Merge branch 'master' into fix/human-transcript-projection
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.
This commit is contained in:
@@ -2,5 +2,5 @@
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write packages/host/apiproxy/README.md
|
||||
README.md: 7f5a469b02853642649220e20a093ce98e7bb063
|
||||
README.zh.md: ff909cf66f5d3fdf7f10778b094f3203920abb8e
|
||||
README.md: 8a9c3de7cddac501921220d31a50bc5f70c551d7
|
||||
README.zh.md: ab2486248f706aec0e270d9d2f91d61ae8135416
|
||||
|
||||
Reference in New Issue
Block a user