diff --git a/src/commands/agent.delivery.test.ts b/src/commands/agent.delivery.test.ts
index 64797367431..6e56fb7f1cb 100644
--- a/src/commands/agent.delivery.test.ts
+++ b/src/commands/agent.delivery.test.ts
@@ -1,10 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import { deliverAgentCommandResult } from "../agents/command/delivery.js";
 import type { ReplyPayload } from "../auto-reply/types.js";
 import type { CliDeps } from "../cli/deps.js";
 import type { OpenClawConfig } from "../config/config.js";
 import type { SessionEntry } from "../config/sessions.js";
 import type { RuntimeEnv } from "../runtime.js";
-import { deliverAgentCommandResult } from "./agent/delivery.js";
 
 const mocks = vi.hoisted(() => ({
   deliverOutboundPayloads: vi.fn(async () => []),
diff --git a/src/commands/agent/delivery.ts b/src/commands/agent/delivery.ts
deleted file mode 100644
index 02d9a36041e..00000000000
--- a/src/commands/agent/delivery.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../agents/command/delivery.js";
diff --git a/src/commands/agent/run-context.ts b/src/commands/agent/run-context.ts
deleted file mode 100644
index 92dcf6adc71..00000000000
--- a/src/commands/agent/run-context.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../agents/command/run-context.js";
diff --git a/src/commands/agent/session-store.ts b/src/commands/agent/session-store.ts
deleted file mode 100644
index 29c590e1dad..00000000000
--- a/src/commands/agent/session-store.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../agents/command/session-store.js";
diff --git a/src/commands/agent/types.ts b/src/commands/agent/types.ts
deleted file mode 100644
index 1768b3ba204..00000000000
--- a/src/commands/agent/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../agents/command/types.js";
diff --git a/src/commands/auth-choice.api-key.ts b/src/commands/auth-choice.api-key.ts
deleted file mode 100644
index ae5e716a46f..00000000000
--- a/src/commands/auth-choice.api-key.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export {
-  formatApiKeyPreview,
-  normalizeApiKeyInput,
-  validateApiKeyInput,
-} from "../plugins/provider-auth-input.js";