Fix duplicate tool lifecycle computations, extract shared utils, preserve null in toCanonicalJsonValue

- Cache canonicalToolLifecycleData/buildCanonicalToolLifecycleData results in local variables instead of calling twice with identical arguments (ClaudeAdapter x3, CodexAdapter x1) - Extract identical normalizeCommandValue and pushChangedFile helpers into apps/server/src/provider/toolDataUtils.ts, imported by both adapters - Fix toCanonicalJsonValue to preserve null as a valid CanonicalJsonValue instead of silently converting it to undefined via the nullish coalescing operator

Cursor Agent committed 7 months ago

Commit 5b3e7101 parent ff581d64 files · +57 −97Browse files

Unified · Split

4 files

apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts +2 −3
apps/server/src/provider/Layers/ClaudeAdapter.ts +25 −65
apps/server/src/provider/Layers/CodexAdapter.ts +5 −29
apps/server/src/provider/toolDataUtils.ts +25 −0

apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts+2−3

   if (value === undefined) {
     return undefined;
   }
-  const normalized = JSON.parse(
+  return JSON.parse(
     JSON.stringify(value, (_key, nestedValue) => (nestedValue === undefined ? null : nestedValue)),
-  ) as CanonicalJsonValue | null;
+  ) as CanonicalJsonValue;
-  return normalized ?? undefined;
 }
 function buildContextWindowActivityPayload(

apps/server/src/provider/Layers/ClaudeAdapter.ts+25−65

   type ProviderAdapterError,
 } from "../Errors.ts";
 import { ClaudeAdapter, type ClaudeAdapterShape } from "../Services/ClaudeAdapter.ts";
+import { normalizeCommandValue, pushChangedFile } from "../toolDataUtils.ts";
 import { type EventNdjsonLogger, makeEventNdjsonLogger } from "./EventNdjsonLogger.ts";
 const PROVIDER = "claudeAgent" as const;
   }
 }
