feat(config): allow provider/model shorthand

src/commands/agent.test.ts

@@ -47,12 +47,14 @@ function mockConfig(
   home: string,
   storePath: string,
   routingOverrides?: Partial<NonNullable<ClawdisConfig["routing"]>>,
+  agentOverrides?: Partial<NonNullable<ClawdisConfig["agent"]>>,
 ) {
   configSpy.mockReturnValue({
     agent: {
       provider: "anthropic",
       model: "claude-opus-4-5",
       workspace: path.join(home, "clawd"),
+      ...agentOverrides,
     },
     session: { store: storePath, mainKey: "main" },
     routing: routingOverrides ? { ...routingOverrides } : undefined,
@@ -141,6 +143,22 @@ describe("agentCommand", () => {
     });
   });
 
+  it("resolves provider from agent.model when prefixed", async () => {
+    await withTempHome(async (home) => {
+      const store = path.join(home, "sessions.json");
+      mockConfig(home, store, undefined, {
+        provider: "openai",
+        model: "anthropic/claude-opus-4-5",
+      });
+
+      await agentCommand({ message: "hi", to: "+1555" }, runtime);
+
+      const callArgs = vi.mocked(runEmbeddedPiAgent).mock.calls.at(-1)?.[0];
+      expect(callArgs?.provider).toBe("anthropic");
+      expect(callArgs?.model).toBe("claude-opus-4-5");
+    });
+  });
+
   it("prints JSON payload when requested", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockResolvedValue({

src/commands/agent.ts

@@ -6,7 +6,11 @@ import {
   DEFAULT_PROVIDER,
 } from "../agents/defaults.js";
 import { loadModelCatalog } from "../agents/model-catalog.js";
-import { buildAllowedModelSet, modelKey } from "../agents/model-selection.js";
+import {
+  buildAllowedModelSet,
+  modelKey,
+  resolveConfiguredModelRef,
+} from "../agents/model-selection.js";
 import { runEmbeddedPiAgent } from "../agents/pi-embedded.js";
 import { buildWorkspaceSkillSnapshot } from "../agents/skills.js";
 import {
@@ -247,8 +251,12 @@ export async function agentCommand(
     await saveSessionStore(storePath, sessionStore);
   }
 
-  const defaultProvider = agentCfg?.provider?.trim() || DEFAULT_PROVIDER;
-  const defaultModel = agentCfg?.model?.trim() || DEFAULT_MODEL;
+  const { provider: defaultProvider, model: defaultModel } =
+    resolveConfiguredModelRef({
+      cfg,
+      defaultProvider: DEFAULT_PROVIDER,
+      defaultModel: DEFAULT_MODEL,
+    });
   let provider = defaultProvider;
   let model = defaultModel;
   const hasAllowlist = (agentCfg?.allowedModels?.length ?? 0) > 0;

src/commands/sessions.ts

@@ -1,7 +1,12 @@
 import chalk from "chalk";
 
 import { lookupContextTokens } from "../agents/context.js";
-import { DEFAULT_CONTEXT_TOKENS, DEFAULT_MODEL } from "../agents/defaults.js";
+import {
+  DEFAULT_CONTEXT_TOKENS,
+  DEFAULT_MODEL,
+  DEFAULT_PROVIDER,
+} from "../agents/defaults.js";
+import { resolveConfiguredModelRef } from "../agents/model-selection.js";
 import { loadConfig } from "../config/config.js";
 import {
   loadSessionStore,
@@ -151,11 +156,16 @@ export async function sessionsCommand(
   runtime: RuntimeEnv,
 ) {
   const cfg = loadConfig();
+  const resolved = resolveConfiguredModelRef({
+    cfg,
+    defaultProvider: DEFAULT_PROVIDER,
+    defaultModel: DEFAULT_MODEL,
+  });
   const configContextTokens =
     cfg.agent?.contextTokens ??
-    lookupContextTokens(cfg.agent?.model) ??
+    lookupContextTokens(resolved.model) ??
     DEFAULT_CONTEXT_TOKENS;
-  const configModel = cfg.agent?.model ?? DEFAULT_MODEL;
+  const configModel = resolved.model ?? DEFAULT_MODEL;
   const storePath = resolveStorePath(opts.store ?? cfg.session?.store);
   const store = loadSessionStore(storePath);
 

src/commands/status.ts

@@ -1,5 +1,10 @@
 import { lookupContextTokens } from "../agents/context.js";
-import { DEFAULT_CONTEXT_TOKENS, DEFAULT_MODEL } from "../agents/defaults.js";
+import {
+  DEFAULT_CONTEXT_TOKENS,
+  DEFAULT_MODEL,
+  DEFAULT_PROVIDER,
+} from "../agents/defaults.js";
+import { resolveConfiguredModelRef } from "../agents/model-selection.js";
 import { loadConfig } from "../config/config.js";
 import {
   loadSessionStore,
@@ -60,7 +65,12 @@ export async function getStatusSummary(): Promise<StatusSummary> {
   const providerSummary = await buildProviderSummary(cfg);
   const queuedSystemEvents = peekSystemEvents();
 
-  const configModel = cfg.agent?.model ?? DEFAULT_MODEL;
+  const resolved = resolveConfiguredModelRef({
+    cfg,
+    defaultProvider: DEFAULT_PROVIDER,
+    defaultModel: DEFAULT_MODEL,
+  });
+  const configModel = resolved.model ?? DEFAULT_MODEL;
   const configContextTokens =
     cfg.agent?.contextTokens ??
     lookupContextTokens(configModel) ??