build a queue

Author: gewenyu99

src/lib/__tests__/workflow-queue.test.ts

@@ -1,6 +1,8 @@
 import {
   WizardWorkflowQueue,
   createInitialWizardWorkflowQueue,
+  createPostBootstrapQueue,
+  parseWorkflowStepsFromSkillMd,
   type WorkflowStepSeed,
 } from '../workflow-queue';
 
@@ -70,6 +72,22 @@ describe('WizardWorkflowQueue', () => {
     ]);
   });
 
+  it('createPostBootstrapQueue omits bootstrap', () => {
+    const queue = createPostBootstrapQueue(BASIC_INTEGRATION_STEPS);
+    const items = queue.toArray();
+
+    expect(items[0]).toEqual({
+      id: 'workflow:1.0-begin',
+      kind: 'workflow',
+      referenceFilename: 'basic-integration-1.0-begin.md',
+    });
+    expect(items[items.length - 1]).toEqual({
+      id: 'env-vars',
+      kind: 'env-vars',
+    });
+    expect(items.find((i) => i.id === 'bootstrap')).toBeUndefined();
+  });
+
   it('supports enqueue and dequeue operations', () => {
     const queue = new WizardWorkflowQueue();
 
@@ -91,3 +109,74 @@ describe('WizardWorkflowQueue', () => {
     expect(queue).toHaveLength(0);
   });
 });
+
+describe('parseWorkflowStepsFromSkillMd', () => {
+  it('parses workflow steps from SKILL.md frontmatter', () => {
+    const skillMd = `---
+name: integration-nextjs-app-router
+description: PostHog integration for Next.js App Router applications
+metadata:
+  author: PostHog
+  version: dev
+workflow:
+  - step_id: 1.0-begin
+    reference: basic-integration-1.0-begin.md
+    title: PostHog Setup - Begin
+    next:
+      - basic-integration-1.1-edit.md
+  - step_id: 1.1-edit
+    reference: basic-integration-1.1-edit.md
+    title: PostHog Setup - Edit
+    next:
+      - basic-integration-1.2-revise.md
+  - step_id: 1.2-revise
+    reference: basic-integration-1.2-revise.md
+    title: PostHog Setup - Revise
+    next:
+      - basic-integration-1.3-conclude.md
+  - step_id: 1.3-conclude
+    reference: basic-integration-1.3-conclude.md
+    title: PostHog Setup - Conclusion
+    next: []
+---
+
+# PostHog integration for Next.js App Router
+`;
+
+    const steps = parseWorkflowStepsFromSkillMd(skillMd);
+
+    expect(steps).toEqual([
+      {
+        stepId: '1.0-begin',
+        referenceFilename: 'basic-integration-1.0-begin.md',
+      },
+      {
+        stepId: '1.1-edit',
+        referenceFilename: 'basic-integration-1.1-edit.md',
+      },
+      {
+        stepId: '1.2-revise',
+        referenceFilename: 'basic-integration-1.2-revise.md',
+      },
+      {
+        stepId: '1.3-conclude',
+        referenceFilename: 'basic-integration-1.3-conclude.md',
+      },
+    ]);
+  });
+
+  it('returns empty array when no frontmatter', () => {
+    expect(parseWorkflowStepsFromSkillMd('# No frontmatter')).toEqual([]);
+  });
+
+  it('returns empty array when no workflow key', () => {
+    const skillMd = `---
+name: feature-flags-nextjs
+description: docs only
+---
+
+# Feature flags
+`;
+    expect(parseWorkflowStepsFromSkillMd(skillMd)).toEqual([]);
+  });
+});

src/lib/agent-runner.ts

