Merged main into feat/use-sdk

script/beta.ts

@@ -89,11 +89,11 @@ async function main() {
     return
   }
 
-  console.log("Fetching latest dev branch...")
-  await $`git fetch origin dev`
+  console.log("Fetching latest main branch...")
+  await $`git fetch origin main`
 
-  console.log("Checking out beta branch...")
-  await $`git checkout -B beta origin/dev`
+  console.log("Checking out main branch...")
+  await $`git checkout -B beta origin/main`
 
   const applied: number[] = []
   const failed: FailedPR[] = []
@@ -177,7 +177,7 @@ async function main() {
   await $`git fetch origin beta`
 
   const localTree = await $`git rev-parse beta^{tree}`.text()
-  const remoteTrees = (await $`git log origin/dev..origin/beta --format=%T`.text()).split("\n")
+  const remoteTrees = (await $`git log origin/main..origin/beta --format=%T`.text()).split("\n")
 
   const matchIdx = remoteTrees.indexOf(localTree.trim())
   if (matchIdx !== -1) {

script/publish.ts

@@ -62,7 +62,7 @@ if (Script.release) {
     await $`git commit -am "release: v${Script.version}"`
     await $`git tag v${Script.version}`
     await $`git fetch origin`
-    await $`git cherry-pick HEAD..origin/dev`.nothrow()
+    await $`git cherry-pick HEAD..origin/main`.nothrow() // kilocode_change
     await $`git push origin HEAD --tags --no-verify --force-with-lease`
     await new Promise((resolve) => setTimeout(resolve, 5_000))
   }
@@ -79,5 +79,10 @@ await import(`../packages/sdk/js/script/publish.ts`)
 console.log("\n=== plugin ===\n")
 await import(`../packages/plugin/script/publish.ts`)
 
+// kilocode_change start
+console.log("\n=== vscode ===\n")
+await import(`../packages/kilo-vscode/script/publish.ts`)
+// kilocode_change end
+
 const dir = fileURLToPath(new URL("..", import.meta.url))
 process.chdir(dir)

script/upstream/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/upstream-merge",
-  "version": "7.0.32",
+  "version": "7.0.33",
   "private": true,
   "type": "module",
   "description": "Scripts for automating upstream opencode merges into Kilo",