oasis_test 0.1.57 → 0.1.58

package/dist/index.js

@@ -42596,7 +42596,7 @@ function latestIso(values) {
 function journalIdentity(entry) {
   return entry.sessionId ?? entry.dispatchId;
 }
-function executionMetrics(journal, artifactIds, resolveActor, nowMs) {
+function executionMetrics(journal, artifactIds, resolveActor, durationBounds) {
   const sessions = /* @__PURE__ */ new Map();
   const activeByJob = /* @__PURE__ */ new Map();
   let fallbackSeq = 0;
@@ -42632,27 +42632,64 @@ function executionMetrics(journal, artifactIds, resolveActor, nowMs) {
         artifactId: entry.artifactId,
         actor: entry.actor,
         startedAt: previous?.startedAt,
+        endedAt: entry.at,
         durationMs: entry.durationMs,
         failed: !entry.progressed
       });
       activeByJob.delete(entry.jobKey);
     }
   }
+  const createdMs = durationBounds.createdAt ? Date.parse(durationBounds.createdAt) : Number.NaN;
+  const finishedMs = durationBounds.latestExecutionFinishedAt ? Date.parse(durationBounds.latestExecutionFinishedAt) : Number.NaN;
+  const completedIntervals = [];
   const actorTotals = /* @__PURE__ */ new Map();
-  let executionDurationMs = 0;
   let executionFailures = 0;
   for (const session of sessions.values()) {
-    const started = session.startedAt ? Date.parse(session.startedAt) : Number.NaN;
-    const duration3 = session.durationMs ?? (Number.isFinite(started) ? Math.max(0, nowMs - started) : 0);
-    executionDurationMs += duration3;
+    const ended = session.endedAt ? Date.parse(session.endedAt) : Number.NaN;
+    const reportedDuration = session.durationMs;
+    const observedStarted = session.startedAt ? Date.parse(session.startedAt) : Number.NaN;
+    const inferredStarted = Number.isFinite(ended) && reportedDuration !== void 0 && Number.isFinite(reportedDuration) ? ended - Math.max(0, reportedDuration) : Number.NaN;
+    const started = Number.isFinite(inferredStarted) ? inferredStarted : observedStarted;
+    const interval = Number.isFinite(started) && Number.isFinite(ended) ? {
+      startMs: Number.isFinite(createdMs) ? Math.max(started, createdMs) : started,
+      endMs: Number.isFinite(finishedMs) ? Math.min(ended, finishedMs) : ended
+    } : null;
+    if (interval && interval.endMs > interval.startMs) completedIntervals.push(interval);
     if (session.failed) executionFailures += 1;
-    const current = actorTotals.get(session.actor) ?? { sessionCount: 0, executionDurationMs: 0 };
+    const current = actorTotals.get(session.actor) ?? { sessionCount: 0, intervals: [] };
     current.sessionCount += 1;
-    current.executionDurationMs += duration3;
+    if (interval && interval.endMs > interval.startMs) current.intervals.push(interval);
     actorTotals.set(session.actor, current);
   }
