WIP: Combined Backups for 6 branches - #1701

Closed

BigSimmo wants to merge 74 commits into

mainfrom

codex/combined-wip-backups-20260807

Commits on Jul 30, 2026

Commits on Jul 31, 2026

Commits on Aug 1, 2026

fix: split dsm home route behind client boundary
BigSimmo
committed
dc53e51
chore: record performance split commit in branch ledger
BigSimmo
committed
bec6b00

Commits on Aug 7, 2026

feat(mockups): add three Live Signal privacy variants without phone chips
cursoragent
committed
67e2241
Merge branch 'main' into cursor/privacy-live-signal-variants-bc81
BigSimmo
authored
52d6fee
Merge branch 'main' into cursor/privacy-live-signal-variants-bc81
BigSimmo
authored
f63eba1
Merge branch 'main' into cursor/privacy-live-signal-variants-bc81
BigSimmo
authored
5c55065
Merge branch 'main' into cursor/privacy-live-signal-variants-bc81
BigSimmo
authored
c8e5058
Merge branch 'main' into cursor/privacy-live-signal-variants-bc81
cursoragent
committed
9508c3e
docs: record PR 1676 review after main sync
cursoragent
committed
b084714
Merge branch 'main' into cursor/privacy-live-signal-variants-bc81
cursoragent
committed
8164875
Merge branch 'main' into cursor/privacy-live-signal-variants-bc81
BigSimmo
committed
68f1c98
docs: record PR 1676 babysit after main sync

BigSimmo
and
cursoragent
committed
2caa3c7
chore: save uncommitted work in progress
BigSimmo
committed
4801078
chore: save uncommitted work in progress
BigSimmo
committed
7a20d44
chore: save uncommitted work in progress
BigSimmo
committed
81bb32d
chore: save uncommitted work in progress
BigSimmo
committed
5396f48
chore: save uncommitted work in progress
BigSimmo
committed
7aa1d83
chore: save uncommitted work in progress
BigSimmo
committed
e03d317
Merge remote-tracking branch 'origin/claude/answer-safety-notice' into codex/combined-wip-backups-20260807
BigSimmo
committed
ccbaa4e
chore: auto-resolve conflicts for codex/chat-full-page-review-speedup-96de backup
BigSimmo
committed
242da3a
chore: auto-resolve conflicts for codex/issue-ledger-audit-findings-20260805 backup
BigSimmo
committed
d9df5df
chore: auto-resolve conflicts for codex/chat-perf-metadata-cd20 backup
BigSimmo
committed
119f8c1
chore: auto-resolve conflicts for codex/chat-pr1485-final-audit-pr1485-final-audit backup
BigSimmo
committed
1e17e28
chore: auto-resolve conflicts for codex/rag-next-issues-20260731 backup
BigSimmo
committed
568ead1
chore: remove junk lighthouse test artifacts
BigSimmo
committed
b96bcf0
chore: meticulous cleanup of remaining lighthouse junk files
BigSimmo
committed
6cddd14
chore: remove low yield scripts and build artifacts
BigSimmo
committed
7777ffa
chore: revert ssr disable and remove experimental mockups
BigSimmo
committed
6910984
chore: Restore accidentally reverted features and tests from main
BigSimmo
committed
0330e15
Update agent process guidelines and policies
BigSimmo
committed
0d0acb0
Merge remote-tracking branch 'policy_editor/subagent-Policy-Editor-self-8c662bb1' into codex/combined-wip-backups-20260807
BigSimmo
committed
f48f1cc
fix: resolve conflict markers in docs
BigSimmo
committed
d110f99

Commits on Aug 8, 2026

fix(search): wire clientRelatedDocuments into search API payload

cursoragent
and
BigSimmo
committed
af4ca7e
merge: sync origin/main and prefer main shared queues

cursoragent
and
BigSimmo
committed
ed2093f
fix(search): project documentMatches for client privacy

cursoragent
and
BigSimmo
committed
51873b9
fix(ci): restore run-lighthouse-budget.mjs after merge corruption

cursoragent
and
BigSimmo
committed
68be7da
fix(docs): clear merge markers and update paths after doc reorg

cursoragent
and
BigSimmo
committed
05bea1a
chore: format staging-setup after conflict resolution

cursoragent
and
BigSimmo
committed
fc86efc
fix(therapy): restore retained catalogue assets for index gate

cursoragent
and
BigSimmo
committed
f142b9c
docs(ledger): record PR #1701 heavy review-and-fix at f142b9c0

cursoragent
and
BigSimmo
committed
56ae718