@dewtech/dare-cli 2.17.0 → 3.0.0

package/dist/__tests__/validate.test.js

@@ -57,74 +57,74 @@ describe('dare validate', () => {
         expect(stdout).toMatch(/Invalid id/);
     });
 });
-const validYaml = `title: "ok"
-version: "1.0.0"
-models:
-  cursor: { HIGH: a, MED: b, LOW: c }
-tasks:
-  - id: task-001
-    title: "First"
-    depends_on: []
-    complexity: LOW
-    subtask_prompt: "go"
-  - id: task-002
-    title: "Second"
-    depends_on: []
-    complexity: LOW
-    subtask_prompt: "go"
+const validYaml = `title: "ok"
+version: "1.0.0"
+models:
+  cursor: { HIGH: a, MED: b, LOW: c }
+tasks:
+  - id: task-001
+    title: "First"
+    depends_on: []
+    complexity: LOW
+    subtask_prompt: "go"
+  - id: task-002
+    title: "Second"
+    depends_on: []
+    complexity: LOW
+    subtask_prompt: "go"
 `;
-const dupIdYaml = `title: "dup"
-version: "1.0.0"
-models:
-  cursor: { HIGH: a, MED: b, LOW: c }
-tasks:
-  - id: task-001
-    title: "A"
-    depends_on: []
-    complexity: LOW
-    subtask_prompt: "go"
-  - id: task-001
-    title: "B"
-    depends_on: []
-    complexity: LOW
-    subtask_prompt: "go"
+const dupIdYaml = `title: "dup"
+version: "1.0.0"
+models:
+  cursor: { HIGH: a, MED: b, LOW: c }
+tasks:
+  - id: task-001
+    title: "A"
+    depends_on: []
+    complexity: LOW
+    subtask_prompt: "go"
+  - id: task-001
+    title: "B"
+    depends_on: []
+    complexity: LOW
+    subtask_prompt: "go"
 `;
-const unknownDepYaml = `title: "missing"
-version: "1.0.0"
-models:
-  cursor: { HIGH: a, MED: b, LOW: c }
-tasks:
-  - id: task-001
-    title: "A"
-    depends_on: [task-999]
-    complexity: LOW
-    subtask_prompt: "go"
+const unknownDepYaml = `title: "missing"
+version: "1.0.0"
+models:
+  cursor: { HIGH: a, MED: b, LOW: c }
+tasks:
+  - id: task-001
+    title: "A"
+    depends_on: [task-999]
+    complexity: LOW
+    subtask_prompt: "go"
 `;
-const cycleYaml = `title: "cycle"
-version: "1.0.0"
-models:
-  cursor: { HIGH: a, MED: b, LOW: c }
-tasks:
-  - id: task-001
-    title: "A"
-    depends_on: [task-002]
-    complexity: LOW
-    subtask_prompt: "go"
-  - id: task-002
-    title: "B"
-    depends_on: [task-001]
-    complexity: LOW
-    subtask_prompt: "go"
+const cycleYaml = `title: "cycle"
+version: "1.0.0"
+models:
+  cursor: { HIGH: a, MED: b, LOW: c }
+tasks:
+  - id: task-001
+    title: "A"
+    depends_on: [task-002]
+    complexity: LOW
+    subtask_prompt: "go"
+  - id: task-002
+    title: "B"
+    depends_on: [task-001]
+    complexity: LOW
+    subtask_prompt: "go"
 `;
