@basou/cli 0.41.0 → 0.42.1

package/dist/program.js

@@ -12,6 +12,7 @@ import {
   appendChainedEventLocked,
   assertBasouRootSafe,
   basouPaths,
+  EVENT_SCHEMA_VERSION,
   enumerateApprovals,
   findErrorCode,
   isLazyExpired,
@@ -101,6 +102,18 @@ function printReplayWarning(warning, sessionId) {
         `Warning: skipped invalid event at line ${warning.line} in ${short}/events.jsonl`
       );
       break;
+    case "retired_zero_duration":
+      console.error(
+        `Warning: kept an event with duration_ms: 0 at line ${warning.line} in ${short}/events.jsonl \u2014 no writer at that schema_version emits one; reading it as unobserved`
+      );
+      break;
+    default: {
+      const unhandled = warning;
+      console.error(
+        `Warning: unhandled replay warning in ${short}/events.jsonl: ${String(unhandled.kind)}`
+      );
+      break;
+    }
   }
 }
 function printSessionSkip(sid, reason) {
@@ -352,7 +365,7 @@ async function doRunApprovalResolve(idInput, options, ctx, decision) {
     if (decision === "approve") {
       const note = options.note ?? null;
       await appendChainedEventLocked(paths, approval.session_id, {
-        schema_version: "0.1.0",
+        schema_version: EVENT_SCHEMA_VERSION,
         id: eventId,
         session_id: approval.session_id,
         occurred_at: occurredAt,
@@ -365,7 +378,7 @@ async function doRunApprovalResolve(idInput, options, ctx, decision) {
     } else {
       const reason = options.reason;
       await appendChainedEventLocked(paths, approval.session_id, {
-        schema_version: "0.1.0",
+        schema_version: EVENT_SCHEMA_VERSION,
         id: eventId,
         session_id: approval.session_id,
         occurred_at: occurredAt,
@@ -851,6 +864,7 @@ import {
   basouPaths as basouPaths3,
   classifyFilesBySourceRoot,
   createAdHocSessionWithEvent,
+  EVENT_SCHEMA_VERSION as EVENT_SCHEMA_VERSION2,
   findErrorCode as findErrorCode2,
   isValidPrefixedId,
   loadSessionEntries,
@@ -1135,6 +1149,15 @@ async function warnLinkedFilesOutsideRoots(input) {
   } catch {
   }
 }
+var TRACK_MARKER_IN_TITLE = /^\s*track\s*[:\uff1a]|[[(\uff08\uff3b\u3010]\s*track\s*[\])\uff09\uff3d\u3011]/i;
+function warnTrackMarkerWithoutKind(decisions, markerWithoutKind) {
+  for (const index of markerWithoutKind) {
+    const title = (decisions[index]?.title ?? "").trim();
+    console.error(
+      `basou: decision[${index}] title carries a track marker (${title.slice(0, 40)}) but "kind" is absent \u2014 it is recorded as a point-in-time decision and will NOT resurface in orient. Set "kind": "track" to open a track, or "kind": "decision" to say the marker is part of the title.`
+    );
+  }
+}
 async function doRunDecisionRecord(options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
   const repositoryRoot = await resolveRepositoryRootForDecision(cwd);
@@ -1232,7 +1255,8 @@ async function doRunDecisionCapture(options, ctx) {
   const paths = basouPaths3(repositoryRoot);
   await assertWorkspaceInitialized2(paths.root);
   const raw = await readCaptureInput(options, ctx);
-  const decisions = parseCaptureInput(raw);
+  const { decisions, markerWithoutKind } = parseCaptureInput(raw);
+  warnTrackMarkerWithoutKind(decisions, markerWithoutKind);
   await warnLinkedFilesOutsideRoots({
     linkedFiles: decisions.flatMap((d) => d.linked_files ?? []),
     cwd,
@@ -1400,7 +1424,7 @@ async function decisionExists(paths, decisionId) {
 }
 function buildDecisionVoidedEvent(input) {
   return {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION2,
     id: input.eventId,
     session_id: input.sessionId,
     occurred_at: input.occurredAt,
@@ -1493,7 +1517,14 @@ function parseCaptureInput(raw) {
   if (parsed.length === 0) {
     throw new Error("Input array must contain at least one decision.");
   }
-  return parsed.map((item, index) => validateCaptureItem(item, index));
+  const decisions = [];
+  const markerWithoutKind = [];
+  parsed.forEach((item, index) => {
+    const { input, kindWasPresent } = validateCaptureItem(item, index);
+    decisions.push(input);
+    if (!kindWasPresent && TRACK_MARKER_IN_TITLE.test(input.title)) markerWithoutKind.push(index);
+  });
+  return { decisions, markerWithoutKind };
 }
 function validateCaptureItem(item, index) {
   if (typeof item !== "object" || item === null || Array.isArray(item)) {
@@ -1554,7 +1585,7 @@ function validateCaptureItem(item, index) {
       }
     });
   }
-  return out;
+  return { input: out, kindWasPresent: obj.kind !== void 0 };
 }
 function requireNonEmptyString(value, index, field) {
   if (typeof value !== "string" || isBlank(value)) {
@@ -1605,6 +1636,9 @@ function captureItemToPayload(item) {
   if (item.input.kind !== void 0) payload.kind = item.input.kind;
   return payload;
 }
+function kindMarker(kind) {
+  return kind === "track" ? " [TRACK]" : " [DECISION]";
+}
 function printCapturePreview(options, decisions) {
   if (options.json === true) {
     console.log(JSON.stringify({ dry_run: true, count: decisions.length, decisions }));
@@ -1614,7 +1648,7 @@ function printCapturePreview(options, decisions) {
     `Would capture ${decisions.length} decision${decisions.length === 1 ? "" : "s"} (dry run; nothing written):`
   );
   for (const decision of decisions) {
-    console.log(`- ${decision.title}${decision.kind === "track" ? " [TRACK]" : ""}`);
+    console.log(`- ${decision.title}${kindMarker(decision.kind)}`);
   }
 }
 function printCaptureResult(options, result) {
@@ -1635,9 +1669,7 @@ function printCaptureResult(options, result) {
     `Captured ${result.items.length} decision${result.items.length === 1 ? "" : "s"} in ad-hoc session ${sid}:`
   );
   for (const item of result.items) {
-    console.log(
-      `- ${item.decisionId}: ${item.input.title}${item.input.kind === "track" ? " [TRACK]" : ""}`
-    );
+    console.log(`- ${item.decisionId}: ${item.input.title}${kindMarker(item.input.kind)}`);
   }
 }
 function pickRichFields(options) {
@@ -1658,7 +1690,7 @@ function pickRichFields(options) {
 }
 function buildDecisionEvent(input) {
   return {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION2,
     id: input.eventId,
     session_id: input.sessionId,
     occurred_at: input.occurredAt,
@@ -1855,6 +1887,7 @@ import {
   basouPaths as basouPaths5,
   ChildProcessRunner,
   appendChainedEvent as coreAppendChainedEvent,
+  EVENT_SCHEMA_VERSION as EVENT_SCHEMA_VERSION3,
   finalizeSessionYaml,
   getSnapshot,
   overwriteYamlFile,
@@ -1865,6 +1898,7 @@ import {
   resolveRepositoryRoot as resolveRepositoryRoot4,
   SessionSchema,
   sanitizeWorkingDirectory,
+  writeObservedDuration,
   writeYamlFile
 } from "@basou/core";
 function registerExecCommand(program) {
@@ -1905,7 +1939,7 @@ async function runExec(command, args, options, ctx = {}) {
   });
   await writeYamlFile(sessionYamlPath, session);
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION3,
     type: "session_started",
     id: prefixedUlid3("evt"),
     session_id: sessionId,
@@ -1917,7 +1951,7 @@ async function runExec(command, args, options, ctx = {}) {
   }
   const runningAt = now().toISOString();
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION3,
     type: "session_status_changed",
     id: prefixedUlid3("evt"),
     session_id: sessionId,
@@ -1986,7 +2020,7 @@ async function runExec(command, args, options, ctx = {}) {
   }
   const endedAt = now().toISOString();
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION3,
     type: "command_executed",
     id: prefixedUlid3("evt"),
     session_id: sessionId,
@@ -1998,14 +2032,21 @@ async function runExec(command, args, options, ctx = {}) {
     exit_code: result.exit_code,
     ...result.signal !== null ? { signal: result.signal } : {},
     ...signalReceived !== null ? { received_signal: signalReceived } : {},
-    duration_ms: result.duration_ms
+    // Reached only when the child actually ran, and the runner times it on a
+    // monotonic sub-millisecond clock, so the cheapest spawn on this host
+    // (`/usr/bin/true`, median 0.83ms) still rounds to 1ms. A non-positive
+    // value therefore means the measurement is unusable, not that the command
+    // was instant, and is recorded as unobserved. A spawn that never ran
+    // (ENOENT) does not reach this line at all: the runner rejects and
+    // `finalizeSessionAsFailed` writes its own null.
+    duration_ms: writeObservedDuration(result.duration_ms)
   });
   if (options.snapshot !== false) {
     await tryAppendGitSnapshot(sessionDir, sessionId, repoRoot, now, appendEvent);
   }
   const finalStatus = decideFinalStatus(result, signalReceived);
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION3,
     type: "session_status_changed",
     id: prefixedUlid3("evt"),
     session_id: sessionId,
@@ -2015,7 +2056,7 @@ async function runExec(command, args, options, ctx = {}) {
     to: finalStatus
   });
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION3,
     type: "session_ended",
     id: prefixedUlid3("evt"),
     session_id: sessionId,
@@ -2062,7 +2103,7 @@ async function tryAppendGitSnapshot(sessionDir, sessionId, repoRoot, now, append
     return;
   }
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION3,
     type: "git_snapshot",
     id: prefixedUlid3("evt"),
     session_id: sessionId,
@@ -2119,7 +2160,7 @@ async function mutateSessionYaml(filePath, mutator) {
 }
 async function finalizeSessionAsFailed(paths, sessionDir, sessionId, appendEvent, ctx) {
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION3,
     type: "command_executed",
     id: prefixedUlid3("evt"),
     session_id: sessionId,
@@ -2131,10 +2172,12 @@ async function finalizeSessionAsFailed(paths, sessionDir, sessionId, appendEvent
     exit_code: null,
     signal: null,
     ...ctx.signalReceived !== null ? { received_signal: ctx.signalReceived } : {},
-    duration_ms: 0
+    // Not observed: this event stands in for a run that ended before a duration
+    // could be measured, so 0 would claim a measured zero.
+    duration_ms: null
   });
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION3,
     type: "session_status_changed",
     id: prefixedUlid3("evt"),
     session_id: sessionId,
@@ -2144,7 +2187,7 @@ async function finalizeSessionAsFailed(paths, sessionDir, sessionId, appendEvent
     to: "failed"
   });
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION3,
     type: "session_ended",
     id: prefixedUlid3("evt"),
     session_id: sessionId,
@@ -2609,6 +2652,7 @@ import {
   readSessionYaml as readSessionYaml2,
   reimportPreservingId,
   resolveRepositoryRoot as resolveRepositoryRoot6,
+  SESSION_IMPORT_SCHEMA_VERSION,
   SessionImportPayloadSchema
 } from "@basou/core";
 var SES_PREFIX2 = "ses_";
@@ -2796,7 +2840,7 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
     if (!parsed.success) {
       throw new Error("Invalid import payload", { cause: parsed.error });
     }
-    if (parsed.data.schema_version !== "0.1.0") {
+    if (parsed.data.schema_version !== SESSION_IMPORT_SCHEMA_VERSION) {
       throw new Error(`Unsupported import schema_version: ${parsed.data.schema_version}`);
     }
     return parsed.data;
@@ -4223,6 +4267,7 @@ import {
   assertBasouRootSafe as assertBasouRootSafe8,
   basouPaths as basouPaths9,
   createAdHocSessionWithEvent as createAdHocSessionWithEvent2,
+  EVENT_SCHEMA_VERSION as EVENT_SCHEMA_VERSION4,
   findErrorCode as findErrorCode7,
   readManifest as readManifest5,
   resolveSessionId as resolveSessionId2
@@ -4327,7 +4372,7 @@ async function doRunNote(body, options, ctx) {
 }
 function buildNoteEvent(input) {
   return {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION4,
     id: input.eventId,
     session_id: input.sessionId,
     occurred_at: input.occurredAt,
@@ -8844,6 +8889,7 @@ import {
   claudeCodeAdapterMetadata,
   codexAdapterMetadata,
   appendChainedEvent as coreAppendChainedEvent2,
+  EVENT_SCHEMA_VERSION as EVENT_SCHEMA_VERSION5,
   finalizeSessionYaml as finalizeSessionYaml2,
   findBasouSessionStartHook as findBasouSessionStartHook2,
   getDiff,
@@ -8858,6 +8904,7 @@ import {
   SessionSchema as SessionSchema2,
   sanitizeRelatedFiles,
   sanitizeWorkingDirectory as sanitizeWorkingDirectory2,
+  writeObservedDuration as writeObservedDuration2,
   writeYamlFile as writeYamlFile2
 } from "@basou/core";
 function registerRunCommand(program, ctx = {}) {
@@ -8930,7 +8977,7 @@ async function runTrackedTool(args, options, ctx, adapter) {
   });
   await writeYamlFile2(sessionYamlPath, session);
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION5,
     type: "session_started",
     id: prefixedUlid4("evt"),
     session_id: sessionId,
@@ -8943,7 +8990,7 @@ async function runTrackedTool(args, options, ctx, adapter) {
   }
   const runningAt = now().toISOString();
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION5,
     type: "session_status_changed",
     id: prefixedUlid4("evt"),
     session_id: sessionId,
@@ -9016,7 +9063,7 @@ async function runTrackedTool(args, options, ctx, adapter) {
   }
   const endedAt = now().toISOString();
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION5,
     type: "command_executed",
     id: prefixedUlid4("evt"),
     session_id: sessionId,
@@ -9028,7 +9075,14 @@ async function runTrackedTool(args, options, ctx, adapter) {
     exit_code: result.exit_code,
     ...result.signal !== null ? { signal: result.signal } : {},
     ...signalReceived !== null ? { received_signal: signalReceived } : {},
-    duration_ms: result.duration_ms
+    // Reached only when the child actually ran, and the runner times it on a
+    // monotonic sub-millisecond clock, so the cheapest spawn on this host
+    // (`/usr/bin/true`, median 0.83ms) still rounds to 1ms. A non-positive
+    // value therefore means the measurement is unusable, not that the command
+    // was instant, and is recorded as unobserved. A spawn that never ran
+    // (ENOENT) does not reach this line at all: the runner rejects and
+    // `finalizeSessionAsFailed` writes its own null.
+    duration_ms: writeObservedDuration2(result.duration_ms)
   });
   let postSnapshot = null;
   if (options.snapshot !== false) {
@@ -9054,7 +9108,7 @@ async function runTrackedTool(args, options, ctx, adapter) {
   }).sanitized;
   const finalStatus = decideFinalStatus2(result, signalReceived);
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION5,
     type: "session_status_changed",
     id: prefixedUlid4("evt"),
     session_id: sessionId,
@@ -9064,7 +9118,7 @@ async function runTrackedTool(args, options, ctx, adapter) {
     to: finalStatus
   });
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION5,
     type: "session_ended",
     id: prefixedUlid4("evt"),
     session_id: sessionId,
@@ -9110,7 +9164,7 @@ async function tryAppendGitSnapshot2(sessionDir, sessionId, repoRoot, now, appen
     return null;
   }
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION5,
     type: "git_snapshot",
     id: prefixedUlid4("evt"),
     session_id: sessionId,
@@ -9130,7 +9184,7 @@ async function tryAppendFileChangedEvents(sessionDir, sessionId, repoRoot, baseR
   }
   for (const change of diff.changed_files) {
     await appendEvent(sessionDir, {
-      schema_version: "0.1.0",
+      schema_version: EVENT_SCHEMA_VERSION5,
       type: "file_changed",
       id: prefixedUlid4("evt"),
       session_id: sessionId,
@@ -9214,7 +9268,7 @@ async function mutateSessionYaml2(filePath, mutator) {
 }
 async function finalizeSessionAsFailed2(paths, sessionDir, sessionId, appendEvent, ctx) {
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION5,
     type: "command_executed",
     id: prefixedUlid4("evt"),
     session_id: sessionId,
@@ -9226,10 +9280,12 @@ async function finalizeSessionAsFailed2(paths, sessionDir, sessionId, appendEven
     exit_code: null,
     signal: null,
     ...ctx.signalReceived !== null ? { received_signal: ctx.signalReceived } : {},
-    duration_ms: 0
+    // Not observed: this event stands in for a run that ended before a duration
+    // could be measured, so 0 would claim a measured zero.
+    duration_ms: null
   });
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION5,
     type: "session_status_changed",
     id: prefixedUlid4("evt"),
     session_id: sessionId,
@@ -9239,7 +9295,7 @@ async function finalizeSessionAsFailed2(paths, sessionDir, sessionId, appendEven
     to: "failed"
   });
   await appendEvent(sessionDir, {
-    schema_version: "0.1.0",
+    schema_version: EVENT_SCHEMA_VERSION5,
     type: "session_ended",
     id: prefixedUlid4("evt"),
     session_id: sessionId,
@@ -9289,16 +9345,19 @@ import {
   appendEventToExistingSession as appendEventToExistingSession3,
   assertBasouRootSafe as assertBasouRootSafe13,
   basouPaths as basouPaths16,
+  EVENT_SCHEMA_VERSION as EVENT_SCHEMA_VERSION6,
   enumerateSessionDirs as enumerateSessionDirs2,
   findErrorCode as findErrorCode12,
   importSessionFromJson as importSessionFromJson2,
   loadSessionEntries as loadSessionEntries2,
   readAllEvents,
   readManifest as readManifest10,
+  readObservedDuration,
   readYamlFile as readYamlFile7,
   rechainSessionInPlace,
   resolveSessionId as resolveSessionId3,
   resolveTaskId,
+  SESSION_IMPORT_SCHEMA_VERSION as SESSION_IMPORT_SCHEMA_VERSION2,
   SessionImportPayloadSchema as SessionImportPayloadSchema2,
   SessionSchema as SessionSchema3,
   SessionStatusSchema,
@@ -9420,15 +9479,19 @@ async function doRunSessionShow(idInput, options, ctx) {
     }
     throw new Error("Failed to read session", { cause: error });
   }
+  let eventsLostLines = 0;
   const events = await readAllEvents(sessionDir, {
-    onWarning: (w) => printReplayWarning(w, sessionId)
+    onWarning: (w) => {
+      if (w.kind === "malformed_json" || w.kind === "schema_violation") eventsLostLines++;
+      printReplayWarning(w, sessionId);
+    }
   });
   if (options.json === true) {
     console.log(JSON.stringify({ session: session.session, events }, null, 2));
     return;
   }
   const now = ctx.nowProvider?.() ?? /* @__PURE__ */ new Date();
-  printSessionShowText(session, events, options, repositoryRoot, now);
+  printSessionShowText(session, events, options, repositoryRoot, now, eventsLostLines);
 }
 function suspectLabel(reason) {
   if (reason === "events_say_ended_but_yaml_running") return " \u26A0 ended (yaml stale)";
@@ -9474,7 +9537,7 @@ function printSessionListText(records) {
     );
   }
 }
-function printSessionShowText(session, events, options, repositoryRoot, now) {
+function printSessionShowText(session, events, options, repositoryRoot, now, eventsLostLines) {
   const s = session.session;
   console.log(`Session: ${s.id}  (status: ${s.status})`);
   console.log(`Source:        ${s.source.kind} (v${s.source.version})`);
@@ -9500,7 +9563,7 @@ function printSessionShowText(session, events, options, repositoryRoot, now) {
     console.log(`  ${pad2(`${type}:`, 24)} ${n}`);
   }
   console.log("");
-  console.log(`Work:          ${formatSessionWork(session, events, now)}`);
+  console.log(`Work:          ${formatSessionWork(session, events, now, eventsLostLines)}`);
   if (events.length === 0) return;
   const last = options.last ?? 5;
   const showAll = options.events === true && options.last === void 0;
@@ -9512,8 +9575,15 @@ function printSessionShowText(session, events, options, repositoryRoot, now) {
     console.log(`  ${formatEventLine(ev)}`);
   }
 }
-function formatSessionWork(session, events, now) {
-  const w = sessionWorkStatsFromEvents(session.session.id, session.session, events, now);
+function formatSessionWork(session, events, now, eventsLostLines) {
+  const w = sessionWorkStatsFromEvents(
+    session.session.id,
+    session.session,
+    events,
+    now,
+    false,
+    eventsLostLines
+  );
   const parts = [];
   if (w.tokens.output > 0) parts.push(`${w.tokens.output.toLocaleString("en-US")} output tokens`);
   parts.push(`${w.commandCount} cmd / ${w.fileChangedCount} files / ${w.decisionCount} dec`);
@@ -9524,7 +9594,7 @@ function formatSessionWork(session, events, now) {
   }
   parts.push(`span ${formatDurationMs(w.sessionSpanMs)}${w.open ? " (open)" : ""}`);
   parts.push(
-    w.availability.commandTime ? `command ${formatDurationMs(w.commandTimeMs)}` : "command n/a (import)"
+    w.availability.commandTime ? `command ${formatDurationMs(w.commandTimeMs)}` : "command n/a (no duration observed, or the stream was not read in full)"
   );
   return parts.join(", ");
 }
@@ -9563,7 +9633,9 @@ function eventVariantSummary(ev) {
       const argsPart = ev.args.length > 0 ? ` ${ev.args.join(" ")}` : "";
       const executorPart = ev.command ?? "(executor unrecorded)";
       const exitPart = ev.exit_code === null ? "exit=unknown" : `exit=${ev.exit_code}`;
-      return `${executorPart}${argsPart} (${exitPart}, ${ev.duration_ms}ms)`;
+      const observedDuration = readObservedDuration(ev);
+      const durationPart = observedDuration === null ? "duration=unknown" : `${observedDuration}ms`;
+      return `${executorPart}${argsPart} (${exitPart}, ${durationPart})`;
     }
     case "git_snapshot":
       return `branch=${ev.branch} dirty=${ev.dirty}`;
@@ -9713,7 +9785,7 @@ async function doRunSessionImport(options, ctx) {
   if (!parsed.success) {
     throw new Error("Invalid import payload", { cause: parsed.error });
   }
-  if (parsed.data.schema_version !== "0.1.0") {
+  if (parsed.data.schema_version !== SESSION_IMPORT_SCHEMA_VERSION2) {
     throw new Error(`Unsupported import schema_version: ${parsed.data.schema_version}`);
   }
   const importOptions2 = { dryRun: options.dryRun === true };
@@ -9834,7 +9906,7 @@ async function doRunSessionNote(sessionIdInput, options, ctx) {
       paths,
       sessionId: sesId,
       eventBuilder: (eventId) => ({
-        schema_version: "0.1.0",
+        schema_version: EVENT_SCHEMA_VERSION6,
         id: eventId,
         session_id: sesId,
         occurred_at: occurredAt,
@@ -10028,7 +10100,7 @@ function printStatsText(result, bySource, byDay) {
   console.log(
     `  Span:            ${formatDurationMs(t.sessionSpanMs)}  (total elapsed${openPart})`
   );
-  const cmdCaveat = t.commandTimeReliable ? "" : "; some sessions (e.g. claude-code-import) report 0 shell time";
+  const cmdCaveat = t.commandTimeReliable ? "; at least, only durations the sources reported are counted" : "; some sessions ran commands with no duration observed, or could not be read in full, so this is a floor";
   console.log(
     `  Command:         ${formatDurationMs(t.commandTimeMs)}  (real shell execution${cmdCaveat})`
   );
@@ -10051,11 +10123,15 @@ function printStatsText(result, bySource, byDay) {
   }
 }
 function describeSource(s) {
-  const cmd = s.commandTimeReliable ? formatDurationMs(s.commandTimeMs) : "n/a";
+  const cmd = s.commandTimeReliable ? formatDurationMs(s.commandTimeMs) : s.commandTimeMs > 0 ? `>=${formatFloorMs(s.commandTimeMs)}` : "n/a";
   const tokens = s.tokensAvailable ? `${formatInt(s.tokens.output)} out tok` : "no tokens";
   const machine = s.machineActiveAvailable ? `, model ${formatDurationMs(s.machineActiveTimeMs)}` : "";
   return `${s.sessionCount} sessions, ${tokens}, active ${formatDurationMs(s.activeTimeMs)}${machine}, command ${cmd}`;
 }
+function formatFloorMs(ms) {
+  const coarse = formatDurationMs(ms);
+  return coarse === "0s" ? `${Math.round(ms)}ms` : coarse;
+}
 function formatInt(n) {
   return n.toLocaleString("en-US");
 }
@@ -12386,6 +12462,12 @@ var VIEW_HTML = `<!doctype html>
     if (m > 0) return m + 'm ' + (sec < 10 ? '0' : '') + sec + 's';
     return sec + 's';
   }
+  // A floor under half a second renders as '>=0s' -- true of any total, and
+  // reading as a measured zero. Show those milliseconds instead.
+  function fmtFloor(ms) {
+    var coarse = fmtDur(ms);
+    return coarse === '0s' ? Math.round(ms || 0) + 'ms' : coarse;
+  }
   function kvrow(k, v) {
     return el('tr', {}, [el('td', { class: 'k', text: k }), el('td', { text: v })]);
   }
@@ -12427,12 +12509,12 @@ var VIEW_HTML = `<!doctype html>
         timeRows.push(kvrow('model working', fmtDur(t.machineActiveTimeMs) + '  (model compute, subset of active; Codex turn duration on ' + machineSessions + ' of ' + t.sessionCount + ' sessions; not wall-clock-deduped)'));
       }
       timeRows.push(kvrow('span', fmtDur(t.sessionSpanMs) + (t.openSessionCount > 0 ? '  (' + t.openSessionCount + ' open)' : '')));
-      timeRows.push(kvrow('command', fmtDur(t.commandTimeMs) + (t.commandTimeReliable ? '' : '  (some sessions report 0)')));
+      timeRows.push(kvrow('command', fmtDur(t.commandTimeMs) + (t.commandTimeReliable ? '' : '  (floor: some sessions had no duration observed, or could not be read in full)')));
       detail.appendChild(el('table', { class: 'kv' }, [el('tbody', {}, timeRows)]));
       if (d.bySource && d.bySource.length) {
         detail.appendChild(el('h3', { text: 'By source' }));
         d.bySource.forEach(function (s) {
-          var cmd = s.commandTimeReliable ? fmtDur(s.commandTimeMs) : 'n/a';
+          var cmd = s.commandTimeReliable ? fmtDur(s.commandTimeMs) : (s.commandTimeMs > 0 ? '>=' + fmtFloor(s.commandTimeMs) : 'n/a');
           var machine = s.machineActiveAvailable ? ', model ' + fmtDur(s.machineActiveTimeMs) : '';
           detail.appendChild(el('div', { class: 'row' }, [
             el('span', { text: s.sourceKind + ': ' + s.sessionCount + ' sessions, ' + numfmt(s.tokens.output) + ' out tok, active ' + fmtDur(s.activeTimeMs) + machine + ', command ' + cmd })