diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index da1a2834a49..b2655cabae6 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,5 +1,6 @@
 name: Bug report
 description: Report an issue that should be fixed
+labels: ["bug"]
 body:
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 42f1d3c51a3..92e6c47570a 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,5 +1,6 @@
 name: 🚀 Feature Request
 description: Suggest an idea, feature, or enhancement
+labels: [discussion]
 title: "[FEATURE]:"
 
 body:
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
index 8930ba693cc..2310bfcc86b 100644
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -1,5 +1,6 @@
 name: Question
 description: Ask a question
+labels: ["question"]
 body:
   - type: textarea
     id: question
diff --git a/.opencode/agent/triage.md b/.opencode/agent/triage.md
index b15350ea9f1..69ab7ac86b6 100644
--- a/.opencode/agent/triage.md
+++ b/.opencode/agent/triage.md
@@ -18,7 +18,7 @@ Assign issues by choosing the team with the strongest overlap. The github-triage
 
 Do not add labels to issues. Only assign an owner.
 
-When calling github-triage, pass one of these team values: tui, desktop_web, core, inference, windows.
+When calling github-triage, pass one of these team values: tui, desktop_web, core, inference, windows, jetbrains, extension
 
 ## Teams
 
@@ -36,8 +36,16 @@ Core opencode server and harness issues, including sqlite, snapshots, memory, AP
 
 ### Inference
 
-OpenCode Zen, OpenCode Go, and billing issues.
+Kilo Provider, Provider implementation, and billing issues.
 
 ### Windows
 
 Windows-specific issues, including native Windows behavior, WSL interactions, path handling, shell compatibility, and installation or runtime problems that only happen on Windows.
+
+### Jetbrains
+
+Jetbrains extension related issues.
+
+### Extension
+
+VSCode Extension related issues.
diff --git a/.opencode/tool/github-triage.ts b/.opencode/tool/github-triage.ts
index b76917d99d5..ce07fdebc60 100644
--- a/.opencode/tool/github-triage.ts
+++ b/.opencode/tool/github-triage.ts
@@ -6,6 +6,7 @@ const TEAM = {
   tui: ["catrielmuller"],
   desktop_web: ["markijbema"],
   core: ["markijbema", "marius-kilocode", "catrielmuller", "chrarnoldus", "imanolmzd-svg"],
+  jetbrains: ["kirillk"],
   inference: ["chrarnoldus", "markijbema"],
   windows: ["catrielmuller"],
 } as const
