6a7d6bc002
resolve merge conflicts
2026-08-27 15:13:58 +02:00
91ca95bad9
merge: record upstream v1.18.20
2026-08-27 13:50:31 +02:00
bf1cf502a3
merge: reconcile updated v1.18.15 base into v1.18.18
2026-08-27 15:28:28 +02:00
9563af96a0
refactor: kilo compat for v1.18.20
2026-08-27 13:50:27 +02:00
3dad775136
Merge remote-tracking branch 'origin/main' into johnnyeric/kilo-opencode-v1.18.15
...
# Conflicts:
# bun.lock
2026-08-26 16:04:55 +02:00
4282d1364a
Merge pull request #13472 from Kilo-Org/fix-kilo-startup-black-screen
...
fix(cli): restore terminal startup
2026-08-26 15:48:56 +02:00
4032c39079
Merge pull request #13470 from Kilo-Org/fix/jetbrains-deleted-session-activity-snapshot
...
fix(jetbrains): prune deleted sessions in the merged activity snapshot
2026-08-26 09:40:51 -04:00
7b9a84f63a
fix(cli): restore terminal startup
2026-08-26 15:39:23 +02:00
17bef75509
fix(jetbrains): prune deleted sessions in the merged activity snapshot
...
activitySnapshot() merged statuses and activity, two StateFlows that each
prune the removed-session set through their own collector. After a delete,
one flow can still carry the session while the other has already dropped
it, so the snapshot briefly reported a deleted session as RUNNING and any
consumer reading it at that moment rendered a stale badge.
Subtract the removed set in the snapshot itself so the merged view is
consistent regardless of collector ordering, and wait on both flows in the
test that asserts every activity kind, which had the same latent race.
This fixes the flaky KiloSessionServiceTest failure on main.
2026-08-26 09:28:41 -04:00
96388f9e2f
chore: update nix node_modules hashes
2026-08-26 13:21:59 +00:00
82ec63727a
Merge pull request #13464 from Kilo-Org/fix/mermaid-security-update
...
fix(security): Mermaid updated due dependabot warnings
2026-08-26 15:13:56 +02:00
4229f698c7
chore: update nix node_modules hashes
2026-08-26 12:42:53 +00:00
fe6ef12859
Merge pull request #13465 from Kilo-Org/fix/dompurify-security-update
...
fix(security): DOMPurify updated due dependabot warnings
2026-08-26 14:31:45 +02:00
e4003da9e1
fix(security): Mermaid updated due dependabot warnings
2026-08-26 14:20:50 +02:00
4e38e0c2e4
fix(security): update DOMPurify to 3.4.13 to fix dependabot warnings
2026-08-26 14:18:08 +02:00
3c2bc841c7
Merge pull request #13463 from Kilo-Org/investigate-kilo-crowdstrike-high-cpu
...
fix(agent-manager): reduce background Git and GitHub process churn
2026-08-26 14:11:24 +02:00
d8815eb51e
Merge pull request #13459 from Kilo-Org/fix-worktree-session-metadata
...
fix(agent-manager): restore promoted session metadata
2026-08-26 14:02:27 +02:00
d9f066556a
fix(agent-manager): harden GitHub CLI fallback and check status
2026-08-26 13:58:26 +02:00
743fafce09
fix(agent-manager): reduce background Git and GitHub process churn
2026-08-26 13:29:39 +02:00
ed3380ea49
release: v7.5.0
2026-08-26 11:03:25 +00:00
f9606d8def
fix(agent-manager): restore promoted session metadata
2026-08-26 12:59:59 +02:00
b6e6d9df83
Merge pull request #13458 from Kilo-Org/fix-review-followup-message-spacing
...
fix(vscode): space review follow-up messages
2026-08-26 12:36:48 +02:00
92ad04da4c
chore: update kilo-vscode visual regression baselines
2026-08-26 10:33:43 +00:00
b925f25a1a
fix(vscode): space review follow-up messages
2026-08-26 12:29:58 +02:00
06bd7ef882
Merge pull request #13457 from Kilo-Org/fix-chat-scroll-user-intent
...
fix(vscode): preserve chat scroll intent
2026-08-26 12:29:47 +02:00
c880daf764
fix(vscode): preserve chat scroll intent
2026-08-26 12:14:46 +02:00
6b4370b3b7
Merge pull request #13456 from Kilo-Org/revert-diff-viewer-performance-fixes
...
revert(agent-manager): remove diff batching regression
2026-08-26 11:41:30 +02:00
24cf297c80
Revert "Merge pull request #13449 from Kilo-Org/perf/agent-manager-bulk-diff-details"
...
This reverts commit f78d736e977834f9308e
2026-08-26 11:20:49 +02:00
472c301da2
Merge pull request #13454 from Kilo-Org/evaluate-agent-manager-panel-defaults
...
fix(ci): skip unsupported PTY smoke targets
2026-08-26 11:15:23 +02:00
98278ab411
Merge pull request #13453 from Kilo-Org/kilo-local-settings
...
fix(vscode): remove top-level Auto-Approve permission on onboarding
2026-08-26 11:14:56 +02:00
d6bc417a94
fix(ci): skip unsupported PTY smoke targets
2026-08-26 11:01:36 +02:00
6722ea600e
fix(vscode) Removed top level Auto-Approve permission on onboarding
2026-08-26 10:56:40 +02:00
3725fb488e
Merge pull request #13435 from Kilo-Org/simplify-manual-abort-warning
...
refactor(vscode): simplify manual interruption handling
2026-08-26 10:56:38 +02:00
9e04b37f74
fix(agent-manager): surface worktree transfer abort errors
2026-08-26 10:54:49 +02:00
80d5353fb4
Merge pull request #13448 from Kilo-Org/fix-cli-errors-on-project-switching
...
fix(agent-manager): prevent false GitHub CLI warnings on project switches
2026-08-26 10:49:35 +02:00
cf7a0023a6
Merge pull request #13450 from Kilo-Org/investigate-agent-manager-false-stops
...
fix(vscode): prevent completed sessions from staying busy
2026-08-26 10:33:48 +02:00
f78d736e97
Merge pull request #13449 from Kilo-Org/perf/agent-manager-bulk-diff-details
...
fix(agent-manager): batch worktree diff details
2026-08-26 10:30:04 +02:00
c479c64481
fix(agent-manager): read project ownership once per PR error
2026-08-26 10:25:41 +02:00
721cc33c8b
test(vscode): align shared session status fixture
2026-08-26 10:03:38 +02:00
6a9fb70ab9
fix(vscode): prevent completed sessions from staying busy
2026-08-26 09:55:06 +02:00
a2d7e689fa
fix(agent-manager): preserve bulk diff fallback during refresh
2026-08-26 09:46:34 +02:00
7834f9308e
Merge pull request #13447 from Kilo-Org/enable-concurrent-worktree-creation
...
fix(agent-manager): speed up worktree session startup
2026-08-26 09:45:13 +02:00
23abb9755a
chore(vscode): format manual interruption handling
2026-08-26 09:24:28 +02:00
613414eb70
fix(agent-manager): prevent false GitHub CLI warnings on project switches
2026-08-26 09:09:30 +02:00
44395d3f25
fix(agent-manager): batch worktree diff details
2026-08-26 09:07:54 +02:00
ecb864e0fa
fix(agent-manager): speed up worktree session startup
2026-08-25 23:37:50 +02:00
24b1fa1fc7
Merge pull request #13441 from Kilo-Org/jetbrains/release/v7.1.0-rc.4
...
release(jetbrains): v7.1.0-rc.4
2026-08-25 16:30:03 -04:00
8986b9cf54
docs(jetbrains): edit changelog for v7.1.0-rc.4
2026-08-25 16:24:22 -04:00
80e3b2ee40
release(jetbrains): v7.1.0-rc.4
2026-08-25 20:15:33 +00:00
a604d9fe71
Merge pull request #13423 from Kilo-Org/gentle-badger
...
fix(jetbrains): harden Agent Manager worktree flows
2026-08-25 16:06:14 -04:00
Johnny Eric Amancio