fix: tighten agent session key resolution

solar · solar · commit 99e542299009 · 2026-04-27T14:34:59.000+08:00
diff --git a/src/agents/command/session.ts b/src/agents/command/session.ts
@@ -24,6 +24,7 @@ import type { OpenClawConfig } from "../../config/types.openclaw.js";
 import {
   normalizeAgentId,
   normalizeMainKey,
+  toAgentRequestSessionKey,
   toAgentStoreSessionKey,
 } from "../../routing/session-key.js";
 import { resolveSessionIdMatchSelection } from "../../sessions/session-id-resolution.js";
@@ -149,9 +150,10 @@ export function resolveSessionKeyForRequest(opts: {
   const mainKey = normalizeMainKey(sessionCfg?.mainKey);
   const requestedAgentId = opts.agentId?.trim() ? normalizeAgentId(opts.agentId) : undefined;
   const requestedSessionId = opts.sessionId?.trim() || undefined;
+  const requestTo = opts.to?.trim();
   const explicitSessionKey = opts.sessionKey?.trim() || undefined;
   const explicitAgentSessionKey =
-    !explicitSessionKey && !requestedSessionId && !opts.to?.trim()
+    !explicitSessionKey && !requestedSessionId && !requestTo
       ? resolveExplicitAgentSessionKey({
           cfg: opts.cfg,
           agentId: requestedAgentId,
@@ -165,16 +167,18 @@ export function resolveSessionKeyForRequest(opts: {
   });
   const sessionStore = loadSessionStore(storePath);
 
-  const ctx: MsgContext | undefined = opts.to?.trim() ? { From: opts.to } : undefined;
+  const ctx: MsgContext | undefined = requestTo ? { From: requestTo } : undefined;
+  const agentScopedRequestKey =
+    requestedAgentId && requestTo ? (toAgentRequestSessionKey(requestTo) ?? requestTo) : requestTo;
   const derivedToSessionKey =
-    !explicitSessionKey && ctx
+    !explicitSessionKey && requestTo
       ? requestedAgentId
         ? toAgentStoreSessionKey({
             agentId: requestedAgentId,
-            requestKey: opts.to,
+            requestKey: agentScopedRequestKey,
             mainKey,
           })
-        : resolveSessionKey(scope, ctx, mainKey)
+        : resolveSessionKey(scope, ctx as MsgContext, mainKey)
       : undefined;
   let sessionKey: string | undefined =
     explicitSessionKey ?? derivedToSessionKey ?? explicitAgentSessionKey;
diff --git a/src/commands/agent/session.test.ts b/src/commands/agent/session.test.ts
@@ -267,6 +267,39 @@ describe("resolveSessionKeyForRequest", () => {
     expect(result.storePath).toBe(MYBOT_STORE_PATH);
   });
 
+  it("treats a blank sessionKey as unset before deriving an agent-scoped --to key", async () => {
+    setupMainAndMybotStorePaths();
+    mockStoresByPath({
+      [MYBOT_STORE_PATH]: {},
+    });
+
+    const result = resolveSessionKeyForRequest({
+      cfg: baseCfg,
+      agentId: "mybot",
+      to: "cw_111",
+      sessionKey: "   ",
+    });
+
+    expect(result.sessionKey).toBe("agent:mybot:cw_111");
+    expect(result.storePath).toBe(MYBOT_STORE_PATH);
+  });
+
+  it("rewrites qualified --to keys to the selected agent scope", async () => {
+    setupMainAndMybotStorePaths();
+    mockStoresByPath({
+      [MYBOT_STORE_PATH]: {},
+    });
+
+    const result = resolveSessionKeyForRequest({
+      cfg: baseCfg,
+      agentId: "mybot",
+      to: "agent:main:main",
+    });
+
+    expect(result.sessionKey).toBe("agent:mybot:main");
+    expect(result.storePath).toBe(MYBOT_STORE_PATH);
+  });
+
   it("skips already-searched primary store when iterating agents", async () => {
     setupMainAndMybotStorePaths();
     mocks.loadSessionStore.mockReturnValue({});
