Fix lint and type errors in include_assets step

- Rename short identifiers (k, v, p) to satisfy id-length rule
- Add eslint-disable for intentional no-await-in-loop in sequential copy loop
- Add null guard for head in buildRelativeEntry to fix TS18048
- Run prettier fixes

Author: alfonso-noriega

packages/app/src/cli/services/build/steps/include-assets-step.test.ts

@@ -337,8 +337,8 @@ describe('executeIncludeAssetsStep', () => {
         } as unknown as ExtensionInstance,
       }
 
-      vi.mocked(fs.fileExists).mockImplementation(async (p) =>
-        typeof p === 'string' && p.startsWith('/test/extension'),
+      vi.mocked(fs.fileExists).mockImplementation(
+        async (path) => typeof path === 'string' && path.startsWith('/test/extension'),
       )
       vi.mocked(fs.copyFile).mockResolvedValue()
       vi.mocked(fs.mkdir).mockResolvedValue()
@@ -613,8 +613,8 @@ describe('executeIncludeAssetsStep', () => {
       // Source files exist; destination paths don't yet (so findUniqueDestPath
       // resolves on the first candidate without looping). Individual tests can
       // override for specific scenarios.
-      vi.mocked(fs.fileExists).mockImplementation(async (p) =>
-        typeof p === 'string' && p.startsWith('/test/extension'),
+      vi.mocked(fs.fileExists).mockImplementation(
+        async (path) => typeof path === 'string' && path.startsWith('/test/extension'),
       )
       vi.mocked(fs.copyFile).mockResolvedValue()
       vi.mocked(fs.copyDirectoryContents).mockResolvedValue()
@@ -630,17 +630,13 @@ describe('executeIncludeAssetsStep', () => {
           configuration: {
             extensions: [
               {
-                targeting: [
-                  {target: 'admin.app.intent.link', tools: './tools.json', url: '/editor'},
-                ],
+                targeting: [{target: 'admin.app.intent.link', tools: './tools.json', url: '/editor'}],
               },
             ],
           },
         } as unknown as ExtensionInstance,
       }
 
-
-
       const step: LifecycleStep = {
         id: 'gen-manifest',
         name: 'Generate Manifest',
@@ -697,8 +693,6 @@ describe('executeIncludeAssetsStep', () => {
         } as unknown as ExtensionInstance,
       }
 
-
-
       const step: LifecycleStep = {
         id: 'gen-manifest',
         name: 'Generate Manifest',
@@ -763,8 +757,6 @@ describe('executeIncludeAssetsStep', () => {
         } as unknown as ExtensionInstance,
       }
 
-
-
       const step: LifecycleStep = {
         id: 'gen-manifest',
         name: 'Generate Manifest',
@@ -861,9 +853,7 @@ describe('executeIncludeAssetsStep', () => {
         type: 'include_assets',
         config: {
           generateManifest: true,
-          inclusions: [
-            {type: 'pattern', baseDir: 'public', include: ['**/*']},
-          ],
+          inclusions: [{type: 'pattern', baseDir: 'public', include: ['**/*']}],
         },
       }
 
@@ -884,8 +874,6 @@ describe('executeIncludeAssetsStep', () => {
         } as unknown as ExtensionInstance,
       }
 
-
-
       const step: LifecycleStep = {
         id: 'gen-manifest',
         name: 'Generate Manifest',
@@ -929,19 +917,15 @@ describe('executeIncludeAssetsStep', () => {
         type: 'include_assets',
         config: {
           generateManifest: true,
-          inclusions: [
-            {type: 'configKey', key: 'targeting.tools', anchor: 'targeting'},
-          ],
+          inclusions: [{type: 'configKey', key: 'targeting.tools', anchor: 'targeting'}],
         },
       }
 
       // When
       await executeIncludeAssetsStep(step, contextWithConfig)
 
       // Then — warning logged, inclusion treated as root entry
-      expect(mockStdout.write).toHaveBeenCalledWith(
-        expect.stringContaining('anchor without groupBy (or vice versa)'),
-      )
+      expect(mockStdout.write).toHaveBeenCalledWith(expect.stringContaining('anchor without groupBy (or vice versa)'))
       const manifestContent = JSON.parse(vi.mocked(fs.writeFile).mock.calls[0]![1] as string)
       expect(manifestContent).toHaveProperty('tools')
     })
@@ -959,8 +943,6 @@ describe('executeIncludeAssetsStep', () => {
         } as unknown as ExtensionInstance,
       }
 
-
-
       const step: LifecycleStep = {
         id: 'gen-manifest',
         name: 'Generate Manifest',
@@ -1007,8 +989,6 @@ describe('executeIncludeAssetsStep', () => {
         } as unknown as ExtensionInstance,
       }
 
-
-
       const step: LifecycleStep = {
         id: 'gen-manifest',
         name: 'Generate Manifest',
@@ -1047,9 +1027,7 @@ describe('executeIncludeAssetsStep', () => {
           ...mockExtension,
           outputPath: '/test/output/extension.js',
           configuration: {
-            extensions: [
-              {targeting: [{target: 'admin.intent.link', tools: './tools.json'}]},
-            ],
+            extensions: [{targeting: [{target: 'admin.intent.link', tools: './tools.json'}]}],
           },
         } as unknown as ExtensionInstance,
       }
@@ -1089,9 +1067,7 @@ describe('executeIncludeAssetsStep', () => {
         extension: {
           ...mockExtension,
           configuration: {
-            extensions: [
-              {targeting: [{target: 'admin.intent.link', tools: './tools.json'}]},
-            ],
+            extensions: [{targeting: [{target: 'admin.intent.link', tools: './tools.json'}]}],
           },
         } as unknown as ExtensionInstance,
       }
@@ -1138,9 +1114,7 @@ describe('executeIncludeAssetsStep', () => {
           configuration: {
             extensions: [
               {
-                targeting: [
-                  {target: 'admin.intent.link', tools: './tools.json', url: '/editor'},
-                ],
+                targeting: [{target: 'admin.intent.link', tools: './tools.json', url: '/editor'}],
               },
             ],
           },

packages/app/src/cli/services/build/steps/include_assets_step.ts

@@ -150,7 +150,7 @@ export async function executeIncludeAssetsStep(
           entry.preserveStructure,
           sanitizedDest,
         )
-        result.pathMap.forEach((v, k) => aggregatedPathMap.set(k, v))
+        result.pathMap.forEach((val, key) => aggregatedPathMap.set(key, val))
         return result.filesCopied
       }
 
@@ -223,8 +223,12 @@ async function findUniqueDestPath(dir: string, filename: string): Promise<string
   const ext = extname(filename)
   const base = ext ? filename.slice(0, -ext.length) : filename
   let counter = 1
+  // Sequential loop is intentional: each iteration must check the previous
+  // result before proceeding to avoid race conditions on concurrent copies.
+
   while (true) {
     const next = joinPath(dir, `${base}-${counter}${ext}`)
+    // eslint-disable-next-line no-await-in-loop
     if (!(await fileExists(next))) return next
     counter++
   }
@@ -283,6 +287,7 @@ async function copyConfigKeyEntry(
   const pathMap = new Map<string, string>()
   let filesCopied = 0
 
+  /* eslint-disable no-await-in-loop */
   for (const sourcePath of uniquePaths) {
     const fullPath = joinPath(baseDir, sourcePath)
     const exists = await fileExists(fullPath)
@@ -317,6 +322,7 @@ async function copyConfigKeyEntry(
       filesCopied += copied.length
     }
   }
+  /* eslint-enable no-await-in-loop */
 
   return {filesCopied, pathMap}
 }
@@ -396,16 +402,15 @@ function buildRelativeEntry(item: {[key: string]: unknown}, relPath: string): {[
 
   const tokens = tokenizePath(relPath)
   const [head, ...rest] = tokens
+  if (!head) return item
   const restPath = rest.map((t) => `${t.name}${t.flatten ? '[]' : ''}`).join('.')
 
   const value = item[head.name]
 
   if (head.flatten) {
     // Array segment: map over each element with the remaining path
     if (!Array.isArray(value)) return {[head.name]: value}
-    const mapped = (value as {[key: string]: unknown}[]).map((el) =>
-      restPath ? buildRelativeEntry(el, restPath) : el,
-    )
+    const mapped = (value as {[key: string]: unknown}[]).map((el) => (restPath ? buildRelativeEntry(el, restPath) : el))
     return {[head.name]: mapped}
   }
 
@@ -438,8 +443,8 @@ function resolveManifestPaths(value: unknown, pathMap: Map<string, string>): unk
   if (Array.isArray(value)) return value.map((el) => resolveManifestPaths(el, pathMap))
   if (value !== null && typeof value === 'object') {
     const result: {[key: string]: unknown} = {}
-    for (const [k, v] of Object.entries(value as {[key: string]: unknown})) {
-      result[k] = resolveManifestPaths(v, pathMap)
+    for (const [key, val] of Object.entries(value as {[key: string]: unknown})) {
+      result[key] = resolveManifestPaths(val, pathMap)
     }
     return result
   }
@@ -489,9 +494,7 @@ async function generateManifestFile(
 
   // Step 1: partition configKey inclusions
   type ConfigKeyEntry = z.infer<typeof ConfigKeyEntrySchema>
-  const configKeyInclusions = config.inclusions.filter(
-    (entry): entry is ConfigKeyEntry => entry.type === 'configKey',
-  )
+  const configKeyInclusions = config.inclusions.filter((entry): entry is ConfigKeyEntry => entry.type === 'configKey')
 
   type AnchoredEntry = ConfigKeyEntry & {anchor: string; groupBy: string}