Garry Tan 0f39f1574c Merge remote-tracking branch 'origin/main' into garrytan/trunk-land-skill ... # Conflicts: # CHANGELOG.md # VERSION # package.json		2026-06-07 06:54:47 -07:00
..
conductor-env-shim.ts	v1.39.2.0 feat: GSTACK_* env-shim for Conductor + gbrain/gstack setup docs (#1534)	2026-05-16 12:32:33 -07:00
gbrain-exec.ts	v1.55.0.0 fix wave: gbrain data-loss guards + browser crash-loop + 6 more (#1808)	2026-05-30 14:57:07 -07:00
gbrain-guards.ts	v1.55.0.0 fix wave: gbrain data-loss guards + browser crash-loop + 6 more (#1808)	2026-05-30 14:57:07 -07:00
gbrain-local-status.ts	v1.55.0.0 fix wave: gbrain data-loss guards + browser crash-loop + 6 more (#1808)	2026-05-30 14:57:07 -07:00
gbrain-sources.ts	v1.55.0.0 fix wave: gbrain data-loss guards + browser crash-loop + 6 more (#1808)	2026-05-30 14:57:07 -07:00
gstack-memory-helpers.ts	v1.43.2.0 fix wave: post-Daegu paper-cut — 18 fixes, 28 bisect commits (#1642)	2026-05-21 21:21:07 -07:00
merge.ts	feat(merge): gstack-merge regime-aware merge helper + tests	2026-05-31 09:13:16 -07:00
redact-audit-log.ts	v1.53.0.0 feat: smarter redaction — PII/secrets/legal guard across /spec, /ship, /cso, /document-* (#1797)	2026-05-30 08:54:46 -07:00
redact-engine.ts	v1.53.0.0 feat: smarter redaction — PII/secrets/legal guard across /spec, /ship, /cso, /document-* (#1797)	2026-05-30 08:54:46 -07:00
redact-patterns.ts	v1.53.0.0 feat: smarter redaction — PII/secrets/legal guard across /spec, /ship, /cso, /document-* (#1797)	2026-05-30 08:54:46 -07:00
staging-guard.ts	v1.56.1.0 fix(sync): staging-dir ownership guard + resume-correctness fixes (#1802) (#1856)	2026-06-07 06:51:10 -07:00
worktree.ts	feat: content security — 4-layer prompt injection defense for pair-agent (#815)	2026-04-06 14:41:06 -07:00