oasis_test 0.1.122 → 0.1.124

package/dist/index.js

@@ -203422,6 +203422,10 @@ var SessionProcessState = class {
     this.spec = spec;
     this.adapter = adapter;
     this.lock = lock;
+    const o = spec.limits ?? {};
+    this.hardTtlMs = o.hardTtlMs ?? SESSION_LIMITS.hardTtlMs;
+    this.suicideAfterUnreachableMs = o.suicideAfterUnreachableMs ?? SESSION_LIMITS.suicideAfterUnreachableMs;
+    this.watchdogIntervalMs = o.watchdogIntervalMs ?? 3e4;
   }
   ws = null;
   connected = false;
@@ -203431,6 +203435,9 @@ var SessionProcessState = class {
   reconnectMs = RECONNECT_MIN_MS;
   lastConnectedAt = Date.now();
   startedAt = Date.now();
+  hardTtlMs;
+  suicideAfterUnreachableMs;
+  watchdogIntervalMs;
   watchdog = null;
   exitAckResolve = null;
   /** 整个会话进程「可以退了」的信号：会话正常退出、或被 evict / TTL / 失联自尽。 */
@@ -203571,16 +203578,16 @@ var SessionProcessState = class {
   startWatchdog() {
     this.watchdog = setInterval(() => {
       const now = Date.now();
-      if (now - this.startedAt >= SESSION_LIMITS.hardTtlMs) {
+      if (now - this.startedAt >= this.hardTtlMs) {
         log2("[session]", `${this.spec.dispatchId}: \u8FBE\u786C\u4E0A\u9650 TTL\uFF0C\u81EA\u9000`);
         void this.selfTerminate("ttl");
         return;
       }
-      if (!this.connected && now - this.lastConnectedAt >= SESSION_LIMITS.suicideAfterUnreachableMs) {
-        log2("[session]", `${this.spec.dispatchId}: \u5931\u8054\u8D85\u8FC7 ${SESSION_LIMITS.suicideAfterUnreachableMs}ms\uFF0C\u81EA\u5C3D\uFF08\u9632\u53CC\u8DD1\uFF09`);
+      if (!this.connected && now - this.lastConnectedAt >= this.suicideAfterUnreachableMs) {
+        log2("[session]", `${this.spec.dispatchId}: \u5931\u8054\u8D85\u8FC7 ${this.suicideAfterUnreachableMs}ms\uFF0C\u81EA\u5C3D\uFF08\u9632\u53CC\u8DD1\uFF09`);
         void this.selfTerminate("unreachable");
       }
-    }, 3e4);
+    }, this.watchdogIntervalMs);
     this.watchdog.unref?.();
   }
   async selfTerminate(reason) {
@@ -203955,6 +203962,7 @@ var DaemonWsClient = class {
     this.onUpdate = onUpdate;
     this.daemonVersion = daemonVersion;
     this.spawnSessionProcess = opts.spawnSessionProcess;
+    this.countDetachedSessions = opts.countDetachedSessions;
     this.pingIntervalMs = opts.pingIntervalMs ?? PING_INTERVAL_MS;
     this.silenceTimeoutMs = opts.silenceTimeoutMs ?? SILENCE_TIMEOUT_MS;
     this.reconnectDelayMs = opts.reconnectDelayMs ?? RECONNECT_DELAY_MS;
@@ -203989,6 +203997,7 @@ var DaemonWsClient = class {
   /** setup 期间收到 kill 的派发。spawn 返回后先杀句柄，不得再宣告 session_started。 */
   cancelledPendingDispatchIds = /* @__PURE__ */ new Set();
   spawnSessionProcess;
+  countDetachedSessions;
   /**
    * 回执 outbox（proposal run-ledger §4.2）：**服务端据以判决的帧**发出后先留一份，收到
    * 服务端 ack 才删；ws 抖动坏窗口发失败/丢失的帧，在重连时全量重发——投递升级 at-least-once，
@@ -204306,7 +204315,8 @@ var DaemonWsClient = class {
           this.pendingUpdateSince = null;
           this.onUpdate();
         } else {
-          log2("[node-cli]", "\u2190 update\uFF1A\u7A7A\u95F2,\u7ACB\u5373\u62C9\u53D6\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F");
+          const detached = this.countDetachedSessions?.() ?? 0;
+          log2("[node-cli]", detached > 0 ? `\u2190 update\uFF1A\u672C\u8FDB\u7A0B\u5185\u65E0\u4F1A\u8BDD\uFF08\u53E6\u6709 ${detached} \u4E2A\u72EC\u7ACB\u4F1A\u8BDD\u5728\u8DD1\uFF0C**\u4E0D\u53D7\u672C\u6B21\u91CD\u542F\u5F71\u54CD**\uFF09\uFF0C\u7ACB\u5373\u62C9\u53D6\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F` : "\u2190 update\uFF1A\u7A7A\u95F2,\u7ACB\u5373\u62C9\u53D6\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F");
           this.onUpdate();
         }
         break;
@@ -204555,7 +204565,8 @@ async function startNode(opts) {
   const client = new DaemonWsClient(opts.serverUrl, opts.nodeId, sessions, adapters, opts.token, runtimes, opts.nodeName, opts.reportRuntimes ?? false, true, opts.onUpdate, opts.daemonVersion, {
     // chat 文件浏览 handler 用它定位会话目录；production 不传 = 与 adapter 同款默认根（~/.oasis/work）。
     ...opts.workRoot !== void 0 ? { workRoot: opts.workRoot } : {},
-    ...opts.spawnSessionProcess ? { spawnSessionProcess: opts.spawnSessionProcess } : {}
+    ...opts.spawnSessionProcess ? { spawnSessionProcess: opts.spawnSessionProcess } : {},
+    ...opts.countDetachedSessions ? { countDetachedSessions: opts.countDetachedSessions } : {}
   });
   console.log(`[oasis node] ${opts.nodeId} \u2192 ${opts.serverUrl}`);
   client.start();
@@ -209440,6 +209451,20 @@ function sweepOrphanSessions(sessionRoots2, deps) {
   }
   return removed;
 }
+function countLiveSessions(sessionRoots2, deps) {
+  if (!deps.flockAvailable) return 0;
+  let n = 0;
+  for (const root of sessionRoots2) {
+    let dirs;
+    try {
+      dirs = fs38.readdirSync(root);
+    } catch {
+      continue;
+    }
+    for (const d of dirs) if (deps.isLocked(path32.join(root, d, "lock"))) n++;
+  }
+  return n;
+}
 
 // src/index.ts
 init_src8();
@@ -209699,7 +209724,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.122" : "dev";
+var PKG_VERSION = true ? "0.1.124" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;
@@ -210221,7 +210246,8 @@ void (async () => {
         drainNode = ctl.drain;
       },
       // 服务端下发了数据面通行证时，把会话交给独立进程跑（daemon 重启不再连坐它）。
-      spawnSessionProcess
+      spawnSessionProcess,
+      countDetachedSessions: () => countLiveSessions(sessionRoots(), { isLocked: isSessionLocked, flockAvailable: hasFlock() })
     });
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.122",
+  "version": "0.1.124",
   "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": "f909dea3a3e738d34800aaae2ff21febd2ed9ea3"
+    "sourceHead": "3c7ad5a874aa215ba7cee828b8cab4ab0a499e87"
   }
 }