fix(cli): re-land stalled-stream watchdog with post-v1.17.4 test wiring - #12438
Merged
Conversation
PR #12249 was reverted (open PR #12435) because its test imported three modules that v1.17.4 compat (2855ebb) removed/moved: - Reference/RepositoryCache from ../../src/reference/* (now packages/core) - Ripgrep from @opencode-ai/core/filesystem/ripgrep Re-land the production fix by pointing RepositoryCache and Ripgrep at @opencode-ai/core/{repository-cache,ripgrep} and dropping the now-gone Reference.defaultLayer from the layer stack, matching the current full-stack sibling (session-prompt-compaction-safety.test.ts). Typecheck passes; all 3 watchdog tests pass.
Contributor
Code Review SummaryStatus: No Issues Found | Recommendation: Merge Verified against current Files Reviewed (1 files)
Reviewed by claude-sonnet-5 · Input: 22 · Output: 3.1K · Cached: 443.8K Review guidance: REVIEW.md from base branch |
iscekic
enabled auto-merge (squash)
July 21, 2026 19:05
kirillk
approved these changes
Jul 21, 2026
t7tran
pushed a commit
to t7tran/kilocode
that referenced
this pull request
Aug 14, 2026
…Kilo-Org#12438) PR Kilo-Org#12249 was reverted (open PR Kilo-Org#12435) because its test imported three modules that v1.17.4 compat (7a1394e) removed/moved: - Reference/RepositoryCache from ../../src/reference/* (now packages/core) - Ripgrep from @opencode-ai/core/filesystem/ripgrep Re-land the production fix by pointing RepositoryCache and Ripgrep at @opencode-ai/core/{repository-cache,ripgrep} and dropping the now-gone Reference.defaultLayer from the layer stack, matching the current full-stack sibling (session-prompt-compaction-safety.test.ts). Typecheck passes; all 3 watchdog tests pass.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Re-lands #12249 (reverted by open PR #12435) and fixes the compile error that broke
@kilocode/clitypecheck onmain.What broke
#12249's test (
packages/opencode/test/kilocode/session-stream-watchdog.test.ts) imported three modules that2855ebbe48 refactor: kilo compat for v1.17.4had already removed/relocated onmain:Reference/RepositoryCachefrom../../src/reference/*— consolidated intopackages/coreRipgrepfrom@opencode-ai/core/filesystem/ripgrep— moved to@opencode-ai/core/ripgrepThe PR's CI ran five days before merge against a branch tip that still carried the old files, so the squash merge landed the importing test onto a
mainthat no longer had the modules →TS2307plus cascadingTS2345/TS2322.Fix
Fix-forward instead of reverting the production fix in
packages/opencode/src/session/llm.ts:RepositoryCacheat@opencode-ai/core/repository-cacheandRipgrepat@opencode-ai/core/ripgrep.Reference.defaultLayerfrom the test's layer stack (three sites), matching the current full-stack siblingsession-prompt-compaction-safety.test.ts, which builds the same Session/SessionProcessor/ToolRegistry graph without it.Net diff is 2 insertions / 6 deletions in one test file.
Verification
bun run typecheck(frompackages/opencode/) — passes.bun test ./test/kilocode/session-stream-watchdog.test.ts— 3 pass, 0 fail.Supersedes #12435 (revert can be closed).