Skip to content

feat(vscode): sync Agent Manager PR fixes with remote - #13951

Merged
marius-kilocode merged 4 commits into
mainfrom
bubbly-wormhole
Sep 9, 2026
Merged

marius-kilocode merged 4 commits into
mainfrom
bubbly-wormhole

Conversation

@marius-kilocode

Copy link
Copy Markdown
Collaborator

What Problem This Solves

Agent Manager can diagnose CI failures, review comments, and base-branch conflicts, but a successful local fix does not update the pull request unless the user performs another manual commit and push step. That breaks the CI feedback loop.

Why This Change Was Made

  • Add kilo-code.new.agentManager.pushFixes, enabled by default and stored in VS Code settings.
  • Ask the agent to commit and push validated fixes for PR CI failures and review feedback.
  • Apply the same behavior to Update from base when the worktree has a pull request.
  • Keep force-pushes out of the prompt. Normal permission prompts still gate commit and push.
  • Add a compact cloud-upload mode toggle to the PR panel header, plus the existing Agent Behaviour setting for users who prefer manual commits.
  • Keep local inline comments and terminal-driven flows manual.

User Impact

With push fixes enabled, Fix with Kilo can complete the PR loop: diagnose, fix, validate, commit, push, and let the PR's CI start again. Turning the setting off keeps fixes local for manual commit and push review.

Evidence

  • Full unit suite: 5,465 passed, 2 skipped, 0 failed.
  • Full host and webview typecheck: 0 errors.
  • Full lint, knip, and extension compile: passed.
  • Agent Manager PR render fixture: 77 passed.
  • Isolated VS Code test verified the Settings toggle save and reload path.
  • Storybook screenshots show the PR panel header mode button in active and inactive states.

Agent Manager PR panel with push-fixes mode enabled

Agent Manager PR panel header with push-fixes mode enabled

Agent Manager PR panel header with push-fixes mode disabled

Comment thread packages/kilo-vscode/webview-ui/agent-manager/pr/pr-check-feedback.ts Outdated
Comment thread packages/kilo-vscode/src/agent-manager/base-update.ts Outdated
@kilo-code-bot

kilo-code-bot Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

Code Review Summary

Status: No Issues Found | Recommendation: Merge

Files Reviewed (27 files)
  • packages/kilo-vscode/package.json
  • packages/kilo-vscode/src/KiloProvider.ts
  • packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
  • packages/kilo-vscode/tests/unit/agent-manager-settings.test.ts
  • packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
  • packages/kilo-vscode/webview-ui/src/i18n/{ar,br,bs,da,de,en,es,fa,fr,it,ja,ko,nl,no,pl,ru,th,tr,uk,zh,zht}.ts (21 locale files)
  • packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx
Previous Review Summaries (2 snapshots, latest commit 5a37198)

Current summary above is authoritative. Previous snapshots are kept for context only.

Previous review (commit 5a37198)

Status: No Issues Found | Recommendation: Merge

Files Reviewed (7 files)
  • packages/kilo-vscode/src/agent-manager/base-update.ts
  • packages/kilo-vscode/tests/fixtures/pr-comments-render.tsx
  • packages/kilo-vscode/tests/unit/base-update.test.ts
  • packages/kilo-vscode/tests/unit/pr-check-feedback.test.ts
  • packages/kilo-vscode/webview-ui/agent-manager/pr/PRChecks.tsx
  • packages/kilo-vscode/webview-ui/agent-manager/pr/PRSummary.tsx
  • packages/kilo-vscode/webview-ui/agent-manager/pr/pr-check-feedback.ts

Previous review (commit 88d4956)

Status: 2 Issues Found | Recommendation: Address before merge

Overview

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

WARNING

File Line Issue
packages/kilo-vscode/webview-ui/agent-manager/pr/pr-check-feedback.ts 63 CI body dropped "Do not commit, push", so off-mode and terminal flows no longer stay manual
packages/kilo-vscode/src/agent-manager/base-update.ts 24 Off path no longer says "Do not push" after removing it from the shared merge prompt
Files Reviewed (40 files)
  • .changeset/agent-manager-push-fixes.md
  • packages/kilo-vscode/package.json
  • packages/kilo-vscode/src/KiloProvider.ts
  • packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
  • packages/kilo-vscode/src/agent-manager/base-update.ts - 1 issue
  • packages/kilo-vscode/src/kilo-provider/push-fixes-settings.ts
  • packages/kilo-vscode/src/shared/review-comments.ts
  • packages/kilo-vscode/tests/fixtures/pr-comments-render.tsx
  • packages/kilo-vscode/tests/unit/agent-manager-settings.test.ts
  • packages/kilo-vscode/tests/unit/base-update.test.ts
  • packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts
  • packages/kilo-vscode/tests/unit/review-comments-pr.test.ts
  • packages/kilo-vscode/webview-ui/agent-manager/pr/PRPanel.tsx
  • packages/kilo-vscode/webview-ui/agent-manager/pr/pr-check-feedback.ts - 1 issue
  • packages/kilo-vscode/webview-ui/agent-manager/pr/pr-panel.css
  • packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
  • packages/kilo-vscode/webview-ui/src/components/settings/AgentBehaviourTab.tsx
  • packages/kilo-vscode/webview-ui/src/i18n/{ar,br,bs,da,de,en,es,fa,fr,it,ja,ko,nl,no,pl,ru,th,tr,uk,zh,zht}.ts (21 locale files)
  • packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx
  • packages/kilo-vscode/webview-ui/src/utils/review-comment-markdown.ts

Fix these issues in Kilo Cloud


Reviewed by grok-4.6 · Input: 69.1K · Output: 10.2K · Cached: 408.6K

Review guidance: REVIEW.md from base branch main

@marius-kilocode
marius-kilocode enabled auto-merge (squash) September 9, 2026 10:14
@marius-kilocode
marius-kilocode merged commit 492a2ff into main Sep 9, 2026
26 of 27 checks passed
@marius-kilocode
marius-kilocode deleted the bubbly-wormhole branch September 9, 2026 10:21
lambertjosh added a commit that referenced this pull request Sep 14, 2026
Verify workflow behavior against #13951, #13953, and #13780; preserve sandbox-specific Git approval requirements. Check saved-file omissions against Kilo-Org/cloud#5813 and folder controls against cloud#5948.
lambertjosh added a commit that referenced this pull request Sep 14, 2026
Account for #14101 and #13951 after the original sync. Verify notification channels against #13771 and widget layouts against Kilo-Org/cloud#5620. Clarify partial change summaries from cloud#5810 and remove implementation-heavy prose.
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.

2 participants