-const badIdYaml = `title: "bad-id"
-version: "1.0.0"
-models:
-  cursor: { HIGH: a, MED: b, LOW: c }
-tasks:
-  - id: Task_001
-    title: "Wrong case"
-    depends_on: []
-    complexity: LOW
-    subtask_prompt: "go"
+const badIdYaml = `title: "bad-id"
+version: "1.0.0"
+models:
+  cursor: { HIGH: a, MED: b, LOW: c }
+tasks:
+  - id: Task_001
+    title: "Wrong case"
+    depends_on: []
+    complexity: LOW
+    subtask_prompt: "go"
 `;
 //# sourceMappingURL=validate.test.js.map

package/dist/bin/dare.js

@@ -6,6 +6,9 @@ import { designCommand } from '../commands/design.js';
 import { blueprintCommand } from '../commands/blueprint.js';
 import { executeCommand } from '../commands/execute.js';
 import { discoverCommand } from '../commands/discover.js';
+import { reverseCommand } from '../commands/reverse.js';
+import { dnaCommand } from '../commands/dna.js';
+import { migrateCommand } from '../commands/migrate.js';
 import { graphCommand } from '../commands/graph.js';
 import { dagCommand } from '../commands/dag.js';
 import { infoCommand } from '../commands/info.js';
@@ -14,16 +17,25 @@ import { bootstrapCommand } from '../commands/bootstrap.js';
 import { updateCommand } from '../commands/update.js';
 import { reviewCommand } from '../commands/review.js';
 import { refineCommand } from '../commands/refine.js';
+import { newCommand } from '../commands/new.js';
+import { skillCommand } from '../skills/index.js';
+import { welcomeCommand } from '../commands/welcome.js';
+import { printBanner } from '../utils/banner.js';
 const require = createRequire(import.meta.url);
 const { version } = require('../../package.json');
 const program = new Command();
 program
     .name('dare')
-    .description('DARE Framework - Design, Architect, Review, Execute methodology for AI-assisted development')
-    .version(version);
+    .description('DARE Framework - Design · Architecture · Review · Execute methodology for AI-assisted development')
+    .version(version)
+    .option('--no-banner', 'Suppress ASCII art banner');
+program.addCommand(newCommand);
 program.addCommand(initCommand);
 program.addCommand(bootstrapCommand);
 program.addCommand(discoverCommand);
+program.addCommand(reverseCommand);
+program.addCommand(dnaCommand);
+program.addCommand(migrateCommand);
 program.addCommand(designCommand);
 program.addCommand(blueprintCommand);
 program.addCommand(executeCommand);
@@ -34,8 +46,25 @@ program.addCommand(infoCommand);
 program.addCommand(updateCommand);
 program.addCommand(reviewCommand);
 program.addCommand(refineCommand);
-program.parse(process.argv);
+program.addCommand(skillCommand);
+program.addCommand(welcomeCommand);
+// Show banner + help when invoked with no subcommand
 if (!process.argv.slice(2).length) {
+    printBanner();
+    program.parse(process.argv);
     program.outputHelp();
 }
+else {
+    // Check for --no-banner early before Commander strips it
+    const noBanner = process.argv.includes('--no-banner');
+    if (!noBanner) {
+        // Show banner only for banner-eligible commands
+        const BANNER_COMMANDS = ['new', '--version', '-V'];
+        const firstArg = process.argv[2] ?? '';
+        if (BANNER_COMMANDS.includes(firstArg)) {
+            printBanner();
+        }
+    }
+    program.parse(process.argv);
+}
 //# sourceMappingURL=dare.js.map

package/dist/bin/dare.js.map

@@ -1 +1 @@
-{"version":3,"file":"dare.js","sourceRoot":"","sources":["../../src/bin/dare.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAwB,CAAC;AAEzE,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,MAAM,CAAC;KACZ,WAAW,CAAC,6FAA6F,CAAC;KAC1G,OAAO,CAAC,OAAO,CAAC,CAAC;AAEpB,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAChC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACrC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;AACpC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAClC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACrC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;AACnC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;AACjC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAC/B,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;AACpC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAChC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAClC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAClC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAElC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAClC,OAAO,CAAC,UAAU,EAAE,CAAC;AACvB,CAAC"}
+{"version":3,"file":"dare.js","sourceRoot":"","sources":["../../src/bin/dare.ts"],"names":[],"mappings":"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"}

package/dist/commands/blueprint.js

@@ -128,43 +128,43 @@ async function writeIfMissing(target, content, force) {
     await fs.writeFile(target, content);
 }
 function renderBlueprint(generatedAt) {
-    return `# BLUEPRINT
-
-## Architecture Overview
-> Generated from DESIGN.md — fill in with the AI agent (\`/dare-blueprint\` / skill \`dare-blueprint\`).
-
-## Technology Stack
-- **Backend:** To be defined
-- **Frontend:** To be defined
-- **Database:** To be defined
-- **Infrastructure:** To be defined
-
-## Modules
-### Module 1: Core
-- Description
-- Endpoints
-- Data models
-
-## API Contracts
-\`\`\`yaml
-openapi: 3.0.0
-info:
-  title: Project API
-  version: 0.1.0
-\`\`\`
-
-## Database Schema
-\`\`\`sql
--- Tables to be defined
-\`\`\`
-
-## Strategy
-- **Testing:** unit + integration; coverage target
-- **Deploy:** env, infra targets, CI/CD
-- **Security:** OWASP Top 10 baseline + stack-specific
-
----
-*Scaffolded by DARE Framework — ${generatedAt}*
+    return `# BLUEPRINT
+
+## Architecture Overview
+> Generated from DESIGN.md — fill in with the AI agent (\`/dare-blueprint\` / skill \`dare-blueprint\`).
+
+## Technology Stack
+- **Backend:** To be defined
+- **Frontend:** To be defined
+- **Database:** To be defined
+- **Infrastructure:** To be defined
+
+## Modules
+### Module 1: Core
+- Description
+- Endpoints
+- Data models
+
+## API Contracts
+\`\`\`yaml
+openapi: 3.0.0
+info:
+  title: Project API
+  version: 0.1.0
+\`\`\`
+
+## Database Schema
+\`\`\`sql
+-- Tables to be defined
+\`\`\`
+
+## Strategy
+- **Testing:** unit + integration; coverage target
+- **Deploy:** env, infra targets, CI/CD
+- **Security:** OWASP Top 10 baseline + stack-specific
+
+---
+*Scaffolded by DARE Framework — ${generatedAt}*
 `;
 }
 function renderDag(tasks, generatedAt) {
@@ -186,24 +186,24 @@ function renderDag(tasks, generatedAt) {
         ].join('\n');
     })
         .join('\n\n');
