fix: restore check after CLI seam cleanup

Author: steipete

extensions/anthropic/index.test.ts

@@ -4,10 +4,10 @@ import { registerSingleProviderPlugin } from "../../test/helpers/plugins/plugin-
 import anthropicPlugin from "./index.js";
 
 describe("anthropic provider replay hooks", () => {
-  it("registers no cli backends", async () => {
+  it("registers no cli commands", async () => {
     const captured = capturePluginRegistration({ register: anthropicPlugin.register });
 
-    expect(captured.cliBackends).toEqual([]);
+    expect(captured.cliRegistrars).toEqual([]);
   });
 
   it("owns native reasoning output mode for Claude transports", async () => {

extensions/google/provider-models.test.ts

@@ -54,7 +54,6 @@ describe("resolveGoogleGeminiForwardCompatModel", () => {
   it("resolves stable gemini 2.5 flash-lite from direct google templates for Gemini CLI when available", () => {
     const model = resolveGoogleGeminiForwardCompatModel({
       providerId: "google-gemini-cli",
-      templateProviderId: "google",
       ctx: createContext({
         provider: "google-gemini-cli",
         modelId: "gemini-2.5-flash-lite",
@@ -73,7 +72,6 @@ describe("resolveGoogleGeminiForwardCompatModel", () => {
   it("resolves stable gemini 2.5 flash-lite from Gemini CLI templates when direct google templates are unavailable", () => {
     const model = resolveGoogleGeminiForwardCompatModel({
       providerId: "google-gemini-cli",
-      templateProviderId: "google",
       ctx: createContext({
         provider: "google-gemini-cli",
         modelId: "gemini-2.5-flash-lite",
@@ -99,7 +97,6 @@ describe("resolveGoogleGeminiForwardCompatModel", () => {
   it("resolves gemini 3.1 pro for google aliases via an alternate template provider", () => {
     const model = resolveGoogleGeminiForwardCompatModel({
       providerId: "google-vertex",
-      templateProviderId: "google-gemini-cli",
       ctx: createContext({
         provider: "google-vertex",
         modelId: "gemini-3.1-pro-preview",
@@ -118,7 +115,6 @@ describe("resolveGoogleGeminiForwardCompatModel", () => {
   it("keeps Gemini CLI 3.1 clones sourced from CLI templates when both catalogs exist", () => {
     const model = resolveGoogleGeminiForwardCompatModel({
       providerId: "google-gemini-cli",
-      templateProviderId: "google",
       ctx: createContext({
         provider: "google-gemini-cli",
         modelId: "gemini-3.1-pro-preview",
@@ -149,7 +145,6 @@ describe("resolveGoogleGeminiForwardCompatModel", () => {
   it("preserves template reasoning metadata instead of forcing it on forward-compat clones", () => {
     const model = resolveGoogleGeminiForwardCompatModel({
       providerId: "google",
-      templateProviderId: "google-gemini-cli",
       ctx: createContext({
         provider: "google",
         modelId: "gemini-3.1-flash-preview",
@@ -172,7 +167,6 @@ describe("resolveGoogleGeminiForwardCompatModel", () => {
   it("resolves gemini 3.1 flash from direct google templates", () => {
     const model = resolveGoogleGeminiForwardCompatModel({
       providerId: "google",
-      templateProviderId: "google-gemini-cli",
       ctx: createContext({
         provider: "google",
         modelId: "gemini-3.1-flash-preview",
@@ -195,7 +189,6 @@ describe("resolveGoogleGeminiForwardCompatModel", () => {
   it("prefers the flash-lite template before the broader flash prefix", () => {
     const model = resolveGoogleGeminiForwardCompatModel({
       providerId: "google-vertex",
-      templateProviderId: "google-gemini-cli",
       ctx: createContext({
         provider: "google-vertex",
         modelId: "gemini-3.1-flash-lite-preview",

extensions/lobster/src/lobster-tool.test.ts

@@ -44,7 +44,6 @@ function fakeApi(overrides: Partial<OpenClawPluginApi> = {}): OpenClawPluginApi
     registerGatewayMethod() {},
     registerCli() {},
     registerService() {},
-    registerCliBackend() {},
     registerConfigMigration() {},
     registerAutoEnableProbe() {},
     registerProvider() {},

src/agents/auth-profiles.store-cache.test.ts

@@ -2,9 +2,11 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { AUTH_STORE_VERSION, EXTERNAL_CLI_SYNC_TTL_MS } from "./auth-profiles/constants.js";
+import { AUTH_STORE_VERSION } from "./auth-profiles/constants.js";
 import type { AuthProfileStore } from "./auth-profiles/types.js";
 
+const AUTH_STORE_CACHE_TTL_MS = 15 * 60 * 1000;
+
 const mocks = vi.hoisted(() => ({
   syncExternalCliCredentials: vi.fn((_: AuthProfileStore) => false),
 }));
@@ -138,7 +140,7 @@ describe("auth profile store cache", () => {
       expect(second.profiles["openai-codex:default"]).toMatchObject({ access: "access-1" });
       expect(mocks.syncExternalCliCredentials).toHaveBeenCalledTimes(1);
 
-      vi.advanceTimersByTime(EXTERNAL_CLI_SYNC_TTL_MS + 1);
+      vi.advanceTimersByTime(AUTH_STORE_CACHE_TTL_MS + 1);
 
       const third = ensureAuthProfileStore(agentDir);
 

src/agents/command/session-store.test.ts

@@ -20,7 +20,7 @@ describe("updateSessionStoreAfterAgentRun", () => {
     await fs.rm(tmpDir, { recursive: true, force: true });
   });
 
-  it("persists cli session bindings when the provider is configured as a CLI backend", async () => {
+  it("persists the runtime provider/model used by the completed run", async () => {
     const cfg = {
       agents: {
         defaults: {
@@ -47,9 +47,6 @@ describe("updateSessionStoreAfterAgentRun", () => {
           sessionId: "cli-session-123",
           provider: "codex-cli",
           model: "gpt-5.4",
-          cliSessionBinding: {
-            sessionId: "cli-session-123",
-          },
         },
       },
     };
@@ -65,15 +62,11 @@ describe("updateSessionStoreAfterAgentRun", () => {
       result,
     });
 
-    expect(sessionStore[sessionKey]?.cliSessionBindings?.["codex-cli"]).toEqual({
-      sessionId: "cli-session-123",
-    });
-    expect(sessionStore[sessionKey]?.cliSessionIds?.["codex-cli"]).toBe("cli-session-123");
+    expect(sessionStore[sessionKey]?.modelProvider).toBe("codex-cli");
+    expect(sessionStore[sessionKey]?.model).toBe("gpt-5.4");
 
     const persisted = loadSessionStore(storePath);
-    expect(persisted[sessionKey]?.cliSessionBindings?.["codex-cli"]).toEqual({
-      sessionId: "cli-session-123",
-    });
-    expect(persisted[sessionKey]?.cliSessionIds?.["codex-cli"]).toBe("cli-session-123");
+    expect(persisted[sessionKey]?.modelProvider).toBe("codex-cli");
+    expect(persisted[sessionKey]?.model).toBe("gpt-5.4");
   });
 });

src/agents/model-selection.test.ts

@@ -1,8 +1,6 @@
 import { describe, it, expect, vi } from "vitest";
 import type { OpenClawConfig } from "../config/config.js";
 import { resetLogger, setLoggerOverride } from "../logging/logger.js";
-import { createEmptyPluginRegistry } from "../plugins/registry-empty.js";
-import { getActivePluginRegistry, setActivePluginRegistry } from "../plugins/runtime.js";
 import {
   buildAllowedModelSet,
   inferUniqueProviderFromConfiguredModels,
@@ -134,27 +132,8 @@ describe("model-selection", () => {
   });
 
   describe("isCliProvider", () => {
-    it("treats runtime-registered CLI backends as CLI providers", () => {
-      const previousRegistry = getActivePluginRegistry();
-      const registry = createEmptyPluginRegistry();
-      try {
-        registry.cliBackends = [
-          {
-            pluginId: "example-plugin",
-            source: "test",
-            backend: {
-              id: "example-cli",
-              config: {
-                command: "example",
-              },
-            },
-          },
-        ];
-        setActivePluginRegistry(registry);
-        expect(isCliProvider("example-cli", {} as OpenClawConfig)).toBe(true);
-      } finally {
-        setActivePluginRegistry(previousRegistry ?? createEmptyPluginRegistry());
-      }
+    it("returns false for provider ids", () => {
+      expect(isCliProvider("example-cli", {} as OpenClawConfig)).toBe(false);
     });
   });
 

src/agents/skills/plugin-skills.test.ts

@@ -26,7 +26,6 @@ function buildRegistry(params: { acpxRoot: string; helperRoot: string }): Plugin
         name: "ACPX Runtime",
         channels: [],
         providers: [],
-        cliBackends: [],
         skills: ["./skills"],
         hooks: [],
         origin: "workspace",
@@ -39,7 +38,6 @@ function buildRegistry(params: { acpxRoot: string; helperRoot: string }): Plugin
         name: "Helper",
         channels: [],
         providers: [],
-        cliBackends: [],
         skills: ["./skills"],
         hooks: [],
         origin: "workspace",
@@ -67,7 +65,6 @@ function createSinglePluginRegistry(params: {
         channels: [],
         providers: [],
         legacyPluginIds: params.legacyPluginIds,
-        cliBackends: [],
         skills: params.skills,
         hooks: [],
         origin: "workspace",

src/auto-reply/reply.triggers.trigger-handling.test-harness.ts

@@ -4,7 +4,6 @@ import os from "node:os";
 import { join } from "node:path";
 import { afterAll, afterEach, beforeAll, expect, vi } from "vitest";
 import { clearRuntimeAuthProfileStoreSnapshots } from "../agents/auth-profiles.js";
-import { resetCliCredentialCachesForTest } from "../agents/cli-credentials.js";
 import type { OpenClawConfig } from "../config/config.js";
 import { resetProviderRuntimeHookCacheForTest } from "../plugins/provider-runtime.js";
 import { resolveRelativeBundledPluginPublicModuleId } from "../test-utils/bundled-plugin-public-surface.js";
@@ -447,7 +446,6 @@ export async function runGreetingPromptForBareNewOrReset(params: {
 export function installTriggerHandlingE2eTestHooks() {
   afterEach(() => {
     clearRuntimeAuthProfileStoreSnapshots();
-    resetCliCredentialCachesForTest();
     resetProviderRuntimeHookCacheForTest();
     vi.clearAllMocks();
   });

src/auto-reply/reply/agent-runner-execution.test.ts

@@ -31,14 +31,6 @@ vi.mock("../../agents/model-selection.js", () => ({
   isCliProvider: () => false,
 }));
 
-vi.mock("../../agents/cli-runner.js", () => ({
-  runCliAgent: vi.fn(),
-}));
-
-vi.mock("../../agents/cli-session.js", () => ({
-  getCliSessionId: vi.fn(),
-}));
-
 vi.mock("../../agents/bootstrap-budget.js", () => ({
   resolveBootstrapWarningSignaturesSeen: () => [],
 }));

src/auto-reply/reply/agent-runner-execution.ts

@@ -27,7 +27,7 @@ import {
   updateSessionStore,
 } from "../../config/sessions.js";
 import { logVerbose } from "../../globals.js";
-import { emitAgentEvent, registerAgentRunContext } from "../../infra/agent-events.js";
+import { registerAgentRunContext } from "../../infra/agent-events.js";
 import { CommandLaneClearedError, GatewayDrainingError } from "../../process/command-queue.js";
 import { defaultRuntime } from "../../runtime.js";
 import { sanitizeForLog } from "../../terminal/ansi.js";