Commit Graph

26368 Commits

Author SHA1 Message Date
marius-kilocode a51864cd75 resolve merge conflicts 2026-07-22 15:00:34 +02:00
marius-kilocode 7bb4538cea merge: record upstream v1.17.9 2026-07-22 13:31:29 +02:00
marius-kilocode a776bd4d29 refactor: kilo compat for v1.17.9 2026-07-22 13:31:23 +02:00
kilo-maintainer[bot] 3572898618 chore: update nix node_modules hashes 2026-07-22 09:38:42 +00:00
Marius 54a9109b46 Merge pull request #12404 from Kilo-Org/marius-kilocode/kilo-opencode-v1.17.5
OpenCode v1.17.5
2026-07-22 11:28:52 +02:00
kilo-maintainer[bot] 13e4259662 release: v7.4.15 v7.4.15 2026-07-22 09:21:25 +00:00
Marius fc5b22fb68 Merge pull request #12454 from Kilo-Org/fix-reload-while-session-running
fix(vscode): show clear warning when reload is blocked by a running session
2026-07-22 10:58:31 +02:00
Marius 2f389f9fb1 fix(vscode): show clear warning when reload is blocked by a running session 2026-07-22 10:53:20 +02:00
marius-kilocode 74ba761c8b Merge remote-tracking branch 'origin/main' into marius-kilocode/kilo-opencode-v1.17.5 2026-07-22 10:30:49 +02:00
marius-kilocode 610f956b76 fix: preserve multi-account auth and Snowflake OAuth
Repair the active-only credential import with a v3 data migration that
restores every account without duplicating users who already ran v2,
while keeping the active account effective. Restore upstream Snowflake
Cortex OAuth account/token resolution and combined refresh fetch path.
2026-07-22 10:27:09 +02:00
Kirill Kalishev 3cab1bd2d5 Merge pull request #12440 from Kilo-Org/jetbrains/release/v7.0.9
release(jetbrains): v7.0.9
2026-07-21 16:18:23 -04:00
Kirill Kalishev 724473e32f docs(jetbrains): edit changelog for v7.0.9 2026-07-21 16:14:33 -04:00
kilo-maintainer[bot] 05b5e9bcdd release(jetbrains): v7.0.9 2026-07-21 20:05:30 +00:00
Kirill Kalishev 5c7978c202 Merge pull request #12437 from Kilo-Org/feat/jetbrains-rules-settings
feat(jetbrains): add Rules settings page; pin CLI to v7.4.13
jetbrains/v7.0.9
2026-07-21 16:00:15 -04:00
Igor Šćekić 016fa42db9 fix(cli): rewire stalled-stream watchdog test to post-v1.17.4 modules (#12438)
PR #12249 was reverted (open PR #12435) because its test imported three
modules that v1.17.4 compat (2855ebbe48) 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.
2026-07-21 15:52:56 -04:00
kirillk 3d5ee24ef5 fix(jetbrains): address rules settings PR review
- Drop test-only component() seams on SettingsPathDialog and
  InstructionEditDialog; test layout helpers and public dialog API directly
- Remove unused settings.rules.files.remove bundle key across all locales
- Note cloud session history import fix in the changeset
2026-07-21 15:51:10 -04:00
Kirill Kalishev d016a09e45 Merge branch 'main' into feat/jetbrains-rules-settings 2026-07-21 15:21:35 -04:00
kirillk c7c7d775cd fix(jetbrains): pin CLI to v7.4.13 to repair cloud session history import
The plugin runs the CLI release pinned in package.json (was 7.4.11), which contains the pre-fix cloud-import path that returns HTTP 400 BadRequest in compiled builds. The fix (#12329) first ships in CLI v7.4.13. No stable release contains it yet (7.4.14 is a draft with no assets), so pin to the v7.4.13 pre-release; the automated jetbrains-cli-pin-bump PR will move to a stable release >= 7.4.13 later. kilo.cli.pinned stays true.
2026-07-21 15:11:13 -04:00
kirillk af33eded9e feat(jetbrains): add Rules settings page with instruction files and Claude Code compatibility
Adds a Rules page under Agent Behavior for managing additional instruction files (config `instructions`) with a Skills-style list: open in editor, in-dialog content editor, and delete. Unifies the add/edit path dialog into a shared SettingsPathDialog (OK button, focused input) and hides in-place list action buttons when the list is not focused.
2026-07-21 15:01:08 -04:00
Igor Šćekić cd205d857a fix(cli): prevent stalled agent streams (#12249)
* fix(cli): prevent stalled agent streams

* docs(cli): clarify stream timeout scope

* test(cli): stabilize global skill permission timing

* fix(cli): make stream timeout tool-aware

* fix(cli): let the idle watchdog cancel a stalled pull immediately

An async generator's return() cannot preempt an in-flight internal
await; when suspended mid-await it only applies once that await
settles on its own. For a genuinely stalled stream that await never
settles, so interrupting a session mid-stream (e.g. aborting while a
local tool call is pending) hung instead of cancelling.

Replace the generator with a hand-rolled AsyncIterator whose return()
runs immediately and forwards to the source's return() without
waiting on any outstanding pull, matching how interruption already
behaves for the unwrapped upstream iterator.

Fixes CI failures in test/session/processor-effect.test.ts and
test/session/prompt.test.ts that hung/timed out on this branch.

* test(cli): give Windows more time for the watchdog integration bash gate

git-bash on Windows CI runners spawns and writes the readiness marker
file noticeably slower than the Unix shells this suite otherwise
runs under, so tests A and C's 5s file-poll and 30s scenario timeout
were too tight there and failed with 'readiness marker never
appeared' even though the tool was already running. Double both on
win32, matching the existing platform-aware timeout doubling in
test/kilocode/background-process.test.ts.

* test(cli): use POSIX-style paths in the watchdog bash gate script

path.join() yields backslash-separated paths on Windows. Embedded
inside a double-quoted git-bash string, a literal backslash is an
escape character, so the ready/release marker paths could resolve to
the wrong file (or nothing) instead of erroring, making 'touch' and
the '[ -f ... ]' poll silently miss each other. Normalize to forward
slashes before interpolating into the script; git-bash/MSYS accept
them natively on every platform this suite runs on.

This is the actual root cause of the 'readiness marker never
appeared' failures on Windows shards; the previous commit's timeout
doubling was only masking symptoms.

* test(cli): extend Windows margins further for the watchdog bash gate

The production bash tool runs every command through a login shell
(bash -l -c ..., src/shell/shell.ts) so ~/.bashrc/aliases behave like
an interactive terminal. Git for Windows' login-shell startup rescans
the full Windows PATH and is known to take several seconds on CI
hardware, well past the previous 15s/60s Windows margins, before the
script's own touch ever runs. Extend waitForFile to 30s and the two
affected scenario timeouts to 90s on win32.

* test(cli): give the watchdog bash gate an explicit shell so it runs on Windows

Root cause, finally isolated: without a config-level shell field, the
bash tool defaultShell() falls back to cmd.exe on Windows (see
packages/core/src/tool/bash.ts). cmd.exe cannot run bashGate POSIX
syntax (touch, test -f, while/done), so touch failed instantly and
silently and the readiness marker never appeared - no timeout was
ever going to fix that, which is why the previous two commits margin
increases did not help. Set shell to bash in tests A and C config so
the bash tool resolves real git-bash via src/shell/shell.ts on
Windows, and drop the speculative timeout inflation back to the
original values plus a small, now-accurate margin for git-bash slower
login-shell startup.
2026-07-21 18:16:57 +02:00
kilo-maintainer[bot] f206b13196 chore: update nix node_modules hashes 2026-07-21 15:40:05 +00:00
Christiaan Arnoldus 9f7c8e58b1 Merge pull request #12427 from Kilo-Org/cherry-pick/improve-xai-cache-hit-rate
fix: improve xai cache hit rate
2026-07-21 17:17:45 +02:00
Mohammad Javad Naderi 232d7f2c61 fix(script): add worktree mode to annotation check (#11842)
* fix(script): add worktree mode to annotation check

* fix(script): limit worktree annotation check to local changes
2026-07-21 16:31:35 +02:00
marius-kilocode d054f394e4 fix(tui): treat global events as default location for integration refresh
The v2 integration refresh converted event metadata directly into a
Location.Ref, so the global routing sentinel (directory "global") was
sent to the server as a real filesystem location. LocationServiceMap
built the full project graph for it, and Fff.create({ basePath: "global" })
failed on every refresh after OAuth callback disposal. Map global events
back to the current default location instead.
2026-07-21 15:23:25 +02:00
Christiaan Arnoldus 8465c1d749 Merge pull request #12430 from Kilo-Org/fix/routed-model-openrouter
fix(cli): allow openrouter models in routed model resolution
2026-07-21 15:15:28 +02:00
chrarnoldus 439b963547 chore: add kilocode_change markers to test file
Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
2026-07-21 12:26:18 +00:00
chrarnoldus b20e4b3938 chore: add kilocode_change marker to satisfy annotation check
Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
2026-07-21 12:24:09 +00:00
Christiaan Arnoldus eec0c111d3 fix(cli): allow openrouter models in routed model resolution 2026-07-21 14:21:29 +02:00
Christiaan Arnoldus 156f176b91 Merge pull request #12426 from Kilo-Org/fix/gateway-optimistic-tools-support
fix(gateway): optimistically assume tools support when supported_parameters is missing
2026-07-21 13:48:09 +02:00
marius-kilocode d9cf6ebaa3 fix: disable per-instance file watchers in httpapi exerciser job
Main's per-instance watcher lands without the unit-test disable env on
the exerciser job, so 289 scenario instance boots spawn inotify watchers
on Linux and the process dies with EBADF. Mirror the unit step's
KILO_EXPERIMENTAL_DISABLE_FILEWATCHER for the exerciser.
2026-07-21 13:34:59 +02:00
Marius 80880dd455 Merge pull request #12405 from Kilo-Org/investigate-pipeline-bottlenecks
chore(ci): trim darwin test profile
2026-07-21 13:29:26 +02:00
Kirill Kalishev 2d03f282ef Merge pull request #12429 from Kilo-Org/jetbrains/release/v7.0.8
release(jetbrains): v7.0.8
2026-07-21 07:29:17 -04:00
Marius 51c4878499 Merge pull request #12414 from Kilo-Org/fix-sandbox-scandir-permission-error
fix(sandbox): tolerate unreadable directories during Linux writable-root scan
2026-07-21 13:28:33 +02:00
Kirill Kalishev b1439c46b1 docs(jetbrains): edit changelog for v7.0.8 2026-07-21 07:26:54 -04:00
Christiaan Arnoldus f3905fbaa5 Merge branch 'main' into fix/gateway-optimistic-tools-support 2026-07-21 13:23:34 +02:00
Christiaan Arnoldus bcbb6917d3 Merge pull request #12402 from Kilo-Org/fix/vscode-unfiltered-typecheck
fix(vscode): enforce unfiltered webview typechecks
2026-07-21 13:21:21 +02:00
kilo-maintainer[bot] 00b0c88e7f release(jetbrains): v7.0.8 2026-07-21 11:20:38 +00:00
marius-kilocode 0e19a61e49 fix: apply patchedDependencies pruning on every package.json path
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.
2026-07-21 13:13:57 +02:00
Kirill Kalishev 8951749dd3 Merge pull request #12291 from Kilo-Org/gigantic-fighter
feat(jetbrains): add auto-approve settings
jetbrains/v7.0.8
2026-07-21 06:56:21 -04:00
marius-kilocode 0bcd1b2c86 Merge remote-tracking branch 'origin/main' into marius-kilocode/kilo-opencode-v1.17.5 2026-07-21 12:35:20 +02:00
marius-kilocode 5da4736d0e chore: retrigger ci 2026-07-21 12:28:14 +02:00
Johnny Eric Amancio fa23cd22ff Merge pull request #12422 from Kilo-Org/johnnyeric/fix-memory-ui-feedback
fix(memory): refine CLI and extension experience
2026-07-21 12:27:03 +02:00
chrarnoldus 2dc1a520cc chore: add changeset for xai cache hit rate improvement 2026-07-21 10:14:21 +00:00
chrarnoldus b692d03f31 fix(gateway): also optimistically set tool_call for models with missing supported_parameters
Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
2026-07-21 09:54:11 +00:00
Aiden Cline c6b45fecd1 fix: improve xai cache hit rate (#35970) 2026-07-21 09:53:17 +00:00
chrarnoldus e944a5764c fix(gateway): optimistically assume tools support when supported_parameters is missing
Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
2026-07-21 09:48:35 +00:00
marius-kilocode 0f79817e6d fix: harden package.json transform against kilo script and policy loss
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.
2026-07-21 11:24:44 +02:00
Marius fa77ec5818 Merge pull request #11928 from jhapate0704/fix-diff-scroll
fix(vscode): reset scroll position on diff change
2026-07-21 11:23:30 +02:00
Marius b0034dcb96 Merge branch 'main' into fix-diff-scroll 2026-07-21 11:17:49 +02:00
marius-kilocode 8f6b48af63 test: port oauth settlement guard regression tests to integration
The upstream connector.test.ts deletion dropped Kilo's six settlement
guard tests (persistence failure, cancellation race, callback and
persistence timeouts). Ports them to the Integration API with the
restored guards.
2026-07-21 11:01:50 +02:00