fix: improve AgentRun status visibility

2026-06-16 05:50:52 +00:00
parent 131698ee82
commit 5a2c72c87b
5 changed files with 300 additions and 51 deletions
@@ -2117,52 +2117,74 @@ async function statusYamlLane(config: UniDeskConfig, options: StatusOptions, tar
    ...(secrets.ready === true ? [] : ["lane-secret-missing"]),
    ...(spec.database.localPostgresExpectedAbsent && localPostgres.absent !== true ? ["local-postgres-present"] : []),
  ];
-  return {
+  const aligned = blockers.length === 0 && pipelineSucceeded && argoSyncedToGitops && managerSourceMatchesExpected;
+  const runtimeAlignment = {
+    pipelineSucceeded,
+    argoRevision: stringOrNull(argo.revision),
+    argoSyncedToGitops,
+    managerSourceCommit: stringOrNull(manager.sourceCommit),
+    managerSourceMatchesExpected,
+  };
+  const summary = {
+    aligned,
+    blockers,
+    sourceCommit,
+    expectedPipelineRun: pipelineRunName,
+    expectedGitopsRevision,
+    runtimeAlignment,
+    source: {
+      workspaceExists: sourcePayload.workspaceExists ?? false,
+      workspaceClean: sourcePayload.workspaceClean ?? null,
+      localHead: sourcePayload.localHead ?? null,
+      remoteBranchExists: sourcePayload.remoteBranchExists ?? false,
+      remoteBranchCommit: sourcePayload.remoteBranchCommit ?? null,
+    },
+    gitMirror: {
+      readReady: mirrorPayload.readReady ?? false,
+      writeReady: mirrorPayload.writeReady ?? false,
+      cachePvcExists: mirrorPayload.cachePvcExists ?? false,
+      repositoryCount: Array.isArray(mirrorPayload.repositories) ? mirrorPayload.repositories.length : null,
+      sourceCommit: stringOrNull(mirrorPayload.sourceCommit),
+      gitopsCommit: expectedGitopsRevision,
+    },
+    ci: {
+      namespaceExists: runtimePayload.ciNamespaceExists ?? false,
+      serviceAccountExists: runtimePayload.serviceAccountExists ?? false,
+      pipeline,
+      pipelineRun: pipelineRunStatus,
+    },
+    argo,
+    runtime: {
+      namespaceExists: runtimePayload.runtimeNamespaceExists ?? false,
+      manager: {
+        deploymentExists: manager.deploymentExists ?? false,
+        serviceExists: manager.serviceExists ?? false,
+        deployment: manager.deployment ?? null,
+        service: manager.service ?? null,
+        image: manager.image ?? null,
+        sourceCommit: stringOrNull(manager.sourceCommit),
+        sourceMatchesExpected: managerSourceMatchesExpected,
+      },
+      database,
+      secrets: compactLaneSecretsStatus(secrets),
+      localPostgres,
+    },
+  };
+  const statusFullCommand = agentRunControlPlaneStatusCommand(spec, options, true);
+  const result: Record<string, unknown> = {
    ok: sourceProbe.value.exitCode === 0 && runtimeProbe.value.exitCode === 0 && mirrorProbe.value.exitCode === 0 && blockers.length === 0,
    command: "agentrun control-plane status",
    mode: "yaml-declared-node-lane",
    configPath: target.configPath,
-    target: agentRunLaneSummary(spec),
-    summary: {
-      aligned: blockers.length === 0 && pipelineSucceeded && argoSyncedToGitops && managerSourceMatchesExpected,
+    target: options.full || options.raw ? agentRunLaneSummary(spec) : compactAgentRunLaneStatusTarget(spec),
+    summary,
+    alignment: {
+      aligned,
      blockers,
      sourceCommit,
      expectedPipelineRun: pipelineRunName,
      expectedGitopsRevision,
-      runtimeAlignment: {
-        pipelineSucceeded,
-        argoRevision: stringOrNull(argo.revision),
-        argoSyncedToGitops,
-        managerSourceCommit: stringOrNull(manager.sourceCommit),
-        managerSourceMatchesExpected,
-      },
-      source: {
-        workspaceExists: sourcePayload.workspaceExists ?? false,
-        workspaceClean: sourcePayload.workspaceClean ?? null,
-        localHead: sourcePayload.localHead ?? null,
-        remoteBranchExists: sourcePayload.remoteBranchExists ?? false,
-        remoteBranchCommit: sourcePayload.remoteBranchCommit ?? null,
-      },
-      gitMirror: {
-        readReady: mirrorPayload.readReady ?? false,
-        writeReady: mirrorPayload.writeReady ?? false,
-        cachePvcExists: mirrorPayload.cachePvcExists ?? false,
-        repositoryCount: Array.isArray(mirrorPayload.repositories) ? mirrorPayload.repositories.length : null,
-      },
-      ci: {
-        namespaceExists: runtimePayload.ciNamespaceExists ?? false,
-        serviceAccountExists: runtimePayload.serviceAccountExists ?? false,
-        pipeline,
-        pipelineRun: pipelineRunStatus,
-      },
-      argo,
-      runtime: {
-        namespaceExists: runtimePayload.runtimeNamespaceExists ?? false,
-        manager,
-        database,
-        secrets,
-        localPostgres,
-      },
+      runtimeAlignment,
    },
    timings: {
      sourceMs: sourceProbe.elapsedMs,
@@ -2170,24 +2192,118 @@ async function statusYamlLane(config: UniDeskConfig, options: StatusOptions, tar
      gitMirrorMs: mirrorProbe.elapsedMs,
      totalMs: sourceProbe.elapsedMs + Math.max(runtimeProbe.elapsedMs, mirrorProbe.elapsedMs),
    },
-    source: sourcePayload,
-    runtime: runtimePayload,
-    gitMirror: mirrorPayload,
    captures: {
      source: compactCapture(sourceProbe.value, { full: options.full || options.raw || sourceProbe.value.exitCode !== 0 }),
      runtime: compactCapture(runtimeProbe.value, { full: options.full || options.raw || runtimeProbe.value.exitCode !== 0 }),
      gitMirror: compactCapture(mirrorProbe.value, { full: options.full || options.raw || mirrorProbe.value.exitCode !== 0 }),
    },
+    disclosure: {
+      output: options.full || options.raw ? "full" : "compact-summary",
+      full: options.full,
+      raw: options.raw,
+      omittedWhenCompact: options.full || options.raw ? [] : ["full target YAML summary", "source", "runtime", "gitMirror", "capture stdout/stderr tails for successful probes"],
+      fullCommand: statusFullCommand,
+    },
    next: {
      plan: `bun scripts/cli.ts agentrun control-plane plan --node ${spec.nodeId} --lane ${spec.lane}`,
      postgresStatus: spec.database.configRef ? `bun scripts/cli.ts platform-db postgres status --config ${spec.database.configRef}` : null,
      postgresApply: spec.database.configRef ? `bun scripts/cli.ts platform-db postgres apply --config ${spec.database.configRef} --confirm` : null,
      secretSync: `bun scripts/cli.ts agentrun control-plane secret-sync --node ${spec.nodeId} --lane ${spec.lane} --confirm`,
      restart: `bun scripts/cli.ts agentrun control-plane restart --node ${spec.nodeId} --lane ${spec.lane} --confirm`,
-      statusFull: `bun scripts/cli.ts agentrun control-plane status --node ${spec.nodeId} --lane ${spec.lane} --full`,
+      statusFull: statusFullCommand,
    },
    valuesPrinted: false,
  };
+  if (options.full || options.raw) {
+    result.source = sourcePayload;
+    result.runtime = runtimePayload;
+    result.gitMirror = mirrorPayload;
+  }
+  return result;
+}
+
+function agentRunControlPlaneStatusCommand(spec: AgentRunLaneSpec, options: Pick<StatusOptions, "sourceCommit" | "pipelineRun">, full: boolean): string {
+  return [
+    "bun scripts/cli.ts agentrun control-plane status",
+    `--node ${spec.nodeId}`,
+    `--lane ${spec.lane}`,
+    options.pipelineRun === null ? null : `--pipeline-run ${options.pipelineRun}`,
+    options.sourceCommit === null ? null : `--source-commit ${options.sourceCommit}`,
+    full ? "--full" : null,
+  ].filter(Boolean).join(" ");
+}
+
+function compactLaneSecretsStatus(secrets: Record<string, unknown>): Record<string, unknown> {
+  const items = Array.isArray(secrets.items) ? secrets.items.filter((item): item is Record<string, unknown> => typeof item === "object" && item !== null && !Array.isArray(item)) : [];
+  const missing = items
+    .filter((item) => item.present !== true || item.keyPresent !== true)
+    .map((item) => ({
+      namespace: item.namespace ?? null,
+      name: item.name ?? null,
+      key: item.key ?? null,
+      present: item.present ?? false,
+      keyPresent: item.keyPresent ?? false,
+    }));
+  return {
+    ready: secrets.ready ?? false,
+    count: secrets.count ?? items.length,
+    missingCount: missing.length,
+    missing,
+    valuesPrinted: false,
+  };
+}
+
+function compactAgentRunLaneStatusTarget(spec: AgentRunLaneSpec): Record<string, unknown> {
+  return {
+    node: {
+      id: spec.nodeId,
+      route: spec.nodeRoute,
+      kubeRoute: spec.nodeKubeRoute,
+    },
+    lane: spec.lane,
+    version: spec.version,
+    source: {
+      repository: spec.source.repository,
+      branch: spec.source.branch,
+      workspace: spec.source.workspace,
+    },
+    runtime: {
+      namespace: spec.runtime.namespace,
+      managerDeployment: spec.runtime.managerDeployment,
+      managerService: spec.runtime.managerService,
+      internalBaseUrl: spec.runtime.internalBaseUrl,
+    },
+    ci: {
+      namespace: spec.ci.namespace,
+      pipeline: spec.ci.pipeline,
+      pipelineRunPrefix: spec.ci.pipelineRunPrefix,
+      registryPrefix: spec.ci.registryPrefix,
+    },
+    gitops: {
+      branch: spec.gitops.branch,
+      path: spec.gitops.path,
+      argoNamespace: spec.gitops.argoNamespace,
+      argoApplication: spec.gitops.argoApplication,
+    },
+    gitMirror: {
+      namespace: spec.gitMirror.namespace,
+      readService: spec.gitMirror.readService,
+      writeService: spec.gitMirror.writeService,
+      repositoryCount: spec.gitMirror.repositories.length,
+    },
+    database: {
+      mode: spec.database.mode,
+      provider: spec.database.provider,
+      configRef: spec.database.configRef,
+      database: spec.database.database,
+      user: spec.database.user,
+      secretRef: spec.database.secretRef,
+      localPostgresExpectedAbsent: spec.database.localPostgresExpectedAbsent,
+      valuesPrinted: false,
+    },
+    secretCount: spec.secrets.length,
+    valuesPrinted: false,
+  };
 }

 async function restartYamlLane(config: UniDeskConfig, options: LaneConfirmOptions): Promise<Record<string, unknown>> {