sync: upstream merge conflicts require manual resolution

[github-actions]

The daily upstream sync encountered 3 merge conflict(s) and aborted per the fork-upstream-sync policy (AGENTS.md).

Auto-resolving in favor of upstream is not permitted — these conflicts contain fork-owned features that must be preserved.

Conflicted files

• packages/agent-core-v2/src/agent/fullCompaction/compactionOps.ts
• packages/agent-core-v2/src/agent/fullCompaction/fullCompactionService.ts
• packages/agent-core-v2/src/app/telemetry/events.ts

Resolution procedure

1. Create a branch: git switch -c sync/fork-sync-resolution upstream/main
2. Merge master into it: git merge master --no-ff
3. Resolve each conflict, preserving fork-owned code (squeeze-model, fallback-model, fuck-permissions, model-favorites, fork-session, etc.).
4. Run ./node_modules/.bin/tsc --noEmit -p packages/agent-core-v2 and the fork-owned test suites (see .github/FORK_OWNED_FILES for the markers to grep for).
5. Open a PR titled chore: sync upstream $(date +%Y-%m-%d) and reference this issue.
6. After the PR merges, the next scheduled sync will be a no-op.

Commit refs

• local master: 7a7e30c7287a5ebeba675ce4302624cc894adc84
• upstream/main: 523d35b54b25a0b4589388a2b6c8c4261f1ef7db

cc: the human on-call fork maintainer.