diff --git a/src/cli/program/register.subclis.test.ts b/src/cli/program/register.subclis.test.ts
index 1beb89f6d22..00650b4ffe7 100644
--- a/src/cli/program/register.subclis.test.ts
+++ b/src/cli/program/register.subclis.test.ts
@@ -76,10 +76,10 @@ describe("registerSubCliCommands", () => {
     }
   });
 
-  it("registers only the primary placeholder and dispatches", async () => {
+  it("registers the primary placeholder plus completion and dispatches", async () => {
     const program = createRegisteredProgram(["node", "openclaw", "acp"]);
 
-    expect(program.commands.map((cmd) => cmd.name())).toEqual(["acp"]);
+    expect(program.commands.map((cmd) => cmd.name())).toEqual(["acp", "completion"]);
 
     await program.parseAsync(["acp"], { from: "user" });
 
@@ -101,7 +101,7 @@ describe("registerSubCliCommands", () => {
   it("re-parses argv for lazy subcommands", async () => {
     const program = createRegisteredProgram(["node", "openclaw", "nodes", "list"], "openclaw");
 
-    expect(program.commands.map((cmd) => cmd.name())).toEqual(["nodes"]);
+    expect(program.commands.map((cmd) => cmd.name())).toEqual(["nodes", "completion"]);
 
     await program.parseAsync(["nodes", "list"], { from: "user" });
 
@@ -112,7 +112,7 @@ describe("registerSubCliCommands", () => {
   it("registers the infer placeholder and dispatches through the capability registrar", async () => {
     const program = createRegisteredProgram(["node", "openclaw", "infer"], "openclaw");
 
-    expect(program.commands.map((cmd) => cmd.name())).toEqual(["infer"]);
+    expect(program.commands.map((cmd) => cmd.name())).toEqual(["infer", "completion"]);
 
     await program.parseAsync(["infer"], { from: "user" });
 
diff --git a/src/plugins/registry-types.ts b/src/plugins/registry-types.ts
index 27a7bdade15..bdb43988bf5 100644
--- a/src/plugins/registry-types.ts
+++ b/src/plugins/registry-types.ts
@@ -15,6 +15,7 @@ import type {
   OpenClawPluginCliCommandDescriptor,
   OpenClawPluginCliRegistrar,
   OpenClawPluginCommandDefinition,
+  OpenClawPluginGatewayRuntimeScopeSurface,
   OpenClawPluginHttpRouteAuth,
   OpenClawPluginGatewayRuntimeScopeSurface,
   OpenClawPluginHttpRouteHandler,