oasis_test_v2 2.2.13 → 2.2.14

package/dist/index.js

@@ -203682,6 +203682,14 @@ async function runView(kernel, oplog, engineStore, blobs, name, artifactId, para
       throw new Error(`\u672A\u77E5\u89C6\u56FE: ${name}`);
   }
 }
+function resolveListenTarget(env, pid, port) {
+  const count2 = Number(env["LISTEN_FDS"] ?? "0");
+  const listenPid = env["LISTEN_PID"];
+  if (Number.isFinite(count2) && count2 >= 1 && (!listenPid || listenPid === String(pid))) {
+    return { fd: 3 };
+  }
+  return { port: port ?? 0, host: "0.0.0.0" };
+}
 async function startOasisServer(opts) {
   const resolveActor = opts.resolveActor ?? defaultResolveActor;
   const defaultDraftPlannerIssuesStore = new MemoryWorkorderDraftPlannerIssuesStore();
@@ -207700,7 +207708,7 @@ ${composed}`;
   });
   httpServer.keepAliveTimeout = 65e3;
   httpServer.headersTimeout = 66e3;
-  await new Promise((resolve10) => httpServer.listen(opts.port ?? 0, "0.0.0.0", resolve10));
+  await new Promise((resolve10) => httpServer.listen(resolveListenTarget(process.env, process.pid, opts.port), resolve10));
   const address = httpServer.address();
   if (address === null || typeof address === "string") throw new Error("listen failed");
   const baseUrl = `http://127.0.0.1:${address.port}`;
@@ -207719,14 +207727,41 @@ ${composed}`;
      * 委派域没装配时返回 null，调用方照常。
      */
     settleDelegationFromSweep: (childSessionId, reason, companyId, opts2) => delegationService?.settleFromSweep(childSessionId, reason, companyId, opts2) ?? Promise.resolve(null),
-    close: async () => {
+    /**
+     * @param opts.drainMs **优雅停机预算**（毫秒）。缺省 0 = 老行为：立刻掐断所有连接后关闭。
+     *
+     *   给了预算就改成「排空」：先 `close()` 停收新连接、`closeIdleConnections()` 放掉空闲的
+     *   keep-alive，**在途请求让它跑完**；预算到点还没走完的（SSE 这类长连接本来就不会自己结束）
+     *   再 `closeAllConnections()` 强断。前端的流有重连（`hydrateAndAttach`），被强断能自愈；
+     *   普通请求跑到一半被掐则是实打实的失败，所以要给它们这几百毫秒。
+     *
+     *   生产上这条由 `oasis serve` 的 SIGTERM 处理器传（见 cli.ts）——现在 systemd 是硬杀
+     *   （journal: `code=exited, status=143`），在途请求当场断。
+     */
+    close: async (opts2) => {
       if (broadcastTimer) clearInterval(broadcastTimer);
       if (pendingSystemNoticesRecoveryTimer) clearInterval(pendingSystemNoticesRecoveryTimer);
       await knowledgeDomain?.close();
       channelWsSupervisor?.stop();
+      const drainMs = opts2?.drainMs ?? 0;
       await new Promise((resolve10, reject) => {
-        httpServer.closeAllConnections();
-        httpServer.close((err) => err ? reject(err) : resolve10());
+        let sweep;
+        let force;
+        httpServer.close((err) => {
+          if (sweep) clearInterval(sweep);
+          if (force) clearTimeout(force);
+          if (err) reject(err);
+          else resolve10();
+        });
+        if (drainMs > 0) {
+          httpServer.closeIdleConnections();
+          sweep = setInterval(() => httpServer.closeIdleConnections(), 100);
+          sweep.unref?.();
+          force = setTimeout(() => httpServer.closeAllConnections(), drainMs);
+          force.unref?.();
+        } else {
+          httpServer.closeAllConnections();
+        }
       });
     }
   };
@@ -210837,6 +210872,18 @@ var init_projection = __esm({
 function isUncategorizedProjectId(projectId2) {
   return projectId2 === UNCATEGORIZED_PROJECT_ID;
 }
+function latestUncategorizedActivityAt(candidates) {
+  let bestIso = UNCATEGORIZED_UNKNOWN_TIME;
+  let bestMs = Date.parse(UNCATEGORIZED_UNKNOWN_TIME);
+  for (const iso6 of candidates) {
+    if (!iso6) continue;
+    const ms = Date.parse(iso6);
+    if (Number.isNaN(ms) || ms <= bestMs) continue;
+    bestMs = ms;
+    bestIso = iso6;
+  }
+  return bestIso;
+}
 async function bindWorkorderProject(deps) {
   const { workOrderId, projectId: projectId2 } = deps;
   if (!projectId2) return null;
@@ -211472,6 +211519,10 @@ var init_service4 = __esm({
       async buildUncategorizedProject() {
         const workorders = await this.listProjectWorkorders(UNCATEGORIZED_PROJECT_ID);
         const artifactList = await this.aggregateUncategorizedArtifacts();
+        const updatedAt = latestUncategorizedActivityAt([
+          ...workorders.map((workorder) => workorder.updatedAt),
+          ...artifactList.artifacts.map((artifact) => artifact.updatedAt)
+        ]);
         return {
           id: UNCATEGORIZED_PROJECT_ID,
           name: UNCATEGORIZED_PROJECT_NAME,
@@ -211484,7 +211535,7 @@ var init_service4 = __esm({
           // 出 null 保持「取不到就 null」的域内红线，也不把一个不存在的 actor id 塞进契约。
           createdBy: null,
           createdAt: UNCATEGORIZED_UNKNOWN_TIME,
-          updatedAt: UNCATEGORIZED_UNKNOWN_TIME
+          updatedAt
         };
       }
       async aggregateUncategorizedArtifacts() {
@@ -223362,8 +223413,12 @@ function toApiProject(project) {
     //   - 取不到创建人 → `null`（老的手建项目 / 无分类虚拟卡），前端显示「—」；
     //   - 有 id 但名册解析不到 → 对象在、`name`/`avatar` 为 `null`（**不回落 id 尾段**）。
     created_by: project.createdBy ? toApiProjectActorRef(project.createdBy) : null,
-    // 空桶哨兵（`UNCATEGORIZED_UNKNOWN_TIME`）→ `null`：无分类项目桶为空时**无可派生时间**，
-    // 前端见 null 显示「—」而不是一串远古时间；真项目/非空桶不受影响。
+    // 「时间不可知」哨兵（`UNCATEGORIZED_UNKNOWN_TIME`）→ `null`，前端见 null 显示「—」而不是
+    // 一串远古时间。**只有无分类虚拟卡会命中**，真项目不受影响（建项目时两个字段都写真时间戳）。
+    // 命中的两种情形（2026-09-10 起）：
+    //   · `created_at`：恒命中——桶不存在「被创建」这回事；
+    //   · `updated_at`：只在桶里空无一物时命中；桶里有工单/产物时是真时间（见 service.ts
+    //     `buildUncategorizedProject` 与 `latestUncategorizedActivityAt`）。
     created_at: project.createdAt === UNCATEGORIZED_UNKNOWN_TIME ? null : project.createdAt,
     updated_at: project.updatedAt === UNCATEGORIZED_UNKNOWN_TIME ? null : project.updatedAt
   };
@@ -234856,6 +234911,12 @@ function payloadStr(payload, key) {
   }
   return "";
 }
+function workorderGoal(title, prefix, suffix) {
+  const subject = Array.from(title.replace(/\s+/g, " ").trim());
+  const budget = 50 - Array.from(prefix + suffix).length;
+  const shortTitle = subject.length > budget ? `${subject.slice(0, budget - 1).join("")}\u2026` : subject.join("");
+  return `${prefix}${shortTitle}${suffix}`;
+}
 function buildPlan(structure, title, ctx, opts = {}) {
   const nodeOwners = payloadNodeOwners(ctx.payload);
   const nodeReviewers = payloadNodeReviewers(ctx.payload);
@@ -234915,9 +234976,7 @@ function bugFixResolve(ctx) {
     artifactType: "diagnosis",
     title,
     brief,
-    // goal 用标题兜底：弹窗不再单列「工单目标」（实测无任何消费方读它、让用户填两遍纯属白填），
-    // 但字段本身在内核里有设计意图（workorderSpec 读它），故填上而非留空。
-    goal: title,
+    goal: workorderGoal(title, "\u4FEE\u590D\u300C", "\u300D\uFF0C\u9A8C\u8BC1\u6240\u62A5\u73B0\u8C61\u4E0D\u518D\u51FA\u73B0\u3002"),
     ...manager ? { manager } : {},
     acceptanceCriteria: ["\u6309\u63CF\u8FF0\u91CC\u7684\u590D\u73B0\u65B9\u5F0F\u9A8C\u8BC1\uFF1A\u6240\u62A5\u73B0\u8C61\u4E0D\u518D\u51FA\u73B0", "\u6539\u52A8\u6CA1\u6709\u660E\u663E\u6253\u574F\u76F4\u63A5\u76F8\u90BB\u7684\u8DEF\u5F84"],
     plan
@@ -234948,7 +235007,7 @@ function adoptExternalResolve(ctx) {
     artifactType: "research",
     title,
     brief,
-    goal: title,
+    goal: workorderGoal(title, "\u56F4\u7ED5\u300C", "\u300D\u501F\u9274\u5916\u90E8\u65B9\u6848\uFF0C\u5B8C\u6210\u843D\u5730\u5E76\u9A8C\u8BC1\u6548\u679C\u3002"),
     ...manager ? { manager } : {},
     acceptanceCriteria: [
       "\u843D\u5730\u65B9\u6848\u9010\u6761\u8BF4\u660E\u4E86\u4E3A\u4EC0\u4E48\u4E0D\u76F4\u63A5\u91C7\u7528\u5DF2\u77E5\u89E3\u6CD5\uFF0C\u5E76\u5199\u660E\u6211\u4EEC\u65B9\u6848\u7684\u4EE3\u4EF7",
@@ -234979,7 +235038,7 @@ function simpleTaskResolve(ctx) {
     artifactType: "research",
     title,
     brief,
-    goal: title,
+    goal: workorderGoal(title, "\u5B8C\u6210\u300C", "\u300D\uFF0C\u4EA4\u4ED8\u53D1\u8D77\u4EBA\u53EF\u76F4\u63A5\u4F7F\u7528\u7684\u7ED3\u679C\u3002"),
     ...manager ? { manager } : {},
     plan
   };
@@ -264088,7 +264147,8 @@ ${nodeFault}` : "");
     baseUrl: server.baseUrl,
     operatorToken,
     __coordinatorSpawnProbe: coordinatorSpawnProbe,
