merge: upstream kilocode v7.3.0

.changeset/agent-manager-tab-add-button.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Keep the Agent Manager new-tab button visible at the end of the tab row, separated by a divider, and show all tab tooltips above the tabs.

.changeset/agent-manager-tab-controls.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Move Agent Manager tab creation and search controls to the left side of the tab bar with clearer toolbar separators.

.changeset/breezy-models-float.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Improve the JetBrains model picker with sections, favorites, and smart filtering.

.changeset/editor-sized-jetbrains-chat.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Scale JetBrains chat transcript fonts from the editor font settings.

.changeset/favorite-picker-index.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Keep the JetBrains model picker at the same row position when models are favorited or unfavorited.

.changeset/hide-empty-task-header-graph.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Hide the task header graph area until timeline data is available.

.changeset/jetbrains-chat-renderers.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Match VS Code-style reasoning and tool run rendering in JetBrains chat.

.changeset/jetbrains-empty-panel-layout.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Center description text and remove the fixed-width cap from the empty session panel so recent sessions can stretch naturally.

.changeset/jetbrains-existing-session-scroll.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Open existing JetBrains sessions scrolled to the latest message after history loads.

.changeset/jetbrains-header-tooltips.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Remember the JetBrains session header metrics expansion preference and show file names in read/write timeline tooltips.

.changeset/jetbrains-history-navigation.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Improve JetBrains history navigation with Back support and a Show History action in recent sessions.

.changeset/jetbrains-history-tabs.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Improve the JetBrains history panel with native tabs, independent local and cloud search, and date-grouped cloud sessions.

.changeset/jetbrains-mode-picker.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Improve the JetBrains mode picker with descriptions, deprecated badges, and native IntelliJ selection behavior.

.changeset/jetbrains-scroll-bottom.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Keep the JetBrains chat transcript pinned to bottom reliably while responses stream.

.changeset/jetbrains-scroll-button.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Show a scroll-to-bottom button when JetBrains chat sessions are scrolled away from the latest message.

.changeset/jetbrains-send-action.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Support rebinding the JetBrains prompt Send action in the IntelliJ keymap.

.changeset/jetbrains-session-header.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Show collapsible session metadata, context usage, token usage, and compaction controls in the JetBrains session header.

.changeset/jetbrains-session-history.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Add a native session history panel to the JetBrains plugin.

.changeset/jetbrains-session-layout-padding.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Control JetBrains chat transcript spacing from the session layout.

.changeset/jetbrains-session-loading-state.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Show loading immediately when opening JetBrains sessions without showing duplicate progress for new sessions.

.changeset/jetbrains-session-scroll-layout.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Reduce redundant JetBrains chat scroll layout work while keeping bottom-follow behavior.

.changeset/jetbrains-step-finish-timeline.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Show completed assistant steps in the JetBrains session timeline.

.changeset/jetbrains-stop-action.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Support stopping active JetBrains sessions from the prompt action button.

.changeset/model-picker-natural-size.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Size the JetBrains model picker from its rendered model rows instead of fixed popup dimensions.

.changeset/quiet-otters-reason.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Support reasoning effort selection and resetting JetBrains chat model overrides to the default model.

.changeset/reasoning-picker-align.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Align checked and unchecked reasoning picker rows in the JetBrains plugin.

.changeset/revert-checkpoints-stay.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Keep older revert checkpoints available after reverting a message in the VS Code extension.

.changeset/review-plus-contrast.md

@@ -0,0 +1,6 @@
+---
+"kilo-code": patch
+"@kilocode/kilo-ui": patch
+---
+
+Improve review comment plus icon contrast in diff viewers.

.changeset/stable-shell-streaming.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Keep shell command blocks stable while output streams so pending animations and expanded state do not reset.

.changeset/steady-crabs-scroll.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Preserve JetBrains chat scroll position when reviewing earlier session output.

.github/actions/setup-git-committer/action.yml

@@ -39,6 +39,15 @@ runs:
     - name: Clear checkout auth
       run: |
         git config --local --unset-all http.https://github.com/.extraheader || true
+        # kilocode_change start
+        keys="$(git config --local --name-only --get-regexp '^includeIf\.gitdir:' || true)"
+        for key in $keys; do
+          path="$(git config --local --get "$key" || true)"
+          case "$path" in
+            *git-credentials-*.config) git config --local --unset-all "$key" || true ;;
+          esac
+        done
+        # kilocode_change end
       shell: bash
 
     - name: Configure git remote

.github/workflows/auto-docs.yml

@@ -1,35 +1,113 @@
-name: Trigger webhook for feat PRs
+name: Auto-docs dry-run intake
 
+# Trigger on merged feature PRs, or manually with a specific PR number.
+# IMPORTANT: This workflow intentionally does NOT check out PR code and does NOT
+# execute any code from the PR branch. It only reads PR metadata and forwards it
+# to a webhook. This is required for safe use of pull_request_target on a public repo.
 on:
-  pull_request:
+  pull_request_target:
     types: [closed]
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: "PR number to test"
+        required: true
+
+# Minimal permissions: read repo contents and PR metadata only.
+permissions:
+  contents: read
+  pull-requests: read
+
+# One run per PR at a time. Does not cancel in progress — let the current run
+# finish so we don't drop events when a PR is quickly closed/reopened/closed.
+concurrency:
+  group: auto-docs-${{ github.event.pull_request.number || inputs.pr_number }}
+  cancel-in-progress: false
 
 jobs:
