The pruning was only wired into the conflict-resolution path, but the
unconditional pre-merge pass and the ref reconciler kept the naive
additive merge, so stale upstream patch entries survived whenever the
root package.json did not hit a git conflict. Extract
prunePatchedDependencies and call it before the preserve loop in all
three paths.
The transform dropped Kilo's test:ci scripts in six upstream-shared
packages, the dev:local root entrypoint, and Kilo's trustedDependencies
install policy on every merge, and merged patchedDependencies naively,
keeping stale upstream entries whose patch files never come over. Extend
PRESERVE_SCRIPTS, add a trustedDependencies deny-list, and drop patch
entries superseded by Kilo pins or missing patch files.
Drop the entire packages/stats workspace (app, core, server) and add
packages/stats/** to the upstream merge skip list so future syncs no
longer pull it in. Update skip-files tests to cover the new glob.
Dependency changes for opencode v1.15.13:
- add ws 8.21.0 and @types/ws for WebSocket transport
- bump @lydell/node-pty to 1.2.0-beta.12
- add proxy-env and googleapis source links
- Rename catalog.loader() to catalog.transform() in tests
- Add SessionStatus.Service dependency to tool registry layer
- Remove `loop` method from session prompt ops stubs
- Remove `onOpenChange` prop from BasicToolProps
- Update codex plugin import path to plugin/openai/codex
- Delete packages/cli scaffold (now skipped from upstream)
- Downgrade virtua to 0.42.3 and remove its patch
- Add @ai-sdk/xai@3.0.82 patch for PDF file support
Consolidate `/local-review` and `/local-review-uncommitted` into a single `/review` command that uses subcommands (`uncommitted` or `branch`) to determine the review scope.
- Replace deprecated `/local-review-*` slash commands with `/review [scope]`
- Update documentation to reflect new command syntax
- Update telemetry to track the unified `review` command
- Update test suites to validate new command parsing and behavior
- Refactor review prompt templates and logic to support the new structure
Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
marius-kilocode