mixdog 1.3.1 → 1.3.3

package/src/runtime/shared/transcript-metadata.mjs

@@ -53,6 +53,20 @@ export function normalizeMessageAttachments(value) {
   return out;
 }
 
+/**
+ * Who a user-kind row came from, as the row's own fields: the sender, the
+ * submitting device and the bot that sent it. One definition for the delivered
+ * steering row and the still-queued one, so both render the same.
+ */
+export function transcriptSourceFields(value) {
+  if (!value || typeof value !== 'object') return {};
+  return {
+    ...(typeof value.sender === 'string' && value.sender ? { sender: value.sender } : {}),
+    ...(typeof value.device === 'string' && value.device ? { device: value.device } : {}),
+    ...(typeof value.fromAgent === 'string' && value.fromAgent ? { fromAgent: value.fromAgent } : {}),
+  };
+}
+
 /** A new stable message id (`meta.transcript.messageId`). */
 export function newTranscriptMessageId() {
   return `msg_${globalThis.crypto.randomUUID().replaceAll('-', '')}`;
@@ -71,14 +85,19 @@ export function persistedUserTranscriptMetadata(value) {
     ...(typeof value.attemptId === 'string' && value.attemptId ? { attemptId: value.attemptId } : {}),
     ...(Number.isFinite(Number(value.at)) ? { at: Number(value.at) } : {}),
     ...transcriptRouteMetadataFields(value),
-    ...(typeof value.sender === 'string' && value.sender ? { sender: value.sender } : {}),
-    // The device that submitted the prompt (host-stamped display name).
-    ...(typeof value.device === 'string' && value.device ? { device: value.device } : {}),
+    // Sender, the submitting device (host-stamped display name) and the bot
+    // that sent this message to this session (agent-task-sessions.mjs).
+    ...transcriptSourceFields(value),
+    // Bot-to-bot chain position of a bot's message (session-runtime/bot-hops.mjs).
+    ...(Number.isInteger(value.hop) && value.hop > 0 ? { hop: value.hop } : {}),
     // The turn's change-record key (the outer prompt id), so a restored user
     // row still addresses its turn's Undo/Reapply.
     ...(typeof value.checkpointId === 'string' && value.checkpointId ? { checkpointId: value.checkpointId } : {}),
     // Every submission a merged queued batch delivered as this turn.
     ...submissionIdsField(value.submissionIds),
+    // The executions a woken batch delivered (session-flow/drain.mjs): the
+    // provenance a task session's report follows (agent-task-sessions.mjs).
+    ...consumedExecutionIdsField(value.consumedExecutionIds),
     ...attachmentsField(value.attachments),
     // A routine fire delivered as this turn (routine-trigger.mjs).
     ...routineTriggerField(value),
@@ -90,6 +109,12 @@ function submissionIdsField(value) {
   return ids.length ? { submissionIds: ids } : {};
 }
 
+// Positions are kept: a null stands for a delivered entry that named no execution.
+function consumedExecutionIdsField(value) {
+  if (!Array.isArray(value) || !value.length) return {};
+  return { consumedExecutionIds: value.map((id) => (typeof id === 'string' && id ? id : null)) };
+}
+
 function attachmentsField(value) {
   const attachments = normalizeMessageAttachments(value);
   return attachments.length ? { attachments } : {};

package/src/runtime/shared/transcript-writer/session-record.mjs

@@ -3,8 +3,7 @@
  * record that names this session's transcript for discovery, plus the
  * first-occurrence failure logger every transcript writer shares.
  */
-import { mkdirSync, writeFileSync } from 'node:fs';
-import { dirname } from 'node:path';
+import { writeJsonAtomicSync } from '../atomic-file.mjs';
 
 // Repeated-failure guard: log the first time each distinct message is seen,
 // then stay quiet so a persistently-broken path does not flood stderr.
@@ -27,10 +26,11 @@ export function createSessionRecord({ sessionRecordPath, sessionId, resolvedCwd,
 
   function write() {
     try {
-      mkdirSync(dirname(sessionRecordPath), { recursive: true });
-      writeFileSync(
+      // Published whole and flushed: a discovery reader never meets a torn or
+      // NUL record, and every refresh rewrites it anyway.
+      writeJsonAtomicSync(
         sessionRecordPath,
-        JSON.stringify({
+        {
           sessionId,
           cwd: resolvedCwd,
           transcriptPath,
@@ -38,7 +38,8 @@ export function createSessionRecord({ sessionRecordPath, sessionId, resolvedCwd,
           updatedAt: Date.now(),
           kind: 'interactive',
           entrypoint: 'cli',
-        })
+        },
+        { compact: true }
       );
     } catch (err) {
       logOnce(err);

package/src/runtime/shared/turn-snapshot-store.mjs

@@ -13,8 +13,9 @@
 // list is what lets a SHARED worktree still revert: the baseline describes the
 // whole tree, but only these paths may be restored from it.
 import { createHash } from 'node:crypto';
-import { mkdir, readFile, readdir, rename, rm, stat, writeFile } from 'node:fs/promises';
+import { mkdir, readFile, readdir, rm, stat } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
+import { writeFileAtomicAsync } from './atomic-file.mjs';
 import { cleanString as clean } from './clean.mjs';
 import { resolvePluginData } from './plugin-paths.mjs';
 
@@ -173,10 +174,10 @@ async function sweepRecords() {
   await sweepDirectory(recordRoot(), RECORD_TTL_MS, MAX_RECORD_FILES);
 }
 
+// Flushed before it is published: a crash must not leave a record that reads as
+// NUL (every reader below answers a damaged record as "no record").
 async function writeJsonAtomically(path, payload) {
-  const temporary = `${path}.${process.pid}.tmp`;
-  await writeFile(temporary, JSON.stringify(payload), 'utf8');
-  await rename(temporary, path);
+  await writeFileAtomicAsync(path, JSON.stringify(payload));
 }
 
 /**