Incorporate lessons from the v1.14.30 merge: explain reasoning before
showing diffs, investigate why Kilo-specific helpers exist before
bypassing them, prefer commenting-out over deletion with kilocode_change
markers, use TODO (not NOTE) for follow-ups, check adjacent files that
structural upstream splits force you to touch, grep for usages before
deleting apparently-unused upstream declarations, and include PR-body
guidance and the 'resolve merge conflicts' commit convention.
When autocompleting a file, folder, or special mention via the @ menu
in the chat textarea, insert a single trailing space (unless the next
char is already whitespace) so typing immediately after selection does
not get appended to the path and break attachment parsing.
* fix(cli): restore kilo branding in MCP auth toast and client name
The 'Run: opencode mcp auth' popup / toast and the MCP protocol client
'name' field were reverted to 'opencode' by an upstream refactor
(opencode PR #22913, pulled in via Kilo PR #9346). Re-apply the
Kilo-branded strings with narrow kilocode_change markers and add a
regression test in packages/opencode/test/kilocode/ so the next upstream
merge fails a Kilo-owned test instead of shipping an 'opencode' popup.
* fix: use kilocode_change block markers for startAuth signature
---------
Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
Co-authored-by: marius-kilocode <marius@kilocode.ai>
Add .github/TEAM_MEMBERS and other files Kilo has deleted to skipFiles
so future upstream merges auto-remove them via git rm instead of
surfacing delete-by-us conflicts that need manual resolution.
Also drop the stale github/.gitignore entry from keepOurs (the file
does not exist in Kilo main; keepOurs was a no-op) and move it to
skipFiles so upstream's copy is dropped on merge instead of added.
* fix(cli): serialize OAuth callback port tests
* fix(cli): close MCP OAuth browser test listener race
The mock subprocess emitted its error via setTimeout(10ms), which raced the error listener attachment on slow Windows CI and left BrowserOpenFailed unpublished. Emit on newListener('error') via a microtask so the listener is always attached first. Revert the unrelated test-runner serialization.
* fix(cli): deliver MCP OAuth mock error to listener directly
Override subprocess.on in the mock so the error is queued to the registered listener as soon as it attaches. The previous newListener + emit chain still lost events on slow Windows CI because EventEmitter dispatch can race microtask draining.
The upstream build script tries to bundle packages/app/ which was removed in #9845. Guard the embed step so the CLI build still works, and revert the --skip-embed-web-ui workaround from #9885 since it is no longer needed.
Marian Alexandru Alecu