@@ -48,8 +49,10 @@ Provide the team that should own the issue. This tool picks a random assignee fr
   },
   async execute(args) {
     const issue = getIssueNumber()
-    const owner = "anomalyco"
-    const repo = "opencode"
+    // kilocode_change start
+    const owner = "Kilo-Org"
+    const repo = "kilocode"
+    // kilocode_change end
     const assignee = pick(TEAM[args.team])
 
     await githubFetch(`/repos/${owner}/${repo}/issues/${issue}/assignees`, {
diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/cli-reference.md b/packages/kilo-docs/pages/code-with-ai/platforms/cli-reference.md
index a99ea5c8ecc..9488f7a8fcd 100644
--- a/packages/kilo-docs/pages/code-with-ai/platforms/cli-reference.md
+++ b/packages/kilo-docs/pages/code-with-ai/platforms/cli-reference.md
@@ -154,7 +154,7 @@ Options:
       --fork        fork the session when continuing (use with --continue or --session)  [boolean]
       --cloud-fork  fetch session from cloud and continue locally (use with --session)  [boolean]
   -p, --password    basic auth password (defaults to KILO_SERVER_PASSWORD)  [string]
-  -u, --username    basic auth username (defaults to KILO_SERVER_USERNAME or 'opencode')  [string]
+  -u, --username    basic auth username (defaults to KILO_SERVER_USERNAME or 'kilo')  [string]
 ```
 
 ## kilo run
diff --git a/packages/opencode/src/cli/cmd/debug/index.ts b/packages/opencode/src/cli/cmd/debug/index.ts
index e545818efa5..91c647cc7ee 100644
--- a/packages/opencode/src/cli/cmd/debug/index.ts
+++ b/packages/opencode/src/cli/cmd/debug/index.ts
@@ -56,7 +56,7 @@ const InfoCommand = effectCmd({
       : undefined
     const terminal = [termProgram, process.env.TERM].filter((item): item is string => Boolean(item)).join(" / ")
 
-    console.log(`opencode version: ${InstallationVersion}`)
+    console.log(`kilo version: ${InstallationVersion}`) // kilocode_change
     console.log(`os: ${os.type()} ${os.release()} ${os.arch()}`)
     console.log(`terminal: ${terminal || "unknown"}`)
     console.log("plugins:")
diff --git a/packages/opencode/src/cli/cmd/tui/attach.ts b/packages/opencode/src/cli/cmd/tui/attach.ts
index 420932d751a..d95ddef36d4 100644
--- a/packages/opencode/src/cli/cmd/tui/attach.ts
+++ b/packages/opencode/src/cli/cmd/tui/attach.ts
@@ -49,7 +49,7 @@ export const AttachCommand = cmd({
       .option("username", {
         alias: ["u"],
         type: "string",
-        describe: "basic auth username (defaults to KILO_SERVER_USERNAME or 'opencode')",
+        describe: "basic auth username (defaults to KILO_SERVER_USERNAME or 'kilo')", // kilocode_change
       }),
   handler: async (args) => {
     const unguard = win32InstallCtrlCGuard()
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/remote.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/remote.ts
index 4b950e91957..b46e124112f 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/remote.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/remote.ts
@@ -7,10 +7,9 @@ import { InstanceHttpApi } from "@/server/routes/instance/httpapi/api"
 export const remoteHandlers = HttpApiBuilder.group(InstanceHttpApi, "remote", (handlers) =>
   Effect.gen(function* () {
     const enable = Effect.fn("RemoteHttpApi.enable")(function* () {
-      yield* Effect.tryPromise({
-        try: () => Effect.runPromise(EffectBridge.fromPromise(() => KiloSessions.enableRemote())),
-        catch: () => new HttpApiError.Unauthorized(),
-      })
+      yield* EffectBridge.fromPromise(() => KiloSessions.enableRemote()).pipe(
+        Effect.catchCause(() => Effect.fail(new HttpApiError.Unauthorized())),
+      )
       return KiloSessions.remoteStatus()
     })
 
diff --git a/packages/opencode/src/server/routes/instance/httpapi/groups/global.ts b/packages/opencode/src/server/routes/instance/httpapi/groups/global.ts
index ea7e6b54457..d53db568351 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/groups/global.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/groups/global.ts
@@ -99,8 +99,8 @@ export const GlobalApi = HttpApi.make("global").add(
       }).annotateMerge(
         OpenApi.annotations({
           identifier: "global.upgrade",
-          summary: "Upgrade opencode",
-          description: "Upgrade opencode to the specified version or latest if not specified.",
+          summary: "Upgrade kilo", // kilocode_change
+          description: "Upgrade kilo to the specified version or latest if not specified.", // kilocode_change
         }),
       ),
     )
diff --git a/packages/opencode/src/server/routes/instance/httpapi/groups/v2.ts b/packages/opencode/src/server/routes/instance/httpapi/groups/v2.ts
index 05da5b720de..b8d34f1b94a 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/groups/v2.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/groups/v2.ts
@@ -7,7 +7,7 @@ export const V2Api = HttpApi.make("v2")
   .add(MessageGroup)
   .annotateMerge(
     OpenApi.annotations({
-      title: "opencode experimental HttpApi",
+      title: "kilo experimental HttpApi", // kilocode_change
       version: "0.0.1",
       description: "Experimental HttpApi surface for selected instance routes.",
     }),
diff --git a/packages/sdk/js/src/v2/client.ts b/packages/sdk/js/src/v2/client.ts
index d12f84476e2..1a708a283ac 100644
--- a/packages/sdk/js/src/v2/client.ts
+++ b/packages/sdk/js/src/v2/client.ts
@@ -107,10 +107,10 @@ export function createKiloClient(config?: Config & { directory?: string; experim
     if (!isEmpty) return error
     const method = request?.method ?? "?"
     const url = request?.url ?? "?"
-    if (!response) return new Error(`opencode server ${method} ${url}: network error (no response)`)
+    if (!response) return new Error(`kilo server ${method} ${url}: network error (no response)`)
     const status = response.status
     const statusText = response.statusText ? " " + response.statusText : ""
-    return new Error(`opencode server ${method} ${url} → ${status}${statusText}: (empty response body)`)
+    return new Error(`kilo server ${method} ${url} → ${status}${statusText}: (empty response body)`)
   })
   return new KiloClient({ client })
 }
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index 35c74518a1d..61e87d8f5e1 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -563,9 +563,9 @@ export class Global extends HeyApiClient {
   }
 
   /**
-   * Upgrade opencode
+   * Upgrade kilo
    *
-   * Upgrade opencode to the specified version or latest if not specified.
+   * Upgrade kilo to the specified version or latest if not specified.
    */
   public upgrade<ThrowOnError extends boolean = false>(
     parameters?: {
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index 4ee90c3d717..6fecb2d9411 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -413,8 +413,8 @@
             }
           }
         },
-        "description": "Upgrade opencode to the specified version or latest if not specified.",
-        "summary": "Upgrade opencode",
+        "description": "Upgrade kilo to the specified version or latest if not specified.",
+        "summary": "Upgrade kilo",
         "requestBody": {
           "content": {
             "application/json": {