diff --git a/.changeset/fix-cli-startup-followup.md b/.changeset/fix-cli-startup-followup.md
new file mode 100644
index 0000000000..23d9ac25a0
--- /dev/null
+++ b/.changeset/fix-cli-startup-followup.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Fix CLI help disposal and shell completion after startup optimization.
diff --git a/packages/opencode/src/kilocode/cli/lazy-commands.ts b/packages/opencode/src/kilocode/cli/lazy-commands.ts
index ee49d9d5b6..b917fab6d1 100644
--- a/packages/opencode/src/kilocode/cli/lazy-commands.ts
+++ b/packages/opencode/src/kilocode/cli/lazy-commands.ts
@@ -19,6 +19,14 @@ export function hasLazyCommandSelection() {
   return selected
 }
 
+export function resetLazyCommandSelection() {
+  selected = false
+}
+
+export function markLazyCommandSelection() {
+  selected = true
+}
+
 export function lazy<T = {}, U = {}>(input: {
   command: string | readonly string[]
   aliases?: string | readonly string[]
@@ -29,9 +37,11 @@ export function lazy<T = {}, U = {}>(input: {
   const load = () => (state.task ??= input.load())
   if (completion) {
     tasks.push(
-      load().then((command) => {
-        state.command = command
-      }),
+      load()
+        .then((command) => {
+          state.command = command
+        })
+        .catch(() => undefined),
     )
   }
   return {
@@ -39,7 +49,7 @@ export function lazy<T = {}, U = {}>(input: {
     aliases: input.aliases,
     describe: input.describe,
     builder: ((args: Argv<T>) => {
-      selected = true
+      markLazyCommandSelection()
       if (state.command) return build(state.command, args)
       return load().then((command) => build(command, args))
     }) as never,
diff --git a/packages/opencode/src/kilocode/help-command.ts b/packages/opencode/src/kilocode/help-command.ts
index ecb5f90f14..fa92607751 100644
--- a/packages/opencode/src/kilocode/help-command.ts
+++ b/packages/opencode/src/kilocode/help-command.ts
@@ -1,13 +1,15 @@
 import { cmd } from "../cli/cmd/cmd"
 import { generateHelp } from "./help"
 import type { Argv } from "yargs"
+import { markLazyCommandSelection } from "@/kilocode/cli/lazy-commands"
 
 export function createHelpCommand(root?: () => Argv) {
   return cmd({
     command: "help [command]",
     describe: "show full CLI reference",
-    builder: (yargs) =>
-      yargs
+    builder: (yargs) => {
+      markLazyCommandSelection()
+      return yargs
         .positional("command", {
           describe: "command to show help for",
           type: "string",
@@ -22,7 +24,8 @@ export function createHelpCommand(root?: () => Argv) {
           type: "string",
           choices: ["md", "text"] as const,
           default: "md" as const,
-        }),
+        })
+    },
     async handler(args) {
       if (!args.command && !args.all) {
         if (root) {
diff --git a/packages/opencode/test/kilocode/cli/bootstrap-runtime.test.ts b/packages/opencode/test/kilocode/cli/bootstrap-runtime.test.ts
index 4ac32559b5..7f580e3b6f 100644
--- a/packages/opencode/test/kilocode/cli/bootstrap-runtime.test.ts
+++ b/packages/opencode/test/kilocode/cli/bootstrap-runtime.test.ts
@@ -1,7 +1,13 @@
-import { describe, expect, test } from "bun:test"
+import { afterEach, beforeEach, describe, expect, test } from "bun:test"
 import { KiloCli } from "../../../src/kilocode/cli/setup"
+import { createHelpCommand } from "../../../src/kilocode/help-command"
+import { resetLazyCommandSelection } from "../../../src/kilocode/cli/lazy-commands"
+import yargs from "yargs"
 
 describe("CLI bootstrap runtime selection", () => {
+  beforeEach(resetLazyCommandSelection)
+  afterEach(resetLazyCommandSelection)
+
   test("uses the narrow runtime for worker-backed TUI launches", () => {
     expect(KiloCli.workerTui({ _: [] })).toBe(true)
     expect(KiloCli.workerTui({ _: ["./project"] })).toBe(true)
@@ -11,4 +17,11 @@ describe("CLI bootstrap runtime selection", () => {
     expect(KiloCli.workerTui({ _: [], mini: true })).toBe(false)
     expect(KiloCli.workerTui({ _: [], worktree: "feature" })).toBe(false)
   })
+
+  test("keeps full bootstrap when the eager help command is selected", () => {
+    const command = createHelpCommand()
+    if (typeof command.builder !== "function") throw new Error("help builder is not a function")
+    command.builder(yargs([]))
+    expect(KiloCli.workerTui({ _: [] })).toBe(false)
+  })
 })