@basou/core 0.14.0 → 0.15.0

package/dist/index.d.ts

@@ -3170,6 +3170,7 @@ type DecisionRecord = {
     decisionId: string;
     title: string;
     occurredAt: string;
+    sessionId: string;
 };
 type NoteRecord = {
     body: string;
@@ -5001,15 +5002,26 @@ declare function readManifest(paths: BasouPaths): Promise<Manifest>;
 declare const GENERATED_START = "<!-- BASOU:GENERATED:START -->";
 /** Marker line that ends the auto-generated region. */
 declare const GENERATED_END = "<!-- BASOU:GENERATED:END -->";
+/** Marker line that begins a managed protocol block in a foreign instruction file. */
+declare const PROTOCOL_START = "<!-- BASOU:PROTOCOLS:START -->";
+/** Marker line that ends a managed protocol block. */
+declare const PROTOCOL_END = "<!-- BASOU:PROTOCOLS:END -->";
+/** A start/end marker pair. Both lines are matched whole-line, exact. */
+type Markers = {
+    start: string;
+    end: string;
+};
 /**
  * Result of parsing a markdown body for the BASOU:GENERATED marker region.
  *
  * The spec mandates strict line-level matching (see
  * `docs/spec/generated-markdown.md#102-marker-convention`): a marker is
  * only recognized when an entire line is exactly the marker string.
- * Leading/trailing whitespace, comment compression, and BOM are treated as
- * legacy formats (`no_markers`) so that re-generation refuses to silently
- * overwrite a mismatched manual edit.
+ * Leading/trailing whitespace and comment compression are treated as legacy
+ * formats (`no_markers`) so that re-generation refuses to silently overwrite a
+ * mismatched manual edit. A leading UTF-8 BOM is the one exception: it is
+ * tolerated (stripped for matching, re-prepended on render) so a BOM-prefixed
+ * file round-trips instead of duplicating the block.
  */
 type MarkerSection = {
     kind: "ok";
@@ -5056,11 +5068,13 @@ declare function writeMarkdownFile(filePath: string, body: string): Promise<void
  * - `multiple_pairs`: more than one START or END line.
  * - `wrong_order`: END appears before START.
  *
- * Matching is strict: leading/trailing whitespace, BOM, and comment
- * compression (`<!--BASOU:...-->`) all bypass the marker and are treated
- * as legacy content.
+ * Matching is strict: leading/trailing whitespace and comment compression
+ * (`<!--BASOU:...-->`) bypass the marker and are treated as legacy content. A
+ * leading UTF-8 BOM is the exception: it is stripped before matching and
+ * re-prepended to `before`, so a marker on the first line of a BOM-prefixed
+ * file still matches and the file round-trips.
  */
-declare function parseMarkers(content: string): MarkerSection;
+declare function parseMarkers(content: string, markers?: Markers): MarkerSection;
 /**
  * Build the final markdown body by replacing the BASOU:GENERATED region.
  *
@@ -5072,7 +5086,18 @@ declare function parseMarkers(content: string): MarkerSection;
  * The caller passes `fileLabel` (e.g. `"handoff.md"` or `"decisions.md"`)
  * so the error message is informative without leaking an absolute path.
  */
-declare function renderWithMarkers(existing: string | null, generated: string, fileLabel: string): string;
+declare function renderWithMarkers(existing: string | null, generated: string, fileLabel: string, markers?: Markers): string;
+/**
+ * Remove a marker region from `existing`, returning the body without the block.
+ *
+ * - `no_markers`: returns `existing` unchanged (nothing to remove).
+ * - `ok`: drops both marker lines and the generated region, collapsing the
+ *   single newline that terminated the END marker line so no stray blank line
+ *   is left behind.
+ * - any other parse result: throws a pathless error referencing `fileLabel`
+ *   (mismatched markers must not be silently rewritten).
+ */
+declare function removeMarkerSection(existing: string, fileLabel: string, markers?: Markers): string;
 
 /**
  * Options for {@link importSessionFromJson}. All fields are optional.
@@ -5299,4 +5324,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 AdoptCandidate, type AdoptCandidateKind, type AppendBasouGitignoreOptions, type AppendBasouGitignoreResult, type AppendEventToExistingInput, type AppendEventToExistingResult, type Approval, type ApprovalApprovedEvent, type ApprovalExpiredEvent, ApprovalIdSchema, type ApprovalLocation, type ApprovalRejectedEvent, type ApprovalRequestedEvent, ApprovalSchema, type ApprovalStatus, ApprovalStatusSchema, type ArchivePlan, type ArchiveTaskInput, type ArchiveTaskResult, type AttachTaskInput, type AttachUpdateTaskStatusInput, type AttachableStatus, BASOU_CORE_VERSION, type BasouPaths, type BulkChainResult, CLAUDE_IMPORT_SOURCE, CODEX_IMPORT_SOURCE, type CaptureMode, type ChainBreakReason, type ChainTailState, type ChainVerdict, type ChainVerdictStatus, type ChainedEvents, ChildProcessRunner, type CitedReview, 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, type ExistingViewLink, FailedToFinalizeError, type FileChange, type FileChangeStatus, type FileChangedEvent, GENERATED_END, GENERATED_START, type GitSnapshot, type GitSnapshotEvent, type GitignorePlanSummary, type HandoffRendererInput, type HandoffRendererResult, ID_PREFIXES, type IdPrefix, type ImportSessionOptions, type ImportSessionResult, type InstructionFileFact, type InstructionSymlinkFact, type InstructionSymlinkState, 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 OrientationRendererInput, type OrientationRendererResult, type OrientationSummary, type PrefixedId, type PresetAction, type PresetCollision, type PresetMarkerConflict, type PresetMarkerKind, type PresetPlanSummary, type PresetRepo, type ProcessRunner, type PublishKind, type PublishTarget, type RechainOptions, type RechainResult, type ReconcileAllResult, type ReconcileAllTasksInput, type ReconcileAllTasksOptions, type ReconcileFailure, type ReconcileResult, type ReconcileTaskInput, type RefreshLinkageInput, type RefreshLinkageResult, type ReimportOptions, type ReimportResult, type RenamePlan, type ReplayOptions, type ReplayWarning, type RepoEntry, type RepoGitignoreFacts, type RepoGitignorePlan, type RepoLanguage, type RepoPresetFacts, type RepoPresetPlan, type RepoSymlinkFacts, type RepoSymlinkPlan, type RepoVisibility, type RepoWiringFacts, type ReportApprovalItem, type ReportData, type ReportDecisionItem, type ReportRendererInput, type ReportRendererResult, type ReportSessionItem, type ReportTaskItem, type ReviewGapRepoSummary, type ReviewGapUnit, type ReviewGapVerdict, type ReviewGapsInput, type ReviewGapsSummary, type RiskLevel, RiskLevelSchema, type RosterAdoptionPlan, type RosterDriftSummary, 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 SessionIntegrity, SessionIntegritySchema, type SessionMetrics, SessionMetricsSchema, SessionSchema, type SessionSkipReason, type SessionSourceKind, SessionSourceKindSchema, type SessionStartedEvent, type SessionStatus, type SessionStatusChangedEvent, SessionStatusSchema, type SessionWorkStats, type SourceRootsReconcile, type SourceWorkStats, type StatusCount, StatusSchema, type StatusSnapshot, type SuspectReason, type SymlinkCollision, type SymlinkConflict, type SymlinkPlanSummary, type Task, type TaskArchivedEvent, type TaskCreatedEvent, type TaskDeletedEvent, type TaskDocument, TaskIdSchema, type TaskLinkageRefreshedEvent, type TaskReconciledEvent, TaskSchema, type TaskSkipReason, type TaskStatus, type TaskStatusChangedEvent, type TaskStatusCount, TaskStatusSchema, TaskWriteAfterEventError, type TaskWriteAfterEventPhase, type TokenTotals, type UpdateAdHocTaskStatusInput, type UpdateTaskStatusInput, type UpdateTaskStatusResult, type ViewCollision, type ViewConflict, type ViewLinkState, type ViewRepoFact, type ViewStrayUnknown, type WiringRisk, type WiringSummary, type WorkStatsInput, type WorkStatsResult, type WorkStatsTotals, WorkspaceIdSchema, type WorkspaceViewPlan, type WriteEventsBulkOptions, type WriteTaskFileMode, acquireLock, appendBasouGitignore, appendChainedEvent, appendChainedEventLocked, appendEvent, appendEventToExistingSession, archiveTask, assertBasouRootSafe, basouPaths, buildJsonSchemas, buildStatusSnapshot, chainEvents, chainRawJsonLines, classifySuspect, claudeCodeAdapterMetadata, claudeTranscriptToImportPayload, codexRolloutToImportPayload, computeWorkStats, createAdHocSessionWithEvent, createManifest, createTaskWithEvent, deleteTask, editTask, ensureBasouDirectory, enumerateApprovals, enumerateArchivedTaskIds, enumerateSessionDirs, enumerateTaskIds, finalizeSessionYaml, findErrorCode, findReviewGaps, formatDurationMs, genesisHash, getDiff, getSnapshot, importSessionFromJson, inspectChainTail, isGitNotFound, isImportDerivedSource, isLazyExpired, isRenderable, isValidPrefixedId, lineHash, linkYamlFile, loadApproval, loadSessionEntries, loadTaskEntries, normalizeRepoKey, normalizeRepoPath, overwriteYamlFile, parseDuration, parseMarkers, pathBasename, planArchive, planGitignore, planRename, planRosterAdoption, planWorkspaceView, prefixedUlid, readAllEvents, readManifest, readMarkdownFile, readSessionYaml, readStatus, readTaskFile, readTaskFileWithArchiveFallback, readYamlFile, rechainSessionInPlace, reconcileAllTasks, reconcileSourceRoots, reconcileTask, refreshTaskLinkedSessions, reimportPreservingId, renderDecisions, renderHandoff, renderOrientation, renderPresetBlock, renderReport, renderWithMarkers, replayEvents, resolveBasouRepositoryRoot, resolveClaudeCodeCommand, resolveRepositoryRoot, resolveSessionId, resolveTaskId, safeSimpleGit, sanitizePath, sanitizeRelatedFiles, sanitizeWorkingDirectory, serializeEventLine, serializeJsonSchema, sessionWorkStatsFromEvents, summarizeAdapterOutput, summarizeOrientation, summarizePresetPlan, summarizeRosterDrift, summarizeSymlinkPlan, summarizeWiring, tryRemoteUrl, ulid, unknownManifestKeys, updateTaskStatusWithEvent, verifyEventsChain, writeEventsBulk, writeManifest, writeMarkdownFile, writeStatus, writeTaskFile, writeYamlFile };
+export { ACTIVE_GAP_CAP_MS, type ActiveTimeBasis, type AdapterOutputEvent, type AdoptCandidate, type AdoptCandidateKind, type AppendBasouGitignoreOptions, type AppendBasouGitignoreResult, type AppendEventToExistingInput, type AppendEventToExistingResult, type Approval, type ApprovalApprovedEvent, type ApprovalExpiredEvent, ApprovalIdSchema, type ApprovalLocation, type ApprovalRejectedEvent, type ApprovalRequestedEvent, ApprovalSchema, type ApprovalStatus, ApprovalStatusSchema, type ArchivePlan, type ArchiveTaskInput, type ArchiveTaskResult, type AttachTaskInput, type AttachUpdateTaskStatusInput, type AttachableStatus, BASOU_CORE_VERSION, type BasouPaths, type BulkChainResult, CLAUDE_IMPORT_SOURCE, CODEX_IMPORT_SOURCE, type CaptureMode, type ChainBreakReason, type ChainTailState, type ChainVerdict, type ChainVerdictStatus, type ChainedEvents, ChildProcessRunner, type CitedReview, 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, type ExistingViewLink, FailedToFinalizeError, type FileChange, type FileChangeStatus, type FileChangedEvent, GENERATED_END, GENERATED_START, type GitSnapshot, type GitSnapshotEvent, type GitignorePlanSummary, type HandoffRendererInput, type HandoffRendererResult, ID_PREFIXES, type IdPrefix, type ImportSessionOptions, type ImportSessionResult, type InstructionFileFact, type InstructionSymlinkFact, type InstructionSymlinkState, IsoTimestampSchema, JSON_SCHEMA_VERSION, type JsonSchemaArtifact, type LoadSessionEntriesOptions, type LoadTaskEntriesOptions, type LoadedApproval, type LockHandle, type LockScope, type Manifest, ManifestSchema, type MarkerSection, type Markers, type MeasureAvailability, type NoteAddedEvent, type OrientationRendererInput, type OrientationRendererResult, type OrientationSummary, PROTOCOL_END, PROTOCOL_START, type PrefixedId, type PresetAction, type PresetCollision, type PresetMarkerConflict, type PresetMarkerKind, type PresetPlanSummary, type PresetRepo, type ProcessRunner, type PublishKind, type PublishTarget, type RechainOptions, type RechainResult, type ReconcileAllResult, type ReconcileAllTasksInput, type ReconcileAllTasksOptions, type ReconcileFailure, type ReconcileResult, type ReconcileTaskInput, type RefreshLinkageInput, type RefreshLinkageResult, type ReimportOptions, type ReimportResult, type RenamePlan, type ReplayOptions, type ReplayWarning, type RepoEntry, type RepoGitignoreFacts, type RepoGitignorePlan, type RepoLanguage, type RepoPresetFacts, type RepoPresetPlan, type RepoSymlinkFacts, type RepoSymlinkPlan, type RepoVisibility, type RepoWiringFacts, type ReportApprovalItem, type ReportData, type ReportDecisionItem, type ReportRendererInput, type ReportRendererResult, type ReportSessionItem, type ReportTaskItem, type ReviewGapRepoSummary, type ReviewGapUnit, type ReviewGapVerdict, type ReviewGapsInput, type ReviewGapsSummary, type RiskLevel, RiskLevelSchema, type RosterAdoptionPlan, type RosterDriftSummary, 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 SessionIntegrity, SessionIntegritySchema, type SessionMetrics, SessionMetricsSchema, SessionSchema, type SessionSkipReason, type SessionSourceKind, SessionSourceKindSchema, type SessionStartedEvent, type SessionStatus, type SessionStatusChangedEvent, SessionStatusSchema, type SessionWorkStats, type SourceRootsReconcile, type SourceWorkStats, type StatusCount, StatusSchema, type StatusSnapshot, type SuspectReason, type SymlinkCollision, type SymlinkConflict, type SymlinkPlanSummary, type Task, type TaskArchivedEvent, type TaskCreatedEvent, type TaskDeletedEvent, type TaskDocument, TaskIdSchema, type TaskLinkageRefreshedEvent, type TaskReconciledEvent, TaskSchema, type TaskSkipReason, type TaskStatus, type TaskStatusChangedEvent, type TaskStatusCount, TaskStatusSchema, TaskWriteAfterEventError, type TaskWriteAfterEventPhase, type TokenTotals, type UpdateAdHocTaskStatusInput, type UpdateTaskStatusInput, type UpdateTaskStatusResult, type ViewCollision, type ViewConflict, type ViewLinkState, type ViewRepoFact, type ViewStrayUnknown, type WiringRisk, type WiringSummary, type WorkStatsInput, type WorkStatsResult, type WorkStatsTotals, WorkspaceIdSchema, type WorkspaceViewPlan, type WriteEventsBulkOptions, type WriteTaskFileMode, acquireLock, appendBasouGitignore, appendChainedEvent, appendChainedEventLocked, appendEvent, appendEventToExistingSession, archiveTask, assertBasouRootSafe, basouPaths, buildJsonSchemas, buildStatusSnapshot, chainEvents, chainRawJsonLines, classifySuspect, claudeCodeAdapterMetadata, claudeTranscriptToImportPayload, codexRolloutToImportPayload, computeWorkStats, createAdHocSessionWithEvent, createManifest, createTaskWithEvent, deleteTask, editTask, ensureBasouDirectory, enumerateApprovals, enumerateArchivedTaskIds, enumerateSessionDirs, enumerateTaskIds, finalizeSessionYaml, findErrorCode, findReviewGaps, formatDurationMs, genesisHash, getDiff, getSnapshot, importSessionFromJson, inspectChainTail, isGitNotFound, isImportDerivedSource, isLazyExpired, isRenderable, isValidPrefixedId, lineHash, linkYamlFile, loadApproval, loadSessionEntries, loadTaskEntries, normalizeRepoKey, normalizeRepoPath, overwriteYamlFile, parseDuration, parseMarkers, pathBasename, planArchive, planGitignore, planRename, planRosterAdoption, planWorkspaceView, prefixedUlid, readAllEvents, readManifest, readMarkdownFile, readSessionYaml, readStatus, readTaskFile, readTaskFileWithArchiveFallback, readYamlFile, rechainSessionInPlace, reconcileAllTasks, reconcileSourceRoots, reconcileTask, refreshTaskLinkedSessions, reimportPreservingId, removeMarkerSection, renderDecisions, renderHandoff, renderOrientation, renderPresetBlock, renderReport, renderWithMarkers, replayEvents, resolveBasouRepositoryRoot, resolveClaudeCodeCommand, resolveRepositoryRoot, resolveSessionId, resolveTaskId, safeSimpleGit, sanitizePath, sanitizeRelatedFiles, sanitizeWorkingDirectory, serializeEventLine, serializeJsonSchema, sessionWorkStatsFromEvents, summarizeAdapterOutput, summarizeOrientation, summarizePresetPlan, summarizeRosterDrift, summarizeSymlinkPlan, summarizeWiring, tryRemoteUrl, ulid, unknownManifestKeys, updateTaskStatusWithEvent, verifyEventsChain, writeEventsBulk, writeManifest, writeMarkdownFile, writeStatus, writeTaskFile, writeYamlFile };

package/dist/index.js

@@ -2081,6 +2081,21 @@ function parseDiffNameStatus(raw) {
 // src/handoff/handoff-renderer.ts
 import { join as join13 } from "path";
 
+// src/lib/recency.ts
+var DECISION_TRAILING_ACTIVITY_GAP_MS = 60 * 60 * 1e3;
+function isTrailingStale(latestActivityAt, recordedAt) {
+  if (latestActivityAt === null) return false;
+  return Date.parse(latestActivityAt) - Date.parse(recordedAt) > DECISION_TRAILING_ACTIVITY_GAP_MS;
+}
+function pickLatestSubstantiveEntry(entries) {
+  return [...entries].sort((a, b) => {
+    const aSubstantive = (a.session.session.related_files?.length ?? 0) > 0 ? 1 : 0;
+    const bSubstantive = (b.session.session.related_files?.length ?? 0) > 0 ? 1 : 0;
+    if (aSubstantive !== bSubstantive) return bSubstantive - aSubstantive;
+    return Date.parse(b.session.session.started_at) - Date.parse(a.session.session.started_at);
+  })[0];
+}
+
 // src/storage/tasks.ts
 import { createHash as createHash2 } from "crypto";
 import { mkdir as mkdir3, readdir as readdir4, readFile as readFile7, rename as rename2, stat as stat3, unlink as unlink3 } from "fs/promises";
@@ -3799,12 +3814,21 @@ async function renderHandoff(input) {
   const decisions = [];
   const tasksCreated = [];
   const tasksStatusChanged = [];
+  let latestActivityAt = null;
+  const noteActivity = (iso) => {
+    if (latestActivityAt === null || Date.parse(iso) > Date.parse(latestActivityAt)) {
+      latestActivityAt = iso;
+    }
+  };
   for (const entry of entries) {
     const sessionDir = join13(input.paths.sessions, entry.sessionId);
+    const counted = entry.session.session.status !== "archived";
+    if (counted) noteActivity(entry.session.session.ended_at ?? entry.session.session.started_at);
     try {
       for await (const ev of replayEvents(sessionDir, {
         onWarning: (w) => input.onWarning?.(w, entry.sessionId)
       })) {
+        if (counted) noteActivity(ev.occurred_at);
         if (ev.type === "decision_recorded") {
           decisions.push({
             decisionId: ev.decision_id,
@@ -3864,9 +3888,7 @@ async function renderHandoff(input) {
   const liveEntries = entries.filter(
     (e) => e.session.session.status !== "archived" && e.session.session.source.kind !== "import"
   );
-  const latestSession = [...liveEntries].sort(
-    (a, b) => Date.parse(b.session.session.started_at) - Date.parse(a.session.session.started_at)
-  )[0];
+  const latestSession = pickLatestSubstantiveEntry(liveEntries);
   const latestFiles = latestSession?.session.session.related_files ?? [];
   const sortedFiles = [...new Set(latestFiles)].sort();
   const displayedFiles = sortedFiles.slice(0, limit);
@@ -3880,6 +3902,7 @@ async function renderHandoff(input) {
     sessionRange,
     sessionCount: entries.length,
     latestSession,
+    latestActivityAt,
     decisions,
     pendingApprovalsCount,
     suspectCount,
@@ -3952,6 +3975,16 @@ function formatHandoffBody(args) {
   } else {
     const last = args.decisions[args.decisions.length - 1];
     lines.push(`- ${last.title} [${shortIdWithPrefix(last.decisionId)}]`);
+    if (args.latestActivityAt !== null && isTrailingStale(args.latestActivityAt, last.occurredAt)) {
+      lines.push(
+        "  - \u6CE8: \u6700\u7D42\u6D3B\u52D5\u306F\u3053\u306E\u5224\u65AD\u3088\u308A\u5F8C\u3067\u3059\u3002\u4F1A\u8A71\u3067\u65E2\u306B\u89E3\u6C7A\u6E08\u307F\u306E\u53EF\u80FD\u6027\u304C\u3042\u308B\u305F\u3081\u3001\u518D\u958B\u524D\u306B\u7D99\u7D9A\u70B9\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044(\u4F1A\u8A71\u3067\u306E\u610F\u601D\u6C7A\u5B9A\u306F\u81EA\u52D5\u8A18\u9332\u3055\u308C\u307E\u305B\u3093\u3002`basou decision capture` \u3067\u8A18\u9332\u3067\u304D\u307E\u3059)\u3002"
+      );
+    }
+    if (args.latestSession !== void 0 && last.sessionId !== args.latestSession.sessionId) {
+      lines.push(
+        `  - \u6CE8: \u3053\u306E\u5224\u65AD\u306F\u6700\u7D42 session \u3068\u306F\u5225\u306E session [${shortIdWithPrefix(last.sessionId)}] \u306E\u3082\u306E\u3067\u3059\u3002`
+      );
+    }
     lines.push("");
     lines.push(`(${args.decisions.length} decisions total \u2014 see decisions.md)`);
   }
@@ -4305,7 +4338,6 @@ function hasErrorCode3(error) {
 }
 
 // src/orientation/orientation-renderer.ts
-var DECISION_TRAILING_ACTIVITY_GAP_MS = 60 * 60 * 1e3;
 async function summarizeOrientation(input) {
   const limit = input.relatedFilesLimit ?? 10;
   const now = new Date(input.nowIso);
@@ -4333,7 +4365,8 @@ async function summarizeOrientation(input) {
           decisions.push({
             decisionId: ev.decision_id,
             title: ev.title,
-            occurredAt: ev.occurred_at
+            occurredAt: ev.occurred_at,
+            sessionId: entry.sessionId
           });
         }
         if (counted && ev.type === "note_added" && ev.kind === "next_step") {
@@ -4386,9 +4419,7 @@ async function summarizeOrientation(input) {
   const liveEntries = entries.filter(
     (e) => e.session.session.status !== "archived" && e.session.session.source.kind !== "import"
   );
-  const latestEntry = [...liveEntries].sort(
-    (a, b) => Date.parse(b.session.session.started_at) - Date.parse(a.session.session.started_at)
-  )[0];
+  const latestEntry = pickLatestSubstantiveEntry(liveEntries);
   const latestSession = latestEntry !== void 0 ? {
     sessionId: latestEntry.sessionId,
     label: latestEntry.session.session.label ?? null,
@@ -4474,16 +4505,20 @@ function formatOrientationBody(summary, opts) {
     lines.push("- \u6700\u7D42 session: (no live sessions)");
   }
   if (summary.latestDecision !== null) {
-    const decAge = relativeAgeJa(summary.latestDecision.occurredAt, now);
-    lines.push(
-      `- \u76F4\u8FD1\u306E\u5224\u65AD: ${summary.latestDecision.title} [${shortId(summary.latestDecision.decisionId)}] (${decAge})`
-    );
+    const dec = summary.latestDecision;
+    const decAge = relativeAgeJa(dec.occurredAt, now);
+    lines.push(`- \u76F4\u8FD1\u306E\u5224\u65AD: ${dec.title} [${shortId(dec.decisionId)}] (${decAge})`);
     const activityAt = summary.freshness.latestActivityAt;
-    if (activityAt !== null && Date.parse(activityAt) - Date.parse(summary.latestDecision.occurredAt) > DECISION_TRAILING_ACTIVITY_GAP_MS) {
+    if (activityAt !== null && isTrailingStale(activityAt, dec.occurredAt)) {
       lines.push(
         `  - \u6CE8: \u3053\u308C\u306F\u6700\u5F8C\u306B\u300C\u8A18\u9332\u3055\u308C\u305F\u300D\u5224\u65AD\u3067\u3059\u3002\u6700\u7D42\u6D3B\u52D5 (${relativeAgeJa(activityAt, now)}) \u306F\u3053\u308C\u3088\u308A\u5F8C\u306E\u305F\u3081\u3001\u73FE\u5728\u306E\u65B9\u91DD\u304C\u53CD\u6620\u3055\u308C\u3066\u3044\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059(\u4F1A\u8A71\u3067\u306E\u610F\u601D\u6C7A\u5B9A\u306F\u81EA\u52D5\u8A18\u9332\u3055\u308C\u307E\u305B\u3093\u3002\`basou decision capture\` \u3067\u3053\u306E session \u306E\u5224\u65AD\u3092\u8A18\u9332\u3067\u304D\u307E\u3059)\u3002`
       );
     }
+    if (summary.latestSession !== null && dec.sessionId !== summary.latestSession.sessionId) {
+      lines.push(
+        `  - \u6CE8: \u3053\u306E\u5224\u65AD\u306F\u6700\u7D42 session \u3068\u306F\u5225\u306E session [${shortId(dec.sessionId)}] \u306E\u3082\u306E\u3067\u3059\u3002`
+      );
+    }
     if (summary.decisionCount > 1) {
       lines.push(`  - ${summary.decisionCount} decisions total \u2014 see decisions.md`);
     }
@@ -4539,7 +4574,7 @@ function formatOrientationBody(summary, opts) {
       `- \u6B21\u306E\u8D77\u70B9 (\u8A18\u9332\u6E08\u307F, ${noteAge}): ${noteSummary(summary.latestNote.body)} [session ${shortId(summary.latestNote.sessionId)}]`
     );
     const activityAt = summary.freshness.latestActivityAt;
-    if (activityAt !== null && Date.parse(activityAt) - Date.parse(summary.latestNote.occurredAt) > DECISION_TRAILING_ACTIVITY_GAP_MS) {
+    if (activityAt !== null && isTrailingStale(activityAt, summary.latestNote.occurredAt)) {
       lines.push(
         `  - \u6CE8: \u3053\u306E\u8D77\u70B9\u306E\u8A18\u9332\u5F8C (\u6700\u7D42\u6D3B\u52D5 ${relativeAgeJa(activityAt, now)}) \u3082\u4F5C\u696D\u304C\u7D9A\u3044\u3066\u3044\u307E\u3059\u3002\u518D\u958B\u70B9\u304C\u53E4\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002`
       );
@@ -4549,9 +4584,17 @@ function formatOrientationBody(summary, opts) {
     lines.push(`- ${t.title} [${shortId(t.id)}]`);
   }
   if (summary.latestNote === null && summary.plannedTasks.length === 0) {
-    lines.push("- (no planned tasks \u2014 direction is inferred from recent decisions)");
-    if (summary.latestDecision !== null) {
-      lines.push(`  - \u76F4\u8FD1\u306E\u5224\u65AD: ${summary.latestDecision.title}`);
+    const dec = summary.latestDecision;
+    if (dec === null) {
+      lines.push("- (no planned tasks or recorded next step yet)");
+    } else if (isTrailingStale(summary.freshness.latestActivityAt, dec.occurredAt)) {
+      lines.push(
+        "- (no planned tasks or recorded next step \u2014 \u6700\u7D42\u6D3B\u52D5\u306F\u76F4\u8FD1\u306E\u5224\u65AD\u3088\u308A\u5F8C\u3067\u3059\u3002\u7D99\u7D9A\u70B9\u3092\u30E6\u30FC\u30B6\u306B\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044)"
+      );
+      lines.push(`  - \u53C2\u8003 (\u53E4\u3044\u53EF\u80FD\u6027\u30FB\u65B9\u91DD\u3067\u306F\u306A\u3044): ${dec.title}`);
+    } else {
+      lines.push("- (no planned tasks \u2014 direction is inferred from recent decisions)");
+      lines.push(`  - \u76F4\u8FD1\u306E\u5224\u65AD: ${dec.title}`);
     }
   }
   lines.push("");
@@ -6462,6 +6505,9 @@ function hasErrorCode5(error) {
 import { readFile as readFile9 } from "fs/promises";
 var GENERATED_START = "<!-- BASOU:GENERATED:START -->";
 var GENERATED_END = "<!-- BASOU:GENERATED:END -->";
+var PROTOCOL_START = "<!-- BASOU:PROTOCOLS:START -->";
+var PROTOCOL_END = "<!-- BASOU:PROTOCOLS:END -->";
+var DEFAULT_MARKERS = { start: GENERATED_START, end: GENERATED_END };
 async function readMarkdownFile(filePath) {
   try {
     return await readFile9(filePath, "utf8");
@@ -6477,13 +6523,15 @@ async function writeMarkdownFile(filePath, body) {
     throw new Error("Failed to write markdown file", { cause: error });
   }
 }
-function parseMarkers(content) {
-  const lines = content.split(/\r?\n/);
+function parseMarkers(content, markers = DEFAULT_MARKERS) {
+  const bom = content.charCodeAt(0) === 65279 ? "\uFEFF" : "";
+  const body = bom === "" ? content : content.slice(1);
+  const lines = body.split(/\r?\n/);
   const startLines = [];
   const endLines = [];
   for (let i = 0; i < lines.length; i++) {
-    if (lines[i] === GENERATED_START) startLines.push(i);
-    else if (lines[i] === GENERATED_END) endLines.push(i);
+    if (lines[i] === markers.start) startLines.push(i);
+    else if (lines[i] === markers.end) endLines.push(i);
   }
   if (startLines.length === 0 && endLines.length === 0) return { kind: "no_markers" };
   if (startLines.length === 0) return { kind: "missing_start" };
@@ -6492,30 +6540,30 @@ function parseMarkers(content) {
   const startLineIdx = startLines[0];
   const endLineIdx = endLines[0];
   if (endLineIdx < startLineIdx) return { kind: "wrong_order" };
-  const startOffset = lineStartOffset(content, startLineIdx);
-  const endLineStart = lineStartOffset(content, endLineIdx);
-  const startLineEnd = startOffset + GENERATED_START.length;
-  const endLineEnd = endLineStart + GENERATED_END.length;
-  const before = content.slice(0, startOffset);
-  const afterStartNewline = skipOneNewline(content, startLineEnd);
-  const beforeEndNewline = trimOneNewline(content, endLineStart);
-  const generated = content.slice(afterStartNewline, beforeEndNewline);
-  const after = content.slice(endLineEnd);
+  const startOffset = lineStartOffset(body, startLineIdx);
+  const endLineStart = lineStartOffset(body, endLineIdx);
+  const startLineEnd = startOffset + markers.start.length;
+  const endLineEnd = endLineStart + markers.end.length;
+  const before = bom + body.slice(0, startOffset);
+  const afterStartNewline = skipOneNewline(body, startLineEnd);
+  const beforeEndNewline = trimOneNewline(body, endLineStart);
+  const generated = body.slice(afterStartNewline, beforeEndNewline);
+  const after = body.slice(endLineEnd);
   return { kind: "ok", before, generated, after };
 }
-function renderWithMarkers(existing, generated, fileLabel) {
+function renderWithMarkers(existing, generated, fileLabel, markers = DEFAULT_MARKERS) {
   const normalized = generated.endsWith("\n") ? generated : `${generated}
 `;
   if (existing === null) {
-    return `${GENERATED_START}
-${normalized}${GENERATED_END}
+    return `${markers.start}
+${normalized}${markers.end}
 `;
   }
-  const section = parseMarkers(existing);
+  const section = parseMarkers(existing, markers);
   switch (section.kind) {
     case "ok":
-      return `${section.before}${GENERATED_START}
-${normalized}${GENERATED_END}${section.after}`;
+      return `${section.before}${markers.start}
+${normalized}${markers.end}${section.after}`;
     case "no_markers":
       throw new Error(`Markers missing in ${fileLabel}`);
     case "missing_start":
@@ -6525,6 +6573,22 @@ ${normalized}${GENERATED_END}${section.after}`;
       throw new Error(`Markers mismatched in ${fileLabel}`);
   }
 }
+function removeMarkerSection(existing, fileLabel, markers = DEFAULT_MARKERS) {
+  const section = parseMarkers(existing, markers);
+  switch (section.kind) {
+    case "no_markers":
+      return existing;
+    case "ok": {
+      const after = section.after.replace(/^\r?\n/, "");
+      return section.before + after;
+    }
+    case "missing_start":
+    case "missing_end":
+    case "multiple_pairs":
+    case "wrong_order":
+      throw new Error(`Markers mismatched in ${fileLabel}`);
+  }
+}
 function lineStartOffset(content, lineIdx) {
   if (lineIdx === 0) return 0;
   let offset = 0;
@@ -6965,6 +7029,8 @@ export {
   IsoTimestampSchema,
   JSON_SCHEMA_VERSION,
   ManifestSchema,
+  PROTOCOL_END,
+  PROTOCOL_START,
   RiskLevelSchema,
   STUCK_THRESHOLD_MS,
   SchemaVersionSchema,
@@ -7055,6 +7121,7 @@ export {
   reconcileTask,
   refreshTaskLinkedSessions,
   reimportPreservingId,
+  removeMarkerSection,
   renderDecisions,
   renderHandoff,
   renderOrientation,