diff --git a/.changeset/agent-manager-tab-add-button.md b/.changeset/agent-manager-tab-add-button.md
deleted file mode 100644
index 93098cacf85..00000000000
--- a/.changeset/agent-manager-tab-add-button.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"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.
diff --git a/.changeset/agent-manager-tab-controls.md b/.changeset/agent-manager-tab-controls.md
deleted file mode 100644
index 8d9b184dd1e..00000000000
--- a/.changeset/agent-manager-tab-controls.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Move Agent Manager tab creation and search controls to the left side of the tab bar with clearer toolbar separators.
diff --git a/.github/workflows/check-kilo-generated-artifacts.yml b/.github/workflows/check-kilo-generated-artifacts.yml
new file mode 100644
index 00000000000..1fa1c083f28
--- /dev/null
+++ b/.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
diff --git a/.gitignore b/.gitignore
index 95a44149d17..91bf7230c02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,8 +45,22 @@ telemetry-id
 tsconfig.tsbuildinfo
 
 # Kilo
+.kilo/.gitignore
+.kilo/package.json
+.kilo/package-lock.json
+.kilo/pnpm-lock.yaml
+.kilo/bun.lock
+.kilo/yarn.lock
+.kilo/node_modules
 .kilo/plans/*upstream-merge-report-*.md
+.kilocode/.gitignore
+.kilocode/package.json
+.kilocode/package-lock.json
+.kilocode/pnpm-lock.yaml
+.kilocode/bun.lock
+.kilocode/yarn.lock
+.kilocode/node_modules
 
 # Test Artifacts
 packages/app/.artifacts/
-packages/opencode/.artifacts/
\ No newline at end of file
+packages/opencode/.artifacts/
diff --git a/.kilo/package-lock.json b/.kilo/package-lock.json
deleted file mode 100644
index ce556edce27..00000000000
--- a/.kilo/package-lock.json
+++ /dev/null
@@ -1,376 +0,0 @@
-{
-  "name": ".kilo",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "@kilocode/plugin": "7.2.31"
-      }
-    },
-    "node_modules/@kilocode/plugin": {
-      "version": "7.2.31",
-      "resolved": "https://registry.npmjs.org/@kilocode/plugin/-/plugin-7.2.31.tgz",
-      "integrity": "sha512-KmKTTIly7hRlJdXKhqZ/j/brvTPh0z0UTjWSjJWq5fqf4pATgYGn7G0g3ZjILnN7MUkkZXuljgqExTEeQJHGkQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@kilocode/sdk": "7.2.31",
-        "effect": "4.0.0-beta.48",
-        "zod": "4.1.8"
-      },
-      "peerDependencies": {
-        "@opentui/core": ">=0.1.100",
-        "@opentui/solid": ">=0.1.100"
-      },
-      "peerDependenciesMeta": {
-        "@opentui/core": {
-          "optional": true
-        },
-        "@opentui/solid": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@kilocode/sdk": {
-      "version": "7.2.31",
-      "resolved": "https://registry.npmjs.org/@kilocode/sdk/-/sdk-7.2.31.tgz",
-      "integrity": "sha512-Sx05yv+3TIlc6M4Ze+YGgKCLoIg8B0WRE15JXDriVncT+wz7M6+e+4mjNWkwfsuywdeOTYPfeFViqX8iO7ckKA==",
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "7.0.6"
-      }
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
-      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
-      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
-      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
-      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
-      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
-      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@standard-schema/spec": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
-      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
-      "license": "MIT"
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/detect-libc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
-      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/effect": {
-      "version": "4.0.0-beta.48",
-      "resolved": "https://registry.npmjs.org/effect/-/effect-4.0.0-beta.48.tgz",
-      "integrity": "sha512-MMAM/ZabuNdNmgXiin+BAanQXK7qM8mlt7nfXDoJ/Gn9V8i89JlCq+2N0AiWmqFLXjGLA0u3FjiOjSOYQk5uMw==",
-      "license": "MIT",
-      "dependencies": {
-        "@standard-schema/spec": "^1.1.0",
-        "fast-check": "^4.6.0",
-        "find-my-way-ts": "^0.1.6",
-        "ini": "^6.0.0",
-        "kubernetes-types": "^1.30.0",
-        "msgpackr": "^1.11.9",
-        "multipasta": "^0.2.7",
-        "toml": "^4.1.1",
-        "uuid": "^13.0.0",
-        "yaml": "^2.8.3"
-      }
-    },
-    "node_modules/fast-check": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-4.7.0.tgz",
-      "integrity": "sha512-NsZRtqvSSoCP0HbNjUD+r1JH8zqZalyp6gLY9e7OYs7NK9b6AHOs2baBFeBG7bVNsuoukh89x2Yg3rPsul8ziQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/dubzzz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fast-check"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "pure-rand": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=12.17.0"
-      }
-    },
-    "node_modules/find-my-way-ts": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/find-my-way-ts/-/find-my-way-ts-0.1.6.tgz",
-      "integrity": "sha512-a85L9ZoXtNAey3Y6Z+eBWW658kO/MwR7zIafkIUPUMf3isZG0NCs2pjW2wtjxAKuJPxMAsHUIP4ZPGv0o5gyTA==",
-      "license": "MIT"
-    },
-    "node_modules/ini": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz",
-      "integrity": "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==",
-      "license": "ISC",
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "license": "ISC"
-    },
-    "node_modules/kubernetes-types": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/kubernetes-types/-/kubernetes-types-1.30.0.tgz",
-      "integrity": "sha512-Dew1okvhM/SQcIa2rcgujNndZwU8VnSapDgdxlYoB84ZlpAD43U6KLAFqYo17ykSFGHNPrg0qry0bP+GJd9v7Q==",
-      "license": "Apache-2.0"
-    },
-    "node_modules/msgpackr": {
-      "version": "1.11.10",
-      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.10.tgz",
-      "integrity": "sha512-iCZNq+HszvF+fC3anCm4nBmWEnbeIAfpDs6IStAEKhQ2YSgkjzVG2FF9XJqwwQh5bH3N9OUTUt4QwVN6MLMLtA==",
-      "license": "MIT",
-      "optionalDependencies": {
-        "msgpackr-extract": "^3.0.2"
-      }
-    },
-    "node_modules/msgpackr-extract": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
-      "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "node-gyp-build-optional-packages": "5.2.2"
-      },
-      "bin": {
-        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
-      },
-      "optionalDependencies": {
-        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
-      }
-    },
-    "node_modules/multipasta": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/multipasta/-/multipasta-0.2.7.tgz",
-      "integrity": "sha512-KPA58d68KgGil15oDqXjkUBEBYc00XvbPj5/X+dyzeo/lWm9Nc25pQRlf1D+gv4OpK7NM0J1odrbu9JNNGvynA==",
-      "license": "MIT"
-    },
-    "node_modules/node-gyp-build-optional-packages": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
-      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "detect-libc": "^2.0.1"
-      },
-      "bin": {
-        "node-gyp-build-optional-packages": "bin.js",
-        "node-gyp-build-optional-packages-optional": "optional.js",
-        "node-gyp-build-optional-packages-test": "build-test.js"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pure-rand": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-8.4.0.tgz",
-      "integrity": "sha512-IoM8YF/jY0hiugFo/wOWqfmarlE6J0wc6fDK1PhftMk7MGhVZl88sZimmqBBFomLOCSmcCCpsfj7wXASCpvK9A==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/dubzzz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fast-check"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/toml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-4.1.1.tgz",
-      "integrity": "sha512-EBJnVBr3dTXdA89WVFoAIPUqkBjxPMwRqsfuo1r240tKFHXv3zgca4+NJib/h6TyvGF7vOawz0jGuryJCdNHrw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=20"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
-      "integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist-node/bin/uuid"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/yaml": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
-      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
-      "license": "ISC",
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/eemeli"
-      }
-    },
-    "node_modules/zod": {
-      "version": "4.1.8",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    }
-  }
-}
diff --git a/.kilocode/package-lock.json b/.kilocode/package-lock.json
deleted file mode 100644
index 32676c56243..00000000000
--- a/.kilocode/package-lock.json
+++ /dev/null
@@ -1,376 +0,0 @@
-{
-  "name": ".kilocode",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "@kilocode/plugin": "7.2.31"
-      }
-    },
-    "node_modules/@kilocode/plugin": {
-      "version": "7.2.31",
-      "resolved": "https://registry.npmjs.org/@kilocode/plugin/-/plugin-7.2.31.tgz",
-      "integrity": "sha512-KmKTTIly7hRlJdXKhqZ/j/brvTPh0z0UTjWSjJWq5fqf4pATgYGn7G0g3ZjILnN7MUkkZXuljgqExTEeQJHGkQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@kilocode/sdk": "7.2.31",
-        "effect": "4.0.0-beta.48",
-        "zod": "4.1.8"
-      },
-      "peerDependencies": {
-        "@opentui/core": ">=0.1.100",
-        "@opentui/solid": ">=0.1.100"
-      },
-      "peerDependenciesMeta": {
-        "@opentui/core": {
-          "optional": true
-        },
-        "@opentui/solid": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@kilocode/sdk": {
-      "version": "7.2.31",
-      "resolved": "https://registry.npmjs.org/@kilocode/sdk/-/sdk-7.2.31.tgz",
-      "integrity": "sha512-Sx05yv+3TIlc6M4Ze+YGgKCLoIg8B0WRE15JXDriVncT+wz7M6+e+4mjNWkwfsuywdeOTYPfeFViqX8iO7ckKA==",
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "7.0.6"
-      }
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
-      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
-      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
-      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
-      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
-      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
-      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@standard-schema/spec": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
-      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
-      "license": "MIT"
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/detect-libc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
-      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/effect": {
-      "version": "4.0.0-beta.48",
-      "resolved": "https://registry.npmjs.org/effect/-/effect-4.0.0-beta.48.tgz",
-      "integrity": "sha512-MMAM/ZabuNdNmgXiin+BAanQXK7qM8mlt7nfXDoJ/Gn9V8i89JlCq+2N0AiWmqFLXjGLA0u3FjiOjSOYQk5uMw==",
-      "license": "MIT",
-      "dependencies": {
-        "@standard-schema/spec": "^1.1.0",
-        "fast-check": "^4.6.0",
-        "find-my-way-ts": "^0.1.6",
-        "ini": "^6.0.0",
-        "kubernetes-types": "^1.30.0",
-        "msgpackr": "^1.11.9",
-        "multipasta": "^0.2.7",
-        "toml": "^4.1.1",
-        "uuid": "^13.0.0",
-        "yaml": "^2.8.3"
-      }
-    },
-    "node_modules/fast-check": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-4.7.0.tgz",
-      "integrity": "sha512-NsZRtqvSSoCP0HbNjUD+r1JH8zqZalyp6gLY9e7OYs7NK9b6AHOs2baBFeBG7bVNsuoukh89x2Yg3rPsul8ziQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/dubzzz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fast-check"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "pure-rand": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=12.17.0"
-      }
-    },
-    "node_modules/find-my-way-ts": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/find-my-way-ts/-/find-my-way-ts-0.1.6.tgz",
-      "integrity": "sha512-a85L9ZoXtNAey3Y6Z+eBWW658kO/MwR7zIafkIUPUMf3isZG0NCs2pjW2wtjxAKuJPxMAsHUIP4ZPGv0o5gyTA==",
-      "license": "MIT"
-    },
-    "node_modules/ini": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz",
-      "integrity": "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==",
-      "license": "ISC",
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "license": "ISC"
-    },
-    "node_modules/kubernetes-types": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/kubernetes-types/-/kubernetes-types-1.30.0.tgz",
-      "integrity": "sha512-Dew1okvhM/SQcIa2rcgujNndZwU8VnSapDgdxlYoB84ZlpAD43U6KLAFqYo17ykSFGHNPrg0qry0bP+GJd9v7Q==",
-      "license": "Apache-2.0"
-    },
-    "node_modules/msgpackr": {
-      "version": "1.11.10",
-      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.10.tgz",
-      "integrity": "sha512-iCZNq+HszvF+fC3anCm4nBmWEnbeIAfpDs6IStAEKhQ2YSgkjzVG2FF9XJqwwQh5bH3N9OUTUt4QwVN6MLMLtA==",
-      "license": "MIT",
-      "optionalDependencies": {
-        "msgpackr-extract": "^3.0.2"
-      }
-    },
-    "node_modules/msgpackr-extract": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
-      "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "node-gyp-build-optional-packages": "5.2.2"
-      },
-      "bin": {
-        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
-      },
-      "optionalDependencies": {
-        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
-      }
-    },
-    "node_modules/multipasta": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/multipasta/-/multipasta-0.2.7.tgz",
-      "integrity": "sha512-KPA58d68KgGil15oDqXjkUBEBYc00XvbPj5/X+dyzeo/lWm9Nc25pQRlf1D+gv4OpK7NM0J1odrbu9JNNGvynA==",
-      "license": "MIT"
-    },
-    "node_modules/node-gyp-build-optional-packages": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
-      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "detect-libc": "^2.0.1"
-      },
-      "bin": {
-        "node-gyp-build-optional-packages": "bin.js",
-        "node-gyp-build-optional-packages-optional": "optional.js",
-        "node-gyp-build-optional-packages-test": "build-test.js"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pure-rand": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-8.4.0.tgz",
-      "integrity": "sha512-IoM8YF/jY0hiugFo/wOWqfmarlE6J0wc6fDK1PhftMk7MGhVZl88sZimmqBBFomLOCSmcCCpsfj7wXASCpvK9A==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/dubzzz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fast-check"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/toml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-4.1.1.tgz",
-      "integrity": "sha512-EBJnVBr3dTXdA89WVFoAIPUqkBjxPMwRqsfuo1r240tKFHXv3zgca4+NJib/h6TyvGF7vOawz0jGuryJCdNHrw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=20"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.2.tgz",
-      "integrity": "sha512-vzi9uRZ926x4XV73S/4qQaTwPXM2JBj6/6lI/byHH1jOpCzb0zDbfytgA9LcN/hzb2l7WQSQnxITOVx5un/wGw==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist-node/bin/uuid"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/yaml": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
-      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
-      "license": "ISC",
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/eemeli"
-      }
-    },
-    "node_modules/zod": {
-      "version": "4.1.8",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    }
-  }
-}
diff --git a/.opencode-version b/.opencode-version
new file mode 100644
index 00000000000..9866d345648
--- /dev/null
+++ b/.opencode-version
@@ -0,0 +1 @@
+v1.14.33
diff --git a/bun.lock b/bun.lock
index 33fca023363..69b439a427c 100644
--- a/bun.lock
+++ b/bun.lock
@@ -33,7 +33,7 @@
     },
     "packages/core": {
       "name": "@opencode-ai/core",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -68,7 +68,7 @@
     },
     "packages/kilo-docs": {
       "name": "@kilocode/kilo-docs",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "dependencies": {
         "@docsearch/css": "^4",
         "@docsearch/js": "^4",
@@ -98,7 +98,7 @@
     },
     "packages/kilo-gateway": {
       "name": "@kilocode/kilo-gateway",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "dependencies": {
         "@ai-sdk/alibaba": "1.0.17",
         "@ai-sdk/anthropic": "3.0.71",
@@ -134,7 +134,7 @@
     },
     "packages/kilo-i18n": {
       "name": "@kilocode/kilo-i18n",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "devDependencies": {
         "@tsconfig/node22": "catalog:",
         "@types/bun": "catalog:",
@@ -144,7 +144,7 @@
     },
     "packages/kilo-indexing": {
       "name": "@kilocode/kilo-indexing",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "dependencies": {
         "@aws-sdk/client-bedrock-runtime": "3.1005.0",
         "@aws-sdk/credential-provider-ini": "3.972.31",
@@ -178,7 +178,7 @@
     },
     "packages/kilo-telemetry": {
       "name": "@kilocode/kilo-telemetry",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "dependencies": {
         "@kilocode/kilo-gateway": "workspace:*",
         "posthog-node": "4.4.0",
@@ -192,7 +192,7 @@
     },
     "packages/kilo-ui": {
       "name": "@kilocode/kilo-ui",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "@kobalte/core": "0.13.11",
@@ -229,7 +229,7 @@
     },
     "packages/kilo-vscode": {
       "name": "kilo-code",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.39.0",
         "@kilocode/kilo-gateway": "workspace:*",
@@ -292,7 +292,7 @@
     },
     "packages/opencode": {
       "name": "@kilocode/cli",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "bin": {
         "kilo": "./bin/kilo",
         "kilocode": "./bin/kilo",
@@ -450,7 +450,7 @@
     },
     "packages/plugin": {
       "name": "@kilocode/plugin",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "effect": "catalog:",
@@ -475,7 +475,7 @@
     },
     "packages/script": {
       "name": "@opencode-ai/script",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "dependencies": {
         "semver": "^7.6.3",
       },
@@ -486,7 +486,7 @@
     },
     "packages/sdk/js": {
       "name": "@kilocode/sdk",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "dependencies": {
         "cross-spawn": "catalog:",
       },
@@ -501,7 +501,7 @@
     },
     "packages/storybook": {
       "name": "@opencode-ai/storybook",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "devDependencies": {
         "@opencode-ai/ui": "workspace:*",
         "@solidjs/meta": "catalog:",
@@ -524,7 +524,7 @@
     },
     "packages/ui": {
       "name": "@opencode-ai/ui",
-      "version": "7.2.49",
+      "version": "7.2.50",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "@kobalte/core": "catalog:",
@@ -615,8 +615,6 @@
     "@opentui/solid": "0.2.2",
     "@pierre/diffs": "1.1.0-beta.18",
     "@playwright/test": "1.59.1",
-    "@sentry/solid": "10.36.0",
-    "@sentry/vite-plugin": "4.6.0",
     "@solid-primitives/storage": "4.3.3",
     "@solidjs/meta": "0.29.4",
     "@solidjs/router": "0.15.4",
diff --git a/package.json b/package.json
index d5cbbaf4375..ff0a116dc3d 100644
--- a/package.json
+++ b/package.json
@@ -7,13 +7,11 @@
   "packageManager": "bun@1.3.13",
   "scripts": {
     "dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
-    "dev:desktop": "bun --cwd packages/desktop-electron dev",
-    "dev:web": "bun --cwd packages/app dev",
-    "dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",
+    "dev-setup": "bun run --cwd packages/opencode --conditions=browser src/index.ts dev-setup",
     "dev:storybook": "bun --cwd packages/storybook storybook",
     "lint": "oxlint",
     "typecheck": "bun turbo typecheck",
-    "postinstall": "bun run --cwd packages/opencode fix-node-pty",
+    "postinstall": "bun run --cwd packages/opencode fix-node-pty && bun run script/setup-git.ts",
     "prepare": "husky",
     "random": "echo 'Random script'",
     "hello": "echo 'Hello World!'",
@@ -76,8 +74,6 @@
       "@solidjs/meta": "0.29.4",
       "@solidjs/router": "0.15.4",
       "@solidjs/start": "https://pkg.pr.new/@solidjs/start@dfb2020",
-      "@sentry/solid": "10.36.0",
-      "@sentry/vite-plugin": "4.6.0",
       "solid-js": "1.9.12",
       "vite-plugin-solid": "2.11.10",
       "@lydell/node-pty": "1.2.0-beta.10"
@@ -149,6 +145,6 @@
     "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
     "solid-js@1.9.10": "patches/solid-js@1.9.10.patch"
   },
-  "version": "7.2.49",
+  "version": "7.2.50",
   "peerDependencies": {}
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index 3fc50a9ce77..c8800d778af 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "name": "@opencode-ai/core",
   "type": "module",
   "license": "MIT",
diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml
index f43d4ec9fa8..bd0807ac0a5 100644
--- a/packages/extensions/zed/extension.toml
+++ b/packages/extensions/zed/extension.toml
@@ -1,7 +1,7 @@
 id = "kilo"
 name = "Kilo"
 description = "The open source coding agent."
-version = "7.2.49"
+version = "7.2.50"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/Kilo-Org/kilocode"
@@ -11,26 +11,26 @@ name = "Kilo"
 icon = "./icons/opencode.svg"
 
 [agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.49/opencode-darwin-arm64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.50/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.49/opencode-darwin-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.50/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.49/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.50/opencode-linux-arm64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.49/opencode-linux-x64.tar.gz"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.50/opencode-linux-x64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.49/opencode-windows-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.50/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
diff --git a/packages/kilo-docs/package.json b/packages/kilo-docs/package.json
index 18e176f2b08..1c72cc0238c 100644
--- a/packages/kilo-docs/package.json
+++ b/packages/kilo-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-docs",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "private": true,
   "scripts": {
     "dev": "next dev --webpack --port 3002",
diff --git a/packages/kilo-gateway/package.json b/packages/kilo-gateway/package.json
index ae71a5b8d4b..c56d0a419cb 100644
--- a/packages/kilo-gateway/package.json
+++ b/packages/kilo-gateway/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-gateway",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "type": "module",
   "license": "MIT",
   "description": "Unified Kilo Gateway package for OpenCode - authentication, provider, and API integration",
diff --git a/packages/kilo-i18n/package.json b/packages/kilo-i18n/package.json
index 500af94d754..5bee4575135 100644
--- a/packages/kilo-i18n/package.json
+++ b/packages/kilo-i18n/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-i18n",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "type": "module",
   "license": "MIT",
   "description": "Kilo-specific i18n translations and overrides",
diff --git a/packages/kilo-indexing/package.json b/packages/kilo-indexing/package.json
index 4d369efd670..88ddae1e9f5 100644
--- a/packages/kilo-indexing/package.json
+++ b/packages/kilo-indexing/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-indexing",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "type": "module",
   "license": "MIT",
   "description": "Standalone indexing engine and host helpers for Kilo Code",
diff --git a/packages/kilo-telemetry/package.json b/packages/kilo-telemetry/package.json
index c284e8fbfb5..c057306a42f 100644
--- a/packages/kilo-telemetry/package.json
+++ b/packages/kilo-telemetry/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-telemetry",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "type": "module",
   "license": "MIT",
   "description": "Telemetry for Kilo CLI - PostHog analytics integration",
diff --git a/packages/kilo-ui/package.json b/packages/kilo-ui/package.json
index 7ad72ec064b..a6f51b2f047 100644
--- a/packages/kilo-ui/package.json
+++ b/packages/kilo-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-ui",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/packages/kilo-ui/src/components/diff.tsx b/packages/kilo-ui/src/components/diff.tsx
index 43abaaf2459..febb70ca813 100644
--- a/packages/kilo-ui/src/components/diff.tsx
+++ b/packages/kilo-ui/src/components/diff.tsx
@@ -256,10 +256,7 @@ export function Diff<T>(props: DiffProps<T>) {
     host.removeAttribute("data-color-scheme")
   }
 
-  // Patch a bug in @pierre/diffs where `grid-template-columns: 100% auto` is set
-  // for `line-info-basic` separators under `@media (pointer: fine)`, causing the
-  // expand button to consume 100% of the gutter width and overlap the separator
-  // content text. We inject into `@layer unsafe` which overrides `@layer base`.
+  // Patch Pierre shadow styles for Kilo-specific layout and contrast tweaks.
   let separatorPatchSheet: CSSStyleSheet | null = null
   const patchSeparatorLayout = () => {
     const root = getRoot()
@@ -267,7 +264,7 @@ export function Diff<T>(props: DiffProps<T>) {
     if (!separatorPatchSheet) {
       separatorPatchSheet = new CSSStyleSheet()
       separatorPatchSheet.replaceSync(
-        `@layer unsafe { @media (pointer: fine) { [data-separator='line-info-basic'][data-expand-index] [data-separator-wrapper] { grid-template-columns: 34px auto; } } }`,
+        `@layer unsafe { @media (pointer: fine) { [data-separator='line-info-basic'][data-expand-index] [data-separator-wrapper] { grid-template-columns: 34px auto; } } [data-utility-button] { background-color: var(--vscode-button-background, var(--button-primary-base, var(--icon-interactive-base))); color: var(--vscode-button-foreground, var(--icon-invert-base, #fff)); } }`,
       )
     }
     if (!root.adoptedStyleSheets.includes(separatorPatchSheet))
diff --git a/packages/kilo-vscode/CHANGELOG.md b/packages/kilo-vscode/CHANGELOG.md
index aeb0fd6cadb..b93f0c6e273 100644
--- a/packages/kilo-vscode/CHANGELOG.md
+++ b/packages/kilo-vscode/CHANGELOG.md
@@ -1,5 +1,26 @@
 # kilo-code
 
+## 7.2.50
+
+### Patch Changes
+
+- [#10082](https://github.com/Kilo-Org/kilocode/pull/10082) [`0aa908c`](https://github.com/Kilo-Org/kilocode/commit/0aa908c7afe9f5e43c77ba157936511a7b959c9f) - 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.
+
+- [#10082](https://github.com/Kilo-Org/kilocode/pull/10082) [`a5f2fbc`](https://github.com/Kilo-Org/kilocode/commit/a5f2fbc9fdba4c51adcdbf6298088a323631f769) - Move Agent Manager tab creation and search controls to the left side of the tab bar with clearer toolbar separators.
+
+- [#10134](https://github.com/Kilo-Org/kilocode/pull/10134) [`0e8d2fe`](https://github.com/Kilo-Org/kilocode/commit/0e8d2fe0911719a2e364a43fdc70b1a18ce4d935) - Fix session cost breakdowns after reloading conversations with subagents.
+
+- [#10125](https://github.com/Kilo-Org/kilocode/pull/10125) [`fc6ce73`](https://github.com/Kilo-Org/kilocode/commit/fc6ce735c9dde64a544e0952d789397fa9fb7815) - Hide the task header graph area until timeline data is available.
+
+- [#10129](https://github.com/Kilo-Org/kilocode/pull/10129) [`d858252`](https://github.com/Kilo-Org/kilocode/commit/d8582521c3d0b1daef7ca6da64cc2a8340786ca9) - Keep older revert checkpoints available after reverting a message in the VS Code extension.
+
+- [#10130](https://github.com/Kilo-Org/kilocode/pull/10130) [`5482cc0`](https://github.com/Kilo-Org/kilocode/commit/5482cc0d09f7c22e15063c75dac223f13b1fa4f9) - Improve review comment plus icon contrast in diff viewers.
+
+- [#10127](https://github.com/Kilo-Org/kilocode/pull/10127) [`3259008`](https://github.com/Kilo-Org/kilocode/commit/3259008074cafe232a30d380e9ecc73c63ca0a35) - Keep shell command blocks stable while output streams so pending animations and expanded state do not reset.
+
+- Updated dependencies [[`5482cc0`](https://github.com/Kilo-Org/kilocode/commit/5482cc0d09f7c22e15063c75dac223f13b1fa4f9)]:
+  - @kilocode/kilo-ui@7.2.50
+
 ## 7.2.49
 
 ## 7.2.48
diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json
index a66d000db5b..33d50e240e2 100644
--- a/packages/kilo-vscode/package.json
+++ b/packages/kilo-vscode/package.json
@@ -2,7 +2,7 @@
   "name": "kilo-code",
   "displayName": "Kilo Code: AI Coding Agent, Copilot, and Autocomplete",
   "description": "Open Source AI coding agent that generates code from natural language, automates tasks, and runs terminal commands. Features inline autocomplete, browser automation, automated refactoring, and custom modes for planning, coding, and debugging. Supports 500+ AI models including Claude (Anthropic), Gemini, Grok, GPT, Codex and GLM.",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "icon": "assets/icons/logo-outline-black.png",
   "galleryBanner": {
     "color": "#FFFFFF",
diff --git a/packages/kilo-vscode/tests/unit/revert-checkpoints.test.ts b/packages/kilo-vscode/tests/unit/revert-checkpoints.test.ts
new file mode 100644
index 00000000000..83f03b0fa76
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/revert-checkpoints.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it } from "bun:test"
+import fs from "node:fs"
+import path from "node:path"
+
+const ROOT = path.resolve(import.meta.dir, "../..")
+const TURN_FILE = path.join(ROOT, "webview-ui/src/components/chat/VscodeSessionTurn.tsx")
+
+const src = fs.readFileSync(TURN_FILE, "utf-8")
+
+describe("message revert checkpoints", () => {
+  it("keeps revert actions available after a session is already reverted", () => {
+    expect(src).toMatch(/onRevert=\{\s*assistantMessages\(\)\.length > 0\s*\? \(\) =>/)
+    expect(src).not.toMatch(/onRevert=\{[\s\S]*?&& !session\.revert\(\)[\s\S]*?\? \(\) =>/)
+  })
+
+  it("only marks revert disabled while the agent is busy", () => {
+    expect(src).toMatch(/data-revert-disabled=\{\s*assistantMessages\(\)\.length > 0 && session\.status\(\) !== "idle"/)
+    expect(src).not.toMatch(/data-revert-disabled=\{[\s\S]*?!session\.revert\(\)/)
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/session-utils.test.ts b/packages/kilo-vscode/tests/unit/session-utils.test.ts
index 64454c9e51e..3ffd26095ea 100644
--- a/packages/kilo-vscode/tests/unit/session-utils.test.ts
+++ b/packages/kilo-vscode/tests/unit/session-utils.test.ts
@@ -4,6 +4,7 @@ import {
   calcTotalCost,
   calcContextUsage,
   buildFamilyCosts,
+  buildFamilyParents,
   buildFamilyLabels,
   buildCostBreakdown,
   collapseCostBreakdown,
@@ -287,6 +288,36 @@ describe("buildFamilyCosts", () => {
     expect(costs.size).toBe(1)
     expect(costs.get("s1")).toBeCloseTo(0.01)
   })
+
+  it("subtracts child totals using task parent links when session metadata is missing", () => {
+    const family = new Set(["root", "child"])
+    const messages = {
+      root: [msg("m1", "assistant", 0.15)],
+      child: [msg("m2", "assistant", 0.1)],
+    }
+    const parts = { m1: [toolPart("task", "child", { subagent_type: "explore" })] }
+    const parents = buildFamilyParents(family, messages, parts)
+    const costs = buildFamilyCosts(family, messages, { root: {} }, parents)
+    expect(costs.get("root")).toBeCloseTo(0.05)
+    expect(costs.get("child")).toBeCloseTo(0.1)
+  })
+})
+
+describe("buildFamilyParents", () => {
+  it("derives child-to-parent links from task tool parts", () => {
+    const family = new Set(["root", "child"])
+    const messages = { root: [msg("m1", "assistant")], child: [msg("m2", "assistant")] }
+    const parts = { m1: [toolPart("task", "child", { subagent_type: "general" })] }
+    const parents = buildFamilyParents(family, messages, parts)
+    expect(parents.get("child")).toBe("root")
+  })
+
+  it("ignores task parts that point outside the family", () => {
+    const family = new Set(["root"])
+    const messages = { root: [msg("m1", "assistant")] }
+    const parts = { m1: [toolPart("task", "orphan", { subagent_type: "general" })] }
+    expect(buildFamilyParents(family, messages, parts).size).toBe(0)
+  })
 })
 
 describe("buildFamilyLabels", () => {
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
index 909688ed72d..5181f537af1 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
+++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
@@ -1991,8 +1991,8 @@ body.am-wt-dragging-active * {
 
 .am-markdown-comment-button:hover,
 .am-markdown-comment-button:focus-visible {
-  color: var(--text-base);
-  background: var(--surface-interactive-base);
+  color: var(--vscode-button-foreground, var(--icon-invert-base, #fff));
+  background: var(--vscode-button-background, var(--button-primary-base, var(--icon-interactive-base)));
 }
 
 .am-markdown-line-number {
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx
index 998d610d579..9acf713193d 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx
@@ -67,19 +67,26 @@ interface AssistantMessageProps {
   feedback?: MessageFeedbackControls
 }
 
+type ToolStateProps = {
+  input?: Record<string, unknown>
+  metadata?: Record<string, unknown>
+  output?: string
+  status?: string
+}
+
 function TodoToolCard(props: { part: ToolPart }) {
   const render = ToolRegistry.render(props.part.tool)
-  const state = props.part.state as any
+  const state = () => props.part.state as ToolStateProps
   return (
     <Show when={render}>
       {(renderFn) => (
         <Dynamic
           component={renderFn()}
-          input={state?.input ?? {}}
-          metadata={state?.metadata ?? {}}
+          input={state()?.input ?? {}}
+          metadata={state()?.metadata ?? {}}
           tool={props.part.tool}
-          output={state?.output}
-          status={state?.status}
+          output={state()?.output}
+          status={state()?.status}
           defaultOpen
           reveal={false}
         />
@@ -90,23 +97,23 @@ function TodoToolCard(props: { part: ToolPart }) {
 
 function BashToolCard(props: { part: ToolPart; defaultOpen: boolean }) {
   const render = ToolRegistry.render(props.part.tool)
-  const state = props.part.state as any
+  const state = () => props.part.state as ToolStateProps
   return (
     <Show when={render}>
       {(card) => (
         <Dynamic
           component={card() as unknown as Component<Record<string, unknown>>}
-          input={state?.input ?? {}}
-          metadata={state?.metadata ?? {}}
+          input={state()?.input ?? {}}
+          metadata={state()?.metadata ?? {}}
           partMetadata={props.part.metadata ?? {}}
           tool={props.part.tool}
           partID={props.part.id}
           callID={props.part.callID}
-          output={state?.output}
-          status={state?.status}
+          output={state()?.output}
+          status={state()?.status}
           defaultOpen={props.defaultOpen}
           animate
-          reveal={state?.status === "pending" || state?.status === "running"}
+          reveal={state()?.status === "pending" || state()?.status === "running"}
         />
       )}
     </Show>
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
index 30bb1a56af8..3ff6d7650bb 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
@@ -934,6 +934,12 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
             <Show when={ghost.text()}>
               <span class="prompt-input-ghost-text">{ghost.text()}</span>
             </Show>
+            {/* A <div> with white-space: pre-wrap collapses a trailing newline,
+                but a <textarea> renders it as a real empty line. This <br> is
+                added in that case so the overlay and textarea heights match. */}
+            <Show when={text().endsWith("\n")}>
+              <br />
+            </Show>
           </div>
           <textarea
             ref={textareaRef}
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
index 409bc62bbcb..e04f51dc7d3 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
@@ -78,6 +78,14 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
     return undefined
   })
 