-  const byActor = [...actorTotals.entries()].map(([actor, totals]) => ({ actor: ref(actor, resolveActor), ...totals })).sort((a, b2) => b2.executionDurationMs - a.executionDurationMs || a.actor.id.localeCompare(b2.actor.id));
-  return { sessionCount: sessions.size, executionDurationMs, byActor, executionFailures };
+  const byActor = [...actorTotals.entries()].map(([actor, totals]) => ({
+    actor: ref(actor, resolveActor),
+    sessionCount: totals.sessionCount,
+    executionDurationMs: mergedIntervalDuration(totals.intervals)
+  })).sort((a, b2) => b2.executionDurationMs - a.executionDurationMs || a.actor.id.localeCompare(b2.actor.id));
+  return {
+    sessionCount: sessions.size,
+    executionDurationMs: mergedIntervalDuration(completedIntervals),
+    byActor,
+    executionFailures
+  };
+}
+function mergedIntervalDuration(intervals) {
+  const ordered = [...intervals].sort((a, b2) => a.startMs - b2.startMs || a.endMs - b2.endMs);
+  let total = 0;
+  let open2 = null;
+  for (const interval of ordered) {
+    if (!open2) {
+      open2 = { ...interval };
+      continue;
+    }
+    if (interval.startMs <= open2.endMs) {
+      open2.endMs = Math.max(open2.endMs, interval.endMs);
+      continue;
+    }
+    total += open2.endMs - open2.startMs;
+    open2 = { ...interval };
+  }
+  return open2 ? total + open2.endMs - open2.startMs : total;
 }
 function workorderDuration(ops, journal, artifactIds) {
   const createdAt = earliestIso(
@@ -42685,22 +42722,22 @@ function reportedGapCount(model, artifactIds) {
   return total;
 }
 function buildWorkorderMetrics(input) {
-  const nowMs = input.nowMs ?? Date.now();
   return input.workorders.map((workorder) => {
     const artifactIds = new Set(
       [...input.model.artifacts.values()].filter((artifact) => artifact.workspace === workorder.id).map((artifact) => artifact.id)
     );
-    const execution = executionMetrics(input.dispatchJournal, artifactIds, input.resolveActor, nowMs);
+    const duration3 = workorderDuration(
+      input.opsByWorkorder?.get(workorder.id) ?? [],
+      input.dispatchJournal,
+      artifactIds
+    );
+    const execution = executionMetrics(input.dispatchJournal, artifactIds, input.resolveActor, duration3);
     const reportedGaps = reportedGapCount(input.model, artifactIds);
     return {
       workorder,
       sessionCount: execution.sessionCount,
       executionDurationMs: execution.executionDurationMs,
-      workorderDuration: workorderDuration(
-        input.opsByWorkorder?.get(workorder.id) ?? [],
-        input.dispatchJournal,
-        artifactIds
-      ),
+      workorderDuration: duration3,
       byActor: execution.byActor,
       firstReviewPassRate: firstReviewPassRate(input.model, artifactIds),
       qualityMetrics: qualitySnapshot(input.nodeOutputsByWorkorder?.get(workorder.id) ?? []),
@@ -58453,6 +58490,7 @@ function log2(tag, msg, extra) {
 var RECONNECT_DELAY_MS = 3e3;
 var PING_INTERVAL_MS = 2e4;
 var SILENCE_TIMEOUT_MS = 6e4;
+var HANDSHAKE_TIMEOUT_MS = 15e3;
 var OUTBOX_TTL_MS = 5 * 6e4;
 var OUTBOX_MAX = 500;
 async function preflightOasisAccess(job) {
@@ -58485,6 +58523,7 @@ var DaemonWsClient = class {
     this.pingIntervalMs = opts.pingIntervalMs ?? PING_INTERVAL_MS;
     this.silenceTimeoutMs = opts.silenceTimeoutMs ?? SILENCE_TIMEOUT_MS;
     this.reconnectDelayMs = opts.reconnectDelayMs ?? RECONNECT_DELAY_MS;
+    this.handshakeTimeoutMs = opts.handshakeTimeoutMs ?? HANDSHAKE_TIMEOUT_MS;
     this.outboxMax = opts.outboxMaxFrames ?? OUTBOX_MAX;
   }
   ws = null;
@@ -58505,6 +58544,7 @@ var DaemonWsClient = class {
   pingIntervalMs;
   silenceTimeoutMs;
   reconnectDelayMs;
+  handshakeTimeoutMs;
   outboxMax;
   /** 未确认关键帧数（观测/测试用）。 */
   outboxSize() {
@@ -58525,7 +58565,9 @@ var DaemonWsClient = class {
         "x-daemon-id": this.daemonId,
         // 经公网网关时鉴权靠它（对齐 multica：Authorization 头反代天然透传）；内网直连可空
         ...this.token ? { authorization: `Bearer ${this.token}` } : {}
-      }
+      },
+      // 握手超时兜底：黑洞化的重连不会永久悬挂（见 HANDSHAKE_TIMEOUT_MS）。
+      handshakeTimeout: this.handshakeTimeoutMs
     });
     this.ws = ws;
     ws.on("open", () => {
@@ -58538,7 +58580,7 @@ var DaemonWsClient = class {
         this.send({ type: "pong" });
         if (Date.now() - this.lastReceivedAt > this.silenceTimeoutMs) {
           log2("[node-cli]", `server silent for ${this.silenceTimeoutMs}ms \u2014 forcing reconnect`);
-          this.ws?.close();
+          this.ws?.terminate();
         }
       }, this.pingIntervalMs);
     });
@@ -60445,7 +60487,7 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.57" : "dev";
+var PKG_VERSION = true ? "0.1.58" : "dev";
 var OASIS_DIR = path18.join(os9.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.57",
+  "version": "0.1.58",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -24,5 +24,8 @@
   },
   "engines": {
     "node": ">=20"
+  },
+  "oasisRelease": {
+    "sourceHead": "16401a67b91c8bdee7aceeb22ad9fc4ccf9de76c"
   }
 }