Skip to content

Merge opencode v1.14.29 - #9751

Merged
markijbema merged 202 commits into
mainfrom
markijbema/kilo-opencode-v1.14.29
May 4, 2026
Merged

Merge opencode v1.14.29#9751
markijbema merged 202 commits into
mainfrom
markijbema/kilo-opencode-v1.14.29

Conversation

@markijbema

Copy link
Copy Markdown
Contributor

No description provided.

kitlangton and others added 30 commits April 24, 2026 09:12
…t landed (#19937)

Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com>
kitlangton and others added 9 commits April 28, 2026 11:02
… merge

Fixes 257 typecheck errors surfaced after the upstream merge:

- Update imports to new module paths after upstream PR #24554 removed
  module barrel files (@/config, @/session, @/util, etc.) and PR #24309
  renamed @opencode-ai/shared to @opencode-ai/core.
- Migrate loadMode to use Info.zod.safeParse for consistency with
  loadAgents and ConfigCommand (unblocks KilocodeConfig.handleInvalid).
- Drop removed Npm.outdated mock from tests.
- Add missing Config.defaultLayer to bash-permission-metadata test runtime.
- Fix Tips component signature (kilocode drops upstream's 'connected' prop).
- Fix toast.tsx undefined 'duration' reference (should be toastOptions.duration).
- Move filesystem-containment test from deleted shared package to core.
@markijbema
markijbema marked this pull request as ready for review May 4, 2026 10:03
Comment thread packages/app/src/context/global-sync.tsx
Comment thread packages/app/src/context/global-sync/child-store.ts
Comment thread packages/app/src/context/global-sync/child-store.ts
Comment thread packages/app/src/context/global-sync/child-store.ts
@kilo-code-bot

kilo-code-bot Bot commented May 4, 2026

Copy link
Copy Markdown
Contributor

Code Review Summary

Status: 4 Issues Found | Recommendation: Address before merge

Overview

Severity Count
CRITICAL 0
WARNING 4
SUGGESTION 0
Issue Details (click to expand)

WARNING

File Line Issue
packages/app/src/context/global-sync.tsx 83 Global ready returns pending/loading state instead of loaded state (carried forward; unchanged in incremental diff)
packages/app/src/context/global-sync/child-store.ts 180 provider_ready returns loading state, causing project provider selection to use empty/global providers (carried forward; unchanged in incremental diff)
packages/app/src/context/global-sync/child-store.ts 200 mcp_ready returns loading state instead of loaded state (carried forward; unchanged in incremental diff)
packages/app/src/context/global-sync/child-store.ts 206 lsp_ready returns loading state instead of loaded state (carried forward; unchanged in incremental diff)
Other Observations (not in diff)

Issues found in unchanged code that cannot receive inline comments:

File Line Issue
Files Reviewed (1 file)
  • packages/opencode/test/server/httpapi-file.test.ts - 0 issues

Fix these issues in Kilo Cloud

@kilo-code-bot

kilo-code-bot Bot commented May 4, 2026

Copy link
Copy Markdown
Contributor

Analysis requested by @markijbema.

I traced all four warnings to the same upstream change, not to Kilo conflict-resolution code:

Conclusion: these comments identify upstream behavior imported by the v1.14.29 merge, not a direct bug introduced by Kilo semantic conflict resolution.

@markijbema

Copy link
Copy Markdown
Contributor Author

Some tests failed because of a new experimental api. i think we should fix, but not necesarily in a merge pr; follow-up issue is here #9831

@markijbema
markijbema merged commit 6b4bc40 into main May 4, 2026
20 checks passed
@markijbema
markijbema deleted the markijbema/kilo-opencode-v1.14.29 branch May 4, 2026 12:21
jliounis pushed a commit to jliounis/kilocode that referenced this pull request May 19, 2026
t7tran pushed a commit to t7tran/kilocode that referenced this pull request Aug 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.