-function normalizeCommandValue(value: unknown): string | undefined {
-  if (typeof value === "string") {
-    const trimmed = value.trim();
-    return trimmed.length > 0 ? trimmed : undefined;
-  }
-  if (!Array.isArray(value)) {
-    return undefined;
-  }
-  const parts = value
-    .map((entry) => (typeof entry === "string" ? entry.trim() : ""))
-    .filter((entry) => entry.length > 0);
-  return parts.length > 0 ? parts.join(" ") : undefined;
-}
-function pushChangedFile(target: string[], seen: Set<string>, value: unknown) {
-  if (typeof value !== "string") {
-    return;
-  }
-  const normalized = value.trim();
-  if (normalized.length === 0 || seen.has(normalized)) {
-    return;
-  }
-  seen.add(normalized);
-  target.push(normalized);
-}
 function collectChangedFiles(value: unknown, target: string[], seen: Set<string>, depth: number) {
   if (depth > 4 || target.length >= 12) {
     return;
               status: status === "completed" ? "completed" : "failed",
               title: tool.title,
               ...(tool.detail ? { detail: tool.detail } : {}),
-              ...(canonicalToolLifecycleData({
+              ...(() => {
-                itemType: tool.itemType,
+                const toolData = canonicalToolLifecycleData({
-                toolName: tool.toolName,
+                  itemType: tool.itemType,
-                input: tool.input,
+                  toolName: tool.toolName,
-              })
+                  input: tool.input,
-                ? {
+                });
-                    data: canonicalToolLifecycleData({
+                return toolData ? { data: toolData } : {};
-                      itemType: tool.itemType,
+              })(),
-                      toolName: tool.toolName,
-                      input: tool.input,
-                    }),
-                  }
-                : {}),
             },
             providerRefs: nativeProviderRefs(context, { providerItemId: tool.itemId }),
             raw: {
                 status: "inProgress",
                 title: nextTool.title,
                 ...(nextTool.detail ? { detail: nextTool.detail } : {}),
-                ...(canonicalToolLifecycleData({
+                ...(() => {
-                  itemType: nextTool.itemType,
+                  const toolData = canonicalToolLifecycleData({
-                  toolName: nextTool.toolName,
+                    itemType: nextTool.itemType,
-                  input: nextTool.input,
+                    toolName: nextTool.toolName,
-                })
+                    input: nextTool.input,
-                  ? {
+                  });
-                      data: canonicalToolLifecycleData({
+                  return toolData ? { data: toolData } : {};
-                        itemType: nextTool.itemType,
+                })(),
-                        toolName: nextTool.toolName,
-                        input: nextTool.input,
-                      }),
-                    }
-                  : {}),
               },
               providerRefs: nativeProviderRefs(context, { providerItemId: nextTool.itemId }),
               raw: {
               status: "inProgress",
               title: tool.title,
               ...(tool.detail ? { detail: tool.detail } : {}),
-              ...(canonicalToolLifecycleData({
+              ...(() => {
-                itemType: tool.itemType,
+                const toolData = canonicalToolLifecycleData({
-                toolName: tool.toolName,
+                  itemType: tool.itemType,
-                input: toolInput,
+                  toolName: tool.toolName,
-              })
+                  input: toolInput,
-                ? {
+                });
-                    data: canonicalToolLifecycleData({
+                return toolData ? { data: toolData } : {};
-                      itemType: tool.itemType,
+              })(),
-                      toolName: tool.toolName,
-                      input: toolInput,
-                    }),
-                  }
-                : {}),
             },
             providerRefs: nativeProviderRefs(context, { providerItemId: tool.itemId }),
             raw: {

apps/server/src/provider/Layers/CodexAdapter.ts+5−29

@@ -33,6 +33,7 @@ import { · 32 unmodified lines
33	type ProviderAdapterError,	33	type ProviderAdapterError,
34	} from "../Errors.ts";	34	} from "../Errors.ts";
35	import { CodexAdapter, type CodexAdapterShape } from "../Services/CodexAdapter.ts";	35	import { CodexAdapter, type CodexAdapterShape } from "../Services/CodexAdapter.ts";
		36	import { normalizeCommandValue, pushChangedFile } from "../toolDataUtils.ts";
36	import {	37	import {
37	CodexAppServerManager,	38	CodexAppServerManager,
38	type CodexAppServerStartSessionInput,	39	type CodexAppServerStartSessionInput,
@@ -111,32 +112,6 @@ function asNumber(value: unknown): number \| undefined { · 72 unmodified lines
111	return typeof value === "number" && Number.isFinite(value) ? value : undefined;	112	return typeof value === "number" && Number.isFinite(value) ? value : undefined;
112	}	113	}
113		114
114	function normalizeCommandValue(value: unknown): string \| undefined {
115	if (typeof value === "string") {
116	const trimmed = value.trim();
117	return trimmed.length > 0 ? trimmed : undefined;
118	}
119	if (!Array.isArray(value)) {
120	return undefined;
121	}
122	const parts = value
123	.map((entry) => (typeof entry === "string" ? entry.trim() : ""))
124	.filter((entry) => entry.length > 0);
125	return parts.length > 0 ? parts.join(" ") : undefined;
126	}
127
128	function pushChangedFile(target: string[], seen: Set<string>, value: unknown) {
129	if (typeof value !== "string") {
130	return;
131	}
132	const normalized = value.trim();
133	if (normalized.length === 0 \|\| seen.has(normalized)) {
134	return;
135	}
136	seen.add(normalized);
137	target.push(normalized);
138	}
139
140	function collectChangedFiles(value: unknown, target: string[], seen: Set<string>, depth: number) {	115	function collectChangedFiles(value: unknown, target: string[], seen: Set<string>, depth: number) {
141	if (depth > 4 \|\| target.length >= 12) {	116	if (depth > 4 \|\| target.length >= 12) {
142	return;	117	return;
@@ -670,9 +645,10 @@ function mapItemLifecycle( · 527 unmodified lines
670	...(status ? { status } : {}),	645	...(status ? { status } : {}),
671	...(itemTitle(itemType) ? { title: itemTitle(itemType) } : {}),	646	...(itemTitle(itemType) ? { title: itemTitle(itemType) } : {}),
672	...(detail ? { detail } : {}),	647	...(detail ? { detail } : {}),
673	...(buildCanonicalToolLifecycleData(itemType, source, payload ?? {})	648	...(() => {
674	? { data: buildCanonicalToolLifecycleData(itemType, source, payload ?? {}) }	649	const toolData = buildCanonicalToolLifecycleData(itemType, source, payload ?? {});
675	: {}),	650	return toolData ? { data: toolData } : {};
		651	})(),
676	},	652	},
677	};	653	};
678	}	654	}

apps/server/src/provider/toolDataUtils.ts+25−0

@@ -0,0 +1,25 @@
	1	export function normalizeCommandValue(value: unknown): string \| undefined {
	2	if (typeof value === "string") {
	3	const trimmed = value.trim();
	4	return trimmed.length > 0 ? trimmed : undefined;
	5	}
	6	if (!Array.isArray(value)) {
	7	return undefined;
	8	}
	9	const parts = value
	10	.map((entry) => (typeof entry === "string" ? entry.trim() : ""))
	11	.filter((entry) => entry.length > 0);
	12	return parts.length > 0 ? parts.join(" ") : undefined;
	13	}
	14
	15	export function pushChangedFile(target: string[], seen: Set<string>, value: unknown) {
	16	if (typeof value !== "string") {
	17	return;
	18	}
	19	const normalized = value.trim();
	20	if (normalized.length === 0 \|\| seen.has(normalized)) {
	21	return;
	22	}
	23	seen.add(normalized);
	24	target.push(normalized);
	25	}

Fix duplicate tool lifecycle computations, extract shared utils, preserve null in toCanonicalJsonValue

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code