@basou/cli 0.71.1 → 0.72.0

package/dist/index.js

@@ -842,11 +842,13 @@ import {
   assertBasouRootSafe as assertBasouRootSafe3,
   BOARD_INIT_SAVE,
   basouPaths as basouPaths4,
+  boardDeclarationSnapshot,
   boardGuide,
   boardInitText,
   buildRecord,
   byCodePoint,
   diffCells,
+  diffDeclarations,
   diffObserved,
   displayPath as displayPath3,
   effortStartOf,
@@ -1042,6 +1044,8 @@ import {
   CLAUDE_IMPORT_SOURCE,
   CODEX_IMPORT_SOURCE,
   classifyFilesBySourceRoot,
+  claudeTranscriptOwnRecords,
+  claudeTranscriptRecordUuid,
   claudeTranscriptToImportPayload,
   codexRolloutToImportPayload,
   displayPath as displayPath2,
@@ -1142,24 +1146,43 @@ async function doRunImportClaudeCode(options, ctx) {
   });
   const projectsRoot = ctx.claudeProjectsDir ?? join2(homedir(), ".claude", "projects");
   const files = await selectTranscriptFiles(projectsRoot, projectPaths, options);
+  const store = await loadImportStore(paths, options, CLAUDE_IMPORT_SOURCE);
+  const conversations = await indexConversations(
+    await listTranscriptFiles(projectsRoot, projectPaths),
+    ctx.transcriptCreatedAtMs ?? birthTimeMs,
+    (externalId) => earliestStart(store.byExternalId.get(externalId) ?? [])
+  );
   const projectSet = new Set(projectPaths);
   const candidates = files.map((file) => {
     const externalId = basename3(file, ".jsonl");
+    const { root, older } = conversations.place(file);
     return {
       externalId,
       sourcePath: file,
-      toPayload: async () => {
+      // An earlier import that took the copies too began the session at the
+      // conversation's first record or before it; one without them begins after
+      // the last copy.
+      holdsCopies: (prior) => older.length > 0 && root?.timestamp !== void 0 && Date.parse(prior.startedAt) <= Date.parse(root.timestamp),
+      toPayload: async (notBefore) => {
         const { records, sizeBytes } = await readJsonlRecords(file);
         const cwd = firstTranscriptCwd(records);
-        if (cwd === void 0 || !projectSet.has(cwd)) return null;
+        if (cwd === void 0 || !projectSet.has(cwd))
+          return { payload: null, leftOutCopies: false };
         const observation2 = await readSessionObservation(paths.observations, externalId);
         const observedFiles = observation2 === null ? [] : observedFilesOf(observation2);
-        return claudeTranscriptToImportPayload(records, {
-          workspaceId: manifest.workspace.id,
-          externalId,
-          sourceSizeBytes: sizeBytes,
-          ...observedFiles.length > 0 ? { observedFiles } : {}
+        const own = claudeTranscriptOwnRecords(records, {
+          copiedUuids: await conversations.uuidsOf(older),
+          ...notBefore !== void 0 ? { notBefore } : {}
         });
+        return {
+          payload: claudeTranscriptToImportPayload(own, {
+            workspaceId: manifest.workspace.id,
+            externalId,
+            sourceSizeBytes: sizeBytes,
+            ...observedFiles.length > 0 ? { observedFiles } : {}
+          }),
+          leftOutCopies: own.length < records.length
+        };
       }
     };
   });
@@ -1167,7 +1190,7 @@ async function doRunImportClaudeCode(options, ctx) {
     paths,
     manifest,
     options,
-    CLAUDE_IMPORT_SOURCE,
+    store,
     candidates,
     projectPaths,
     hasDeclaredBoundary(options, manifest)
@@ -1189,18 +1212,21 @@ async function doRunImportCodex(options, ctx) {
     sourcePath: file,
     toPayload: async () => {
       const { records, sizeBytes } = await readJsonlRecords(file);
-      return codexRolloutToImportPayload(records, {
-        workspaceId: manifest.workspace.id,
-        externalId,
-        sourceSizeBytes: sizeBytes
-      });
+      return {
+        payload: codexRolloutToImportPayload(records, {
+          workspaceId: manifest.workspace.id,
+          externalId,
+          sourceSizeBytes: sizeBytes
+        }),
+        leftOutCopies: false
+      };
     }
   }));
   await importDerivedSessions(
     paths,
     manifest,
     options,
-    CODEX_IMPORT_SOURCE,
+    await loadImportStore(paths, options, CODEX_IMPORT_SOURCE),
     candidates,
     projectPaths,
     hasDeclaredBoundary(options, manifest)
@@ -1225,14 +1251,8 @@ async function resolveImportTarget(ctx) {
   const manifest = await readManifest2(paths);
   return { repositoryRoot, paths, manifest };
 }
-async function importDerivedSessions(paths, manifest, options, sourceKind, candidates, projectPaths, boundaryDeclared) {
-  await assertSessionStoreSafe(paths);
-  if (options.dryRun !== true) await assertLockStoreSafe2(paths);
-  const {
-    byExternalId: existingByExternalId,
-    notDirectories,
-    yamlNotFiles
-  } = await loadExistingByExternalId(paths, sourceKind);
+async function importDerivedSessions(paths, manifest, options, store, candidates, projectPaths, boundaryDeclared) {
+  const { byExternalId: existingByExternalId, notDirectories, yamlNotFiles } = store;
   let notDirectoriesWarned = false;
   const seenThisRun = /* @__PURE__ */ new Set();
   const crossProjectCheck = boundaryDeclared;
@@ -1260,7 +1280,8 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
     skippedLegacy: 0,
     skippedDecreased: 0,
     skippedDuplicate: 0,
-    skippedUnverifiable: 0
+    skippedUnverifiable: 0,
+    droppedCopies: 0
   };
   let sanitizedPaths = 0;
   const validate = (payload) => {
@@ -1276,30 +1297,44 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
     }
     return parsed.data;
   };
-  for (const { externalId, sourcePath, toPayload } of candidates) {
+  for (const { externalId, sourcePath, toPayload, holdsCopies } of candidates) {
     if (seenThisRun.has(externalId)) {
       counts.skippedExisting++;
       continue;
     }
     const priors = existingByExternalId.get(externalId) ?? [];
     if (priors.length > 0 && options.force !== true) {
-      const prior = await classifyReimport(priors, sourcePath, externalId, counts);
-      if (prior === null) continue;
-      const payload2 = validate(await toPayload());
+      const decision = await classifyReimport(priors, sourcePath, externalId, counts, holdsCopies);
+      if (decision === null) continue;
+      const { prior, reason } = decision;
+      const derived = await toPayload(prior.startedAt);
+      const payload2 = validate(derived.payload);
       if (payload2 === null) {
+        if (reason === "holds_copies") {
+          console.error(
+            `Import: ${externalId} added no action of its own after the records it copied from an older transcript; its session, imported with those records, is left as it is`
+          );
+        }
         counts.skippedNoAction++;
         continue;
       }
+      if (reason === "holds_copies" && !derived.leftOutCopies) {
+        counts.skippedExisting++;
+        continue;
+      }
       const readSize = payload2.session.source.source_size_bytes;
-      if (prior.sourceSizeBytes !== void 0 && readSize !== void 0 && readSize <= prior.sourceSizeBytes) {
+      if (prior.sourceSizeBytes !== void 0 && readSize !== void 0 && (reason === "grew" ? readSize <= prior.sourceSizeBytes : readSize < prior.sourceSizeBytes)) {
         console.error(
-          `Import: ${externalId} source changed during read (now ${readSize} <= ${prior.sourceSizeBytes} bytes); re-import skipped`
+          `Import: ${externalId} source changed during read (now ${readSize} bytes, was ${prior.sourceSizeBytes}); re-import skipped`
         );
         counts.skippedDecreased++;
         continue;
       }
       const outcome = await reimportPreservingId(paths, manifest, prior.sessionId, payload2, {
-        dryRun: options.dryRun === true
+        dryRun: options.dryRun === true,
+        // What an earlier import derived from the copies predates the session's
+        // fresh start; anything later that is not reproduced still refuses.
+        ...derived.leftOutCopies ? { dropDerivedBefore: payload2.session.started_at } : {}
       });
       if (outcome.status === "skipped") {
         const detail = outcome.reason === "prior_events_unreadable" ? "prior events.jsonl has unreadable lines" : outcome.reason === "prior_chain_broken" ? "prior events.jsonl failed hash-chain verification (run 'basou verify')" : outcome.reason === "prior_yaml_invalid" ? "prior session.yaml does not load as a whole document" : "source changed in a non-append way (derived events would be dropped)";
@@ -1308,11 +1343,12 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
         continue;
       }
       counts.reimported++;
+      if (holdsCopies?.(prior) === true) counts.droppedCopies++;
       seenThisRun.add(externalId);
       await noteCrossProject(externalId, payload2);
       continue;
     }
-    const payload = validate(await toPayload());
+    const payload = validate((await toPayload(earliestStart(priors))).payload);
     if (payload === null) {
       counts.skippedNoAction++;
       continue;
@@ -1363,7 +1399,7 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
   }
   printImportResult(options, results, counts);
 }
-async function classifyReimport(priors, sourcePath, externalId, counts) {
+async function classifyReimport(priors, sourcePath, externalId, counts, holdsCopies) {
   if (priors.length > 1) {
     console.error(
       `Import: ${externalId} has ${priors.length} prior sessions; re-import skipped (use --force)`
@@ -1386,6 +1422,7 @@ async function classifyReimport(priors, sourcePath, externalId, counts) {
     return null;
   }
   if (currentSize === prior.sourceSizeBytes) {
+    if (holdsCopies?.(prior) === true) return { prior, reason: "holds_copies" };
     counts.skippedExisting++;
     return null;
   }
@@ -1396,7 +1433,15 @@ async function classifyReimport(priors, sourcePath, externalId, counts) {
     counts.skippedDecreased++;
     return null;
   }
-  return prior;
+  return { prior, reason: "grew" };
+}
+function earliestStart(priors) {
+  let earliest;
+  for (const { startedAt } of priors) {
+    if (earliest === void 0 || Date.parse(startedAt) < Date.parse(earliest))
+      earliest = startedAt;
+  }
+  return earliest;
 }
 function encodeProjectDir(projectPath) {
   return projectPath.replace(/[^a-zA-Z0-9]/g, "-");
@@ -1408,6 +1453,11 @@ function firstTranscriptCwd(records) {
   }
   return void 0;
 }
+async function loadImportStore(paths, options, sourceKind) {
+  await assertSessionStoreSafe(paths);
+  if (options.dryRun !== true) await assertLockStoreSafe2(paths);
+  return loadExistingByExternalId(paths, sourceKind);
+}
 async function loadExistingByExternalId(paths, sourceKind) {
   const byExternalId = /* @__PURE__ */ new Map();
   const add = (externalId, prior) => {
@@ -1433,7 +1483,8 @@ async function loadExistingByExternalId(paths, sourceKind) {
     }
     if (session.session.source.kind !== sourceKind) continue;
     const sourceSizeBytes = session.session.source.source_size_bytes;
-    const prior = sourceSizeBytes !== void 0 ? { sessionId, sourceSizeBytes } : { sessionId };
+    const startedAt = session.session.started_at;
+    const prior = sourceSizeBytes !== void 0 ? { sessionId, startedAt, sourceSizeBytes } : { sessionId, startedAt };
     const ext = session.session.source.external_id;
     if (typeof ext === "string" && ext.length > 0) {
       add(ext, prior);
@@ -1478,6 +1529,153 @@ async function selectTranscriptFiles(projectsRoot, projectPaths, options) {
   }
   return [...new Set(files)].sort();
 }
+async function listTranscriptFiles(projectsRoot, projectPaths) {
+  const files = [];
+  for (const projectPath of projectPaths) {
+    const transcriptDir = join2(projectsRoot, encodeProjectDir(projectPath));
+    let entries;
+    try {
+      entries = await readdir(transcriptDir);
+    } catch (error) {
+      if (findErrorCode2(error, "ENOENT")) continue;
+      throw new Error("Failed to read Claude transcript directory", { cause: error });
+    }
+    for (const name of entries) {
+      if (name.endsWith(".jsonl")) files.push(join2(transcriptDir, name));
+    }
+  }
+  return [...new Set(files)].sort();
+}
+async function indexConversations(files, createdAtMs, importedStartedAt) {
+  const uuidsByFile = /* @__PURE__ */ new Map();
+  const uuidsIn = async (file) => {
+    let held = uuidsByFile.get(file);
+    if (held === void 0) {
+      held = await readTranscriptUuids(file);
+      uuidsByFile.set(file, held);
+    }
+    return held;
+  };
+  const rootOf = /* @__PURE__ */ new Map();
+  const byRoot = /* @__PURE__ */ new Map();
+  for (const file of files) {
+    const root = await readConversationRoot(file);
+    if (root === void 0) continue;
+    rootOf.set(file, root);
+    const entry = { file, externalId: basename3(file, ".jsonl"), createdAtMs: Number.NaN };
+    const list = byRoot.get(root.uuid);
+    if (list === void 0) byRoot.set(root.uuid, [entry]);
+    else list.push(entry);
+  }
+  for (const list of byRoot.values()) {
+    if (list.length < 2) continue;
+    for (const entry of list) entry.createdAtMs = await createdAtMs(entry.file);
+    list.sort((a, b) => {
+      const knownA = Number.isFinite(a.createdAtMs) && a.createdAtMs > 0;
+      const knownB = Number.isFinite(b.createdAtMs) && b.createdAtMs > 0;
+      if (knownA && knownB && a.createdAtMs !== b.createdAtMs) return a.createdAtMs - b.createdAtMs;
+      if (knownA !== knownB) return knownA ? -1 : 1;
+      return a.externalId < b.externalId ? -1 : a.externalId > b.externalId ? 1 : 0;
+    });
+    const startedAtMs = /* @__PURE__ */ new Map();
+    for (const entry of list) {
+      const ms = Date.parse(importedStartedAt(entry.externalId) ?? "");
+      if (!Number.isNaN(ms)) startedAtMs.set(entry, ms);
+    }
+    const imported = [...startedAtMs.keys()].sort(
+      (a, b) => (startedAtMs.get(a) ?? 0) - (startedAtMs.get(b) ?? 0)
+    );
+    list.forEach((entry, index) => {
+      if (startedAtMs.has(entry)) list[index] = imported.shift() ?? entry;
+    });
+    const rootMs = Date.parse(rootOf.get(list[0]?.file ?? "")?.timestamp ?? "");
+    const forks = list.filter((entry) => (startedAtMs.get(entry) ?? Number.NaN) > rootMs);
+    if (forks.length === 0) continue;
+    const rank = new Map(list.map((entry, index) => [entry, index]));
+    const countedBy = /* @__PURE__ */ new Map();
+    for (const [index, entry] of list.entries()) {
+      if (startedAtMs.has(entry)) continue;
+      for (const fork of forks) {
+        const forkRank = rank.get(fork) ?? index;
+        if (forkRank < index) continue;
+        let counted = countedBy.get(fork);
+        if (counted === void 0) {
+          counted = await readTranscriptUuids(fork.file, importedStartedAt(fork.externalId));
+          countedBy.set(fork, counted);
+        }
+        if (counted.size === 0) continue;
+        const held = await uuidsIn(entry.file);
+        if ([...counted].some((uuid) => held.has(uuid))) {
+          rank.set(entry, Math.max(rank.get(entry) ?? index, forkRank + 0.5));
+        }
+      }
+    }
+    list.sort((a, b) => (rank.get(a) ?? 0) - (rank.get(b) ?? 0));
+  }
+  return {
+    place(file) {
+      const root = rootOf.get(file);
+      if (root === void 0) return { root: void 0, older: [] };
+      const list = byRoot.get(root.uuid) ?? [];
+      const at = list.findIndex((entry) => entry.file === file);
+      return { root, older: list.slice(0, Math.max(at, 0)).map((entry) => entry.file) };
+    },
+    async uuidsOf(older) {
+      const uuids = /* @__PURE__ */ new Set();
+      for (const file of older) {
+        for (const uuid of await uuidsIn(file)) uuids.add(uuid);
+      }
+      return uuids;
+    }
+  };
+}
+async function readTranscriptUuids(file, notBefore) {
+  const uuids = /* @__PURE__ */ new Set();
+  try {
+    const { records } = await readJsonlRecords(file);
+    const kept = notBefore === void 0 ? records : claudeTranscriptOwnRecords(records, { notBefore });
+    for (const record of kept) {
+      const uuid = claudeTranscriptRecordUuid(record);
+      if (uuid !== void 0) uuids.add(uuid);
+    }
+  } catch {
+  }
+  return uuids;
+}
+async function readConversationRoot(file) {
+  const stream = createReadStream(file, { encoding: "utf8" });
+  const rl = createInterface({ input: stream, crlfDelay: Number.POSITIVE_INFINITY });
+  try {
+    for await (const line of rl) {
+      const trimmed = line.trim();
+      if (trimmed.length === 0) continue;
+      let parsed;
+      try {
+        parsed = JSON.parse(trimmed);
+      } catch {
+        continue;
+      }
+      if (!isObject(parsed)) continue;
+      const uuid = claudeTranscriptRecordUuid(parsed);
+      if (uuid === void 0) continue;
+      const timestamp = parsed.timestamp;
+      return typeof timestamp === "string" && timestamp.length > 0 ? { uuid, timestamp } : { uuid };
+    }
+    return void 0;
+  } catch {
+    return void 0;
+  } finally {
+    rl.close();
+    stream.destroy();
+  }
+}
+async function birthTimeMs(file) {
+  try {
+    return (await stat2(file)).birthtimeMs;
+  } catch {
+    return Number.NaN;
+  }
+}
 async function pathExists(file) {
   try {
     await stat2(file);
@@ -1613,7 +1811,8 @@ function printImportResult(options, results, counts) {
     skippedLegacy,
     skippedDecreased,
     skippedDuplicate,
-    skippedUnverifiable
+    skippedUnverifiable,
+    droppedCopies
   } = counts;
   if (options.json === true) {
     console.log(
@@ -1627,6 +1826,7 @@ function printImportResult(options, results, counts) {
         imported_count: results.length,
         replaced_count: replaced,
         reimported_count: reimported,
+        dropped_copies_count: droppedCopies,
         skipped_no_action: skippedNoAction,
         skipped_already_imported: skippedExisting,
         skipped_legacy_untracked: skippedLegacy,
@@ -1649,10 +1849,11 @@ function printImportResult(options, results, counts) {
     skipParts.push(`${skippedUnverifiable} unverifiable (run 'basou verify')`);
   const skipSuffix = skipParts.length > 0 ? `; skipped ${skipParts.join(", ")}` : "";
   const eventsPart = replaced > 0 ? `${eventTotal} events, ${replaced} replaced` : `${eventTotal} events`;
+  const copiesPart = droppedCopies > 0 ? ` (${droppedCopies} without the records ${droppedCopies === 1 ? "its transcript" : "their transcripts"} copied from an older one)` : "";
   if (isDry) {
     const parts = [];
     if (results.length > 0) parts.push(`import ${results.length} session(s) (${eventsPart})`);
-    if (reimported > 0) parts.push(`re-import ${reimported} changed session(s)`);
+    if (reimported > 0) parts.push(`re-import ${reimported} changed session(s)${copiesPart}`);
     const head = parts.length > 0 ? `Dry run: would ${parts.join(", ")}` : "Dry run: no changes";
     console.log(`${head}${skipSuffix}`);
     return;
@@ -1670,7 +1871,7 @@ function printImportResult(options, results, counts) {
   }
   if (reimported > 0) {
     segments.push(
-      `${results.length > 0 ? "re-imported" : "Re-imported"} ${reimported} changed session(s)`
+      `${results.length > 0 ? "re-imported" : "Re-imported"} ${reimported} changed session(s)${copiesPart}`
     );
   }
   console.log(`${segments.join(", ")}${skipSuffix}`);
@@ -1756,6 +1957,7 @@ async function runImport(adapter, fn) {
       importedCount: readCount(json.imported_count),
       replacedCount: readCount(json.replaced_count),
       reimportedCount: readCount(json.reimported_count),
+      droppedCopiesCount: readCount(json.dropped_copies_count),
       skippedNoAction: readCount(json.skipped_no_action),
       skippedAlreadyImported: readCount(json.skipped_already_imported),
       skippedLegacyUntracked: readCount(json.skipped_legacy_untracked),
@@ -2145,9 +2347,10 @@ async function doRunBoardMeasure(options, ctx) {
     throw new Error("--model must name a model.");
   }
   const loaded = await loadBoard(options, ctx, "board measure");
-  const measurement = await measureLoaded(loaded, ctx, options.model, await previousOf(loaded));
+  const previous = await previousOf(loaded);
+  const measurement = await measureLoaded(loaded, ctx, options.model, previous);
   if (options.json === true) console.log(JSON.stringify(measurement, null, 2));
-  else printMeasurementText(measurement, hasRecords(loaded));
+  else printMeasurementText(measurement, hasRecords(loaded), declarationChanges(loaded, previous));
   if (!measurement.complete) process.exitCode = 1;
   return measurement;
 }
@@ -2162,16 +2365,17 @@ async function runBoardRecord(options, ctx = {}) {
 var RecordRefusal = class extends Error {
 };
 async function doRunBoardRecord(options, ctx) {
-  let result;
+  let checked;
   try {
-    result = await checkAndRecord(options, ctx);
+    checked = await checkAndRecord(options, ctx);
   } catch (error) {
     if (error instanceof RecordRefusal || !(error instanceof Error)) throw error;
     throw new RecordRefusal(`${error.message}
 Nothing was written.`, { cause: error.cause });
   }
+  const { result, declared } = checked;
   if (options.json === true) console.log(JSON.stringify(result, null, 2));
-  else printRecordText(result);
+  else printRecordText(result, declared ?? null);
   return result;
 }
 async function checkAndRecord(options, ctx) {
@@ -2197,9 +2401,9 @@ async function checkAndRecord(options, ctx) {
 ${parsed.errors.map((e) => `  - ${displayPath3(e)}`).join("\n")}`
     );
   }
-  const recordedAt = ctx.nowProvider?.() ?? /* @__PURE__ */ new Date();
   const previous = await previousOf(loaded);
   const measurement = await measureLoaded(loaded, ctx, parsed.input.judged_by.model, previous);
+  const recordedAt = ctx.nowProvider?.() ?? /* @__PURE__ */ new Date();
   if (measurement.digest !== parsed.input.measure_digest) {
     throw new RecordRefusal(
       `measure_digest is ${parsed.input.measure_digest}, but the board measures ${measurement.digest} now: something it measures or board.yaml changed since the judgement, or basou was rebuilt or upgraded since that measurement. Measure again and judge that; nothing was written.`
@@ -2212,6 +2416,7 @@ ${parsed.errors.map((e) => `  - ${displayPath3(e)}`).join("\n")}`
     recordedAt,
     recordedWith: { basou: BASOU_CLI_VERSION, build: BASOU_BUILD?.commit ?? null }
   });
+  const declared = options.json === true ? void 0 : declarationChanges(loaded, previous);
   let written = null;
   if (options.dryRun !== true) {
     let name;
@@ -2238,14 +2443,22 @@ ${parsed.errors.map((e) => `  - ${displayPath3(e)}`).join("\n")}`
     };
   }
   return {
-    record: written,
-    dry_run: options.dryRun === true,
-    complete: measurement.complete,
-    not_found: measurement.not_found,
-    order_anomalies: record.order_anomalies,
-    diff
+    result: {
+      record: written,
+      dry_run: options.dryRun === true,
+      complete: measurement.complete,
+      not_found: measurement.not_found,
+      order_anomalies: record.order_anomalies,
+      diff
+    },
+    ...declared === void 0 ? {} : { declared }
   };
 }
+function declarationChanges(loaded, previous) {
+  const { last } = previous;
+  if (last.status !== "found") return null;
+  return diffDeclarations(last.record.declaration, boardDeclarationSnapshot(loaded.declaration));
+}
 var INPUT_KEYS = /* @__PURE__ */ new Set([
   "measure_digest",
   "observed",
@@ -2395,7 +2608,7 @@ async function checkRecordsPlace(loaded, recordsDir, shown, notPrivate) {
     }
   }
 }
-function printRecordText(result) {
+function printRecordText(result, declared) {
   const lines = [
     result.record === null ? "Dry run: the record checked out (nothing was written)." : `Recorded ${displayPath3(result.record)}`
   ];
@@ -2416,7 +2629,11 @@ function printRecordText(result) {
         `  observed ${displayPath3(o.name)}: ${observation(o.before)} -> ${observation(o.after)}`
       );
     }
-    lines.push(...diffLines(result.diff.measure, cells.length + observed.length > 0));
+    const declaration = declarationLines(declared);
+    lines.push(
+      ...diffLines(result.diff.measure, cells.length + observed.length + declaration.length > 0),
+      ...declaration
+    );
   }
   if (!result.complete) {
     lines.push(`The measurement recorded is not complete (${result.not_found.length}):`);
@@ -2602,6 +2819,16 @@ function diffLines(diff, more) {
   if (lines.length === 0 && !more) lines.push("  nothing moved");
   return lines;
 }
+function declarationLines(changes) {
+  if (changes === null) {
+    return [
+      "  declaration: not compared (the previous record holds no declaration basou can compare with)"
+    ];
+  }
+  return changes.map(
+    (c) => `  declaration ${displayPath3(c.at)}: ${c.change === "reordered" ? "the order changed" : c.change}`
+  );
+}
 function shownValue(value) {
   if (value === null) return "not measured";
   if (typeof value === "number") return String(Math.round(value * 1e4) / 1e4);
@@ -2733,12 +2960,18 @@ function axisLines(m) {
   for (const u of a.unjudged) lines.push(`    (${u.trigger}) not judged: ${u.why}`);
   return lines;
 }
-function printMeasurementText(m, hasRecords2) {
+function printMeasurementText(m, hasRecords2, declared) {
   const lines = [displayPath3(m.title)];
   const build = m.measured_with.build === null ? "" : ` (build ${m.measured_with.build})`;
   lines.push(`Measured ${m.measured_at} with basou ${m.measured_with.basou}${build}`);
   if (m.diff !== null) {
-    lines.push("", `Since the previous record ${m.diff.against}:`, ...diffLines(m.diff, false));
+    const declaration = declarationLines(declared);
+    lines.push(
+      "",
+      `Since the previous record ${m.diff.against}:`,
+      ...diffLines(m.diff, declaration.length > 0),
+      ...declaration
+    );
   } else if (m.not_found.some((n) => n.at === "diff")) {
     lines.push("", "The previous record could not be read (see Not measured).");
   } else {
@@ -2753,7 +2986,8 @@ function printMeasurementText(m, hasRecords2) {
     const width = Math.max(...measures.map(([id]) => id.length));
     lines.push("", "Measures:");
     for (const [id, measure] of measures) {
-      const unit = measure.value === null ? "" : ` ${displayPath3(measure.unit)}`;
+      const counted = typeof measure.value === "number" || Array.isArray(measure.value);
+      const unit = counted ? ` ${displayPath3(measure.unit)}` : "";
       const listed = Array.isArray(measure.value) ? " (paths in --json)" : "";
       const lane = measure.lane === void 0 ? "" : `  [${measure.lane.join(", ")}]`;
       lines.push(`  ${id.padEnd(width)}  ${shownValue(measure.value)}${unit}${listed}${lane}`);
@@ -9996,7 +10230,10 @@ function describeImport(outcome) {
   }
   const verb = outcome.dryRun ? "would import" : "imported";
   const parts = [`${outcome.importedCount} session(s)`, `${outcome.eventTotal} events`];
-  if (outcome.reimportedCount > 0) parts.push(`${outcome.reimportedCount} re-imported`);
+  if (outcome.reimportedCount > 0) {
+    const copies = outcome.droppedCopiesCount > 0 ? ` (${outcome.droppedCopiesCount} without records copied from an older transcript)` : "";
+    parts.push(`${outcome.reimportedCount} re-imported${copies}`);
+  }
   if (outcome.replacedCount > 0) parts.push(`${outcome.replacedCount} replaced`);
   if (outcome.skippedAlreadyImported > 0)
     parts.push(`${outcome.skippedAlreadyImported} already imported`);
@@ -13754,6 +13991,11 @@ var BOARD_HTML = `<!doctype html>
   .chip.blocked { background: var(--chip-blocked); }
   .chip.unverified { background: var(--chip-unverified); }
   .muted { color: var(--fg-2); }
+  .sub { font-size: 12px; color: var(--fg-2); overflow-wrap: anywhere; }
+  ul.sub { margin: 0; padding-left: 18px; }
+  td.wrap { overflow-wrap: anywhere; min-width: 10em; }
+  tr.notes td { padding-top: 0; }
+  .chip.changed { margin-left: 0; margin-right: 6px; background: var(--chip-unverified); }
   .bar { height: 10px; background: var(--fill); border-radius: 5px; min-width: 120px; position: relative; overflow: hidden; }
   .bar span { position: absolute; left: 0; top: 0; bottom: 0; background: var(--s1); }
   figure { margin: 16px 0; }
@@ -13883,6 +14125,60 @@ var BOARD_HTML = `<!doctype html>
       return JSON.stringify(k) + ':' + v;
     }).join(',') + '}';
   }
+  // The parts of a value drawn on one line, and what an http value says of each word.
+  var DOT = ' ' + String.fromCharCode(183) + ' ';
+  var FOUND = String.fromCharCode(10003);
+  var NOT_FOUND = String.fromCharCode(10007);
+  // An http value read as its parts: the status, the redirects, where it
+  // landed, and what it read off the body (when the status is 2xx) or that it
+  // did not. Numbers and strings are drawn as they are.
+  function httpText(h) {
+    var parts = [String(h.status), fill(S.observed.redirects, { n: h.redirects }), h.final_url];
+    if (h.body === null) parts.push(S.observed.bodyNotRead);
+    else if (h.body) {
+      if (h.body.words) {
+        parts.push(h.body.words.map(function (w) { return w.word + ' ' + (w.found ? FOUND : NOT_FOUND); }).join('  '));
+      }
+      if (h.body.count !== undefined) parts.push(fill(S.observed.count, { n: h.body.count }));
+      if (h.body.capture !== undefined) {
+        parts.push(h.body.capture === null ? S.observed.captureNone : fill(S.observed.capture, { value: JSON.stringify(h.body.capture) }));
+      }
+    }
+    return parts.join(DOT);
+  }
+  // A value of an observation as the page draws it: an http value in its
+  // shape read as its parts, one with words beside what it says of each, and
+  // any other as it is (a string) or as JSON. A test lifts this function.
+  function observedText(value, words, http) {
+    if (http) return httpText(http);
+    if (words) return withWords(value, words);
+    return shown(value);
+  }
+  // The value of an observation that moved, and what the previous record
+  // held: a value whose type alone moved ("12" and 12) is drawn as JSON, so
+  // that the two do not read the same. A test lifts this function.
+  function movedText(o) {
+    var m = o.moved;
+    var now = observedText(o.value, o.words, o.http);
+    if (m.status === 'none') return { now: now, then: S.observed.beforeNone };
+    if (m.value === null) {
+      return { now: now, then: S.observed.beforeNotObserved + (m.error ? '  (' + m.error + ')' : '') };
+    }
+    var then = observedText(m.value, m.words, m.http);
+    if ((typeof m.value === 'string') !== (typeof o.value === 'string')) {
+      then = JSON.stringify(m.value);
+      if (then === now) now = JSON.stringify(o.value);
+    }
+    return { now: now, then: fill(S.observed.before, { value: then }) + (m.error ? '  (' + m.error + ')' : '') };
+  }
+  // A measure's value: the paths of a file_paths by how many, a number with
+  // its unit, and a string (a file's name, a capture), which is no amount,
+  // without it.
+  function measureText(m) {
+    if (Array.isArray(m.value)) return num(m.value.length) + ' ' + m.unit;
+    return num(m.value) + (typeof m.value === 'number' ? ' ' + m.unit : '');
+  }
+  function signed(n) { return (n > 0 ? '+' : '') + num(n); }
   function stateName(state) { return S.states[state] || state; }
   function setStatus(message, isErr) {
     var s = $('status');
@@ -13967,17 +14263,36 @@ var BOARD_HTML = `<!doctype html>
     if (s.observed.length === 0) {
       observed = el('p', { class: 'muted', text: S.observed.none });
     } else {
-      var rows = s.observed.map(function (o) {
+      var rows = [];
+      s.observed.forEach(function (o) {
+        var cell = el('td', { class: 'wrap' });
         var value;
-        if (o.value !== null) value = o.words ? withWords(o.value, o.words) : shown(o.value);
-        else if (o.previous && o.previous.status === 'value') value = fill(S.observed.missing, { value: shown(o.previous.value) });
-        else if (o.previous && o.previous.status === 'unreadable') value = S.observed.missingPreviousUnreadable;
-        else value = S.observed.missingNoPrevious;
-        if (o.error) value += '  (' + o.error + ')';
-        return el('tr', null, [
-          el('td', { text: o.name }), el('td', { text: value }),
-          el('td', { text: o.observed_at }), el('td', { text: o.source })
-        ]);
+        if (o.value !== null && o.moved) {
+          var pair = movedText(o);
+          cell.appendChild(el('span', { class: 'chip changed', text: S.observed.changed }));
+          value = pair.now;
+          cell.appendChild(el('span', { text: value + (o.error ? '  (' + o.error + ')' : '') }));
+          cell.appendChild(el('div', { class: 'sub', text: pair.then }));
+        } else {
+          if (o.value !== null) value = observedText(o.value, o.words, o.http);
+          else if (o.previous && o.previous.status === 'value') value = fill(S.observed.missing, { value: shown(o.previous.value) });
+          else if (o.previous && o.previous.status === 'unreadable') value = S.observed.missingPreviousUnreadable;
+          else value = S.observed.missingNoPrevious;
+          if (o.error) value += '  (' + o.error + ')';
+          cell.appendChild(el('span', { text: value }));
+        }
+        // What the record's declaration says it is and looks at, under its name.
+        var what = o.kind ? [o.kind].concat(o.looks_at || []).join(DOT) : null;
+        rows.push(el('tr', null, [
+          el('td', null, [el('div', { text: o.name }), what === null ? null : el('div', { class: 'sub', text: what })]),
+          cell,
+          el('td', { text: o.observed_at }), el('td', { class: 'wrap', text: o.source })
+        ]));
+        if (o.notes && o.notes.length > 0) {
+          rows.push(el('tr', { class: 'notes' }, [el('td', { colspan: '4' }, [
+            el('ul', { class: 'sub' }, o.notes.map(function (n) { return el('li', null, [prose(n, 'span')]); }))
+          ])]));
+        }
       });
       observed = el('div', { class: 'scroll' }, [el('table', { class: 'grid' }, [
         el('tr', null, [
@@ -13987,12 +14302,16 @@ var BOARD_HTML = `<!doctype html>
       ].concat(rows))]);
     }
     var observedHeading = el('h3', { text: S.observed.heading }, [reported()]);
-    return section(S.sections.summary, false, [
+    var children = [
       el('div', null, [prose(s.text), reported()]),
       tiles,
       observedHeading,
       observed
-    ]);
+    ];
+    if (s.previous_record === 'unreadable' && s.observed.length > 0) {
+      children.push(el('p', { class: 'muted', text: S.observed.previousUnreadable }));
+    }
+    return section(S.sections.summary, false, children);
   }
 
   var SVGNS = 'http://www.w3.org/2000/svg';
@@ -14323,13 +14642,35 @@ var BOARD_HTML = `<!doctype html>
               el('ul', null, m.value.map(function (p) { return el('li', { text: p }); }))
             ])]);
           }
-          return el('li', { text: m.id + ': ' + num(m.value) + (m.value === null ? '' : ' ' + m.unit) });
+          // A string (a file's name, a capture) is no amount: it takes no unit.
+          return el('li', { text: m.id + ': ' + num(m.value) + (typeof m.value === 'number' ? ' ' + m.unit : '') });
         })));
       }
       return el('div', { class: 'lane', 'data-lane': lane.id }, body);
     }));
   }
 
+  // Every measure of the record, with the lanes it is drawn in and how much a
+  // number moved since the previous record.
+  function measures(b) {
+    if (b.measures.length === 0) {
+      return section(S.sections.measures, false, [el('p', { class: 'muted', text: S.measures.none })]);
+    }
+    var head = el('tr', null, [
+      el('th', { text: S.measures.id }), el('th', { text: S.measures.value }),
+      el('th', { text: S.measures.lanes }), el('th', { class: 'n', text: S.measures.delta })
+    ]);
+    var rows = b.measures.map(function (m) {
+      return el('tr', { 'data-measure': m.id }, [
+        el('td', null, [el('code', { text: m.id })]),
+        el('td', { class: 'wrap', text: measureText(m) }),
+        el('td', { text: m.lanes.length === 0 ? '-' : m.lanes.join(', ') }),
+        el('td', { class: 'n', text: m.delta === null || m.delta === undefined ? '' : signed(m.delta) })
+      ]);
+    });
+    return section(S.sections.measures, false, [el('div', { class: 'scroll' }, [el('table', { class: 'grid' }, [head].concat(rows))])]);
+  }
+
   function composition(b) {
     if (b.composition.length === 0) {
       return section(S.sections.composition, false, [el('p', { class: 'muted', text: S.composition.none })]);
@@ -14417,7 +14758,8 @@ var BOARD_HTML = `<!doctype html>
     var b = page.board;
     // The board's own title, so that boards open in other tabs can be told apart.
     document.title = b.heading.title;
-    [heading(b), summary(b), effort(b, false), matrix(b), lanes(b), composition(b), turns(b), footnotes(b)]
+    [heading(b), summary(b), effort(b, false), matrix(b), lanes(b), measures(b), composition(b), turns(b),
+      recordRepos(b), recordComponents(b), footnotes(b)]
       .forEach(function (node) { root.appendChild(node); });
   }
 
@@ -14443,12 +14785,14 @@ var BOARD_HTML = `<!doctype html>
   function missingIn(l) {
     return function (at) { return l.footnotes.not_found.some(function (n) { return n.at === at; }); };
   }
-  function liveRepos(l) {
-    var missing = missingIn(l);
+  // The repositories as a table. older: a record of version 1 or 2, which
+  // measured no base, ahead or fetch time (drawn as '-') and held the
+  // commits behind as behind_main.
+  function reposTable(list, missing, older) {
     var labels = [S.live.repo, S.live.branch, S.live.head, S.live.lastCommit, S.live.commits, S.live.uncommitted, S.live.base, S.live.behind, S.live.ahead, S.live.fetchedAt];
     var numeric = [4, 5, 7, 8];
     var head = el('tr', null, labels.map(function (label, i) { return el('th', { class: numeric.indexOf(i) !== -1 ? 'n' : '', text: label }); }));
-    var rows = l.repos.map(function (r) {
+    var rows = list.map(function (r) {
       var at = 'repos[' + r.path + ']';
       // A null the measurement says it could not measure, or one that means
       // so (a detached HEAD, no commit yet, no base, no fetch of it on
@@ -14457,6 +14801,7 @@ var BOARD_HTML = `<!doctype html>
         if (v !== null) return show(v);
         return missing(at) || missing(at + '.' + field) ? S.tiles.notMeasured : '-';
       };
+      var unmeasured = function (field, v, show) { return older ? '-' : value(field, v, show); };
       return el('tr', null, [
         el('td', { text: r.name === null ? r.path : r.name }),
         el('td', { text: value('branch', r.branch, String) }),
@@ -14464,13 +14809,59 @@ var BOARD_HTML = `<!doctype html>
         el('td', { text: value('last_commit', r.last_commit, when) }),
         el('td', { class: 'n', text: num(r.commits) }),
         el('td', { class: 'n', text: num(r.uncommitted) }),
-        el('td', { text: value('base', r.base, String) }),
-        el('td', { class: 'n', text: value('behind', r.behind, num) }),
-        el('td', { class: 'n', text: value('ahead', r.ahead, num) }),
-        el('td', { text: value('fetched_at', r.fetched_at, when) })
+        el('td', { text: unmeasured('base', r.base, String) }),
+        el('td', { class: 'n', text: value(older ? 'behind_main' : 'behind', r.behind, num) }),
+        el('td', { class: 'n', text: unmeasured('ahead', r.ahead, num) }),
+        el('td', { text: unmeasured('fetched_at', r.fetched_at, when) })
+      ]);
+    });
+    return el('div', { class: 'scroll' }, [el('table', { class: 'grid' }, [head].concat(rows))]);
+  }
+  function liveRepos(l) {
+    return section(S.live.repos, false, [reposTable(l.repos, missingIn(l), false)]);
+  }
+  // The repositories as the record measured them, by its version.
+  function recordRepos(b) {
+    var r = b.repos;
+    if (!r) return section(S.live.repos, false, [el('p', { class: 'muted', text: S.record.reposUnread })]);
+    var children = [reposTable(r.list, missingIn(b), !r.base_measured)];
+    if (!r.base_measured) children.push(el('p', { class: 'muted', text: fill(S.record.notMeasuredByVersion, { version: r.record_version }) }));
+    return section(S.live.repos, false, children);
+  }
+  // The components the record found, by the lanes its registry counts them
+  // in, then those in no lane, those not registered, and those gone.
+  function recordComponents(b) {
+    var c = b.components;
+    if (!c) return section(S.live.components, false, [el('p', { class: 'muted', text: S.record.componentsUnread })]);
+    if (!c.measured) {
+      return section(S.live.components, false, [
+        el('p', { class: 'muted', text: S.record.componentsNotMeasured }),
+        el('ul', null, c.reasons.map(function (reason) { return el('li', { text: reason }); }))
       ]);
+    }
+    var item = function (x) {
+      var kinds = x.kinds === null ? S.record.notFound : x.kinds.join(', ');
+      var parts = [el('code', { text: x.key }), el('span', { class: 'muted', text: '  ' + kinds })];
+      if (x.kind_changed) {
+        parts.push(el('span', { class: 'chip changed', text: fill(S.record.kindChanged, { before: x.kind_changed.before.join(', ') }) }));
+      }
+      if (x.note) parts.push(el('div', { class: 'sub', text: x.note }));
+      return el('li', { 'data-component': x.key }, parts);
+    };
+    var group = function (title, list, empty) {
+      return [el('h3', { text: title }), list.length === 0 ? el('p', { class: 'muted', text: empty }) : el('ul', null, list.map(item))];
+    };
+    var children = [];
+    c.lanes.forEach(function (lane) {
+      children = children.concat(group(lane.name, lane.components, S.record.noComponentInLane));
     });
-    return section(S.live.repos, false, [el('div', { class: 'scroll' }, [el('table', { class: 'grid' }, [head].concat(rows))])]);
+    children = children.concat(group(S.record.uncounted, c.uncounted, S.record.none));
+    children = children.concat(group(S.record.unacknowledged, c.unacknowledged, S.record.none));
+    children.push(el('h3', { text: S.record.gone }));
+    children.push(c.gone === null ? el('p', { class: 'muted', text: S.record.goneUnknown })
+      : c.gone.length === 0 ? el('p', { class: 'muted', text: S.record.none })
+      : el('ul', null, c.gone.map(function (key) { return el('li', null, [el('code', { text: key })]); })));
+    return section(S.live.components, false, children);
   }
   function liveTrail(l) {
     var t = l.trail;
@@ -16131,7 +16522,7 @@ function installExperimentalNotice(program2, names = EXPERIMENTAL_COMMANDS, writ
 function readBuildStamp() {
   if (false) return void 0;
   try {
-    return JSON.parse('{"version":"0.71.1","commit":"5097e32","committedAt":"2026-10-19T07:43:16+09:00"}');
+    return JSON.parse('{"version":"0.72.0","commit":"f92df50","committedAt":"2026-10-20T12:15:21+09:00"}');
   } catch {
     return void 0;
   }