feat(slash-commands): usage footer modes

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

@@ -457,10 +457,16 @@ export async function runReplyAgent(params: {
       }
     }
 
-    const responseUsageEnabled =
-      (activeSessionEntry?.responseUsage ??
-        (sessionKey ? activeSessionStore?.[sessionKey]?.responseUsage : undefined)) === "on";
-    if (responseUsageEnabled && hasNonzeroUsage(usage)) {
+    const responseUsageRaw =
+      activeSessionEntry?.responseUsage ??
+      (sessionKey ? activeSessionStore?.[sessionKey]?.responseUsage : undefined);
+    const responseUsageMode =
+      responseUsageRaw === "full"
+        ? "full"
+        : responseUsageRaw === "tokens" || responseUsageRaw === "on"
+          ? "tokens"
+          : "off";
+    if (responseUsageMode !== "off" && hasNonzeroUsage(usage)) {
       const authMode = resolveModelAuthMode(providerUsed, cfg);
       const showCost = authMode === "api-key";
       const costConfig = showCost
@@ -470,11 +476,14 @@ export async function runReplyAgent(params: {
             config: cfg,
           })
         : undefined;
-      const formatted = formatResponseUsageLine({
+      let formatted = formatResponseUsageLine({
         usage,
         showCost,
         costConfig,
       });
+      if (formatted && responseUsageMode === "full" && sessionKey) {
+        formatted = `${formatted} · session ${sessionKey}`;
+      }
       if (formatted) responseUsageLine = formatted;
     }
 

src/auto-reply/reply/commands-core.ts

@@ -20,6 +20,7 @@ import {
   handleRestartCommand,
   handleSendPolicyCommand,
   handleStopCommand,
+  handleUsageCommand,
 } from "./commands-session.js";
 import type {
   CommandHandler,
@@ -31,6 +32,7 @@ const HANDLERS: CommandHandler[] = [
   handleBashCommand,
   handleActivationCommand,
   handleSendPolicyCommand,
+  handleUsageCommand,
   handleRestartCommand,
   handleHelpCommand,
   handleCommandsListCommand,

src/auto-reply/reply/commands-session.ts

@@ -6,6 +6,7 @@ import { createInternalHookEvent, triggerInternalHook } from "../../hooks/intern
 import { scheduleGatewaySigusr1Restart, triggerClawdbotRestart } from "../../infra/restart.js";
 import { parseActivationCommand } from "../group-activation.js";
 import { parseSendPolicyCommand } from "../send-policy.js";
+import { normalizeUsageDisplay } from "../thinking.js";
 import {
   formatAbortReplyText,
   isAbortTrigger,
@@ -127,6 +128,57 @@ export const handleSendPolicyCommand: CommandHandler = async (params, allowTextC
   };
 };
 
+export const handleUsageCommand: CommandHandler = async (params, allowTextCommands) => {
+  if (!allowTextCommands) return null;
+  const normalized = params.command.commandBodyNormalized;
+  if (normalized !== "/usage" && !normalized.startsWith("/usage ")) return null;
+  if (!params.command.isAuthorizedSender) {
+    logVerbose(
+      `Ignoring /usage from unauthorized sender: ${params.command.senderId || "<unknown>"}`,
+    );
+    return { shouldContinue: false };
+  }
+
+  const rawArgs = normalized === "/usage" ? "" : normalized.slice("/usage".length).trim();
+  const requested = rawArgs ? normalizeUsageDisplay(rawArgs) : undefined;
+  if (rawArgs && !requested) {
+    return {
+      shouldContinue: false,
+      reply: { text: "⚙️ Usage: /usage off|tokens|full" },
+    };
+  }
+
+  const currentRaw =
+    params.sessionEntry?.responseUsage ??
+    (params.sessionKey ? params.sessionStore?.[params.sessionKey]?.responseUsage : undefined);
+  const current =
+    currentRaw === "full"
+      ? "full"
+      : currentRaw === "tokens" || currentRaw === "on"
+        ? "tokens"
+        : "off";
+  const next = requested ?? (current === "off" ? "tokens" : current === "tokens" ? "full" : "off");
+
+  if (params.sessionEntry && params.sessionStore && params.sessionKey) {
+    if (next === "off") delete params.sessionEntry.responseUsage;
+    else params.sessionEntry.responseUsage = next;
+    params.sessionEntry.updatedAt = Date.now();
+    params.sessionStore[params.sessionKey] = params.sessionEntry;
+    if (params.storePath) {
+      await updateSessionStore(params.storePath, (store) => {
+        store[params.sessionKey] = params.sessionEntry as SessionEntry;
+      });
+    }
+  }
+
+  return {
+    shouldContinue: false,
+    reply: {
+      text: `⚙️ Usage footer: ${next}.`,
+    },
+  };
+};
+
 export const handleRestartCommand: CommandHandler = async (params, allowTextCommands) => {
   if (!allowTextCommands) return null;
   if (params.command.commandBodyNormalized !== "/restart") return null;

src/auto-reply/reply/commands-status.ts

@@ -10,7 +10,10 @@ import {
   resolveAuthProfileOrder,
 } from "../../agents/auth-profiles.js";
 import { getCustomProviderApiKey, resolveEnvApiKey } from "../../agents/model-auth.js";
-import { resolveInternalSessionKey, resolveMainSessionAlias } from "../../agents/tools/sessions-helpers.js";
+import {
+  resolveInternalSessionKey,
+  resolveMainSessionAlias,
+} from "../../agents/tools/sessions-helpers.js";
 import { normalizeProviderId } from "../../agents/model-selection.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import type { SessionEntry, SessionScope } from "../../config/sessions.js";

src/auto-reply/reply/commands-subagents.ts

@@ -180,10 +180,7 @@ export const handleSubagentsCommand: CommandHandler = async (params, allowTextCo
     const sorted = sortSubagentRuns(runs);
     const active = sorted.filter((entry) => !entry.endedAt);
     const done = sorted.length - active.length;
-    const lines = [
-      "🧭 Subagents (current session)",
-      `Active: ${active.length} · Done: ${done}`,
-    ];
+    const lines = ["🧭 Subagents (current session)", `Active: ${active.length} · Done: ${done}`];
     sorted.forEach((entry, index) => {
       const status = formatRunStatus(entry);
       const label = formatRunLabel(entry);
@@ -396,8 +393,7 @@ export const handleSubagentsCommand: CommandHandler = async (params, allowTextCo
       shouldContinue: false,
       reply: {
         text:
-          replyText ??
-          `✅ Sent to ${formatRunLabel(resolved.entry)} (run ${runId.slice(0, 8)}).`,
+          replyText ?? `✅ Sent to ${formatRunLabel(resolved.entry)} (run ${runId.slice(0, 8)}).`,
       },
     };
   }

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

@@ -1,6 +1,9 @@
 import { describe, expect, it, vi } from "vitest";
 
-import { addSubagentRunForTests, resetSubagentRegistryForTests } from "../../agents/subagent-registry.js";
+import {
+  addSubagentRunForTests,
+  resetSubagentRegistryForTests,
+} from "../../agents/subagent-registry.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import * as internalHooks from "../../hooks/internal-hooks.js";
 import type { MsgContext } from "../templating.js";

src/auto-reply/reply/directives.ts

@@ -149,7 +149,7 @@ export function extractStatusDirective(body?: string): {
   hasDirective: boolean;
 } {
   if (!body) return { cleaned: "", hasDirective: false };
-  return extractSimpleDirective(body, ["status", "usage"]);
+  return extractSimpleDirective(body, ["status"]);
 }
 
 export type { ElevatedLevel, ReasoningLevel, ThinkLevel, VerboseLevel };

src/auto-reply/reply/reply-inline.ts

@@ -6,7 +6,7 @@ const INLINE_SIMPLE_COMMAND_ALIASES = new Map<string, string>([
 ]);
 const INLINE_SIMPLE_COMMAND_RE = /(?:^|\s)\/(help|commands|whoami|id)(?=$|\s|:)/i;
 
-const INLINE_STATUS_RE = /(?:^|\s)\/(?:status|usage)(?=$|\s|:)(?:\s*:\s*)?/gi;
+const INLINE_STATUS_RE = /(?:^|\s)\/status(?=$|\s|:)(?:\s*:\s*)?/gi;
 
 export function extractInlineSimpleCommand(body?: string): {
   command: string;

src/auto-reply/reply/subagents-utils.test.ts

@@ -49,12 +49,10 @@ describe("subagents utils", () => {
 
   it("formats run status from outcome and timestamps", () => {
     expect(formatRunStatus({ ...baseRun })).toBe("running");
-    expect(formatRunStatus({ ...baseRun, endedAt: 2000, outcome: { status: "ok" } })).toBe(
-      "done",
+    expect(formatRunStatus({ ...baseRun, endedAt: 2000, outcome: { status: "ok" } })).toBe("done");
+    expect(formatRunStatus({ ...baseRun, endedAt: 2000, outcome: { status: "timeout" } })).toBe(
+      "timeout",
     );
-    expect(
-      formatRunStatus({ ...baseRun, endedAt: 2000, outcome: { status: "timeout" } }),
-    ).toBe("timeout");
   });
 
   it("formats duration short for seconds and minutes", () => {

src/auto-reply/reply/subagents-utils.ts

@@ -28,10 +28,7 @@ export function resolveSubagentLabel(entry: SubagentRunRecord, fallback = "subag
   return raw || fallback;
 }
 
-export function formatRunLabel(
-  entry: SubagentRunRecord,
-  options?: { maxLength?: number },
-) {
+export function formatRunLabel(entry: SubagentRunRecord, options?: { maxLength?: number }) {
   const raw = resolveSubagentLabel(entry);
   const maxLength = options?.maxLength ?? 72;
   if (!Number.isFinite(maxLength) || maxLength <= 0) return raw;