Jelajahi Sumber

docs: update default branch references from dev to main

- Update AGENTS.md to reflect main as default branch
- Update GitHub Actions workflows to trigger on main branch
- Update publish scripts to cherry-pick from origin/main
- Update upstream merge scripts and documentation
- Update CONTRIBUTING.md links in PR standards workflow
- Fix disabled workflow and documentation links

All development commands (bun dev, npm run dev) and external services
(models.dev, ai-sdk.dev) remain unchanged as they are unrelated to branch names.
Mark IJbema 1 bulan lalu
induk
melakukan
9a0ac0c0ee

+ 1 - 1
.github/workflows/disabled/nix-desktop.yml.disabled

@@ -2,7 +2,7 @@ name: nix-desktop
 
 on:
   push:
-    branches: [dev]
+    branches: [main]
     paths:
       - "flake.nix"
       - "flake.lock"

+ 1 - 1
.github/workflows/docs-build.yml

@@ -2,7 +2,7 @@ name: docs-build
 
 on:
   push:
-    branches: [dev]
+    branches: [main]
     paths:
       - "packages/kilo-docs/**"
   pull_request:

+ 1 - 1
.github/workflows/docs-check-links.yml

@@ -2,7 +2,7 @@ name: Check Links
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
   pull_request:
   schedule:
     # Run daily at 9am UTC

+ 1 - 1
.github/workflows/nix-hashes.yml

@@ -6,7 +6,7 @@ permissions:
 on:
   workflow_dispatch:
   push:
-    branches: [dev]
+    branches: [main]
     paths:
       - "bun.lock"
       - "package.json"

+ 2 - 2
.github/workflows/pr-standards.yml

@@ -89,7 +89,7 @@ jobs:
 
             Where \`scope\` is the package name (e.g., \`app\`, \`desktop\`, \`kilo\`).
 
-            See [CONTRIBUTING.md](../blob/dev/CONTRIBUTING.md#pr-titles) for details.`);
+            See [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md#pr-titles) for details.`);
               return;
             }
 
@@ -132,7 +132,7 @@ jobs:
             1. Open an issue describing the bug/feature (if one doesn't exist)
             2. Add \`Fixes #<number>\` or \`Closes #<number>\` to this PR description
 
-            See [CONTRIBUTING.md](../blob/dev/CONTRIBUTING.md#issue-first-policy) for details.`);
+            See [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md#issue-first-policy) for details.`);
               return;
             }
 

+ 1 - 2
AGENTS.md

@@ -3,8 +3,7 @@
 Kilo CLI is an open source AI coding agent that generates code from natural language, automates tasks, and supports 500+ AI models.
 
 - ALWAYS USE PARALLEL TOOLS WHEN APPLICABLE.
-- The default branch in this repo is `dev`.
-- Local `main` ref may not exist; use `dev` or `origin/dev` for diffs.
+- The default branch in this repo is `main`.
 - Prefer automation: execute requested actions without confirmation unless blocked by missing info or safety/irreversibility.
 - You may be running in a git worktree. All changes must be made in your current working directory — never modify files in the main repo checkout.
 

+ 1 - 1
packages/kilo-vscode/docs/opencode-migration-plan.md

@@ -2,7 +2,7 @@
 
 ## Overview
 
