refactor: centralize session agent resolution

src/auto-reply/reply/abort.ts

@@ -1,3 +1,4 @@
+import { resolveSessionAgentId } from "../../agents/agent-scope.js";
 import { abortEmbeddedPiRun } from "../../agents/pi-embedded.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import {
@@ -7,10 +8,7 @@ import {
   saveSessionStore,
   type SessionEntry,
 } from "../../config/sessions.js";
-import {
-  parseAgentSessionKey,
-  resolveAgentIdFromSessionKey,
-} from "../../routing/session-key.js";
+import { parseAgentSessionKey } from "../../routing/session-key.js";
 import { resolveCommandAuthorization } from "../command-auth.js";
 import {
   normalizeCommandBody,
@@ -80,9 +78,10 @@ export async function tryFastAbortFromMessage(params: {
   if (!auth.isAuthorizedSender) return { handled: false, aborted: false };
 
   const targetKey = resolveAbortTargetKey(ctx);
-  const agentId = resolveAgentIdFromSessionKey(
-    targetKey ?? ctx.SessionKey ?? "",
-  );
+  const agentId = resolveSessionAgentId({
+    sessionKey: targetKey ?? ctx.SessionKey ?? "",
+    config: cfg,
+  });
   const raw = stripStructuralPrefixes(ctx.Body ?? "");
   const isGroup = ctx.ChatType?.trim().toLowerCase() === "group";
   const stripped = isGroup ? stripMentions(raw, ctx, cfg, agentId) : raw;

src/auto-reply/reply/commands.ts

@@ -1,6 +1,7 @@
 import {
   resolveAgentDir,
   resolveDefaultAgentId,
+  resolveSessionAgentId,
 } from "../../agents/agent-scope.js";
 import {
   ensureAuthProfileStore,
@@ -26,7 +27,6 @@ import {
   unsetConfigOverride,
 } from "../../config/runtime-overrides.js";
 import {
-  resolveAgentIdFromSessionKey,
   resolveSessionFilePath,
   type SessionEntry,
   type SessionScope,
@@ -148,7 +148,7 @@ export async function buildStatusReply(params: {
     return undefined;
   }
   const statusAgentId = sessionKey
-    ? resolveAgentIdFromSessionKey(sessionKey)
+    ? resolveSessionAgentId({ sessionKey, config: cfg })
     : resolveDefaultAgentId(cfg);
   const statusAgentDir = resolveAgentDir(cfg, statusAgentId);
   let usageLine: string | null = null;

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

@@ -2,6 +2,7 @@ import {
   resolveAgentConfig,
   resolveAgentDir,
   resolveDefaultAgentId,
+  resolveSessionAgentId,
 } from "../../agents/agent-scope.js";
 import {
   isProfileInCooldown,
@@ -31,7 +32,6 @@ import {
 import { resolveSandboxConfigForAgent } from "../../agents/sandbox.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import {
-  resolveAgentIdFromSessionKey,
   resolveAgentMainSessionKey,
   type SessionEntry,
   saveSessionStore,
@@ -491,14 +491,18 @@ export async function handleDirectiveOnly(params: {
     currentReasoningLevel,
     currentElevatedLevel,
   } = params;
-  const activeAgentId = params.sessionKey
-    ? resolveAgentIdFromSessionKey(params.sessionKey)
-    : resolveDefaultAgentId(params.cfg);
+  const activeAgentId = resolveSessionAgentId({
+    sessionKey: params.sessionKey,
+    config: params.cfg,
+  });
   const agentDir = resolveAgentDir(params.cfg, activeAgentId);
   const runtimeIsSandboxed = (() => {
     const sessionKey = params.sessionKey?.trim();
     if (!sessionKey) return false;
-    const agentId = resolveAgentIdFromSessionKey(sessionKey);
+    const agentId = resolveSessionAgentId({
+      sessionKey,
+      config: params.cfg,
+    });
     const sandboxCfg = resolveSandboxConfigForAgent(params.cfg, agentId);
     if (sandboxCfg.mode === "off") return false;
     const mainKey = resolveAgentMainSessionKey({
@@ -1013,7 +1017,7 @@ export async function persistInlineDirectives(params: {
   } = params;
   let { provider, model } = params;
   const activeAgentId = sessionKey
-    ? resolveAgentIdFromSessionKey(sessionKey)
+    ? resolveSessionAgentId({ sessionKey, config: cfg })
     : resolveDefaultAgentId(cfg);
   const agentDir = resolveAgentDir(cfg, activeAgentId);
 

src/auto-reply/reply/route-reply.ts

@@ -7,12 +7,12 @@
  * across multiple providers.
  */
 
+import { resolveSessionAgentId } from "../../agents/agent-scope.js";
 import { resolveEffectiveMessagesConfig } from "../../agents/identity.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import { sendMessageDiscord } from "../../discord/send.js";
 import { sendMessageIMessage } from "../../imessage/send.js";
 import { sendMessageMSTeams } from "../../msteams/send.js";
-import { resolveAgentIdFromSessionKey } from "../../routing/session-key.js";
 import { sendMessageSignal } from "../../signal/send.js";
 import { sendMessageSlack } from "../../slack/send.js";
 import { sendMessageTelegram } from "../../telegram/send.js";
@@ -67,7 +67,10 @@ export async function routeReply(
   const responsePrefix = params.sessionKey
     ? resolveEffectiveMessagesConfig(
         cfg,
-        resolveAgentIdFromSessionKey(params.sessionKey),
+        resolveSessionAgentId({
+          sessionKey: params.sessionKey,
+          config: cfg,
+        }),
       ).responsePrefix
     : cfg.messages?.responsePrefix === "auto"
       ? undefined

src/auto-reply/reply/session.ts

@@ -6,6 +6,7 @@ import {
   CURRENT_SESSION_VERSION,
   SessionManager,
 } from "@mariozechner/pi-coding-agent";
+import { resolveSessionAgentId } from "../../agents/agent-scope.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import {
   buildGroupDisplayName,
@@ -13,7 +14,6 @@ import {
   DEFAULT_RESET_TRIGGERS,
   type GroupKeyResolution,
   loadSessionStore,
-  resolveAgentIdFromSessionKey,
   resolveGroupSessionKey,
   resolveSessionFilePath,
   resolveSessionKey,
@@ -92,7 +92,10 @@ export async function initSessionState(params: {
   const { ctx, cfg, commandAuthorized } = params;
   const sessionCfg = cfg.session;
   const mainKey = normalizeMainKey(sessionCfg?.mainKey);
-  const agentId = resolveAgentIdFromSessionKey(ctx.SessionKey);
+  const agentId = resolveSessionAgentId({
+    sessionKey: ctx.SessionKey,
+    config: cfg,
+  });
   const resetTriggers = sessionCfg?.resetTriggers?.length
     ? sessionCfg.resetTriggers
     : DEFAULT_RESET_TRIGGERS;