fix(agent): extract resolveAgentRunLifecycleEndLogLevel, use subsystem logger, add test coverage

chenxiaoyu209 · chenxiaoyu209 · commit 0b1238bbd15c · 2026-07-07T23:57:31.000+08:00
diff --git a/src/agents/agent-command.ingress-diagnostics.test.ts b/src/agents/agent-command.ingress-diagnostics.test.ts
@@ -299,3 +299,52 @@ describe("emitIngressModelUsageDiagnostic", () => {
     expect(event.context).toEqual({ limit: 128000 });
   });
 });
+
+// ---------------------------------------------------------------------------
+// resolveAgentRunLifecycleEndLogLevel
+// ---------------------------------------------------------------------------
+describe("resolveAgentRunLifecycleEndLogLevel", () => {
+  /**
+   * Constructs a minimal AgentRunTerminalOutcome for log-level testing.
+   * All fields beyond `reason` and `status` are optional at the type level;
+   * omitting them keeps each case focused on the reason.
+   */
+  function outcome(reason: string, status: "ok" | "error" | "timeout" = "error") {
+    return testing.resolveAgentRunLifecycleEndLogLevel({
+      reason,
+      status,
+    } as Parameters<typeof testing.resolveAgentRunLifecycleEndLogLevel>[0]);
+  }
+
+  it("returns info for completed", () => {
+    expect(outcome("completed", "ok")).toBe("info");
+  });
+
+  it("returns warn for cancelled", () => {
+    expect(outcome("cancelled")).toBe("warn");
+  });
+
+  it("returns warn for timed_out", () => {
+    expect(outcome("timed_out", "timeout")).toBe("warn");
+  });
+
+  it("returns warn for hard_timeout", () => {
+    expect(outcome("hard_timeout", "timeout")).toBe("warn");
+  });
+
+  it("returns error for failed", () => {
+    expect(outcome("failed")).toBe("error");
+  });
+
+  it("returns error for aborted", () => {
+    expect(outcome("aborted")).toBe("error");
+  });
+
+  it("returns error for blocked", () => {
+    expect(outcome("blocked")).toBe("error");
+  });
+
+  it("returns error for abandoned", () => {
+    expect(outcome("abandoned")).toBe("error");
+  });
+});
diff --git a/src/agents/agent-command.ts b/src/agents/agent-command.ts
@@ -73,7 +73,10 @@ import {
   resolveMessageChannel,
 } from "../utils/message-channel.js";
 import { estimateUsageCost, resolveModelCostConfig } from "../utils/usage-format.js";
-import { buildAgentRunTerminalOutcome } from "./agent-run-terminal-outcome.js";
+import {
+  buildAgentRunTerminalOutcome,
+  type AgentRunTerminalOutcome,
+} from "./agent-run-terminal-outcome.js";
 import { resolveAgentRuntimeConfig } from "./agent-runtime-config.js";
 import {
   clearAutoFallbackPrimaryProbeSelection,
@@ -154,6 +157,27 @@ import { ensureAgentWorkspace } from "./workspace.js";
 
 const log = createSubsystemLogger("agents/agent-command");
 
+/**
+ * Maps a normalized terminal outcome to a lifecycle-end log level.
+ *
+ * Completed runs are informational; timeouts and cancellations are warnings;
+ * hard failures (including aborted, blocked, and abandoned liveness states)
+ * remain at error level so they surface in monitoring.
+ */
+function resolveAgentRunLifecycleEndLogLevel(
+  outcome: AgentRunTerminalOutcome,
+): "info" | "warn" | "error" {
+  if (outcome.reason === "completed") return "info";
+  if (
+    outcome.reason === "cancelled" ||
+    outcome.reason === "timed_out" ||
+    outcome.reason === "hard_timeout"
+  ) {
+    return "warn";
+  }
+  return "error";
+}
+
 function hasExactConfiguredProviderModel(params: {
   cfg: OpenClawConfig;
   provider: string;
@@ -1888,12 +1912,13 @@ async function agentCommandInternal(
               ? { providerStarted: runResult.meta.providerStarted }
               : {}),
           });
-          const logMsg = `[agent] run ${runId} ended with stopReason=${stopReason}`;
-          if (outcome.reason === "completed" || outcome.reason === "cancelled") {
-            console.info(logMsg);
-          } else {
-            console.warn(logMsg);
-          }
+          const level = resolveAgentRunLifecycleEndLogLevel(outcome);
+          log[level](`run ${runId} ended with stopReason=${stopReason}`, {
+            runId,
+            stopReason,
+            reason: outcome.reason,
+            status: outcome.status,
+          });
         }
         emitAgentEvent({
           runId,
@@ -2756,6 +2781,7 @@ export const testing = {
   resolveExplicitAgentCommandSessionKey,
   ingressDiagnosticChannel,
   emitIngressModelUsageDiagnostic,
+  resolveAgentRunLifecycleEndLogLevel,
 };
 
 /** @deprecated Use `testing`. */