-This extension is a **ground-up rebuild** of the [old Kilo Code extension](https://github.com/Kilo-Org/kilocode) using Kilo CLI as the backend. Rather than migrating the old extension's codebase, we started fresh with a Solid.js webview, a CLI server manager, and a message-based protocol between extension host and webview. This new extension lives in the [Kilo monorepo](https://github.com/Kilo-Org/kilo/tree/dev/packages/kilo-vscode).
+This extension is a **ground-up rebuild** of the [old Kilo Code extension](https://github.com/Kilo-Org/kilocode) using Kilo CLI as the backend. Rather than migrating the old extension's codebase, we started fresh with a Solid.js webview, a CLI server manager, and a message-based protocol between extension host and webview. This new extension lives in the [Kilo monorepo](https://github.com/Kilo-Org/kilo/tree/main/packages/kilo-vscode).
 
 This document tracks remaining work needed for feature parity with the old extension. Each feature links to its detailed parity requirement doc. Features sourced from the [GitHub project board](https://github.com/orgs/Kilo-Org/projects/25/views/1) include issue links.
 

+ 4 - 4
script/beta.ts

@@ -43,11 +43,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`
+  await $`git checkout -B beta origin/main`
 
   const applied: number[] = []
   const failed: FailedPR[] = []
@@ -80,7 +80,7 @@ async function main() {
         await $`git clean -fd`
       } catch {}
       failed.push({ number: pr.number, title: pr.title, reason: "Merge conflicts" })
-      await commentOnPR(pr.number, "Merge conflicts with dev branch")
+      await commentOnPR(pr.number, "Merge conflicts with main branch")
       continue
     }
 

+ 1 - 1
script/publish-start.ts

@@ -86,7 +86,7 @@ if (!Script.preview) {
   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()
   await $`git push origin HEAD --tags --no-verify --force-with-lease`
   await new Promise((resolve) => setTimeout(resolve, 5_000))
   // kilocode_change start - skip draft flag when KILO_SKIP_NOTES=1 (used by publish-stable.yml which doesn't have a publish-complete step)

+ 1 - 1
script/publish.ts

@@ -65,7 +65,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()
   await $`git push origin HEAD --tags --no-verify --force-with-lease`
   await new Promise((resolve) => setTimeout(resolve, 5_000))
   await $`gh release edit v${Script.version} --draft=false`

+ 9 - 9
script/upstream/README.md

@@ -212,7 +212,7 @@ The only remaining conflicts are files with **actual code differences** - files
 Options:
   --version <version>    Target upstream version (e.g., v1.1.49)
   --commit <hash>        Target upstream commit hash
-  --base-branch <name>   Base branch to merge into (default: dev)
+  --base-branch <name>   Base branch to merge into (default: main)
   --dry-run              Preview changes without applying them
   --no-push              Don't push branches to remote
   --report-only          Only generate conflict report
@@ -226,29 +226,29 @@ Options:
 Options:
   --version <version>    Target upstream version
   --commit <hash>        Target commit hash
-  --base-branch <name>   Base branch to analyze from (default: dev)
+  --base-branch <name>   Base branch to analyze from (default: main)
   --output <file>        Output file for report
 ```
 
 ## Using Custom Base Branches
 
-By default, upstream merges start from the `dev` branch. However, you can use `--base-branch` to start from a different branch. This is useful for:
+By default, upstream merges start from the `main` branch. However, you can use `--base-branch` to start from a different branch. This is useful for:
 
 ### Incremental Merges
 
 When working on multiple upstream versions, you can create a chain of merge PRs:
 
 ```bash
-# First merge: v1.1.44 into dev
+# First merge: v1.1.44 into main
 bun run merge.ts --version v1.1.44
 
-# Create PR: catrielmuller/kilo-opencode-v1.1.44 -> dev
+# Create PR: catrielmuller/kilo-opencode-v1.1.44 -> main
 
 # Second merge: v1.1.50 based on the previous PR (without waiting for approval)
 bun run merge.ts --version v1.1.50 --base-branch catrielmuller/kilo-opencode-v1.1.44
 
 # Create PR: catrielmuller/kilo-opencode-v1.1.50 -> catrielmuller/kilo-opencode-v1.1.44
-# OR: catrielmuller/kilo-opencode-v1.1.50 -> dev (once first PR is merged)
+# OR: catrielmuller/kilo-opencode-v1.1.50 -> main (once first PR is merged)
 ```
 
 ### Benefits
@@ -269,7 +269,7 @@ bun run merge.ts --version v1.1.50 --base-branch catrielmuller/kilo-opencode-v1.
 
 # 3. Create PR from catrielmuller/kilo-opencode-v1.1.50
 #    - Target: catrielmuller/kilo-opencode-v1.1.44 (if first PR not merged yet)
-#    - Target: dev (if first PR is already merged)
+#    - Target: main (if first PR is already merged)
 ```
 
 ## Manual Conflict Resolution
@@ -294,8 +294,8 @@ If something goes wrong:
 git branch | grep backup
 
 # Reset to backup
-git checkout dev
-git reset --hard backup/dev-<timestamp>
+git checkout main
+git reset --hard backup/main-<timestamp>
 ```
 
 ## Adding New Transformations

+ 1 - 1
script/upstream/merge.ts

@@ -10,7 +10,7 @@
  * Options:
  *   --version <version>  Target upstream version (e.g., v1.1.49)
  *   --commit <hash>      Target upstream commit hash
- *   --base-branch <name> Base branch to merge into (default: dev)
+ *   --base-branch <name> Base branch to merge into (default: main)
  *   --dry-run            Preview changes without applying them
  *   --no-push            Don't push branches to remote
  *   --report-only        Only generate conflict report, don't merge

+ 3 - 3
script/upstream/transforms/transform-package-json.ts

@@ -430,12 +430,12 @@ export async function transformConflictedPackageJson(
 }
 
 /**
- * Get Kilo's package.json from the base branch (dev) for comparison
+ * Get Kilo's package.json from the base branch (main) for comparison
  * Used during pre-merge to compare upstream versions against Kilo's versions
  */
-async function getKiloPackageJson(path: string, baseBranch = "dev"): Promise<Record<string, unknown> | null> {
+async function getKiloPackageJson(path: string, baseBranch = "main"): Promise<Record<string, unknown> | null> {
   try {
-    // Try to get the file from origin/dev (or whatever base branch)
+    // Try to get the file from origin/main (or whatever base branch)
     const content = await $`git show origin/${baseBranch}:${path}`.text()
     return JSON.parse(content)
   } catch {

+ 1 - 1
script/upstream/utils/config.ts

@@ -211,7 +211,7 @@ export const defaultConfig: MergeConfig = {
     "**/yarn.lock",
   ],
 
-  baseBranch: "dev",
+  baseBranch: "main",
   branchPrefix: "upstream-merge",
   upstreamRemote: "upstream",
   originRemote: "origin",