mixdog 1.1.2 → 1.2.1

package/src/runtime/agent/orchestrator/session/store/summary-cache.mjs

@@ -11,6 +11,9 @@ import {
   _removeSessionSummary,
   _pruneSummaryIndexIds,
 } from '../store-summary-index.mjs';
+// In the daemon, ids whose file a write just changed are hinted to the
+// session catalog DB (a no-op in any other process).
+import { hintSessionCatalogStorage } from '../catalog-db/index.mjs';
 
 // Listing is much hotter than writing, especially while the desktop session
 // browser is open. Keep the compact sidecar in memory after the first read;
@@ -142,16 +145,19 @@ export function _queueSessionSummaryUpsertRow(row, version = null) {
     _invalidateSummaryRowsView();
   }
   _upsertSessionSummaryRow(durableRow);
+  hintSessionCatalogStorage([row.id]);
 }
 
 export function _queueSessionSummaryRemoval(id) {
   _uncacheSessionSummary(id);
   _removeSessionSummary(id);
+  hintSessionCatalogStorage([id]);
 }
 
 export function _queueSummaryIndexPrune(ids) {
   for (const id of ids) _uncacheSessionSummary(id);
   _pruneSummaryIndexIds(ids);
+  hintSessionCatalogStorage(ids);
 }
 
 // ── Incremental storage scan ────────────────────────────────────────────────

package/src/runtime/agent/orchestrator/session/store/sweep/sweep-finish.mjs

@@ -6,6 +6,7 @@ import { join } from 'node:path';
 import { probePath, PROBE_PRESENT, PROBE_ABSENT } from '../fs-probe.mjs';
 import { _queueSummaryIndexPrune } from '../summary-cache.mjs';
 import { deleteSession } from '../session-delete.mjs';
