From 1f50fed3b28bf4a87439152c6f2dd50bedcc3db5 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Sun, 15 Mar 2026 20:52:09 -0700
Subject: [PATCH] Agents: skip eager context warmup for status commands

---
 src/agents/context.lookup.test.ts | 28 ++++++++++++++++++++++++++++
 src/agents/context.ts             |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/src/agents/context.lookup.test.ts b/src/agents/context.lookup.test.ts
index e5025b36c76..0f33ada0d1b 100644
--- a/src/agents/context.lookup.test.ts
+++ b/src/agents/context.lookup.test.ts
@@ -104,6 +104,34 @@ describe("lookupContextTokens", () => {
     }
   });
 
+  it("skips eager warmup for status commands that only read model metadata opportunistically", async () => {
+    const loadConfigMock = vi.fn(() => ({ models: {} }));
+    mockContextModuleDeps(loadConfigMock);
+
+    const argvSnapshot = process.argv;
+    process.argv = ["node", "openclaw", "status", "--json"];
+    try {
+      await import("./context.js");
+      expect(loadConfigMock).not.toHaveBeenCalled();
+    } finally {
+      process.argv = argvSnapshot;
+    }
+  });
+
+  it("skips eager warmup for gateway commands that do not need model metadata at startup", async () => {
+    const loadConfigMock = vi.fn(() => ({ models: {} }));
+    mockContextModuleDeps(loadConfigMock);
+
+    const argvSnapshot = process.argv;
+    process.argv = ["node", "openclaw", "gateway", "status", "--json"];
+    try {
+      await import("./context.js");
+      expect(loadConfigMock).not.toHaveBeenCalled();
+    } finally {
+      process.argv = argvSnapshot;
+    }
+  });
+
   it("retries config loading after backoff when an initial load fails", async () => {
     vi.useFakeTimers();
     const loadConfigMock = vi
diff --git a/src/agents/context.ts b/src/agents/context.ts
index 5550f67e3b7..cfeee26cd60 100644
--- a/src/agents/context.ts
+++ b/src/agents/context.ts
@@ -114,11 +114,13 @@ const SKIP_EAGER_WARMUP_PRIMARY_COMMANDS = new Set([
   "config",
   "directory",
   "doctor",
+  "gateway",
   "health",
   "hooks",
   "logs",
   "plugins",
   "secrets",
+  "status",
   "update",
   "webhooks",
 ]);