-    return `title: "Project - Development Tasks"
-version: "1.0.0"
-generated: "${generatedAt}"
-
-# Limites alinhados com Cursor SDK DAG runner
-limits:
-  parent_context_chars: 2000   # snippet de output de cada pai injetado no filho
-  task_output_chars: 4000      # cap do output capturado por task
-  timeout_seconds: 600         # AbortController por task
-
-# Mapeamento complexity → modelo, por runner
-models:
-  cursor:      { HIGH: gpt-5.3-codex,     MED: composer-2,       LOW: auto-low }
-  claude:      { HIGH: claude-sonnet-4-5, MED: claude-haiku-4,   LOW: claude-haiku-4 }
-  antigravity: { HIGH: gemini-2.5-pro,    MED: gemini-2.5-flash, LOW: gemini-2.5-flash }
-
-tasks:
-${tasksYaml}
+    return `title: "Project - Development Tasks"
+version: "1.0.0"
+generated: "${generatedAt}"
+
+# Limites alinhados com Cursor SDK DAG runner
+limits:
+  parent_context_chars: 2000   # snippet de output de cada pai injetado no filho
+  task_output_chars: 4000      # cap do output capturado por task
+  timeout_seconds: 600         # AbortController por task
+
+# Mapeamento complexity → modelo, por runner
+models:
+  cursor:      { HIGH: gpt-5.3-codex,     MED: composer-2,       LOW: auto-low }
+  claude:      { HIGH: claude-sonnet-4-5, MED: claude-haiku-4,   LOW: claude-haiku-4 }
+  antigravity: { HIGH: gemini-2.5-pro,    MED: gemini-2.5-flash, LOW: gemini-2.5-flash }
+
+tasks:
+${tasksYaml}
 `;
 }
 function renderTasksMd(tasks, generatedAt) {
@@ -213,77 +213,77 @@ function renderTasksMd(tasks, generatedAt) {
         return `| ${t.id} | ${t.title} | ⏳ PENDING | ${deps} | ${t.complexity} |`;
     })
         .join('\n');
-    return `# TASKS
-
-## Status Legend
-- ⏳ PENDING
-- 🔄 RUNNING
-- ✅ DONE
-- ❌ FAILED
-- ⏭️ SKIPPED
-
-## Tasks
-
-| ID | Title | Status | Depends On | Complexity |
-|----|-------|--------|------------|------------|
-${rows}
-
-## How to execute
-
-Paralelo (recomendado):
-\`\`\`bash
-dare execute --parallel
-\`\`\`
-
-Task única:
-\`\`\`bash
-dare execute --task task-001
-\`\`\`
-
-Resume (apenas PENDING/FAILED):
-\`\`\`bash
-dare execute --parallel --resume
-\`\`\`
-
----
-*Scaffolded by DARE Framework — ${generatedAt}*
+    return `# TASKS
+
+## Status Legend
+- ⏳ PENDING
+- 🔄 RUNNING
+- ✅ DONE
+- ❌ FAILED
+- ⏭️ SKIPPED
+
+## Tasks
+
+| ID | Title | Status | Depends On | Complexity |
+|----|-------|--------|------------|------------|
+${rows}
+
+## How to execute
+
+Paralelo (recomendado):
+\`\`\`bash
+dare execute --parallel
+\`\`\`
+
+Task única:
+\`\`\`bash
+dare execute --task task-001
+\`\`\`
+
+Resume (apenas PENDING/FAILED):
+\`\`\`bash
+dare execute --parallel --resume
+\`\`\`
+
+---
+*Scaffolded by DARE Framework — ${generatedAt}*
 `;
 }
 function renderTaskSpec(t) {
     const deps = t.deps.length === 0 ? 'None' : t.deps.join(', ');
-    return `# ${t.id}: ${t.title}
-
-## Objective
-${t.prompt.split('\n')[0]}
-
-## Description
-${t.prompt}
-
-## Dependencies
-${deps}
-
-## Complexity
-${t.complexity}
-
-## Files to create / modify
-- _List the concrete files this task touches._
-
-## Validation Gates
-- [ ] Build passes
-- [ ] Tests pass
-- [ ] Lint clean
-- [ ] _Stack-specific gate (e.g. \`php artisan test\`, \`pytest\`, \`cargo test\`)_
-
-## Tests
-\`\`\`bash
-# Stack-specific test command
-\`\`\`
-
-## Security
-- _OWASP considerations for this task_
-
-## Next task
-- _Suggested follow-up_
+    return `# ${t.id}: ${t.title}
+
+## Objective
+${t.prompt.split('\n')[0]}
+
+## Description
+${t.prompt}
+
+## Dependencies
+${deps}
+
+## Complexity
+${t.complexity}
+
+## Files to create / modify
+- _List the concrete files this task touches._
+
+## Validation Gates
+- [ ] Build passes
+- [ ] Tests pass
+- [ ] Lint clean
+- [ ] _Stack-specific gate (e.g. \`php artisan test\`, \`pytest\`, \`cargo test\`)_
+
+## Tests
+\`\`\`bash
+# Stack-specific test command
+\`\`\`
+
+## Security
+- _OWASP considerations for this task_
+
+## Next task
+- _Suggested follow-up_
 `;
 }
 //# sourceMappingURL=blueprint.js.map

package/dist/commands/dag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dag.d.ts","sourceRoot":"","sources":["../../src/commands/dag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,EAEL,KAAK,GAAG,EAGT,MAAM,0BAA0B,CAAC;AAUlC;;;;GAIG;AACH,eAAO,MAAM,UAAU,SAEtB,CAAC;AA6FF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CA6CjD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAyC7C"}
+{"version":3,"file":"dag.d.ts","sourceRoot":"","sources":["../../src/commands/dag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,EACL,KAAK,GAAG,EAGT,MAAM,0BAA0B,CAAC;AAgBlC;;;;GAIG;AACH,eAAO,MAAM,UAAU,SAEtB,CAAC;AAiHF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAejD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAY7C"}

package/dist/commands/dag.js

@@ -3,9 +3,9 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
 import { convertYamlToDag } from '../utils/dag-converter.js';
-import { computeRanks, } from '../dag-runner/run_dag.js';
 import { DEFAULT_STATE_PATH, loadAndApplyState, } from '../dag-runner/state-store.js';
 import { renderDagExcalidraw, serializeExcalidraw, } from '../utils/excalidraw-renderer.js';
+import { renderGraphMermaid, renderGraphDot, escapeMermaid, } from '../utils/graph-renderer.js';
 /**
  * `dare dag` — inspect and visualize the static task DAG declared in
  * `dare-dag.yaml`. Distinct from `dare graph`, which inspects the populated
@@ -76,90 +76,54 @@ const MERMAID_CLASSES = [
     'classDef st_failed fill:#fee2e2,stroke:#dc2626,color:#7f1d1d;',
     'classDef st_skipped fill:#e5e7eb,stroke:#6b7280,color:#374151;',
 ];
+const DOT_FILL = {
+    PENDING: '#f3f4f6',
+    RUNNING: '#dbeafe',
+    DONE: '#dcfce7',
+    FAILED: '#fee2e2',
+    SKIPPED: '#e5e7eb',
+};
+const DOT_BORDER = {
+    PENDING: '#9ca3af',
+    RUNNING: '#2563eb',
+    DONE: '#16a34a',
+    FAILED: '#dc2626',
+    SKIPPED: '#6b7280',
+};
+function taskLabelLines(task) {
+    const status = task.status ?? 'PENDING';
+    return [task.id, task.title, `${STATUS_ICON[status]} ${status}`];
+}
 export function renderDagMermaid(dag) {
-    const lines = [
-        `%% DARE DAG — ${escapeMermaid(dag.title)}`,
-        `%% Generated: ${new Date().toISOString()}`,
-        'graph LR',
-    ];
-    // Group nodes by rank using subgraphs so the diagram visually flows by rank
-    const ranks = computeRanks(dag.tasks);
-    const byRank = new Map();
-    for (const task of dag.tasks) {
-        const r = ranks.get(task.id) ?? 0;
-        if (!byRank.has(r))
-            byRank.set(r, []);
-        byRank.get(r).push(task);
-    }
-    const sortedRanks = [...byRank.keys()].sort((a, b) => a - b);
-    for (const r of sortedRanks) {
-        lines.push(`  subgraph rank_${r} ["Rank ${r}"]`);
-        lines.push(`    direction TB`);
-        for (const task of byRank.get(r)) {
-            const id = sanitizeId(task.id);
-            const status = task.status ?? 'PENDING';
-            const icon = STATUS_ICON[status];
-            const label = `${task.id}\\n${escapeMermaid(task.title)}\\n${icon} ${status}`;
-            lines.push(`    ${id}["${label}"]`);
-        }
-        lines.push('  end');
-    }
-    // Edges
-    for (const task of dag.tasks) {
-        for (const dep of task.depends_on) {
-            lines.push(`  ${sanitizeId(dep)} --> ${sanitizeId(task.id)}`);
-        }
-    }
-    // Status classes
-    for (const task of dag.tasks) {
-        const status = task.status ?? 'PENDING';
-        lines.push(`  class ${sanitizeId(task.id)} st_${status.toLowerCase()};`);
-    }
-    for (const cls of MERMAID_CLASSES)
-        lines.push(`  ${cls}`);
-    return lines.join('\n');
+    const nodes = dag.tasks.map((task) => ({
+        id: task.id,
+        depends_on: task.depends_on,
+        labelLines: taskLabelLines(task),
+        bg: '',
+        stroke: '',
+        mermaidClass: `st_${(task.status ?? 'PENDING').toLowerCase()}`,
+    }));
+    return renderGraphMermaid(nodes, {
+        headerComment: `DARE DAG — ${escapeMermaid(dag.title)}`,
+        direction: 'LR',
+        styling: 'class',
+        classDefs: MERMAID_CLASSES,
+    });
 }
 export function renderDagDot(dag) {
-    const lines = [
-        'digraph DareDAG {',
-        '  rankdir=LR;',
-        '  node [shape=box style=filled fontname=Helvetica];',
-    ];
-    const colors = {
-        PENDING: '"#f3f4f6"',
-        RUNNING: '"#dbeafe"',
-        DONE: '"#dcfce7"',
-        FAILED: '"#fee2e2"',
-        SKIPPED: '"#e5e7eb"',
-    };
-    const borders = {
-        PENDING: '"#9ca3af"',
-        RUNNING: '"#2563eb"',
-        DONE: '"#16a34a"',
-        FAILED: '"#dc2626"',
-        SKIPPED: '"#6b7280"',
-    };
-    for (const task of dag.tasks) {
+    const nodes = dag.tasks.map((task) => {
         const status = task.status ?? 'PENDING';
-        const id = JSON.stringify(task.id);
-        const label = JSON.stringify(`${task.id}\n${task.title}\n${STATUS_ICON[status]} ${status}`);
-        lines.push(`  ${id} [label=${label} fillcolor=${colors[status]} color=${borders[status]}];`);
-    }
-    for (const task of dag.tasks) {
-        for (const dep of task.depends_on) {
-            lines.push(`  ${JSON.stringify(dep)} -> ${JSON.stringify(task.id)};`);
-        }
-    }
-    lines.push('}');
-    return lines.join('\n');
+        return {
+            id: task.id,
+            depends_on: task.depends_on,
+            labelLines: taskLabelLines(task),
+            bg: DOT_FILL[status],
+            stroke: DOT_BORDER[status],
+        };
+    });
+    return renderGraphDot(nodes, { name: 'DareDAG' });
 }
 // ─── Helpers ────────────────────────────────────────────────────────────────
-function sanitizeId(id) {
-    return id.replace(/[^a-zA-Z0-9_]/g, '_');
-}
-function escapeMermaid(s) {
-    return s.replace(/"/g, '"').replace(/[\r\n]+/g, ' ');
-}
 function countEdges(dag) {
     return dag.tasks.reduce((sum, t) => sum + t.depends_on.length, 0);
 }

package/dist/commands/dag.js.map

@@ -1 +1 @@
-{"version":3,"file":"dag.js","sourceRoot":"","sources":["../../src/commands/dag.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dag.js","sourceRoot":"","sources":["../../src/commands/dag.ts"],"names":[],"mappings":"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"}