Conflicts resolved:
- VERSION: keep 1.42.0.0 (queue-advance past #1592's v1.41.1.0 claim,
per CLAUDE.md workspace-aware ship rule)
- CHANGELOG.md: keep both entries — v1.42.0.0 Daegu wave on top,
v1.41.1.0 audit wave below in reverse-chronological order
- package.json: bump version field to 1.42.0.0 to match VERSION
Auto-merged cleanly:
- browse/src/meta-commands.ts: both the screenshot-size-guard wiring
from C16 (this branch) and the parsePdfFromFile JSON validation
from PR #1592 (main) survive in the merged file. Verified by
inspecting the imports + call sites + running both test surfaces
green.
- All other v1.41.1.0 changes from main (scripts/build-app.sh sed
hardening, mktemp fallback drops, security-classifier download
cleanup, global-discover 64KB cap) pulled in unchanged.
Verified 77 wave + audit tests green after merge:
- browse/test/screenshot-size-guard.test.ts (7)
- browse/test/regression-pr1169-pdf-from-file-invalid-json.test.ts
- browse/test/security-classifier-download-cleanup.test.ts
- browse/test/find-browse.test.ts (5)
- test/gstack-paths.test.ts (9), test/gstack-gbrain-sync.test.ts (37)
- test/memory-ingest-no-put_page.test.ts (2)
- test/resolvers-gbrain-put-rewrite.test.ts (2)
- test/extension-pty-inject-invariant.test.ts (3)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
b6ba3b9c06