fix(workflow): correct token calculation and step completion logic

fix incorrect token calculation by removing cached token subtraction
ensure proper step completion handling in loop and checkpoint scenarios

Author: moazbuilds

src/cli/tui/routes/workflow/components/output/telemetry-bar.tsx

@@ -38,16 +38,13 @@ export function TelemetryBar(props: TelemetryBarProps) {
 
   const totalText = () => {
     const cached = props.total.cached ?? 0
-    const newTokensIn = props.total.tokensIn - cached
-    const base = formatTokens(newTokensIn, props.total.tokensOut)
+    const base = formatTokens(props.total.tokensIn, props.total.tokensOut)
     return cached > 0 ? `${base} (${formatNumber(cached)} cached)` : base
   }
 
   // Compact token display - no "cached" info
   const compactTokenText = () => {
-    const cached = props.total.cached ?? 0
-    const newTokensIn = props.total.tokensIn - cached
-    return formatTokens(newTokensIn, props.total.tokensOut)
+    return formatTokens(props.total.tokensIn, props.total.tokensOut)
   }
 
   const showStatus = () => props.status === "awaiting" || props.status === "paused" || props.status === "stopped"

src/workflows/step/run.ts

@@ -192,17 +192,20 @@ export async function runStepFresh(ctx: RunnerContext): Promise<RunStepResult |
       const targetIndex = postResult.newIndex + 1;
       if (targetIndex >= 0 && targetIndex <= stepIndex) {
         debug('[step/run] Loop directive: rewinding to step %d', targetIndex);
+        ctx.emitter.updateAgentStatus(uniqueAgentId, 'completed');
+        await ctx.indexManager.stepCompleted(stepIndex);
         machineCtx.currentStepIndex = targetIndex;
         return { output: stepOutput, newIndex: targetIndex };
       }
     }
 
-    // Checkpoint continued - skip chained prompts
+    // Checkpoint continued - skip chained prompts and go directly to next step
     if (postResult.checkpointContinued) {
       debug('[step/run] Checkpoint continued, advancing to next step');
       ctx.emitter.updateAgentStatus(uniqueAgentId, 'completed');
       ctx.indexManager.resetQueue();
-      ctx.machine.send({ type: 'STEP_COMPLETE', output: stepOutput });
+      await ctx.indexManager.stepCompleted(stepIndex);
+      ctx.machine.send({ type: 'SKIP' });
       return { output: stepOutput, checkpointContinued: true };
     }