+import { COMPACTION_ARCHIVE_SUFFIX } from '../../compaction-archive.mjs';
 
 /** Retention cap: prune resumable open (non-tombstone) sessions newest-first
  *  — keep the most recent openMaxCount, prune anything older than openMaxAgeMs
@@ -47,18 +48,24 @@ export function pruneOpenCandidates({ plan, now, tally }) {
   }
 }
 
-/** Orphan .hb/.own reap: a heartbeat/presence sidecar whose .json no longer
+/** Orphan .hb/.own/compaction-archive reap: a sidecar whose .json no longer
  *  exists is dead weight once it is also stale (older than maxAge) — the
  *  session JSON was swept/closed but the sidecar lingered (crashed owner or
  *  pre-fix orphan). The staleness gate avoids nuking the sidecar of a session
  *  mid-create whose .json write has not landed yet. Yields between sidecars
  *  like the row loop. */
 export function* reapOrphanSidecars({ plan, dir, now, tally }) {
+  const recordOf = (sidecar) =>
+    sidecar.endsWith(COMPACTION_ARCHIVE_SUFFIX)
+      ? `${sidecar.slice(0, -COMPACTION_ARCHIVE_SUFFIX.length)}.json`
+      : sidecar.replace(/\.(hb|own)$/, '.json');
   try {
-    for (const h of readdirSync(dir).filter((f) => f.endsWith('.hb') || f.endsWith('.own'))) {
+    for (const h of readdirSync(dir).filter(
+      (f) => f.endsWith('.hb') || f.endsWith('.own') || f.endsWith(COMPACTION_ARCHIVE_SUFFIX)
+    )) {
       yield undefined;
       // Only a PROVEN-absent session file makes its sidecar an orphan.
-      if (probePath(join(dir, h.replace(/\.(hb|own)$/, '.json'))).state !== PROBE_ABSENT) continue;
+      if (probePath(join(dir, recordOf(h))).state !== PROBE_ABSENT) continue;
       const sidecarProbe = probePath(join(dir, h));
       if (sidecarProbe.state !== PROBE_PRESENT) continue;
       if (now - sidecarProbe.mtimeMs > plan.maxAge) {

package/src/runtime/agent/orchestrator/session/store-agent-worker-rows.mjs

@@ -27,6 +27,7 @@ import {
   storedLeadWorkerIndexPath,
 } from './store-summary-locations.mjs';
 import { cleanValue, isStoredSessionId, positiveNumber } from './store-summary-fields.mjs';
+import { sessionUsageTotals } from '../../../shared/session-usage-totals.mjs';
 
 const DEAD_AGENT_STATUS =
   /^(?:done|complete|completed|success|closed|error|fail|failed|cancelled|canceled|killed|timeout)$/i;
@@ -223,6 +224,7 @@ const WORKER_HEADER_FIELDS = [
   'model',
   'effort',
   'fast',
+  'autoEffort',
   'createdAt',
   'updatedAt',
   'cwd',
@@ -234,6 +236,9 @@ const WORKER_HEADER_FIELDS = [
   'startedAt',
   'cancelledAt',
   'finishedAt',
+  'totalInputTokens',
+  'totalOutputTokens',
+  'totalToolCalls',
   ...SESSION_CANCEL_FIELDS,
 ];
 
@@ -321,6 +326,7 @@ function projectChildWorkerRow(row, { now, heartbeatMtimes }) {
     model: cleanValue(row.model || session?.model) || null,
     effort: cleanValue(row.effort || session?.effort) || null,
     fast: row.fast === true || session?.fast === true,
+    ...(row.autoEffort === false || session?.autoEffort === false ? { autoEffort: false } : {}),
     status: declaredWorking && !working ? 'unknown' : declaredStatus,
     stage: declaredWorking && !working ? 'unknown' : declaredStage,
     // A live turn blocked on the user's approval (persisted by the agent
@@ -335,6 +341,7 @@ function projectChildWorkerRow(row, { now, heartbeatMtimes }) {
     cwd: cleanValue(row.cwd || session?.cwd) || null,
     clientHostPid: positiveNumber(row.clientHostPid || session?.clientHostPid, 0) || null,
     taskId: cleanValue(row.task_id || row.taskId) || null,
+    ...sessionUsageTotals(session),
   };
 }
 
@@ -356,6 +363,7 @@ function sidecarWorkerRow(
     model: cleanValue(session?.model) || current.model || null,
     effort: cleanValue(session?.effort) || current.effort || null,
     fast: session?.fast === true || current.fast === true,
+    ...(session?.autoEffort === false || current.autoEffort === false ? { autoEffort: false } : {}),
     status,
     stage: status,
     startedAt: session?.createdAt || current.startedAt || heartbeatAt,
@@ -365,6 +373,7 @@ function sidecarWorkerRow(
     cwd: cleanValue(session?.cwd) || current.cwd || null,
     clientHostPid: positiveNumber(session?.clientHostPid, 0) || current.clientHostPid || null,
     taskId: cleanValue(session?.task_id || session?.taskId) || current.taskId || null,
+    ...sessionUsageTotals(session),
   };
 }
 
@@ -458,6 +467,7 @@ function projectLeadWorkerRow(row, { now, heartbeatMtimes }) {
     model: cleanValue(row.model) || null,
     effort: cleanValue(row.effort) || null,
     fast: row.fast === true,
+    ...(row.autoEffort === false ? { autoEffort: false } : {}),
     status: shownStatus,
     stage: shownStatus,
     startedAt: row.startedAt || row.createdAt || null,
@@ -468,6 +478,7 @@ function projectLeadWorkerRow(row, { now, heartbeatMtimes }) {
     cwd: cleanValue(row.cwd) || null,
     clientHostPid: positiveNumber(row.clientHostPid, 0) || null,
     taskId: cleanValue(row.task_id || row.taskId) || null,
+    ...sessionUsageTotals(readWorkerSessionHeader(sessionId)),
   };
 }