refactor(codex): simplify native tool diagnostics · openclaw/openclaw@529bfdb

Recent Commits to openclaw:main

obviyus · 2026-05-10 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -816,29 +816,24 @@ export class CodexAppServerEventProjector {`
`816`	`816`	`typeof params.item.durationMs === "number" ? params.item.durationMs : undefined;`
`817`	`817`	`const durationMs =`
`818`	`818`	`itemDurationMs ?? (startedAt === undefined ? 0 : Math.max(0, Date.now() - startedAt));`
`819`		`-if (params.status === "blocked") {`
`820`		`-emitTrustedDiagnosticEvent({`
`821`		`-type: "tool.execution.blocked",`
`822`		`- ...base,`
`823`		`-reason: "codex_native_tool_blocked",`
`824`		`-deniedReason: "codex_native_tool_blocked",`
`825`		`-});`
`826`		`-return;`
`827`		`-}`
`828`		`-if (params.status === "failed") {`
`829`		`-emitTrustedDiagnosticEvent({`
`830`		`-type: "tool.execution.error",`
`831`		`- ...base,`
`832`		`- durationMs,`
`833`		`-errorCategory: "codex_native_tool_error",`
`834`		`-});`
`835`		`-return;`
`836`		`-}`
`837`		`-emitTrustedDiagnosticEvent({`
`838`		`-type: "tool.execution.completed",`
`839`		`- ...base,`
`840`		`- durationMs,`
`841`		`-});`
	`819`	`+const terminalEvent =`
	`820`	`+params.status === "blocked"`
	`821`	`+ ? {`
	`822`	`+type: "tool.execution.blocked" as const,`
	`823`	`+reason: "codex_native_tool_blocked",`
	`824`	`+deniedReason: "codex_native_tool_blocked",`
	`825`	`+}`
	`826`	`+ : params.status === "failed"`
	`827`	`+ ? {`
	`828`	`+type: "tool.execution.error" as const,`
	`829`	`+ durationMs,`
	`830`	`+errorCategory: "codex_native_tool_error",`
	`831`	`+}`
	`832`	`+ : {`
	`833`	`+type: "tool.execution.completed" as const,`
	`834`	`+ durationMs,`
	`835`	`+};`
	`836`	`+emitTrustedDiagnosticEvent({ ...base, ...terminalEvent });`
`842`	`837`	`}`
`843`	`838`
`844`	`839`	`private emitToolResultSummary(item: CodexThreadItem \| undefined): void {`

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,11 @@ type ActiveTool = {`
`21`	`21`	`lastProgressAt: number;`
`22`	`22`	`};`
`23`	`23`
	`24`	`+type DiagnosticToolStartedActivityEvent = Pick<`
	`25`	`+Extract<DiagnosticEventPayload, { type: "tool.execution.started" }>,`
	`26`	`+"runId" \| "sessionId" \| "sessionKey" \| "toolName" \| "toolCallId"`
	`27`	`+>;`
	`28`	`+`
`24`	`29`	`export type DiagnosticSessionActivitySnapshot = {`
`25`	`30`	`activeWorkKind?: DiagnosticSessionActiveWorkKind;`
`26`	`31`	`activeToolName?: string;`
`@@ -158,9 +163,7 @@ function modelCallKey(event: { runId?: string; provider?: string; model?: string`
`158`	`163`	return `${event.runId ?? "unknown"}:${event.provider ?? "provider"}:${event.model ?? "model"}`;
`159`	`164`	`}`
`160`	`165`
`161`		`-function recordToolStarted(`
`162`		`-event: Extract<DiagnosticEventPayload, { type: "tool.execution.started" }>,`
`163`		`-): void {`
	`166`	`+function recordToolStarted(event: DiagnosticToolStartedActivityEvent): void {`
`164`	`167`	`const activity = resolveSessionActivity({ ...event, create: true });`
`165`	`168`	`if (!activity) {`
`166`	`169`	`return;`
`@@ -314,18 +317,7 @@ export function markDiagnosticToolStartedForTest(params: {`
`314`	`317`	`toolName: string;`
`315`	`318`	`toolCallId?: string;`
`316`	`319`	`}): void {`
`317`		`-const activity = resolveSessionActivity({ ...params, create: true });`
`318`		`-if (!activity) {`
`319`		`-return;`
`320`		`-}`
`321`		`-const now = Date.now();`
`322`		`-activity.activeTools.set(toolKey(params), {`
`323`		`-toolName: params.toolName,`
`324`		`-toolCallId: params.toolCallId,`
`325`		`-startedAt: now,`
`326`		`-lastProgressAt: now,`
`327`		`-});`
`328`		-touchSessionActivity(activity, `tool:${params.toolName}:started`, now);
	`320`	`+recordToolStarted(params);`
`329`	`321`	`}`
`330`	`322`
`331`	`323`	`export function resetDiagnosticRunActivityForTest(): void {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main