-    close: async () => {
+    /** @param opts.drainMs 优雅停机排空预算，原样透传给 HTTP 层（见 server.ts 的 close）。缺省 = 老行为。 */
+    close: async (opts2) => {
       for (const timer of dispatchTimers) clearInterval(timer);
       clearInterval(slaTimer);
       escalationDeliveryWorker.stop();
@@ -264107,7 +264167,7 @@ ${nodeFault}` : "");
       if (boardWatchTimer) clearInterval(boardWatchTimer);
       clearInterval(serverHeartbeatTimer);
       hub?.close();
-      await server.close();
+      await server.close(opts2 ?? {});
       if (pgPool) await pgPool.end().catch(() => {
       });
       releaseServeLock(lock);
@@ -268326,9 +268386,25 @@ async function runCli(argv, println = console.log, progressln = console.error) {
     println(`oasis serve \u5C31\u7EEA\uFF1Ahttp://0.0.0.0:${port2}\uFF08\u672C\u673A\u8BBF\u95EE\u7528 http://127.0.0.1:${port2}\uFF09`);
     println(`operator token \u5DF2\u5199\u5165 ${path35.join(dir, "operator-token")}\uFF08\u672C\u673A CLI \u81EA\u52A8\u8BFB\u53D6\uFF09`);
     if (flags.get("dispatch") === "true") println(`\u8C03\u5EA6\u5FAA\u73AF\u5DF2\u542F\u52A8\uFF08claude-code adapter\uFF09`);
-    await new Promise(() => {
+    const drainMs = Number(process.env["OASIS_SHUTDOWN_DRAIN_MS"] ?? "3000");
+    const shutdownBudgetMs = drainMs + 5e3;
+    await new Promise((resolve10) => {
+      let stopping = false;
+      const stop = (signal) => {
+        if (stopping) return;
+        stopping = true;
+        println(`[serve] \u6536\u5230 ${signal}\uFF0C\u5F00\u59CB\u4F18\u96C5\u505C\u673A\uFF08\u6392\u7A7A\u9884\u7B97 ${drainMs}ms\uFF09\u2026`);
+        const hardExit = setTimeout(() => {
+          println(`[serve] \u505C\u673A\u603B\u9884\u7B97 ${shutdownBudgetMs}ms \u7528\u5C3D\uFF0C\u5F3A\u5236\u9000\u51FA`);
+          process.exit(0);
+        }, shutdownBudgetMs);
+        hardExit.unref?.();
+        void handle.close({ drainMs }).then(() => println("[serve] \u5DF2\u4F18\u96C5\u505C\u673A")).catch((err) => println(`[serve] \u505C\u673A\u8FC7\u7A0B\u51FA\u9519\uFF08\u7167\u5E38\u9000\u51FA\uFF09\uFF1A${String(err)}`)).finally(() => resolve10());
+      };
+      process.once("SIGTERM", () => stop("SIGTERM"));
+      process.once("SIGINT", () => stop("SIGINT"));
     });
-    return;
+    process.exit(0);
   }
   const base = flags.get("server") ?? process.env["OASIS_SERVER"] ?? "http://127.0.0.1:7320";
   const tokenFile = path35.join(dir, "operator-token");
@@ -271356,7 +271432,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.13" : "dev";
+var PKG_VERSION = true ? "2.2.14" : "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.13",
+  "version": "2.2.14",
   "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": "b907ec1d1a0ae4a57e7eb938c477f05323b84590"
+    "sourceHead": "c6b9e871786ca57b2d1b01293c368ed043db700f"
   }
 }