@unbrained/pm-cli 2026.7.19 → 2026.7.20

package/dist/cli-bundle/chunks/chunk-INSTSQNZ.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../../sdk/merge/three-way.ts", "../../../../../../../../sdk/merge/driver.ts"],
+  "sourcesContent": ["/**\n * @module sdk/merge/three-way\n *\n * Field-aware three-way merge primitives for every mergeable tracker artifact\n * class: append-only history JSONL streams, item documents (TOON or\n * JSON+Markdown), and key-level JSON configuration/schema files. These\n * primitives are pure (content in, content out) so the CLI merge driver, the\n * MCP surface, and package integrations all share one merge semantics\n * definition for multi-branch agent workflows.\n */\nimport {\n  historyEntriesToRaw,\n  reanchorHistoryEntries,\n} from \"../../core/history/replay.js\";\nimport {\n  canonicalDocument,\n  parseItemDocument,\n  serializeItemDocument,\n  type ItemDocumentFormatOptions,\n} from \"../../core/item/item-format.js\";\nimport { EXIT_CODE } from \"../../core/shared/constants.js\";\nimport { findFirstMergeConflictMarker } from \"../../core/shared/conflict-markers.js\";\nimport { PmCliError } from \"../../core/shared/errors.js\";\nimport { stableStringify } from \"../../core/shared/serialization.js\";\nimport { compareTimestampStrings } from \"../../core/shared/time.js\";\nimport type {\n  HistoryEntry,\n  ItemDocument,\n  ItemMetadata,\n} from \"../../types/index.js\";\n\n/** Restricts which side of a three-way merge wins an unresolvable conflict. */\nexport type MergePreferredSide = \"ours\" | \"theirs\";\n\n/** Restricts the strategy labels reported by the history stream merge. */\nexport type HistoryMergeStrategy =\n  | \"identical\"\n  | \"fast_forward_ours\"\n  | \"fast_forward_theirs\"\n  | \"union_reanchor\";\n\n/** Documents the history stream merge result payload exchanged by command, SDK, and package integrations. */\nexport interface HistoryMergeResult {\n  /** Merged JSONL content ready to be written as the resolved history stream. */\n  merged: string;\n  /** Strategy the merge used: identical inputs, one-sided fast-forward, or a deterministic union with a re-anchored hash chain. */\n  strategy: HistoryMergeStrategy;\n  /** Number of entries shared by both sides before their streams diverged. */\n  common_entries: number;\n  /** Number of divergent entries contributed by the ours side. */\n  entries_from_ours: number;\n  /** Number of divergent entries contributed by the theirs side. */\n  entries_from_theirs: number;\n  /** Total entries in the merged stream. */\n  entries_total: number;\n  /** Whether the merged chain required hash re-anchoring (true for every union merge). */\n  reanchored: boolean;\n}\n\nfunction parseHistoryJsonl(raw: string, label: string): HistoryEntry[] {\n  const conflictMarker = findFirstMergeConflictMarker(raw);\n  if (conflictMarker) {\n    throw new PmCliError(\n      `History merge input (${label}) contains unresolved conflict markers at line ${conflictMarker.line}. Merge drivers must receive clean per-side versions.`,\n      EXIT_CODE.GENERIC_FAILURE,\n    );\n  }\n  const entries: HistoryEntry[] = [];\n  for (const [index, rawLine] of raw.split(/\\r?\\n/).entries()) {\n    const line = rawLine.trim();\n    if (!line) {\n      continue;\n    }\n    try {\n      const parsed = JSON.parse(line) as unknown;\n      if (typeof parsed !== \"object\" || parsed === null || Array.isArray(parsed)) {\n        throw new TypeError(\"history entry must be an object\");\n      }\n      entries.push(parsed as HistoryEntry);\n    } catch {\n      throw new PmCliError(\n        `History merge input (${label}) contains invalid JSON at line ${index + 1}.`,\n        EXIT_CODE.GENERIC_FAILURE,\n      );\n    }\n  }\n  return entries;\n}\n\nfunction historyEntryIdentity(entry: HistoryEntry): string {\n  return stableStringify({\n    ts: entry.ts,\n    author: entry.author,\n    op: entry.op,\n    patch: entry.patch,\n    message: entry.message ?? null,\n  });\n}\n\nfunction commonHistoryPrefixLength(\n  ours: HistoryEntry[],\n  theirs: HistoryEntry[],\n): number {\n  const limit = Math.min(ours.length, theirs.length);\n  let shared = 0;\n  while (\n    shared < limit &&\n    historyEntryIdentity(ours[shared]) === historyEntryIdentity(theirs[shared])\n  ) {\n    shared += 1;\n  }\n  return shared;\n}\n\n/**\n * Deterministically merge two diverged versions of one append-only history\n * JSONL stream. Identical streams and one-sided fast-forwards keep the winning\n * side byte-for-byte; genuinely diverged streams are merged as the shared\n * prefix plus both suffixes ordered by timestamp (ours-first on ties), then\n * hash re-anchored so the resulting chain verifies again. No side's events are\n * ever discarded: content divergence is preserved for the post-merge\n * reconciliation pass (`pm validate` + `pm history-repair`) instead of being\n * silently resolved by last-writer-wins.\n */\nexport function mergeHistoryStreams(\n  baseRaw: string,\n  oursRaw: string,\n  theirsRaw: string,\n): HistoryMergeResult {\n  parseHistoryJsonl(baseRaw, \"base\");\n  const ours = parseHistoryJsonl(oursRaw, \"ours\");\n  const theirs = parseHistoryJsonl(theirsRaw, \"theirs\");\n  const shared = commonHistoryPrefixLength(ours, theirs);\n\n  if (shared === ours.length && shared === theirs.length) {\n    return {\n      merged: historyEntriesToRaw(ours),\n      strategy: \"identical\",\n      common_entries: shared,\n      entries_from_ours: 0,\n      entries_from_theirs: 0,\n      entries_total: ours.length,\n      reanchored: false,\n    };\n  }\n  if (shared === theirs.length) {\n    return {\n      merged: historyEntriesToRaw(ours),\n      strategy: \"fast_forward_ours\",\n      common_entries: shared,\n      entries_from_ours: ours.length - shared,\n      entries_from_theirs: 0,\n      entries_total: ours.length,\n      reanchored: false,\n    };\n  }\n  if (shared === ours.length) {\n    return {\n      merged: historyEntriesToRaw(theirs),\n      strategy: \"fast_forward_theirs\",\n      common_entries: shared,\n      entries_from_ours: 0,\n      entries_from_theirs: theirs.length - shared,\n      entries_total: theirs.length,\n      reanchored: false,\n    };\n  }\n\n  const oursSuffix = ours.slice(shared);\n  const seenIdentities = new Set(oursSuffix.map(historyEntryIdentity));\n  const theirsSuffix = theirs\n    .slice(shared)\n    .filter((entry) => !seenIdentities.has(historyEntryIdentity(entry)));\n  const mergedSuffix = [...oursSuffix, ...theirsSuffix].sort((left, right) => {\n    const byTs = compareTimestampStrings(left.ts, right.ts);\n    if (byTs !== 0) {\n      return byTs;\n    }\n    const leftFromOurs = seenIdentities.has(historyEntryIdentity(left));\n    const rightFromOurs = seenIdentities.has(historyEntryIdentity(right));\n    if (leftFromOurs !== rightFromOurs) {\n      return Number(rightFromOurs) - Number(leftFromOurs);\n    }\n    return historyEntryIdentity(left).localeCompare(historyEntryIdentity(right));\n  });\n  const reanchored = reanchorHistoryEntries([\n    ...ours.slice(0, shared),\n    ...mergedSuffix,\n  ]);\n  return {\n    merged: historyEntriesToRaw(reanchored.entries),\n    strategy: \"union_reanchor\",\n    common_entries: shared,\n    entries_from_ours: oursSuffix.length,\n    entries_from_theirs: theirsSuffix.length,\n    entries_total: reanchored.entries.length,\n    reanchored: true,\n  };\n}\n\n/** Documents the relationship event stream merge result payload exchanged by command, SDK, and package integrations. */\nexport interface RelationshipStreamMergeResult {\n  /** Merged JSONL content with consecutively renumbered `sequence` values, ready to be written as the resolved event store. */\n  merged: string;\n  /** Strategy the merge used: identical inputs, one-sided fast-forward, or a deterministic union with renumbered sequences. */\n  strategy: HistoryMergeStrategy;\n  /** Number of events shared by both sides before their streams diverged. */\n  common_entries: number;\n  /** Number of divergent events contributed by the ours side. */\n  entries_from_ours: number;\n  /** Number of divergent events contributed by the theirs side. */\n  entries_from_theirs: number;\n  /** Total events in the merged stream. */\n  entries_total: number;\n  /** Whether merged events required sequence renumbering (true for every union merge). */\n  reanchored: boolean;\n}\n\ninterface RelationshipStreamEvent {\n  /** Globally unique event identity used for prefix detection and suffix deduplication. */\n  eventId: string;\n  /** One-based append sequence; rewritten consecutively in the merged stream. */\n  sequence: number;\n  /** ISO timestamp used to order divergent suffixes deterministically. */\n  timestamp?: string;\n  /** Remaining event payload fields, preserved verbatim. */\n  [key: string]: unknown;\n}\n\nfunction parseRelationshipJsonl(\n  raw: string,\n  label: string,\n): RelationshipStreamEvent[] {\n  const conflictMarker = findFirstMergeConflictMarker(raw);\n  if (conflictMarker) {\n    throw new PmCliError(\n      `Relationship merge input (${label}) contains unresolved conflict markers at line ${conflictMarker.line}. Merge drivers must receive clean per-side versions.`,\n      EXIT_CODE.GENERIC_FAILURE,\n    );\n  }\n  const events: RelationshipStreamEvent[] = [];\n  for (const [index, rawLine] of raw.split(/\\r?\\n/).entries()) {\n    const line = rawLine.trim();\n    if (!line) {\n      continue;\n    }\n    let parsed: unknown;\n    try {\n      parsed = JSON.parse(line) as unknown;\n    } catch {\n      throw new PmCliError(\n        `Relationship merge input (${label}) contains invalid JSON at line ${index + 1}.`,\n        EXIT_CODE.GENERIC_FAILURE,\n      );\n    }\n    if (\n      typeof parsed !== \"object\" ||\n      parsed === null ||\n      Array.isArray(parsed) ||\n      typeof (parsed as { eventId?: unknown }).eventId !== \"string\" ||\n      typeof (parsed as { sequence?: unknown }).sequence !== \"number\"\n    ) {\n      throw new PmCliError(\n        `Relationship merge input (${label}) line ${index + 1} is not a relationship event (eventId + sequence required).`,\n        EXIT_CODE.GENERIC_FAILURE,\n      );\n    }\n    events.push(parsed as RelationshipStreamEvent);\n  }\n  return events;\n}\n\nfunction relationshipEventsToRaw(events: RelationshipStreamEvent[]): string {\n  return events.length === 0\n    ? \"\"\n    : `${events.map((event) => JSON.stringify(event)).join(\"\\n\")}\\n`;\n}\n\nfunction renumberRelationshipEvents(\n  events: RelationshipStreamEvent[],\n): RelationshipStreamEvent[] {\n  return events.map((event, index) => ({ ...event, sequence: index + 1 }));\n}\n\n/**\n * Deterministically merge two diverged versions of one append-only\n * relationship event JSONL store. The store's loader enforces strictly\n * consecutive one-based `sequence` values, so a plain text union of two\n * diverged streams is always unreadable; this merge keeps the shared prefix,\n * unions both divergent suffixes by `eventId` (ordered by event timestamp,\n * ours-first on ties), and renumbers every merged sequence consecutively so\n * the resulting stream loads again. No side's events are ever discarded.\n */\nexport function mergeRelationshipEventStreams(\n  baseRaw: string,\n  oursRaw: string,\n  theirsRaw: string,\n): RelationshipStreamMergeResult {\n  parseRelationshipJsonl(baseRaw, \"base\");\n  const ours = parseRelationshipJsonl(oursRaw, \"ours\");\n  const theirs = parseRelationshipJsonl(theirsRaw, \"theirs\");\n  const limit = Math.min(ours.length, theirs.length);\n  let shared = 0;\n  while (shared < limit && ours[shared].eventId === theirs[shared].eventId) {\n    shared += 1;\n  }\n\n  if (shared === ours.length && shared === theirs.length) {\n    return {\n      merged: relationshipEventsToRaw(ours),\n      strategy: \"identical\",\n      common_entries: shared,\n      entries_from_ours: 0,\n      entries_from_theirs: 0,\n      entries_total: ours.length,\n      reanchored: false,\n    };\n  }\n  if (shared === theirs.length) {\n    return {\n      merged: relationshipEventsToRaw(ours),\n      strategy: \"fast_forward_ours\",\n      common_entries: shared,\n      entries_from_ours: ours.length - shared,\n      entries_from_theirs: 0,\n      entries_total: ours.length,\n      reanchored: false,\n    };\n  }\n  if (shared === ours.length) {\n    return {\n      merged: relationshipEventsToRaw(theirs),\n      strategy: \"fast_forward_theirs\",\n      common_entries: shared,\n      entries_from_ours: 0,\n      entries_from_theirs: theirs.length - shared,\n      entries_total: theirs.length,\n      reanchored: false,\n    };\n  }\n\n  const oursSuffix = ours.slice(shared);\n  const oursEventIds = new Set(oursSuffix.map((event) => event.eventId));\n  const theirsSuffix = theirs\n    .slice(shared)\n    .filter((event) => !oursEventIds.has(event.eventId));\n  const mergedSuffix = [...oursSuffix, ...theirsSuffix].sort((left, right) => {\n    if (left.timestamp !== undefined && right.timestamp !== undefined) {\n      const byTs = compareTimestampStrings(left.timestamp, right.timestamp);\n      if (byTs !== 0) {\n        return byTs;\n      }\n    } else if (left.timestamp === undefined && right.timestamp !== undefined) {\n      return 1;\n    } else if (left.timestamp !== undefined) {\n      return -1;\n    }\n    const leftFromOurs = oursEventIds.has(left.eventId);\n    const rightFromOurs = oursEventIds.has(right.eventId);\n    if (leftFromOurs !== rightFromOurs) {\n      return Number(rightFromOurs) - Number(leftFromOurs);\n    }\n    // Array.prototype.sort is stable: returning zero preserves each side's\n    // original append order when its events share a timestamp.\n    return 0;\n  });\n  const merged = renumberRelationshipEvents([\n    ...ours.slice(0, shared),\n    ...mergedSuffix,\n  ]);\n  return {\n    merged: relationshipEventsToRaw(merged),\n    strategy: \"union_reanchor\",\n    common_entries: shared,\n    entries_from_ours: oursSuffix.length,\n    entries_from_theirs: theirsSuffix.length,\n    entries_total: merged.length,\n    reanchored: true,\n  };\n}\n\n/**\n * Item metadata collections merged by element-identity set semantics instead\n * of whole-field three-way comparison: concurrent commutative appends from two\n * branches (notes on A, tags on B, a test run on each) must merge cleanly.\n * Element identity is the stable serialization of the normalized element, so\n * an element edited on one side counts as remove-old + add-new and both sides'\n * contributions survive. Plan collections are deliberately excluded: plan\n * steps carry cross-element ordering invariants that set-union would corrupt,\n * so they stay under scalar three-way semantics with explicit conflicts.\n */\nexport const ITEM_UNION_COLLECTION_FIELDS = [\n  \"tags\",\n  \"dependencies\",\n  \"comments\",\n  \"notes\",\n  \"learnings\",\n  \"files\",\n  \"tests\",\n  \"test_runs\",\n  \"docs\",\n  \"reminders\",\n  \"events\",\n] as const;\n\n/** Item metadata fields resolved by deterministic latest-timestamp-wins instead of three-way conflict, so disjoint-field edits never conflict on the shared freshness scalar every mutation rewrites. */\nexport const ITEM_LATEST_TIMESTAMP_FIELDS = [\"updated_at\"] as const;\n\n/** Documents the item document merge result payload exchanged by command, SDK, and package integrations. */\nexport interface ItemDocumentMergeResult {\n  /** Serialized merged item document (always parseable; count headers recomputed by canonical serialization). */\n  merged: string;\n  /** Metadata fields (plus `body`) where both sides changed to different values; resolved toward the preferred side. */\n  conflict_fields: string[];\n  /** Fields taken from the theirs side by clean three-way resolution. */\n  fields_from_theirs: string[];\n  /** Collection fields that merged by element-identity union. */\n  union_fields: string[];\n  /** Which side unresolvable conflicts were resolved toward. */\n  preferred: MergePreferredSide;\n}\n\nfunction jsonEquals(left: unknown, right: unknown): boolean {\n  return stableStringify(left ?? null) === stableStringify(right ?? null);\n}\n\nfunction unionCollection(\n  base: unknown,\n  ours: unknown,\n  theirs: unknown,\n): unknown[] {\n  const toEntries = (value: unknown): unknown[] =>\n    Array.isArray(value) ? value : [];\n  const baseIds = new Set(toEntries(base).map((entry) => stableStringify(entry)));\n  const oursEntries = toEntries(ours);\n  const oursIds = new Set(oursEntries.map((entry) => stableStringify(entry)));\n  const theirsEntries = toEntries(theirs);\n  const theirsIds = new Set(\n    theirsEntries.map((entry) => stableStringify(entry)),\n  );\n  const merged = oursEntries.filter((entry) => {\n    const identity = stableStringify(entry);\n    // An element kept by ours survives unless theirs deleted it (present in\n    // base, absent from theirs).\n    return !baseIds.has(identity) || theirsIds.has(identity);\n  });\n  for (const entry of theirsEntries) {\n    const identity = stableStringify(entry);\n    if (!oursIds.has(identity) && !baseIds.has(identity)) {\n      merged.push(entry);\n    }\n  }\n  return merged;\n}\n\nfunction latestTimestamp(ours: unknown, theirs: unknown): unknown {\n  return compareTimestampStrings(String(ours), String(theirs)) >= 0\n    ? ours\n    : theirs;\n}\n\ninterface ScalarMergeOutcome {\n  value: unknown;\n  from_theirs: boolean;\n  conflict: boolean;\n}\n\nfunction mergeScalarThreeWay(\n  base: unknown,\n  ours: unknown,\n  theirs: unknown,\n  preferred: MergePreferredSide,\n): ScalarMergeOutcome {\n  if (jsonEquals(ours, theirs)) {\n    return { value: ours, from_theirs: false, conflict: false };\n  }\n  if (jsonEquals(base, ours)) {\n    return { value: theirs, from_theirs: true, conflict: false };\n  }\n  if (jsonEquals(base, theirs)) {\n    return { value: ours, from_theirs: false, conflict: false };\n  }\n  return {\n    value: preferred === \"theirs\" ? theirs : ours,\n    from_theirs: preferred === \"theirs\",\n    conflict: true,\n  };\n}\n\nfunction toMetadataRecord(document: ItemDocument): Record<string, unknown> {\n  return { ...(document.metadata as unknown as Record<string, unknown>) };\n}\n\nfunction parseItemMergeSide(\n  raw: string,\n  label: string,\n  options: ItemDocumentFormatOptions,\n): ItemDocument {\n  try {\n    return canonicalDocument(parseItemDocument(raw, options), options);\n  } catch (error) {\n    throw new PmCliError(\n      `Item merge input (${label}) is not a readable item document: ${String(error)}`,\n      EXIT_CODE.GENERIC_FAILURE,\n    );\n  }\n}\n\ninterface ItemMetadataMergeAccumulator {\n  /** Merged metadata values keyed by canonical field name. */\n  merged: Record<string, unknown>;\n  /** Scalar fields where both sides diverged from the base. */\n  conflictFields: string[];\n  /** Scalar fields cleanly selected from the other branch. */\n  fieldsFromTheirs: string[];\n  /** Collection fields whose final union differs from ours. */\n  unionFields: string[];\n}\n\nfunction mergeItemMetadataRecords(\n  baseRecord: Record<string, unknown>,\n  oursRecord: Record<string, unknown>,\n  theirsRecord: Record<string, unknown>,\n  preferred: MergePreferredSide,\n): ItemMetadataMergeAccumulator {\n  const unionFieldSet = new Set<string>(ITEM_UNION_COLLECTION_FIELDS);\n  const latestFieldSet = new Set<string>(ITEM_LATEST_TIMESTAMP_FIELDS);\n  const fieldNames = [\n    ...new Set([...Object.keys(oursRecord), ...Object.keys(theirsRecord)]),\n  ].sort((left, right) => left.localeCompare(right));\n  const accumulator: ItemMetadataMergeAccumulator = {\n    merged: {},\n    conflictFields: [],\n    fieldsFromTheirs: [],\n    unionFields: [],\n  };\n\n  for (const field of fieldNames) {\n    const baseValue = baseRecord[field];\n    const oursValue = oursRecord[field];\n    const theirsValue = theirsRecord[field];\n    if (unionFieldSet.has(field)) {\n      const union = unionCollection(baseValue, oursValue, theirsValue);\n      // `fieldNames` is derived from both records' own keys, so a collection\n      // reached here is declared by at least one side. Preserve even an empty\n      // result (`tags` is required) so serialization never drops it.\n      accumulator.merged[field] = union;\n      if (!jsonEquals(union, oursValue)) {\n        accumulator.unionFields.push(field);\n      }\n      continue;\n    }\n    if (latestFieldSet.has(field)) {\n      accumulator.merged[field] = latestTimestamp(oursValue, theirsValue);\n      continue;\n    }\n    const outcome = mergeScalarThreeWay(\n      baseValue,\n      oursValue,\n      theirsValue,\n      preferred,\n    );\n    if (outcome.value !== undefined) {\n      accumulator.merged[field] = outcome.value;\n    }\n    if (outcome.conflict) {\n      accumulator.conflictFields.push(field);\n    } else if (outcome.from_theirs) {\n      accumulator.fieldsFromTheirs.push(field);\n    }\n  }\n  return accumulator;\n}\n\n/**\n * Field-aware three-way merge of one tracker item document. Commutative\n * collections (notes, tags, tests, ...) union by element identity so\n * concurrent appends never conflict; `updated_at` resolves to the latest\n * timestamp so disjoint-field edits never collide on the shared freshness\n * scalar; every other metadata field and the body use classic three-way\n * resolution. Unresolvable both-sides-changed conflicts are resolved toward\n * the preferred side but reported in `conflict_fields`, and the merged output\n * is always canonically serialized — count-prefixed TOON array headers are\n * recomputed, so the hand-resolution corruption class (stale `notes[N]`\n * headers) cannot be produced by this merge.\n */\nexport function mergeItemDocuments(\n  baseRaw: string,\n  oursRaw: string,\n  theirsRaw: string,\n  options: ItemDocumentFormatOptions & {\n    /** Side that wins unresolvable conflicts (default \"ours\"). */\n    preferred?: MergePreferredSide;\n  } = {},\n): ItemDocumentMergeResult {\n  const preferred: MergePreferredSide = options.preferred ?? \"ours\";\n  // An empty base means both branches created the file independently\n  // (add/add); three-way falls back to treating every differing field as an\n  // ours/theirs decision, which the scalar resolver already models.\n  const hasBase = baseRaw.trim().length > 0;\n  const ours = parseItemMergeSide(oursRaw, \"ours\", options);\n  const theirs = parseItemMergeSide(theirsRaw, \"theirs\", options);\n  const base = hasBase ? parseItemMergeSide(baseRaw, \"base\", options) : ours;\n\n  const baseRecord = hasBase\n    ? toMetadataRecord(base)\n    : ({} as Record<string, unknown>);\n  const oursRecord = toMetadataRecord(ours);\n  const theirsRecord = toMetadataRecord(theirs);\n  const { merged, conflictFields, fieldsFromTheirs, unionFields } =\n    mergeItemMetadataRecords(baseRecord, oursRecord, theirsRecord, preferred);\n\n  const bodyOutcome = mergeScalarThreeWay(\n    hasBase ? base.body : \"\",\n    ours.body,\n    theirs.body,\n    preferred,\n  );\n  if (bodyOutcome.conflict) {\n    conflictFields.push(\"body\");\n  } else if (bodyOutcome.from_theirs) {\n    fieldsFromTheirs.push(\"body\");\n  }\n\n  const mergedRaw = serializeItemDocument(\n    {\n      metadata: merged as unknown as ItemMetadata,\n      body: bodyOutcome.value as string,\n    },\n    options,\n  );\n  return {\n    merged: mergedRaw,\n    conflict_fields: conflictFields,\n    fields_from_theirs: fieldsFromTheirs,\n    union_fields: unionFields,\n    preferred,\n  };\n}\n\n/** Documents the JSON document merge result payload exchanged by command, SDK, and package integrations. */\nexport interface JsonDocumentMergeResult {\n  /** Serialized merged JSON document (two-space indent, trailing newline — the tracker's canonical config style). */\n  merged: string;\n  /** Dotted key paths where both sides changed to different values; resolved toward the preferred side. */\n  conflict_paths: string[];\n  /** Dotted key paths taken from the theirs side by clean three-way resolution. */\n  paths_from_theirs: string[];\n  /** Which side unresolvable conflicts were resolved toward. */\n  preferred: MergePreferredSide;\n}\n\nfunction isPlainObject(value: unknown): value is Record<string, unknown> {\n  return (\n    typeof value === \"object\" &&\n    value !== null &&\n    !Array.isArray(value)\n  );\n}\n\nfunction parseJsonSide(raw: string, label: string): unknown {\n  const conflictMarker = findFirstMergeConflictMarker(raw);\n  if (conflictMarker) {\n    throw new PmCliError(\n      `JSON merge input (${label}) contains unresolved conflict markers at line ${conflictMarker.line}.`,\n      EXIT_CODE.GENERIC_FAILURE,\n    );\n  }\n  if (raw.trim().length === 0) {\n    return undefined;\n  }\n  try {\n    return JSON.parse(raw) as unknown;\n  } catch {\n    throw new PmCliError(\n      `JSON merge input (${label}) is not valid JSON.`,\n      EXIT_CODE.GENERIC_FAILURE,\n    );\n  }\n}\n\nfunction mergeJsonValue(\n  base: unknown,\n  ours: unknown,\n  theirs: unknown,\n  preferred: MergePreferredSide,\n  pathPrefix: string,\n  conflictPaths: string[],\n  pathsFromTheirs: string[],\n): unknown {\n  if (jsonEquals(ours, theirs)) {\n    return ours;\n  }\n  if (isPlainObject(ours) && isPlainObject(theirs)) {\n    const baseObject = isPlainObject(base) ? base : {};\n    const merged: Record<string, unknown> = {};\n    const keys = [\n      ...new Set([...Object.keys(ours), ...Object.keys(theirs)]),\n    ].sort((left, right) => left.localeCompare(right));\n    for (const key of keys) {\n      const childPath = pathPrefix.length > 0 ? `${pathPrefix}.${key}` : key;\n      const child = mergeJsonKey(\n        baseObject,\n        ours,\n        theirs,\n        key,\n        preferred,\n        childPath,\n        conflictPaths,\n        pathsFromTheirs,\n      );\n      if (child !== undefined) {\n        merged[key] = child;\n      }\n    }\n    return merged;\n  }\n  const outcome = mergeScalarThreeWay(base, ours, theirs, preferred);\n  if (outcome.conflict) {\n    conflictPaths.push(pathPrefix);\n  } else if (outcome.from_theirs) {\n    pathsFromTheirs.push(pathPrefix);\n  }\n  return outcome.value;\n}\n\nfunction mergeJsonKey(\n  base: Record<string, unknown>,\n  ours: Record<string, unknown>,\n  theirs: Record<string, unknown>,\n  key: string,\n  preferred: MergePreferredSide,\n  childPath: string,\n  conflictPaths: string[],\n  pathsFromTheirs: string[],\n): unknown {\n  const inOurs = Object.prototype.hasOwnProperty.call(ours, key);\n  const inTheirs = Object.prototype.hasOwnProperty.call(theirs, key);\n  const inBase = Object.prototype.hasOwnProperty.call(base, key);\n  if (inOurs && inTheirs) {\n    return mergeJsonValue(\n      base[key],\n      ours[key],\n      theirs[key],\n      preferred,\n      childPath,\n      conflictPaths,\n      pathsFromTheirs,\n    );\n  }\n  if (inOurs) {\n    // Present only in ours: either ours added it (keep) or theirs deleted it\n    // (honor the delete when ours left it untouched from base).\n    if (inBase && jsonEquals(base[key], ours[key])) {\n      pathsFromTheirs.push(childPath);\n      return undefined;\n    }\n    if (inBase) {\n      conflictPaths.push(childPath);\n      return preferred === \"theirs\" ? undefined : ours[key];\n    }\n    return ours[key];\n  }\n  // Present only in theirs (mirror of the branch above).\n  if (inBase && jsonEquals(base[key], theirs[key])) {\n    return undefined;\n  }\n  if (inBase) {\n    conflictPaths.push(childPath);\n    return preferred === \"theirs\" ? theirs[key] : undefined;\n  }\n  pathsFromTheirs.push(childPath);\n  return theirs[key];\n}\n\n/**\n * Key-level three-way merge for the tracker's single-file JSON configuration\n * artifacts (`settings.json`, `schema/*.json`). Nested objects merge\n * recursively per key so two branches editing disjoint settings never\n * conflict; both-sides-changed leaf values resolve toward the preferred side\n * and are reported in `conflict_paths`. The output is always valid JSON, so a\n * merged configuration can never regress into the silent-defaults fallback\n * that raw conflict markers cause.\n */\nexport function mergeJsonDocuments(\n  baseRaw: string,\n  oursRaw: string,\n  theirsRaw: string,\n  options: {\n    /** Side that wins unresolvable conflicts (default \"ours\"). */\n    preferred?: MergePreferredSide;\n  } = {},\n): JsonDocumentMergeResult {\n  const preferred: MergePreferredSide = options.preferred ?? \"ours\";\n  const base = parseJsonSide(baseRaw, \"base\");\n  const ours = parseJsonSide(oursRaw, \"ours\");\n  const theirs = parseJsonSide(theirsRaw, \"theirs\");\n  const conflictPaths: string[] = [];\n  const pathsFromTheirs: string[] = [];\n  const merged = mergeJsonValue(\n    base,\n    ours,\n    theirs,\n    preferred,\n    \"\",\n    conflictPaths,\n    pathsFromTheirs,\n  );\n  return {\n    merged: `${JSON.stringify(merged ?? null, null, 2)}\\n`,\n    conflict_paths: conflictPaths,\n    paths_from_theirs: pathsFromTheirs,\n    preferred,\n  };\n}\n", "/**\n * @module sdk/merge/driver\n *\n * File-level git merge driver runner for tracker artifacts. Git invokes the\n * driver with the base (%O), ours (%A), and theirs (%B) temporary files; the\n * driver writes the merged content back to the ours path and reports whether\n * unresolvable conflicts remain. Conflicted artifacts are still written as\n * parseable documents (resolved toward the preferred side) so a conflicted\n * merge never corrupts tracker storage the way raw conflict markers do.\n */\nimport { readFile, writeFile } from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { getActiveExtensionRegistrations } from \"../../core/extensions/index.js\";\nimport { collectRegisteredItemFieldNames } from \"../../core/extensions/item-fields.js\";\nimport { pathExists } from \"../../core/fs/fs-utils.js\";\nimport { EXIT_CODE } from \"../../core/shared/constants.js\";\nimport type { GlobalOptions } from \"../../core/shared/command-types.js\";\nimport { PmCliError } from \"../../core/shared/errors.js\";\nimport { nowIso } from \"../../core/shared/time.js\";\nimport { getSettingsPath, resolvePmRoot } from \"../../core/store/paths.js\";\nimport { readSettings } from \"../../core/store/settings.js\";\nimport type { ItemFormat, PmSettings } from \"../../types/index.js\";\nimport {\n  mergeHistoryStreams,\n  mergeItemDocuments,\n  mergeJsonDocuments,\n  mergeRelationshipEventStreams,\n  type MergePreferredSide,\n} from \"./three-way.js\";\n\n/** Supported values accepted by the merge driver artifact contract across CLI, SDK, and MCP surfaces. */\nexport const MERGE_DRIVER_ARTIFACT_VALUES = [\n  \"item\",\n  \"history\",\n  \"relationship\",\n  \"json\",\n] as const;\n/** Restricts merge driver artifact values accepted by command, SDK, and storage contracts. */\nexport type MergeDriverArtifact = (typeof MERGE_DRIVER_ARTIFACT_VALUES)[number];\n\n/** Documents the merge driver options payload exchanged by command, SDK, and package integrations. */\nexport interface MergeDriverOptions {\n  /** Artifact class being merged: item document, history JSONL stream, relationship event JSONL store, or key-level JSON config. */\n  artifact: string;\n  /** Path to the common-ancestor version (git %O). */\n  basePath: string;\n  /** Path to the current-branch version (git %A); also the default output path per the git merge-driver protocol. */\n  oursPath: string;\n  /** Path to the other-branch version (git %B). */\n  theirsPath: string;\n  /** Optional explicit output path overriding the git default of writing to the ours path. */\n  outputPath?: string;\n  /** Original repository-relative item path supplied by Git as `%P`, used to detect item format when temporary side paths lack extensions. */\n  itemPath?: string;\n  /** Side that wins unresolvable conflicts (default \"ours\"). */\n  prefer?: string;\n}\n\n/** Documents the merge driver result payload exchanged by command, SDK, and package integrations. */\nexport interface MergeDriverResult {\n  /** Whether the merge completed without unresolvable conflicts. */\n  ok: boolean;\n  /** Artifact class that was merged. */\n  artifact: MergeDriverArtifact;\n  /** Path the merged content was written to. */\n  output_path: string;\n  /** Side unresolvable conflicts were resolved toward. */\n  preferred: MergePreferredSide;\n  /** Unresolvable conflict labels: metadata field names (item), dotted key paths (json). Empty for history merges. */\n  conflicts: string[];\n  /** History-merge strategy and entry accounting; present only for the history artifact. */\n  history?: {\n    strategy: string;\n    common_entries: number;\n    entries_from_ours: number;\n    entries_from_theirs: number;\n    entries_total: number;\n    reanchored: boolean;\n  };\n  /** Relationship-event-merge strategy and accounting; present only for the relationship artifact. */\n  relationship?: {\n    strategy: string;\n    common_entries: number;\n    entries_from_ours: number;\n    entries_from_theirs: number;\n    entries_total: number;\n    reanchored: boolean;\n  };\n  /** Item-merge field accounting; present only for the item artifact. */\n  item?: {\n    fields_from_theirs: string[];\n    union_fields: string[];\n  };\n  /** JSON-merge key accounting; present only for the json artifact. */\n  json?: {\n    paths_from_theirs: string[];\n  };\n  /** Guidance for resolving remaining conflicts or verifying the merged workspace. */\n  guidance: string[];\n  /** ISO 8601 timestamp recording when generated occurred. */\n  generated_at: string;\n}\n\nfunction resolveArtifact(value: string): MergeDriverArtifact {\n  const normalized = value.trim().toLowerCase();\n  if (\n    (MERGE_DRIVER_ARTIFACT_VALUES as readonly string[]).includes(normalized)\n  ) {\n    return normalized as MergeDriverArtifact;\n  }\n  throw new PmCliError(\n    `Unknown merge artifact \"${value}\". Supported values: ${MERGE_DRIVER_ARTIFACT_VALUES.join(\", \")}.`,\n    EXIT_CODE.USAGE,\n  );\n}\n\nfunction resolvePreferredSide(value: string | undefined): MergePreferredSide {\n  if (value === undefined) {\n    return \"ours\";\n  }\n  const normalized = value.trim().toLowerCase();\n  if (normalized === \"ours\" || normalized === \"theirs\") {\n    return normalized;\n  }\n  throw new PmCliError(\n    `Unknown --prefer value \"${value}\". Supported values: ours, theirs.`,\n    EXIT_CODE.USAGE,\n  );\n}\n\nasync function readSideFile(filePath: string, label: string): Promise<string> {\n  try {\n    return await readFile(filePath, \"utf8\");\n  } catch {\n    throw new PmCliError(\n      `Cannot read merge ${label} file at ${filePath}.`,\n      EXIT_CODE.NOT_FOUND,\n    );\n  }\n}\n\n/**\n * Load the workspace settings when a tracker is initialized at the resolved pm\n * root, or fall back to format defaults when the driver runs outside a tracker\n * (git can invoke merge drivers before `pm init`, e.g. while rebasing the\n * commit that introduces the tracker).\n */\nasync function loadOptionalSettings(\n  global: GlobalOptions,\n): Promise<PmSettings | null> {\n  const pmRoot = resolvePmRoot(process.cwd(), global.path);\n  if (!(await pathExists(getSettingsPath(pmRoot)))) {\n    return null;\n  }\n  return readSettings(pmRoot);\n}\n\nfunction itemFormatForPath(\n  filePath: string,\n  settings: PmSettings | null,\n): ItemFormat {\n  if (filePath.endsWith(\".md\")) {\n    return \"json_markdown\";\n  }\n  if (filePath.endsWith(\".toon\")) {\n    return \"toon\";\n  }\n  return settings?.item_format ?? \"toon\";\n}\n\n/**\n * Execute one git merge-driver invocation for a tracker artifact. Reads the\n * three per-side versions, applies the artifact's field-aware merge semantics,\n * writes the merged content (parseable even when conflicted) to the output\n * path, and reports remaining conflicts so the CLI can exit non-zero and let\n * git mark the path unmerged.\n */\nexport async function runMergeDriver(\n  options: MergeDriverOptions,\n  global: GlobalOptions,\n): Promise<MergeDriverResult> {\n  const artifact = resolveArtifact(options.artifact);\n  const preferred = resolvePreferredSide(options.prefer);\n  const outputPath = path.resolve(options.outputPath ?? options.oursPath);\n  const [baseRaw, oursRaw, theirsRaw] = await Promise.all([\n    readSideFile(options.basePath, \"base\"),\n    readSideFile(options.oursPath, \"ours\"),\n    readSideFile(options.theirsPath, \"theirs\"),\n  ]);\n\n  let merged: string;\n  const conflicts: string[] = [];\n  const result: Partial<MergeDriverResult> = {};\n  if (artifact === \"history\") {\n    const historyMerge = mergeHistoryStreams(baseRaw, oursRaw, theirsRaw);\n    merged = historyMerge.merged;\n    result.history = {\n      strategy: historyMerge.strategy,\n      common_entries: historyMerge.common_entries,\n      entries_from_ours: historyMerge.entries_from_ours,\n      entries_from_theirs: historyMerge.entries_from_theirs,\n      entries_total: historyMerge.entries_total,\n      reanchored: historyMerge.reanchored,\n    };\n  } else if (artifact === \"relationship\") {\n    const relationshipMerge = mergeRelationshipEventStreams(\n      baseRaw,\n      oursRaw,\n      theirsRaw,\n    );\n    merged = relationshipMerge.merged;\n    result.relationship = {\n      strategy: relationshipMerge.strategy,\n      common_entries: relationshipMerge.common_entries,\n      entries_from_ours: relationshipMerge.entries_from_ours,\n      entries_from_theirs: relationshipMerge.entries_from_theirs,\n      entries_total: relationshipMerge.entries_total,\n      reanchored: relationshipMerge.reanchored,\n    };\n  } else if (artifact === \"item\") {\n    const settings = await loadOptionalSettings(global);\n    const itemMerge = mergeItemDocuments(baseRaw, oursRaw, theirsRaw, {\n      format: itemFormatForPath(options.itemPath ?? outputPath, settings),\n      schema: settings?.schema,\n      extensionFieldNames: collectRegisteredItemFieldNames(\n        getActiveExtensionRegistrations(),\n      ),\n      preferred,\n    });\n    merged = itemMerge.merged;\n    conflicts.push(...itemMerge.conflict_fields);\n    result.item = {\n      fields_from_theirs: itemMerge.fields_from_theirs,\n      union_fields: itemMerge.union_fields,\n    };\n  } else {\n    const jsonMerge = mergeJsonDocuments(baseRaw, oursRaw, theirsRaw, {\n      preferred,\n    });\n    merged = jsonMerge.merged;\n    conflicts.push(...jsonMerge.conflict_paths);\n    result.json = {\n      paths_from_theirs: jsonMerge.paths_from_theirs,\n    };\n  }\n\n  await writeFile(outputPath, merged, \"utf8\");\n  const guidance: string[] = [];\n  if (conflicts.length > 0) {\n    guidance.push(\n      `Both branches changed ${conflicts.join(\", \")}; the ${preferred} value was kept. Review the merged file, re-apply the losing change if needed, then \"git add\" it.`,\n    );\n  }\n  if (artifact === \"history\" && result.history?.reanchored) {\n    guidance.push(\n      'The merged history chain was re-anchored. Run \"pm validate --check-history-drift\" and \"pm history-repair --all\" after the merge to reconcile item state with merged history.',\n    );\n  }\n  return {\n    ok: conflicts.length === 0,\n    artifact,\n    output_path: outputPath,\n    preferred,\n    conflicts,\n    ...result,\n    guidance,\n    generated_at: nowIso(),\n  };\n}\n"],
+  "mappings": "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",
+  "names": ["global"]
+}

