fix(infra): propagate macOS product version to runtime prompt metadata (fixes #95145)

zenglingbiao · zenglingbiao · commit e61380f4ef5c · 2026-06-20T10:00:06.000+08:00
- Cache macosVersion() result to avoid double sw_vers probe
- Route cli-runner and embedded attempt OS fields through resolveOsSummary
- Update os-summary test expectations for darwin release = product version
diff --git a/src/agents/cli-runner/helpers.ts b/src/agents/cli-runner/helpers.ts
@@ -19,6 +19,7 @@ import type { ThinkLevel } from "../../auto-reply/thinking.js";
 import type { ChatType } from "../../channels/chat-type.js";
 import type { CliBackendConfig } from "../../config/types.js";
 import type { OpenClawConfig } from "../../config/types.openclaw.js";
+import { resolveOsSummary } from "../../infra/os-summary.js";
 import { privateFileStore } from "../../infra/private-file-store.js";
 import { tempWorkspace } from "../../infra/private-temp-workspace.js";
 import { resolvePreferredOpenClawTmpDir } from "../../infra/tmp-openclaw-dir.js";
@@ -157,7 +158,7 @@ export function buildCliAgentSystemPrompt(params: {
       sessionKey: params.sessionKey,
       sessionId: params.sessionId,
       host: "openclaw",
-      os: `${os.type()} ${os.release()}`,
+      os: `${os.type()} ${resolveOsSummary().release}`,
       arch: os.arch(),
       node: process.version,
       model: params.modelDisplay,
diff --git a/src/agents/embedded-agent-runner/run/attempt.ts b/src/agents/embedded-agent-runner/run/attempt.ts
@@ -44,6 +44,7 @@ import { isEmbeddedMode } from "../../../infra/embedded-mode.js";
 import { formatErrorMessage } from "../../../infra/errors.js";
 import { resolveHeartbeatSummaryForAgent } from "../../../infra/heartbeat-summary.js";
 import { getMachineDisplayName } from "../../../infra/machine-name.js";
+import { resolveOsSummary } from "../../../infra/os-summary.js";
 import { createCodexNativeWebSearchWrapper } from "../../../llm/providers/stream-wrappers/openai.js";
 import type { AssistantMessage } from "../../../llm/types.js";
 import { listRegisteredPluginAgentPromptGuidance } from "../../../plugins/command-registry-state.js";
@@ -1933,7 +1934,7 @@ export async function runEmbeddedAttempt(
         sessionKey: params.sessionKey,
         sessionId: params.sessionId,
         host: machineName,
-        os: `${os.type()} ${os.release()}`,
+        os: `${os.type()} ${resolveOsSummary().release}`,
         arch: os.arch(),
         node: process.version,
         model: `${params.provider}/${params.modelId}`,
diff --git a/src/infra/os-summary.test.ts b/src/infra/os-summary.test.ts
@@ -37,7 +37,9 @@ describe("resolveOsSummary", () => {
       expected: {
         platform: "darwin",
         arch: "arm64",
-        release: "24.0.0",
+        // On darwin, release uses sw_vers -productVersion, not os.release()
+        // (kernel 24.0.0 → macOS 15.4). #95145
+        release: "15.4",
         label: "macos 15.4 (arm64)",
       },
     },
diff --git a/src/infra/os-summary.ts b/src/infra/os-summary.ts
@@ -21,7 +21,11 @@ function macosVersion(): string {
 /** Resolves a compact OS label for diagnostics, logs, and environment summaries. */
 export function resolveOsSummary(): OsSummary {
   const platform = os.platform();
-  const release = platform === "darwin" ? macosVersion() : os.release();
+  // On darwin, os.release() returns the Darwin kernel version (e.g. "25.5.0"),
+  // not the macOS product version ("26.5.1"). Use macosVersion() which calls
+  // sw_vers -productVersion to get the actual macOS version. (#95145)
+  const darwinProductVersion = platform === "darwin" ? macosVersion() : null;
+  const release = darwinProductVersion ?? os.release();
   const arch = os.arch();
   const cacheKey = `${platform}\0${release}\0${arch}`;
   // Cache by stable os.* facts; darwin's sw_vers lookup is comparatively slow
@@ -32,7 +36,7 @@ export function resolveOsSummary(): OsSummary {
   }
   const label = (() => {
     if (platform === "darwin") {
-      return `macos ${macosVersion()} (${arch})`;
+      return `macos ${darwinProductVersion} (${arch})`;
     }
     if (platform === "win32") {
       return `windows ${release} (${arch})`;
