fix: avoid logging stale anthropic usage (#1501) (thanks @parubets)

Added a dedicated Anthropic payload logger that writes exact request
JSON (as sent) plus per‑run usage stats (input/output/cache read/write)
to a
  standalone JSONL file, gated by an env flag.

  Changes

  - New logger: src/agents/anthropic-payload-log.ts (writes
logs/anthropic-payload.jsonl under the state dir, optional override via
env).
  - Hooked into embedded runs to wrap the stream function and record
usage: src/agents/pi-embedded-runner/run/attempt.ts.

  How to enable

  - CLAWDBOT_ANTHROPIC_PAYLOAD_LOG=1
  - Optional:
CLAWDBOT_ANTHROPIC_PAYLOAD_LOG_FILE=/path/to/anthropic-payload.jsonl

  What you’ll get (JSONL)

  - stage: "request" with payload (exact Anthropic params) +
payloadDigest
  - stage: "usage" with usage
(input/output/cacheRead/cacheWrite/totalTokens/etc.)

  Notes

  - Usage is taken from the last assistant message in the run; if the
run fails before usage is present, you’ll only see an error field.

  Files touched

  - src/agents/anthropic-payload-log.ts
  - src/agents/pi-embedded-runner/run/attempt.ts

  Tests not run.

CHANGELOG.md

@@ -5,13 +5,14 @@ Docs: https://docs.clawd.bot
 ## 2026.1.23 (Unreleased)
 
 ### Changes
+- Agents: keep system prompt time zone-only and move current time to `session_status` for better cache hits.
 - Browser: add node-host proxy auto-routing for remote gateways (configurable per gateway/node).
 - Plugins: add optional llm-task JSON-only tool for workflows. (#1498) Thanks @vignesh07.
-- Plugins: add LLM-free plugin slash commands and include them in `/commands`. (#1558) Thanks @Glucksberg.
 - CLI: restart the gateway by default after `clawdbot update`; add `--no-restart` to skip it.
 - CLI: add live auth probes to `clawdbot models status` for per-profile verification.
 - CLI: add `clawdbot system` for system events + heartbeat controls; remove standalone `wake`.
 - Agents: add Bedrock auto-discovery defaults + config overrides. (#1553) Thanks @fal3.
+- Agents: add diagnostics-configured Anthropic payload logging. (#1501) Thanks @parubets.
 - Docs: add cron vs heartbeat decision guide (with Lobster workflow notes). (#1533) Thanks @JustYannicc.
 - Docs: clarify HEARTBEAT.md empty file skips heartbeats, missing file still runs. (#1535) Thanks @JustYannicc.
 - Markdown: add per-channel table conversion (bullets for Signal/WhatsApp, code blocks elsewhere). (#1495) Thanks @odysseus0.

docs/concepts/system-prompt.md

@@ -66,12 +66,12 @@ To inspect how much each injected file contributes (raw vs injected, truncation,
 
 ## Time handling
 
-The system prompt includes a dedicated **Current Date & Time** section when user
-time or timezone is known. It is explicit about:
+The system prompt includes a dedicated **Current Date & Time** section when the
+user timezone is known. To keep the prompt cache-stable, it now only includes
+the **time zone** (no dynamic clock or time format).
 
-- The user’s **local time** (already converted).
-- The **time zone** used for the conversion.
-- The **time format** (12-hour / 24-hour).
+Use `session_status` when the agent needs the current time; the status card
+includes a timestamp line.
 
 Configure with:
 

docs/date-time.md

@@ -7,8 +7,8 @@ read_when:
 
 # Date & Time
 
-Clawdbot defaults to **host-local time for transport timestamps** and **user-local time only in the system prompt**.
-Provider timestamps are preserved so tools keep their native semantics.
+Clawdbot defaults to **host-local time for transport timestamps** and **user timezone only in the system prompt**.
+Provider timestamps are preserved so tools keep their native semantics (current time is available via `session_status`).
 
 ## Message envelopes (local by default)
 
@@ -63,16 +63,16 @@ You can override this behavior:
 
 ## System prompt: Current Date & Time
 
-If the user timezone or local time is known, the system prompt includes a dedicated
-**Current Date & Time** section:
+If the user timezone is known, the system prompt includes a dedicated
+**Current Date & Time** section with the **time zone only** (no clock/time format)
+to keep prompt caching stable:
 
 ```
-Thursday, January 15th, 2026 — 3:07 PM (America/Chicago)
-Time format: 12-hour
+Time zone: America/Chicago
 ```
 
-If only the timezone is known, we still include the section and instruct the model
-to assume UTC for unknown time references.
+When the agent needs the current time, use the `session_status` tool; the status
+card includes a timestamp line.
 
 ## System event lines (local by default)
 

docs/logging.md

@@ -95,6 +95,29 @@ Console logs are **TTY-aware** and formatted for readability:
 
 Console formatting is controlled by `logging.consoleStyle`.
 
+## Anthropic payload log (debugging)
+
+For Anthropic-only runs, you can enable a dedicated JSONL log that captures the
+exact request payload (as sent) plus per-run usage stats. This log includes full
+prompt/message data; treat it as sensitive.
+
+```json
+{
+  "diagnostics": {
+    "anthropicPayloadLog": {
+      "enabled": true,
+      "filePath": "/path/to/anthropic-payload.jsonl"
+    }
+  }
+}
+```
+
+Defaults + overrides:
+
+- Default path: `$CLAWDBOT_STATE_DIR/logs/anthropic-payload.jsonl`
+- Env enable: `CLAWDBOT_ANTHROPIC_PAYLOAD_LOG=1`
+- Env path: `CLAWDBOT_ANTHROPIC_PAYLOAD_LOG_FILE=/path/to/anthropic-payload.jsonl`
+
 ## Configuring logging
 
 All logging configuration lives under `logging` in `~/.clawdbot/clawdbot.json`.

docs/plugin.md

@@ -62,7 +62,6 @@ Plugins can register:
 - Background services
 - Optional config validation
 - **Skills** (by listing `skills` directories in the plugin manifest)
-- **Auto-reply commands** (execute without invoking the AI agent)
 
 Plugins run **in‑process** with the Gateway, so treat them as trusted code.
 Tool authoring guide: [Plugin agent tools](/plugins/agent-tools).
@@ -495,66 +494,6 @@ export default function (api) {
 }
 ```
 
-### Register auto-reply commands
-
-Plugins can register custom slash commands that execute **without invoking the
-AI agent**. This is useful for toggle commands, status checks, or quick actions
-that don't need LLM processing.
-
-```ts
-export default function (api) {
-  api.registerCommand({
-    name: "mystatus",
-    description: "Show plugin status",
-    handler: (ctx) => ({
-      text: `Plugin is running! Channel: ${ctx.channel}`,
-    }),
-  });
-}
-```
-
-Command handler context:
-
-- `senderId`: The sender's ID (if available)
-- `channel`: The channel where the command was sent
-- `isAuthorizedSender`: Whether the sender is an authorized user
-- `args`: Arguments passed after the command (if `acceptsArgs: true`)
-- `commandBody`: The full command text
-- `config`: The current Clawdbot config
-
-Command options:
-
-- `name`: Command name (without the leading `/`)
-- `description`: Help text shown in command lists
-- `acceptsArgs`: Whether the command accepts arguments (default: false). If false and arguments are provided, the command won't match and the message falls through to other handlers
-- `requireAuth`: Whether to require authorized sender (default: true)
-- `handler`: Function that returns `{ text: string }` (can be async)
-
-Example with authorization and arguments:
-
-```ts
-api.registerCommand({
-  name: "setmode",
-  description: "Set plugin mode",
-  acceptsArgs: true,
-  requireAuth: true,
-  handler: async (ctx) => {
-    const mode = ctx.args?.trim() || "default";
-    await saveMode(mode);
-    return { text: `Mode set to: ${mode}` };
-  },
-});
-```
-
-Notes:
-- Plugin commands are processed **before** built-in commands and the AI agent
-- Commands are registered globally and work across all channels
-- Command names are case-insensitive (`/MyStatus` matches `/mystatus`)
-- Command names must start with a letter and contain only letters, numbers, hyphens, and underscores
-- Telegram native commands only allow `a-z0-9_` (max 32 chars). Use underscores (not hyphens) if you want a plugin command to appear in Telegram’s native command list.
-- Reserved command names (like `help`, `status`, `reset`, etc.) cannot be overridden by plugins
-- Duplicate command registration across plugins will fail with a diagnostic error
-
 ### Register background services
 
 ```ts

src/agents/anthropic-payload-log.test.ts

@@ -0,0 +1,182 @@
+import { describe, expect, it } from "vitest";
+
+import type { StreamFn } from "@mariozechner/pi-agent-core";
+
+import type { ClawdbotConfig } from "../config/config.js";
+import { resolveUserPath } from "../utils.js";
+import { createAnthropicPayloadLogger } from "./anthropic-payload-log.js";
+
+describe("createAnthropicPayloadLogger", () => {
+  it("returns null when diagnostics payload logging is disabled", () => {
+    const logger = createAnthropicPayloadLogger({
+      cfg: {} as ClawdbotConfig,
+      env: {},
+      modelApi: "anthropic-messages",
+    });
+
+    expect(logger).toBeNull();
+  });
+
+  it("returns null when model api is not anthropic", () => {
+    const logger = createAnthropicPayloadLogger({
+      cfg: {
+        diagnostics: {
+          anthropicPayloadLog: {
+            enabled: true,
+          },
+        },
+      },
+      env: {},
+      modelApi: "openai",
+      writer: {
+        filePath: "memory",
+        write: () => undefined,
+      },
+    });
+
+    expect(logger).toBeNull();
+  });
+
+  it("honors diagnostics config and expands file paths", () => {
+    const lines: string[] = [];
+    const logger = createAnthropicPayloadLogger({
+      cfg: {
+        diagnostics: {
+          anthropicPayloadLog: {
+            enabled: true,
+            filePath: "~/.clawdbot/logs/anthropic-payload.jsonl",
+          },
+        },
+      },
+      env: {},
+      modelApi: "anthropic-messages",
+      writer: {
+        filePath: "memory",
+        write: (line) => lines.push(line),
+      },
+    });
+
+    expect(logger).not.toBeNull();
+    expect(logger?.filePath).toBe(resolveUserPath("~/.clawdbot/logs/anthropic-payload.jsonl"));
+
+    logger?.recordUsage([
+      {
+        role: "assistant",
+        usage: {
+          input: 12,
+        },
+      } as unknown as {
+        role: string;
+        usage: { input: number };
+      },
+    ]);
+
+    const event = JSON.parse(lines[0]?.trim() ?? "{}") as Record<string, unknown>;
+    expect(event.stage).toBe("usage");
+    expect(event.usage).toEqual({ input: 12 });
+  });
+
+  it("skips usage when no new assistant message was added", () => {
+    const lines: string[] = [];
+    const logger = createAnthropicPayloadLogger({
+      cfg: {
+        diagnostics: {
+          anthropicPayloadLog: {
+            enabled: true,
+          },
+        },
+      },
+      env: {},
+      modelApi: "anthropic-messages",
+      writer: {
+        filePath: "memory",
+        write: (line) => lines.push(line),
+      },
+    });
+
+    logger?.recordUsage(
+      [
+        {
+          role: "assistant",
+          usage: {
+            input: 1,
+          },
+        } as unknown as {
+          role: string;
+          usage: { input: number };
+        },
+      ],
+      undefined,
+      1,
+    );
+
+    expect(lines.length).toBe(0);
+  });
+
+  it("records request payloads and forwards onPayload", async () => {
+    const lines: string[] = [];
+    let forwarded: unknown;
+    const logger = createAnthropicPayloadLogger({
+      cfg: {
+        diagnostics: {
+          anthropicPayloadLog: {
+            enabled: true,
+          },
+        },
+      },
+      env: {},
+      modelApi: "anthropic-messages",
+      writer: {
+        filePath: "memory",
+        write: (line) => lines.push(line),
+      },
+    });
+
+    const streamFn = ((_, __, options) => {
+      options?.onPayload?.({ hello: "world" });
+      return Promise.resolve(undefined);
+    }) as StreamFn;
+
+    const wrapped = logger?.wrapStreamFn(streamFn);
+    await wrapped?.(
+      { api: "anthropic-messages" } as unknown as { api: string },
+      {},
+      {
+        onPayload: (payload) => {
+          forwarded = payload;
+        },
+      },
+    );
+
+    const event = JSON.parse(lines[0]?.trim() ?? "{}") as Record<string, unknown>;
+    expect(event.stage).toBe("request");
+    expect(event.payload).toEqual({ hello: "world" });
+    expect(event.payloadDigest).toBeTruthy();
+    expect(forwarded).toEqual({ hello: "world" });
+  });
+
+  it("records errors when usage is missing", () => {
+    const lines: string[] = [];
+    const logger = createAnthropicPayloadLogger({
+      cfg: {
+        diagnostics: {
+          anthropicPayloadLog: {
+            enabled: true,
+          },
+        },
+      },
+      env: {},
+      modelApi: "anthropic-messages",
+      writer: {
+        filePath: "memory",
+        write: (line) => lines.push(line),
+      },
+    });
+
+    logger?.recordUsage([], new Error("boom"));
+
+    const event = JSON.parse(lines[0]?.trim() ?? "{}") as Record<string, unknown>;
+    expect(event.stage).toBe("usage");
+    expect(event.error).toContain("boom");
+  });
+});

src/agents/anthropic-payload-log.ts

@@ -0,0 +1,224 @@
+import crypto from "node:crypto";
+import fs from "node:fs/promises";
+import path from "node:path";
+
+import type { AgentMessage, StreamFn } from "@mariozechner/pi-agent-core";
+import type { Api, Model } from "@mariozechner/pi-ai";
+
+import type { ClawdbotConfig } from "../config/config.js";
+import { resolveStateDir } from "../config/paths.js";
+import { formatErrorMessage } from "../infra/errors.js";
+import { parseBooleanValue } from "../utils/boolean.js";
+import { resolveUserPath } from "../utils.js";
+import { createSubsystemLogger } from "../logging/subsystem.js";
+
+type PayloadLogStage = "request" | "usage";
+
+type PayloadLogEvent = {
+  ts: string;
+  stage: PayloadLogStage;
+  runId?: string;
+  sessionId?: string;
+  sessionKey?: string;
+  provider?: string;
+  modelId?: string;
+  modelApi?: string | null;
+  workspaceDir?: string;
+  payload?: unknown;
+  usage?: Record<string, unknown>;
+  error?: string;
+  payloadDigest?: string;
+};
+
+type PayloadLogConfig = {
+  enabled: boolean;
+  filePath: string;
+};
+
+type PayloadLogInit = {
+  cfg?: ClawdbotConfig;
+  env?: NodeJS.ProcessEnv;
+};
+
+type PayloadLogWriter = {
+  filePath: string;
+  write: (line: string) => void;
+};
+
+const writers = new Map<string, PayloadLogWriter>();
+const log = createSubsystemLogger("agent/anthropic-payload");
+
+function resolvePayloadLogConfig(params: PayloadLogInit): PayloadLogConfig {
+  const env = params.env ?? process.env;
+  const config = params.cfg?.diagnostics?.anthropicPayloadLog;
+  const envEnabled = parseBooleanValue(env.CLAWDBOT_ANTHROPIC_PAYLOAD_LOG);
+  const enabled = envEnabled ?? config?.enabled ?? false;
+  const fileOverride = config?.filePath?.trim() || env.CLAWDBOT_ANTHROPIC_PAYLOAD_LOG_FILE?.trim();
+  const filePath = fileOverride
+    ? resolveUserPath(fileOverride)
+    : path.join(resolveStateDir(env), "logs", "anthropic-payload.jsonl");
+  return { enabled, filePath };
+}
+
+function getWriter(filePath: string): PayloadLogWriter {
+  const existing = writers.get(filePath);
+  if (existing) return existing;
+
+  const dir = path.dirname(filePath);
+  const ready = fs.mkdir(dir, { recursive: true }).catch(() => undefined);
+  let queue = Promise.resolve();
+
+  const writer: PayloadLogWriter = {
+    filePath,
+    write: (line: string) => {
+      queue = queue
+        .then(() => ready)
+        .then(() => fs.appendFile(filePath, line, "utf8"))
+        .catch(() => undefined);
+    },
+  };
+
+  writers.set(filePath, writer);
+  return writer;
+}
+
+function safeJsonStringify(value: unknown): string | null {
+  try {
+    return JSON.stringify(value, (_key, val) => {
+      if (typeof val === "bigint") return val.toString();
+      if (typeof val === "function") return "[Function]";
+      if (val instanceof Error) {
+        return { name: val.name, message: val.message, stack: val.stack };
+      }
+      if (val instanceof Uint8Array) {
+        return { type: "Uint8Array", data: Buffer.from(val).toString("base64") };
+      }
+      return val;
+    });
+  } catch {
+    return null;
+  }
+}
+
+function digest(value: unknown): string | undefined {
+  const serialized = safeJsonStringify(value);
+  if (!serialized) return undefined;
+  return crypto.createHash("sha256").update(serialized).digest("hex");
+}
+
+function isAnthropicModel(model: Model<Api> | undefined | null): boolean {
+  return (model as { api?: unknown })?.api === "anthropic-messages";
+}
+
+function findLastAssistantUsage(
+  messages: AgentMessage[],
+  minIndex = 0,
+): Record<string, unknown> | null {
+  for (let i = messages.length - 1; i >= 0; i -= 1) {
+    if (i < minIndex) break;
+    const msg = messages[i] as { role?: unknown; usage?: unknown };
+    if (msg?.role === "assistant" && msg.usage && typeof msg.usage === "object") {
+      return msg.usage as Record<string, unknown>;
+    }
+  }
+  return null;
+}
+
+export type AnthropicPayloadLogger = {
+  enabled: true;
+  filePath: string;
+  wrapStreamFn: (streamFn: StreamFn) => StreamFn;
+  recordUsage: (messages: AgentMessage[], error?: unknown, baselineMessageCount?: number) => void;
+};
+
+export function createAnthropicPayloadLogger(params: {
+  cfg?: ClawdbotConfig;
+  env?: NodeJS.ProcessEnv;
+  runId?: string;
+  sessionId?: string;
+  sessionKey?: string;
+  provider?: string;
+  modelId?: string;
+  modelApi?: string | null;
+  workspaceDir?: string;
+  writer?: PayloadLogWriter;
+}): AnthropicPayloadLogger | null {
+  const env = params.env ?? process.env;
+  const cfg = resolvePayloadLogConfig({ env, cfg: params.cfg });
+  if (!cfg.enabled) return null;
+  if (params.modelApi !== "anthropic-messages") return null;
+
+  const writer = params.writer ?? getWriter(cfg.filePath);
+  const base: Omit<PayloadLogEvent, "ts" | "stage"> = {
+    runId: params.runId,
+    sessionId: params.sessionId,
+    sessionKey: params.sessionKey,
+    provider: params.provider,
+    modelId: params.modelId,
+    modelApi: params.modelApi,
+    workspaceDir: params.workspaceDir,
+  };
+
+  const record = (event: PayloadLogEvent) => {
+    const line = safeJsonStringify(event);
+    if (!line) return;
+    writer.write(`${line}\n`);
+  };
+
+  const wrapStreamFn: AnthropicPayloadLogger["wrapStreamFn"] = (streamFn) => {
+    const wrapped: StreamFn = (model, context, options) => {
+      if (!isAnthropicModel(model as Model<Api>)) {
+        return streamFn(model, context, options);
+      }
+      const nextOnPayload = (payload: unknown) => {
+        record({
+          ...base,
+          ts: new Date().toISOString(),
+          stage: "request",
+          payload,
+          payloadDigest: digest(payload),
+        });
+        options?.onPayload?.(payload);
+      };
+      return streamFn(model, context, {
+        ...options,
+        onPayload: nextOnPayload,
+      });
+    };
+    return wrapped;
+  };
+
+  const recordUsage: AnthropicPayloadLogger["recordUsage"] = (
+    messages,
+    error,
+    baselineMessageCount,
+  ) => {
+    const usage = findLastAssistantUsage(messages, baselineMessageCount ?? 0);
+    if (!usage) {
+      if (error) {
+        record({
+          ...base,
+          ts: new Date().toISOString(),
+          stage: "usage",
+          error: formatErrorMessage(error),
+        });
+      }
+      return;
+    }
+    record({
+      ...base,
+      ts: new Date().toISOString(),
+      stage: "usage",
+      usage,
+      error: error ? formatErrorMessage(error) : undefined,
+    });
+    log.info("anthropic usage", {
+      runId: params.runId,
+      sessionId: params.sessionId,
+      usage,
+    });
+  };
+
+  log.info("anthropic payload logger enabled", { filePath: cfg.filePath });
+  return { enabled: true, filePath: cfg.filePath, wrapStreamFn, recordUsage };
+}

src/agents/pi-embedded-runner/run/attempt.ts

@@ -20,6 +20,7 @@ import { isReasoningTagProvider } from "../../../utils/provider-utils.js";
 import { isSubagentSessionKey } from "../../../routing/session-key.js";
 import { resolveUserPath } from "../../../utils.js";
 import { createCacheTrace } from "../../cache-trace.js";
+import { createAnthropicPayloadLogger } from "../../anthropic-payload-log.js";
 import { resolveClawdbotAgentDir } from "../../agent-paths.js";
 import { resolveSessionAgentIds } from "../../agent-scope.js";
 import { makeBootstrapWarn, resolveBootstrapContextForRun } from "../../bootstrap-files.js";
@@ -458,6 +459,17 @@ export async function runEmbeddedAttempt(
         modelApi: params.model.api,
         workspaceDir: params.workspaceDir,
       });
+      const anthropicPayloadLogger = createAnthropicPayloadLogger({
+        cfg: params.config,
+        env: process.env,
+        runId: params.runId,
+        sessionId: activeSession.sessionId,
+        sessionKey: params.sessionKey,
+        provider: params.provider,
+        modelId: params.modelId,
+        modelApi: params.model.api,
+        workspaceDir: params.workspaceDir,
+      });
 
       // Force a stable streamFn reference so vitest can reliably mock @mariozechner/pi-ai.
       activeSession.agent.streamFn = streamSimple;
@@ -478,6 +490,11 @@ export async function runEmbeddedAttempt(
         });
         activeSession.agent.streamFn = cacheTrace.wrapStreamFn(activeSession.agent.streamFn);
       }
+      if (anthropicPayloadLogger) {
+        activeSession.agent.streamFn = anthropicPayloadLogger.wrapStreamFn(
+          activeSession.agent.streamFn,
+        );
+      }
 
       try {
         const prior = await sanitizeSessionHistory({
@@ -626,6 +643,7 @@ export async function runEmbeddedAttempt(
 
       let messagesSnapshot: AgentMessage[] = [];
       let sessionIdUsed = activeSession.sessionId;
+      let promptStartMessageCount = activeSession.messages.length;
       const onAbort = () => {
         const reason = params.abortSignal ? getAbortReason(params.abortSignal) : undefined;
         const timeout = reason ? isTimeoutError(reason) : false;
@@ -697,6 +715,8 @@ export async function runEmbeddedAttempt(
           );
         }
 
+        promptStartMessageCount = activeSession.messages.length;
+
         try {
           // Detect and load images referenced in the prompt for vision-capable models.
           // This eliminates the need for an explicit "view" tool call by injecting
@@ -772,6 +792,7 @@ export async function runEmbeddedAttempt(
           messages: messagesSnapshot,
           note: promptError ? "prompt error" : undefined,
         });
+        anthropicPayloadLogger?.recordUsage(messagesSnapshot, promptError, promptStartMessageCount);
 
         // Run agent_end hooks to allow plugins to analyze the conversation
         // This is fire-and-forget, so we don't await

src/agents/system-prompt.test.ts

@@ -124,7 +124,7 @@ describe("buildAgentSystemPrompt", () => {
     expect(prompt).toContain("Reminder: commit your changes in this workspace after edits.");
   });
 
-  it("includes user time when provided (12-hour)", () => {
+  it("includes user timezone when provided (12-hour)", () => {
     const prompt = buildAgentSystemPrompt({
       workspaceDir: "/tmp/clawd",
       userTimezone: "America/Chicago",
@@ -133,11 +133,10 @@ describe("buildAgentSystemPrompt", () => {
     });
 
     expect(prompt).toContain("## Current Date & Time");
-    expect(prompt).toContain("Monday, January 5th, 2026 — 3:26 PM (America/Chicago)");
-    expect(prompt).toContain("Time format: 12-hour");
+    expect(prompt).toContain("Time zone: America/Chicago");
   });
 
-  it("includes user time when provided (24-hour)", () => {
+  it("includes user timezone when provided (24-hour)", () => {
     const prompt = buildAgentSystemPrompt({
       workspaceDir: "/tmp/clawd",
       userTimezone: "America/Chicago",
@@ -146,11 +145,10 @@ describe("buildAgentSystemPrompt", () => {
     });
 
     expect(prompt).toContain("## Current Date & Time");
-    expect(prompt).toContain("Monday, January 5th, 2026 — 15:26 (America/Chicago)");
-    expect(prompt).toContain("Time format: 24-hour");
+    expect(prompt).toContain("Time zone: America/Chicago");
   });
 
-  it("shows UTC fallback when only timezone is provided", () => {
+  it("shows timezone when only timezone is provided", () => {
     const prompt = buildAgentSystemPrompt({
       workspaceDir: "/tmp/clawd",
       userTimezone: "America/Chicago",
@@ -158,9 +156,7 @@ describe("buildAgentSystemPrompt", () => {
     });
 
     expect(prompt).toContain("## Current Date & Time");
-    expect(prompt).toContain(
-      "Time zone: America/Chicago. Current time unknown; assume UTC for date/time references.",
-    );
+    expect(prompt).toContain("Time zone: America/Chicago");
   });
 
   it("includes model alias guidance when aliases are provided", () => {

src/agents/system-prompt.ts

@@ -49,22 +49,9 @@ function buildUserIdentitySection(ownerLine: string | undefined, isMinimal: bool
   return ["## User Identity", ownerLine, ""];
 }
 
-function buildTimeSection(params: {
-  userTimezone?: string;
-  userTime?: string;
-  userTimeFormat?: ResolvedTimeFormat;
-}) {
-  if (!params.userTimezone && !params.userTime) return [];
-  return [
-    "## Current Date & Time",
-    params.userTime
-      ? `${params.userTime} (${params.userTimezone ?? "unknown"})`
-      : `Time zone: ${params.userTimezone}. Current time unknown; assume UTC for date/time references.`,
-    params.userTimeFormat
-      ? `Time format: ${params.userTimeFormat === "24" ? "24-hour" : "12-hour"}`
-      : "",
-    "",
-  ];
+function buildTimeSection(params: { userTimezone?: string }) {
+  if (!params.userTimezone) return [];
+  return ["## Current Date & Time", `Time zone: ${params.userTimezone}`, ""];
 }
 
 function buildReplyTagsSection(isMinimal: boolean) {
@@ -212,7 +199,7 @@ export function buildAgentSystemPrompt(params: {
     sessions_send: "Send a message to another session/sub-agent",
     sessions_spawn: "Spawn a sub-agent session",
     session_status:
-      "Show a /status-equivalent status card (usage + Reasoning/Verbose/Elevated); use for model-use questions (📊 session_status); optional per-session model override",
+      "Show a /status-equivalent status card (usage + time + Reasoning/Verbose/Elevated); use for model-use questions (📊 session_status); optional per-session model override",
     image: "Analyze an image with the configured image model",
   };
 
@@ -302,7 +289,6 @@ export function buildAgentSystemPrompt(params: {
     : undefined;
   const reasoningLevel = params.reasoningLevel ?? "off";
   const userTimezone = params.userTimezone?.trim();
-  const userTime = params.userTime?.trim();
   const skillsPrompt = params.skillsPrompt?.trim();
   const heartbeatPrompt = params.heartbeatPrompt?.trim();
   const heartbeatPromptLine = heartbeatPrompt
@@ -465,8 +451,6 @@ export function buildAgentSystemPrompt(params: {
     ...buildUserIdentitySection(ownerLine, isMinimal),
     ...buildTimeSection({
       userTimezone,
-      userTime,
-      userTimeFormat: params.userTimeFormat,
     }),
     "## Workspace Files (injected)",
     "These user-editable files are loaded by Clawdbot and included below in Project Context.",

src/agents/tools/session-status-tool.ts

@@ -15,6 +15,7 @@ import {
   resolveDefaultModelForAgent,
   resolveModelRefFromString,
 } from "../../agents/model-selection.js";
+import { formatUserTime, resolveUserTimeFormat, resolveUserTimezone } from "../date-time.js";
 import { normalizeGroupActivation } from "../../auto-reply/group-activation.js";
 import { getFollowupQueueDepth, resolveQueueSettings } from "../../auto-reply/reply/queue.js";
 import { buildStatusMessage } from "../../auto-reply/status.js";
@@ -215,7 +216,7 @@ export function createSessionStatusTool(opts?: {
     label: "Session Status",
     name: "session_status",
     description:
-      "Show a /status-equivalent session status card (usage + cost when available). Use for model-use questions (📊 session_status). Optional: set per-session model override (model=default resets overrides).",
+      "Show a /status-equivalent session status card (usage + time + cost when available). Use for model-use questions (📊 session_status). Optional: set per-session model override (model=default resets overrides).",
     parameters: SessionStatusToolSchema,
     execute: async (_toolCallId, args) => {
       const params = args as Record<string, unknown>;
@@ -324,6 +325,13 @@ export function createSessionStatusTool(opts?: {
         resolved.entry.queueDebounceMs ?? resolved.entry.queueCap ?? resolved.entry.queueDrop,
       );
 
+      const userTimezone = resolveUserTimezone(cfg.agents?.defaults?.userTimezone);
+      const userTimeFormat = resolveUserTimeFormat(cfg.agents?.defaults?.timeFormat);
+      const userTime = formatUserTime(new Date(), userTimezone, userTimeFormat);
+      const timeLine = userTime
+        ? `🕒 Time: ${userTime} (${userTimezone})`
+        : `🕒 Time zone: ${userTimezone}`;
+
       const agentDefaults = cfg.agents?.defaults ?? {};
       const defaultLabel = `${configured.provider}/${configured.model}`;
       const agentModel =
@@ -346,6 +354,7 @@ export function createSessionStatusTool(opts?: {
           agentDir,
         }),
         usageLine,
+        timeLine,
         queue: {
           mode: queueSettings.mode,
           depth: queueDepth,

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

@@ -8,7 +8,6 @@ import {
   listChatCommandsForConfig,
   listNativeCommandSpecs,
   listNativeCommandSpecsForConfig,
-  normalizeNativeCommandSpecsForSurface,
   normalizeCommandBody,
   parseCommandArgs,
   resolveCommandArgMenu,
@@ -16,18 +15,15 @@ import {
   shouldHandleTextCommands,
 } from "./commands-registry.js";
 import type { ChatCommandDefinition } from "./commands-registry.types.js";
-import { clearPluginCommands, registerPluginCommand } from "../plugins/commands.js";
 import { setActivePluginRegistry } from "../plugins/runtime.js";
 import { createTestRegistry } from "../test-utils/channel-plugins.js";
 
 beforeEach(() => {
   setActivePluginRegistry(createTestRegistry([]));
-  clearPluginCommands();
 });
 
 afterEach(() => {
   setActivePluginRegistry(createTestRegistry([]));
-  clearPluginCommands();
 });
 
 describe("commands registry", () => {
@@ -46,20 +42,6 @@ describe("commands registry", () => {
     expect(specs.find((spec) => spec.name === "compact")).toBeFalsy();
   });
 
-  it("normalizes telegram native command specs", () => {
-    const specs = [
-      { name: "OK", description: "Ok", acceptsArgs: false },
-      { name: "bad-name", description: "Bad", acceptsArgs: false },
-      { name: "fine_name", description: "Fine", acceptsArgs: false },
-      { name: "ok", description: "Dup", acceptsArgs: false },
-    ];
-    const normalized = normalizeNativeCommandSpecsForSurface({
-      surface: "telegram",
-      specs,
-    });
-    expect(normalized.map((spec) => spec.name)).toEqual(["ok", "fine_name"]);
-  });
-
   it("filters commands based on config flags", () => {
     const disabled = listChatCommandsForConfig({
       commands: { config: false, debug: false },
@@ -103,19 +85,6 @@ describe("commands registry", () => {
     expect(native.find((spec) => spec.name === "demo_skill")).toBeTruthy();
   });
 
-  it("includes plugin commands in native specs", () => {
-    registerPluginCommand("plugin-core", {
-      name: "plugstatus",
-      description: "Plugin status",
-      handler: () => ({ text: "ok" }),
-    });
-    const native = listNativeCommandSpecsForConfig(
-      { commands: { config: false, debug: false, native: true } },
-      { skillCommands: [] },
-    );
-    expect(native.find((spec) => spec.name === "plugstatus")).toBeTruthy();
-  });
-
   it("detects known text commands", () => {
     const detection = getCommandDetection();
     expect(detection.exact.has("/commands")).toBe(true);

src/auto-reply/commands-registry.ts

@@ -1,13 +1,8 @@
 import type { ClawdbotConfig } from "../config/types.js";
 import type { SkillCommandSpec } from "../agents/skills.js";
 import { getChatCommands, getNativeCommandSurfaces } from "./commands-registry.data.js";
-import { getPluginCommandSpecs } from "../plugins/commands.js";
 import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "../agents/defaults.js";
 import { resolveConfiguredModelRef } from "../agents/model-selection.js";
-import {
-  normalizeTelegramCommandName,
-  TELEGRAM_COMMAND_NAME_PATTERN,
-} from "../config/telegram-custom-commands.js";
 import type {
   ChatCommandDefinition,
   CommandArgChoiceContext,
@@ -113,7 +108,7 @@ export function listChatCommandsForConfig(
 export function listNativeCommandSpecs(params?: {
   skillCommands?: SkillCommandSpec[];
 }): NativeCommandSpec[] {
-  const base = listChatCommands({ skillCommands: params?.skillCommands })
+  return listChatCommands({ skillCommands: params?.skillCommands })
     .filter((command) => command.scope !== "text" && command.nativeName)
     .map((command) => ({
       name: command.nativeName ?? command.key,
@@ -121,18 +116,13 @@ export function listNativeCommandSpecs(params?: {
       acceptsArgs: Boolean(command.acceptsArgs),
       args: command.args,
     }));
-  const pluginSpecs = getPluginCommandSpecs();
-  if (pluginSpecs.length === 0) return base;
-  const seen = new Set(base.map((spec) => spec.name.toLowerCase()));
-  const extras = pluginSpecs.filter((spec) => !seen.has(spec.name.toLowerCase()));
-  return extras.length > 0 ? [...base, ...extras] : base;
 }
 
 export function listNativeCommandSpecsForConfig(
   cfg: ClawdbotConfig,
   params?: { skillCommands?: SkillCommandSpec[] },
 ): NativeCommandSpec[] {
-  const base = listChatCommandsForConfig(cfg, params)
+  return listChatCommandsForConfig(cfg, params)
     .filter((command) => command.scope !== "text" && command.nativeName)
     .map((command) => ({
       name: command.nativeName ?? command.key,
@@ -140,42 +130,6 @@ export function listNativeCommandSpecsForConfig(
       acceptsArgs: Boolean(command.acceptsArgs),
       args: command.args,
     }));
-  const pluginSpecs = getPluginCommandSpecs();
-  if (pluginSpecs.length === 0) return base;
-  const seen = new Set(base.map((spec) => spec.name.toLowerCase()));
-  const extras = pluginSpecs.filter((spec) => !seen.has(spec.name.toLowerCase()));
-  return extras.length > 0 ? [...base, ...extras] : base;
-}
-
-function normalizeNativeCommandNameForSurface(name: string, surface: string): string | null {
-  const trimmed = name.trim();
-  if (!trimmed) return null;
-  if (surface === "telegram") {
-    const normalized = normalizeTelegramCommandName(trimmed);
-    if (!normalized) return null;
-    if (!TELEGRAM_COMMAND_NAME_PATTERN.test(normalized)) return null;
-    return normalized;
-  }
-  return trimmed;
-}
-
-export function normalizeNativeCommandSpecsForSurface(params: {
-  surface: string;
-  specs: NativeCommandSpec[];
-}): NativeCommandSpec[] {
-  const surface = params.surface.toLowerCase();
-  if (!surface) return params.specs;
-  const normalized: NativeCommandSpec[] = [];
-  const seen = new Set<string>();
-  for (const spec of params.specs) {
-    const normalizedName = normalizeNativeCommandNameForSurface(spec.name, surface);
-    if (!normalizedName) continue;
-    const key = normalizedName.toLowerCase();
-    if (seen.has(key)) continue;
-    seen.add(key);
-    normalized.push(normalizedName === spec.name ? spec : { ...spec, name: normalizedName });
-  }
-  return normalized;
 }
 
 export function findCommandByNativeName(name: string): ChatCommandDefinition | undefined {

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

@@ -24,7 +24,6 @@ import {
   handleStopCommand,
   handleUsageCommand,
 } from "./commands-session.js";
-import { handlePluginCommand } from "./commands-plugin.js";
 import type {
   CommandHandler,
   CommandHandlerResult,
@@ -32,8 +31,6 @@ import type {
 } from "./commands-types.js";
 
 const HANDLERS: CommandHandler[] = [
-  // Plugin commands are processed first, before built-in commands
-  handlePluginCommand,
   handleBashCommand,
   handleActivationCommand,
   handleSendPolicyCommand,

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

@@ -1,53 +0,0 @@
-import { beforeEach, describe, expect, it } from "vitest";
-import type { ClawdbotConfig } from "../../config/config.js";
-import { clearPluginCommands, registerPluginCommand } from "../../plugins/commands.js";
-import type { HandleCommandsParams } from "./commands-types.js";
-import { handlePluginCommand } from "./commands-plugin.js";
-
-describe("handlePluginCommand", () => {
-  beforeEach(() => {
-    clearPluginCommands();
-  });
-
-  it("skips plugin commands when text commands are disabled", async () => {
-    registerPluginCommand("plugin-core", {
-      name: "ping",
-      description: "Ping",
-      handler: () => ({ text: "pong" }),
-    });
-
-    const params = {
-      command: {
-        commandBodyNormalized: "/ping",
-        senderId: "user-1",
-        channel: "test",
-        isAuthorizedSender: true,
-      },
-      cfg: {} as ClawdbotConfig,
-    } as HandleCommandsParams;
-
-    const result = await handlePluginCommand(params, false);
-    expect(result).toBeNull();
-  });
-
-  it("executes plugin commands when text commands are enabled", async () => {
-    registerPluginCommand("plugin-core", {
-      name: "ping",
-      description: "Ping",
-      handler: () => ({ text: "pong" }),
-    });
-
-    const params = {
-      command: {
-        commandBodyNormalized: "/ping",
-        senderId: "user-1",
-        channel: "test",
-        isAuthorizedSender: true,
-      },
-      cfg: {} as ClawdbotConfig,
-    } as HandleCommandsParams;
-
-    const result = await handlePluginCommand(params, true);
-    expect(result?.reply?.text).toBe("pong");
-  });
-});

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

@@ -1,42 +0,0 @@
-/**
- * Plugin Command Handler
- *
- * Handles commands registered by plugins, bypassing the LLM agent.
- * This handler is called before built-in command handlers.
- */
-
-import { matchPluginCommand, executePluginCommand } from "../../plugins/commands.js";
-import type { CommandHandler, CommandHandlerResult } from "./commands-types.js";
-
-/**
- * Handle plugin-registered commands.
- * Returns a result if a plugin command was matched and executed,
- * or null to continue to the next handler.
- */
-export const handlePluginCommand: CommandHandler = async (
-  params,
-  allowTextCommands,
-): Promise<CommandHandlerResult | null> => {
-  if (!allowTextCommands) return null;
-  const { command, cfg } = params;
-
-  // Try to match a plugin command
-  const match = matchPluginCommand(command.commandBodyNormalized);
-  if (!match) return null;
-
-  // Execute the plugin command (always returns a result)
-  const result = await executePluginCommand({
-    command: match.command,
-    args: match.args,
-    senderId: command.senderId,
-    channel: command.channel,
-    isAuthorizedSender: command.isAuthorizedSender,
-    commandBody: command.commandBodyNormalized,
-    config: cfg,
-  });
-
-  return {
-    shouldContinue: false,
-    reply: { text: result.text },
-  };
-};

src/auto-reply/status.test.ts

@@ -4,11 +4,9 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import { normalizeTestText } from "../../test/helpers/normalize-text.js";
 import { withTempHome } from "../../test/helpers/temp-home.js";
 import type { ClawdbotConfig } from "../config/config.js";
-import { clearPluginCommands, registerPluginCommand } from "../plugins/commands.js";
 import { buildCommandsMessage, buildHelpMessage, buildStatusMessage } from "./status.js";
 
 afterEach(() => {
-  clearPluginCommands();
   vi.restoreAllMocks();
 });
 
@@ -425,19 +423,6 @@ describe("buildCommandsMessage", () => {
     );
     expect(text).toContain("/demo_skill - Demo skill");
   });
-
-  it("includes plugin commands when registered", () => {
-    registerPluginCommand("plugin-core", {
-      name: "plugstatus",
-      description: "Plugin status",
-      handler: () => ({ text: "ok" }),
-    });
-    const text = buildCommandsMessage({
-      commands: { config: false, debug: false },
-    } as ClawdbotConfig);
-    expect(text).toContain("🔌 Plugin commands");
-    expect(text).toContain("/plugstatus - Plugin status");
-  });
 });
 
 describe("buildHelpMessage", () => {

src/auto-reply/status.ts

@@ -22,7 +22,6 @@ import {
 } from "../utils/usage-format.js";
 import { VERSION } from "../version.js";
 import { listChatCommands, listChatCommandsForConfig } from "./commands-registry.js";
-import { listPluginCommands } from "../plugins/commands.js";
 import type { SkillCommandSpec } from "../agents/skills.js";
 import type { ElevatedLevel, ReasoningLevel, ThinkLevel, VerboseLevel } from "./thinking.js";
 import type { MediaUnderstandingDecision } from "../media-understanding/types.js";
@@ -53,6 +52,7 @@ type StatusArgs = {
   resolvedElevated?: ElevatedLevel;
   modelAuth?: string;
   usageLine?: string;
+  timeLine?: string;
   queue?: QueueStatus;
   mediaDecisions?: MediaUnderstandingDecision[];
   subagentsLine?: string;
@@ -382,6 +382,7 @@ export function buildStatusMessage(args: StatusArgs): string {
 
   return [
     versionLine,
+    args.timeLine,
     modelLine,
     usageCostLine,
     `📚 ${contextLine}`,
@@ -443,12 +444,5 @@ export function buildCommandsMessage(
     const scopeLabel = command.scope === "text" ? " (text-only)" : "";
     lines.push(`${primary}${aliasLabel}${scopeLabel} - ${command.description}`);
   }
-  const pluginCommands = listPluginCommands();
-  if (pluginCommands.length > 0) {
-    lines.push("🔌 Plugin commands");
-    for (const command of pluginCommands) {
-      lines.push(`/${command.name} - ${command.description}`);
-    }
-  }
   return lines.join("\n");
 }

src/config/schema.ts

@@ -121,6 +121,8 @@ const FIELD_LABELS: Record<string, string> = {
   "diagnostics.cacheTrace.includeMessages": "Cache Trace Include Messages",
   "diagnostics.cacheTrace.includePrompt": "Cache Trace Include Prompt",
   "diagnostics.cacheTrace.includeSystem": "Cache Trace Include System",
+  "diagnostics.anthropicPayloadLog.enabled": "Anthropic Payload Log Enabled",
+  "diagnostics.anthropicPayloadLog.filePath": "Anthropic Payload Log File Path",
   "agents.list.*.identity.avatar": "Identity Avatar",
   "gateway.remote.url": "Remote Gateway URL",
   "gateway.remote.sshTarget": "Remote Gateway SSH Target",
@@ -390,6 +392,10 @@ const FIELD_HELP: Record<string, string> = {
     "Include full message payloads in trace output (default: true).",
   "diagnostics.cacheTrace.includePrompt": "Include prompt text in trace output (default: true).",
   "diagnostics.cacheTrace.includeSystem": "Include system prompt in trace output (default: true).",
+  "diagnostics.anthropicPayloadLog.enabled":
+    "Log Anthropic request payloads + usage for embedded runs (default: false).",
+  "diagnostics.anthropicPayloadLog.filePath":
+    "JSONL output path for Anthropic payload logs (default: $CLAWDBOT_STATE_DIR/logs/anthropic-payload.jsonl).",
   "tools.exec.applyPatch.enabled":
     "Experimental. Enables apply_patch for OpenAI models when allowed by tool policy.",
   "tools.exec.applyPatch.allowModels":

src/config/types.base.ts

@@ -133,10 +133,16 @@ export type DiagnosticsCacheTraceConfig = {
   includeSystem?: boolean;
 };
 
+export type DiagnosticsAnthropicPayloadLogConfig = {
+  enabled?: boolean;
+  filePath?: string;
+};
+
 export type DiagnosticsConfig = {
   enabled?: boolean;
   otel?: DiagnosticsOtelConfig;
   cacheTrace?: DiagnosticsCacheTraceConfig;
+  anthropicPayloadLog?: DiagnosticsAnthropicPayloadLogConfig;
 };
 
 export type WebReconnectConfig = {

src/config/zod-schema.ts

@@ -86,6 +86,13 @@ export const ClawdbotSchema = z
           })
           .strict()
           .optional(),
+        anthropicPayloadLog: z
+          .object({
+            enabled: z.boolean().optional(),
+            filePath: z.string().optional(),
+          })
+          .strict()
+          .optional(),
       })
       .strict()
       .optional(),

src/gateway/server/__tests__/test-utils.ts

@@ -12,7 +12,6 @@ export const createTestRegistry = (overrides: Partial<PluginRegistry> = {}): Plu
     httpHandlers: [],
     cliRegistrars: [],
     services: [],
-    commands: [],
     diagnostics: [],
   };
   const merged = { ...base, ...overrides };

src/gateway/test-helpers.mocks.ts

@@ -140,7 +140,6 @@ const createStubPluginRegistry = (): PluginRegistry => ({
   httpHandlers: [],
   cliRegistrars: [],
   services: [],
-  commands: [],
   diagnostics: [],
 });
 

src/plugins/commands.test.ts

@@ -1,63 +0,0 @@
-import { beforeEach, describe, expect, it } from "vitest";
-import type { ClawdbotConfig } from "../config/config.js";
-import {
-  clearPluginCommands,
-  executePluginCommand,
-  matchPluginCommand,
-  registerPluginCommand,
-  validateCommandName,
-} from "./commands.js";
-
-describe("validateCommandName", () => {
-  it("rejects reserved aliases from built-in commands", () => {
-    const error = validateCommandName("id");
-    expect(error).toContain("reserved");
-  });
-});
-
-describe("plugin command registry", () => {
-  beforeEach(() => {
-    clearPluginCommands();
-  });
-
-  it("normalizes command names for registration and matching", () => {
-    const result = registerPluginCommand("plugin-core", {
-      name: "  ping  ",
-      description: "Ping",
-      handler: () => ({ text: "pong" }),
-    });
-    expect(result.ok).toBe(true);
-
-    const match = matchPluginCommand("/ping");
-    expect(match?.command.name).toBe("ping");
-  });
-
-  it("blocks registration while a command is executing", async () => {
-    let nestedResult: { ok: boolean; error?: string } | undefined;
-
-    registerPluginCommand("plugin-core", {
-      name: "outer",
-      description: "Outer",
-      handler: () => {
-        nestedResult = registerPluginCommand("plugin-inner", {
-          name: "inner",
-          description: "Inner",
-          handler: () => ({ text: "ok" }),
-        });
-        return { text: "done" };
-      },
-    });
-
-    await executePluginCommand({
-      command: matchPluginCommand("/outer")!.command,
-      senderId: "user-1",
-      channel: "test",
-      isAuthorizedSender: true,
-      commandBody: "/outer",
-      config: {} as ClawdbotConfig,
-    });
-
-    expect(nestedResult?.ok).toBe(false);
-    expect(nestedResult?.error).toContain("processing is in progress");
-  });
-});

src/plugins/commands.ts

@@ -1,281 +0,0 @@
-/**
- * Plugin Command Registry
- *
- * Manages commands registered by plugins that bypass the LLM agent.
- * These commands are processed before built-in commands and before agent invocation.
- */
-
-import type { ClawdbotConfig } from "../config/config.js";
-import { listChatCommands } from "../auto-reply/commands-registry.js";
-import type { ClawdbotPluginCommandDefinition, PluginCommandContext } from "./types.js";
-import { logVerbose } from "../globals.js";
-
-type RegisteredPluginCommand = ClawdbotPluginCommandDefinition & {
-  pluginId: string;
-};
-
-// Registry of plugin commands
-const pluginCommands: Map<string, RegisteredPluginCommand> = new Map();
-
-// Lock counter to prevent modifications during command execution
-let registryLockCount = 0;
-
-// Maximum allowed length for command arguments (defense in depth)
-const MAX_ARGS_LENGTH = 4096;
-
-function getReservedCommands(): Set<string> {
-  const reserved = new Set<string>();
-  for (const command of listChatCommands()) {
-    if (command.nativeName) {
-      const normalized = command.nativeName.trim().toLowerCase();
-      if (normalized) reserved.add(normalized);
-    }
-    for (const alias of command.textAliases ?? []) {
-      const trimmed = alias.trim();
-      if (!trimmed) continue;
-      const withoutSlash = trimmed.startsWith("/") ? trimmed.slice(1) : trimmed;
-      const normalized = withoutSlash.trim().toLowerCase();
-      if (normalized) reserved.add(normalized);
-    }
-  }
-  return reserved;
-}
-
-/**
- * Validate a command name.
- * Returns an error message if invalid, or null if valid.
- */
-export function validateCommandName(name: string): string | null {
-  const trimmed = name.trim().toLowerCase();
-
-  if (!trimmed) {
-    return "Command name cannot be empty";
-  }
-
-  // Must start with a letter, contain only letters, numbers, hyphens, underscores
-  // Note: trimmed is already lowercased, so no need for /i flag
-  if (!/^[a-z][a-z0-9_-]*$/.test(trimmed)) {
-    return "Command name must start with a letter and contain only letters, numbers, hyphens, and underscores";
-  }
-
-  // Check reserved commands
-  if (getReservedCommands().has(trimmed)) {
-    return `Command name "${trimmed}" is reserved by a built-in command`;
-  }
-
-  return null;
-}
-
-export type CommandRegistrationResult = {
-  ok: boolean;
-  error?: string;
-};
-
-/**
- * Register a plugin command.
- * Returns an error if the command name is invalid or reserved.
- */
-export function registerPluginCommand(
-  pluginId: string,
-  command: ClawdbotPluginCommandDefinition,
-): CommandRegistrationResult {
-  // Prevent registration while commands are being processed
-  if (registryLockCount > 0) {
-    return { ok: false, error: "Cannot register commands while processing is in progress" };
-  }
-
-  // Validate handler is a function
-  if (typeof command.handler !== "function") {
-    return { ok: false, error: "Command handler must be a function" };
-  }
-
-  const validationError = validateCommandName(command.name);
-  if (validationError) {
-    return { ok: false, error: validationError };
-  }
-
-  const normalizedName = command.name.trim();
-  const key = `/${normalizedName.toLowerCase()}`;
-
-  // Check for duplicate registration
-  if (pluginCommands.has(key)) {
-    const existing = pluginCommands.get(key)!;
-    return {
-      ok: false,
-      error: `Command "${command.name}" already registered by plugin "${existing.pluginId}"`,
-    };
-  }
-
-  pluginCommands.set(key, { ...command, name: normalizedName, pluginId });
-  logVerbose(`Registered plugin command: ${key} (plugin: ${pluginId})`);
-  return { ok: true };
-}
-
-/**
- * Clear all registered plugin commands.
- * Called during plugin reload.
- */
-export function clearPluginCommands(): void {
-  pluginCommands.clear();
-  registryLockCount = 0;
-}
-
-/**
- * Clear plugin commands for a specific plugin.
- */
-export function clearPluginCommandsForPlugin(pluginId: string): void {
-  for (const [key, cmd] of pluginCommands.entries()) {
-    if (cmd.pluginId === pluginId) {
-      pluginCommands.delete(key);
-    }
-  }
-}
-
-/**
- * Check if a command body matches a registered plugin command.
- * Returns the command definition and parsed args if matched.
- *
- * Note: If a command has `acceptsArgs: false` and the user provides arguments,
- * the command will not match. This allows the message to fall through to
- * built-in handlers or the agent. Document this behavior to plugin authors.
- */
-export function matchPluginCommand(
-  commandBody: string,
-): { command: RegisteredPluginCommand; args?: string } | null {
-  const trimmed = commandBody.trim();
-  if (!trimmed.startsWith("/")) return null;
-
-  // Extract command name and args
-  const spaceIndex = trimmed.indexOf(" ");
-  const commandName = spaceIndex === -1 ? trimmed : trimmed.slice(0, spaceIndex);
-  const args = spaceIndex === -1 ? undefined : trimmed.slice(spaceIndex + 1).trim();
-
-  const key = commandName.toLowerCase();
-  const command = pluginCommands.get(key);
-
-  if (!command) return null;
-
-  // If command doesn't accept args but args were provided, don't match
-  if (args && !command.acceptsArgs) return null;
-
-  return { command, args: args || undefined };
-}
-
-/**
- * Sanitize command arguments to prevent injection attacks.
- * Removes control characters and enforces length limits.
- */
-function sanitizeArgs(args: string | undefined): string | undefined {
-  if (!args) return undefined;
-
-  // Enforce length limit
-  const trimmed = args.length > MAX_ARGS_LENGTH ? args.slice(0, MAX_ARGS_LENGTH) : args;
-
-  // Remove control characters (except newlines and tabs which may be intentional)
-  let needsSanitize = false;
-  for (let i = 0; i < trimmed.length; i += 1) {
-    const code = trimmed.charCodeAt(i);
-    if (code === 0x09 || code === 0x0a) continue;
-    if (code < 0x20 || code === 0x7f) {
-      needsSanitize = true;
-      break;
-    }
-  }
-  if (!needsSanitize) return trimmed;
-
-  let sanitized = "";
-  for (let i = 0; i < trimmed.length; i += 1) {
-    const code = trimmed.charCodeAt(i);
-    if (code === 0x09 || code === 0x0a || (code >= 0x20 && code !== 0x7f)) {
-      sanitized += trimmed[i];
-    }
-  }
-  return sanitized;
-}
-
-/**
- * Execute a plugin command handler.
- *
- * Note: Plugin authors should still validate and sanitize ctx.args for their
- * specific use case. This function provides basic defense-in-depth sanitization.
- */
-export async function executePluginCommand(params: {
-  command: RegisteredPluginCommand;
-  args?: string;
-  senderId?: string;
-  channel: string;
-  isAuthorizedSender: boolean;
-  commandBody: string;
-  config: ClawdbotConfig;
-}): Promise<{ text: string }> {
-  const { command, args, senderId, channel, isAuthorizedSender, commandBody, config } = params;
-
-  // Check authorization
-  const requireAuth = command.requireAuth !== false; // Default to true
-  if (requireAuth && !isAuthorizedSender) {
-    logVerbose(
-      `Plugin command /${command.name} blocked: unauthorized sender ${senderId || "<unknown>"}`,
-    );
-    return { text: "⚠️ This command requires authorization." };
-  }
-
-  // Sanitize args before passing to handler
-  const sanitizedArgs = sanitizeArgs(args);
-
-  const ctx: PluginCommandContext = {
-    senderId,
-    channel,
-    isAuthorizedSender,
-    args: sanitizedArgs,
-    commandBody,
-    config,
-  };
-
-  // Lock registry during execution to prevent concurrent modifications
-  registryLockCount += 1;
-  try {
-    const result = await command.handler(ctx);
-    logVerbose(
-      `Plugin command /${command.name} executed successfully for ${senderId || "unknown"}`,
-    );
-    return { text: result.text };
-  } catch (err) {
-    const error = err as Error;
-    logVerbose(`Plugin command /${command.name} error: ${error.message}`);
-    // Don't leak internal error details - return a safe generic message
-    return { text: "⚠️ Command failed. Please try again later." };
-  } finally {
-    registryLockCount = Math.max(0, registryLockCount - 1);
-  }
-}
-
-/**
- * List all registered plugin commands.
- * Used for /help and /commands output.
- */
-export function listPluginCommands(): Array<{
-  name: string;
-  description: string;
-  pluginId: string;
-}> {
-  return Array.from(pluginCommands.values()).map((cmd) => ({
-    name: cmd.name,
-    description: cmd.description,
-    pluginId: cmd.pluginId,
-  }));
-}
-
-/**
- * Get plugin command specs for native command registration (e.g., Telegram).
- */
-export function getPluginCommandSpecs(): Array<{
-  name: string;
-  description: string;
-  acceptsArgs: boolean;
-}> {
-  return Array.from(pluginCommands.values()).map((cmd) => ({
-    name: cmd.name,
-    description: cmd.description,
-    acceptsArgs: Boolean(cmd.acceptsArgs),
-  }));
-}

src/plugins/loader.ts

@@ -16,7 +16,6 @@ import {
   type NormalizedPluginsConfig,
 } from "./config-state.js";
 import { initializeGlobalHookRunner } from "./hook-runner-global.js";
-import { clearPluginCommands } from "./commands.js";
 import { createPluginRegistry, type PluginRecord, type PluginRegistry } from "./registry.js";
 import { createPluginRuntime } from "./runtime/index.js";
 import { setActivePluginRegistry } from "./runtime.js";
@@ -148,7 +147,6 @@ function createPluginRecord(params: {
     gatewayMethods: [],
     cliCommands: [],
     services: [],
-    commands: [],
     httpHandlers: 0,
     hookCount: 0,
     configSchema: params.configSchema,
@@ -179,9 +177,6 @@ export function loadClawdbotPlugins(options: PluginLoadOptions = {}): PluginRegi
     }
   }
 
-  // Clear previously registered plugin commands before reloading
-  clearPluginCommands();
-
   const runtime = createPluginRuntime();
   const { registry, createApi } = createPluginRegistry({
     logger,

src/plugins/registry.ts

@@ -11,7 +11,6 @@ import type {
   ClawdbotPluginApi,
   ClawdbotPluginChannelRegistration,
   ClawdbotPluginCliRegistrar,
-  ClawdbotPluginCommandDefinition,
   ClawdbotPluginHttpHandler,
   ClawdbotPluginHookOptions,
   ProviderPlugin,
@@ -27,7 +26,6 @@ import type {
   PluginHookHandlerMap,
   PluginHookRegistration as TypedPluginHookRegistration,
 } from "./types.js";
-import { registerPluginCommand } from "./commands.js";
 import type { PluginRuntime } from "./runtime/types.js";
 import type { HookEntry } from "../hooks/types.js";
 import path from "node:path";
@@ -79,12 +77,6 @@ export type PluginServiceRegistration = {
   source: string;
 };
 
-export type PluginCommandRegistration = {
-  pluginId: string;
-  command: ClawdbotPluginCommandDefinition;
-  source: string;
-};
-
 export type PluginRecord = {
   id: string;
   name: string;
@@ -104,7 +96,6 @@ export type PluginRecord = {
   gatewayMethods: string[];
   cliCommands: string[];
   services: string[];
-  commands: string[];
   httpHandlers: number;
   hookCount: number;
   configSchema: boolean;
@@ -123,7 +114,6 @@ export type PluginRegistry = {
   httpHandlers: PluginHttpRegistration[];
   cliRegistrars: PluginCliRegistration[];
   services: PluginServiceRegistration[];
-  commands: PluginCommandRegistration[];
   diagnostics: PluginDiagnostic[];
 };
 
@@ -145,7 +135,6 @@ export function createPluginRegistry(registryParams: PluginRegistryParams) {
     httpHandlers: [],
     cliRegistrars: [],
     services: [],
-    commands: [],
     diagnostics: [],
   };
   const coreGatewayMethods = new Set(Object.keys(registryParams.coreGatewayHandlers ?? {}));
@@ -363,39 +352,6 @@ export function createPluginRegistry(registryParams: PluginRegistryParams) {
     });
   };
 
-  const registerCommand = (record: PluginRecord, command: ClawdbotPluginCommandDefinition) => {
-    const name = command.name.trim();
-    if (!name) {
-      pushDiagnostic({
-        level: "error",
-        pluginId: record.id,
-        source: record.source,
-        message: "command registration missing name",
-      });
-      return;
-    }
-
-    // Register with the plugin command system (validates name and checks for duplicates)
-    const normalizedCommand = { ...command, name };
-    const result = registerPluginCommand(record.id, normalizedCommand);
-    if (!result.ok) {
-      pushDiagnostic({
-        level: "error",
-        pluginId: record.id,
-        source: record.source,
-        message: `command registration failed: ${result.error}`,
-      });
-      return;
-    }
-
-    record.commands.push(name);
-    registry.commands.push({
-      pluginId: record.id,
-      command: normalizedCommand,
-      source: record.source,
-    });
-  };
-
   const registerTypedHook = <K extends PluginHookName>(
     record: PluginRecord,
     hookName: K,
@@ -445,7 +401,6 @@ export function createPluginRegistry(registryParams: PluginRegistryParams) {
       registerGatewayMethod: (method, handler) => registerGatewayMethod(record, method, handler),
       registerCli: (registrar, opts) => registerCli(record, registrar, opts),
       registerService: (service) => registerService(record, service),
-      registerCommand: (command) => registerCommand(record, command),
       resolvePath: (input: string) => resolveUserPath(input),
       on: (hookName, handler, opts) => registerTypedHook(record, hookName, handler, opts),
     };
@@ -461,7 +416,6 @@ export function createPluginRegistry(registryParams: PluginRegistryParams) {
     registerGatewayMethod,
     registerCli,
     registerService,
-    registerCommand,
     registerHook,
     registerTypedHook,
   };

src/plugins/runtime.ts

@@ -11,7 +11,6 @@ const createEmptyRegistry = (): PluginRegistry => ({
   httpHandlers: [],
   cliRegistrars: [],
   services: [],
-  commands: [],
   diagnostics: [],
 });
 

src/plugins/types.ts

@@ -129,59 +129,6 @@ export type ClawdbotPluginGatewayMethod = {
   handler: GatewayRequestHandler;
 };
 
-// =============================================================================
-// Plugin Commands
-// =============================================================================
-
-/**
- * Context passed to plugin command handlers.
- */
-export type PluginCommandContext = {
-  /** The sender's identifier (e.g., Telegram user ID) */
-  senderId?: string;
-  /** The channel/surface (e.g., "telegram", "discord") */
-  channel: string;
-  /** Whether the sender is on the allowlist */
-  isAuthorizedSender: boolean;
-  /** Raw command arguments after the command name */
-  args?: string;
-  /** The full normalized command body */
-  commandBody: string;
-  /** Current clawdbot configuration */
-  config: ClawdbotConfig;
-};
-
-/**
- * Result returned by a plugin command handler.
- */
-export type PluginCommandResult = {
-  /** Text response to send back to the user */
-  text: string;
-};
-
-/**
- * Handler function for plugin commands.
- */
-export type PluginCommandHandler = (
-  ctx: PluginCommandContext,
-) => PluginCommandResult | Promise<PluginCommandResult>;
-
-/**
- * Definition for a plugin-registered command.
- */
-export type ClawdbotPluginCommandDefinition = {
-  /** Command name without leading slash (e.g., "tts_on") */
-  name: string;
-  /** Description shown in /help and command menus */
-  description: string;
-  /** Whether this command accepts arguments */
-  acceptsArgs?: boolean;
-  /** Whether only authorized senders can use this command (default: true) */
-  requireAuth?: boolean;
-  /** The handler function */
-  handler: PluginCommandHandler;
-};
-
 export type ClawdbotPluginHttpHandler = (
   req: IncomingMessage,
   res: ServerResponse,
@@ -254,12 +201,6 @@ export type ClawdbotPluginApi = {
   registerCli: (registrar: ClawdbotPluginCliRegistrar, opts?: { commands?: string[] }) => void;
   registerService: (service: ClawdbotPluginService) => void;
   registerProvider: (provider: ProviderPlugin) => void;
-  /**
-   * Register a custom command that bypasses the LLM agent.
-   * Plugin commands are processed before built-in commands and before agent invocation.
-   * Use this for simple state-toggling or status commands that don't need AI reasoning.
-   */
-  registerCommand: (command: ClawdbotPluginCommandDefinition) => void;
   resolvePath: (input: string) => string;
   /** Register a lifecycle hook handler */
   on: <K extends PluginHookName>(

src/telegram/bot-native-commands.ts

@@ -6,7 +6,6 @@ import {
   findCommandByNativeName,
   listNativeCommandSpecs,
   listNativeCommandSpecsForConfig,
-  normalizeNativeCommandSpecsForSurface,
   parseCommandArgs,
   resolveCommandArgMenu,
 } from "../auto-reply/commands-registry.js";
@@ -85,28 +84,13 @@ export const registerTelegramNativeCommands = ({
 }: RegisterTelegramNativeCommandsParams) => {
   const skillCommands =
     nativeEnabled && nativeSkillsEnabled ? listSkillCommandsForAgents({ cfg }) : [];
-  const rawNativeCommands = nativeEnabled
+  const nativeCommands = nativeEnabled
     ? listNativeCommandSpecsForConfig(cfg, { skillCommands })
     : [];
-  const nativeCommands = normalizeNativeCommandSpecsForSurface({
-    surface: "telegram",
-    specs: rawNativeCommands,
-  });
   const reservedCommands = new Set(
-    normalizeNativeCommandSpecsForSurface({
-      surface: "telegram",
-      specs: listNativeCommandSpecs(),
-    }).map((command) => command.name.toLowerCase()),
+    listNativeCommandSpecs().map((command) => command.name.toLowerCase()),
   );
-  const reservedSkillSpecs = normalizeNativeCommandSpecsForSurface({
-    surface: "telegram",
-    specs: skillCommands.map((command) => ({
-      name: command.name,
-      description: command.description,
-      acceptsArgs: true,
-    })),
-  });
-  for (const command of reservedSkillSpecs) {
+  for (const command of skillCommands) {
     reservedCommands.add(command.name.toLowerCase());
   }
   const customResolution = resolveTelegramCustomCommands({

src/test-utils/channel-plugins.ts

@@ -19,7 +19,6 @@ export const createTestRegistry = (channels: PluginRegistry["channels"] = []): P
   httpHandlers: [],
   cliRegistrars: [],
   services: [],
-  commands: [],
   diagnostics: [],
 });