oasis_test 0.1.37 → 0.1.39

package/dist/index.js

@@ -25136,10 +25136,12 @@ async function startOasisServer(opts) {
               if (!body.actorId) {
                 throw new ApiError(400, "CHAT_ACTOR_REQUIRED", "\u8111\u66B4\u5BF9\u8BDD\u5FC5\u987B\u9009\u62E9\u4E00\u4E2A\u6570\u5B57\u5458\u5DE5");
               }
+              const inheritedRuntimeSessionId = !body.sessionId && body.chatSessionId && opts.chatSession ? await opts.chatSession.getSession(body.chatSessionId).catch(() => null).then((s2) => s2 && s2.humanActorId === actor ? s2.runtimeSessionId ?? void 0 : void 0) : void 0;
+              const effectiveSessionId = body.sessionId ?? inheritedRuntimeSessionId;
               const session = await opts.dispatchChat({
                 actorId: body.actorId,
                 message: body.message,
-                ...body.sessionId ? { sessionId: body.sessionId } : {},
+                ...effectiveSessionId ? { sessionId: effectiveSessionId } : {},
                 ...body.chatSessionId ? { chatSessionId: body.chatSessionId } : {},
                 ...body.workspace ? { workspace: body.workspace } : {},
                 ...currentCompanyId !== void 0 ? { companyId: currentCompanyId } : {},
@@ -25164,26 +25166,52 @@ async function startOasisServer(opts) {
                   ...persistAttachments.length ? { attachments: persistAttachments } : {}
                 }).catch(() => void 0);
               }
+              let assistantMsgId;
+              if (chatStore && persistTarget) {
+                const { randomUUID: randomUUID19 } = await import("node:crypto");
+                const id = randomUUID19();
+                await chatStore.appendMessage({
+                  id,
+                  sessionId: persistTarget.id,
+                  role: "assistant",
+                  content: "",
+                  createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+                  status: "running",
+                  ...session.runId ? { runId: session.runId } : {}
+                }).then(() => {
+                  assistantMsgId = id;
+                }).catch(() => void 0);
+              }
               let assistantText = "";
               let persisted = false;
               let live = null;
               const localParts = [];
               const collectedParts = () => (live ? live.bufferedParts() : localParts).filter((p2) => p2.type !== "done");
-              const finalizeAssistant = async () => {
+              const finalizeAssistant = async (status = "done") => {
                 if (persisted || !chatStore || !persistTarget) return;
                 persisted = true;
                 const parts = collectedParts();
-                if (!assistantText && !session.runId && parts.length === 0) return;
-                const { randomUUID: randomUUID19 } = await import("node:crypto");
-                await chatStore.appendMessage({
-                  id: randomUUID19(),
-                  sessionId: persistTarget.id,
-                  role: "assistant",
-                  content: assistantText,
-                  createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-                  ...session.runId ? { runId: session.runId } : {},
-                  ...parts.length ? { parts } : {}
-                }).catch(() => void 0);
+                if (assistantMsgId) {
+                  await chatStore.updateMessage(assistantMsgId, {
+                    content: assistantText,
+                    status,
+                    ...parts.length ? { parts } : {},
+                    ...session.runId ? { runId: session.runId } : {}
+                  }).catch(() => void 0);
+                } else {
+                  if (!assistantText && !session.runId && parts.length === 0) return;
+                  const { randomUUID: randomUUID19 } = await import("node:crypto");
+                  await chatStore.appendMessage({
+                    id: randomUUID19(),
+                    sessionId: persistTarget.id,
+                    role: "assistant",
+                    content: assistantText,
+                    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+                    status,
+                    ...session.runId ? { runId: session.runId } : {},
+                    ...parts.length ? { parts } : {}
+                  }).catch(() => void 0);
+                }
                 await chatStore.updateSession(persistTarget.id, {
                   // 优先落 runtime-native id（codex rollout / ACP session/new 返回），让下一轮 resume
                   // 能命中 runtime 认可的 id；claude-code 等接受任意外部 id 的仍回退 session.id 兼容原行为。
@@ -25213,11 +25241,13 @@ async function startOasisServer(opts) {
                   }
                 }) : null;
                 let localSeq = 0;
+                let ckptDirty = false;
                 const writeToRes = (part) => {
                   if (!res.destroyed) res.write(`${JSON.stringify(part)}
 `);
                 };
                 const emit = (part) => {
+                  ckptDirty = true;
                   if (live) return live.emit(part);
                   const withSeq = { ...part, seq: ++localSeq };
                   if (part.type !== "done") localParts.push(withSeq);
@@ -25233,6 +25263,13 @@ async function startOasisServer(opts) {
                 });
                 res.flushHeaders();
                 stopKeepalive = startStreamKeepalive(res);
+                const ckptTimer = setInterval(() => {
+                  if (!ckptDirty || !assistantMsgId || !chatStore) return;
+                  ckptDirty = false;
+                  const parts = collectedParts();
+                  void chatStore.updateMessage(assistantMsgId, { content: assistantText, status: "running", ...parts.length ? { parts } : {} }).catch(() => void 0);
+                }, 2e3);
+                ckptTimer.unref?.();
                 if (live) detachViewer = live.subscribe(writeToRes);
                 let sawTextOutput = false;
                 session.onOutput((chunk) => {
@@ -25253,7 +25290,8 @@ async function startOasisServer(opts) {
                   emit({ type: "error", text: err instanceof Error ? err.message : String(err) });
                 }
                 finished = true;
-                await finalizeAssistant();
+                clearInterval(ckptTimer);
+                await finalizeAssistant(errored ? "error" : "done");
                 emit({ type: "done", sessionId: session.id });
                 live?.finish(errored ? "error" : "done");
                 stopKeepalive?.();
@@ -28896,6 +28934,17 @@ var init_dev_store = __esm({
         this.messages.set(m2.sessionId, list);
         return record5;
       }
+      async updateMessage(id, patch) {
+        for (const list of this.messages.values()) {
+          const item = list.find((x2) => x2.id === id);
+          if (!item) continue;
+          if (patch.content !== void 0) item.content = patch.content;
+          if (patch.parts !== void 0) item.parts = patch.parts;
+          if (patch.status !== void 0) item.status = patch.status;
+          if (patch.runId !== void 0) item.runId = patch.runId;
+          return;
+        }
+      }
       async listMessages(sessionId, limit) {
         const list = (this.messages.get(sessionId) ?? []).sort((a, b2) => a.seq - b2.seq);
         return limit ? list.slice(-limit) : list;
@@ -28944,6 +28993,10 @@ var init_dev_store = __esm({
         this.save();
         return record5;
       }
+      async updateMessage(id, patch) {
+        await super.updateMessage(id, patch);
+        this.save();
+      }
       async linkWorkOrder(sessionId, workOrderId) {
         await super.linkWorkOrder(sessionId, workOrderId);
         this.save();
@@ -37926,6 +37979,31 @@ function codexSessionsRoot() {
   }
   return "";
 }
+function codexRolloutExists(sessionId, root = codexSessionsRoot()) {
+  if (!sessionId || !root) return false;
+  const suffix = `-${sessionId}.jsonl`;
+  let hit = false;
+  const walk = (d) => {
+    if (hit) return;
+    let ents;
+    try {
+      ents = fs8.readdirSync(d, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const ent of ents) {
+      if (hit) return;
+      const p2 = path8.join(d, ent.name);
+      if (ent.isDirectory()) walk(p2);
+      else if (ent.isFile() && ent.name.startsWith("rollout-") && ent.name.endsWith(suffix)) {
+        hit = true;
+        return;
+      }
+    }
+  };
+  walk(root);
+  return hit;
+}
 function listRecentRollouts(root, sinceMs) {
   const margin = sinceMs - 6e4;
   const found = [];
@@ -38176,7 +38254,9 @@ var init_codex = __esm({
         const task = job.bundle.files["TASK.md"];
         if (!task) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
         const prompt = job.systemPrompt ? ["# System Prompt", job.systemPrompt, "", "# Task", task].join("\n") : task;
-        const isResume = Boolean(job.resumeRuntimeSession && job.runtimeSessionId);
+        const isResume = Boolean(
+          job.resumeRuntimeSession && job.runtimeSessionId && codexRolloutExists(job.runtimeSessionId)
+        );
         const args = [
           "exec",
           "-C",
@@ -40216,39 +40296,47 @@ function nodesDomain(deps) {
       if (msg.type !== "hello") return;
       const d = hub.connectedDaemons().find((c) => c.daemonId === daemonId);
       if (!d) return;
-      if (msg.meta.runtimes) {
-        const existing = await nodeStore.getNode(daemonId);
-        await nodeStore.upsertNode({
-          id: daemonId,
-          hostname: d.meta.hostname,
-          nodeVersion: d.meta.nodeVersion ?? "unknown",
-          status: "online",
-          // revives a previously soft-deleted node
-          lastSeenAt: now(),
-          enrolledAt: existing?.enrolledAt ?? now(),
-          ...d.meta.nodeName ? { name: d.meta.nodeName } : existing?.name ? { name: existing.name } : {}
-        });
-        for (const cap of msg.meta.runtimes) {
-          await nodeStore.addRuntimeIfAbsent({
-            id: `runtime:${daemonId}:${cap.kind}`,
-            nodeId: daemonId,
-            kind: cap.kind,
+      try {
+        if (msg.meta.runtimes) {
+          const existing = await nodeStore.getNode(daemonId);
+          await nodeStore.upsertNode({
+            id: daemonId,
             hostname: d.meta.hostname,
-            ...cap.binary ? { binary: cap.binary } : {},
-            ...cap.version ? { version: cap.version } : {},
+            nodeVersion: d.meta.nodeVersion ?? "unknown",
             status: "online",
-            lastSeenAt: now()
+            // revives a previously soft-deleted node
+            lastSeenAt: now(),
+            enrolledAt: existing?.enrolledAt ?? now(),
+            ...d.meta.nodeName ? { name: d.meta.nodeName } : existing?.name ? { name: existing.name } : {}
           });
+          for (const cap of msg.meta.runtimes) {
+            await nodeStore.addRuntimeIfAbsent({
+              id: `runtime:${daemonId}:${cap.kind}`,
+              nodeId: daemonId,
+              kind: cap.kind,
+              hostname: d.meta.hostname,
+              ...cap.binary ? { binary: cap.binary } : {},
+              ...cap.version ? { version: cap.version } : {},
+              status: "online",
+              lastSeenAt: now()
+            });
+          }
+          await nodeStore.setNodeRuntimesOnline(daemonId, true);
+        } else {
+          await nodeStore.setNodeOnline(daemonId, true);
+          await nodeStore.setNodeRuntimesOnline(daemonId, true);
         }
-        await nodeStore.setNodeRuntimesOnline(daemonId, true);
-      } else {
-        await nodeStore.setNodeOnline(daemonId, true);
-        await nodeStore.setNodeRuntimesOnline(daemonId, true);
+      } catch (err) {
+        console.warn(`[nodes] hello \u5904\u7406\u5931\u8D25(node=${daemonId})\uFF1A${err instanceof Error ? err.message : String(err)}`);
       }
     });
     hub.onDaemonDisconnected = async (daemonId) => {
-      await nodeStore.setNodeOnline(daemonId, false);
-      await nodeStore.setNodeRuntimesOnline(daemonId, false);
+      try {
+        await nodeStore.setNodeOnline(daemonId, false);
+        await nodeStore.setNodeRuntimesOnline(daemonId, false);
+      } catch (err) {
+        console.warn(`[nodes] disconnect \u5904\u7406\u5931\u8D25(node=${daemonId})\uFF1A${err instanceof Error ? err.message : String(err)}`);
+      }
     };
   }
   return (router) => {
@@ -54232,6 +54320,7 @@ var PostgresChatSessionStore = class _PostgresChatSessionStore {
     await pool.query(`ALTER TABLE "${s2}".chat_messages ADD COLUMN IF NOT EXISTS run_id text`);
     await pool.query(`ALTER TABLE "${s2}".chat_messages ADD COLUMN IF NOT EXISTS parts jsonb`);
     await pool.query(`ALTER TABLE "${s2}".chat_messages ADD COLUMN IF NOT EXISTS attachments jsonb`);
+    await pool.query(`ALTER TABLE "${s2}".chat_messages ADD COLUMN IF NOT EXISTS status text`);
     await pool.query(`ALTER TABLE "${s2}".chat_sessions ADD COLUMN IF NOT EXISTS workspace text`);
     await pool.query(`
       WITH ranked AS (
@@ -54297,11 +54386,11 @@ var PostgresChatSessionStore = class _PostgresChatSessionStore {
   async appendMessage(m2) {
     const insert = async () => {
       const r = await this.pool.query(
-        `INSERT INTO ${this.s}.chat_messages (id, session_id, role, content, seq, created_at, run_id, parts, attachments)
-         SELECT $1,$2,$3,$4, COALESCE(MAX(seq),0)+1, $5,$6,$7,$8
+        `INSERT INTO ${this.s}.chat_messages (id, session_id, role, content, seq, created_at, run_id, parts, attachments, status)
+         SELECT $1,$2,$3,$4, COALESCE(MAX(seq),0)+1, $5,$6,$7,$8,$9
          FROM ${this.s}.chat_messages WHERE session_id = $2
          RETURNING seq`,
-        [m2.id, m2.sessionId, m2.role, m2.content, m2.createdAt, m2.runId ?? null, m2.parts !== void 0 ? JSON.stringify(m2.parts) : null, m2.attachments !== void 0 ? JSON.stringify(m2.attachments) : null]
+        [m2.id, m2.sessionId, m2.role, m2.content, m2.createdAt, m2.runId ?? null, m2.parts !== void 0 ? JSON.stringify(m2.parts) : null, m2.attachments !== void 0 ? JSON.stringify(m2.attachments) : null, m2.status ?? null]
       );
       return Number(r.rows[0].seq);
     };
@@ -54315,6 +54404,29 @@ var PostgresChatSessionStore = class _PostgresChatSessionStore {
       }
     }
   }
+  async updateMessage(id, patch) {
+    const sets = [];
+    const args = [];
+    if (patch.content !== void 0) {
+      args.push(patch.content);
+      sets.push(`content = $${args.length}`);
+    }
+    if (patch.parts !== void 0) {
+      args.push(JSON.stringify(patch.parts));
+      sets.push(`parts = $${args.length}`);
+    }
+    if (patch.status !== void 0) {
+      args.push(patch.status);
+      sets.push(`status = $${args.length}`);
+    }
+    if (patch.runId !== void 0) {
+      args.push(patch.runId);
+      sets.push(`run_id = $${args.length}`);
+    }
+    if (sets.length === 0) return;
+    args.push(id);
+    await this.pool.query(`UPDATE ${this.s}.chat_messages SET ${sets.join(", ")} WHERE id = $${args.length}`, args);
+  }
   async listMessages(sessionId, limit) {
     const limitClause = limit ? `LIMIT ${limit}` : "";
     const r = await this.pool.query(
@@ -54358,7 +54470,8 @@ var rowToMessage = (row) => ({
   createdAt: new Date(row.created_at).toISOString(),
   ...row.run_id != null ? { runId: row.run_id } : {},
   ...row.parts != null ? { parts: row.parts } : {},
-  ...row.attachments != null ? { attachments: row.attachments } : {}
+  ...row.attachments != null ? { attachments: row.attachments } : {},
+  ...row.status != null ? { status: row.status } : {}
 });
 
 // ../storage/src/postgres-nodes.ts
@@ -55062,6 +55175,9 @@ async function startServe(opts) {
       return service.listSkillFiles(skillId);
     }
   });
+  process.on("unhandledRejection", (reason) => {
+    console.error(`[serve] unhandledRejection\uFF08\u5DF2\u515C\u5E95\uFF0C\u4E0D\u5D29\u8FDB\u7A0B\uFF09\uFF1A${reason instanceof Error ? reason.stack ?? reason.message : String(reason)}`);
+  });
   const server = await startOasisServer({
     kernel: engine.kernel,
     blobs: engine.blobs,
@@ -58005,7 +58121,7 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.37" : "dev";
+var PKG_VERSION = true ? "0.1.39" : "dev";
 var OASIS_DIR = path18.join(os10.homedir(), ".oasis");
 var CONFIG_FILE = path18.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path18.join(OASIS_DIR, "node.pid");

package/package.json

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