refactor(messages): centralize per-agent prefixes

src/agents/agent-scope.ts

@@ -3,14 +3,12 @@ import path from "node:path";
 
 import type { ClawdbotConfig } from "../config/config.js";
 import { resolveStateDir } from "../config/paths.js";
-import {
-  DEFAULT_AGENT_ID,
-  normalizeAgentId,
-  parseAgentSessionKey,
-} from "../routing/session-key.js";
+import { DEFAULT_AGENT_ID, normalizeAgentId } from "../routing/session-key.js";
 import { resolveUserPath } from "../utils.js";
 import { DEFAULT_AGENT_WORKSPACE_DIR } from "./workspace.js";
 
+export { resolveAgentIdFromSessionKey } from "../routing/session-key.js";
+
 type AgentEntry = NonNullable<
   NonNullable<ClawdbotConfig["agents"]>["list"]
 >[number];
@@ -29,13 +27,6 @@ type ResolvedAgentConfig = {
 
 let defaultAgentWarned = false;
 
-export function resolveAgentIdFromSessionKey(
-  sessionKey?: string | null,
-): string {
-  const parsed = parseAgentSessionKey(sessionKey);
-  return normalizeAgentId(parsed?.agentId ?? DEFAULT_AGENT_ID);
-}
-
 function listAgents(cfg: ClawdbotConfig): AgentEntry[] {
   const list = cfg.agents?.list;
   if (!Array.isArray(list)) return [];

src/agents/identity.ts

@@ -29,6 +29,22 @@ export function resolveIdentityNamePrefix(
   return `[${name}]`;
 }
 
+export function resolveMessagePrefix(
+  cfg: ClawdbotConfig,
+  agentId: string,
+  opts?: { hasAllowFrom?: boolean; fallback?: string },
+): string {
+  const configured = cfg.messages?.messagePrefix;
+  if (configured !== undefined) return configured;
+
+  const hasAllowFrom = opts?.hasAllowFrom === true;
+  if (hasAllowFrom) return "";
+
+  return (
+    resolveIdentityNamePrefix(cfg, agentId) ?? opts?.fallback ?? "[clawdbot]"
+  );
+}
+
 export function resolveResponsePrefix(
   cfg: ClawdbotConfig,
   agentId: string,
@@ -37,3 +53,17 @@ export function resolveResponsePrefix(
   if (configured !== undefined) return configured;
   return resolveIdentityNamePrefix(cfg, agentId);
 }
+
+export function resolveEffectiveMessagesConfig(
+  cfg: ClawdbotConfig,
+  agentId: string,
+  opts?: { hasAllowFrom?: boolean; fallbackMessagePrefix?: string },
+): { messagePrefix: string; responsePrefix?: string } {
+  return {
+    messagePrefix: resolveMessagePrefix(cfg, agentId, {
+      hasAllowFrom: opts?.hasAllowFrom,
+      fallback: opts?.fallbackMessagePrefix,
+    }),
+    responsePrefix: resolveResponsePrefix(cfg, agentId),
+  };
+}