Conflicts: the four generated catalog docs (regenerated over merged sources), session index.ts exports (keep chunk-rows exports + master's SessionSurface re-export), stdio/acp demo config schema and persistence wiring (thread packChunks through master's DEFAULT_PERSISTENCE_ROOT/UI shape), stdio README config table, and the jsonl spec import line. The packed-chunk fixture also gains the provenance field master made required on assistant/message. |
||
|---|---|---|
| .. | ||
| chunk-rows.spec.ts | ||
| derived-cache.spec.ts | ||
| fork.spec.ts | ||
| gen-persistence-catalog.spec.ts | ||
| json.spec.ts | ||
| properties.spec.ts | ||
| repair.spec.ts | ||
| request-header.spec.ts | ||
| scoped.spec.ts | ||
| session.spec.ts | ||
| surface.spec.ts | ||