-  call-webhook:
+  call-valtown:
     if: >
-      github.event.pull_request.merged == true &&
-      (startsWith(github.event.pull_request.title, 'feat:') ||
-       startsWith(github.event.pull_request.title, 'feat('))
+      github.event_name == 'workflow_dispatch' ||
+      (
+        github.event.pull_request.merged == true &&
+        (
+          startsWith(github.event.pull_request.title, 'feat:') ||
+          startsWith(github.event.pull_request.title, 'feat(')
+        )
+      )
+
     runs-on: ubuntu-latest
+    timeout-minutes: 5
+
     steps:
-      - name: Send webhook safely
+      - name: Build webhook payload
+        env:
+          GH_TOKEN: ${{ github.token }}
+          EVENT_NAME: ${{ github.event_name }}
+          REPO: ${{ github.repository }}
+          PR_NUMBER_FROM_EVENT: ${{ github.event.pull_request.number }}
+          PR_NUMBER_FROM_INPUT: ${{ inputs.pr_number }}
         run: |
-          payload=$(jq -n \
-            --arg repo "${GITHUB_REPOSITORY}" \
-            --arg pr_number "${{ github.event.pull_request.number }}" \
-            --arg title "${{ github.event.pull_request.title }}" \
-            --arg body "${{ github.event.pull_request.body }}" \
-            --arg author "${{ github.event.pull_request.user.login }}" \
-            --arg merged_at "${{ github.event.pull_request.merged_at }}" \
+          set -euo pipefail
+
+          PR_NUMBER="${PR_NUMBER_FROM_EVENT:-$PR_NUMBER_FROM_INPUT}"
+
+          if [ -z "$PR_NUMBER" ]; then
+            echo "Missing PR number"
+            exit 1
+          fi
+
+          gh api "repos/$REPO/pulls/$PR_NUMBER" > pr.json
+
+          jq -n \
+            --arg event_name "$EVENT_NAME" \
+            --arg repo "$REPO" \
+            --arg pr_number "$PR_NUMBER" \
+            --slurpfile pr pr.json \
             '{
+              event_name: $event_name,
               repo: $repo,
               pr_number: $pr_number,
-              title: $title,
-              description: $body,
-              author: $author,
-              merged_at: $merged_at
-            }'
-          )
-          curl --fail-with-body -X POST "${{ secrets.DOC_WEBHOOK_URL }}" \
+              title: $pr[0].title,
+              description: ($pr[0].body // ""),
+              author: $pr[0].user.login,
+              merged_at: ($pr[0].merged_at // ""),
+              pr_url: $pr[0].html_url,
+              base_branch: $pr[0].base.ref,
+              head_branch: $pr[0].head.ref
+            }' > payload.json
+
+          echo "Payload created:"
+          jq '{
+            event_name,
+            repo,
+            pr_number,
+            title,
+            author,
+            merged_at,
+            pr_url,
+            base_branch,
+            head_branch
+          }' payload.json
+
+      - name: Send webhook to Val Town
+        env:
+          DOC_WEBHOOK_URL: ${{ secrets.DOC_WEBHOOK_URL }}
+          DOC_WEBHOOK_SECRET: ${{ secrets.DOC_WEBHOOK_SECRET }}
+        run: |
+          set -euo pipefail
+
+          if [ -z "${DOC_WEBHOOK_URL:-}" ]; then
+            echo "DOC_WEBHOOK_URL secret is not set"
+            exit 1
+          fi
+
+          if [ -z "${DOC_WEBHOOK_SECRET:-}" ]; then
+            echo "DOC_WEBHOOK_SECRET secret is not set"
+            exit 1
+          fi
+
+          curl --fail-with-body -sS -X POST "$DOC_WEBHOOK_URL" \
             -H "Content-Type: application/json" \
-            --data-raw "$payload"
+            -H "X-Docs-Webhook-Secret: $DOC_WEBHOOK_SECRET" \
+            --data-binary @payload.json

.github/workflows/beta.yml

@@ -14,8 +14,9 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
         with:
+          persist-credentials: false # kilocode_change
           fetch-depth: 0
 
       - name: Setup Bun

.github/workflows/check-kilo-generated-artifacts.yml

@@ -0,0 +1,27 @@
+# kilocode_change - new file
+name: Check Kilo generated artifacts
+
+on:
+  pull_request:
+    paths:
+      - ".gitignore"
+      - ".github/workflows/check-kilo-generated-artifacts.yml"
+      - ".kilo/**"
+      - ".kilocode/**"
+      - "script/check-kilo-generated-artifacts.ts"
+  workflow_dispatch:
+
+jobs:
+  check:
+    name: Check Kilo generated artifacts
+    if: github.repository == 'Kilo-Org/kilocode'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6 # kilocode_change
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+
+      - uses: oven-sh/setup-bun@v2
+
+      - name: Run check
+        run: bun run script/check-kilo-generated-artifacts.ts

.github/workflows/check-md-table-padding.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.repository == 'Kilo-Org/kilocode'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6 # kilocode_change
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}