oasis_test_v2 2.2.97 → 2.2.98

package/dist/index.js

@@ -5838,7 +5838,7 @@ var init_binary = __esm({
 async function listModels(runtime, executablePath) {
   switch (runtime) {
     case "claude-code":
-      return discoverClaudeCatalog(executablePath);
+      return withFallback(runtime, executablePath, () => discoverClaudeModels(executablePath), claudeStaticModels);
     case "codex":
       return discoverCodexCatalog(executablePath);
     case "gemini":
@@ -5924,13 +5924,6 @@ async function cachedDiscovery(key2, fn) {
   if (models.length > 0) modelCache.set(key2, { models, expiresAt: now + CACHE_TTL_MS });
   return models;
 }
-async function discoverClaudeCatalog(bin) {
-  const models = await cachedDiscovery(discoveryCacheKey("claude-code", bin), () => discoverClaudeModels(bin));
-  if (models.length === 0) return claudeStaticModels();
-  if (models.some((m2) => m2.provider === "custom")) return models;
-  const present = new Set(models.map((m2) => m2.id));
-  return [...models, ...claudeStaticModels().filter((m2) => !present.has(m2.id))];
-}
 async function withFallback(runtime, executablePath, discover, fallback) {
   const models = await cachedDiscovery(discoveryCacheKey(runtime, executablePath), discover);
   return models.length > 0 ? models : fallback();
@@ -230730,6 +230723,8 @@ var init_daemon_hub = __esm({
       frameWatermark = /* @__PURE__ */ new Map();
       /** 每 dispatch 上次回 ackSeq 的时刻——把流式期间的回执节流到 ~250ms 一次。 */
       lastAckSeqAt = /* @__PURE__ */ new Map();
+      /** 收尾后那 60 秒延迟清理的定时器（换机器重派时要撤掉，否则会在新会话跑到一半时把它的帧号状态清掉）。 */
+      frameCleanupTimers = /* @__PURE__ */ new Map();
       /**
        * 「这次派发归谁管、现在什么状态」的认领口。**必须由 hub 汇总，不能各 adapter 自己判**——
        * serve 里同时有两个 DaemonHubAdapter（chat 一个、dispatch 一个），一次派发只属于其中一个。
@@ -231084,14 +231079,36 @@ var init_daemon_hub = __esm({
         this.lastAckSeqAt.set(dispatchId, now);
         ws.send(JSON.stringify({ type: "ack", dispatchId, ackSeq: this.frameWatermark.get(dispatchId) ?? 0 }));
       }
+      /**
+       * 同一把派发键**换了一台机器重派**（Bug 0279 的换候选重试）时，清掉这把键的帧号状态。
+       *
+       * 帧号是按会话进程编的：新机器上的新进程从 1 重新编。不清的话，上一个进程留下的水位（收尾后还要
+       * 保留 60 秒）会把新进程的帧**全部当成重复帧丢掉**，连收尾帧都到不了，这一轮就一直挂着
+       * （2026-09-29 v2 run chat-run:d27ff875：第二台 1.3 秒就退出了，服务端一帧都没收到）。
+       * 旧进程这时已经退出或被判死；它若还有迟到的帧，由认领那一步按机器对不上直接驱逐。
+       */
+      resetSessionFrameState(dispatchId) {
+        const pending = this.frameCleanupTimers.get(dispatchId);
+        if (pending) {
+          clearTimeout(pending);
+          this.frameCleanupTimers.delete(dispatchId);
+        }
+        this.frameSeqSupported.delete(dispatchId);
+        this.frameWatermark.delete(dispatchId);
+        this.lastAckSeqAt.delete(dispatchId);
+      }
       /** `session_exited` 后延迟清帧号状态：给重连重放的收尾帧留一个去重窗口，之后回收避免无界增长。 */
       scheduleFrameStateCleanup(dispatchId) {
+        const prior = this.frameCleanupTimers.get(dispatchId);
+        if (prior) clearTimeout(prior);
         const t = setTimeout(() => {
+          this.frameCleanupTimers.delete(dispatchId);
           this.frameSeqSupported.delete(dispatchId);
           this.frameWatermark.delete(dispatchId);
           this.lastAckSeqAt.delete(dispatchId);
         }, 6e4);
         t.unref?.();
+        this.frameCleanupTimers.set(dispatchId, t);
       }
       /**
        * 注册一个认领判断。返回：
@@ -259448,7 +259465,7 @@ var init_daemon_adapter = __esm({
           appendWaiters: []
         };
         this.pending.set(dispatchId, entry);
-        this.settledDispatchIds.delete(dispatchId);
+        if (this.settledDispatchIds.delete(dispatchId)) this.hub.resetSessionFrameState?.(dispatchId);
         const sessionAuth = this.sessionAuth ? { ...this.sessionAuth.issue({ nodeId, dispatchId }), gatewayUrl: this.sessionAuth.gatewayUrl } : void 0;
         let sent;
         try {
@@ -289503,7 +289520,7 @@ async function startServe(opts) {
         if (isDeletedActor(dispatchTarget)) {
           throw new ApiError(409, ACTOR_DELETED_ERROR_CODE, ACTOR_DELETED_CHAT_MESSAGE);
         }
-        const runtimeSessionId = sessionId ?? (requestDispatchId ? deterministicUuid(`chat-runtime:${requestDispatchId}`) : (0, import_node_crypto92.randomUUID)());
+        const runtimeSessionId = sessionId ?? (requestDispatchId ? deterministicUuid(retargetClaimedDispatch ? `chat-runtime:${requestDispatchId}:retry:${(0, import_node_crypto92.randomUUID)()}` : `chat-runtime:${requestDispatchId}`) : (0, import_node_crypto92.randomUUID)());
         const resumeRuntimeSession = Boolean(sessionId);
         const traceRunId = requestDispatchId ? stableChatTraceRunId(requestDispatchId) : `chat-run:${(0, import_node_crypto92.randomUUID)()}`;
         const artifactId = requestDispatchId ? `artifact:chat:${deterministicUuid(`chat-artifact:${requestDispatchId}`)}` : `artifact:chat:${(0, import_node_crypto92.randomUUID)()}`;
@@ -289722,8 +289739,12 @@ async function startServe(opts) {
                旧机器那次失败的原文仍留在事件流里，也记进了故障标记与失败链。 */
             exitReason: null,
             errorMessage: null,
+            // 这一次是新的一场 runtime 会话（见上面 runtimeSessionId），账本里的会话号跟着换。
+            triggerRef: runtimeSessionId,
+            jobKey: runtimeSessionId,
             metadata: {
               ...prior.metadata ?? {},
+              runtimeSessionId,
               nodeId: binding.nodeId,
               runtimeKind: binding.runtimeKind,
               runtimeTargetSource: "session_override"
@@ -298211,7 +298232,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.97" ? "2.2.97" : "dev";
+var CLI_VERSION = "2.2.98" ? "2.2.98" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -302182,7 +302203,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.97" : "dev";
+var PKG_VERSION = true ? "2.2.98" : "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.97",
+  "version": "2.2.98",
   "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": "b58602b3836acf502fd5bfc644949eb355440ae0"
+    "sourceHead": "9232426433ddd120620c9d131d9f3fd247d726eb"
   }
 }