Merge branch 'main' into commands-list-clean

src/auto-reply/reply.directive.test.ts

@@ -599,7 +599,7 @@ describe("directive behavior", () => {
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
       expect(text).toContain("Elevated mode disabled.");
-      expect(text).toContain("status agent:main:main");
+      expect(text).toContain("Session: agent:main:main");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });

src/auto-reply/status.test.ts

@@ -92,8 +92,7 @@ describe("buildStatusMessage", () => {
 
     expect(text).toContain("🦞 ClawdBot");
     expect(text).toContain("🧠 Model: anthropic/pi:opus · 🔑 api-key");
-    expect(text).toContain("🧮 Tokens: 1.2k in / 800 out");
-    expect(text).toContain("💵 Cost: $0.0020");
+    expect(text).toContain("🧮 Tokens: 1.2k in / 800 out · 💵 Cost: $0.0020");
     expect(text).toContain("Context: 16k/32k (50%)");
     expect(text).toContain("🧹 Compactions: 2");
     expect(text).toContain("Session: agent:main:main");

src/auto-reply/status.ts

@@ -297,7 +297,10 @@ export function buildStatusMessage(args: StatusArgs): string {
   const activationLine = activationParts.filter(Boolean).join(" · ");
 
   const authMode = resolveModelAuthMode(provider, args.config);
-  const showCost = authMode === "api-key";
+  const authLabelValue =
+    args.modelAuth ??
+    (authMode && authMode !== "unknown" ? authMode : undefined);
+  const showCost = authLabelValue === "api-key" || authLabelValue === "mixed";
   const costConfig = showCost
     ? resolveModelCostConfig({
         provider,
@@ -320,21 +323,19 @@ export function buildStatusMessage(args: StatusArgs): string {
   const costLabel = showCost && hasUsage ? formatUsd(cost) : undefined;
 
   const modelLabel = model ? `${provider}/${model}` : "unknown";
-  const authLabelValue =
-    args.modelAuth ??
-    (authMode && authMode !== "unknown" ? authMode : undefined);
   const authLabel = authLabelValue ? ` · 🔑 ${authLabelValue}` : "";
   const modelLine = `🧠 Model: ${modelLabel}${authLabel}`;
   const commit = resolveCommitHash();
   const versionLine = `🦞 ClawdBot ${VERSION}${commit ? ` (${commit})` : ""}`;
   const usagePair = formatUsagePair(inputTokens, outputTokens);
   const costLine = costLabel ? `💵 Cost: ${costLabel}` : null;
+  const usageCostLine =
+    usagePair && costLine ? `${usagePair} · ${costLine}` : usagePair ?? costLine;
 
   return [
     versionLine,
     modelLine,
-    usagePair,
-    costLine,
+    usageCostLine,
     `📚 ${contextLine}`,
     args.usageLine,
     `🧵 ${sessionLine}`,