Conflicts, all in files this branch and master both touched: - `chat/helpers.ts` — kept both sides. Master replaced the inline env filter in `gitBranch` with `scrubbedParentEnv()`; this branch added the surface-marker and compaction-source imports. - `docs/module-graph.md` — regenerated. Both sides added a `tui` edge (master `subprocess`, this branch `compact`); the generated row now carries both. - Three `.i18n.yaml` pairing records — re-recorded from the merged files. Blob hashes cannot be hand-merged, and both sides' prose survives on each side of every pair. `docs/cordis-catalog/services.md` also regenerated for shifted source lines and master's new `sessionTitle.rename` entry. |
||
|---|---|---|
| .. | ||
| chunk-rows.spec.ts | ||
| derived-cache.spec.ts | ||
| fork.spec.ts | ||
| gen-persistence-catalog.spec.ts | ||
| invariant.spec.ts | ||
| json.spec.ts | ||
| properties.spec.ts | ||
| repair.spec.ts | ||
| request-header.spec.ts | ||
| scoped.spec.ts | ||
| session.spec.ts | ||
| surface.spec.ts | ||