@adhdev/daemon-core 0.9.82-rc.24 → 0.9.82-rc.26

package/dist/index.js

@@ -1514,18 +1514,20 @@ function requeueTask(meshId, taskId, opts) {
     return entry;
   });
 }
-function updateSessionTaskStatus(meshId, sessionId, status) {
+function updateSessionTaskStatus(meshId, sessionId, status, opts) {
   return withQueueLock(meshId, () => {
     const queue = readQueue(meshId);
+    const occurredAtTime = opts?.occurredAt ? new Date(opts.occurredAt).getTime() : Number.NaN;
+    const hasOccurredAt = Number.isFinite(occurredAtTime);
     let bestIdx = -1;
     let bestTime = 0;
     for (let i = queue.length - 1; i >= 0; i--) {
-      if (queue[i].assignedSessionId === sessionId && queue[i].status === "assigned") {
-        const time = new Date(queue[i].dispatchTimestamp || queue[i].updatedAt).getTime();
-        if (time > bestTime) {
-          bestTime = time;
-          bestIdx = i;
-        }
+      if (queue[i].assignedSessionId !== sessionId || queue[i].status !== "assigned") continue;
+      const time = new Date(queue[i].dispatchTimestamp || queue[i].updatedAt).getTime();
+      if (hasOccurredAt && Number.isFinite(time) && time > occurredAtTime) continue;
+      if (time > bestTime) {
+        bestTime = time;
+        bestIdx = i;
       }
     }
     if (bestIdx === -1) return null;
@@ -2051,6 +2053,38 @@ function shouldSuppressIntentionalCleanupStop(args) {
   if (isIntentionalCleanupStopMetadata(args.metadataEvent)) return true;
   return hasRecentIntentionalCleanupStop(args.meshId, args.sessionId, args.nodeId);
 }
+function readEventTimestamp(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string" && value.trim()) {
+    const numeric = Number(value);
+    if (Number.isFinite(numeric)) return numeric;
+    const parsed = Date.parse(value);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return null;
+}
+function buildMeshCompletionFingerprint(args) {
+  const timestampPart = Number.isFinite(args.timestamp) ? String(args.timestamp) : readNonEmptyString(args.finalSummary).slice(0, 200);
+  return [
+    args.meshId,
+    args.event,
+    args.sessionId,
+    args.providerType || "",
+    args.providerSessionId || "",
+    timestampPart
+  ].join("::");
+}
+function isDuplicateMeshCompletionEvent(args) {
+  const fingerprint = buildMeshCompletionFingerprint(args);
+  if (!fingerprint) return false;
+  const now = Date.now();
+  for (const [key, seenAt] of recentCompletionFingerprints.entries()) {
+    if (now - seenAt > RECENT_COMPLETION_FINGERPRINT_TTL_MS) recentCompletionFingerprints.delete(key);
+  }
+  if (recentCompletionFingerprints.has(fingerprint)) return true;
+  recentCompletionFingerprints.set(fingerprint, now);
+  return false;
+}
 function tryAssignQueueTask(components, meshId, nodeId, sessionId, providerType) {
   const task = claimNextTask(meshId, nodeId, sessionId);
   if (!task) {
@@ -2412,13 +2446,31 @@ function injectMeshSystemMessage(components, args) {
     LOG.info("MeshEvents", `Suppressed ${args.event} for intentionally cleanup-stopped session ${eventSessionId || "(unknown session)"}`);
     return { success: true, forwarded: 0, suppressed: true, intentionalCleanupStop: true };
   }
+  const eventTimestamp = readEventTimestamp(args.metadataEvent.timestamp);
+  if (args.event === "agent:generating_completed" && eventSessionId) {
+    const duplicateCompletion = isDuplicateMeshCompletionEvent({
+      meshId: args.meshId,
+      event: args.event,
+      sessionId: eventSessionId,
+      providerType: readNonEmptyString(args.metadataEvent.providerType) || void 0,
+      providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0,
+      timestamp: eventTimestamp,
+      finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || void 0
+    });
+    if (duplicateCompletion) {
+      LOG.info("MeshEvents", `Suppressed duplicate completion for mesh ${args.meshId} session ${eventSessionId}`);
+      return { success: true, forwarded: 0, suppressed: true, duplicateCompletion: true };
+    }
+  }
   let completedTaskForLedger = null;
   if (args.event === "agent:generating_completed") {
     const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
     const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
     const providerType = readNonEmptyString(args.metadataEvent.providerType);
     if (sessionId) {
-      const completedTask = updateSessionTaskStatus(args.meshId, sessionId, "completed");
+      const completedTask = updateSessionTaskStatus(args.meshId, sessionId, "completed", {
+        occurredAt: eventTimestamp !== null ? new Date(eventTimestamp).toISOString() : void 0
+      });
       completedTaskForLedger = completedTask ? { id: completedTask.id } : null;
       if (nodeId && providerType) {
         setImmediate(() => {
@@ -2632,6 +2684,7 @@ function handleMeshForwardEvent(components, payload) {
       providerType: readNonEmptyString(payload.providerType),
       providerSessionId: readNonEmptyString(payload.providerSessionId),
       finalSummary: readNonEmptyString(payload.finalSummary) || readNonEmptyString(payload.summary),
+      ...payload.timestamp !== void 0 ? { timestamp: payload.timestamp } : {},
       intentional: payload.intentional === true,
       intentionalStop: payload.intentionalStop === true,
       operatorCleanup: payload.operatorCleanup === true,
@@ -2674,7 +2727,7 @@ function setupMeshEventForwarding(components) {
     });
   });
 }
-var import_fs6, import_path5, REMOTE_IDLE_SESSION_TTL_MS, remoteIdleSessions, MESH_COORDINATOR_EVENTS, EVENT_TO_LEDGER_KIND, INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS;
+var import_fs6, import_path5, REMOTE_IDLE_SESSION_TTL_MS, remoteIdleSessions, MESH_COORDINATOR_EVENTS, EVENT_TO_LEDGER_KIND, INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS, RECENT_COMPLETION_FINGERPRINT_TTL_MS, recentCompletionFingerprints, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS;
 var init_mesh_events = __esm({
   "src/mesh/mesh-events.ts"() {
     "use strict";
@@ -2703,6 +2756,8 @@ var init_mesh_events = __esm({
       "monitor:long_generating": "task_stalled"
     };
     INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS = 30 * 60 * 1e3;
+    RECENT_COMPLETION_FINGERPRINT_TTL_MS = 10 * 60 * 1e3;
+    recentCompletionFingerprints = /* @__PURE__ */ new Map();
     autoLaunchInProgress = /* @__PURE__ */ new Set();
     autoLaunchCooldownUntil = /* @__PURE__ */ new Map();
     AUTO_LAUNCH_COOLDOWN_MS = 5e3;
@@ -24037,49 +24092,7 @@ function readGitSubmodules(value) {
   }).filter((entry) => entry !== null);
   return submodules.length > 0 ? submodules : void 0;
 }
-function buildCachedInlineMeshGitStatus(node) {
-  const cachedStatus = readObjectRecord(node?.cachedStatus);
-  const cachedGit = readObjectRecord(cachedStatus.git);
-  if (Object.keys(cachedGit).length) {
-    const conflictFiles2 = Array.isArray(cachedGit.conflictFiles) ? cachedGit.conflictFiles.filter((value) => typeof value === "string") : [];
-    const conflictCount2 = readNumberValue(cachedGit.conflicts) ?? conflictFiles2.length;
-    const hasConflicts2 = readBooleanValue(cachedGit.hasConflicts) ?? conflictCount2 > 0;
-    const isGitRepo2 = readBooleanValue(cachedGit.isGitRepo);
-    if (isGitRepo2 !== void 0) {
-      const submodules2 = readGitSubmodules(cachedGit.submodules);
-      return {
-        workspace: readStringValue(cachedGit.workspace, node?.workspace) || "",
-        repoRoot: readStringValue(cachedGit.repoRoot, node?.repoRoot, node?.workspace) || null,
-        isGitRepo: isGitRepo2,
-        branch: readStringValue(cachedGit.branch) ?? null,
-        headCommit: readStringValue(cachedGit.headCommit) ?? null,
-        headMessage: readStringValue(cachedGit.headMessage) ?? null,
-        upstream: readStringValue(cachedGit.upstream) ?? null,
-        ahead: readNumberValue(cachedGit.ahead) ?? 0,
-        behind: readNumberValue(cachedGit.behind) ?? 0,
-        staged: readNumberValue(cachedGit.staged) ?? 0,
-        modified: readNumberValue(cachedGit.modified) ?? 0,
-        untracked: readNumberValue(cachedGit.untracked) ?? 0,
-        deleted: readNumberValue(cachedGit.deleted) ?? 0,
-        renamed: readNumberValue(cachedGit.renamed) ?? 0,
-        hasConflicts: hasConflicts2,
-        conflictFiles: conflictFiles2,
-        stashCount: readNumberValue(cachedGit.stashCount) ?? 0,
-        lastCheckedAt: readNumberValue(cachedGit.lastCheckedAt) ?? Date.now(),
-        ...submodules2 ? { submodules: submodules2 } : {}
-      };
-    }
-  }
-  const rawGit = readObjectRecord(node?.lastGit ?? node?.last_git);
-  const gitResult = readObjectRecord(rawGit.result);
-  const directStatus = readObjectRecord(rawGit.status);
-  const nestedStatus = readObjectRecord(gitResult.status);
-  const rawProbe = readObjectRecord(node?.lastProbe ?? node?.last_probe);
-  const probeGit = readObjectRecord(rawProbe.git);
-  const probeGitResult = readObjectRecord(probeGit.result);
-  const probeDirectStatus = readObjectRecord(probeGit.status);
-  const probeNestedStatus = readObjectRecord(probeGitResult.status);
-  const status = Object.keys(directStatus).length ? directStatus : Object.keys(nestedStatus).length ? nestedStatus : Object.keys(probeDirectStatus).length ? probeDirectStatus : Object.keys(probeNestedStatus).length ? probeNestedStatus : {};
+function normalizeInlineMeshGitStatus(status, node, options) {
   const isGitRepo = readBooleanValue(status.isGitRepo);
   if (!Object.keys(status).length || isGitRepo === void 0) return void 0;
   const conflictFiles = Array.isArray(status.conflictFiles) ? status.conflictFiles.filter((value) => typeof value === "string") : [];
@@ -24104,10 +24117,31 @@ function buildCachedInlineMeshGitStatus(node) {
     hasConflicts,
     conflictFiles,
     stashCount: readNumberValue(status.stashCount) ?? 0,
-    lastCheckedAt: Date.now(),
+    lastCheckedAt: options?.lastCheckedAt ?? readNumberValue(status.lastCheckedAt) ?? Date.now(),
     ...submodules ? { submodules } : {}
   };
 }
+function buildInlineMeshTransitGitStatus(node) {
+  const rawGit = readObjectRecord(node?.lastGit ?? node?.last_git);
+  const gitResult = readObjectRecord(rawGit.result);
+  const directStatus = readObjectRecord(rawGit.status);
+  const nestedStatus = readObjectRecord(gitResult.status);
+  const rawProbe = readObjectRecord(node?.lastProbe ?? node?.last_probe);
+  const probeGit = readObjectRecord(rawProbe.git);
+  const probeGitResult = readObjectRecord(probeGit.result);
+  const probeDirectStatus = readObjectRecord(probeGit.status);
+  const probeNestedStatus = readObjectRecord(probeGitResult.status);
+  const status = Object.keys(directStatus).length ? directStatus : Object.keys(nestedStatus).length ? nestedStatus : Object.keys(probeDirectStatus).length ? probeDirectStatus : Object.keys(probeNestedStatus).length ? probeNestedStatus : {};
+  return normalizeInlineMeshGitStatus(status, node, { lastCheckedAt: Date.now() });
+}
+function buildCachedInlineMeshGitStatus(node) {
+  const liveGit = buildInlineMeshTransitGitStatus(node);
+  if (liveGit) return liveGit;
+  const cachedStatus = readObjectRecord(node?.cachedStatus);
+  const cachedGit = readObjectRecord(cachedStatus.git);
+  if (!Object.keys(cachedGit).length) return void 0;
+  return normalizeInlineMeshGitStatus(cachedGit, node);
+}
 function shouldDiscardCachedInlineMeshStatus(node) {
   const cachedStatus = readObjectRecord(node?.cachedStatus);
   if (!Object.keys(cachedStatus).length) return false;
@@ -24336,9 +24370,10 @@ function collectLiveMeshSessionRecords(args) {
 }
 function applyCachedInlineMeshNodeStatus(status, node) {
   const cachedStatus = readObjectRecord(node?.cachedStatus);
-  const git = buildCachedInlineMeshGitStatus(node);
-  const error = readStringValue(cachedStatus.error, node?.error);
-  const health = readStringValue(cachedStatus.health, node?.health);
+  const liveGit = buildInlineMeshTransitGitStatus(node);
+  const git = liveGit ?? buildCachedInlineMeshGitStatus(node);
+  const error = liveGit ? void 0 : readStringValue(cachedStatus.error, node?.error);
+  const health = liveGit ? void 0 : readStringValue(cachedStatus.health, node?.health);
   const machineStatus = readStringValue(cachedStatus.machineStatus, node?.machineStatus);
   const lastSeenAt = toIsoTimestamp(cachedStatus.lastSeenAt ?? cachedStatus.last_seen_at ?? node?.lastSeenAt ?? node?.last_seen_at);
   const updatedAt = toIsoTimestamp(cachedStatus.updatedAt ?? cachedStatus.updated_at ?? node?.updatedAt ?? node?.updated_at);