refactor: share tier labels, add retriedResources to JSON, tidy retry attribution (Closes #162)

Co-authored-by: azaslonov <2320302+azaslonov@users.noreply.github.com>

Author: Copilot

src/cli/extract-command.ts

@@ -21,7 +21,7 @@ import { ArtifactStore } from '../clients/artifact-store.js';
 import { IArtifactStore } from '../clients/iartifact-store.js';
 import { getCloudConfig, buildArmBaseUrl } from '../lib/cloud-config.js';
 import { EXIT_FATAL, EXIT_SUCCESS } from '../lib/exit-codes.js';
-import { getResourceTier } from '../lib/dependency-graph.js';
+import { getResourceTier, TIER_LABELS } from '../lib/dependency-graph.js';
 import { formatDuration } from '../lib/format-duration.js';
 import { ResourceType } from '../models/resource-types.js';
 
@@ -223,21 +223,12 @@ function outputJson(result: ExtractionResult, elapsedMs: number): void {
   process.stdout.write(JSON.stringify(output, null, 2) + '\n');
 }
 
-/**
- * Human-readable labels for each dependency tier, used to group output.
- */
-const TIER_LABELS: Record<number, string> = {
-  1: 'Independent resources',
-  2: 'Resources with dependencies',
-  3: 'Child resources',
-  4: 'Nested child resources',
-};
 
 function tierOf(type: ResourceType): number {
   try {
     return getResourceTier(type);
   } catch {
-    return 0;
+    return Number.MAX_SAFE_INTEGER;
   }
 }
 

src/cli/publish-command.ts

@@ -204,6 +204,7 @@ function outputJson(result: PublishResult): void {
       totalErrors: number;
       totalSkipped: number;
       totalRetries: number;
+      retriedResources: number;
       elapsedMs?: number;
     };
     actions: Array<{
@@ -243,6 +244,7 @@ function outputJson(result: PublishResult): void {
       totalErrors: result.totalErrors,
       totalSkipped: result.totalSkipped,
       totalRetries: result.totalRetries ?? 0,
+      retriedResources: result.retriedResources ?? 0,
       elapsedMs: result.elapsedMs,
     },
     actions: result.actions.map((action) => ({

src/lib/dependency-graph.ts

@@ -109,6 +109,16 @@ export const TIER_4_RESOURCES: ResourceType[] = [
   ResourceType.GraphQLResolverPolicy,
 ];
 
+/**
+ * Human-readable labels for each dependency tier, used to group CLI output.
+ */
+export const TIER_LABELS: Readonly<Record<number, string>> = {
+  1: 'Independent resources',
+  2: 'Resources with dependencies',
+  3: 'Child resources',
+  4: 'Nested child resources',
+};
+
 /**
  * Returns all resource types in topological order (dependencies first).
  * This is the order in which resources should be extracted and published.

src/services/publish-service.ts

@@ -11,7 +11,7 @@ import { IArtifactStore } from '../clients/iartifact-store.js';
 import { FilterConfig, PublishConfig, OverrideConfig } from '../models/config.js';
 import { ApimServiceContext, ResourceDescriptor } from '../models/types.js';
 import { ResourceType } from '../models/resource-types.js';
-import { getResourceTier } from '../lib/dependency-graph.js';
+import { getResourceTier, TIER_LABELS } from '../lib/dependency-graph.js';
 import { runParallel } from '../lib/parallel-runner.js';
 import { logger } from '../lib/logger.js';
 import { isAutoGeneratedId } from '../lib/auto-generated.js';
@@ -89,16 +89,6 @@ export interface PublishResult {
   retriedResources?: number;
 }
 
-/**
- * Human-readable labels for each dependency tier, used in publish output headers.
- */
-const TIER_LABELS: Record<number, string> = {
-  1: 'Independent resources',
-  2: 'Resources with dependencies',
-  3: 'Child resources',
-  4: 'Nested child resources',
-};
-
 interface PublishTargets {
   targetDescriptors: ResourceDescriptor[];
   deletedDescriptors: ResourceDescriptor[];
@@ -811,11 +801,6 @@ async function publishTier(
   descriptors: ResourceDescriptor[],
   allTargetDescriptors: ResourceDescriptor[]
 ): Promise<PublishActionResult[]> {
-  const tasks = descriptors.map((descriptor) => async () => {
-    const { value, retries } = await trackRetries(() => publishDescriptor(descriptor));
-    return attachRetries(value, retries);
-  });
-
   const publishDescriptor = async (descriptor: ResourceDescriptor): Promise<PublishActionResult[]> => {
     try {
       let publishResult: ResourcePublishResult;
@@ -867,6 +852,11 @@ async function publishTier(
     }
   };
 
+  const tasks = descriptors.map((descriptor) => async () => {
+    const { value, retries } = await trackRetries(() => publishDescriptor(descriptor));
+    return attachRetries(value, retries);
+  });
+
   const taskResults = await runParallel(tasks, 5);
 
   return taskResults.flatMap((tr, index) => {
@@ -1028,11 +1018,6 @@ async function deleteTier(
   config: PublishConfig,
   descriptorsAreDeployed: boolean
 ): Promise<PublishActionResult[]> {
-  const tasks = descriptors.map((descriptor) => async () => {
-    const { value, retries } = await trackRetries(() => deleteDescriptor(descriptor));
-    return retries > 0 ? { ...value, retries } : value;
-  });
-
   const deleteDescriptor = async (descriptor: ResourceDescriptor): Promise<PublishActionResult> => {
     try {
       const deployedDescriptor = config.envMapping && !descriptorsAreDeployed
@@ -1071,6 +1056,11 @@ async function deleteTier(
     }
   };
 
+  const tasks = descriptors.map((descriptor) => async () => {
+    const { value, retries } = await trackRetries(() => deleteDescriptor(descriptor));
+    return attachRetries([value], retries)[0] ?? value;
+  });
+
   const taskResults = await runParallel(tasks, 5);
 
   return taskResults.map((tr, index) => {