fix(cli): fold upstream-merge 'Removed:' logs into 'Removed directory: X'

[markijbema]

Summary

When skipFiles strips upstream files that live under directories Kilo doesn't have (packages/web/**, packages/console/**, …), it prints one green Removed: path/file line per file, producing hundreds of lines of noise during an upstream merge.

This change folds those per-file log lines into a single Removed directory: X (N files) line whenever every ancestor dir of the removed file is absent from the base branch. Per-file logs are kept only for files under directories that do exist in the base branch.

Pre-merge, skipFiles now takes an explicit baseRef (defaulting to HEAD); merge.ts passes config.baseBranch for the pre-merge force-skip pass, since HEAD on the opencode branch points at upstream, not at Kilo.

[kilo-code-bot]

Code Review Summary

Status: No Issues Found | Recommendation: Merge

Files Reviewed (2 files)

• script/upstream/merge.ts
• script/upstream/transforms/skip-files.ts

---

_{Reviewed by gpt-5.5-20260423 · 136,999 tokens}