@fission-ai/openspec 1.13.1 → 1.13.2

package/dist/core/command-generation/adapters/kilocode.d.ts

@@ -7,7 +7,7 @@
 import type { ToolCommandAdapter } from '../types.js';
 /**
  * Kilo Code adapter for command generation.
- * File path: .kilocode/workflows/opsx-<id>.md
+ * File path: .kilo/command/opsx-<id>.md
  * Format: Plain markdown without frontmatter
  */
 export declare const kilocodeAdapter: ToolCommandAdapter;

package/dist/core/command-generation/adapters/kilocode.js

@@ -7,13 +7,13 @@
 import path from 'path';
 /**
  * Kilo Code adapter for command generation.
- * File path: .kilocode/workflows/opsx-<id>.md
+ * File path: .kilo/command/opsx-<id>.md
  * Format: Plain markdown without frontmatter
  */
 export const kilocodeAdapter = {
     toolId: 'kilocode',
     getFilePath(commandId) {
-        return path.join('.kilocode', 'workflows', `opsx-${commandId}.md`);
+        return path.join('.kilo', 'command', `opsx-${commandId}.md`);
     },
     formatFile(content) {
         return `${content.body}

package/dist/core/init.js

@@ -992,9 +992,15 @@ export class InitCommand {
                     // Tools with no slash surface (e.g. Rovo Dev) reference skills as
                     // prose ("the openspec-propose skill"); phrase the hint so it reads
                     // as an instruction rather than a dead command with an argument.
-                    hint = usesNaturalLanguageSkillReferences(tool.value)
-                        ? `Start your first change: ask ${tool.name} to use ${skillReference} with "your idea"`
-                        : `Start your first change: ${skillReference} "your idea"`;
+                    if (usesNaturalLanguageSkillReferences(tool.value)) {
+                        hint = `Start your first change: ask ${tool.name} to use ${skillReference} with "your idea"`;
+                    }
+                    else if (tool.value === 'codex') {
+                        hint = `Start your first change: ${skillReference} "your idea" (Codex CLI or IDE); in the Codex desktop app, select ${skillReference.slice(1)} from Skills in the sidebar`;
+                    }
+                    else {
+                        hint = `Start your first change: ${skillReference} "your idea"`;
+                    }
                 }
                 else {
                     continue;

package/dist/core/legacy-cleanup.d.ts

@@ -2,7 +2,7 @@
  * Legacy cleanup module for detecting and removing OpenSpec artifacts
  * from previous init versions during the migration to the skill-based workflow.
  */
-import type { WorkflowId } from './profiles.js';
+import { type WorkflowId } from './profiles.js';
 /**
  * Legacy config file names from the old ToolRegistry.
  * These were config files created at project root with OpenSpec markers.

package/dist/core/legacy-cleanup.js

@@ -4,10 +4,11 @@
  */
 import path from 'path';
 import os from 'os';
-import { promises as fs } from 'fs';
+import { promises as fs, constants as fsConstants } from 'fs';
 import chalk from 'chalk';
 import { FileSystemUtils, removeMarkerBlock as removeMarkerBlockUtil } from '../utils/file-system.js';
 import { OPENSPEC_MARKERS } from './config.js';
+import { ALL_WORKFLOWS } from './profiles.js';
 /**
  * Legacy config file names from the old ToolRegistry.
  * These were config files created at project root with OpenSpec markers.
@@ -24,6 +25,13 @@ export const LEGACY_CONFIG_FILES = [
 ];
 /** The three commands the old SlashCommandRegistry wrote into each directory. */
 const LEGACY_DIRECTORY_COMMAND_FILES = ['proposal.md', 'apply.md', 'archive.md'];
+/** Exact Kilo workflow files written by OpenSpec before the command path moved. */
+const LEGACY_KILOCODE_COMMAND_FILES = [
+    ...ALL_WORKFLOWS.map(workflow => `.kilocode/workflows/opsx-${workflow}.md`),
+    '.kilocode/workflows/openspec-proposal.md',
+    '.kilocode/workflows/openspec-apply.md',
+    '.kilocode/workflows/openspec-archive.md',
+];
 /**
  * Legacy slash command patterns from the old SlashCommandRegistry.
  * These map toolId to the path pattern where legacy commands were created.
@@ -48,7 +56,12 @@ export const LEGACY_SLASH_COMMAND_PATHS = {
     // belong to `devin` — the id Windsurf became. Only `.windsurf/` is listed:
     // `.devin/` postdates the opsx rename and never held `openspec-*` files.
     'devin': { type: 'files', pattern: '.windsurf/workflows/openspec-*.md' },
-    'kilocode': { type: 'files', pattern: '.kilocode/workflows/openspec-*.md' },
+    // Kilo now writes commands under `.kilo/command/`. Clean up both generations
+    // of OpenSpec workflows from Kilo's legacy `.kilocode/workflows/` folder.
+    'kilocode': {
+        type: 'files',
+        pattern: LEGACY_KILOCODE_COMMAND_FILES,
+    },
     'kiro': { type: 'files', pattern: '.kiro/prompts/openspec-*.prompt.md' },
     'github-copilot': { type: 'files', pattern: '.github/prompts/openspec-*.prompt.md' },
     'amazon-q': { type: 'files', pattern: '.amazonq/prompts/openspec-*.md' },
@@ -331,15 +344,27 @@ async function settleLegacyCommandDir(projectPath, dirPath, result) {
  * a same-named file without them is the user's.
  */
 async function isGeneratedLegacyCommand(filePath) {
+    // Judge the opened handle, not the path, so the file checked is the file
+    // read. O_NOFOLLOW refuses a link and O_NONBLOCK keeps a FIFO from hanging;
+    // Windows has neither flag, so a link is refused there by lstat instead.
+    const { O_RDONLY, O_NOFOLLOW, O_NONBLOCK } = fsConstants;
+    let handle;
     try {
-        if (!(await fs.lstat(filePath)).isFile()) {
+        handle = await fs.open(filePath, O_RDONLY | (O_NOFOLLOW ?? 0) | (O_NONBLOCK ?? 0));
+        if (O_NOFOLLOW === undefined && (await fs.lstat(filePath)).isSymbolicLink()) {
             return false;
         }
-        return hasOpenSpecMarkers(await fs.readFile(filePath, 'utf-8'));
+        if (!(await handle.stat()).isFile()) {
+            return false;
+        }
+        return hasOpenSpecMarkers(await handle.readFile('utf-8'));
     }
     catch {
         return false;
     }
+    finally {
+        await handle?.close();
+    }
 }
 /**
  * Detects legacy global slash command files.

package/dist/core/parsers/requirement-blocks.d.ts

@@ -95,14 +95,45 @@ export interface DeltaPlan {
  * Parse a delta-formatted spec change file content into a DeltaPlan with raw blocks.
  */
 export declare function parseDeltaSpec(content: string): DeltaPlan;
+/** Both directions of the scenario-name comparison, plus the two totals. */
+export interface ScenarioNameDiff {
+    /** Names the current block has that the incoming block does not cover. */
+    missing: string[];
+    /** Names the incoming block introduces that the current block does not have. */
+    added: string[];
+    /** Level-4 headers in the current block. */
+    currentCount: number;
+    /** Level-4 headers in the incoming block. */
+    incomingCount: number;
+}
+/**
+ * Compare the scenario names of a current requirement block and an incoming
+ * (MODIFIED) one, in both directions.
+ *
+ * `missing` is the loss the guard exists to catch: a MODIFIED requirement
+ * replaces the whole block, so every name there would be dropped from the main
+ * spec. `added` and the two counts are reported alongside it, because they are
+ * the first thing a reader checks once it fires (#1697) - a block that omits
+ * two names and introduces two is shaped like a rename, one that omits two and
+ * introduces none is shaped like a truncation. Neither is proof, and intent is
+ * not recoverable from structure, so this decides nothing and only says what
+ * the two blocks contain.
+ */
+export declare function diffScenarioNames(current: RequirementBlock, incoming: RequirementBlock): ScenarioNameDiff;
 /**
  * Scenario names the current requirement block has and the incoming
  * (MODIFIED) block does not. A MODIFIED requirement replaces the whole block,
  * so every name reported here would be dropped from the main spec.
  *
- * Shared by archive (which refuses to apply the block) and validate (which
- * reports the same loss at authoring time, #1477), so the two cannot disagree
- * about what counts as a dropped scenario.
+ * The `missing` half of diffScenarioNames, which archive (refusing to apply
+ * the block) and validate (reporting the same loss at authoring time, #1477)
+ * both go through, so the two cannot disagree about what counts as a dropped
+ * scenario.
  */
 export declare function findMissingCurrentScenarios(current: RequirementBlock, incoming: RequirementBlock): string[];
+/**
+ * The one sentence archive and validate both append when the guard fires, so
+ * the counts a reader sees cannot differ between the two commands.
+ */
+export declare function describeScenarioBalance(diff: ScenarioNameDiff): string;
 //# sourceMappingURL=requirement-blocks.d.ts.map

package/dist/core/parsers/requirement-blocks.js

@@ -380,37 +380,79 @@ function parseRenamedPairs(sectionBody, unpaired) {
         drop('FROM', pending.name, pending.line);
     return pairs;
 }
+/**
+ * Compare the scenario names of a current requirement block and an incoming
+ * (MODIFIED) one, in both directions.
+ *
+ * `missing` is the loss the guard exists to catch: a MODIFIED requirement
+ * replaces the whole block, so every name there would be dropped from the main
+ * spec. `added` and the two counts are reported alongside it, because they are
+ * the first thing a reader checks once it fires (#1697) - a block that omits
+ * two names and introduces two is shaped like a rename, one that omits two and
+ * introduces none is shaped like a truncation. Neither is proof, and intent is
+ * not recoverable from structure, so this decides nothing and only says what
+ * the two blocks contain.
+ */
+export function diffScenarioNames(current, incoming) {
+    const currentNames = parseScenarioBlocks(current.raw).map((scenario) => scenario.name);
+    const incomingNames = parseScenarioBlocks(incoming.raw).map((scenario) => scenario.name);
+    // Multiplicity-aware: a name present N times on one side and M times on the
+    // other leaves max(0, N - M) instances unmatched. Set membership would treat
+    // N>M as fully covered and let archive silently drop duplicates (residual
+    // #1246 / duplicate-scenario-name blind spot).
+    const unmatched = (names, against) => {
+        const remaining = new Map();
+        for (const name of against)
+            remaining.set(name, (remaining.get(name) ?? 0) + 1);
+        const out = [];
+        for (const name of names) {
+            const left = remaining.get(name) ?? 0;
+            if (left > 0)
+                remaining.set(name, left - 1);
+            else
+                out.push(name);
+        }
+        return out;
+    };
+    return {
+        missing: unmatched(currentNames, incomingNames),
+        added: unmatched(incomingNames, currentNames),
+        currentCount: currentNames.length,
+        incomingCount: incomingNames.length,
+    };
+}
 /**
  * Scenario names the current requirement block has and the incoming
  * (MODIFIED) block does not. A MODIFIED requirement replaces the whole block,
  * so every name reported here would be dropped from the main spec.
  *
- * Shared by archive (which refuses to apply the block) and validate (which
- * reports the same loss at authoring time, #1477), so the two cannot disagree
- * about what counts as a dropped scenario.
+ * The `missing` half of diffScenarioNames, which archive (refusing to apply
+ * the block) and validate (reporting the same loss at authoring time, #1477)
+ * both go through, so the two cannot disagree about what counts as a dropped
+ * scenario.
  */
 export function findMissingCurrentScenarios(current, incoming) {
-    // Multiplicity-aware: a name present N times in current and M times in
-    // incoming means max(0, N - M) instances are missing. Set membership would
-    // treat N>M as fully covered and let archive silently drop duplicates
-    // (residual #1246 / duplicate-scenario-name blind spot).
-    const remainingIncoming = new Map();
-    for (const scenario of parseScenarioBlocks(incoming.raw)) {
-        const name = scenario.name;
-        remainingIncoming.set(name, (remainingIncoming.get(name) ?? 0) + 1);
-    }
-    const missing = [];
-    for (const scenario of parseScenarioBlocks(current.raw)) {
-        const name = scenario.name;
-        const remaining = remainingIncoming.get(name) ?? 0;
-        if (remaining > 0) {
-            remainingIncoming.set(name, remaining - 1);
-        }
-        else {
-            missing.push(name);
-        }
+    return diffScenarioNames(current, incoming).missing;
+}
+/** At most this many added names are listed before the rest are counted. */
+const MAX_LISTED_ADDED_SCENARIOS = 3;
+/**
+ * The one sentence archive and validate both append when the guard fires, so
+ * the counts a reader sees cannot differ between the two commands.
+ */
+export function describeScenarioBalance(diff) {
+    const count = (value) => `${value} ${value === 1 ? 'scenario' : 'scenarios'}`;
+    const scale = `The modified block has ${count(diff.incomingCount)}; the current spec has ${count(diff.currentCount)}.`;
+    if (diff.added.length === 0) {
+        return `${scale} It adds none.`;
     }
-    return missing;
+    const listed = diff.added
+        .slice(0, MAX_LISTED_ADDED_SCENARIOS)
+        .map((name) => `"${name}"`)
+        .join(', ');
+    const rest = diff.added.length - MAX_LISTED_ADDED_SCENARIOS;
+    const names = rest > 0 ? `${listed} and ${rest} more` : listed;
+    return `${scale} It adds ${count(diff.added.length)} not in the current spec: ${names}.`;
 }
 /**
  * Any non-fenced level-4 header on the given (masked) line. Reuses the spec

package/dist/core/specs-apply.d.ts

@@ -102,6 +102,26 @@ export declare function retireSpec(update: SpecUpdate, mainSpecsDir: string, opt
     displacedPath?: string;
 }>;
 export declare function finalizeRetiredSpec(target: string, displacedPath: string, mainSpecsDir: string): Promise<void>;
+/**
+ * Remove now-empty directories from `startDir` upward, never leaving the real
+ * `boundaryDir` and never removing that directory itself.
+ *
+ * The boundary is a parameter rather than the specs root directly so the walk's
+ * containment is stated at the call site, where the root it must not escape is
+ * the thing being reasoned about.
+ *
+ * The guard re-runs every iteration, so stepping to the LEXICAL parent is safe:
+ * a parent that is not the real one is simply re-resolved and rejected. Errors
+ * are swallowed and end the walk - ENOTEMPTY and ENOENT are correct outcomes (a
+ * file arriving mid-walk must win), and a permissions failure leaves an empty
+ * directory behind, which the next successful archive clears.
+ *
+ * Not race-free: an attacker who can swap an ancestor between the check and the
+ * `rmdir` could get an empty directory outside the root removed. Closing that
+ * needs fd-relative syscalls Node does not expose, and it requires local write
+ * access to `openspec/specs` during an archive.
+ */
+export declare function pruneEmptyDirs(startDir: string, boundaryDir: string): Promise<void>;
 /**
  * Write an updated spec to disk.
  */

package/dist/core/specs-apply.js

@@ -8,13 +8,14 @@ import { promises as fs } from 'fs';
 import { randomUUID } from 'crypto';
 import path from 'path';
 import chalk from 'chalk';
-import { extractRequirementsSection, findMissingCurrentScenarios, foldRequirementName, parseDeltaSpec, normalizeRequirementName, } from './parsers/requirement-blocks.js';
+import { extractRequirementsSection, diffScenarioNames, describeScenarioBalance, foldRequirementName, parseDeltaSpec, normalizeRequirementName, } from './parsers/requirement-blocks.js';
 import { findMainSpecStructureIssues } from './parsers/spec-structure.js';
 import { buildCodeFenceMask } from './parsers/code-fence.js';
 import { MarkdownParser } from './parsers/markdown-parser.js';
 import { MIN_PURPOSE_LENGTH, PURPOSE_PLACEHOLDER_PREFIX, PURPOSE_PLACEHOLDER_SUFFIX, } from './validation/constants.js';
 import { discoverSpecFiles } from '../utils/spec-discovery.js';
 import { FileSystemUtils } from '../utils/file-system.js';
+import { matchLineEnding } from '../utils/line-endings.js';
 function isLexicallyWithin(allowedDirectory, targetPath) {
     const relative = path.relative(path.resolve(allowedDirectory), path.resolve(targetPath));
     return (relative === '' ||
@@ -383,9 +384,9 @@ export async function buildUpdatedSpec(update, changeName, options = {}) {
         if (!modHeaderMatch || normalizeRequirementName(modHeaderMatch[1]) !== key) {
             throw new Error(`${specName} MODIFIED failed for header "### Requirement: ${mod.name}" - header mismatch in content`);
         }
-        const missingScenarios = findMissingCurrentScenarios(currentBlock, mod);
-        if (missingScenarios.length > 0) {
-            throw new Error(`${specName} MODIFIED failed for header "### Requirement: ${mod.name}" - current spec contains scenario(s) not present in the modified block: ${missingScenarios.map(name => `"${name}"`).join(', ')}. Refresh the change spec before archiving to avoid dropping scenarios.`);
+        const scenarioDiff = diffScenarioNames(currentBlock, mod);
+        if (scenarioDiff.missing.length > 0) {
+            throw new Error(`${specName} MODIFIED failed for header "### Requirement: ${mod.name}" - current spec contains scenario(s) not present in the modified block: ${scenarioDiff.missing.map(name => `"${name}"`).join(', ')}. ${describeScenarioBalance(scenarioDiff)} Refresh the change spec before archiving to avoid dropping scenarios.`);
         }
         // Identical content means the modification was already synced to the
         // baseline (early-sync pattern) — count only real replacements, so a
@@ -995,7 +996,7 @@ async function isInsideRealDir(realPath, dir) {
  * needs fd-relative syscalls Node does not expose, and it requires local write
  * access to `openspec/specs` during an archive.
  */
-async function pruneEmptyDirs(startDir, boundaryDir) {
+export async function pruneEmptyDirs(startDir, boundaryDir) {
     let boundary;
     try {
         boundary = await fs.realpath(boundaryDir);
@@ -1040,11 +1041,23 @@ export async function writeUpdatedSpec(update, rebuilt, counts, options = {}) {
     // Create target directory if needed
     const targetDir = path.dirname(update.target);
     await fs.mkdir(targetDir, { recursive: true });
+    // The parsers normalize CRLF to LF on read, so `rebuilt` is always LF. Write
+    // it back with the convention the file already used, or a Windows checkout
+    // (core.autocrlf=true) sees every line of the spec change when one
+    // requirement moved. A spec that does not exist yet stays LF.
+    // Only a missing file means "no convention to match". Swallowing every error
+    // would read an existing but unreadable spec as absent and rewrite it as LF.
+    const previous = await fs.readFile(update.target, 'utf-8').catch((error) => {
+        if (error.code === 'ENOENT')
+            return undefined;
+        throw error;
+    });
+    const toWrite = previous === undefined ? rebuilt : matchLineEnding(rebuilt, previous);
     await options.beforeMutate?.();
     // Preserve the established in-place write semantics: symlink referents,
     // hard-linked specs, ACLs, extended attributes, and filesystems without hard
     // links must continue to behave as they did before capability retirement.
-    await fs.writeFile(update.target, rebuilt);
+    await fs.writeFile(update.target, toWrite);
     if (options.silent)
         return;
     const specName = update.id;

package/dist/core/templates/workflows/archive-change.js

@@ -81,20 +81,27 @@ ${PROJECT_ROOT_GUARD}
 
 3. **Check task completion status**
 
-   Read the tasks file (typically \`tasks.md\`) to check for incomplete tasks.
-
-   A checkbox is complete when its only content is \`x\` or \`X\`; spacing inside
-   the brackets does not matter, so \`- [ x]\` counts as complete too. Every
-   other marker is incomplete - \`- [ ]\`, an empty \`- []\`, and markers OpenSpec
-   assigns no meaning to such as \`- [~]\` or \`- [-]\`. Never read an unfamiliar
-   marker as complete.
+   Run \`openspec list --json\` with the same selected-root flags and find the
+   entry in \`changes\` whose \`name\` exactly matches the selected change.
+   Require exactly one match and nonnegative integer \`totalTasks\` and
+   \`completedTasks\`, with \`completedTasks <= totalTasks\`. The CLI resolves
+   the schema's tracked task files, including custom artifact names, output
+   paths, and globs.
+   Incomplete tasks = \`totalTasks - completedTasks\`.
+
+   Do not infer task completion from artifact status or the absence of a
+   top-level \`tasks.md\`. If the lookup fails, returns invalid JSON, omits or
+   duplicates the selected change, or returns invalid counts, report the problem
+   and stop before syncing or archiving.
+   The CLI counts only \`x\`/\`X\` checkbox markers as complete;
+   other markers, including unfamiliar ones, remain incomplete.
 
    **If incomplete tasks found:**
    - Display warning showing count of incomplete tasks
    - Ask the user to confirm they want to proceed
    - Proceed if user confirms
 
-   **If no tasks file exists:** Proceed without task-related warning.
+   **If \`totalTasks\` is zero:** Proceed without a task-related warning.
 
 4. **Assess delta spec sync state**
 
@@ -274,20 +281,27 @@ ${PROJECT_ROOT_GUARD}
 
 3. **Check task completion status**
 
-   Read the tasks file (typically \`tasks.md\`) to check for incomplete tasks.
-
-   A checkbox is complete when its only content is \`x\` or \`X\`; spacing inside
-   the brackets does not matter, so \`- [ x]\` counts as complete too. Every
-   other marker is incomplete - \`- [ ]\`, an empty \`- []\`, and markers OpenSpec
-   assigns no meaning to such as \`- [~]\` or \`- [-]\`. Never read an unfamiliar
-   marker as complete.
+   Run \`openspec list --json\` with the same selected-root flags and find the
+   entry in \`changes\` whose \`name\` exactly matches the selected change.
+   Require exactly one match and nonnegative integer \`totalTasks\` and
+   \`completedTasks\`, with \`completedTasks <= totalTasks\`. The CLI resolves
+   the schema's tracked task files, including custom artifact names, output
+   paths, and globs.
+   Incomplete tasks = \`totalTasks - completedTasks\`.
+
+   Do not infer task completion from artifact status or the absence of a
+   top-level \`tasks.md\`. If the lookup fails, returns invalid JSON, omits or
+   duplicates the selected change, or returns invalid counts, report the problem
+   and stop before syncing or archiving.
+   The CLI counts only \`x\`/\`X\` checkbox markers as complete;
+   other markers, including unfamiliar ones, remain incomplete.
 
    **If incomplete tasks found:**
    - Display warning showing count of incomplete tasks
    - Prompt user for confirmation to continue
    - Proceed if user confirms
 
-   **If no tasks file exists:** Proceed without task-related warning.
+   **If \`totalTasks\` is zero:** Proceed without a task-related warning.
 
 4. **Assess delta spec sync state**
 

package/dist/core/templates/workflows/bulk-archive-change.js

@@ -37,7 +37,7 @@ ${PROJECT_ROOT_GUARD}
 2. **Prompt for change selection**
 
    Ask the user to choose changes (multi-select):
-   - Show each change with its schema
+   - Show each change name and task status from the list output
    - Include an option for "All changes"
    - Allow any number of selections (1+ works, 2+ is the typical use case)
 
@@ -70,17 +70,24 @@ ${PROJECT_ROOT_GUARD}
 
 3. **Batch validation - gather status for all selected changes**
 
+   Run \`openspec list --json\` once with the same selected-root flags for task
+   progress. If the lookup fails, returns invalid JSON, or omits any selected
+   change, contains a duplicate selected change, or returns invalid counts,
+   report the problem and stop before syncing or archiving the batch.
+
    For each selected change, collect:
 
    a. **Artifact status** - Run \`openspec status --change "<name>" --json\`
       - Parse \`schemaName\`, \`artifacts\`, \`planningHome\`, \`changeRoot\`, \`artifactPaths\`, and \`actionContext\`
       - Note which artifacts are \`done\` vs other states
 
-   b. **Task completion** - Read \`artifactPaths.tasks.existingOutputPaths\` from status JSON
-      - Complete means the checkbox holds only \`x\`/\`X\`, ignoring spacing
-        (\`- [ x]\` is complete); every other marker is incomplete (\`- [ ]\`,
-        \`- []\`, and unfamiliar ones such as \`- [~]\` or \`- [-]\`)
-      - If no tasks file exists, note as "No tasks"
+   b. **Task completion** - Find the \`changes\` entry from the list response whose \`name\` exactly matches this change
+      - Require nonnegative integer \`totalTasks\` and \`completedTasks\`, with \`completedTasks <= totalTasks\`
+      - Incomplete tasks = \`totalTasks - completedTasks\`
+      - The CLI resolves the schema's tracked task files, including custom artifact names, output paths, and globs
+      - Do not infer task completion from artifact status, an artifact id of \`tasks\`, or the absence of a top-level \`tasks.md\`
+      - The CLI counts only \`x\`/\`X\` checkbox markers as complete; other markers remain incomplete
+      - If \`totalTasks\` is zero, note as "No tasks"
 
    c. **Delta specs** - Check \`artifactPaths.specs.existingOutputPaths\` from status JSON
       - List which capability specs exist
@@ -194,7 +201,7 @@ ${PROJECT_ROOT_GUARD}
    Process changes in the determined order (respecting conflict resolution):
 
    a. **Sync included delta specs**:
-      - Run the \`openspec-sync-specs\` workflow inline (agent-driven intelligent merge) only for changes with entries in \`includedDeltas\`, passing only the included delta paths and explicitly instructing it to ignore that change's \`excludedDeltas\`. Wait for it to finish.
+      - ${optionalWorkflow('sync', 'Run the `openspec-sync-specs` workflow inline (agent-driven intelligent merge)', 'Perform the delta-to-main-spec merge inline yourself (agent-driven intelligent merge)')} only for changes with entries in \`includedDeltas\`, passing only the included delta paths and explicitly instructing it to ignore that change's \`excludedDeltas\`. Wait for it to finish.
       - For conflicts, apply in resolved order.
       - Pass that change's fetched specs-rule snapshot into inline sync; inline
         sync must reuse it without fetching instructions again
@@ -347,7 +354,7 @@ No active changes found. Create a new change to get started.
 - Archive directory target uses the current date, computed once in step 3d and reused at the move: YYYY-MM-DD-<name>; a name that already starts with a \`YYYY-MM-DD-\` prefix is used as-is (never stack a second date)
 - If archive target exists, fail that change but continue with others
 - Check every archive target in step 3, before the first main-spec write; a change whose target exists is never synced or moved
-- If sync is requested, run the \`openspec-sync-specs\` workflow inline (agent-driven) for each change with included delta specs
+- If sync is requested, ${optionalWorkflow('sync', 'run the `openspec-sync-specs` workflow inline (agent-driven)', 'perform the delta-to-main-spec merge inline (agent-driven)')} for each change with included delta specs
 - Carry the per-delta \`includedDeltas\` and \`excludedDeltas\` decisions into execution; sync and verify only included deltas
 - Report every excluded delta as \`sync skipped\` without treating the archive itself as skipped
 - Never archive a change while a spec sync is still in flight — run the sync inline and verify main specs at \`<planningHome.root>/openspec/specs/<capability-path>/spec.md\` before moving \`changeRoot\`
@@ -395,7 +402,7 @@ ${PROJECT_ROOT_GUARD}
 2. **Prompt for change selection**
 
    Ask the user to choose changes (multi-select):
-   - Show each change with its schema
+   - Show each change name and task status from the list output
    - Include an option for "All changes"
    - Allow any number of selections (1+ works, 2+ is the typical use case)
 
@@ -428,17 +435,24 @@ ${PROJECT_ROOT_GUARD}
 
 3. **Batch validation - gather status for all selected changes**
 
+   Run \`openspec list --json\` once with the same selected-root flags for task
+   progress. If the lookup fails, returns invalid JSON, or omits any selected
+   change, contains a duplicate selected change, or returns invalid counts,
+   report the problem and stop before syncing or archiving the batch.
+
    For each selected change, collect:
 
    a. **Artifact status** - Run \`openspec status --change "<name>" --json\`
       - Parse \`schemaName\`, \`artifacts\`, \`planningHome\`, \`changeRoot\`, \`artifactPaths\`, and \`actionContext\`
       - Note which artifacts are \`done\` vs other states
 
-   b. **Task completion** - Read \`artifactPaths.tasks.existingOutputPaths\` from status JSON
-      - Complete means the checkbox holds only \`x\`/\`X\`, ignoring spacing
-        (\`- [ x]\` is complete); every other marker is incomplete (\`- [ ]\`,
-        \`- []\`, and unfamiliar ones such as \`- [~]\` or \`- [-]\`)
-      - If no tasks file exists, note as "No tasks"
+   b. **Task completion** - Find the \`changes\` entry from the list response whose \`name\` exactly matches this change
+      - Require nonnegative integer \`totalTasks\` and \`completedTasks\`, with \`completedTasks <= totalTasks\`
+      - Incomplete tasks = \`totalTasks - completedTasks\`
+      - The CLI resolves the schema's tracked task files, including custom artifact names, output paths, and globs
+      - Do not infer task completion from artifact status, an artifact id of \`tasks\`, or the absence of a top-level \`tasks.md\`
+      - The CLI counts only \`x\`/\`X\` checkbox markers as complete; other markers remain incomplete
+      - If \`totalTasks\` is zero, note as "No tasks"
 
    c. **Delta specs** - Check \`artifactPaths.specs.existingOutputPaths\` from status JSON
       - List which capability specs exist

package/dist/core/templates/workflows/continue-change.js

@@ -30,7 +30,6 @@ ${PROJECT_ROOT_GUARD}
 
    When prompting, present the top 3-4 most recently modified changes as options, showing:
    - Change name
-   - Schema (from \`schema\` field if present, otherwise "spec-driven")
    - Status (e.g., "0/5 tasks", "complete", "no tasks")
    - How recently it was modified (from \`lastModified\` field)
 
@@ -149,7 +148,6 @@ ${PROJECT_ROOT_GUARD}
 
    When prompting, present the top 3-4 most recently modified changes as options, showing:
    - Change name
-   - Schema (from \`schema\` field if present, otherwise "spec-driven")
    - Status (e.g., "0/5 tasks", "complete", "no tasks")
    - How recently it was modified (from \`lastModified\` field)
 

package/dist/core/templates/workflows/explore.js

@@ -128,7 +128,7 @@ openspec list --json
 
 This tells you:
 - If there are active changes
-- Their names, schemas, and status
+- Their names and task status
 - What the user might be working on
 
 That is the *change* list - work in flight. It does not include the project's durable capabilities, so list those too:
@@ -459,7 +459,7 @@ openspec list --json
 
 This tells you:
 - If there are active changes
-- Their names, schemas, and status
+- Their names and task status
 - What the user might be working on
 
 That is the *change* list - work in flight. It does not include the project's durable capabilities, so list those too:

package/dist/core/templates/workflows/ff-change.js

@@ -88,7 +88,7 @@ ${PROJECT_ROOT_GUARD}
       - Dependencies are enablers, not gates: if a required artifact is still \`blocked\` only because you skipped a conditional dependency, write it anyway
       - Stop when every artifact in the required set is \`done\`, \`skipped\`, or was deliberately skipped
 
-   c. **If an artifact requires user input** (unclear context):
+   c. **If an artifact requires user input** (critically unclear context):
       - Ask the user to clarify
       - Then continue with creation
 
@@ -206,7 +206,7 @@ ${PROJECT_ROOT_GUARD}
       - Dependencies are enablers, not gates: if a required artifact is still \`blocked\` only because you skipped a conditional dependency, write it anyway
       - Stop when every artifact in the required set is \`done\`, \`skipped\`, or was deliberately skipped
 
-   c. **If an artifact requires user input** (unclear context):
+   c. **If an artifact requires user input** (critically unclear context):
       - Ask the user to clarify
       - Then continue with creation
 

package/dist/core/templates/workflows/onboard.js

@@ -415,7 +415,7 @@ Save to the \`resolvedOutputPath\` from \`openspec instructions design --change
 
 Finally, we break the work into implementation tasks—checkboxes that drive the apply phase.
 
-These should be small, clear, and in logical order.
+These should be small, clear, and in logical order. Each group carries the tests and documentation for its own work - the last group is only for integration checks.
 \`\`\`
 
 **DO:** Generate tasks based on specs and design:
@@ -438,12 +438,17 @@ Here are the implementation tasks:
 
 ---
 
-Each checkbox becomes a unit of work in the apply phase. Ready to implement?
+Each checkbox becomes a unit of work in the apply phase. Does this task breakdown look right?
 \`\`\`
 
-**PAUSE** - Wait for user to confirm they're ready to implement.
+**PAUSE** - Wait for user approval/feedback.
+
+After approval, save to the \`resolvedOutputPath\` from \`openspec instructions tasks --change "<name>" --json\`.
+
+Then ask:
+> "Tasks are saved. Ready to implement?"
 
-Save to the \`resolvedOutputPath\` from \`openspec instructions tasks --change "<name>" --json\`.
+**PAUSE** - Wait for user to confirm before implementation.
 
 ---