+  const hasTimeline = createMemo(() => {
+    for (const m of session.messages()) {
+      if (m.role !== "assistant") continue
+      if (session.getParts(m.id).some((p) => p.type !== "step-start")) return true
+    }
+    return false
+  })
+
   const fmtNum = (n: number): string => {
     if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`
     if (n >= 1_000) return `${(n / 1_000).toFixed(1)}K`
@@ -166,7 +174,7 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
         </div>
       </div>
       {/* Expanded graph section: timeline + context bar + token breakdown */}
-      <Show when={expanded() && session.messages().some((m) => m.role === "assistant")}>
+      <Show when={expanded() && hasTimeline()}>
         <div data-component="task-header-graph">
           <TaskTimeline />
           <div data-slot="task-header-graph-row">
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/VscodeSessionTurn.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/VscodeSessionTurn.tsx
index c4de848fa2a..c667615beae 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/VscodeSessionTurn.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/VscodeSessionTurn.tsx
@@ -122,11 +122,9 @@ export const VscodeSessionTurn: Component<VscodeSessionTurnProps> = (props) => {
           <Show when={!props.turn.partial}>
             <div
               class="vscode-session-turn-user"
-              data-revert-disabled={
-                assistantMessages().length > 0 && !session.revert() && session.status() !== "idle" ? "" : undefined
-              }
+              data-revert-disabled={assistantMessages().length > 0 && session.status() !== "idle" ? "" : undefined}
               title={
-                assistantMessages().length > 0 && !session.revert() && session.status() !== "idle"
+                assistantMessages().length > 0 && session.status() !== "idle"
                   ? language.t("revert.disabled.agentBusy")
                   : undefined
               }
@@ -138,7 +136,7 @@ export const VscodeSessionTurn: Component<VscodeSessionTurnProps> = (props) => {
                 queued={props.queued}
                 onFork={props.onForkMessage ? () => props.onForkMessage?.(msg().sessionID, msg().id) : undefined}
                 onRevert={
-                  assistantMessages().length > 0 && !session.revert()
+                  assistantMessages().length > 0
                     ? () => {
                         if (session.status() !== "idle") return
                         session.revertSession(msg().id)
diff --git a/packages/kilo-vscode/webview-ui/src/context/session-utils.ts b/packages/kilo-vscode/webview-ui/src/context/session-utils.ts
index 3506d2d07b9..2544246964a 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session-utils.ts
+++ b/packages/kilo-vscode/webview-ui/src/context/session-utils.ts
@@ -121,13 +121,14 @@ export function buildFamilyCosts(
   family: Set<string>,
   messages: Record<string, Array<{ role: string; cost?: number }>>,
   sessions: Record<string, { parentID?: string | null } | undefined>,
+  parents: Map<string, string> = new Map(),
 ): Map<string, number> {
   const totals = new Map<string, number>()
   for (const sid of family) totals.set(sid, calcTotalCost(messages[sid] ?? []))
 
   const own = new Map<string, number>(totals)
   for (const sid of family) {
-    const parent = sessions[sid]?.parentID
+    const parent = sessions[sid]?.parentID ?? parents.get(sid)
     if (!parent || !own.has(parent)) continue
     own.set(parent, (own.get(parent) ?? 0) - (totals.get(sid) ?? 0))
   }
@@ -139,6 +140,32 @@ export function buildFamilyCosts(
   return costs
 }
 
+/**
+ * Build child session ID -> parent session ID links from task tool metadata.
+ * This fills the gap when child messages are synced before their SessionInfo.
+ */
+export function buildFamilyParents(
+  family: Set<string>,
+  messages: Record<string, CostMessage[]>,
+  parts: Record<string, TaskPart[]>,
+): Map<string, string> {
+  const parents = new Map<string, string>()
+  for (const sid of family) {
+    const msgs = messages[sid]
+    if (!msgs) continue
+    for (const msg of msgs) {
+      const list = parts[msg.id]
+      if (!list) continue
+      for (const p of list) {
+        const child = childID(p)
+        if (!child || !family.has(child) || parents.has(child)) continue
+        parents.set(child, sid)
+      }
+    }
+  }
+  return parents
+}
+
 const LABEL_CAP = 24
 
 /**
diff --git a/packages/kilo-vscode/webview-ui/src/context/session.tsx b/packages/kilo-vscode/webview-ui/src/context/session.tsx
index 8ebe0d41edf..48695930192 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/session.tsx
@@ -39,6 +39,7 @@ import {
   computeStatus,
   calcContextUsage,
   buildFamilyCosts,
+  buildFamilyParents,
   buildFamilyLabels,
   buildCostBreakdown,
   childID,
@@ -1192,8 +1193,13 @@ export const SessionProvider: ParentComponent = (props) => {
             // Append text delta to text or reasoning parts
             ;(existing as { text: string }).text += delta.textDelta
           } else {
-            // Replace entire part
-            parts[effectiveMessageID][existingIndex] = part
+            // Preserve the proxy identity so Solid does not remount tool UI
+            // during streaming updates and restart pending animations.
+            const target = existing as unknown as Record<string, unknown>
+            for (const key of Object.keys(target)) {
+              if (!(key in part)) delete target[key]
+            }
+            Object.assign(existing, part)
           }
         } else {
           // Add new part
@@ -2190,14 +2196,16 @@ export const SessionProvider: ParentComponent = (props) => {
 
   /**
    * Per-session **own cost** — reads `store.messages` for per-session
-   * propagated totals and `store.sessions` for parent links so each
+   * propagated totals and task metadata as a fallback for parent links so each
    * session's entry excludes the cost already propagated up from its
    * descendants by the CLI backend.
    */
   const familyCosts = createMemo<Map<string, number>>(() => {
     const id = currentSessionID()
     if (!id) return new Map()
-    return buildFamilyCosts(sessionFamily(id), store.messages, store.sessions)
+    const family = sessionFamily(id)
+    const parents = buildFamilyParents(family, store.messages as any, store.parts as any)
+    return buildFamilyCosts(family, store.messages, store.sessions, parents)
   })
 
   /** Child session labels — only reads store.parts (not message costs). */
diff --git a/packages/opencode/CHANGELOG.md b/packages/opencode/CHANGELOG.md
index 0a02028f04a..5ada16acc9e 100644
--- a/packages/opencode/CHANGELOG.md
+++ b/packages/opencode/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @kilocode/cli
 
+## 7.2.50
+
 ## 7.2.49
 
 ### Patch Changes
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index cb35bba1d57..7395def6fdf 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "name": "@kilocode/cli",
   "type": "module",
   "license": "MIT",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 14b63c0e4d0..7a8da1e11d1 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/plugin",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/script/package.json b/packages/script/package.json
index c4d81d24013..d2c4bccf003 100644
--- a/packages/script/package.json
+++ b/packages/script/package.json
@@ -12,6 +12,6 @@
   "exports": {
     ".": "./src/index.ts"
   },
-  "version": "7.2.49",
+  "version": "7.2.50",
   "peerDependencies": {}
 }
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index f4d6092c657..ce44b4e9555 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/sdk",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index 5548ad1c5a7..b965b8127af 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -26,7 +26,7 @@
     "typescript": "catalog:",
     "vite": "catalog:"
   },
-  "version": "7.2.49",
+  "version": "7.2.50",
   "dependencies": {},
   "peerDependencies": {}
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 3490793a1b2..48cf18d8be6 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/ui",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/script/check-kilo-generated-artifacts.ts b/script/check-kilo-generated-artifacts.ts
new file mode 100644
index 00000000000..e7d377b0eef
--- /dev/null
+++ b/script/check-kilo-generated-artifacts.ts
@@ -0,0 +1,51 @@
+#!/usr/bin/env bun
+// kilocode_change - new file
+
+/**
+ * Guards generated Kilo config dependency artifacts.
+ *
+ * Kilo loads project config from .kilo/ and .kilocode/ and installs
+ * @kilocode/plugin there at runtime. npm writes package.json, lockfiles,
+ * .gitignore, and node_modules as generated local state. These paths must stay
+ * untracked so background installs do not create recurring branch diffs.
+ */
+
+import { spawnSync } from "node:child_process"
+
+const paths = [
+  ".kilo/.gitignore",
+  ".kilo/package.json",
+  ".kilo/package-lock.json",
+  ".kilo/pnpm-lock.yaml",
+  ".kilo/bun.lock",
+  ".kilo/yarn.lock",
+  ".kilo/node_modules",
+  ".kilocode/.gitignore",
+  ".kilocode/package.json",
+  ".kilocode/package-lock.json",
+  ".kilocode/pnpm-lock.yaml",
+  ".kilocode/bun.lock",
+  ".kilocode/yarn.lock",
+  ".kilocode/node_modules",
+]
+
+const git = spawnSync("git", ["ls-files", "-z", "--", ...paths], { encoding: "utf8" })
+
+if (git.status !== 0) {
+  console.error(git.stderr.trim() || "git ls-files failed")
+  process.exit(1)
+}
+
+const bad = git.stdout.split("\0").filter(Boolean).sort()
+
+if (bad.length === 0) {
+  console.log("check-kilo-generated-artifacts: ok")
+  process.exit(0)
+}
+
+console.error("Generated Kilo config dependency artifacts are tracked:")
+for (const file of bad) console.error(`  ${file}`)
+console.error("")
+console.error("These files are created by runtime dependency installs in .kilo/ and .kilocode/.")
+console.error("Remove them from git and keep them ignored.")
+process.exit(1)
diff --git a/script/check-workflows.ts b/script/check-workflows.ts
index a7536cd0799..487b03f20a5 100644
--- a/script/check-workflows.ts
+++ b/script/check-workflows.ts
@@ -29,6 +29,7 @@ const DIR = path.join(ROOT, ".github", "workflows")
 const active = new Set([
   "auto-docs.yml",
   "beta.yml",
+  "check-kilo-generated-artifacts.yml",
   "check-md-table-padding.yml",
   "check-opencode-annotations.yml",
   "check-org-member.yml",
diff --git a/script/upstream/README.md b/script/upstream/README.md
index ed37cd23422..2024a11ad6b 100644
--- a/script/upstream/README.md
+++ b/script/upstream/README.md
@@ -243,7 +243,9 @@ Options:
   --dry-run              Show what would change without writing the file
 ```
 
-The command finds the newest upstream tag already merged into `HEAD`, reads that upstream version of the file, applies the same branding transforms used by upstream merge automation, strips existing `kilocode_change` markers from the current file, and adds fresh markers around the remaining lines that differ from upstream.
+The command finds the newest upstream tag already merged into `HEAD` (read from `.opencode-version` at the repo root, falling back to an `ls-remote` + `merge-base --is-ancestor` walk), reads that upstream version of the file, applies the same branding transforms used by upstream merge automation, strips existing `kilocode_change` markers from the current file, and adds fresh markers around the remaining lines that differ from upstream.
+
+The `.opencode-version` file is a single-line tag (e.g. `v1.14.33`) recorded by `merge.ts` after every successful upstream merge. Editing it by hand pins the "last merged" tag for the per-file commands above; delete it to fall back to the slower automatic discovery.
 
 ### reset-to-upstream.ts
 
diff --git a/script/upstream/merge.ts b/script/upstream/merge.ts
index 02933816c1f..0e1d9a5f1ec 100644
--- a/script/upstream/merge.ts
+++ b/script/upstream/merge.ts
@@ -33,11 +33,16 @@ import { skipFiles } from "./transforms/skip-files"
 import { transformConflictedI18n, transformAllI18n } from "./transforms/transform-i18n"
 // New transforms for auto-resolving more conflict types
 import { transformConflictedTakeTheirs, transformAllTakeTheirs } from "./transforms/transform-take-theirs"
-import { transformConflictedPackageJson, transformAllPackageJson } from "./transforms/transform-package-json"
+import {
+  transformConflictedPackageJson,
+  transformAllPackageJson,
+  reconcileAllPackageJson,
+} from "./transforms/transform-package-json"
 import { transformConflictedScripts, transformAllScripts } from "./transforms/transform-scripts"
 import { transformConflictedExtensions, transformAllExtensions } from "./transforms/transform-extensions"
 import { transformConflictedWeb, transformAllWeb } from "./transforms/transform-web"
 import { resolveLockFileConflicts, regenerateLockFiles } from "./transforms/lock-files"
+import { writeVersion } from "./utils/upstream"
 
 interface MergeOptions {
   version?: string
@@ -421,6 +426,15 @@ async function main() {
   await git.createBranch(opencodeBranch)
   logger.info(`Created opencode branch: ${opencodeBranch}`)
 
+  const prior = await git.findLatestCompatCommit(config.baseBranch, targetVersion.commit)
+  if (prior) {
+    logger.info(
+      `Found previous compatibility base: ${prior.message} (${prior.commit.slice(0, 8)}) from upstream ${prior.upstream.slice(0, 8)}`,
+    )
+  } else {
+    logger.warn("No previous compatibility base found; merge base will remain pristine upstream")
+  }
+
   // Step 6: Apply ALL transformations to opencode branch (pre-merge)
   // This reduces conflicts by transforming upstream code to Kilo conventions BEFORE merging
   logger.step(6, 8, "Applying transformations to opencode branch (pre-merge)...")
@@ -499,6 +513,11 @@ async function main() {
   const keepOursResults = await resetToOurs(config.keepOurs, { dryRun: false, verbose: options.verbose })
   logger.success(`Reset ${keepOursResults.length} files to Kilo's version`)
 
+  // 6k. Record the last merged upstream tag so future automation can find it
+  // without walking ls-remote + isAncestor for every tag.
+  const versionFile = await writeVersion(targetVersion.tag)
+  logger.success(`Recorded ${targetVersion.tag} in ${versionFile.split("/").pop()}`)
+
   // Clean untracked build artifacts from Kilo-specific directories.
   // These packages don't exist in upstream, so their .gitignore files are absent
   // on the opencode branch. Artifacts like bin/, out/, .next/ etc. would otherwise
@@ -508,13 +527,25 @@ async function main() {
 
   // Commit all transformations
   await git.stageAll()
-  await git.commit(`refactor: kilo compat for ${targetVersion.tag}`)
+  const compatMessage = `refactor: kilo compat for ${targetVersion.tag}`
+  if (prior) {
+    const tree = await git.writeTree()
+    const commit = await git.createCommit(tree, compatMessage, prior.commit)
+    await git.updateBranch(opencodeBranch, commit)
+    await git.checkout(opencodeBranch)
+  } else {
+    await git.commit(compatMessage)
+  }
   logger.success("Committed pre-merge transformations")
 
   // Step 7: Merge into Kilo branch
   logger.step(7, 8, "Merging into Kilo branch...")
 
   await git.checkout(kiloBranch)
+  if (prior) {
+    const linked = await git.recordAncestor(targetVersion.commit, `merge: record upstream ${targetVersion.tag}`)
+    if (linked) logger.info(`Recorded upstream ${targetVersion.tag} as Kilo branch ancestry`)
+  }
   const mergeResult = await git.merge(opencodeBranch)
 
   if (!mergeResult.success) {
@@ -707,6 +738,24 @@ async function main() {
       }
     }
 
+    // Reconcile every package.json that the merge touched, regardless of
+    // whether it was conflicted, auto-resolved by rerere, or merged textually.
+    // rerere can replay stale resolutions that bypass our package.json
+    // transform entirely, so always run our merge logic as the final word for
+    // package.json content. Skip files that are still conflicted so the user
+    // can resolve them manually instead of silently overwriting markers.
+    const stillConflicted = new Set(await git.getConflictedFiles())
+    const reconcileResults = await reconcileAllPackageJson({
+      oursRef: baseSha,
+      theirsRef: opencodeBranch,
+      verbose: options.verbose,
+      skip: stillConflicted,
+    })
+    const reconcileCount = reconcileResults.filter((r) => r.action === "transformed" && r.changes.length > 0).length
+    if (reconcileCount > 0) {
+      logger.success(`Reconciled ${reconcileCount} package.json file(s) post-merge`)
+    }
+
     // Check remaining conflicts
     const remaining = await git.getConflictedFiles()
     // Combine git-reported conflicts with files flagged due to kilocode_change markers
@@ -764,6 +813,17 @@ async function main() {
     }
   } else {
     logger.success("Merge completed without conflicts!")
+    // Same reconcile pass as the conflict path: ensure rerere or git's textual
+    // merge can't slip stale package.json resolutions through.
+    const reconcileResults = await reconcileAllPackageJson({
+      oursRef: baseSha,
+      theirsRef: opencodeBranch,
+      verbose: options.verbose,
+    })
+    const reconcileCount = reconcileResults.filter((r) => r.action === "transformed" && r.changes.length > 0).length
+    if (reconcileCount > 0) {
+      logger.success(`Reconciled ${reconcileCount} package.json file(s) post-merge`)
+    }
     await git.stageAll()
     const hasChanges = await git.hasUncommittedChanges()
     if (hasChanges) {
diff --git a/script/upstream/package.json b/script/upstream/package.json
index a95ee1b8219..6a814f90525 100644
--- a/script/upstream/package.json
+++ b/script/upstream/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/upstream-merge",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "private": true,
   "type": "module",
   "description": "Scripts for automating upstream opencode merges into Kilo",
diff --git a/script/upstream/transforms/transform-package-json.test.ts b/script/upstream/transforms/transform-package-json.test.ts
new file mode 100644
index 00000000000..a239bcc5edf
--- /dev/null
+++ b/script/upstream/transforms/transform-package-json.test.ts
@@ -0,0 +1,116 @@
+import { expect, test } from "bun:test"
+import { fixCatalog, fixScripts, mergeWithNewestVersions } from "./transform-package-json"
+
+test("fixScripts preserves Kilo-only root scripts from base", () => {
+  const ours = {
+    scripts: {
+      "dev-setup": "kilo dev-setup",
+      "postinstall": "bun run --cwd packages/opencode fix-node-pty && bun run script/setup-git.ts",
+      "extension": "bun --cwd packages/kilo-vscode script/launch.ts",
+    },
+  }
+  const pkg: Record<string, unknown> = {
+    scripts: { postinstall: "bun run --cwd packages/opencode fix-node-pty" },
+  }
+  const changes: string[] = []
+  fixScripts(pkg, "package.json", ours, changes)
+  const scripts = pkg.scripts as Record<string, string>
+  expect(scripts.postinstall).toBe(ours.scripts.postinstall)
+  expect(scripts["dev-setup"]).toBe(ours.scripts["dev-setup"])
+  expect(scripts.extension).toBe(ours.scripts.extension)
+  expect(changes.some((c) => c.includes("postinstall"))).toBe(true)
+  expect(changes.some((c) => c.includes("dev-setup"))).toBe(true)
+})
+
+test("fixScripts removes upstream-only dead scripts from root", () => {
+  const pkg: Record<string, unknown> = {
+    scripts: {
+      "dev": "bun run --cwd packages/opencode src/index.ts",
+      "dev:desktop": "bun --cwd packages/desktop-electron dev",
+      "dev:web": "bun --cwd packages/app dev",
+      "dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",
+    },
+  }
+  const changes: string[] = []
+  fixScripts(pkg, "package.json", null, changes)
+  const scripts = pkg.scripts as Record<string, string>
+  expect(scripts.dev).toBeDefined()
+  expect(scripts["dev:desktop"]).toBeUndefined()
+  expect(scripts["dev:web"]).toBeUndefined()
+  expect(scripts["dev:console"]).toBeUndefined()
+  expect(changes.length).toBe(3)
+})
+
+test("fixScripts preserves opencode test scripts", () => {
+  const ours = { scripts: { test: "bun test", "test:ci": "bun test --ci" } }
+  const pkg: Record<string, unknown> = { scripts: { test: "vitest" } }
+  const changes: string[] = []
+  fixScripts(pkg, "packages/opencode/package.json", ours, changes)
+  const scripts = pkg.scripts as Record<string, string>
+  expect(scripts.test).toBe("bun test")
+  expect(scripts["test:ci"]).toBe("bun test --ci")
+})
+
+test("fixScripts leaves unknown packages untouched", () => {
+  const pkg: Record<string, unknown> = { scripts: { build: "tsc" } }
+  const changes: string[] = []
+  fixScripts(pkg, "packages/some-unknown/package.json", null, changes)
+  expect((pkg.scripts as Record<string, string>).build).toBe("tsc")
+  expect(changes.length).toBe(0)
+})
+
+test("fixCatalog removes upstream-only desktop sentry entries", () => {
+  const pkg: Record<string, unknown> = {
+    workspaces: {
+      catalog: {
+        "@sentry/solid": "10.36.0",
+        "@sentry/vite-plugin": "4.6.0",
+        "solid-js": "1.9.12",
+      },
+    },
+  }
+  const changes: string[] = []
+  fixCatalog(pkg, "package.json", changes)
+  const cat = (pkg.workspaces as { catalog: Record<string, string> }).catalog
+  expect(cat["@sentry/solid"]).toBeUndefined()
+  expect(cat["@sentry/vite-plugin"]).toBeUndefined()
+  expect(cat["solid-js"]).toBe("1.9.12")
+  expect(changes.length).toBe(2)
+})
+
+test("fixCatalog is a no-op when catalog is absent", () => {
+  const pkg: Record<string, unknown> = {}
+  const changes: string[] = []
+  fixCatalog(pkg, "package.json", changes)
+  expect(changes.length).toBe(0)
+})
+
+test("mergeWithNewestVersions preserves ours' key order so kilo-only deps don't relocate", () => {
+  // Regression: when ours has a kilo-only dep in the middle (e.g. rotating-file-stream
+  // alphabetically between npm-package-arg and semver) and theirs lacks it, the merge
+  // result must keep that key in its original position. Previously this function
+  // started from theirs' keys and appended ours-only keys at the end, causing git's
+  // textual 3-way merge to produce a duplicate JSON key.
+  const ours = {
+    "npm-package-arg": "13.0.2",
+    "rotating-file-stream": "3.2.9",
+    semver: "^7.6.3",
+    zod: "catalog:",
+  }
+  const theirs = {
+    "npm-package-arg": "13.0.2",
+    semver: "^7.6.3",
+    zod: "catalog:",
+  }
+  const changes: string[] = []
+  const result = mergeWithNewestVersions(ours, theirs, changes, "dependencies")
+  expect(Object.keys(result)).toEqual(["npm-package-arg", "rotating-file-stream", "semver", "zod"])
+})
+
+test("mergeWithNewestVersions appends theirs-only keys at the end", () => {
+  const ours = { a: "1.0.0", b: "1.0.0" }
+  const theirs = { a: "1.0.0", c: "1.0.0" }
+  const changes: string[] = []
+  const result = mergeWithNewestVersions(ours, theirs, changes, "dependencies")
+  expect(Object.keys(result)).toEqual(["a", "b", "c"])
+})
diff --git a/script/upstream/transforms/transform-package-json.ts b/script/upstream/transforms/transform-package-json.ts
index bbc812ea958..501786e1453 100644
--- a/script/upstream/transforms/transform-package-json.ts
+++ b/script/upstream/transforms/transform-package-json.ts
@@ -108,8 +108,14 @@ function compareVersions(a: string, b: string): number | null {
 /**
  * Merge two dependency objects using "newest wins" strategy
  * For non-comparable versions (URLs, catalog:, workspace:*), upstream (theirs) wins
+ *
+ * Key order preserves ours' order first (so kilo-only deps stay in their
+ * original position), then appends theirs-only keys at the end. This avoids
+ * relocating existing keys, which would otherwise let git's textual merge
+ * produce duplicate JSON keys (ours keeps the line in place, theirs appears
+ * to "add" the same key elsewhere → both survive the merge).
  */
-function mergeWithNewestVersions(
+export function mergeWithNewestVersions(
   ours: Record<string, string> | undefined,
   theirs: Record<string, string> | undefined,
   changes: string[],
@@ -117,38 +123,38 @@ function mergeWithNewestVersions(
 ): Record<string, string> {
   const result: Record<string, string> = {}
 
-  // Start with all of theirs
-  if (theirs) {
-    for (const [name, version] of Object.entries(theirs)) {
-      result[name] = version
+  // Seed with ours' keys in ours' order, applying newest-wins per key.
+  if (ours) {
+    for (const [name, ourVersion] of Object.entries(ours)) {
+      const theirVersion = theirs?.[name]
+      if (theirVersion === undefined) {
+        result[name] = ourVersion
+        changes.push(`${section}: preserved ${name}@${ourVersion} (kilo-only)`)
+        continue
+      }
+      if (ourVersion === theirVersion) {
+        result[name] = theirVersion
+        continue
+      }
+      const cmp = compareVersions(ourVersion, theirVersion)
+      if (cmp === null) {
+        result[name] = theirVersion
+        changes.push(`${section}: ${name} kept upstream ${theirVersion} (special format)`)
+      } else if (cmp > 0) {
+        result[name] = ourVersion
+        changes.push(`${section}: ${name} ${theirVersion} -> ${ourVersion} (kilo newer)`)
+      } else {
+        result[name] = theirVersion
+        if (cmp < 0) changes.push(`${section}: ${name} kept upstream ${theirVersion} (upstream newer)`)
+      }
     }
   }
 
-  // Merge in ours, keeping newer versions
-  if (ours) {
-    for (const [name, ourVersion] of Object.entries(ours)) {
-      const theirVersion = result[name]
-
-      if (!theirVersion) {
-        // Dependency only exists in ours - keep it
-        result[name] = ourVersion
-        changes.push(`${section}: preserved ${name}@${ourVersion} (kilo-only)`)
-      } else if (ourVersion !== theirVersion) {
-        // Both have it with different versions - compare
-        const comparison = compareVersions(ourVersion, theirVersion)
-
-        if (comparison === null) {
-          // Can't compare (special format) - upstream wins per user preference
-          changes.push(`${section}: ${name} kept upstream ${theirVersion} (special format)`)
-        } else if (comparison > 0) {
-          // Ours is newer
-          result[name] = ourVersion
-          changes.push(`${section}: ${name} ${theirVersion} -> ${ourVersion} (kilo newer)`)
-        } else if (comparison < 0) {
-          // Theirs is newer - already in result
-          changes.push(`${section}: ${name} kept upstream ${theirVersion} (upstream newer)`)
-        }
-        // If equal, keep theirs (already in result)
+  // Append any theirs-only keys at the end, preserving theirs' relative order.
+  if (theirs) {
+    for (const [name, version] of Object.entries(theirs)) {
+      if (result[name] === undefined) {
+        result[name] = version
       }
     }
   }
@@ -169,6 +175,17 @@ export interface PackageJsonOptions {
   preserveVersion?: boolean
 }
 
+export interface ReconcileOptions extends PackageJsonOptions {
+  oursRef: string
+  theirsRef: string
+  /**
+   * Files to skip (e.g. still-conflicted files where the user is going to
+   * resolve manually). The reconciler would otherwise overwrite the conflict
+   * markers and silently auto-resolve.
+   */
+  skip?: Set<string>
+}
+
 // Package name mappings
 const PACKAGE_NAME_MAP: Record<string, string> = {
   "opencode-ai": "@kilocode/cli",
@@ -204,6 +221,69 @@ const TRANSFORM_PACKAGE_NAMES: Record<string, string> = {
   "packages/sdk/js/package.json": "@kilocode/sdk",
 }
 
+// Kilo-specific scripts to preserve from the base branch per package.json.
+// Upstream's version wholesale-replaces the scripts block, so anything listed
+// here gets re-applied from ours after taking theirs.
+const PRESERVE_SCRIPTS: Record<string, string[]> = {
+  "package.json": ["extension", "changeset", "changeset:version", "dev-setup", "postinstall"],
+  "packages/opencode/package.json": ["test", "test:ci"],
+}
+
+// Upstream-only scripts to delete per package.json. These reference packages
+// Kilo doesn't ship (desktop-electron, console/app, app) and would otherwise
+// reappear on every merge.
+const DELETE_UPSTREAM_SCRIPTS: Record<string, string[]> = {
+  "package.json": ["dev:desktop", "dev:web", "dev:console"],
+}
+
+// Upstream-only catalog entries to delete per package.json. These are pulled
+// in by upstream features (e.g. desktop Sentry integration) that Kilo doesn't
+// ship, so they add install weight with zero consumers in our tree.
+const DELETE_UPSTREAM_CATALOG: Record<string, string[]> = {
+  "package.json": ["@sentry/solid", "@sentry/vite-plugin"],
+}
+
+/**
+ * Re-apply Kilo-specific scripts on top of the upstream-shaped scripts block,
+ * and prune upstream-only scripts that target packages Kilo doesn't ship.
+ */
+export function fixScripts(pkg: Record<string, unknown>, path: string, ours: Record<string, unknown> | null, changes: string[]): void {
+  const theirs = (pkg.scripts as Record<string, string> | undefined) || {}
+  const oursScripts = (ours?.scripts as Record<string, string> | undefined) || {}
+
+  for (const name of PRESERVE_SCRIPTS[path] || []) {
+    const val = oursScripts[name]
+    if (val && theirs[name] !== val) {
+      theirs[name] = val
+      changes.push(`scripts.${name}: preserved from base`)
+    }
+  }
+
+  for (const name of DELETE_UPSTREAM_SCRIPTS[path] || []) {
+    if (theirs[name]) {
+      delete theirs[name]
+      changes.push(`scripts.${name}: removed (upstream-only, no Kilo target)`)
+    }
+  }
+
+  if (Object.keys(theirs).length > 0) pkg.scripts = theirs
+}
+
+/**
+ * Prune upstream-only catalog entries that have no consumers in Kilo.
+ */
+export function fixCatalog(pkg: Record<string, unknown>, path: string, changes: string[]): void {
+  const ws = pkg.workspaces as { catalog?: Record<string, string> } | undefined
+  const cat = ws?.catalog
+  if (!cat) return
+  for (const name of DELETE_UPSTREAM_CATALOG[path] || []) {
+    if (cat[name]) {
+      delete cat[name]
+      changes.push(`workspaces.catalog.${name}: removed (upstream-only, no Kilo consumer)`)
+    }
+  }
+}
+
 /**
  * Check if file is a package.json
  */
@@ -358,46 +438,7 @@ export async function transformPackageJson(file: string, options: PackageJsonOpt
         changes.push(`workspaces.packages: preserved Kilo's workspace configuration`)
       }
 
-      const ourScripts = ourPkg.scripts as Record<string, string> | undefined
-      if (relativePath === "package.json" && ourScripts?.extension && pkg.scripts?.extension !== ourScripts.extension) {
-        pkg.scripts = pkg.scripts || {}
-        pkg.scripts.extension = ourScripts.extension
-        changes.push(`scripts.extension: preserved Kilo's extension script`)
-      }
-      if (relativePath === "package.json" && ourScripts?.changeset && pkg.scripts?.changeset !== ourScripts.changeset) {
-        pkg.scripts = pkg.scripts || {}
-        pkg.scripts.changeset = ourScripts.changeset
-        changes.push(`scripts.changeset: preserved Kilo's changeset script`)
-      }
-      if (
-        relativePath === "package.json" &&
-        ourScripts?.["changeset:version"] &&
-        pkg.scripts?.["changeset:version"] !== ourScripts["changeset:version"]
-      ) {
-        pkg.scripts = pkg.scripts || {}
-        pkg.scripts["changeset:version"] = ourScripts["changeset:version"]
-        changes.push(`scripts.changeset:version: preserved Kilo's changeset:version script`)
-      }
-
-      // Preserve Kilo's test runner scripts for packages/opencode
-      if (
-        relativePath === "packages/opencode/package.json" &&
-        ourScripts?.test &&
-        pkg.scripts?.test !== ourScripts.test
-      ) {
-        pkg.scripts = pkg.scripts || {}
-        pkg.scripts.test = ourScripts.test
-        changes.push(`scripts.test: preserved Kilo's test runner script`)
-      }
-      if (
-        relativePath === "packages/opencode/package.json" &&
-        ourScripts?.["test:ci"] &&
-        pkg.scripts?.["test:ci"] !== ourScripts["test:ci"]
-      ) {
-        pkg.scripts = pkg.scripts || {}
-        pkg.scripts["test:ci"] = ourScripts["test:ci"]
-        changes.push(`scripts.test:ci: preserved Kilo's CI test runner script`)
-      }
+      fixScripts(pkg, relativePath, ourPkg, changes)
 
       // Merge catalog with "newest wins" strategy
       if (ourWorkspaces?.catalog || theirWorkspaces?.catalog) {
@@ -409,6 +450,8 @@ export async function transformPackageJson(file: string, options: PackageJsonOpt
           "workspaces.catalog",
         )
       }
+
+      fixCatalog(pkg, relativePath, changes)
     }
 
     // 7. Transform dependency names (opencode -> kilo)
@@ -617,28 +660,7 @@ export async function transformAllPackageJson(options: PackageJsonOptions = {}):
           changes.push(`workspaces.packages: preserved Kilo's workspace configuration`)
         }
 
-        const kiloScripts = kiloPkg.scripts as Record<string, string> | undefined
-        if (path === "package.json" && kiloScripts?.extension && pkg.scripts?.extension !== kiloScripts.extension) {
-          pkg.scripts = pkg.scripts || {}
-          pkg.scripts.extension = kiloScripts.extension
-          changes.push(`scripts.extension: preserved Kilo's extension script`)
-        }
-
-        // Preserve Kilo's test runner scripts for packages/opencode
-        if (path === "packages/opencode/package.json" && kiloScripts?.test && pkg.scripts?.test !== kiloScripts.test) {
-          pkg.scripts = pkg.scripts || {}
-          pkg.scripts.test = kiloScripts.test
-          changes.push(`scripts.test: preserved Kilo's test runner script`)
-        }
-        if (
-          path === "packages/opencode/package.json" &&
-          kiloScripts?.["test:ci"] &&
-          pkg.scripts?.["test:ci"] !== kiloScripts["test:ci"]
-        ) {
-          pkg.scripts = pkg.scripts || {}
-          pkg.scripts["test:ci"] = kiloScripts["test:ci"]
-          changes.push(`scripts.test:ci: preserved Kilo's CI test runner script`)
-        }
+        fixScripts(pkg, path, kiloPkg, changes)
 
         // Merge catalog with "newest wins" strategy
         if (kiloWorkspaces?.catalog || upstreamWorkspaces?.catalog) {
@@ -650,6 +672,8 @@ export async function transformAllPackageJson(options: PackageJsonOptions = {}):
             "workspaces.catalog",
           )
         }
+
+        fixCatalog(pkg, path, changes)
       }
 
       // 7. Transform dependency names (opencode -> kilo)
@@ -716,6 +740,235 @@ export async function transformAllPackageJson(options: PackageJsonOptions = {}):
   return results
 }
 
+/**
+ * Reconcile a single package.json after a merge has finished, regardless of
+ * whether it was conflicted or auto-resolved (by rerere or git's textual
+ * merge). Reads ours from `oursRef` and theirs from `theirsRef`, then applies
+ * the same merge logic used for conflict resolution and writes the result to
+ * the working tree. Stages the file.
+ *
+ * This is needed because rerere can replay stale resolutions for files like
+ * `package.json` that include cosmetic reordering — those resolutions bypass
+ * `transformConflictedPackageJson` entirely. Running this reconciler after
+ * the merge guarantees our merge logic always wins.
+ *
+ * Returns "skipped" if neither side touched the file (or both sides match) so
+ * callers can avoid unnecessary churn. Returns "flagged" if ours has
+ * kilocode_change markers (manual review needed).
+ */
+export async function reconcilePackageJsonFromRefs(
+  file: string,
+  options: ReconcileOptions,
+): Promise<PackageJsonResult> {
+  const changes: string[] = []
+  const dryRun = options.dryRun ?? false
+
+  if (await oursHasKilocodeChanges(file)) {
+    warn(`${file} has kilocode_change markers — skipping reconcile, needs manual resolution`)
+    return { file, action: "flagged", changes: [], dryRun }
+  }
+
+  let ourPkg: Record<string, unknown> | null = null
+  try {
+    const ourContent = await $`git show ${options.oursRef}:${file}`.text()
+    ourPkg = JSON.parse(ourContent)
+  } catch {
+    // file didn't exist in ours - that's fine
+  }
+
+  let pkg: Record<string, unknown> | null = null
+  try {
+    const theirContent = await $`git show ${options.theirsRef}:${file}`.text()
+    pkg = JSON.parse(theirContent)
+  } catch {
+    // file didn't exist in theirs either - nothing to reconcile
+  }
+
+  if (!pkg) {
+    if (!ourPkg) return { file, action: "skipped", changes: [], dryRun }
+    pkg = JSON.parse(JSON.stringify(ourPkg))
+  }
+
+  const relativePath = file.replace(process.cwd() + "/", "")
+  const newName = TRANSFORM_PACKAGE_NAMES[relativePath]
+  if (newName && pkg.name !== newName) {
+    changes.push(`name: ${pkg.name} -> ${newName}`)
+    pkg.name = newName
+  }
+
+  if (options.preserveVersion !== false) {
+    const kiloVersion = await getCurrentVersion()
+    if (pkg.version !== kiloVersion) {
+      changes.push(`version: ${pkg.version} -> ${kiloVersion}`)
+      pkg.version = kiloVersion
+    }
+  }
+
+  if (ourPkg) {
+    pkg.dependencies = mergeWithNewestVersions(
+      ourPkg.dependencies as Record<string, string> | undefined,
+      pkg.dependencies as Record<string, string> | undefined,
+      changes,
+      "dependencies",
+    )
+    pkg.devDependencies = mergeWithNewestVersions(
+      ourPkg.devDependencies as Record<string, string> | undefined,
+      pkg.devDependencies as Record<string, string> | undefined,
+      changes,
+      "devDependencies",
+    )
+    pkg.peerDependencies = mergeWithNewestVersions(
+      ourPkg.peerDependencies as Record<string, string> | undefined,
+      pkg.peerDependencies as Record<string, string> | undefined,
+      changes,
+      "peerDependencies",
+    )
+
+    const ourOverrides = ourPkg.overrides as Record<string, string> | undefined
+    if (ourOverrides || pkg.overrides) {
+      pkg.overrides = mergeWithNewestVersions(
+        ourOverrides,
+        pkg.overrides as Record<string, string> | undefined,
+        changes,
+        "overrides",
+      )
+    }
+
+    const ourPatched = ourPkg.patchedDependencies as Record<string, string> | undefined
+    if (ourPatched) {
+      pkg.patchedDependencies = (pkg.patchedDependencies as Record<string, string>) || {}
+      const patched = pkg.patchedDependencies as Record<string, string>
+      for (const [name, patch] of Object.entries(ourPatched)) {
+        if (!patched[name]) {
+          patched[name] = patch
+          changes.push(`patchedDependencies: preserved ${name}`)
+        }
+      }
+    }
+
+    const ourRepo = ourPkg.repository
+    if (ourRepo && JSON.stringify(pkg.repository) !== JSON.stringify(ourRepo)) {
+      pkg.repository = ourRepo
+      changes.push(`repository: preserved Kilo's repository configuration`)
+    }
+
+    const ourWs = ourPkg.workspaces as { packages?: string[]; catalog?: Record<string, string> } | undefined
+    const theirWs = pkg.workspaces as { packages?: string[]; catalog?: Record<string, string> } | undefined
+
+    if (relativePath === "package.json" && ourWs?.packages) {
+      pkg.workspaces = (pkg.workspaces as Record<string, unknown>) || {}
+      ;(pkg.workspaces as { packages: string[] }).packages = ourWs.packages
+      changes.push(`workspaces.packages: preserved Kilo's workspace configuration`)
+    }
+
+    fixScripts(pkg, relativePath, ourPkg, changes)
+
+    if (ourWs?.catalog || theirWs?.catalog) {
+      pkg.workspaces = (pkg.workspaces as Record<string, unknown>) || {}
+      ;(pkg.workspaces as { catalog: Record<string, string> }).catalog = mergeWithNewestVersions(
+        ourWs?.catalog,
+        theirWs?.catalog,
+        changes,
+        "workspaces.catalog",
+      )
+    }
+
+    fixCatalog(pkg, relativePath, changes)
+  }
+
+  if (pkg.dependencies) {
+    const { result, changes: depChanges } = transformDependencies(pkg.dependencies as Record<string, string>)
+    pkg.dependencies = result
+    changes.push(...depChanges.map((c) => `dependencies: ${c}`))
+  }
+  if (pkg.devDependencies) {
+    const { result, changes: devChanges } = transformDependencies(pkg.devDependencies as Record<string, string>)
+    if (devChanges.length > 0) {
+      pkg.devDependencies = result
+      changes.push(...devChanges.map((c) => `devDependencies: ${c}`))
+    }
+  }
+  if (pkg.peerDependencies) {
+    const { result, changes: peerChanges } = transformDependencies(pkg.peerDependencies as Record<string, string>)
+    if (peerChanges.length > 0) {
+      pkg.peerDependencies = result
+      changes.push(...peerChanges.map((c) => `peerDependencies: ${c}`))
+    }
+  }
+
+  const kiloDeps = KILO_DEPENDENCIES[relativePath]
+  if (kiloDeps) {
+    pkg.dependencies = (pkg.dependencies as Record<string, string>) || {}
+    const deps = pkg.dependencies as Record<string, string>
+    for (const [name, version] of Object.entries(kiloDeps)) {
+      if (!deps[name]) {
+        deps[name] = version
+        changes.push(`injected: ${name}`)
+      }
+    }
+  }
+
+  const kiloBin = KILO_BIN[relativePath]
+  if (kiloBin) {
+    pkg.bin = kiloBin
+    changes.push(`bin: set Kilo bin entries`)
+  }
+
+  if (dryRun) {
+    info(`[DRY-RUN] Would reconcile ${file}: ${changes.length} changes`)
+    return { file, action: "transformed", changes, dryRun: true }
+  }
+
+  const newContent = JSON.stringify(pkg, null, 2) + "\n"
+  await Bun.write(file, newContent)
+  await $`git add ${file}`.quiet().nothrow()
+
+  if (changes.length > 0) {
+    success(`Reconciled ${file}: ${changes.length} changes`)
+    if (options.verbose) {
+      for (const change of changes) debug(`  - ${change}`)
+    }
+  }
+
+  return { file, action: "transformed", changes, dryRun: false }
+}
+
+/**
+ * Reconcile every package.json that differs between `oursRef` and `theirsRef`
+ * after a merge. This is meant to run after `git merge` (whether the merge
+ * was clean, conflict-resolved, or rerere-replayed) to ensure our merge logic
+ * is the source of truth for package.json content.
+ */
+export async function reconcileAllPackageJson(options: ReconcileOptions): Promise<PackageJsonResult[]> {
+  // Collect every package.json that differs in either direction so we cover
+  // upstream-only and kilo-only files alike.
+  const diffOurs = await $`git diff --name-only ${options.oursRef} -- '*package.json'`.text()
+  const diffTheirs = await $`git diff --name-only ${options.theirsRef} -- '*package.json'`.text()
+  const candidates = new Set<string>()
+  for (const line of [...diffOurs.split("\n"), ...diffTheirs.split("\n")]) {
+    const path = line.trim()
+    if (!path) continue
+    if (path.includes("node_modules")) continue
+    if (!path.endsWith("package.json")) continue
+    candidates.add(path)
+  }
+
+  const results: PackageJsonResult[] = []
+  for (const file of candidates) {
+    if (options.skip?.has(file)) {
+      results.push({ file, action: "skipped", changes: [], dryRun: options.dryRun ?? false })
+      continue
+    }
+    const f = Bun.file(file)
+    if (!(await f.exists())) {
+      // file was removed by the merge - nothing to reconcile
+      continue
+    }
+    results.push(await reconcilePackageJsonFromRefs(file, options))
+  }
+  return results
+}
+
 // CLI entry point
 if (import.meta.main) {
   const args = process.argv.slice(2)
diff --git a/script/upstream/utils/git.test.ts b/script/upstream/utils/git.test.ts
new file mode 100644
index 00000000000..b51dd35ea4a
--- /dev/null
+++ b/script/upstream/utils/git.test.ts
@@ -0,0 +1,110 @@
+import { afterEach, beforeEach, expect, test } from "bun:test"
+import { mkdtemp, rm } from "node:fs/promises"
+import { join } from "node:path"
+import { tmpdir } from "node:os"
+import { $ } from "bun"
+import {
+  createCommit,
+  findLatestCompatCommit,
+  getCommitHash,
+  getCommitParents,
+  isAncestor,
+  recordAncestor,
+  updateBranch,
+  writeTree,
+} from "./git"
+
+const cwd = process.cwd()
+let dir = ""
+
+async function commit(message: string) {
+  await $`git add -A`.quiet()
+  await $`git -c user.name=Test -c user.email=test@example.com commit -m ${message}`.quiet()
+  return getCommitHash("HEAD")
+}
+
+beforeEach(async () => {
+  dir = await mkdtemp(join(tmpdir(), "kilo-upstream-git-"))
+  process.chdir(dir)
+  await $`git init -b upstream`.quiet()
+  await $`git config user.name Test`.quiet()
+  await $`git config user.email test@example.com`.quiet()
+})
+
+afterEach(async () => {
+  process.chdir(cwd)
+  await rm(dir, { recursive: true, force: true })
+})
+
+test("finds previous compatibility commit for transformed base", async () => {
+  await Bun.write("brand.txt", "opencode A\n")
+  const old = await commit("release: v1.0.0")
+
+  await Bun.write("brand.txt", "opencode B\n")
+  const target = await commit("release: v1.0.1")
+  await $`git tag v1.0.1 ${target}`.quiet()
+
+  await $`git checkout -b main ${old}`.quiet()
+  await $`git tag v1.0.0 ${old}`.quiet()
+  await Bun.write("brand.txt", "kilo A\n")
+  const prior = await commit("refactor: kilo compat for v1.0.0")
+
+  const found = await findLatestCompatCommit("main", target)
+  expect(found?.commit).toBe(prior)
+  expect(found?.upstream).toBe(old)
+
+  await $`git checkout ${target}`.quiet()
+  await $`git checkout -b opencode-v1.0.1`.quiet()
+  await Bun.write("brand.txt", "kilo B\n")
+  await $`git add -A`.quiet()
+  const tree = await writeTree()
+  const next = await createCommit(tree, "refactor: kilo compat for v1.0.1", prior)
+  await updateBranch("opencode-v1.0.1", next)
+  const base = (await $`git merge-base main opencode-v1.0.1`.text()).trim()
+  expect(base).toBe(prior)
+  expect(await getCommitParents(next)).toEqual([prior])
+
+  await $`git checkout main`.quiet()
+  expect(await recordAncestor(target, "merge: record upstream v1.0.1")).toBe(true)
+  const link = await getCommitHash("HEAD")
+  expect(await getCommitParents(link)).toEqual([prior, target])
+  expect(await isAncestor(target, link)).toBe(true)
+
+  const linked = (await $`git merge-base main opencode-v1.0.1`.text()).trim()
+  expect(linked).toBe(prior)
+
+  await $`git merge opencode-v1.0.1`.quiet()
+  const head = await getCommitHash("HEAD")
+  expect(await getCommitParents(head)).toEqual([link, next])
+  expect(await isAncestor(target, head)).toBe(true)
+})
+
+test("finds previous compatibility commit when upstream tags diverge", async () => {
+  await Bun.write("brand.txt", "opencode 1.4.9\n")
+  const old = await commit("release: v1.4.9")
+  await $`git tag v1.4.9 ${old}`.quiet()
+
+  await $`git checkout -b release-30 ${old}`.quiet()
+  await Bun.write("brand.txt", "opencode 1.14.30\n")
+  const side = await commit("release: v1.14.30")
+  await $`git tag v1.14.30 ${side}`.quiet()
+
+  await $`git checkout -b release-31 ${old}`.quiet()
+  await Bun.write("brand.txt", "opencode 1.14.31\n")
+  const target = await commit("release: v1.14.31")
+  await $`git tag v1.14.31 ${target}`.quiet()
+
+  await $`git checkout -b main ${old}`.quiet()
+  await Bun.write("brand.txt", "kilo 1.4.9\n")
+  const ancient = await commit("refactor: kilo compat for v1.4.9")
+  await Bun.write("brand.txt", "kilo 1.14.30\n")
+  const prior = await commit("refactor: kilo compat for v1.14.30")
+
+  expect(await isAncestor(side, target)).toBe(false)
+  expect(await isAncestor(old, target)).toBe(true)
+
+  const found = await findLatestCompatCommit("main", target)
+  expect(found?.commit).toBe(prior)
+  expect(found?.upstream).toBe(side)
+  expect(found?.commit).not.toBe(ancient)
+})
diff --git a/script/upstream/utils/git.ts b/script/upstream/utils/git.ts
index 461cd712e4f..ab2c5693413 100644
--- a/script/upstream/utils/git.ts
+++ b/script/upstream/utils/git.ts
@@ -19,6 +19,18 @@ export interface RemoteInfo {
   url: string
 }
 
+export interface CompatBase {
+  commit: string
+  upstream: string
+  message: string
+}
+
+type Semver = readonly [number, number, number]
+
+interface Candidate extends CompatBase {
+  version: Semver
+}
+
 export async function getCurrentBranch(): Promise<string> {
   const result = await $`git rev-parse --abbrev-ref HEAD`.text()
   return result.trim()
@@ -181,6 +193,136 @@ export async function getCommitHash(ref: string): Promise<string> {
   return result.trim()
 }
 
+export async function getCommitParents(ref: string): Promise<string[]> {
+  const result = await $`git show --no-patch --format=%P ${ref}`.text()
+  return result
+    .trim()
+    .split(/\s+/)
+    .filter((parent) => parent.length > 0)
+}
+
+export async function writeTree(): Promise<string> {
+  const result = await $`git write-tree`.text()
+  return result.trim()
+}
+
+export async function createCommit(tree: string, message: string, parent: string): Promise<string> {
+  const result = await $`git commit-tree ${tree} -p ${parent} -m ${message}`.text()
+  return result.trim()
+}
+
+export async function updateBranch(name: string, commit: string): Promise<void> {
+  await $`git update-ref refs/heads/${name} ${commit}`
+}
+
+export async function recordAncestor(ref: string, message: string): Promise<boolean> {
+  if (await isAncestor(ref, "HEAD")) return false
+
+  const result = await $`git merge -s ours --no-ff ${ref} -m ${message}`.nothrow()
+  if (result.exitCode !== 0) {
+    throw new Error(`Failed to record ancestor ${ref}: ${result.stderr.toString()}`)
+  }
+  return true
+}
+
+async function compatUpstream(message: string): Promise<string | null> {
+  const tag = compatTag(message)
+  if (!tag) return null
+
+  const ref = `${tag}^{commit}`
+  const result = await $`git rev-parse ${ref}`.quiet().nothrow()
+  if (result.exitCode !== 0) return null
+  return result.stdout.toString().trim()
+}
+
+function compatTag(message: string): string | null {
+  const prefix = "refactor: kilo compat for "
+  if (!message.startsWith(prefix)) return null
+  return message.slice(prefix.length).trim().split(/\s+/)[0] ?? null
+}
+
+function parseSemver(value: string | undefined): Semver | null {
+  const match = value?.match(/^v?(\d+)\.(\d+)\.(\d+)$/)
+  if (!match) return null
+  const major = Number.parseInt(match[1] ?? "0", 10)
+  const minor = Number.parseInt(match[2] ?? "0", 10)
+  const patch = Number.parseInt(match[3] ?? "0", 10)
+  return [major, minor, patch]
+}
+
+function compareSemver(a: Semver, b: Semver): number {
+  for (const idx of [0, 1, 2] as const) {
+    if (a[idx] < b[idx]) return -1
+    if (a[idx] > b[idx]) return 1
+  }
+  return 0
+}
+
+function exists<T>(value: T | null): value is T {
+  return value !== null
+}
+
+async function targetSemver(ref: string): Promise<Semver | null> {
+  const tags = await getTagsForCommit(ref)
+  const tag = tags.find((item) => parseSemver(item) !== null)
+  const parsed = parseSemver(tag)
+  if (parsed) return parsed
+
+  const message = await getCommitMessage(ref)
+  const match = message.match(/\bv?\d+\.\d+\.\d+\b/)
+  return parseSemver(match?.[0])
+}
+
+async function candidate(line: string): Promise<Candidate | null> {
+  const [commit, message = ""] = line.split("\0")
+  if (!commit) return null
+
+  const version = parseSemver(compatTag(message) ?? undefined)
+  if (!version) return null
+
+  const upstream = (await compatUpstream(message)) ?? (await getCommitParents(commit))[0] ?? commit
+  return { commit, upstream, message, version }
+}
+
+export async function findLatestCompatCommit(base: string, target: string): Promise<CompatBase | null> {
+  const grep = "^refactor: kilo compat for "
+  const result = await $`git log --format=%H%x00%s --grep=${grep} ${base}`.quiet().nothrow()
+  if (result.exitCode !== 0) {
+    throw new Error(`Failed to search compatibility commits: ${result.stderr.toString()}`)
+  }
+
+  const lines = result.stdout
+    .toString()
+    .trim()
+    .split("\n")
+    .filter((line) => line.length > 0)
+
+  const targetVersion = await targetSemver(target)
+  if (targetVersion) {
+    const candidates = (await Promise.all(lines.map(candidate)))
+      .filter(exists)
+      .filter((item) => compareSemver(item.version, targetVersion) < 0)
+      .sort((a, b) => compareSemver(b.version, a.version))
+    const latest = candidates[0]
+    if (latest) return { commit: latest.commit, upstream: latest.upstream, message: latest.message }
+  }
+
+  for (const line of lines) {
+    const [commit, message = ""] = line.split("\0")
+    if (!commit) continue
+
+    const upstream = await compatUpstream(message)
+    if (upstream && (await isAncestor(upstream, target))) return { commit, upstream, message }
+
+    const parents = await getCommitParents(commit)
+    for (const parent of parents) {
+      if (await isAncestor(parent, target)) return { commit, upstream: parent, message }
+    }
+  }
+
+  return null
+}
+
 /**
  * Check if `commit` is an ancestor of `ref` (i.e. reachable from `ref`).
  * Uses `git merge-base --is-ancestor`, which exits 0 for yes, 1 for no.
diff --git a/script/upstream/utils/upstream.ts b/script/upstream/utils/upstream.ts
index 2ab0c1b3537..ab4107c40db 100644
--- a/script/upstream/utils/upstream.ts
+++ b/script/upstream/utils/upstream.ts
@@ -15,6 +15,12 @@ import { isAncestor } from "./git"
 const url = "https://github.com/anomalyco/opencode.git"
 const workflows = [".github/workflows/publish.yml", ".github/workflows/beta.yml"]
 
+/**
+ * Repo-relative path of the file that records the last merged upstream tag.
+ * Single line containing the upstream tag (e.g. `v1.14.33`).
+ */
+export const versionFile = ".opencode-version"
+
 export async function root() {
   return (await $`git rev-parse --show-toplevel`.text()).trim()
 }
@@ -39,6 +45,9 @@ export async function remote() {
 }
 
 export async function last(): Promise<VersionInfo> {
+  const recorded = await readVersionFile()
+  if (recorded) return recorded
+
   const source = await remote()
 
   info(`Fetching upstream tags from ${source}...`)
@@ -53,6 +62,59 @@ export async function last(): Promise<VersionInfo> {
   throw new Error("Could not find a merged upstream tag in HEAD")
 }
 
+/**
+ * Read the recorded last-merged upstream tag from `.opencode-version`. Returns
+ * null if the file is missing/empty, or if the recorded tag cannot be resolved
+ * to a commit (e.g. tags have not been fetched yet). Falls back to the
+ * isAncestor-based discovery in `last()`.
+ */
+async function readVersionFile(): Promise<VersionInfo | null> {
+  const repo = await root()
+  const file = Bun.file(`${repo}/${versionFile}`)
+  if (!(await file.exists())) return null
+
+  const tag = (await file.text()).trim()
+  if (!tag) return null
+
+  const version = parseVersion(tag)
+  if (!version) {
+    warn(`${versionFile} contains '${tag}' which is not a valid version tag; ignoring`)
+    return null
+  }
+
+  const commit = await resolveTag(tag)
+  if (!commit) return null
+
+  return { version, tag, commit }
+}
+
+async function resolveTag(tag: string): Promise<string | null> {
+  const local = await $`git rev-parse --verify --quiet ${tag}^{commit}`.quiet().nothrow()
+  if (local.exitCode === 0) return local.stdout.toString().trim()
+
+  const source = await remote()
+  info(`Tag ${tag} not present locally; fetching from ${source}...`)
+  const fetch = await $`git fetch ${source} tag ${tag} --no-tags`.quiet().nothrow()
+  if (fetch.exitCode !== 0) {
+    warn(`Failed to fetch tag ${tag}: ${fetch.stderr.toString()}`)
+    return null
+  }
+
+  const after = await $`git rev-parse --verify --quiet ${tag}^{commit}`.quiet().nothrow()
+  return after.exitCode === 0 ? after.stdout.toString().trim() : null
+}
+
+/**
+ * Record the merged upstream tag in `.opencode-version` so subsequent runs of
+ * `last()` resolve instantly without an `ls-remote` walk.
+ */
+export async function writeVersion(tag: string): Promise<string> {
+  const repo = await root()
+  const dest = `${repo}/${versionFile}`
+  await Bun.write(dest, `${tag}\n`)
+  return dest
+}
+
 export async function versions(source: string): Promise<VersionInfo[]> {
   const result = await $`git ls-remote --tags ${source}`.quiet().nothrow()
   if (result.exitCode !== 0) throw new Error(`Failed to list upstream tags: ${result.stderr.toString()}`)
diff --git a/sdks/vscode/package.json b/sdks/vscode/package.json
index daa7a4c99a5..bba10e139a8 100644
--- a/sdks/vscode/package.json
+++ b/sdks/vscode/package.json
@@ -2,7 +2,7 @@
   "name": "opencode",
   "displayName": "opencode",
   "description": "opencode for VS Code",
-  "version": "7.2.49",
+  "version": "7.2.50",
   "publisher": "sst-dev",
   "repository": {
     "type": "git",