package/dist/cli-bundle/chunks/{chunk-A3GAQLBH.js → chunk-IX677TRO.js}

@@ -1,17 +1,23 @@
 import {
   scanHistoryDrift
-} from "./chunk-BFJP4VYC.js";
+} from "./chunk-L7BH7IWU.js";
+import {
+  patchPathToChangedField
+} from "./chunk-TYHJDFYW.js";
 import {
   executeHistoryRewrite,
-  historyEntriesToRaw,
   readHistoryEntries,
+  resolveHistorySubject,
+  writeHistoryRawWithRollback
+} from "./chunk-C3KD7U3T.js";
+import {
+  historyEntriesToRaw,
+  normalizeReplayPatchOps,
   reanchorHistoryEntries,
   replayHash,
-  resolveHistorySubject,
   toReplayDocument,
-  verifyHistoryChain,
-  writeHistoryRawWithRollback
-} from "./chunk-RWAIRGBC.js";
+  verifyHistoryChain
+} from "./chunk-E6LEMURX.js";
 import {
   getActiveExtensionRegistrations,
   listAllItemMetadataWithBody,
@@ -19,7 +25,7 @@ import {
   readLocatedItem,
   readSettings,
   runActiveOnWriteHooks
-} from "./chunk-RLLOZAM2.js";
+} from "./chunk-IY6VZ3IW.js";
 import {
   EXIT_CODE,
   PmCliError,
@@ -28,17 +34,63 @@ import {
   readFileIfExists,
   resolveItemTypeRegistry,
   resolvePmRoot
-} from "./chunk-WCBB6VI3.js";
+} from "./chunk-7AVEY74G.js";
 
 // dist/sdk/history-repair.js
 import jsonPatch from "fast-json-patch";
 !(function() {
   try {
     var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "681e79d9-140b-5a78-9e24-6714efd974dc");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "bebe24ff-abdb-5530-b461-720da955db72");
   } catch (e2) {
   }
 })();
