Revert "refactor: address PR Fission-AI#790 review feedback"

This reverts commit 9b10d02.

Author: pformoso-deus-ai

build.js

@@ -4,6 +4,14 @@ import { execFileSync } from 'child_process';
 import { existsSync, rmSync } from 'fs';
 import { createRequire } from 'module';
 
+// When npm installs from a git dep (github:user/repo#branch), it runs
+// `prepare` before node_modules exist. Skip gracefully and let `prepack`
+// handle the build during the pack phase where deps are available.
+if (!existsSync('node_modules')) {
+  console.log('⏭️  Skipping build (node_modules not yet available)');
+  process.exit(0);
+}
+
 const require = createRequire(import.meta.url);
 
 const runTsc = (args = []) => {

package-lock.json

@@ -48,9 +48,10 @@
     "test:ui": "vitest --ui",
     "test:coverage": "vitest --coverage",
     "test:postinstall": "node scripts/postinstall.js",
-    "prepare": "pnpm run build",
+    "prepare": "node build.js",
+    "prepack": "node build.js",
     "prepublishOnly": "pnpm run build",
-    "postinstall": "node scripts/postinstall.js",
+    "postinstall": "node scripts/postinstall.js || true",
     "check:pack-version": "node scripts/pack-version-check.mjs",
     "release": "pnpm run release:ci",
     "release:ci": "pnpm run check:pack-version && pnpm exec changeset publish",

package.json

@@ -1,6 +1,6 @@
 name: dispec-driven
 version: 1
-description: Distributed spec-driven workflow - proposal → (specs + design) → tasks → dependencies → distribution
+description: Distributed spec-driven workflow - proposal → specs → design → tasks → dependencies → distribution
 artifacts:
   - id: proposal
     generates: proposal.md

schemas/dispec-driven/schema.yaml

@@ -18,9 +18,21 @@
 
 ## Agent Assignments
 
-<!-- Repeat this card for each agent (recommended: 3-5 agents) -->
+### Agent 1: <!-- agent name/focus area -->
 
-### Agent N: <!-- agent name/focus area -->
+**Tasks:**
+<!-- List assigned task IDs -->
+
+**File ownership:**
+<!-- Files this agent is responsible for -->
+
+**Execution order:**
+<!-- Order respecting dependencies -->
+
+**Cross-agent dependencies:**
+<!-- Tasks from other agents this agent must wait for -->
+
+### Agent 2: <!-- agent name/focus area -->
 
 **Tasks:**
 <!-- List assigned task IDs -->

schemas/dispec-driven/templates/distribution.md

@@ -6,7 +6,11 @@
  */
 import type { SkillTemplate, CommandTemplate } from '../types.js';
 
-const MULTIAGENT_INSTRUCTIONS = `Plan and distribute a change across multiple AI agents for parallel execution.
+export function getOpsxMultiagentSkillTemplate(): SkillTemplate {
+  return {
+    name: 'openspec-multiagent',
+    description: 'Plan and distribute a change across multiple AI agents for parallel execution. Use when the user wants to break down a complex change into tasks that can be worked on simultaneously by a team of agents.',
+    instructions: `Plan and distribute a change across multiple AI agents for parallel execution.
 
 I'll create a change with artifacts:
 - proposal.md (what & why)
@@ -20,11 +24,11 @@ When ready to implement, run /opsx:multiagent-apply
 
 ---
 
-**Input**: The argument after \`/opsx:multiagent\` is the change name (kebab-case), OR a description of what the user wants to build.
+**Input**: The user's request should include a change name (kebab-case) OR a description of what they want to build.
 
 **Steps**
 
-1. **If no input provided, ask what they want to build**
+1. **If no clear input provided, ask what they want to build**
 
    Use the **AskUserQuestion tool** (open-ended, no preset options) to ask:
    > "What change do you want to work on? Describe what you want to build or fix."
@@ -74,13 +78,11 @@ When ready to implement, run /opsx:multiagent-apply
       > "How many agents do you want to distribute tasks across? (Recommended: 3-5)"
 
       With options:
-      - "2 agents" - Minimum viable parallelism
       - "3 agents (Recommended)" - Good balance of parallelism and coordination
       - "4 agents" - More parallelism, moderate coordination
       - "5 agents" - Maximum parallelism, higher coordination overhead
 
-      If the user selects fewer than 2, suggest using \`/opsx:propose\` instead for a simpler single-agent workflow.
-      If the user requests more than 5, warn about coordination overhead and recommend 3-5 agents.
+      If the user selects 1 agent, suggest using \`/opsx:propose\` instead for a simpler single-agent workflow.
 
    c. **Continue until all \`applyRequires\` artifacts are complete**
       - After creating each artifact, re-run \`openspec status --change "<name>" --json\`
@@ -121,13 +123,7 @@ After completing all artifacts, summarize:
 - Always read dependency artifacts before creating a new one
 - If context is critically unclear, ask the user - but prefer making reasonable decisions to keep momentum
 - If a change with that name already exists, ask if user wants to continue it or create a new one
-- Verify each artifact file exists after writing before proceeding to next`;
-
-export function getOpsxMultiagentSkillTemplate(): SkillTemplate {
-  return {
-    name: 'openspec-multiagent',
-    description: 'Plan and distribute a change across multiple AI agents for parallel execution. Use when the user wants to break down a complex change into tasks that can be worked on simultaneously by a team of agents.',
-    instructions: MULTIAGENT_INSTRUCTIONS,
+- Verify each artifact file exists after writing before proceeding to next`,
     license: 'MIT',
     compatibility: 'Requires openspec CLI.',
     metadata: { author: 'openspec', version: '1.0' },
@@ -140,6 +136,119 @@ export function getOpsxMultiagentCommandTemplate(): CommandTemplate {
     description: 'Plan and distribute a change across multiple AI agents for parallel execution',
     category: 'Workflow',
     tags: ['workflow', 'artifacts', 'multiagent', 'experimental'],
-    content: MULTIAGENT_INSTRUCTIONS,
+    content: `Plan and distribute a change across multiple AI agents for parallel execution.
+
+I'll create a change with artifacts:
+- proposal.md (what & why)
+- specs/ (detailed specifications)
+- design.md (how, with parallelism considerations)
+- tasks.md (implementation steps with file ownership)
+- dependencies.md (task dependency analysis)
+- distribution.md (agent assignment plan)
+
+When ready to implement, run /opsx:multiagent-apply
+
+---
+
+**Input**: The argument after \`/opsx:multiagent\` is the change name (kebab-case), OR a description of what the user wants to build.
+
+**Steps**
+
+1. **If no input provided, ask what they want to build**
+
+   Use the **AskUserQuestion tool** (open-ended, no preset options) to ask:
+   > "What change do you want to work on? Describe what you want to build or fix."
+
+   From their description, derive a kebab-case name (e.g., "add user authentication" → \`add-user-auth\`).
+
+   **IMPORTANT**: Do NOT proceed without understanding what the user wants to build.
+
+2. **Create the change directory**
+   \`\`\`bash
+   openspec new change "<name>" --schema dispec-driven
+   \`\`\`
+   This creates a scaffolded change at \`openspec/changes/<name>/\` with \`.openspec.yaml\` using the dispec-driven schema.
+
+3. **Get the artifact build order**
+   \`\`\`bash
+   openspec status --change "<name>" --json
+   \`\`\`
+   Parse the JSON to get:
+   - \`applyRequires\`: array of artifact IDs needed before implementation (e.g., \`["distribution"]\`)
+   - \`artifacts\`: list of all artifacts with their status and dependencies
+
+4. **Create artifacts in sequence until apply-ready**
+
+   Use **TaskCreate** and **TaskUpdate** tools to track progress through the artifacts.
+
+   Loop through artifacts in dependency order (artifacts with no pending dependencies first):
+
+   a. **For each artifact that is \`ready\` (dependencies satisfied)**:
+      - Get instructions:
+        \`\`\`bash
+        openspec instructions <artifact-id> --change "<name>" --json
+        \`\`\`
+      - The instructions JSON includes:
+        - \`context\`: Project background (constraints for you - do NOT include in output)
+        - \`rules\`: Artifact-specific rules (constraints for you - do NOT include in output)
+        - \`template\`: The structure to use for your output file
+        - \`instruction\`: Schema-specific guidance for this artifact type
+        - \`outputPath\`: Where to write the artifact
+        - \`dependencies\`: Completed artifacts to read for context
+      - Read any completed dependency files for context
+      - Create the artifact file using \`template\` as the structure
+      - Apply \`context\` and \`rules\` as constraints - but do NOT copy them into the file
+      - Show brief progress: "Created <artifact-id>"
+
+   b. **For the distribution artifact**: Use the **AskUserQuestion tool** to ask:
+      > "How many agents do you want to distribute tasks across? (Recommended: 3-5)"
+
+      With options:
+      - "3 agents (Recommended)" - Good balance of parallelism and coordination
+      - "4 agents" - More parallelism, moderate coordination
+      - "5 agents" - Maximum parallelism, higher coordination overhead
+
+      If the user selects 1 agent, suggest using \`/opsx:propose\` instead for a simpler single-agent workflow.
+
+   c. **Continue until all \`applyRequires\` artifacts are complete**
+      - After creating each artifact, re-run \`openspec status --change "<name>" --json\`
+      - Check if every artifact ID in \`applyRequires\` has \`status: "done"\` in the artifacts array
+      - Stop when all \`applyRequires\` artifacts are done
+
+   d. **If an artifact requires user input** (unclear context):
+      - Use **AskUserQuestion tool** to clarify
+      - Then continue with creation
+
+5. **Show final status**
+   \`\`\`bash
+   openspec status --change "<name>"
+   \`\`\`
+
+**Output**
+
+After completing all artifacts, summarize:
+- Change name and location
+- List of artifacts created with brief descriptions
+- **Agent assignment summary**: Which tasks go to which agent
+- **Token cost warning**: Remind that N agents ≈ N× token usage
+- What's ready: "All artifacts created! Ready for multi-agent implementation."
+- Prompt: "Run \`/opsx:multiagent-apply\` to orchestrate a Claude Code agent team for parallel implementation."
+
+**Artifact Creation Guidelines**
+
+- Follow the \`instruction\` field from \`openspec instructions\` for each artifact type
+- The schema defines what each artifact should contain - follow it
+- Read dependency artifacts for context before creating new ones
+- Use \`template\` as the structure for your output file - fill in its sections
+- **IMPORTANT**: \`context\` and \`rules\` are constraints for YOU, not content for the file
+  - Do NOT copy \`<context>\`, \`<rules>\`, \`<project_context>\` blocks into the artifact
+  - These guide what you write, but should never appear in the output
+
+**Guardrails**
+- Create ALL artifacts needed for implementation (as defined by schema's \`apply.requires\`)
+- Always read dependency artifacts before creating a new one
+- If context is critically unclear, ask the user - but prefer making reasonable decisions to keep momentum
+- If a change with that name already exists, ask if user wants to continue it or create a new one
+- Verify each artifact file exists after writing before proceeding to next`
   };
 }

src/core/templates/workflows/multiagent.ts

@@ -56,8 +56,8 @@ const EXPECTED_FUNCTION_HASHES: Record<string, string> = {
   getOpsxVerifyCommandTemplate: '9b4d3ca422553b7534764eb3a009da87a051612c5238e9baab294c7b1233e9a2',
   getOpsxProposeSkillTemplate: 'd67f937d44650e9c61d2158c865309fbab23cb3f50a3d4868a640a97776e3999',
   getOpsxProposeCommandTemplate: '41ad59b37eafd7a161bab5c6e41997a37368f9c90b194451295ede5cd42e4d46',
-  getOpsxMultiagentSkillTemplate: '9f0869a754c0f316c76d0970d886cbf96ebd073c5ba62278a6b6707d3535ccf4',
-  getOpsxMultiagentCommandTemplate: '353b3dc822145884acd27f33ed692b36f4b9d75349f350bb6ca9cbce01562892',
+  getOpsxMultiagentSkillTemplate: 'd0f5057cdd58d2cd3ae917e916a36a376cd4d956e53c337d1af9efcb01414a07',
+  getOpsxMultiagentCommandTemplate: '84c01236b6d55342a8786d5c2904cb0b5dd45cc9cbd2f81e82e1334d2c24e433',
   getOpsxMultiagentApplySkillTemplate: 'b90f8d481511a1c0d69651f2b7116166d044d12acfcc1fd9e336e4636cedfa05',
   getOpsxMultiagentApplyCommandTemplate: '046abe3e18f86a807e79fd1f399a9105cae93106d1448b1a989d57623baed4c6',
   getFeedbackSkillTemplate: 'd7d83c5f7fc2b92fe8f4588a5bf2d9cb315e4c73ec19bcd5ef28270906319a0d',
@@ -75,7 +75,7 @@ const EXPECTED_GENERATED_SKILL_CONTENT_HASHES: Record<string, string> = {
   'openspec-verify-change': '30d07c6f7051965f624f5964db51844ec17c7dfd05f0da95281fe0ca73616326',
   'openspec-onboard': 'dbce376cf895f3fe4f63b4bce66d258c35b7b8884ac746670e5e35fabcefd255',
   'openspec-propose': '20e36dabefb90e232bad0667292bd5007ec280f8fc4fc995dbc4282bf45a22e7',
-  'openspec-multiagent': '4aeb273e34f9b4ac7385bc636ca4ddbd401b43afd2f9834eda76790617f5aa9c',
+  'openspec-multiagent': 'e061c1d547c7fa8e647fb91fc80d236fe7751f3e180dd06914ee519bb9148695',
   'openspec-multiagent-apply': '55300df760099dca2f7e965d63d9bd75b7e2152b35638f9ac66a4f516d167204',
 };