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:
@@ -18,6 +18,7 @@ import {
|
||||
import { isCompactCheckpointSource } from '@deepseek-ai/dsh-compact'
|
||||
import { isAppendSurfaceEvent, isReplacementSurfaceEvent } from '@deepseek-ai/dsh-session'
|
||||
import type { Session, SessionEvent } from '@deepseek-ai/dsh-session'
|
||||
import { scrubbedParentEnv } from '@deepseek-ai/dsh-subprocess'
|
||||
|
||||
/** Editor that shows a placeholder without making it editable content. */
|
||||
export class HintEditor extends Editor {
|
||||
@@ -67,13 +68,10 @@ export function formatCwd(cwd: string | undefined): string {
|
||||
*/
|
||||
export function gitBranch(cwd: string): string | undefined {
|
||||
try {
|
||||
const env = Object.fromEntries(
|
||||
Object.entries(process.env).filter(([name]) => !/(?:KEY|SECRET|TOKEN)/iu.test(name)),
|
||||
)
|
||||
const branch = execFileSync('git', ['branch', '--show-current'], {
|
||||
cwd,
|
||||
encoding: 'utf8',
|
||||
env,
|
||||
env: scrubbedParentEnv(),
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
timeout: 1_000,
|
||||
}).trim()
|
||||
|
||||
Reference in New Issue
Block a user