From 197a883ca0b56a0cbfce0bd351ad75d4d3940b73 Mon Sep 17 00:00:00 2001 From: Codex Date: Fri, 3 Jul 2026 20:49:57 +0000 Subject: [PATCH] fix: keep branch follower reuse status compact --- scripts/native/cicd/read-state-summary.mjs | 12 +++++++----- scripts/src/cicd-branch-follower.ts | 14 +++++++++----- scripts/src/cicd-debug.ts | 5 +++++ scripts/src/cicd-reuse-config.ts | 16 +--------------- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/scripts/native/cicd/read-state-summary.mjs b/scripts/native/cicd/read-state-summary.mjs index b10fd6ea..740490ae 100644 --- a/scripts/native/cicd/read-state-summary.mjs +++ b/scripts/native/cicd/read-state-summary.mjs @@ -166,16 +166,18 @@ function compactReuseConfig(reuseConfig) { stageRef: stringOrNull(value.stageRef), sha256: stringOrNull(value.sha256), serviceCount: numberOrNull(value.serviceCount), - services: arrayRecords(value.services).slice(0, 8).map((service) => ({ - id: stringOrNull(service.id), - runtimeReuse: recordOrNull(service.runtimeReuse), - envReuse: recordOrNull(service.envReuse), - })), + serviceIds: compactReuseServiceIds(value), errors: arrayStrings(value.errors).slice(0, 5), valuesRedacted: true, }; } +function compactReuseServiceIds(value) { + const explicit = arrayStrings(value.serviceIds); + if (explicit.length > 0) return explicit.slice(0, 16); + return arrayRecords(value.services).map((service) => stringOrNull(service.id)).filter(Boolean).slice(0, 16); +} + function compactGitMirror(gitMirror) { const value = recordOrNull(gitMirror); if (value === null) return null; diff --git a/scripts/src/cicd-branch-follower.ts b/scripts/src/cicd-branch-follower.ts index 70bce39c..a7be0727 100644 --- a/scripts/src/cicd-branch-follower.ts +++ b/scripts/src/cicd-branch-follower.ts @@ -2140,16 +2140,20 @@ function summarizeRuntimeReuseConfigFromRecord(value: Record | stageRef: stringOrNull(value.stageRef), sha256: stringOrNull(value.sha256), serviceCount: numberOrNull(value.serviceCount), - services: arrayRecords(value.services).slice(0, 8).map((service) => ({ - id: stringOrNull(service.id), - runtimeReuse: asOptionalRecord(service.runtimeReuse), - envReuse: asOptionalRecord(service.envReuse), - })), + serviceIds: compactReuseServiceIds(value), errors: Array.isArray(value.errors) ? value.errors.map(String).slice(0, 5) : [], valuesRedacted: true, }; } +function compactReuseServiceIds(value: Record): string[] { + if (Array.isArray(value.serviceIds)) return value.serviceIds.map(String).slice(0, 16); + return arrayRecords(value.services).flatMap((service) => { + const id = stringOrNull(service.id); + return id === null ? [] : [id]; + }).slice(0, 16); +} + function compactSourceSyncPayload(value: Record | null): Record | null { if (value === null) return null; return { diff --git a/scripts/src/cicd-debug.ts b/scripts/src/cicd-debug.ts index 3862f886..b0214107 100644 --- a/scripts/src/cicd-debug.ts +++ b/scripts/src/cicd-debug.ts @@ -393,6 +393,7 @@ function compactStatusGates(payload: Record | null): Record[] { return Array.isArray(value) ? value.filter((item): item is Record => typeof item === "object" && item !== null && !Array.isArray(item)) : []; } +function arrayStrings(value: unknown): string[] { + return Array.isArray(value) ? value.map(String) : []; +} + function compactFollowerDecision(state: FollowerState): Record { return { phase: state.phase, diff --git a/scripts/src/cicd-reuse-config.ts b/scripts/src/cicd-reuse-config.ts index 1a548d2e..7cebb700 100644 --- a/scripts/src/cicd-reuse-config.ts +++ b/scripts/src/cicd-reuse-config.ts @@ -102,21 +102,7 @@ export function summarizeRuntimeReuseConfig(config: RuntimeReuseConfig | null): stageRef: config.stageRef, sha256: config.sha256, serviceCount: config.serviceCount, - services: config.services.map((service) => ({ - id: service.id, - runtimeReuse: service.runtimeReuse === null ? null : { - enabled: service.runtimeReuse.enabled, - codeIdentityPathCount: service.runtimeReuse.codeIdentityPaths.length, - envIdentityPathCount: service.runtimeReuse.envIdentityPaths.length, - }, - envReuse: service.envReuse === null ? null : { - enabled: service.envReuse.enabled, - mode: service.envReuse.mode, - nodeDepsPath: service.envReuse.nodeDepsPath, - envIdentityFileCount: service.envReuse.envIdentityFiles.length, - buildArgNames: Object.keys(service.envReuse.buildArgs).sort(), - }, - })), + serviceIds: config.services.map((service) => service.id).sort(), errors: config.errors.slice(0, 5), valuesRedacted: true, };