@@ -1,3 +1,5 @@
+import fs from 'fs';
+import path from 'path';
 import {
   DEFAULT_PACKAGE_INSTALLATION,
   type FrameworkConfig,
@@ -39,9 +41,9 @@ import {
 } from '../utils/wizard-abort';
 import { formatScanReport, writeScanReport } from './yara-hooks';
 import {
-  createInitialWizardWorkflowQueue,
+  createPostBootstrapQueue,
+  parseWorkflowStepsFromSkillMd,
   type WizardWorkflowQueueItem,
-  type WorkflowStepSeed,
 } from './workflow-queue';
 
 const WIZARD_SKILL_ID_SIGNAL = '[WIZARD-SKILL-ID]';
@@ -274,76 +276,106 @@ export async function runAgentWizard(
     ? createBenchmarkPipeline(spinner, sessionToOptions(session))
     : undefined;
 
-  // TODO: S5 — seed from context-mill workflow manifest instead of this static list
-  const workflowSteps: WorkflowStepSeed[] = [
-    {
-      stepId: '1.0-begin',
-      referenceFilename: 'basic-integration-1.0-begin.md',
-    },
-    { stepId: '1.1-edit', referenceFilename: 'basic-integration-1.1-edit.md' },
-    {
-      stepId: '1.2-revise',
-      referenceFilename: 'basic-integration-1.2-revise.md',
-    },
+  // ── Step 1: Bootstrap — install the skill and get its ID ──
+
+  let agentResult = await runAgent(
+    agent,
+    buildBootstrapPrompt(config, promptContext, frameworkContext),
+    sessionToOptions(session),
+    spinner,
     {
-      stepId: '1.3-conclude',
-      referenceFilename: 'basic-integration-1.3-conclude.md',
+      estimatedDurationMinutes: config.ui.estimatedDurationMinutes,
+      spinnerMessage: 'Preparing integration...',
+      successMessage: 'Integration prepared',
+      errorMessage: 'Integration failed during bootstrap',
+      additionalFeatureQueue: [],
+      requestRemark: false,
+      captureOutputText: true,
+      captureSessionId: true,
+      finalizeMiddleware: false,
     },
-  ];
-  const queue = createInitialWizardWorkflowQueue(workflowSteps);
-  let queuedSessionId: string | undefined;
-  let installedSkillId: string | undefined;
-  let agentResult: Awaited<ReturnType<typeof runAgent>> = {};
-
-  while (queue.length > 0) {
-    const queueItem = queue.dequeue()!;
-    const prompt = buildQueuedPrompt(
-      queueItem,
-      config,
-      promptContext,
-      frameworkContext,
+    middleware,
+  );
+
+  const queuedSessionId = agentResult.sessionId;
+  const installedSkillId =
+    extractInstalledSkillId(agentResult.outputText ?? '') ?? undefined;
+
+  if (!installedSkillId) {
+    await wizardAbort({
+      message:
+        'The wizard could not determine which integration skill was installed during bootstrap.',
+      error: new WizardError('Bootstrap step did not emit installed skill id'),
+    });
+  }
+
+  // ── Step 2: Read SKILL.md and seed the queue from its frontmatter ──
+
+  if (!agentResult.error && installedSkillId) {
+    const skillMdPath = path.join(
+      session.installDir,
+      '.claude',
+      'skills',
       installedSkillId,
+      'SKILL.md',
     );
+    const skillMdContent = fs.readFileSync(skillMdPath, 'utf-8');
+    const workflowSteps = parseWorkflowStepsFromSkillMd(skillMdContent);
 
-    agentResult = await runAgent(
-      agent,
-      prompt,
-      sessionToOptions(session),
-      spinner,
-      {
-        estimatedDurationMinutes: config.ui.estimatedDurationMinutes,
-        spinnerMessage: getQueueSpinnerMessage(queueItem),
-        successMessage: getQueueSuccessMessage(queueItem, config),
-        errorMessage: `Integration failed during ${queueItem.id}`,
-        additionalFeatureQueue:
-          queueItem.id === 'env-vars' ? session.additionalFeatureQueue : [],
-        resumeSessionId: queuedSessionId,
-        requestRemark: queueItem.id === 'env-vars',
-        captureOutputText: queueItem.kind === 'bootstrap',
-        captureSessionId: true,
-        finalizeMiddleware: queue.length === 0,
-      },
-      middleware,
+    if (workflowSteps.length === 0) {
+      logToFile(
+        '[agent-runner] No workflow steps found in SKILL.md frontmatter, aborting',
+      );
+      await wizardAbort({
+        message:
+          'The installed skill does not contain workflow steps in its metadata.',
+        error: new WizardError('No workflow steps in SKILL.md frontmatter'),
+      });
+    }
+
+    logToFile(
+      `[agent-runner] Seeded queue from SKILL.md: ${workflowSteps
+        .map((s) => s.stepId)
+        .join(', ')}`,
     );
 
-    queuedSessionId = agentResult.sessionId ?? queuedSessionId;
+    // ── Step 3: Execute workflow steps + env-vars from the queue ──
 
-    if (queueItem.kind === 'bootstrap') {
-      installedSkillId =
-        extractInstalledSkillId(agentResult.outputText ?? '') ?? undefined;
-      if (!installedSkillId) {
-        await wizardAbort({
-          message:
-            'The wizard could not determine which integration skill was installed during bootstrap.',
-          error: new WizardError(
-            'Bootstrap step did not emit installed skill id',
-          ),
-        });
-      }
-    }
+    const queue = createPostBootstrapQueue(workflowSteps);
+
+    while (queue.length > 0) {
+      const queueItem = queue.dequeue()!;
+      const prompt = buildQueuedPrompt(
+        queueItem,
+        config,
+        promptContext,
+        installedSkillId,
+      );
+
+      agentResult = await runAgent(
+        agent,
+        prompt,
+        sessionToOptions(session),
+        spinner,
+        {
+          estimatedDurationMinutes: config.ui.estimatedDurationMinutes,
+          spinnerMessage: getQueueSpinnerMessage(queueItem),
+          successMessage: getQueueSuccessMessage(queueItem, config),
+          errorMessage: `Integration failed during ${queueItem.id}`,
+          additionalFeatureQueue:
+            queueItem.id === 'env-vars' ? session.additionalFeatureQueue : [],
+          resumeSessionId: queuedSessionId,
+          requestRemark: queueItem.id === 'env-vars',
+          captureOutputText: false,
+          captureSessionId: false,
+          finalizeMiddleware: queue.length === 0,
+        },
+        middleware,
+      );
 
-    if (agentResult.error) {
-      break;
+      if (agentResult.error) {
+        break;
+      }
     }
   }
 
@@ -467,17 +499,9 @@ function buildQueuedPrompt(
     host: string;
     projectId: number;
   },
-  frameworkContext: Record<string, unknown>,
-  installedSkillId?: string,
+  installedSkillId: string,
 ): string {
-  if (queueItem.kind === 'bootstrap') {
-    return buildBootstrapPrompt(config, context, frameworkContext);
-  }
-
   if (queueItem.kind === 'workflow') {
-    if (!installedSkillId) {
-      throw new Error('Workflow step requires installed skill id');
-    }
     return buildWorkflowStepPrompt(
       queueItem.referenceFilename,
       installedSkillId,

src/lib/workflow-queue.ts

@@ -43,8 +43,7 @@ export class WizardWorkflowQueue {
 
 /**
  * Describes a workflow step that can be seeded into the queue.
- * Eventually this comes from a context-mill manifest; for now it's
- * passed in by the caller so the queue itself stays generic.
+ * Parsed from SKILL.md frontmatter's `workflow` array.
  */
 export interface WorkflowStepSeed {
   /** Unique id for the step, e.g. "1.0-begin" */
@@ -53,6 +52,32 @@ export interface WorkflowStepSeed {
   referenceFilename: string;
 }
 
+/**
+ * Parse workflow steps from SKILL.md content.
+ *
+ * Extracts `step_id` and `reference` from the YAML frontmatter's
+ * `workflow` array. Uses simple regex — no YAML library needed
+ * since we control the output format in skill-generator.
+ */
+export function parseWorkflowStepsFromSkillMd(
+  skillMdContent: string,
+): WorkflowStepSeed[] {
+  const fmMatch = skillMdContent.match(/^---\n([\s\S]*?)\n---/);
+  if (!fmMatch) return [];
+  const frontmatter = fmMatch[1];
+
+  const steps: WorkflowStepSeed[] = [];
+  const entryRegex = /step_id:\s*(.+)\n\s*reference:\s*(.+)/g;
+  let match;
+  while ((match = entryRegex.exec(frontmatter)) !== null) {
+    steps.push({
+      stepId: match[1].trim(),
+      referenceFilename: match[2].trim(),
+    });
+  }
+  return steps;
+}
+
 /**
  * Build the initial queue from an ordered list of workflow steps.
  * The queue is always: bootstrap → workflow steps → env-vars.
@@ -73,3 +98,23 @@ export function createInitialWizardWorkflowQueue(
   ];
   return new WizardWorkflowQueue(items);
 }
+
+/**
+ * Build a queue with only workflow steps + env-vars (no bootstrap).
+ * Used after bootstrap has already run and SKILL.md has been parsed.
+ */
+export function createPostBootstrapQueue(
+  steps: WorkflowStepSeed[],
+): WizardWorkflowQueue {
+  const items: WizardWorkflowQueueItem[] = [
+    ...steps.map(
+      (step): WizardWorkflowQueueItem => ({
+        id: `workflow:${step.stepId}`,
+        kind: 'workflow',
+        referenceFilename: step.referenceFilename,
+      }),
+    ),
+    { id: 'env-vars', kind: 'env-vars' },
+  ];
+  return new WizardWorkflowQueue(items);
+}