+function analyzeReconciliationDiscard(entries, finalReplay, currentItemReplay) {
+  const reconcilePatch = jsonPatch.compare(finalReplay, currentItemReplay);
+  if (reconcilePatch.length === 0) {
+    return void 0;
+  }
+  const revertedFields = /* @__PURE__ */ new Set();
+  for (const op of reconcilePatch) {
+    revertedFields.add(patchPathToChangedField(op.path));
+  }
+  const remaining = new Set(revertedFields);
+  const discardedEvents = [];
+  for (let index = entries.length - 1; index >= 0 && remaining.size > 0; index -= 1) {
+    const entry = entries[index];
+    const entryFields = /* @__PURE__ */ new Set();
+    for (const op of normalizeReplayPatchOps(entry.patch)) {
+      entryFields.add(patchPathToChangedField(op.path));
+      if (op.from) {
+        entryFields.add(patchPathToChangedField(op.from));
+      }
+    }
+    const overlap = [...remaining].filter((field) => entryFields.has(field));
+    if (overlap.length === 0) {
+      continue;
+    }
+    for (const field of overlap) {
+      remaining.delete(field);
+    }
+    discardedEvents.push({
+      index: index + 1,
+      ts: entry.ts,
+      author: entry.author,
+      op: entry.op,
+      fields: overlap.sort((left, right) => left.localeCompare(right))
+    });
+  }
+  discardedEvents.reverse();
+  return {
+    reverted_field_count: revertedFields.size,
+    reverted_fields: [...revertedFields].sort((left, right) => left.localeCompare(right)),
+    discarded_events: discardedEvents,
+    discarded_authors: [
+      ...new Set(discardedEvents.map((event) => event.author))
+    ].sort((left, right) => left.localeCompare(right)),
+    recovery_hint: "Reconciliation keeps the on-disk item and overwrites these replayed mutations. To recover one, inspect it with pm history <id> --diff --field <field>, then re-apply the lost value with pm update."
+  };
+}
 function toAuthor(candidate, defaultAuthor) {
   const resolved = candidate ?? process.env.PM_AUTHOR ?? defaultAuthor;
   const trimmed = resolved.trim();
@@ -144,6 +196,7 @@ async function runHistoryRepair(id, options, global2) {
   const itemReplayContext = await loadHistoryRepairItemReplay(subject, settings, historyEntries);
   const finalReplay = reanchor.finalDocument;
   const reconcileNeeded = itemReplayContext.currentItemReplay !== null && replayHash(finalReplay) !== replayHash(itemReplayContext.currentItemReplay);
+  const reconciliation = reconcileNeeded && itemReplayContext.currentItemReplay ? analyzeReconciliationDiscard(reanchor.entries, finalReplay, itemReplayContext.currentItemReplay) : void 0;
   const changed = reanchor.entriesRehashed > 0 || reanchor.entriesPatchRepaired > 0 || reconcileNeeded;
   const author = toAuthor(options.author, settings.author_default);
   const dryRun = Boolean(options.dryRun);
@@ -167,6 +220,10 @@ async function runHistoryRepair(id, options, global2) {
     throw new PmCliError(`history-repair produced an invalid rewritten chain (${historyVerify.errors.join(", ")}).`, EXIT_CODE.GENERIC_FAILURE);
   }
   const warnings = collectHistoryRepairWarnings(changed, reanchor.skippedOps);
+  if (reconciliation) {
+    warnings.push(`history_repair_reconcile_discards_events:${reconciliation.discarded_events.length}`);
+    warnings.push(`history_repair_discarded_authors:${reconciliation.discarded_authors.join(",")}`);
+  }
   if (changed && !dryRun) {
     warnings.push(...await applyHistoryRepairRewrite({
       pmRoot,
@@ -204,6 +261,7 @@ async function runHistoryRepair(id, options, global2) {
       path: itemReplayContext.currentItemPath,
       matched_chain_before: itemReplayContext.matchedChainBefore
     },
+    ...reconciliation ? { reconciliation } : {},
     warnings: [...new Set(warnings)].sort((left, right) => left.localeCompare(right)),
     generated_at: nowIso()
   };
@@ -227,18 +285,22 @@ async function runHistoryRepairAll(options, global2) {
   const items = await listAllItemMetadataWithBody(pmRoot, settings.item_format, typeRegistry.type_to_folder, itemReadWarnings, settings.schema);
   const drift = await scanHistoryDrift(pmRoot, items);
   const streams = [];
+  const repairWarnings = [];
   const totals = { repaired: 0, skipped_clean: 0, failed: 0 };
   for (const driftedId of drift.driftedItems) {
     try {
       const result = await runHistoryRepair(driftedId, options, global2);
       const outcome = result.changed ? "repaired" : "skipped_clean";
       totals[outcome] += 1;
+      repairWarnings.push(...result.warnings.map((warning) => `${driftedId}:${warning}`));
       streams.push({
         id: driftedId,
         outcome,
         entries_rehashed: result.history.entries_rehashed,
         entries_patch_repaired: result.history.entries_patch_repaired,
-        reconciled_with_item: result.history.reconciled_with_item
+        reconciled_with_item: result.history.reconciled_with_item,
+        ...result.reconciliation ? { reconciliation: result.reconciliation } : {},
+        warnings: result.warnings
       });
     } catch (error) {
       totals.failed += 1;
@@ -257,7 +319,7 @@ async function runHistoryRepairAll(options, global2) {
     drifted_streams: drift.driftedItems.length,
     streams,
     totals,
-    warnings: [...new Set(itemReadWarnings)].sort((left, right) => left.localeCompare(right)),
+    warnings: [.../* @__PURE__ */ new Set([...itemReadWarnings, ...repairWarnings])].sort((left, right) => left.localeCompare(right)),
     generated_at: nowIso()
   };
 }
@@ -272,8 +334,9 @@ async function runHistoryRepairAll(options, global2) {
 })();
 
 export {
+  analyzeReconciliationDiscard,
   runHistoryRepair,
   assertHistoryRepairTarget,
   runHistoryRepairAll
 };
-//# sourceMappingURL=chunk-A3GAQLBH.js.map
+//# sourceMappingURL=chunk-IX677TRO.js.map

package/dist/cli-bundle/chunks/chunk-IX677TRO.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../../sdk/history-repair.ts"],
+  "sourcesContent": ["/**\n * @module sdk/history-repair\n *\n * Implements the pm history repair command surface and its agent-facing runtime behavior.\n */\nimport jsonPatch from \"fast-json-patch\";\nimport { patchPathToChangedField } from \"../core/history/history-diff.js\";\nimport { pathExists, readFileIfExists } from \"../core/fs/fs-utils.js\";\nimport {\n  executeHistoryRewrite,\n  writeHistoryRawWithRollback,\n} from \"../core/history/history-rewrite.js\";\nimport {\n  historyEntriesToRaw,\n  normalizeReplayPatchOps,\n  reanchorHistoryEntries,\n  replayHash,\n  toReplayDocument,\n  verifyHistoryChain,\n  type ReplayDocument,\n} from \"../core/history/replay.js\";\nimport { scanHistoryDrift } from \"../core/history/drift-scan.js\";\nimport { readHistoryEntries } from \"../core/history/read.js\";\nimport { resolveItemTypeRegistry } from \"../core/item/type-registry.js\";\nimport { EXIT_CODE } from \"../core/shared/constants.js\";\nimport type { GlobalOptions } from \"../core/shared/command-types.js\";\nimport { PmCliError } from \"../core/shared/errors.js\";\nimport { nowIso } from \"../core/shared/time.js\";\nimport {\n  getActiveExtensionRegistrations,\n  runActiveOnWriteHooks,\n} from \"../core/extensions/index.js\";\nimport {\n  listAllItemMetadataWithBody,\n  readLocatedItem,\n} from \"../core/store/item-store.js\";\nimport { getSettingsPath, resolvePmRoot } from \"../core/store/paths.js\";\nimport { readSettings } from \"../core/store/settings.js\";\nimport type {\n  HistoryEntry,\n  HistoryPatchOp,\n  ItemMetadata,\n} from \"../types/index.js\";\nimport { resolveHistorySubject } from \"./history-redact.js\";\n\n/** Documents the history repair command options payload exchanged by command, SDK, and package integrations. */\nexport interface HistoryRepairCommandOptions {\n  /** Value that configures or reports dry run for this contract. */\n  dryRun?: boolean;\n  /** Value that configures or reports author for this contract. */\n  author?: string;\n  /** Human-readable explanation suitable for logs and agent-facing output. */\n  message?: string;\n  /** Value that configures or reports force for this contract. */\n  force?: boolean;\n}\n\n/** Documents the history repair result payload exchanged by command, SDK, and package integrations. */\nexport interface HistoryRepairResult {\n  /** Stable identifier used to reference this record across commands and storage. */\n  id: string;\n  /** Value that configures or reports dry run for this contract. */\n  dry_run: boolean;\n  /** Value that configures or reports changed for this contract. */\n  changed: boolean;\n  /** Value that configures or reports history for this contract. */\n  history: {\n    path: string;\n    entries_scanned: number;\n    chain_drift_before: boolean;\n    entries_rehashed: number;\n    entries_patch_repaired: number;\n    converted_replace_to_add: number;\n    skipped_ops: number;\n    reconciled_with_item: boolean;\n    audit_entry_added: boolean;\n    verify_ok: boolean;\n    verify_errors: string[];\n  };\n  /** Value that configures or reports item for this contract. */\n  item: {\n    exists: boolean;\n    path: string | null;\n    matched_chain_before: boolean | null;\n  };\n  /** Present when reconciling the chain with the on-disk item discards the replayed effect of earlier history events (GH-603): names the reverted fields and the authors whose mutations the reconciliation overwrites, so cross-author data loss after a lossy merge is loud instead of silent. */\n  reconciliation?: HistoryRepairReconciliationReport;\n  /** Value that configures or reports warnings for this contract. */\n  warnings: string[];\n  /** ISO 8601 timestamp recording when generated occurred. */\n  generated_at: string;\n}\n\n/** Documents one history event whose replayed effect a repair reconciliation overwrites. */\nexport interface HistoryRepairDiscardedEvent {\n  /** 1-based index of the event in the (re-anchored) history stream. */\n  index: number;\n  /** Timestamp of the discarded event. */\n  ts: string;\n  /** Author whose mutation the reconciliation overwrites. */\n  author: string;\n  /** Operation label of the discarded event. */\n  op: string;\n  /** Reverted fields this event last wrote. */\n  fields: string[];\n}\n\n/** Documents the repair reconciliation data-loss report exchanged by command, SDK, and package integrations. */\nexport interface HistoryRepairReconciliationReport {\n  /** Number of fields the reconciliation patch reverts relative to the replayed chain. */\n  reverted_field_count: number;\n  /** Fields whose replayed values the reconciliation overwrites with the on-disk item's values. */\n  reverted_fields: string[];\n  /** Newest history events that last wrote each reverted field — the mutations being discarded. */\n  discarded_events: HistoryRepairDiscardedEvent[];\n  /** Distinct authors whose mutations the reconciliation discards. */\n  discarded_authors: string[];\n  /** How to recover a discarded mutation instead of accepting the revert. */\n  recovery_hint: string;\n}\n\n/** Compute which fields a chain-vs-item reconciliation reverts and which history events (and authors) last wrote them. The reconciliation patch rewrites the replayed final state into the on-disk item state, so any field it touches is a replayed mutation being overwritten — after a lossy merge resolution this is exactly the other branch's discarded work (GH-603). */\nexport function analyzeReconciliationDiscard(\n  entries: HistoryEntry[],\n  finalReplay: ReplayDocument,\n  currentItemReplay: ReplayDocument,\n): HistoryRepairReconciliationReport | undefined {\n  const reconcilePatch = jsonPatch.compare(\n    finalReplay,\n    currentItemReplay,\n  ) as HistoryPatchOp[];\n  if (reconcilePatch.length === 0) {\n    return undefined;\n  }\n  const revertedFields = new Set<string>();\n  for (const op of reconcilePatch) {\n    revertedFields.add(patchPathToChangedField(op.path));\n  }\n  const remaining = new Set(revertedFields);\n  const discardedEvents: HistoryRepairDiscardedEvent[] = [];\n  for (let index = entries.length - 1; index >= 0 && remaining.size > 0; index -= 1) {\n    const entry = entries[index];\n    const entryFields = new Set<string>();\n    for (const op of normalizeReplayPatchOps(entry.patch)) {\n      entryFields.add(patchPathToChangedField(op.path));\n      if (op.from) {\n        entryFields.add(patchPathToChangedField(op.from));\n      }\n    }\n    const overlap = [...remaining].filter((field) => entryFields.has(field));\n    if (overlap.length === 0) {\n      continue;\n    }\n    for (const field of overlap) {\n      remaining.delete(field);\n    }\n    discardedEvents.push({\n      index: index + 1,\n      ts: entry.ts,\n      author: entry.author,\n      op: entry.op,\n      fields: overlap.sort((left, right) => left.localeCompare(right)),\n    });\n  }\n  discardedEvents.reverse();\n  return {\n    reverted_field_count: revertedFields.size,\n    reverted_fields: [...revertedFields].sort((left, right) =>\n      left.localeCompare(right),\n    ),\n    discarded_events: discardedEvents,\n    discarded_authors: [\n      ...new Set(discardedEvents.map((event) => event.author)),\n    ].sort((left, right) => left.localeCompare(right)),\n    recovery_hint:\n      \"Reconciliation keeps the on-disk item and overwrites these replayed mutations. To recover one, inspect it with pm history <id> --diff --field <field>, then re-apply the lost value with pm update.\",\n  };\n}\n\ninterface HistoryRepairItemReplayContext {\n  currentItemReplay: ReplayDocument | null;\n  currentItemPath: string | null;\n  matchedChainBefore: boolean | null;\n  currentItemRawBeforeLock: string | null;\n  loadedItem: Awaited<ReturnType<typeof readLocatedItem>> | null;\n}\n\nfunction toAuthor(\n  candidate: string | undefined,\n  defaultAuthor: string,\n): string {\n  /* c8 ignore next -- PM_AUTHOR fallback branch is environment-dependent in CI. */\n  const resolved = candidate ?? process.env.PM_AUTHOR ?? defaultAuthor;\n  const trimmed = resolved.trim();\n  return trimmed.length > 0 ? trimmed : \"unknown\";\n}\n\nasync function loadHistoryRepairItemReplay(\n  subject: Awaited<ReturnType<typeof resolveHistorySubject>>,\n  settings: Awaited<ReturnType<typeof readSettings>>,\n  historyEntries: HistoryEntry[],\n): Promise<HistoryRepairItemReplayContext> {\n  const currentItemPath = subject.located?.itemPath ?? null;\n  const loadedItem = subject.located\n    ? await readLocatedItem(subject.located, { schema: settings.schema })\n    : null;\n  if (!loadedItem) {\n    return {\n      currentItemReplay: null,\n      currentItemPath,\n      matchedChainBefore: null,\n      currentItemRawBeforeLock: null,\n      loadedItem: null,\n    };\n  }\n  const currentItemReplay = toReplayDocument(loadedItem.document);\n  const lastOriginalAfterHash =\n    historyEntries[historyEntries.length - 1]?.after_hash;\n  return {\n    currentItemReplay,\n    currentItemPath,\n    matchedChainBefore: replayHash(currentItemReplay) === lastOriginalAfterHash,\n    currentItemRawBeforeLock: loadedItem.raw,\n    loadedItem,\n  };\n}\n\nfunction buildHistoryRepairMessage(params: {\n  message: string | undefined;\n  entriesRehashed: number;\n  entriesPatchRepaired: number;\n  reconcileNeeded: boolean;\n}): string {\n  if (typeof params.message === \"string\" && params.message.trim().length > 0) {\n    return params.message;\n  }\n  /* v8 ignore start -- message suffix/plural variants are deterministic formatting fallbacks around the covered repair outcomes */\n  return `history-repair re-anchored ${params.entriesRehashed} entr${\n    params.entriesRehashed === 1 ? \"y\" : \"ies\"\n  }${params.entriesPatchRepaired > 0 ? `, repaired ${params.entriesPatchRepaired} patch(es)` : \"\"}${\n    params.reconcileNeeded ? \", reconciled chain with on-disk item\" : \"\"\n  }.`;\n  /* v8 ignore stop */\n}\n\nfunction buildHistoryRepairEntries(params: {\n  reanchorEntries: HistoryEntry[];\n  changed: boolean;\n  reconcileNeeded: boolean;\n  currentItemReplay: ReplayDocument | null;\n  finalReplay: ReplayDocument;\n  author: string;\n  message: string;\n}): { rewrittenEntries: HistoryEntry[]; auditEntryAdded: boolean } {\n  const rewrittenEntries: HistoryEntry[] = [...params.reanchorEntries];\n  if (!params.changed) {\n    return { rewrittenEntries, auditEntryAdded: false };\n  }\n  const afterReplay =\n    params.reconcileNeeded && params.currentItemReplay\n      ? params.currentItemReplay\n      : params.finalReplay;\n  rewrittenEntries.push({\n    ts: nowIso(),\n    author: params.author,\n    op: \"history_repair\",\n    patch:\n      params.reconcileNeeded && params.currentItemReplay\n        ? (jsonPatch.compare(\n            params.finalReplay,\n            params.currentItemReplay,\n          ) as HistoryPatchOp[])\n        : [],\n    before_hash: replayHash(params.finalReplay),\n    after_hash: replayHash(afterReplay),\n    message: params.message,\n  });\n  return { rewrittenEntries, auditEntryAdded: true };\n}\n\nfunction collectHistoryRepairWarnings(\n  changed: boolean,\n  skippedOps: number,\n): string[] {\n  const warnings: string[] = [];\n  if (!changed) {\n    warnings.push(\"history_repair_no_changes\");\n  }\n  if (skippedOps > 0) {\n    warnings.push(`history_repair_skipped_unresolvable_ops:${skippedOps}`);\n  }\n  return warnings;\n}\n\nasync function applyHistoryRepairRewrite(params: {\n  pmRoot: string;\n  subject: Awaited<ReturnType<typeof resolveHistorySubject>>;\n  settings: Awaited<ReturnType<typeof readSettings>>;\n  typeRegistry: ReturnType<typeof resolveItemTypeRegistry>;\n  historyRawBeforeLock: string | null;\n  currentItemRawBeforeLock: string | null;\n  author: string;\n  force: boolean | undefined;\n  loadedItem: Awaited<ReturnType<typeof readLocatedItem>> | null;\n  historyPath: string;\n  rewrittenEntries: HistoryEntry[];\n}): Promise<string[]> {\n  return executeHistoryRewrite({\n    pmRoot: params.pmRoot,\n    subject: params.subject,\n    settings: params.settings,\n    typeRegistry: params.typeRegistry,\n    historyRawBeforeLock: params.historyRawBeforeLock,\n    currentItemRawBeforeLock: params.currentItemRawBeforeLock,\n    operation: \"history-repair\",\n    author: params.author,\n    force: params.force,\n    itemDocument: params.loadedItem?.document ?? null,\n    applyRewrite: async ({ historyRawUnderLock }) =>\n      writeHistoryRawWithRollback({\n        historyPath: params.historyPath,\n        nextHistoryRaw: historyEntriesToRaw(params.rewrittenEntries),\n        historyRawUnderLock,\n      }),\n    applyPostRewrite: async () =>\n      runActiveOnWriteHooks({\n        path: params.historyPath,\n        scope: \"project\",\n        op: \"history_repair:history\",\n      }),\n  });\n}\n\n/** Implements run history repair for the public runtime surface of this module. */\nexport async function runHistoryRepair(\n  id: string,\n  options: HistoryRepairCommandOptions,\n  global: GlobalOptions,\n): Promise<HistoryRepairResult> {\n  const pmRoot = resolvePmRoot(process.cwd(), global.path);\n  if (!(await pathExists(getSettingsPath(pmRoot)))) {\n    throw new PmCliError(\n      `Tracker is not initialized at ${pmRoot}. Run pm init first.`,\n      EXIT_CODE.NOT_FOUND,\n    );\n  }\n\n  const settings = await readSettings(pmRoot);\n  const typeRegistry = resolveItemTypeRegistry(\n    settings,\n    getActiveExtensionRegistrations(),\n  );\n  const subject = await resolveHistorySubject(\n    pmRoot,\n    id,\n    settings,\n    typeRegistry.type_to_folder,\n  );\n\n  if (!(await pathExists(subject.historyPath))) {\n    throw new PmCliError(\n      `No history stream exists for ${subject.id}.`,\n      EXIT_CODE.NOT_FOUND,\n    );\n  }\n  const historyRawBeforeLock = await readFileIfExists(subject.historyPath);\n  const historyEntries = await readHistoryEntries(\n    subject.historyPath,\n    subject.id,\n  );\n  if (historyEntries.length === 0) {\n    throw new PmCliError(\n      `No history entries exist for ${subject.id}; nothing to repair.`,\n      EXIT_CODE.USAGE,\n    );\n  }\n\n  const chainBefore = verifyHistoryChain(historyEntries);\n  const reanchor = reanchorHistoryEntries(historyEntries);\n\n  const itemReplayContext = await loadHistoryRepairItemReplay(\n    subject,\n    settings,\n    historyEntries,\n  );\n\n  const finalReplay = reanchor.finalDocument;\n  const reconcileNeeded =\n    itemReplayContext.currentItemReplay !== null &&\n    replayHash(finalReplay) !== replayHash(itemReplayContext.currentItemReplay);\n  // GH-603: reconciling toward the on-disk item can silently overwrite the\n  // replayed effect of other authors' events (classic after a lossy merge).\n  // Surface exactly what is being discarded before any write happens.\n  const reconciliation =\n    reconcileNeeded && itemReplayContext.currentItemReplay\n      ? analyzeReconciliationDiscard(\n          reanchor.entries,\n          finalReplay,\n          itemReplayContext.currentItemReplay,\n        )\n      : undefined;\n\n  const changed =\n    reanchor.entriesRehashed > 0 ||\n    reanchor.entriesPatchRepaired > 0 ||\n    reconcileNeeded;\n  const author = toAuthor(options.author, settings.author_default);\n  const dryRun = Boolean(options.dryRun);\n\n  const repairMessage = buildHistoryRepairMessage({\n    message: options.message,\n    entriesRehashed: reanchor.entriesRehashed,\n    entriesPatchRepaired: reanchor.entriesPatchRepaired,\n    reconcileNeeded,\n  });\n  const { rewrittenEntries, auditEntryAdded } = buildHistoryRepairEntries({\n    reanchorEntries: reanchor.entries,\n    changed,\n    reconcileNeeded,\n    currentItemReplay: itemReplayContext.currentItemReplay,\n    finalReplay,\n    author,\n    message: repairMessage,\n  });\n\n  const historyVerify = verifyHistoryChain(rewrittenEntries);\n  if (!historyVerify.ok) {\n    throw new PmCliError(\n      `history-repair produced an invalid rewritten chain (${historyVerify.errors.join(\", \")}).`,\n      EXIT_CODE.GENERIC_FAILURE,\n    );\n  }\n\n  const warnings = collectHistoryRepairWarnings(changed, reanchor.skippedOps);\n  if (reconciliation) {\n    warnings.push(\n      `history_repair_reconcile_discards_events:${reconciliation.discarded_events.length}`,\n    );\n    warnings.push(\n      `history_repair_discarded_authors:${reconciliation.discarded_authors.join(\",\")}`,\n    );\n  }\n\n  if (changed && !dryRun) {\n    warnings.push(\n      ...(await applyHistoryRepairRewrite({\n        pmRoot,\n        subject,\n        settings,\n        typeRegistry,\n        historyRawBeforeLock,\n        currentItemRawBeforeLock: itemReplayContext.currentItemRawBeforeLock,\n        author,\n        force: options.force,\n        loadedItem: itemReplayContext.loadedItem,\n        historyPath: subject.historyPath,\n        rewrittenEntries,\n      })),\n    );\n  }\n\n  return {\n    id: subject.id,\n    dry_run: dryRun,\n    changed,\n    history: {\n      path: subject.historyPath,\n      entries_scanned: historyEntries.length,\n      chain_drift_before: !chainBefore.ok,\n      entries_rehashed: reanchor.entriesRehashed,\n      entries_patch_repaired: reanchor.entriesPatchRepaired,\n      converted_replace_to_add: reanchor.convertedReplaceToAdd,\n      skipped_ops: reanchor.skippedOps,\n      reconciled_with_item: reconcileNeeded,\n      audit_entry_added: auditEntryAdded,\n      verify_ok: historyVerify.ok,\n      verify_errors: historyVerify.errors,\n    },\n    item: {\n      exists: itemReplayContext.currentItemPath !== null,\n      path: itemReplayContext.currentItemPath,\n      matched_chain_before: itemReplayContext.matchedChainBefore,\n    },\n    ...(reconciliation ? { reconciliation } : {}),\n    warnings: [...new Set(warnings)].sort((left, right) =>\n      left.localeCompare(right),\n    ),\n    generated_at: nowIso(),\n  };\n}\n\n/** Documents the history repair all stream result payload exchanged by command, SDK, and package integrations. */\nexport interface HistoryRepairAllStreamResult {\n  /** Stable identifier used to reference this record across commands and storage. */\n  id: string;\n  /** Value that configures or reports outcome for this contract. */\n  outcome: \"repaired\" | \"skipped_clean\" | \"failed\";\n  /** Value that configures or reports entries rehashed for this contract. */\n  entries_rehashed?: number;\n  /** Value that configures or reports entries patch repaired for this contract. */\n  entries_patch_repaired?: number;\n  /** Value that configures or reports reconciled with item for this contract. */\n  reconciled_with_item?: boolean;\n  /** Cross-author data-loss detail when reconciliation overwrites replayed mutations. */\n  reconciliation?: HistoryRepairReconciliationReport;\n  /** Stream-specific repair warnings retained by the bulk workflow. */\n  warnings?: string[];\n  /** Value that configures or reports error for this contract. */\n  error?: string;\n}\n\n/** Documents the history repair all result payload exchanged by command, SDK, and package integrations. */\nexport interface HistoryRepairAllResult {\n  /** Value that configures or reports all for this contract. */\n  all: true;\n  /** Value that configures or reports dry run for this contract. */\n  dry_run: boolean;\n  /** Value that configures or reports scanned streams for this contract. */\n  scanned_streams: number;\n  /** Value that configures or reports drifted streams for this contract. */\n  drifted_streams: number;\n  /** One compact row per drifted stream (clean streams are summarized by the counts only). */\n  streams: HistoryRepairAllStreamResult[];\n  /** Value that configures or reports totals for this contract. */\n  totals: { repaired: number; skipped_clean: number; failed: number };\n  /** Value that configures or reports warnings for this contract. */\n  warnings: string[];\n  /** ISO 8601 timestamp recording when generated occurred. */\n  generated_at: string;\n}\n\n/** Enforce the `pm history-repair` target contract shared by the CLI and MCP surfaces: exactly one of an item `<id>` or `--all` must be provided. */\nexport function assertHistoryRepairTarget(\n  id: string | undefined,\n  all: boolean,\n): void {\n  if (all && id !== undefined) {\n    throw new PmCliError(\n      \"history-repair: <id> and --all are mutually exclusive; pass an item id to repair one stream or --all to repair every drifted stream.\",\n      EXIT_CODE.USAGE,\n    );\n  }\n  if (!all && id === undefined) {\n    throw new PmCliError(\n      \"history-repair: provide an item <id> or pass --all to repair every drifted stream.\",\n      EXIT_CODE.USAGE,\n    );\n  }\n}\n\n/** Bulk drift repair: scan every item's history stream with the same drift scan `pm health` uses, then run the audited single-stream repair (ownership check, lock, no-drift verification, audit marker) for each drifted stream. One failing stream never aborts the rest; failures are collected per row and the caller decides the exit code from `totals.failed`. */\nexport async function runHistoryRepairAll(\n  options: HistoryRepairCommandOptions,\n  global: GlobalOptions,\n): Promise<HistoryRepairAllResult> {\n  const pmRoot = resolvePmRoot(process.cwd(), global.path);\n  if (!(await pathExists(getSettingsPath(pmRoot)))) {\n    throw new PmCliError(\n      `Tracker is not initialized at ${pmRoot}. Run pm init first.`,\n      EXIT_CODE.NOT_FOUND,\n    );\n  }\n\n  const settings = await readSettings(pmRoot);\n  const typeRegistry = resolveItemTypeRegistry(\n    settings,\n    getActiveExtensionRegistrations(),\n  );\n  const itemReadWarnings: string[] = [];\n  const items = await listAllItemMetadataWithBody(\n    pmRoot,\n    settings.item_format,\n    typeRegistry.type_to_folder,\n    itemReadWarnings,\n    settings.schema,\n  );\n  const drift = await scanHistoryDrift(\n    pmRoot,\n    items as Array<ItemMetadata & { body: string }>,\n  );\n\n  const streams: HistoryRepairAllStreamResult[] = [];\n  const repairWarnings: string[] = [];\n  const totals = { repaired: 0, skipped_clean: 0, failed: 0 };\n  for (const driftedId of drift.driftedItems) {\n    try {\n      const result = await runHistoryRepair(driftedId, options, global);\n      /* c8 ignore next -- mixed repaired/clean outcomes depend on live drift composition. */\n      const outcome = result.changed ? \"repaired\" : \"skipped_clean\";\n      totals[outcome] += 1;\n      repairWarnings.push(\n        ...result.warnings.map((warning) => `${driftedId}:${warning}`),\n      );\n      streams.push({\n        id: driftedId,\n        outcome,\n        entries_rehashed: result.history.entries_rehashed,\n        entries_patch_repaired: result.history.entries_patch_repaired,\n        reconciled_with_item: result.history.reconciled_with_item,\n        ...(result.reconciliation\n          ? { reconciliation: result.reconciliation }\n          : {}),\n        warnings: result.warnings,\n      });\n    } catch (error) {\n      totals.failed += 1;\n      streams.push({\n        id: driftedId,\n        outcome: \"failed\",\n        /* c8 ignore next -- non-Error throws are normalized in defensive fallback. */\n        error: error instanceof Error ? error.message : String(error),\n      });\n    }\n  }\n\n  return {\n    all: true,\n    dry_run: Boolean(options.dryRun),\n    scanned_streams: items.length,\n    drifted_streams: drift.driftedItems.length,\n    streams,\n    totals,\n    warnings: [...new Set([...itemReadWarnings, ...repairWarnings])].sort((left, right) =>\n      left.localeCompare(right),\n    ),\n    generated_at: nowIso(),\n  };\n}\n"],
+  "mappings": "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",
+  "names": ["global"]
+}

package/dist/cli-bundle/chunks/{chunk-RLLOZAM2.js → chunk-IY6VZ3IW.js}

@@ -56,7 +56,7 @@ import {
   toErrorMessage,
   weekdayOrderIndex,
   writeFileAtomic
-} from "./chunk-WCBB6VI3.js";
+} from "./chunk-7AVEY74G.js";
 
 // dist/core/extensions/command-hook-context.js
 !(function() {
@@ -565,7 +565,7 @@ function orderObject(value, keyOrder) {
 !(function() {
   try {
     var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "d47253a0-918b-55b2-9b6f-e68e6f1f1626");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "b007f2f4-f40a-5cc5-82e7-c4e083249dc3");
   } catch (e2) {
   }
 })();
@@ -586,6 +586,9 @@ function vNumber(options = {}) {
     if (typeof options.min === "number" && input < options.min) {
       return FAIL;
     }
+    if (typeof options.max === "number" && input > options.max) {
+      return FAIL;
+    }
     return { ok: true, value: input };
   };
 }
@@ -788,6 +791,9 @@ var extensionPolicy = vOptional(vObject({
 var settingsCheck = vObject({
   version: vNumber({ int: true }),
   id_prefix: vString,
+  ids: vOptional(vObject({
+    token_length: vOptional(vNumber({ int: true, min: 4, max: 12 }))
+  })),
   author_default: vString,
   item_format: vOptional(vLiteral("toon", "json_markdown")),
   locks: vObject({
@@ -1059,7 +1065,7 @@ function clearSettingsReadCache(pmRoot) {
 !(function() {
   try {
     var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "c7a1560b-d8bb-55bb-bf5e-50c97b4ff692");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "a4d073da-52c1-5f9d-885f-6ca0e8aa470a");
   } catch (e2) {
   }
 })();
@@ -1623,6 +1629,7 @@ function mergeSettings(settings) {
     ...settings,
     item_format: normalizeSettingsItemFormat(settings, defaults),
     locks: { ...defaults.locks, ...settings.locks },
+    ids: { ...defaults.ids, ...settings.ids },
     checkpoints: { ...defaults.checkpoints, ...settings.checkpoints },
     output: { ...defaults.output, ...settings.output },
     history: {
@@ -1665,6 +1672,9 @@ function orderSerializedSettingsSections(ordered) {
     "ttl_seconds",
     "wait_ms"
   ]);
+  ordered.ids = orderObject(ordered.ids, [
+    "token_length"
+  ]);
   ordered.checkpoints = orderObject(ordered.checkpoints, ["retention_days"]);
   ordered.output = orderObject(ordered.output, [
     "default_format"
@@ -1818,6 +1828,7 @@ function buildSerializeBaseSettings(settings) {
   return {
     ...settings,
     locks: valueOrDefault(settings.locks, SETTINGS_DEFAULTS.locks),
+    ids: valueOrDefault(settings.ids, SETTINGS_DEFAULTS.ids),
     checkpoints: valueOrDefault(settings.checkpoints, SETTINGS_DEFAULTS.checkpoints),
     output: valueOrDefault(settings.output, SETTINGS_DEFAULTS.output),
     history: valueOrDefault(settings.history, SETTINGS_DEFAULTS.history),
@@ -1926,6 +1937,7 @@ function serializeSettings(settings, options = {}) {
   }, [
     "version",
     "id_prefix",
+    "ids",
     "author_default",
     "item_format",
     "locks",
@@ -4455,7 +4467,7 @@ import path3 from "node:path";
 !(function() {
   try {
     var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "900d99bf-095b-5dcf-9a33-b04c9b440969");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "ee13ce1e-8508-5eb1-be0b-6e49f4280e87");
   } catch (e2) {
   }
 })();
@@ -4499,10 +4511,19 @@ async function idExists(pmRoot, id) {
   }
   return false;
 }
-async function generateItemId(pmRoot, prefix) {
-  let tokenLength = 4;
+var ID_TOKEN_LENGTH_MIN = 4;
+var ID_TOKEN_LENGTH_MAX = 12;
+function clampIdTokenLength(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    return ID_TOKEN_LENGTH_MIN;
+  }
+  return Math.min(ID_TOKEN_LENGTH_MAX, Math.max(ID_TOKEN_LENGTH_MIN, Math.trunc(value)));
+}
+async function generateItemId(pmRoot, prefix, options = {}) {
+  let tokenLength = clampIdTokenLength(options.tokenLength);
+  const maxTokenLength = Math.min(tokenLength + 6, ID_TOKEN_LENGTH_MAX);
   let attempts = 0;
-  while (tokenLength <= 10) {
+  while (tokenLength <= maxTokenLength) {
     for (let i = 0; i < 32; i += 1) {
       const id = `${normalizePrefix(prefix)}${randomToken(tokenLength)}`;
       if (!await idExists(pmRoot, id)) {
@@ -5614,4 +5635,4 @@ export {
   mutateItem,
   deleteItem
 };
-//# sourceMappingURL=chunk-RLLOZAM2.js.map
+//# sourceMappingURL=chunk-IY6VZ3IW.js.map