diff --git a/RELEASING.md b/RELEASING.md
index ee2e8b465f8..437d34b1926 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -34,7 +34,7 @@ The `publish.yml` workflow runs four jobs sequentially:
 - Builds native binaries for **all supported platforms and architectures**:
   - Linux: x64, arm64 (glibc and musl), plus baseline (non-AVX2) variants
   - macOS: x64, arm64, plus baseline variants
-  - Windows: x64, plus baseline variant
+  - Windows: x64 (plus baseline variant), arm64
 - Patches ELF interpreters on Linux binaries for broad compatibility.
 - Creates platform archives (`.tar.gz` for Linux, `.zip` for macOS/Windows) and uploads them to the draft GitHub Release.
 - Uploads the `dist/` directory as a workflow artifact (`kilo-cli`) for subsequent jobs.
@@ -43,7 +43,7 @@ The `publish.yml` workflow runs four jobs sequentially:
 
 - Downloads the CLI artifacts from the previous job.
 - Runs `packages/kilo-vscode/script/build.ts` to build VSIX packages for all target platforms:
-  - `linux-x64`, `linux-arm64`, `alpine-x64`, `alpine-arm64`, `darwin-x64`, `darwin-arm64`, `win32-x64`
+  - `linux-x64`, `linux-arm64`, `alpine-x64`, `alpine-arm64`, `darwin-x64`, `darwin-arm64`, `win32-x64`, `win32-arm64`
 - Each VSIX bundles the platform-specific CLI binary.
 - Uploads the VSIX files as a workflow artifact (`kilo-vscode`).
 
diff --git a/packages/kilo-vscode/script/build.ts b/packages/kilo-vscode/script/build.ts
index 43d283ac7a5..ac0fe13dbde 100644
--- a/packages/kilo-vscode/script/build.ts
+++ b/packages/kilo-vscode/script/build.ts
@@ -30,6 +30,9 @@ const targets = [
   { target: "darwin-x64", cliDir: "@kilocode/cli-darwin-x64", binary: "kilo" },
   { target: "darwin-arm64", cliDir: "@kilocode/cli-darwin-arm64", binary: "kilo" },
   { target: "win32-x64", cliDir: "@kilocode/cli-windows-x64", binary: "kilo.exe" },
+  // kilocode_change start - added Windows ARM64 target
+  { target: "win32-arm64", cliDir: "@kilocode/cli-windows-arm64", binary: "kilo.exe" },
+  // kilocode_change end
 ]
 
 const binDir = join(import.meta.dir, "..", "bin")
diff --git a/packages/kilo-vscode/script/publish.ts b/packages/kilo-vscode/script/publish.ts
index f4d20b1bfc6..ec4fa0aebfb 100755
--- a/packages/kilo-vscode/script/publish.ts
+++ b/packages/kilo-vscode/script/publish.ts
@@ -13,7 +13,18 @@ if (!existsSync(outDir)) {
   throw new Error(`VSIX directory not found: ${outDir}`)
 }
 
-const targets = ["linux-x64", "linux-arm64", "alpine-x64", "alpine-arm64", "darwin-x64", "darwin-arm64", "win32-x64"]
+// kilocode_change start - added Windows ARM64 target
+const targets = [
+  "linux-x64",
+  "linux-arm64",
+  "alpine-x64",
+  "alpine-arm64",
+  "darwin-x64",
+  "darwin-arm64",
+  "win32-x64",
+  "win32-arm64",
+]
+// kilocode_change end
 
 const vsixFiles: string[] = []
 for (const target of targets) {
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index 7b4b30d6dbf..c2232e6b655 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -36,6 +36,7 @@
     "@parcel/watcher-linux-x64-glibc": "2.5.1",
     "@parcel/watcher-linux-x64-musl": "2.5.1",
     "@parcel/watcher-win32-x64": "2.5.1",
+    "@parcel/watcher-win32-arm64": "2.5.1",
     "@standard-schema/spec": "1.0.0",
     "@tsconfig/bun": "catalog:",
     "@types/babel__core": "7.20.5",
diff --git a/packages/opencode/script/build.ts b/packages/opencode/script/build.ts
index 264ab6af389..937505f43e9 100755
--- a/packages/opencode/script/build.ts
+++ b/packages/opencode/script/build.ts
@@ -117,6 +117,12 @@ const allTargets: {
     arch: "x64",
     avx2: false,
   },
+  // kilocode_change start - added Windows ARM64 target
+  {
+    os: "win32",
+    arch: "arm64",
+  },
+  // kilocode_change end
 ]
 
 const targets = singleFlag