fix(agents): include session identity in runtime prompt

zhangguiping-xydt · zhangguiping-xydt · commit 0b1a27a7f4b1 · 2026-06-12T22:05:08.000+08:00
diff --git a/src/agents/embedded-agent-runner/run/attempt.ts b/src/agents/embedded-agent-runner/run/attempt.ts
@@ -1800,6 +1800,8 @@ export async function runEmbeddedAttempt(
       workspaceDir: effectiveWorkspace,
       cwd: effectiveCwd,
       runtime: {
+        sessionKey: params.sessionKey,
+        sessionId: params.sessionId,
         host: machineName,
         os: `${os.type()} ${os.release()}`,
         arch: os.arch(),
diff --git a/src/agents/embedded-agent-runner/system-prompt.ts b/src/agents/embedded-agent-runner/system-prompt.ts
@@ -57,6 +57,8 @@ export function buildEmbeddedSystemPrompt(params: {
   nativeCommandGuidanceLines?: string[];
   runtimeInfo: {
     agentId?: string;
+    sessionKey?: string;
+    sessionId?: string;
     host: string;
     os: string;
     arch: string;
diff --git a/src/agents/system-prompt-params.test.ts b/src/agents/system-prompt-params.test.ts
@@ -30,7 +30,7 @@ function buildParams(params: { config?: OpenClawConfig; workspaceDir?: string; c
   });
 }
 
-describe("buildSystemPromptParams repo root", () => {
+describe("buildSystemPromptParams", () => {
   it("detects repo root from workspaceDir", async () => {
     const temp = await makeTempDir("workspace");
     const repoRoot = path.join(temp, "repo");
@@ -105,4 +105,22 @@ describe("buildSystemPromptParams repo root", () => {
 
     expect(runtimeInfo.repoRoot).toBeUndefined();
   });
+
+  it("carries session identity into runtime info", () => {
+    const { runtimeInfo } = buildSystemPromptParams({
+      agentId: "main",
+      runtime: {
+        sessionKey: "agent:main:main",
+        sessionId: "23ae7fce-3c27-4a51-b58e-d800d8ca091f",
+        host: "host",
+        os: "os",
+        arch: "arch",
+        node: "node",
+        model: "model",
+      },
+    });
+
+    expect(runtimeInfo.sessionKey).toBe("agent:main:main");
+    expect(runtimeInfo.sessionId).toBe("23ae7fce-3c27-4a51-b58e-d800d8ca091f");
+  });
 });
diff --git a/src/agents/system-prompt-params.ts b/src/agents/system-prompt-params.ts
@@ -19,6 +19,8 @@ import {
 
 type RuntimeInfoInput = {
   agentId?: string;
+  sessionKey?: string;
+  sessionId?: string;
   host: string;
   os: string;
   arch: string;
diff --git a/src/agents/system-prompt.test.ts b/src/agents/system-prompt.test.ts
@@ -1129,11 +1129,13 @@ describe("buildAgentSystemPrompt", () => {
     expect(prompt).not.toContain("capabilities= InlineButtons ,voice,inlinebuttons,Voice");
   });
 
-  it("includes agent id in runtime when provided", () => {
+  it("includes agent and session identity in runtime when provided", () => {
     const prompt = buildAgentSystemPrompt({
       workspaceDir: "/tmp/openclaw",
       runtimeInfo: {
         agentId: "work",
+        sessionKey: "agent:main:main",
+        sessionId: "23ae7fce-3c27-4a51-b58e-d800d8ca091f",
         host: "host",
         os: "macOS",
         arch: "arm64",
@@ -1143,6 +1145,8 @@ describe("buildAgentSystemPrompt", () => {
     });
 
     expect(prompt).toContain("agent=work");
+    expect(prompt).toContain("session=agent:main:main");
+    expect(prompt).toContain("sessionId=23ae7fce-3c27-4a51-b58e-d800d8ca091f");
   });
 
   it("includes reasoning visibility hint", () => {
@@ -1160,6 +1164,8 @@ describe("buildAgentSystemPrompt", () => {
     const line = buildRuntimeLine(
       {
         agentId: "work",
+        sessionKey: "agent:main:subagent:runtime-check",
+        sessionId: "23ae7fce-3c27-4a51-b58e-d800d8ca091f",
         host: "host",
         repoRoot: "/repo",
         os: "macOS",
@@ -1174,6 +1180,8 @@ describe("buildAgentSystemPrompt", () => {
     );
 
     expect(line).toContain("agent=work");
+    expect(line).toContain("session=agent:main:subagent:runtime-check");
+    expect(line).toContain("sessionId=23ae7fce-3c27-4a51-b58e-d800d8ca091f");
     expect(line).toContain("host=host");
     expect(line).toContain("repo=/repo");
     expect(line).toContain("os=macOS (arm64)");
diff --git a/src/agents/system-prompt.ts b/src/agents/system-prompt.ts
@@ -709,6 +709,8 @@ export function buildAgentSystemPrompt(params: {
   nativeCommandGuidanceLines?: string[];
   runtimeInfo?: {
     agentId?: string;
+    sessionKey?: string;
+    sessionId?: string;
     host?: string;
     os?: string;
     arch?: string;
@@ -1349,6 +1351,8 @@ function buildActiveProcessSessionReferenceLines(
 export function buildRuntimeLine(
   runtimeInfo?: {
     agentId?: string;
+    sessionKey?: string;
+    sessionId?: string;
     host?: string;
     os?: string;
     arch?: string;
@@ -1366,6 +1370,8 @@ export function buildRuntimeLine(
   const normalizedRuntimeCapabilities = normalizePromptCapabilityIds(runtimeCapabilities);
   return `Runtime: ${[
     runtimeInfo?.agentId ? `agent=${runtimeInfo.agentId}` : "",
+    runtimeInfo?.sessionKey ? `session=${sanitizeForPromptLiteral(runtimeInfo.sessionKey)}` : "",
+    runtimeInfo?.sessionId ? `sessionId=${sanitizeForPromptLiteral(runtimeInfo.sessionId)}` : "",
     runtimeInfo?.host ? `host=${runtimeInfo.host}` : "",
     runtimeInfo?.repoRoot ? `repo=${runtimeInfo.repoRoot}` : "",
     runtimeInfo?.os
