fix: show 'merging' phase step during osspckgs merge loop

Signed-off-by: Uroš Marolt <uros@marolt.me>

Author: themarolt

services/apps/packages_worker/src/deps-dev/workflows/ingestDependencies.ts

@@ -397,6 +397,11 @@ export async function ingestDependencies(opts: {
     let priorStagingRows = 0
     const priorTableRowCounts: Record<string, number> = {}
 
+    // Advance the phase label to 'merging' before the loop. The merge itself sets status='merging'
+    // but never a step, so without this the monitor keeps showing the last phase (creating_lookup for
+    // fill/incremental, drop_indexes for full) alongside the 'merging' status. Set once, not per chunk.
+    await setJobStep({ jobId: exportResult.jobId, step: 'merging' })
+
     for (let chunkIndex = startChunk; chunkIndex < totalChunks; chunkIndex++) {
       const start = chunkIndex * filesPerChunk
       const chunk = fileNames.slice(start, start + filesPerChunk)

services/apps/packages_worker/src/scripts/monitorOsspckgs.ts

@@ -114,7 +114,9 @@ function statusStr(status: string, step?: string | null, stuck?: boolean) {
   const c = stuck ? A.yellow : (STATUS_COLOR[status as keyof typeof STATUS_COLOR] ?? '')
   const i = stuck ? '⚠' : (STATUS_ICON[status as keyof typeof STATUS_ICON] ?? '?')
   const label =
-    step && !['done', 'failed', 'cleaned'].includes(status) ? `${status}·${step}` : status
+    step && step !== status && !['done', 'failed', 'cleaned'].includes(status)
+      ? `${status}·${step}`
+      : status
   return `${c}${i} ${label}${A.reset}`
 }