diff --git a/.agents/skills/unidesk-cicd/references/branch-follower.md b/.agents/skills/unidesk-cicd/references/branch-follower.md index 6a0a4dbd..6ea4378c 100644 --- a/.agents/skills/unidesk-cicd/references/branch-follower.md +++ b/.agents/skills/unidesk-cicd/references/branch-follower.md @@ -48,6 +48,8 @@ Follower-scoped commands such as `status --follower`, `events --follower`, `logs Argo closeout visibility must include the bounded reason for non-ready health, not only `Synced/Progressing`: health message, operation phase/message, short Application conditions and a small list of non-healthy resources when available. +The automatic controller loop is non-blocking, so closeout acceleration cannot live only in the user-facing `--wait` path. Once a triggered PipelineRun has succeeded and required runtime/GitOps gates are not aligned, the in-cluster controller path should perform the same bounded target-side Argo refresh used by wait closeout; otherwise convergence depends on Argo's background poll interval and can exceed the 120s budget even when Tekton finished quickly. + Stage timing rows must not label optional gates as `not-ready` when they are not part of that follower's closeout contract. For sentinel-like followers without a GitOps branch flush gate, git-mirror source snapshot readiness should render as source-ready/ready, while missing GitOps `githubInSync` remains `-`/not-applicable instead of a failure-looking state. ## Source Authority diff --git a/scripts/src/cicd.ts b/scripts/src/cicd.ts index d469bac7..2fa61104 100644 --- a/scripts/src/cicd.ts +++ b/scripts/src/cicd.ts @@ -858,6 +858,10 @@ async function decideAndMaybeTrigger( } if (options.dryRun && phase === "PendingTrigger") decision = `${decision}; dry-run did not trigger`; + if (shouldRefreshAutomaticCloseout(follower, observedSha, live, phase, options)) { + const refresh = runNativeArgoRefresh(follower.nativeStatus.argo as NonNullable); + if (refresh.exitCode !== 0) warnings.push(`argo refresh failed: ${redactText(tailText(refresh.stderr || refresh.stdout, 300))}`); + } const statePipelineRun = stringOrNull(triggerCommand?.pipelineRun) ?? live.pipelineRun; return { @@ -904,6 +908,25 @@ async function decideAndMaybeTrigger( }; } +function shouldRefreshAutomaticCloseout( + follower: FollowerSpec, + observedSha: string | null, + live: AdapterSummary, + phase: BranchFollowerPhase, + options: ParsedOptions, +): boolean { + if (!options.inCluster || !options.confirm || options.wait || options.dryRun) return false; + if (phase !== "ClosingOut" || observedSha === null || follower.nativeStatus.argo === null) return false; + const payload = asOptionalRecord(live.payload); + const tekton = asOptionalRecord(payload?.tekton); + if (tekton?.succeeded !== true) return false; + const argo = asOptionalRecord(payload?.argo); + const runtime = asOptionalRecord(payload?.runtime); + const argoReady = argo?.ready === true; + const runtimeAligned = runtime?.aligned === true; + return !argoReady || !runtimeAligned || live.targetSha !== observedSha; +} + async function executeTrigger(registry: BranchFollowerRegistry, follower: FollowerSpec, observedSha: string | null, options: ParsedOptions): Promise { const spec = follower.commands.trigger; const timeoutSeconds = options.timeoutSeconds ?? spec.timeoutSeconds;