perf: speed up local TUI startup

steipete · steipete · commit a0023fbfa0ab · 2026-05-25T20:30:00.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ Docs: https://docs.openclaw.ai
 - Agent transcript: include OpenClaw agent session logs when finding local transcript candidates.
 - Crabbox: bootstrap raw AWS macOS shell commands wrapped in absolute `time` paths so RSS probes can run Node and pnpm on fresh macOS runners.
 - Crabbox: bootstrap raw AWS macOS shell commands even when setup statements precede Node or pnpm usage.
+- TUI/local: skip unnecessary secret resolution, gateway model catalog loading, bootstrap, and skill scans in explicit local-model runs so startup reaches the model request faster.
 - Sessions/doctor: load large session stores without clone amplification during read-only doctor checks and reclaim stale `sessions.json.*.tmp` sidecars. Fixes #56827. Thanks @openperf.
 - Tests: clean successful plugin gateway gauntlet isolated temp roots while keeping an explicit preservation switch for failed/debug runs.
 - Plugins/perf: reuse derived plugin metadata snapshots for the lifetime of the process so reply-time skill setup no longer rescans plugin metadata on every turn.
diff --git a/src/agents/agent-command.live-model-switch.test.ts b/src/agents/agent-command.live-model-switch.test.ts
@@ -26,6 +26,7 @@ const state = vi.hoisted(() => ({
   resolveAcpExplicitTurnPolicyErrorMock: vi.fn(),
   runWithModelFallbackMock: vi.fn(),
   runAgentAttemptMock: vi.fn(),
+  resolveAgentSkillsFilterMock: vi.fn((): string[] | undefined => undefined),
   resolveEffectiveModelFallbacksMock: vi.fn().mockReturnValue(undefined),
   emitAgentEventMock: vi.fn(),
   registerAgentRunContextMock: vi.fn(),
@@ -312,7 +313,7 @@ vi.mock("./agent-scope.js", () => ({
   resolveEffectiveModelFallbacks: state.resolveEffectiveModelFallbacksMock,
   resolveSessionAgentIds: () => ({ defaultAgentId: "default", sessionAgentId: "default" }),
   resolveSessionAgentId: () => "default",
-  resolveAgentSkillsFilter: () => undefined,
+  resolveAgentSkillsFilter: (...args: unknown[]) => state.resolveAgentSkillsFilterMock(...args),
   resolveAgentWorkspaceDir: () => "/tmp/workspace",
 }));
 
@@ -757,6 +758,7 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
     state.runtimeConfigMock = undefined;
     state.isThinkingLevelSupportedMock.mockReturnValue(true);
     state.resolveThinkingDefaultMock.mockReturnValue("low");
+    state.resolveAgentSkillsFilterMock.mockReturnValue(undefined);
     state.loadManifestModelCatalogMock.mockReturnValue([]);
     state.acpRunTurnMock.mockImplementation(async (params: unknown) => {
       const onEvent = (params as { onEvent?: (event: unknown) => void }).onEvent;
@@ -1002,6 +1004,7 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
             ],
           },
         },
+        list: [{ id: "main", default: true, skills: [] }],
       },
     };
     state.runWithModelFallbackMock.mockImplementation(async (params: FallbackRunnerParams) => {
@@ -1426,6 +1429,42 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
     expect(state.buildWorkspaceSkillSnapshotMock).toHaveBeenCalledTimes(1);
   });
 
