oasis_test_v2 2.2.44 → 2.2.45

package/dist/index.js

@@ -4880,7 +4880,7 @@ async function listModels(runtime, executablePath) {
     case "claude-code":
       return claudeStaticModels();
     case "codex":
-      return withFallback(runtime, executablePath, () => discoverCodexModels(executablePath), codexStaticModels);
+      return discoverCodexCatalog(executablePath);
     case "gemini":
       return withFallback(runtime, executablePath, async () => await discoverACPModels(executablePath ?? "gemini", "gemini", ["--acp"]) ?? [], geminiStaticModels);
     case "copilot":
@@ -5024,22 +5024,9 @@ function codebuddyStaticModels() {
 function cursorStaticModels() {
   return [{ id: "default[]", label: "Auto", provider: "cursor", default: true }];
 }
-async function isModelValid(runtime, modelId, executablePath) {
-  try {
-    const models = await listModels(runtime, executablePath);
-    if (models.length === 0) return true;
-    return models.some((m2) => m2.id === modelId);
-  } catch {
-    return true;
-  }
-}
-async function defaultModelFor(runtime, executablePath) {
-  try {
-    const models = await listModels(runtime, executablePath);
-    return models.find((m2) => m2.default)?.id;
-  } catch {
-    return void 0;
-  }
+function resolveDispatchModel(candidate, catalog) {
+  if (catalog.length === 0 || catalog.some((m2) => m2.id === candidate)) return { model: candidate, replaced: false };
+  return { model: catalog.find((m2) => m2.default)?.id, replaced: true };
 }
 async function discoverOpenCodeModels(bin) {
   const out = await runCapture(bin ?? "opencode", ["models"]);
@@ -5055,7 +5042,163 @@ async function discoverOpenCodeModels(bin) {
   }
   return models;
 }
-async function discoverCodexModels(bin) {
+async function discoverCodexCatalog(bin) {
+  const probed = { customProvider: false };
+  const models = await cachedDiscovery(discoveryCacheKey("codex", bin), async () => {
+    const catalog = codexCatalogFromAppServer(await probeCodexAppServer(bin ?? "codex"));
+    if (!catalog) return discoverCodexBundledModels(bin);
+    probed.customProvider = catalog.customProvider;
+    return catalog.models;
+  });
+  return models.length > 0 || probed.customProvider ? models : codexStaticModels();
+}
+function codexCatalogFromAppServer(probe) {
+  const config2 = probe?.config;
+  if (!probe || !config2) return null;
+  const providerId = config2.modelProvider?.trim() || "openai";
+  const customProvider = providerId.toLowerCase() !== "openai";
+  if (!customProvider && !probe.models) return null;
+  const provider = customProvider ? config2.providerName?.trim() || providerId : "OpenAI";
+  const listApplies = !customProvider || Boolean(config2.modelCatalogJson);
+  const listed = listApplies ? probe.models ?? [] : [];
+  const configured = config2.model?.trim();
+  const defaultId = configured || listed.find((m2) => m2.isDefault)?.id;
+  const models = listed.map((m2) => ({ id: m2.id, label: m2.label, provider }));
+  if (configured && !models.some((m2) => m2.id === configured)) models.push({ id: configured, label: configured, provider });
+  return { models: models.map((m2) => m2.id === defaultId ? { ...m2, default: true } : m2), customProvider };
+}
+async function probeCodexAppServer(bin, timeoutMs = 15e3) {
+  let dir;
+  try {
+    dir = (0, import_node_fs2.mkdtempSync)((0, import_node_path3.join)((0, import_node_os2.tmpdir)(), "oasis-codex-models-"));
+  } catch {
+    return null;
+  }
+  let child;
+  try {
+    child = (0, import_node_child_process5.spawn)(bin, ["app-server", "--stdio", "-c", "allow_login_shell=false"], {
+      cwd: dir,
+      stdio: ["pipe", "pipe", "ignore"],
+      env: { ...process.env }
+    });
+  } catch {
+    (0, import_node_fs2.rmSync)(dir, { recursive: true, force: true });
+    return null;
+  }
+  return await new Promise((resolve10) => {
+    let settled = false;
+    let config2;
+    const listed = [];
+    let listState = "pending";
+    let nextId = 3;
+    const MAX_PAGES = 20;
+    let pages = 0;
+    const finish = (value2) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      try {
+        child.stdin?.end();
+      } catch {
+      }
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+      try {
+        (0, import_node_fs2.rmSync)(dir, { recursive: true, force: true });
+      } catch {
+      }
+      resolve10(value2);
+    };
+    const maybeFinish = () => {
+      if (config2 === void 0 || listState === "pending") return;
+      finish({ config: config2, models: listState === "done" ? listed : null });
+    };
+    const timer = setTimeout(() => finish(null), timeoutMs);
+    const send = (id, method, params) => {
+      try {
+        child.stdin?.write(`${JSON.stringify({ jsonrpc: "2.0", id, method, params })}
+`);
+      } catch {
+        finish(null);
+      }
+    };
+    child.on("error", () => finish(null));
+    child.stdin?.on("error", () => finish(null));
+    child.on("close", () => finish(null));
+    let buf = "";
+    child.stdout?.on("data", (chunk) => {
+      if (settled) return;
+      buf += chunk.toString("utf8");
+      let nl;
+      while ((nl = buf.indexOf("\n")) >= 0) {
+        const line = buf.slice(0, nl).trim();
+        buf = buf.slice(nl + 1);
+        if (!line) continue;
+        let msg;
+        try {
+          msg = JSON.parse(line);
+        } catch {
+          continue;
+        }
+        if (typeof msg.id !== "number") continue;
+        if (msg.id === 1) {
+          if (msg.error !== void 0) {
+            finish(null);
+            return;
+          }
+          send(2, "config/read", { cwd: dir });
+          send(nextId, "model/list", {});
+          continue;
+        }
+        if (msg.id === 2) {
+          config2 = msg.error !== void 0 ? null : parseCodexConfigRead(msg.result);
+          maybeFinish();
+          continue;
+        }
+        if (msg.id === nextId && listState === "pending") {
+          if (msg.error !== void 0) {
+            listState = "failed";
+          } else {
+            const page = msg.result ?? {};
+            for (const m2 of page.data ?? []) {
+              const id = typeof m2.model === "string" && m2.model ? m2.model : typeof m2.id === "string" ? m2.id : "";
+              if (!id || m2.hidden === true || listed.some((x2) => x2.id === id)) continue;
+              listed.push({ id, label: typeof m2.displayName === "string" && m2.displayName ? m2.displayName : id, isDefault: m2.isDefault === true });
+            }
+            pages += 1;
+            if (typeof page.nextCursor === "string" && page.nextCursor && pages < MAX_PAGES) {
+              nextId += 1;
+              send(nextId, "model/list", { cursor: page.nextCursor });
+              continue;
+            }
+            listState = "done";
+          }
+          maybeFinish();
+        }
+      }
+    });
+    send(1, "initialize", { clientInfo: { name: "oasis-model-discovery", version: "0.1.0" }, capabilities: {} });
+  });
+}
+function parseCodexConfigRead(result) {
+  const config2 = (result ?? {}).config ?? {};
+  const str5 = (v2) => typeof v2 === "string" && v2.trim() ? v2.trim() : void 0;
+  const model = str5(config2["model"]);
+  const modelProvider = str5(config2["model_provider"]);
+  const modelCatalogJson = str5(config2["model_catalog_json"]);
+  const providers = config2["model_providers"];
+  const entry = modelProvider && providers && typeof providers === "object" ? providers[modelProvider] : void 0;
+  const providerName = entry && typeof entry === "object" ? str5(entry["name"]) : void 0;
+  return {
+    ...model ? { model } : {},
+    ...modelProvider ? { modelProvider } : {},
+    ...providerName ? { providerName } : {},
+    ...modelCatalogJson ? { modelCatalogJson } : {}
+  };
+}
+async function discoverCodexBundledModels(bin) {
   const out = await runCapture(bin ?? "codex", ["debug", "models", "--bundled"]);
   if (out === void 0) return [];
   try {
@@ -5256,6 +5399,7 @@ async function discoverACPModels(bin, provider, args = ["acp"], timeoutMs = 12e3
     };
     const watchdog = setTimeout(fail, timeoutMs);
     child.on("error", fail);
+    child.stdin?.on("error", fail);
     child.on("exit", () => {
       if (!settled) fail();
     });
@@ -270097,6 +270241,9 @@ async function startServe(opts) {
         // actor→runtime→default 模型解析（内部字段；非用户 per-session 选择）。
         // 决策 0032 预派发校验：候选 model 不在该 runtime 的模型目录里 → 不烧会话，
         // 回退目录默认并留 warn（曾因 actor 存了残缺 id "claude-sonnet"，CLI 秒拒、节点熔断卡死）。
+        // 目录用**绑定那台节点**的（resolveRuntimeModels，与控制台下拉、会话级校验同一份）：控制面本机
+        // 的 isModelValid 看的是控制面自己的 CLI 配置，跨机时回落静态 GPT 目录，会把节点上配好的
+        // deepseek-flash 判无效、悄悄换成 gpt-6-astra 派出去（Bug 0209）。
         resolveModel: async (actorId) => {
           const actors2 = await runActors();
           const binding = await actors2.service.resolveBinding()(actorId);
@@ -270107,13 +270254,14 @@ async function startServe(opts) {
             candidate = runtimeCfg?.model;
           }
           if (!candidate) return void 0;
-          const kind = binding ? traceRuntimeKind(binding.runtimeKind) : void 0;
-          if (kind && kind !== "custom" && !await isModelValid(kind, candidate)) {
-            const fallback = await defaultModelFor(kind);
-            console.warn(`[dispatch] ${actorId} \u914D\u7F6E\u7684\u6A21\u578B '${candidate}' \u5BF9 runtime ${kind} \u65E0\u6548\uFF0C\u56DE\u9000 ${fallback ?? "CLI \u9ED8\u8BA4"}\uFF08\u51B3\u7B56 0032\uFF09`);
-            return fallback;
-          }
-          return candidate;
+          if (!binding || traceRuntimeKind(binding.runtimeKind) === "custom") return candidate;
+          const runtimeId = `runtime:${binding.nodeId}:${binding.runtimeKind}`;
+          const catalog = await resolveRuntimeModels({ nodeStore, registry: registryStore, nodeReportedModels }, runtimeId).catch(() => []);
+          const checked = resolveDispatchModel(candidate, catalog);
+          if (checked.replaced) {
+            console.warn(`[dispatch] ${actorId} \u914D\u7F6E\u7684\u6A21\u578B '${candidate}' \u4E0D\u5728 ${runtimeId} \u7684\u5019\u9009\u91CC\uFF0C\u56DE\u9000 ${checked.model ?? "CLI \u9ED8\u8BA4"}\uFF08\u51B3\u7B56 0032\uFF09`);
+          }
+          return checked.model;
         },
         // ADR「agent CLI 启动参数员工级可配置化」：每次派发解析员工 actor_configs.extraArgs 下发（形态同 resolveModel）。
         // 只读员工配置，不叠 runtime 默认、不做「没有员工就找 runtime」回退（ADR §3.3 / §4-A）。
@@ -278735,7 +278883,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.44" : "dev";
+var PKG_VERSION = true ? "2.2.45" : "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.44",
+  "version": "2.2.45",
   "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": "91d9408678684a3e8cb17fdae1fdc0b7772cdcb4"
+    "sourceHead": "c27918782543065f65990ee2acc32b3da89bba06"
   }
 }