Merge remote-tracking branch 'origin/main' into garrytan/PRIORITY-broken-ask-user-question

# Conflicts:
#	CHANGELOG.md
#	VERSION
#	autoplan/SKILL.md
#	canary/SKILL.md
#	codex/SKILL.md
#	context-restore/SKILL.md
#	context-save/SKILL.md
#	cso/SKILL.md
#	design-consultation/SKILL.md
#	design-html/SKILL.md
#	design-review/SKILL.md
#	design-shotgun/SKILL.md
#	devex-review/SKILL.md
#	document-release/SKILL.md
#	health/SKILL.md
#	investigate/SKILL.md
#	land-and-deploy/SKILL.md
#	learn/SKILL.md
#	office-hours/SKILL.md
#	open-gstack-browser/SKILL.md
#	package.json
#	pair-agent/SKILL.md
#	plan-ceo-review/SKILL.md
#	plan-design-review/SKILL.md
#	plan-devex-review/SKILL.md
#	plan-eng-review/SKILL.md
#	plan-tune/SKILL.md
#	qa-only/SKILL.md
#	qa/SKILL.md
#	retro/SKILL.md
#	review/SKILL.md
#	scripts/resolvers/preamble.ts
#	setup-deploy/SKILL.md
#	ship/SKILL.md

scripts/resolvers/preamble.ts

@@ -37,6 +37,9 @@ import { generateWritingStyleMigration } from './preamble/generate-writing-style
 // Host-specific instructions
 import { generateBrainHealthInstruction } from './preamble/generate-brain-health-instruction';
 
+// GBrain cross-machine sync (runs at skill start; end-side handled in completion-status)
+import { generateBrainSyncBlock } from './preamble/generate-brain-sync-block';
+
 // Behavioral / voice
 import { generateVoiceDirective } from './preamble/generate-voice-directive';
 
@@ -89,6 +92,7 @@ export function generatePreamble(ctx: TemplateContext): string {
     // patches. Opus 4.7 reads top-to-bottom and absorbs the first pacing directive
     // it hits; reversing this order regresses plan-review cadence (v1.6.4.0 bug).
     ...(tier >= 2 ? [generateAskUserFormat(ctx)] : []),
+    generateBrainSyncBlock(ctx),
     generateModelOverlay(ctx),
     generateVoiceDirective(tier),
     ...(tier >= 2 ? [