@specmarket/cli 0.0.5 → 0.0.6

package/src/commands/issues.test.ts

@@ -172,14 +172,13 @@ describe('handleIssuesList', () => {
     });
   });
 
-  it('filters by label client-side', async () => {
+  it('passes label filter to server as labels array', async () => {
     mockQuery.mockImplementation((fn: string) => {
       if (fn === 'specs.get') return MOCK_SPEC;
       if (fn === 'issues.list') {
         return {
           page: [
-            { ...MOCK_ISSUE, labels: ['bug'] },
-            { ...MOCK_ISSUE, number: 2, labels: ['enhancement'], title: 'Add feature' },
+            { ...MOCK_ISSUE, labels: ['enhancement'], title: 'Add feature' },
           ],
           isDone: true,
           continueCursor: null,
@@ -189,6 +188,12 @@ describe('handleIssuesList', () => {
 
     await handleIssuesList('@alice/my-spec', { label: 'enhancement' });
 
+    expect(mockQuery).toHaveBeenCalledWith('issues.list', {
+      specId: 'spec123',
+      status: 'open',
+      labels: ['enhancement'],
+      paginationOpts: { numItems: 50, cursor: null },
+    });
     expect(consoleSpy).toHaveBeenCalledWith(
       expect.stringContaining('1 issue(s)')
     );

package/src/commands/issues.ts

@@ -75,20 +75,13 @@ export async function handleIssuesList(
     const result = await client.query(api.issues.list, {
       specId: spec._id,
       status: statusFilter,
+      labels: opts.label ? [opts.label] : undefined,
       paginationOpts: { numItems: 50, cursor: null },
     });
 
     spinner.stop();
 
-    let issues = result.page;
-
-    // Client-side label filter (backend doesn't support it directly)
-    if (opts.label) {
-      const label = opts.label.toLowerCase();
-      issues = issues.filter((i: any) =>
-        i.labels.some((l: string) => l.toLowerCase() === label)
-      );
-    }
+    const issues = result.page;
 
     if (issues.length === 0) {
       const statusLabel = statusFilter ?? 'any';

package/src/commands/login.ts

@@ -1,10 +1,9 @@
 import { Command } from 'commander';
 import chalk from 'chalk';
 import ora from 'ora';
-import { EXIT_CODES } from '@specmarket/shared';
+import { EXIT_CODES, TOKEN_EXPIRY_MS, DEFAULT_WEB_URL } from '@specmarket/shared';
 import { saveCredentials, loadCredentials } from '../lib/auth.js';
 import { getConvexClient } from '../lib/convex-client.js';
-import { TOKEN_EXPIRY_MS } from '@specmarket/shared';
 import type { Credentials } from '@specmarket/shared';
 import createDebug from 'debug';
 
@@ -101,10 +100,7 @@ async function handleTokenLogin(token: string): Promise<void> {
  * 6. On expiry/timeout: show error
  */
 async function handleDeviceCodeLogin(): Promise<void> {
-  const config = await import('../lib/config.js').then((m) => m.loadConfig());
-  const baseUrl = config.convexUrl ?? process.env['CONVEX_URL'] ?? 'https://your-deployment.convex.cloud';
-  const webUrl = baseUrl.replace('convex.cloud', 'specmarket.dev');
-
+  const webUrl = DEFAULT_WEB_URL;
   const client = await getConvexClient();
 
   let api: any;

package/src/commands/publish.test.ts

@@ -58,9 +58,21 @@ const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 vi.spyOn(console, 'error').mockImplementation(() => {});
 
 import { handlePublish } from './publish.js';
+import { SIDECAR_FILENAME } from '@specmarket/shared';
 
 // --- Helpers ---
 
+const VALID_SPECMARKET_YAML = `spec_format: specmarket
+display_name: "Test Spec"
+description: "A valid test spec with enough description length to pass."
+output_type: web-app
+primary_stack: nextjs-typescript
+tags: []
+estimated_tokens: 50000
+estimated_cost_usd: 2.50
+estimated_time_minutes: 30
+`;
+
 const VALID_SPEC_YAML = `name: test-spec
 display_name: "Test Spec"
 description: "A valid test spec with enough description length to pass."
@@ -109,8 +121,9 @@ describe('handlePublish', () => {
   });
 
   it('publishes a valid spec successfully', async () => {
-    // Write a valid spec
+    // Write a valid spec (specmarket.yaml required)
     await Promise.all([
+      writeFile(join(specDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
       writeFile(join(specDir, 'spec.yaml'), VALID_SPEC_YAML),
       writeFile(join(specDir, 'PROMPT.md'), '# Prompt\nBuild something.'),
       writeFile(join(specDir, 'SPEC.md'), '# Spec\nDetails here.'),

package/src/commands/publish.ts

@@ -102,6 +102,7 @@ export async function handlePublish(specPath: string, opts: { changelog?: string
       specStorageId: storageId,
       readme,
       runner: specYaml.runner,
+      specFormat: validation.format,
       minModel: specYaml.min_model,
       estimatedTokens: specYaml.estimated_tokens,
       estimatedCostUsd: specYaml.estimated_cost_usd,

package/src/commands/run.test.ts

@@ -60,9 +60,21 @@ const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 vi.spyOn(console, 'error').mockImplementation(() => {});
 
 import { handleRun } from './run.js';
+import { SIDECAR_FILENAME } from '@specmarket/shared';
 
 // --- Helpers ---
 
+const VALID_SPECMARKET_YAML = `spec_format: specmarket
+display_name: "Test Spec"
+description: "A valid test spec with enough description length to pass."
+output_type: web-app
+primary_stack: nextjs-typescript
+tags: []
+estimated_tokens: 50000
+estimated_cost_usd: 2.50
+estimated_time_minutes: 30
+`;
+
 const VALID_SPEC_YAML = `name: test-spec
 display_name: "Test Spec"
 description: "A valid test spec with enough description length to pass."
@@ -114,6 +126,7 @@ describe('handleRun', () => {
 
   it('runs a valid spec and prints summary', async () => {
     await Promise.all([
+      writeFile(join(specDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
       writeFile(join(specDir, 'spec.yaml'), VALID_SPEC_YAML),
       writeFile(join(specDir, 'PROMPT.md'), '# Prompt\nBuild it.'),
       writeFile(join(specDir, 'SPEC.md'), '# Spec\nDetails.'),
@@ -155,6 +168,7 @@ describe('handleRun', () => {
 
   it('prints security warning before running', async () => {
     await Promise.all([
+      writeFile(join(specDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
       writeFile(join(specDir, 'spec.yaml'), VALID_SPEC_YAML),
       writeFile(join(specDir, 'PROMPT.md'), '# Prompt\nBuild it.'),
       writeFile(join(specDir, 'SPEC.md'), '# Spec\nDetails.'),
@@ -183,8 +197,200 @@ describe('handleRun', () => {
     );
   });
 
+  it('prints harness in run summary', async () => {
+    await Promise.all([
+      writeFile(join(specDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
+      writeFile(join(specDir, 'spec.yaml'), VALID_SPEC_YAML),
+      writeFile(join(specDir, 'PROMPT.md'), '# Prompt\nBuild it.'),
+      writeFile(join(specDir, 'SPEC.md'), '# Spec\nDetails.'),
+      writeFile(join(specDir, 'SUCCESS_CRITERIA.md'), VALID_SUCCESS_CRITERIA),
+      writeFile(join(specDir, 'stdlib', 'STACK.md'), '# Stack\nNext.js'),
+    ]);
+
+    mockRunSpec.mockResolvedValue({
+      report: {
+        runId: 'run-123',
+        status: 'success',
+        loopCount: 1,
+        totalTokens: 1000,
+        totalCostUsd: 0.1,
+        totalTimeMinutes: 1,
+        successCriteriaResults: [],
+      },
+      outputDir: '/tmp/output',
+    });
+    mockSubmitTelemetry.mockResolvedValue(false);
+
+    await handleRun(specDir, { harness: 'codex' });
+
+    expect(consoleSpy).toHaveBeenCalledWith(
+      expect.stringContaining('codex')
+    );
+    expect(mockRunSpec).toHaveBeenCalledWith(
+      specDir,
+      expect.any(Object),
+      expect.objectContaining({ harness: 'codex' }),
+      expect.any(Function)
+    );
+  });
+
+  it('exits with validation error for unknown harness', async () => {
+    await Promise.all([
+      writeFile(join(specDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
+      writeFile(join(specDir, 'spec.yaml'), VALID_SPEC_YAML),
+      writeFile(join(specDir, 'PROMPT.md'), '# Prompt\nBuild it.'),
+      writeFile(join(specDir, 'SPEC.md'), '# Spec\nDetails.'),
+      writeFile(join(specDir, 'SUCCESS_CRITERIA.md'), VALID_SUCCESS_CRITERIA),
+      writeFile(join(specDir, 'stdlib', 'STACK.md'), '# Stack\nNext.js'),
+    ]);
+
+    await expect(handleRun(specDir, { harness: 'unknown-harness' })).rejects.toThrow(
+      'process.exit called'
+    );
+    expect(consoleSpy).toHaveBeenCalledWith(
+      expect.stringContaining('Unknown harness')
+    );
+  });
+
+  it('passes --workdir to runSpec as workdir option', async () => {
+    await Promise.all([
+      writeFile(join(specDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
+      writeFile(join(specDir, 'spec.yaml'), VALID_SPEC_YAML),
+      writeFile(join(specDir, 'PROMPT.md'), '# Prompt\nBuild it.'),
+      writeFile(join(specDir, 'SPEC.md'), '# Spec\nDetails.'),
+      writeFile(join(specDir, 'SUCCESS_CRITERIA.md'), VALID_SUCCESS_CRITERIA),
+      writeFile(join(specDir, 'stdlib', 'STACK.md'), '# Stack\nNext.js'),
+    ]);
+
+    mockRunSpec.mockResolvedValue({
+      report: {
+        runId: 'run-123',
+        status: 'success',
+        loopCount: 1,
+        totalTokens: 1000,
+        totalCostUsd: 0.1,
+        totalTimeMinutes: 1,
+        successCriteriaResults: [],
+      },
+      outputDir: '/tmp/myworkdir',
+    });
+    mockSubmitTelemetry.mockResolvedValue(false);
+
+    await handleRun(specDir, { workdir: '/tmp/myworkdir' });
+
+    expect(mockRunSpec).toHaveBeenCalledWith(
+      specDir,
+      expect.any(Object),
+      expect.objectContaining({ workdir: '/tmp/myworkdir' }),
+      expect.any(Function)
+    );
+    expect(consoleSpy).toHaveBeenCalledWith(
+      expect.stringContaining('/tmp/myworkdir')
+    );
+  });
+
+  it('passes steeringQueue to runSpec', async () => {
+    await Promise.all([
+      writeFile(join(specDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
+      writeFile(join(specDir, 'spec.yaml'), VALID_SPEC_YAML),
+      writeFile(join(specDir, 'PROMPT.md'), '# Prompt\nBuild it.'),
+      writeFile(join(specDir, 'SPEC.md'), '# Spec\nDetails.'),
+      writeFile(join(specDir, 'SUCCESS_CRITERIA.md'), VALID_SUCCESS_CRITERIA),
+      writeFile(join(specDir, 'stdlib', 'STACK.md'), '# Stack\nNext.js'),
+    ]);
+
+    mockRunSpec.mockResolvedValue({
+      report: {
+        runId: 'run-123',
+        status: 'success',
+        loopCount: 2,
+        totalTokens: 5000,
+        totalCostUsd: 0.5,
+        totalTimeMinutes: 3,
+        steeringActionCount: 0,
+        successCriteriaResults: [],
+      },
+      outputDir: '/tmp/output',
+    });
+    mockSubmitTelemetry.mockResolvedValue(false);
+
+    await handleRun(specDir, {});
+
+    // runSpec must receive a steeringQueue array in opts
+    expect(mockRunSpec).toHaveBeenCalledWith(
+      specDir,
+      expect.any(Object),
+      expect.objectContaining({ steeringQueue: expect.any(Array) }),
+      expect.any(Function)
+    );
+  });
+
+  it('shows steering action count in summary when > 0', async () => {
+    await Promise.all([
+      writeFile(join(specDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
+      writeFile(join(specDir, 'spec.yaml'), VALID_SPEC_YAML),
+      writeFile(join(specDir, 'PROMPT.md'), '# Prompt\nBuild it.'),
+      writeFile(join(specDir, 'SPEC.md'), '# Spec\nDetails.'),
+      writeFile(join(specDir, 'SUCCESS_CRITERIA.md'), VALID_SUCCESS_CRITERIA),
+      writeFile(join(specDir, 'stdlib', 'STACK.md'), '# Stack\nNext.js'),
+    ]);
+
+    mockRunSpec.mockResolvedValue({
+      report: {
+        runId: 'run-123',
+        status: 'success',
+        loopCount: 5,
+        totalTokens: 20000,
+        totalCostUsd: 2.0,
+        totalTimeMinutes: 10,
+        steeringActionCount: 3,
+        successCriteriaResults: [],
+      },
+      outputDir: '/tmp/output',
+    });
+    mockSubmitTelemetry.mockResolvedValue(false);
+
+    await handleRun(specDir, {});
+
+    expect(consoleSpy).toHaveBeenCalledWith(
+      expect.stringContaining('Steering Actions: 3')
+    );
+  });
+
+  it('omits steering count from summary when 0', async () => {
+    await Promise.all([
+      writeFile(join(specDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
+      writeFile(join(specDir, 'spec.yaml'), VALID_SPEC_YAML),
+      writeFile(join(specDir, 'PROMPT.md'), '# Prompt\nBuild it.'),
+      writeFile(join(specDir, 'SPEC.md'), '# Spec\nDetails.'),
+      writeFile(join(specDir, 'SUCCESS_CRITERIA.md'), VALID_SUCCESS_CRITERIA),
+      writeFile(join(specDir, 'stdlib', 'STACK.md'), '# Stack\nNext.js'),
+    ]);
+
+    mockRunSpec.mockResolvedValue({
+      report: {
+        runId: 'run-123',
+        status: 'success',
+        loopCount: 2,
+        totalTokens: 5000,
+        totalCostUsd: 0.5,
+        totalTimeMinutes: 3,
+        steeringActionCount: 0,
+        successCriteriaResults: [],
+      },
+      outputDir: '/tmp/output',
+    });
+    mockSubmitTelemetry.mockResolvedValue(false);
+
+    await handleRun(specDir, {});
+
+    const calls = consoleSpy.mock.calls.map((c) => String(c[0]));
+    expect(calls.some((c) => c.includes('Steering Actions'))).toBe(false);
+  });
+
   it('exits with budget_exceeded code on budget runs', async () => {
     await Promise.all([
+      writeFile(join(specDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
       writeFile(join(specDir, 'spec.yaml'), VALID_SPEC_YAML),
       writeFile(join(specDir, 'PROMPT.md'), '# Prompt\nBuild it.'),
       writeFile(join(specDir, 'SPEC.md'), '# Spec\nDetails.'),

package/src/commands/run.ts

@@ -4,7 +4,7 @@ import ora from 'ora';
 import { readFile, mkdir, writeFile as writeFileFn } from 'fs/promises';
 import { join, resolve, isAbsolute } from 'path';
 import { parse as parseYaml } from 'yaml';
-import { specYamlSchema, EXIT_CODES } from '@specmarket/shared';
+import { specYamlSchema, EXIT_CODES, KNOWN_HARNESSES } from '@specmarket/shared';
 import { validateSpec } from './validate.js';
 import { loadCredentials, isAuthenticated } from '../lib/auth.js';
 import { getConvexClient } from '../lib/convex-client.js';
@@ -46,6 +46,8 @@ export async function handleRun(
     dryRun?: boolean;
     resume?: string;
     output?: string;
+    harness?: string;
+    workdir?: string;
   }
 ): Promise<void> {
   // Resolve spec directory (and registry spec ID if downloaded from registry)
@@ -94,9 +96,15 @@ export async function handleRun(
     await promptTelemetryOptIn();
   }
 
-  // Pre-flight check: Ensure Claude CLI is installed
+  // Validate --harness value
+  if (opts.harness && !(KNOWN_HARNESSES as readonly string[]).includes(opts.harness)) {
+    console.log(chalk.red(`\n✗ Unknown harness "${opts.harness}". Supported: ${KNOWN_HARNESSES.join(', ')}`));
+    process.exit(EXIT_CODES.VALIDATION_ERROR);
+  }
+
+  // Pre-flight check: Ensure the selected harness CLI is installed
   try {
-    await checkClaudeCliInstalled();
+    await checkClaudeCliInstalled(opts.harness);
   } catch (err) {
     console.log(chalk.red(`\n✗ ${(err as Error).message}`));
     process.exit(EXIT_CODES.VALIDATION_ERROR);
@@ -105,12 +113,46 @@ export async function handleRun(
   const maxLoops = opts.maxLoops ? parseInt(opts.maxLoops, 10) : undefined;
   const maxBudget = opts.maxBudget ? parseFloat(opts.maxBudget) : undefined;
 
+  const harness = opts.harness ?? 'claude-code';
   console.log(chalk.cyan(`\nRunning spec: ${chalk.bold(specYaml.display_name)}`));
   console.log(chalk.gray(`  Version: ${specYaml.version}`));
   console.log(chalk.gray(`  Model: ${opts.model ?? specYaml.min_model}`));
+  console.log(chalk.gray(`  Harness: ${harness}`));
+  if (opts.workdir) {
+    console.log(chalk.gray(`  Working dir: ${opts.workdir}`));
+  }
   console.log(chalk.gray(`  Max loops: ${maxLoops ?? 50}`));
   console.log(chalk.gray(`  Estimated tokens: ${specYaml.estimated_tokens.toLocaleString()}`));
   console.log(chalk.gray(`  Estimated cost: $${specYaml.estimated_cost_usd.toFixed(2)}`));
+
+  // Set up steering input: collect lines from stdin and queue them for injection
+  // at the next iteration boundary. Works when stdin is a TTY (interactive) or
+  // a pipe (scripted input). Non-blocking — the run continues regardless.
+  const steeringQueue: string[] = [];
+  let steeringInputBuffer = '';
+  const steeringDataHandler = (chunk: Buffer | string): void => {
+    const data = typeof chunk === 'string' ? chunk : chunk.toString('utf-8');
+    steeringInputBuffer += data;
+    const lines = steeringInputBuffer.split('\n');
+    steeringInputBuffer = lines.pop() ?? '';
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (trimmed) {
+        steeringQueue.push(trimmed);
+        // Write to stderr so it doesn't overwrite the spinner on stdout
+        process.stderr.write(
+          `\n${chalk.cyan('[steering]')} Queued: "${trimmed.length > 60 ? trimmed.slice(0, 60) + '…' : trimmed}"\n`
+        );
+      }
+    }
+  };
+
+  if (!opts.dryRun) {
+    process.stdin.setEncoding('utf-8');
+    process.stdin.resume();
+    process.stdin.on('data', steeringDataHandler);
+    console.log(chalk.gray('  Tip: Type a message + Enter to steer the agent mid-run.'));
+  }
   console.log('');
 
   const spinner = ora({ text: 'Starting loop iteration 1...', spinner: 'dots' }).start();
@@ -134,13 +176,20 @@ export async function handleRun(
         dryRun: opts.dryRun,
         resumeRunId: opts.resume,
         outputDir: opts.output,
+        harness: opts.harness,
+        workdir: opts.workdir,
         cliVersion: CLI_VERSION,
+        steeringQueue,
       },
       (iteration: LoopIteration) => {
         spinner.text = `Loop ${iteration.iteration}: ${iteration.tokens.toLocaleString()} tokens, ${(iteration.durationMs / 1000).toFixed(1)}s`;
       }
     );
 
+    // Stop collecting steering input now that the run is complete
+    process.stdin.removeListener('data', steeringDataHandler);
+    process.stdin.pause();
+
     const { report } = result;
     const statusColor =
       report.status === 'success'
@@ -158,6 +207,9 @@ export async function handleRun(
     console.log(`  Tokens: ${report.totalTokens.toLocaleString()}`);
     console.log(`  Cost: $${report.totalCostUsd.toFixed(4)}`);
     console.log(`  Time: ${report.totalTimeMinutes.toFixed(1)} minutes`);
+    if (report.steeringActionCount && report.steeringActionCount > 0) {
+      console.log(`  Steering Actions: ${report.steeringActionCount}`);
+    }
     console.log(`  Run ID: ${chalk.gray(report.runId)}`);
     console.log(`  Output: ${chalk.gray(result.outputDir)}`);
 
@@ -378,6 +430,14 @@ export function createRunCommand(): Command {
     .option('--dry-run', 'Validate and show config without executing')
     .option('--resume <run-id>', 'Resume a previous run from where it left off')
     .option('--output <dir>', 'Custom output directory for run artifacts')
+    .option(
+      '--harness <harness>',
+      `Agentic harness to use (default: claude-code). One of: ${KNOWN_HARNESSES.join(', ')}`
+    )
+    .option(
+      '--workdir <dir>',
+      'Run in an existing directory instead of a fresh sandbox (spec files not copied)'
+    )
     .action(async (pathOrId: string, opts) => {
       try {
         await handleRun(pathOrId, opts);

package/src/commands/validate.test.ts

@@ -4,6 +4,18 @@ import { join } from 'path';
 import { tmpdir } from 'os';
 import { randomUUID } from 'crypto';
 import { validateSpec, detectCircularReferences } from './validate.js';
+import { SIDECAR_FILENAME } from '@specmarket/shared';
+
+const VALID_SPECMARKET_YAML = `spec_format: specmarket
+display_name: "Test Spec"
+description: "A valid test spec with enough description length to pass."
+output_type: web-app
+primary_stack: nextjs-typescript
+tags: []
+estimated_tokens: 50000
+estimated_cost_usd: 2.50
+estimated_time_minutes: 30
+`;
 
 const VALID_SPEC_YAML = `name: test-spec
 display_name: "Test Spec"
@@ -51,6 +63,7 @@ describe('validateSpec', () => {
 
   async function writeValidSpec() {
     await Promise.all([
+      writeFile(join(tmpDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML),
       writeFile(join(tmpDir, 'spec.yaml'), VALID_SPEC_YAML),
       writeFile(join(tmpDir, 'PROMPT.md'), VALID_PROMPT_MD),
       writeFile(join(tmpDir, 'SPEC.md'), VALID_SPEC_MD),
@@ -84,6 +97,15 @@ describe('validateSpec', () => {
     expect(result.errors.some((e) => e.includes('PROMPT.md'))).toBe(true);
   });
 
+  it('reports error when specmarket.yaml is missing', async () => {
+    await writeValidSpec();
+    const { unlink } = await import('fs/promises');
+    await unlink(join(tmpDir, SIDECAR_FILENAME));
+    const result = await validateSpec(tmpDir);
+    expect(result.valid).toBe(false);
+    expect(result.errors.some((e) => e.includes(SIDECAR_FILENAME) && e.includes('required'))).toBe(true);
+  });
+
   it('reports error for missing SUCCESS_CRITERIA.md', async () => {
     await writeValidSpec();
     const { unlink } = await import('fs/promises');
@@ -289,8 +311,9 @@ describe('validateSpec format-aware', () => {
     await rm(tmpDir, { recursive: true, force: true });
   });
 
-  it('reports format and formatDetectedBy in result for legacy spec', async () => {
+  it('reports format from sidecar for specmarket spec', async () => {
     await mkdir(join(tmpDir, 'stdlib'), { recursive: true });
+    await writeFile(join(tmpDir, SIDECAR_FILENAME), VALID_SPECMARKET_YAML);
     await writeFile(join(tmpDir, 'spec.yaml'), VALID_SPEC_YAML);
     await writeFile(join(tmpDir, 'PROMPT.md'), VALID_PROMPT_MD);
     await writeFile(join(tmpDir, 'SPEC.md'), VALID_SPEC_MD);
@@ -298,11 +321,19 @@ describe('validateSpec format-aware', () => {
     await writeFile(join(tmpDir, 'stdlib', 'STACK.md'), VALID_STACK_MD);
     const result = await validateSpec(tmpDir);
     expect(result.valid).toBe(true);
-    expect(result.format).toBe('specmarket-legacy');
-    expect(result.formatDetectedBy).toBe('heuristic');
+    expect(result.format).toBe('specmarket');
+    expect(result.formatDetectedBy).toBe('sidecar');
   });
 
+  const SIDECAR_SPECKIT = `spec_format: speckit
+display_name: My Spec
+description: A long enough description for the sidecar schema.
+output_type: web-app
+primary_stack: nextjs-typescript
+`;
+
   it('speckit dir validates successfully', async () => {
+    await writeFile(join(tmpDir, SIDECAR_FILENAME), SIDECAR_SPECKIT);
     await writeFile(join(tmpDir, 'spec.md'), '# Spec\nContent here.');
     await writeFile(join(tmpDir, 'tasks.md'), '# Tasks');
     await mkdir(join(tmpDir, '.specify'), { recursive: true });
@@ -312,6 +343,7 @@ describe('validateSpec format-aware', () => {
   });
 
   it('speckit missing tasks.md and plan.md returns error', async () => {
+    await writeFile(join(tmpDir, SIDECAR_FILENAME), SIDECAR_SPECKIT);
     await writeFile(join(tmpDir, 'spec.md'), '# Spec');
     const result = await validateSpec(tmpDir);
     expect(result.valid).toBe(false);
@@ -319,6 +351,15 @@ describe('validateSpec format-aware', () => {
   });
 
   it('bmad dir validates successfully', async () => {
+    await writeFile(
+      join(tmpDir, SIDECAR_FILENAME),
+      `spec_format: bmad
+display_name: PRD Spec
+description: A long enough description for the sidecar schema.
+output_type: web-app
+primary_stack: nextjs-typescript
+`
+    );
     await writeFile(join(tmpDir, 'prd.md'), '# PRD\nProduct requirements.');
     await writeFile(join(tmpDir, 'story-1.md'), '# Story 1');
     const result = await validateSpec(tmpDir);
@@ -327,6 +368,15 @@ describe('validateSpec format-aware', () => {
   });
 
   it('ralph dir validates successfully', async () => {
+    await writeFile(
+      join(tmpDir, SIDECAR_FILENAME),
+      `spec_format: ralph
+display_name: Ralph Spec
+description: A long enough description for the sidecar schema.
+output_type: web-app
+primary_stack: nextjs-typescript
+`
+    );
     await writeFile(
       join(tmpDir, 'prd.json'),
       JSON.stringify({ userStories: [{ title: 'As a user I want X' }] })
@@ -337,6 +387,15 @@ describe('validateSpec format-aware', () => {
   });
 
   it('ralph prd.json missing userStories returns error', async () => {
+    await writeFile(
+      join(tmpDir, SIDECAR_FILENAME),
+      `spec_format: ralph
+display_name: Ralph Spec
+description: A long enough description for the sidecar schema.
+output_type: web-app
+primary_stack: nextjs-typescript
+`
+    );
     await writeFile(join(tmpDir, 'prd.json'), JSON.stringify({ other: true }));
     const result = await validateSpec(tmpDir);
     expect(result.valid).toBe(false);
@@ -344,6 +403,15 @@ describe('validateSpec format-aware', () => {
   });
 
   it('custom dir with sufficient .md validates', async () => {
+    await writeFile(
+      join(tmpDir, SIDECAR_FILENAME),
+      `spec_format: custom
+display_name: Custom Spec
+description: A long enough description for the sidecar schema.
+output_type: web-app
+primary_stack: nextjs-typescript
+`
+    );
     const content =
       '# Readme\n\nThis is a spec with enough content to pass the 100-byte minimum for custom format. Extra text here.';
     expect(content.length).toBeGreaterThan(100);
@@ -354,6 +422,15 @@ describe('validateSpec format-aware', () => {
   });
 
   it('custom dir with only tiny .md files fails', async () => {
+    await writeFile(
+      join(tmpDir, SIDECAR_FILENAME),
+      `spec_format: custom
+display_name: Custom Spec
+description: A long enough description for the sidecar schema.
+output_type: web-app
+primary_stack: nextjs-typescript
+`
+    );
     await writeFile(join(tmpDir, 'tiny.md'), 'x');
     const result = await validateSpec(tmpDir);
     expect(result.valid).toBe(false);
@@ -364,19 +441,19 @@ describe('validateSpec format-aware', () => {
     await writeFile(join(tmpDir, 'spec.md'), '# Spec');
     await writeFile(join(tmpDir, 'tasks.md'), '# Tasks');
     await writeFile(
-      join(tmpDir, 'specmarket.yaml'),
+      join(tmpDir, SIDECAR_FILENAME),
       'spec_format: speckit\ndisplay_name: X\ndescription: short'
     );
     const result = await validateSpec(tmpDir);
     expect(result.valid).toBe(false);
-    expect(result.errors.some((e) => e.includes('specmarket.yaml'))).toBe(true);
+    expect(result.errors.some((e) => e.includes(SIDECAR_FILENAME))).toBe(true);
   });
 
   it('sidecar with valid schema passes and format is from sidecar', async () => {
     await writeFile(join(tmpDir, 'spec.md'), '# Spec');
     await writeFile(join(tmpDir, 'tasks.md'), '# Tasks');
     await writeFile(
-      join(tmpDir, 'specmarket.yaml'),
+      join(tmpDir, SIDECAR_FILENAME),
       `spec_format: speckit
 display_name: My Spec
 description: A long enough description for the sidecar schema.