oasis_test 0.1.28 → 0.1.29

package/dist/index.js

@@ -42998,6 +42998,18 @@ function classifyExit(result) {
   if (result.is_error === true || String(result.subtype ?? "").startsWith("error")) return "error";
   return void 0;
 }
+function conversationExists(sessionId) {
+  const configDir = process.env["CLAUDE_CONFIG_DIR"] || path6.join(os2.homedir(), ".claude");
+  const projectsDir = path6.join(configDir, "projects");
+  const target = `${sessionId}.jsonl`;
+  try {
+    for (const proj of fs9.readdirSync(projectsDir)) {
+      if (fs9.existsSync(path6.join(projectsDir, proj, target))) return true;
+    }
+  } catch {
+  }
+  return false;
+}
 var ClaudeCodeAdapter = class {
   constructor(opts = {}) {
     this.opts = opts;
@@ -43040,7 +43052,8 @@ var ClaudeCodeAdapter = class {
     }
     const prompt = job.bundle.files["TASK.md"];
     if (!prompt) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
-    const runtimeSessionArgs = job.runtimeSessionId ? job.resumeRuntimeSession ? ["--resume", job.runtimeSessionId] : ["--session-id", job.runtimeSessionId] : [];
+    const canResume = job.resumeRuntimeSession && conversationExists(job.runtimeSessionId ?? "");
+    const runtimeSessionArgs = job.runtimeSessionId ? canResume ? ["--resume", job.runtimeSessionId] : ["--session-id", job.runtimeSessionId] : [];
     const args = [
       "-p",
       prompt,
@@ -49331,6 +49344,8 @@ var DaemonWsClient = class {
   ws = null;
   pingTimer = null;
   stopped = false;
+  /** 收到 update 但有活跃会话时置真：延后到所有会话结束再自更新，避免打断执行中的 agent。 */
+  pendingUpdate = false;
   start() {
     this.connect();
   }
@@ -49405,6 +49420,7 @@ var DaemonWsClient = class {
             log2("[node-cli]", `  \u25A0 session_exited  id=${handle.id}  code=${info.code ?? "killed"}  total=${Date.now() - t0}ms`);
             if (info.transcriptRef) log2("[node-cli]", `  transcript: ${info.transcriptRef}`);
             this.send({ type: "session_exited", dispatchId, sessionId: handle.id, info });
+            this.maybeRunPendingUpdate();
           });
         } catch (err) {
           log2("[node-cli]", `  spawn failed: ${err}`);
@@ -49424,9 +49440,18 @@ var DaemonWsClient = class {
         this.send({ type: "pong" });
         break;
       case "update": {
-        log2("[node-cli]", "\u2190 update\uFF1A\u62C9\u53D6\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F");
-        if (this.onUpdate) this.onUpdate();
-        else log2("[node-cli]", "  update \u5FFD\u7565\uFF1A\u672C\u8FDB\u7A0B\u672A\u6CE8\u5165\u81EA\u66F4\u65B0\u903B\u8F91\uFF08\u975E node-daemon \u6258\u7BA1\uFF1F\uFF09");
+        if (!this.onUpdate) {
+          log2("[node-cli]", "\u2190 update \u5FFD\u7565\uFF1A\u672C\u8FDB\u7A0B\u672A\u6CE8\u5165\u81EA\u66F4\u65B0\u903B\u8F91\uFF08\u975E node-daemon \u6258\u7BA1\uFF1F\uFF09");
+          break;
+        }
+        const active = this.sessions.activeCount();
+        if (active > 0) {
+          this.pendingUpdate = true;
+          log2("[node-cli]", `\u2190 update\uFF1A\u5F53\u524D\u6709 ${active} \u4E2A\u6267\u884C\u4E2D\u4F1A\u8BDD,\u5EF6\u540E\u5230\u5168\u90E8\u7ED3\u675F\u540E\u518D\u66F4\u65B0`);
+        } else {
+          log2("[node-cli]", "\u2190 update\uFF1A\u7A7A\u95F2,\u7ACB\u5373\u62C9\u53D6\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F");
+          this.onUpdate();
+        }
         break;
       }
     }
@@ -49434,6 +49459,14 @@ var DaemonWsClient = class {
   send(msg) {
     if (this.ws?.readyState === import_websocket.default.OPEN) this.ws.send(JSON.stringify(msg));
   }
+  /** 会话结束后调用：若之前收到过 update 但因忙延后了,且现已空闲,则触发自更新。 */
+  maybeRunPendingUpdate() {
+    if (this.pendingUpdate && this.sessions.activeCount() === 0) {
+      this.pendingUpdate = false;
+      log2("[node-cli]", "\u6240\u6709\u4F1A\u8BDD\u5DF2\u7ED3\u675F,\u6267\u884C\u5EF6\u540E\u7684\u66F4\u65B0\uFF1A\u62C9\u53D6\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F");
+      this.onUpdate?.();
+    }
+  }
   buildMeta() {
     return { hostname: (0, import_node_os3.hostname)(), adapters: this.adapters, ...this.reportRuntimes ? { runtimes: this.runtimes } : {}, nodeVersion: process.version, ...this.daemonVersion ? { daemonVersion: this.daemonVersion } : {}, ...this.nodeName ? { nodeName: this.nodeName } : {} };
   }
@@ -50988,7 +51021,7 @@ async function runCli(argv, println = console.log) {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.28" : "dev";
+var PKG_VERSION = true ? "0.1.29" : "dev";
 var OASIS_DIR = path13.join(os8.homedir(), ".oasis");
 var CONFIG_FILE = path13.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path13.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"