@basou/core 0.6.0 → 0.8.0

package/dist/index.d.ts

@@ -89,6 +89,9 @@ declare const ManifestSchema: z.ZodObject<{
             commit: "commit";
         }>>;
     }, z.core.$strip>;
+    import: z.ZodOptional<z.ZodObject<{
+        source_roots: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    }, z.core.$strip>>;
 }, z.core.$strip>;
 /** Inferred runtime type for {@link ManifestSchema}. */
 type Manifest = z.infer<typeof ManifestSchema>;
@@ -101,14 +104,15 @@ declare const SessionInnerImportSchema: z.ZodObject<{
     source: z.ZodObject<{
         kind: z.ZodEnum<{
             "claude-code-adapter": "claude-code-adapter";
+            import: "import";
             "claude-code-import": "claude-code-import";
             "codex-import": "codex-import";
             human: "human";
-            import: "import";
             terminal: "terminal";
         }>;
         version: z.ZodLiteral<"0.1.0">;
         external_id: z.ZodOptional<z.ZodString>;
+        source_size_bytes: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>;
     started_at: z.ZodString;
     ended_at: z.ZodOptional<z.ZodString>;
@@ -161,14 +165,15 @@ declare const SessionImportPayloadSchema: z.ZodObject<{
         source: z.ZodObject<{
             kind: z.ZodEnum<{
                 "claude-code-adapter": "claude-code-adapter";
+                import: "import";
                 "claude-code-import": "claude-code-import";
                 "codex-import": "codex-import";
                 human: "human";
-                import: "import";
                 terminal: "terminal";
             }>;
             version: z.ZodLiteral<"0.1.0">;
             external_id: z.ZodOptional<z.ZodString>;
+            source_size_bytes: z.ZodOptional<z.ZodNumber>;
         }, z.core.$strip>;
         started_at: z.ZodString;
         ended_at: z.ZodOptional<z.ZodString>;
@@ -448,6 +453,14 @@ type ClaudeTranscriptToPayloadOptions = {
      * back to the `sessionId` read from the records when omitted.
      */
     externalId?: string;
+    /**
+     * Byte size of the source transcript that produced `records`, stored as
+     * `session.source.source_size_bytes` so a later import can detect growth and
+     * re-import the session. The caller passes the size of the buffer it actually
+     * read (an immutable snapshot of the parsed bytes), so the stored size always
+     * matches the imported content. Omitted => the field is not recorded.
+     */
+    sourceSizeBytes?: number;
 };
 /**
  * Transform a Claude Code native transcript into a Basou
@@ -503,6 +516,14 @@ type CodexRolloutToPayloadOptions = {
      * to the id read from the rollout's `session_meta` record when omitted.
      */
     externalId?: string;
+    /**
+     * Byte size of the source rollout that produced `records`, stored as
+     * `session.source.source_size_bytes` so a later import can detect growth and
+     * re-import the session. The caller passes the size of the buffer it actually
+     * read (an immutable snapshot of the parsed bytes), so the stored size always
+     * matches the imported content. Omitted => the field is not recorded.
+     */
+    sourceSizeBytes?: number;
 };
 /**
  * Transform a Codex native rollout log into a Basou {@link SessionImportPayload},
@@ -1271,10 +1292,10 @@ type SessionStatus = z.infer<typeof SessionStatusSchema>;
  */
 declare const SessionSourceKindSchema: z.ZodEnum<{
     "claude-code-adapter": "claude-code-adapter";
+    import: "import";
     "claude-code-import": "claude-code-import";
     "codex-import": "codex-import";
     human: "human";
-    import: "import";
     terminal: "terminal";
 }>;
 /** Inferred runtime type for {@link SessionSourceKindSchema}. */
@@ -1339,14 +1360,15 @@ declare const SessionSchema: z.ZodObject<{
         source: z.ZodObject<{
             kind: z.ZodEnum<{
                 "claude-code-adapter": "claude-code-adapter";
+                import: "import";
                 "claude-code-import": "claude-code-import";
                 "codex-import": "codex-import";
                 human: "human";
-                import: "import";
                 terminal: "terminal";
             }>;
             version: z.ZodLiteral<"0.1.0">;
             external_id: z.ZodOptional<z.ZodString>;
+            source_size_bytes: z.ZodOptional<z.ZodNumber>;
         }, z.core.$strip>;
         started_at: z.ZodString;
         ended_at: z.ZodOptional<z.ZodString>;
@@ -3146,6 +3168,14 @@ type CreateManifestInput = {
     now?: Date;
     /** Override for tests; defaults to a freshly generated `ws_<ULID>`. */
     workspaceId?: PrefixedId<"ws">;
+    /**
+     * Import source roots, each RELATIVE to the repository root (e.g. `"."`,
+     * `"../basou-workspace"`). Persisted under `import.source_roots` so
+     * `basou refresh` / `basou import` aggregate several sibling repos into one
+     * `.basou/`. Validated by `ManifestSchema` (absolute paths are rejected).
+     * Omitted from the manifest entirely when absent or empty.
+     */
+    sourceRoots?: string[];
 };
 /**
  * Build a fresh Manifest object that satisfies the manifest schema's
@@ -3295,6 +3325,44 @@ type ImportSessionResult = {
  * for `--verbose` rendering.
  */
 declare function importSessionFromJson(paths: BasouPaths, manifest: Manifest, payload: SessionImportPayload, options: ImportSessionOptions): Promise<ImportSessionResult>;
+/** Whether `source` is one of the known import-derived event sources. */
+declare function isImportDerivedSource(source: string): boolean;
+/** Options for {@link reimportPreservingId}. */
+type ReimportOptions = {
+    /** Compute the re-import and return its preview without writing to disk. */
+    dryRun?: boolean;
+};
+/** Result of {@link reimportPreservingId}. */
+type ReimportResult = {
+    status: "reimported";
+    sessionId: PrefixedId<"ses">;
+    /** Total events written to the merged `events.jsonl`. */
+    eventCount: number;
+    /** Non-derived events (human / unknown source) carried over unchanged. */
+    preservedCount: number;
+    /** Derived events whose prior id (and decision_id) was reused. */
+    reusedIdCount: number;
+} | {
+    status: "skipped";
+    reason: "prior_events_unreadable" | "prior_derived_dropped";
+};
+/**
+ * Re-import a source whose native log GREW into the SAME Basou session,
+ * preserving its id and any non-derived events, instead of skipping it (default
+ * dedup) or deleting + recreating it (`--force`). The caller has already
+ * validated `freshPayload` and confirmed (by source byte size) that the source
+ * changed; this function re-derives the adapter's events, reuses prior derived
+ * event ids for unchanged derivations (so `linked_events` references survive),
+ * preserves human / unknown-source events, and rewrites `events.jsonl` +
+ * `session.yaml` atomically under the session lock.
+ *
+ * The whole read-modify-write runs under {@link acquireLock} so a concurrent
+ * writer cannot interleave; `dryRun` computes the result and writes nothing
+ * (and takes no lock). If the prior `events.jsonl` has any line that cannot be
+ * preserved (malformed / schema-invalid / half-written), the re-import is
+ * ABORTED (`status: "skipped"`) rather than risk dropping data on the rewrite.
+ */
+declare function reimportPreservingId(paths: BasouPaths, manifest: Manifest, priorSessionId: string, freshPayload: SessionImportPayload, options?: ReimportOptions): Promise<ReimportResult>;
 
 /**
  * Walk the cause chain (up to `depth` levels) looking for an Error whose
@@ -3396,4 +3464,4 @@ declare function overwriteYamlFile(filePath: string, value: unknown): Promise<vo
  */
 declare const BASOU_CORE_VERSION = "0.1.0";
 
-export { ACTIVE_GAP_CAP_MS, type ActiveTimeBasis, type AdapterOutputEvent, type AppendBasouGitignoreResult, type AppendEventToExistingInput, type AppendEventToExistingResult, type Approval, type ApprovalApprovedEvent, type ApprovalExpiredEvent, ApprovalIdSchema, type ApprovalLocation, type ApprovalRejectedEvent, type ApprovalRequestedEvent, ApprovalSchema, type ApprovalStatus, ApprovalStatusSchema, type ArchiveTaskInput, type ArchiveTaskResult, type AttachTaskInput, type AttachUpdateTaskStatusInput, type AttachableStatus, BASOU_CORE_VERSION, type BasouPaths, CLAUDE_IMPORT_SOURCE, CODEX_IMPORT_SOURCE, type CaptureMode, ChildProcessRunner, type ClaudeTranscriptRecord, type ClaudeTranscriptToPayloadOptions, type CodexRolloutRecord, type CodexRolloutToPayloadOptions, type CommandExecutedEvent, type CommandLookup, type CreateAdHocSessionInput, type CreateAdHocSessionResult, type CreateAdHocTaskInput, type CreateManifestInput, type CreateTaskInput, type CreateTaskResult, type DayWorkStats, DecisionIdSchema, type DecisionRecordedEvent, type DecisionsRendererInput, type DecisionsRendererResult, type DeleteTaskInput, type DeleteTaskResult, type DiffResult, type EditTaskInput, type EditTaskResult, type Event, EventIdSchema, EventSchema, EventSourceSchema, FailedToFinalizeError, type FileChange, type FileChangeStatus, type FileChangedEvent, GENERATED_END, GENERATED_START, type GitSnapshot, type GitSnapshotEvent, type HandoffRendererInput, type HandoffRendererResult, ID_PREFIXES, type IdPrefix, type ImportSessionOptions, type ImportSessionResult, IsoTimestampSchema, JSON_SCHEMA_VERSION, type JsonSchemaArtifact, type LoadSessionEntriesOptions, type LoadTaskEntriesOptions, type LoadedApproval, type LockHandle, type LockScope, type Manifest, ManifestSchema, type MarkerSection, type MeasureAvailability, type NoteAddedEvent, type PrefixedId, type ProcessRunner, type ReconcileAllResult, type ReconcileAllTasksInput, type ReconcileAllTasksOptions, type ReconcileFailure, type ReconcileResult, type ReconcileTaskInput, type RefreshLinkageInput, type RefreshLinkageResult, type ReplayOptions, type ReplayWarning, type RiskLevel, RiskLevelSchema, type RunOptions, type RunResult, STUCK_THRESHOLD_MS, type SanitizePathOptions, type SanitizeRelatedFilesResult, SchemaVersionSchema, type Session, type SessionEndedEvent, type SessionEntry, SessionIdSchema, type SessionImportPayload, SessionImportPayloadSchema, type SessionInnerImportInput, SessionInnerImportSchema, type SessionMetrics, SessionMetricsSchema, SessionSchema, type SessionSkipReason, type SessionSourceKind, SessionSourceKindSchema, type SessionStartedEvent, type SessionStatus, type SessionStatusChangedEvent, SessionStatusSchema, type SessionWorkStats, type SourceWorkStats, type StatusCount, StatusSchema, type StatusSnapshot, type SuspectReason, type Task, type TaskArchivedEvent, type TaskCreatedEvent, type TaskDeletedEvent, type TaskDocument, TaskIdSchema, type TaskLinkageRefreshedEvent, type TaskReconciledEvent, TaskSchema, type TaskSkipReason, type TaskStatus, type TaskStatusChangedEvent, TaskStatusSchema, TaskWriteAfterEventError, type TaskWriteAfterEventPhase, type TokenTotals, type UpdateAdHocTaskStatusInput, type UpdateTaskStatusInput, type UpdateTaskStatusResult, type WorkStatsInput, type WorkStatsResult, type WorkStatsTotals, WorkspaceIdSchema, type WriteTaskFileMode, acquireLock, appendBasouGitignore, appendEvent, appendEventToExistingSession, archiveTask, assertBasouRootSafe, basouPaths, buildJsonSchemas, buildStatusSnapshot, classifySuspect, claudeCodeAdapterMetadata, claudeTranscriptToImportPayload, codexRolloutToImportPayload, computeWorkStats, createAdHocSessionWithEvent, createManifest, createTaskWithEvent, deleteTask, editTask, ensureBasouDirectory, enumerateApprovals, enumerateArchivedTaskIds, enumerateSessionDirs, enumerateTaskIds, findErrorCode, getDiff, getSnapshot, importSessionFromJson, isLazyExpired, isValidPrefixedId, linkYamlFile, loadApproval, loadSessionEntries, loadTaskEntries, overwriteYamlFile, parseDuration, parseMarkers, prefixedUlid, readAllEvents, readManifest, readMarkdownFile, readSessionYaml, readStatus, readTaskFile, readTaskFileWithArchiveFallback, readYamlFile, reconcileAllTasks, reconcileTask, refreshTaskLinkedSessions, renderDecisions, renderHandoff, renderWithMarkers, replayEvents, resolveClaudeCodeCommand, resolveRepositoryRoot, resolveSessionId, resolveTaskId, sanitizePath, sanitizeRelatedFiles, sanitizeWorkingDirectory, serializeJsonSchema, sessionWorkStatsFromEvents, summarizeAdapterOutput, tryRemoteUrl, ulid, updateTaskStatusWithEvent, writeEventsBulk, writeManifest, writeMarkdownFile, writeStatus, writeTaskFile, writeYamlFile };
+export { ACTIVE_GAP_CAP_MS, type ActiveTimeBasis, type AdapterOutputEvent, type AppendBasouGitignoreResult, type AppendEventToExistingInput, type AppendEventToExistingResult, type Approval, type ApprovalApprovedEvent, type ApprovalExpiredEvent, ApprovalIdSchema, type ApprovalLocation, type ApprovalRejectedEvent, type ApprovalRequestedEvent, ApprovalSchema, type ApprovalStatus, ApprovalStatusSchema, type ArchiveTaskInput, type ArchiveTaskResult, type AttachTaskInput, type AttachUpdateTaskStatusInput, type AttachableStatus, BASOU_CORE_VERSION, type BasouPaths, CLAUDE_IMPORT_SOURCE, CODEX_IMPORT_SOURCE, type CaptureMode, ChildProcessRunner, type ClaudeTranscriptRecord, type ClaudeTranscriptToPayloadOptions, type CodexRolloutRecord, type CodexRolloutToPayloadOptions, type CommandExecutedEvent, type CommandLookup, type CreateAdHocSessionInput, type CreateAdHocSessionResult, type CreateAdHocTaskInput, type CreateManifestInput, type CreateTaskInput, type CreateTaskResult, type DayWorkStats, DecisionIdSchema, type DecisionRecordedEvent, type DecisionsRendererInput, type DecisionsRendererResult, type DeleteTaskInput, type DeleteTaskResult, type DiffResult, type EditTaskInput, type EditTaskResult, type Event, EventIdSchema, EventSchema, EventSourceSchema, FailedToFinalizeError, type FileChange, type FileChangeStatus, type FileChangedEvent, GENERATED_END, GENERATED_START, type GitSnapshot, type GitSnapshotEvent, type HandoffRendererInput, type HandoffRendererResult, ID_PREFIXES, type IdPrefix, type ImportSessionOptions, type ImportSessionResult, IsoTimestampSchema, JSON_SCHEMA_VERSION, type JsonSchemaArtifact, type LoadSessionEntriesOptions, type LoadTaskEntriesOptions, type LoadedApproval, type LockHandle, type LockScope, type Manifest, ManifestSchema, type MarkerSection, type MeasureAvailability, type NoteAddedEvent, type PrefixedId, type ProcessRunner, type ReconcileAllResult, type ReconcileAllTasksInput, type ReconcileAllTasksOptions, type ReconcileFailure, type ReconcileResult, type ReconcileTaskInput, type RefreshLinkageInput, type RefreshLinkageResult, type ReimportOptions, type ReimportResult, type ReplayOptions, type ReplayWarning, type RiskLevel, RiskLevelSchema, type RunOptions, type RunResult, STUCK_THRESHOLD_MS, type SanitizePathOptions, type SanitizeRelatedFilesResult, SchemaVersionSchema, type Session, type SessionEndedEvent, type SessionEntry, SessionIdSchema, type SessionImportPayload, SessionImportPayloadSchema, type SessionInnerImportInput, SessionInnerImportSchema, type SessionMetrics, SessionMetricsSchema, SessionSchema, type SessionSkipReason, type SessionSourceKind, SessionSourceKindSchema, type SessionStartedEvent, type SessionStatus, type SessionStatusChangedEvent, SessionStatusSchema, type SessionWorkStats, type SourceWorkStats, type StatusCount, StatusSchema, type StatusSnapshot, type SuspectReason, type Task, type TaskArchivedEvent, type TaskCreatedEvent, type TaskDeletedEvent, type TaskDocument, TaskIdSchema, type TaskLinkageRefreshedEvent, type TaskReconciledEvent, TaskSchema, type TaskSkipReason, type TaskStatus, type TaskStatusChangedEvent, TaskStatusSchema, TaskWriteAfterEventError, type TaskWriteAfterEventPhase, type TokenTotals, type UpdateAdHocTaskStatusInput, type UpdateTaskStatusInput, type UpdateTaskStatusResult, type WorkStatsInput, type WorkStatsResult, type WorkStatsTotals, WorkspaceIdSchema, type WriteTaskFileMode, acquireLock, appendBasouGitignore, appendEvent, appendEventToExistingSession, archiveTask, assertBasouRootSafe, basouPaths, buildJsonSchemas, buildStatusSnapshot, classifySuspect, claudeCodeAdapterMetadata, claudeTranscriptToImportPayload, codexRolloutToImportPayload, computeWorkStats, createAdHocSessionWithEvent, createManifest, createTaskWithEvent, deleteTask, editTask, ensureBasouDirectory, enumerateApprovals, enumerateArchivedTaskIds, enumerateSessionDirs, enumerateTaskIds, findErrorCode, getDiff, getSnapshot, importSessionFromJson, isImportDerivedSource, isLazyExpired, isValidPrefixedId, linkYamlFile, loadApproval, loadSessionEntries, loadTaskEntries, overwriteYamlFile, parseDuration, parseMarkers, prefixedUlid, readAllEvents, readManifest, readMarkdownFile, readSessionYaml, readStatus, readTaskFile, readTaskFileWithArchiveFallback, readYamlFile, reconcileAllTasks, reconcileTask, refreshTaskLinkedSessions, reimportPreservingId, renderDecisions, renderHandoff, renderWithMarkers, replayEvents, resolveClaudeCodeCommand, resolveRepositoryRoot, resolveSessionId, resolveTaskId, sanitizePath, sanitizeRelatedFiles, sanitizeWorkingDirectory, serializeJsonSchema, sessionWorkStatsFromEvents, summarizeAdapterOutput, tryRemoteUrl, ulid, updateTaskStatusWithEvent, writeEventsBulk, writeManifest, writeMarkdownFile, writeStatus, writeTaskFile, writeYamlFile };

package/dist/index.js

@@ -224,7 +224,8 @@ function claudeTranscriptToImportPayload(records, options) {
       source: {
         kind: CLAUDE_IMPORT_SOURCE,
         version: "0.1.0",
-        ...externalId !== void 0 ? { external_id: externalId } : {}
+        ...externalId !== void 0 ? { external_id: externalId } : {},
+        ...options.sourceSizeBytes !== void 0 ? { source_size_bytes: options.sourceSizeBytes } : {}
       },
       started_at: minTs,
       ended_at: maxTs,
@@ -457,7 +458,8 @@ function codexRolloutToImportPayload(records, options) {
       source: {
         kind: CODEX_IMPORT_SOURCE,
         version: "0.1.0",
-        ...externalId !== void 0 ? { external_id: externalId } : {}
+        ...externalId !== void 0 ? { external_id: externalId } : {},
+        ...options.sourceSizeBytes !== void 0 ? { source_size_bytes: options.sourceSizeBytes } : {}
       },
       started_at: minTs,
       ended_at: maxTs,
@@ -1032,7 +1034,15 @@ var SessionSourceSchema = z4.object({
   // Optional id of the originating session in the SOURCE tool's own
   // namespace (e.g. the Claude Code session UUID for a `claude-code-import`).
   // Lets re-imports of the same source be deduplicated; absent for live runs.
-  external_id: z4.string().optional()
+  external_id: z4.string().optional(),
+  // Byte size of the source native log at import time, recorded so a later
+  // import can detect that an append-only transcript GREW and re-import it
+  // (scoped, preserving the session id) instead of skipping it as already
+  // imported. Additive optional => no schema_version bump (precedent:
+  // external_id, metrics). Absent on sessions imported before this field
+  // existed (treated as legacy: never auto-re-imported, populated on the next
+  // fresh import or `--force`).
+  source_size_bytes: z4.number().int().nonnegative().optional()
 });
 var InvocationSchema = z4.object({
   command: z4.string().min(1),
@@ -3885,6 +3895,13 @@ var AdaptersSchema = z9.object({
 var GitConfigSchema = z9.object({
   events_log: z9.enum(["ignore", "commit"]).default("ignore")
 });
+var SOURCE_ROOT_PATTERN = /^(?![~/\\])(?![A-Za-z]:)[^\0\\]+$/;
+var SourceRootSchema = z9.string().min(1).regex(SOURCE_ROOT_PATTERN, {
+  message: "source_roots entries must be relative paths (no absolute path, '~', '\\', or null byte)"
+});
+var ImportConfigSchema = z9.object({
+  source_roots: z9.array(SourceRootSchema).min(1).optional()
+});
 var WorkspaceMetaSchema = z9.object({
   id: WorkspaceIdSchema,
   name: z9.string().min(1),
@@ -3899,7 +3916,8 @@ var ManifestSchema = z9.object({
   capabilities: CapabilitiesSchema,
   approval: ApprovalConfigSchema,
   adapters: AdaptersSchema,
-  git: GitConfigSchema
+  git: GitConfigSchema,
+  import: ImportConfigSchema.optional()
 });
 
 // src/schemas/session-import.schema.ts
@@ -3914,7 +3932,13 @@ var SessionInnerImportSchema = z10.object({
     version: z10.literal("0.1.0"),
     // Source-tool-native id (e.g. Claude Code session UUID), retained so
     // re-imports of the same source can be deduplicated.
-    external_id: z10.string().optional()
+    external_id: z10.string().optional(),
+    // Byte size of the source native log at import time. Declared here too
+    // (not only in session.schema.ts) because this inner `source` object is
+    // a plain z.object: zod strips keys it does not declare, so a field
+    // absent here would be dropped from the parsed payload before persist
+    // and the size could never be stored.
+    source_size_bytes: z10.number().int().nonnegative().optional()
   }),
   started_at: IsoTimestampSchema,
   ended_at: IsoTimestampSchema.optional(),
@@ -3987,7 +4011,7 @@ var DOCUMENTS = [
     name: "session-import",
     schema: SessionImportPayloadSchema,
     title: "Basou Session Import Payload",
-    description: "The portable session payload consumed by `basou session import` (and produced by `basou session export`)."
+    description: "The portable session payload consumed by `basou session import`."
   }
 ];
 function buildJsonSchemas() {
@@ -4454,7 +4478,8 @@ function createManifest(input) {
     adapters: {
       "claude-code": { enabled: true }
     },
-    git: { events_log: "ignore" }
+    git: { events_log: "ignore" },
+    ...input.sourceRoots !== void 0 && input.sourceRoots.length > 0 ? { import: { source_roots: input.sourceRoots } } : {}
   };
   return ManifestSchema.parse(manifest);
 }
@@ -4722,6 +4747,130 @@ function buildSessionRecord(input, manifest, newSessionId, options) {
     }
   };
 }
+var IMPORT_DERIVED_SOURCES = /* @__PURE__ */ new Set([
+  "claude-code-import",
+  "codex-import"
+]);
+function isImportDerivedSource(source) {
+  return IMPORT_DERIVED_SOURCES.has(source);
+}
+function derivedEventContentKey(event) {
+  const base = `${event.type}\0${event.occurred_at}`;
+  switch (event.type) {
+    case "command_executed":
+      return `${base}\0${event.command}\0${event.args.join("
")}\0${event.cwd}`;
+    case "file_changed":
+      return `${base}\0${event.path}\0${event.change_type}`;
+    case "decision_recorded":
+      return `${base}\0${event.title}`;
+    default:
+      return base;
+  }
+}
+function reuseDerivedIds(priorDerived, freshDerived, sessionId) {
+  const priorStarted = priorDerived.find((e) => e.type === "session_started");
+  const priorEnded = priorDerived.find((e) => e.type === "session_ended");
+  let startedUsed = false;
+  let endedUsed = false;
+  const middleByKey = /* @__PURE__ */ new Map();
+  for (const e of priorDerived) {
+    if (e.type === "session_started" || e.type === "session_ended") continue;
+    const key = derivedEventContentKey(e);
+    const list = middleByKey.get(key);
+    if (list === void 0) middleByKey.set(key, [e]);
+    else list.push(e);
+  }
+  let reusedIdCount = 0;
+  const withReusedId = (fresh, prior) => {
+    reusedIdCount++;
+    if (fresh.type === "decision_recorded" && prior.type === "decision_recorded") {
+      return { ...fresh, id: prior.id, session_id: sessionId, decision_id: prior.decision_id };
+    }
+    return { ...fresh, id: prior.id, session_id: sessionId };
+  };
+  const events = freshDerived.map((fresh) => {
+    if (fresh.type === "session_started") {
+      if (priorStarted !== void 0) {
+        startedUsed = true;
+        return withReusedId(fresh, priorStarted);
+      }
+      return { ...fresh, id: prefixedUlid("evt"), session_id: sessionId };
+    }
+    if (fresh.type === "session_ended") {
+      if (priorEnded !== void 0) {
+        endedUsed = true;
+        return withReusedId(fresh, priorEnded);
+      }
+      return { ...fresh, id: prefixedUlid("evt"), session_id: sessionId };
+    }
+    const match = middleByKey.get(derivedEventContentKey(fresh))?.shift();
+    if (match !== void 0) return withReusedId(fresh, match);
+    return { ...fresh, id: prefixedUlid("evt"), session_id: sessionId };
+  });
+  const droppedPriorDerived = priorStarted !== void 0 && !startedUsed || priorEnded !== void 0 && !endedUsed || [...middleByKey.values()].some((q) => q.length > 0);
+  return { events, reusedIdCount, droppedPriorDerived };
+}
+async function reimportPreservingId(paths, manifest, priorSessionId, freshPayload, options = {}) {
+  const sessionId = priorSessionId;
+  const importSource = freshPayload.session.source.kind;
+  const sessionDir = join14(paths.sessions, priorSessionId);
+  const lock = options.dryRun === true ? null : await acquireLock(paths, "session", priorSessionId);
+  try {
+    let priorUnreadable = false;
+    const priorEvents = await readAllEvents(sessionDir, {
+      onWarning: () => {
+        priorUnreadable = true;
+      }
+    });
+    if (priorUnreadable) {
+      return { status: "skipped", reason: "prior_events_unreadable" };
+    }
+    const priorDerived = priorEvents.filter((e) => e.source === importSource);
+    const preserved = priorEvents.filter((e) => e.source !== importSource);
+    const {
+      events: rederived,
+      reusedIdCount,
+      droppedPriorDerived
+    } = reuseDerivedIds(priorDerived, freshPayload.events, sessionId);
+    if (droppedPriorDerived) {
+      return { status: "skipped", reason: "prior_derived_dropped" };
+    }
+    const mergedEvents = [...rederived, ...preserved].sort(
+      (a, b) => Date.parse(a.occurred_at) - Date.parse(b.occurred_at)
+    );
+    assertChronologicalOrder(mergedEvents);
+    const prior = await readSessionYaml(paths, priorSessionId);
+    const { record } = buildSessionRecord(freshPayload.session, manifest, sessionId, {});
+    const preservedInner = {
+      ...record.session,
+      // A human may have linked this imported session to a task
+      // (`basou task link` updates session.yaml.task_id even for imported
+      // sessions); never drop that link on a re-derive.
+      task_id: prior.session.task_id ?? null,
+      // Re-derivation always yields a null summary; keep a prior non-null one.
+      summary: prior.session.summary ?? record.session.summary ?? null
+    };
+    const updatedRecord = { schema_version: "0.1.0", session: preservedInner };
+    if (options.dryRun !== true) {
+      await writeEventsBulk(sessionDir, mergedEvents);
+      try {
+        await overwriteYamlFile(join14(sessionDir, "session.yaml"), updatedRecord);
+      } catch (error) {
+        await writeEventsBulk(sessionDir, priorEvents).catch(() => void 0);
+        throw error;
+      }
+    }
+    return {
+      status: "reimported",
+      sessionId,
+      eventCount: mergedEvents.length,
+      preservedCount: preserved.length,
+      reusedIdCount
+    };
+  } finally {
+    await lock?.release();
+  }
+}
 
 // src/index.ts
 var BASOU_CORE_VERSION = "0.1.0";
@@ -4789,6 +4938,7 @@ export {
   getDiff,
   getSnapshot,
   importSessionFromJson,
+  isImportDerivedSource,
   isLazyExpired,
   isValidPrefixedId,
   linkYamlFile,
@@ -4810,6 +4960,7 @@ export {
   reconcileAllTasks,
   reconcileTask,
   refreshTaskLinkedSessions,
+  reimportPreservingId,
   renderDecisions,
   renderHandoff,
   renderWithMarkers,