+  it("uses an empty skill snapshot without loading workspace skills for an empty skill filter", async () => {
+    state.runtimeConfigMock = {
+      agents: {
+        defaults: {
+          models: {
+            "anthropic/claude": {},
+            "openai/claude": {},
+            "openai/gpt-5.4": {},
+          },
+          skills: [],
+        },
+      },
+    };
+    state.sessionEntryMock = {
+      sessionId: "session-1",
+      updatedAt: Date.now(),
+    };
+    state.resolveAgentSkillsFilterMock.mockReturnValue([]);
+    setupSingleAttemptFallback();
+    state.runAgentAttemptMock.mockResolvedValue(makeSuccessResult("anthropic", "claude"));
+
+    await runBasicAgentCommand();
+
+    const attemptParams = mockCallArg(state.runAgentAttemptMock) as {
+      skillsSnapshot?: Record<string, unknown>;
+    };
+    expectRecordFields(attemptParams?.skillsSnapshot, {
+      prompt: "",
+      skills: [],
+      resolvedSkills: [],
+      skillFilter: [],
+      version: 0,
+    });
+    expect(state.buildWorkspaceSkillSnapshotMock).not.toHaveBeenCalled();
+  });
+
   it("classifies empty embedded run results before model fallback accepts them", async () => {
     let observedClassification: unknown;
     state.runWithModelFallbackMock.mockImplementation(async (params: FallbackRunnerParams) => {
diff --git a/src/agents/agent-command.ts b/src/agents/agent-command.ts
@@ -97,6 +97,7 @@ import { listOpenAIAuthProfileProvidersForAgentRuntime } from "./openai-codex-ro
 import { classifyEmbeddedPiRunResultForModelFallback } from "./pi-embedded-runner/result-fallback-classifier.js";
 import { resolveProviderIdForAuth } from "./provider-auth-aliases.js";
 import { hydrateResolvedSkillsAsync } from "./skills/snapshot-hydration.js";
+import type { SkillSnapshot } from "./skills/types.js";
 import { normalizeSpawnedRunMetadata } from "./spawned-context.js";
 import { resolveAgentTimeoutMs } from "./timeout.js";
 import { ensureAgentWorkspace } from "./workspace.js";
@@ -161,6 +162,19 @@ const skillsRemoteRuntimeLoader = createLazyImportLoader<SkillsRemoteRuntime>(
   () => import("../infra/skills-remote.js"),
 );
 
+function createEmptySkillsSnapshot(params: {
+  skillFilter: string[];
+  version?: number;
+}): SkillSnapshot {
+  return {
+    prompt: "",
+    skills: [],
+    resolvedSkills: [],
+    skillFilter: params.skillFilter,
+    version: params.version,
+  };
+}
+
 function loadAttemptExecutionRuntime(): Promise<AttemptExecutionRuntime> {
   return attemptExecutionRuntimeLoader.load();
 }
@@ -780,7 +794,14 @@ async function agentCommandInternal(
       shouldRefreshSnapshotForVersion(currentSkillsSnapshot.version, skillsSnapshotVersion) ||
       !matchesSkillFilter(currentSkillsSnapshot.skillFilter, skillFilter);
     const needsSkillsSnapshot = isNewSession || shouldRefreshSkillsSnapshot;
+    const emptySkillsFilter = skillFilter !== undefined && skillFilter.length === 0;
     const buildSkillsSnapshot = async () => {
+      if (emptySkillsFilter) {
+        return createEmptySkillsSnapshot({
+          skillFilter,
+          version: skillsSnapshotVersion,
+        });
+      }
       const [
         { buildWorkspaceSkillSnapshot },
         { getRemoteSkillEligibility },
diff --git a/src/agents/agent-runtime-config.ts b/src/agents/agent-runtime-config.ts
@@ -14,6 +14,11 @@ export async function resolveAgentRuntimeConfig(
   cfg: OpenClawConfig;
 }> {
   const loadedRaw = getRuntimeConfig();
+  const includeChannelTargets = params?.runtimeTargetsChannelSecrets === true;
+  const hasRuntimeSecretRefs = hasAgentRuntimeSecretRefs({
+    config: loadedRaw,
+    includeChannelTargets,
+  });
   const sourceConfig = await (async () => {
     try {
       const { snapshot } = await readConfigFileSnapshotForWrite();
@@ -25,11 +30,7 @@ export async function resolveAgentRuntimeConfig(
     }
     return loadedRaw;
   })();
-  const includeChannelTargets = params?.runtimeTargetsChannelSecrets === true;
-  const cfg = hasAgentRuntimeSecretRefs({
-    config: loadedRaw,
-    includeChannelTargets,
-  })
+  const cfg = hasRuntimeSecretRefs
     ? (
         await (
           await import("../cli/command-config-resolution.runtime.js")
diff --git a/src/agents/skills/workspace.ts b/src/agents/skills/workspace.ts
@@ -1100,8 +1100,11 @@ function resolveWorkspaceSkillPromptState(
   prompt: string;
   resolvedSkills: Skill[];
 } {
-  const skillEntries = opts?.entries ?? loadSkillEntries(workspaceDir, opts);
   const effectiveSkillFilter = resolveEffectiveWorkspaceSkillFilter(opts);
+  if (effectiveSkillFilter !== undefined && effectiveSkillFilter.length === 0) {
+    return { eligible: [], prompt: "", resolvedSkills: [] };
+  }
+  const skillEntries = opts?.entries ?? loadSkillEntries(workspaceDir, opts);
   const eligible = filterSkillEntries(
     skillEntries,
     opts?.config,
diff --git a/src/commands/agent.runtime-config.test.ts b/src/commands/agent.runtime-config.test.ts
@@ -201,7 +201,9 @@ describe("agentCommand runtime config", () => {
 
       const prepared = await resolveAgentRuntimeConfig(runtime);
 
+      expect(readConfigFileSnapshotForWriteMock).toHaveBeenCalledTimes(1);
       expect(resolveCommandConfigWithSecretsMock).not.toHaveBeenCalled();
+      expect(setRuntimeConfigSnapshotMock).toHaveBeenCalledWith(loadedConfig, loadedConfig);
       expect(prepared.cfg).toBe(loadedConfig);
     });
   });
diff --git a/src/tui/embedded-backend.test.ts b/src/tui/embedded-backend.test.ts
diff --git a/src/tui/embedded-backend.ts b/src/tui/embedded-backend.ts
diff --git a/src/tui/tui-pty-local.e2e.test.ts b/src/tui/tui-pty-local.e2e.test.ts
