@ktpartners/dgs-platform 2.9.0 → 3.3.0

package/deliver-great-systems/bin/lib/init.test.cjs

@@ -60,6 +60,21 @@ function v2FixtureWithProject() {
   });
 }
 
+// ─── v2 fixture for multi-project case (existing active + new slug) ──────────
+
+function v2FixtureMultiProject() {
+  // Active project exists and is populated; we are about to create a second, distinct project.
+  return createFixture({
+    'config.json': JSON.stringify({ current_project: 'test-project' }),
+    'PROJECTS.md': '# Projects\n\n| Project | Status |\n|---------|--------|\n| test-project | Active |\n',
+    'REPOS.md': '# Repos\n\n| Name | Path |\n|------|------|\n',
+    'projects/test-project/STATE.md': '# State',
+    'projects/test-project/ROADMAP.md': '# Roadmap',
+    'projects/test-project/REQUIREMENTS.md': '# Requirements',
+    'projects/test-project/PROJECT.md': '# Project',
+  });
+}
+
 // ─── v2 fixture without current_project (for guard tests) ────────────────────
 
 function v2FixtureOneProject() {
@@ -67,6 +82,7 @@ function v2FixtureOneProject() {
     'config.json': JSON.stringify({}),
     'PROJECTS.md': '# Projects\n\n| Project | Status |\n',
     'REPOS.md': '# Repos\n\n| Name | Path |\n',
+    'projects/test-project/PROJECT.md': '# Project\n',
     'projects/test-project/STATE.md': '# State',
   });
 }
@@ -84,7 +100,9 @@ function v2FixtureMultipleProjects() {
     'config.json': JSON.stringify({}),
     'PROJECTS.md': '# Projects\n\n| Project | Status |\n',
     'REPOS.md': '# Repos\n\n| Name | Path |\n',
+    'projects/alpha-project/PROJECT.md': '# Project\n',
     'projects/alpha-project/STATE.md': '# State',
+    'projects/beta-project/PROJECT.md': '# Project\n',
     'projects/beta-project/STATE.md': '# State',
   });
 }
@@ -278,7 +296,8 @@ describe('v1 mode: init todos', () => {
   });
 
   it('returns v1 pending_dir path', () => {
-    assert.equal(result.pending_dir, 'todos/pending');
+    // Flat layout: pending_dir points to todos/ (not todos/pending/)
+    assert.equal(result.pending_dir, 'todos');
   });
 
   it('returns v1 completed_dir path', () => {
@@ -518,7 +537,8 @@ describe('v2 mode with project: init todos', () => {
   });
 
   it('returns product-level pending_dir', () => {
-    assert.equal(result.pending_dir, path.join('todos', 'pending'));
+    // Flat layout: pending_dir points to todos/ (not todos/pending/)
+    assert.equal(result.pending_dir, 'todos');
   });
 
   it('returns product-level completed_dir', () => {
@@ -1148,7 +1168,7 @@ describe('v2 guard: multiple projects (prompt)', () => {
 describe('branch_name with {project} resolution', () => {
   it('v1 execute-phase branch_name resolves {project} from current_project', () => {
     const fixture = createFixture({
-      'config.json': JSON.stringify({ current_project: 'myapp', git: { branching_strategy: 'phase' } }),
+      'config.json': JSON.stringify({ current_project: 'myapp' }),
       'STATE.md': '# State',
       'ROADMAP.md': '# Roadmap\n\n## Phases\n\n- [ ] **Phase 3: Auth** - Auth\n',
       'REQUIREMENTS.md': '# Requirements',
@@ -1157,7 +1177,7 @@ describe('branch_name with {project} resolution', () => {
     });
     try {
       const result = runInit(fixture.cwd, 'execute-phase 3');
-      assert.equal(result.branch_name, 'dgs/myapp/phase-03-auth');
+      assert.equal(result.branch_name, 'dgs/myapp/v1.0-milestone');
     } finally {
       fixture.cleanup();
     }
@@ -1165,7 +1185,7 @@ describe('branch_name with {project} resolution', () => {
 
   it('v2 execute-phase branch_name resolves {project} from current_project', () => {
     const fixture = createFixture({
-      'config.json': JSON.stringify({ current_project: 'checkout', git: { branching_strategy: 'phase' } }),
+      'config.json': JSON.stringify({ current_project: 'checkout' }),
       'PROJECTS.md': '# Projects\n\n| Project | Status |\n|---------|--------|\n| checkout | Active |\n',
       'REPOS.md': '# Repos\n\n| Name | Path |\n|------|------|\n',
       'projects/checkout/STATE.md': '# State',
@@ -1176,13 +1196,13 @@ describe('branch_name with {project} resolution', () => {
     });
     try {
       const result = runInit(fixture.cwd, 'execute-phase 1');
-      assert.equal(result.branch_name, 'dgs/checkout/phase-01-init');
+      assert.equal(result.branch_name, 'dgs/checkout/v1.0-milestone');
     } finally {
       fixture.cleanup();
     }
   });
 
-  it('branch_name with custom template without {project} is unchanged', () => {
+  it('branch_name always uses milestone template regardless of config', () => {
     const fixture = createFixture({
       'config.json': JSON.stringify({
         current_project: 'myapp',
@@ -1196,7 +1216,7 @@ describe('branch_name with {project} resolution', () => {
     });
     try {
       const result = runInit(fixture.cwd, 'execute-phase 3');
-      assert.equal(result.branch_name, 'feature/phase-03-auth');
+      assert.equal(result.branch_name, 'dgs/myapp/v1.0-milestone');
     } finally {
       fixture.cleanup();
     }
@@ -1521,3 +1541,600 @@ describe('archived milestone phase rejection', () => {
     assert.ok(result.phase_dir);
   });
 });
+
+// ─── cmdInitQuick quick_dir resolution ──────────────────────────────────────
+
+describe('cmdInitQuick quick_dir resolution', () => {
+  describe('product mode (no active milestone)', () => {
+    let fixture;
+
+    beforeEach(() => {
+      fixture = v2FixtureWithProject();
+    });
+
+    afterEach(() => {
+      fixture.cleanup();
+    });
+
+    it('init quick uses product-root quick_dir in product mode (no active milestone)', () => {
+      const result = runInit(fixture.cwd, 'quick "test task"');
+      assert.equal(result.quick_dir, 'quick');
+    });
+
+    it('task_dir follows quick_dir in product mode', () => {
+      const result = runInit(fixture.cwd, 'quick "test task"');
+      assert.ok(result.task_dir, 'task_dir should be set');
+      assert.ok(result.task_dir.startsWith('quick/'), 'task_dir should start with quick/');
+    });
+
+    it('state_path resolves to product-root in product mode', () => {
+      const result = runInit(fixture.cwd, 'quick "test task"');
+      assert.equal(result.state_path, 'STATE.md');
+    });
+
+    it('roadmap_exists remains project-scoped in product mode', () => {
+      const result = runInit(fixture.cwd, 'quick "test task"');
+      assert.equal(result.roadmap_exists, true);
+    });
+
+    it('creates planning-root STATE.md on demand when missing', () => {
+      // Remove the planning-root STATE.md if present (fixture has a project STATE.md but not a product one)
+      const productStatePath = path.join(fixture.cwd, 'STATE.md');
+      if (fs.existsSync(productStatePath)) {
+        fs.unlinkSync(productStatePath);
+      }
+      assert.equal(fs.existsSync(productStatePath), false, 'precondition: product STATE.md absent');
+
+      runInit(fixture.cwd, 'quick "test task"');
+
+      assert.equal(fs.existsSync(productStatePath), true, 'product STATE.md should be auto-created');
+      const contents = fs.readFileSync(productStatePath, 'utf-8');
+      assert.match(contents, /### Blockers\/Concerns/, 'skeleton should contain Blockers/Concerns anchor');
+    });
+  });
+
+  describe('milestone-context mode (active milestone)', () => {
+    let fixture;
+
+    beforeEach(() => {
+      fixture = createFixture({
+        'config.json': JSON.stringify({ current_project: 'test-project' }),
+        'config.local.json': JSON.stringify({
+          execution: { active_context: 'v19-git-worktrees' },
+          projects: {
+            'test-project': {
+              worktrees: {
+                'v19-git-worktrees': { type: 'milestone' }
+              }
+            }
+          }
+        }),
+        'PROJECTS.md': '# Projects\n\n| Project | Status |\n|---------|--------|\n| test-project | Active |\n',
+        'REPOS.md': '# Repos\n\n| Name | Path |\n|------|------|\n',
+        'projects/test-project/STATE.md': '# State',
+        'projects/test-project/ROADMAP.md': '# Roadmap\n\n## Phases\n\n- [ ] **Phase 1: Test Phase** - A test\n',
+        'projects/test-project/REQUIREMENTS.md': '# Requirements',
+        'projects/test-project/PROJECT.md': '# Project',
+        'projects/test-project/phases/01-test-phase/01-CONTEXT.md': '# Context',
+        'projects/test-project/phases/01-test-phase/01-01-PLAN.md': '---\nphase: 01-test-phase\nplan: 01\n---\n# Plan',
+      });
+    });
+
+    afterEach(() => {
+      fixture.cleanup();
+    });
+
+    it('init quick uses project quick_dir when in milestone context', () => {
+      const result = runInit(fixture.cwd, 'quick "test task"');
+      assert.equal(result.quick_dir, 'projects/test-project/quick');
+    });
+
+    it('state_path remains project-scoped in milestone-context mode', () => {
+      const result = runInit(fixture.cwd, 'quick "test task"');
+      assert.equal(result.state_path, 'projects/test-project/STATE.md');
+    });
+  });
+
+  describe('--main flag override', () => {
+    let fixture;
+
+    beforeEach(() => {
+      fixture = createFixture({
+        'config.json': JSON.stringify({ current_project: 'test-project' }),
+        'config.local.json': JSON.stringify({
+          execution: { active_context: 'v19-git-worktrees' },
+          projects: {
+            'test-project': {
+              worktrees: {
+                'v19-git-worktrees': { type: 'milestone' }
+              }
+            }
+          }
+        }),
+        'PROJECTS.md': '# Projects\n\n| Project | Status |\n|---------|--------|\n| test-project | Active |\n',
+        'REPOS.md': '# Repos\n\n| Name | Path |\n|------|------|\n',
+        'projects/test-project/STATE.md': '# State',
+        'projects/test-project/ROADMAP.md': '# Roadmap\n\n## Phases\n\n- [ ] **Phase 1: Test Phase** - A test\n',
+        'projects/test-project/REQUIREMENTS.md': '# Requirements',
+        'projects/test-project/PROJECT.md': '# Project',
+        'projects/test-project/phases/01-test-phase/01-CONTEXT.md': '# Context',
+        'projects/test-project/phases/01-test-phase/01-01-PLAN.md': '---\nphase: 01-test-phase\nplan: 01\n---\n# Plan',
+      });
+    });
+
+    afterEach(() => {
+      fixture.cleanup();
+    });
+
+    it('init quick --main forces product-level quick_dir even with active milestone', () => {
+      const result = runInit(fixture.cwd, 'quick --main "test task"');
+      assert.equal(result.quick_dir, 'quick');
+    });
+
+    it('init quick --main forces product-level state_path even with active milestone', () => {
+      const result = runInit(fixture.cwd, 'quick --main "test task"');
+      assert.equal(result.state_path, 'STATE.md');
+    });
+
+    it('init quick --main strips flag from description', () => {
+      const result = runInit(fixture.cwd, 'quick --main "test task"');
+      assert.equal(result.description, 'test task');
+    });
+  });
+
+  describe('product mode with active quick worktree (parity)', () => {
+    let fixture;
+
+    beforeEach(() => {
+      // Hand-rolled fixture (not v2FixtureWithProject) so we can seed
+      // config.local.json with an active quick worktree whose slug has
+      // already been truncated by worktrees.cjs::_sanitizeSlug to 50 chars.
+      fixture = createFixture({
+        'config.json': JSON.stringify({ current_project: 'test-project' }),
+        'PROJECTS.md': '# Projects\n\n| Project | Status |\n|---------|--------|\n| test-project | Active |\n',
+        'REPOS.md': '# Repos\n\n| Name | Path |\n|------|------|\n',
+        'projects/test-project/PROJECT.md': '# Project',
+        'projects/test-project/STATE.md': '# State',
+        'projects/test-project/ROADMAP.md': '# Roadmap\n\n## Phases\n\n- [ ] **Phase 1: Test Phase** - A test\n',
+        'projects/test-project/REQUIREMENTS.md': '# Requirements',
+      });
+      // Seed the active quick worktree AFTER createFixture so we can point
+      // entry.repos at fixture.cwd (which is a real on-disk tmp dir).
+      // Slug is the SHORT (50-char) form that worktrees.cjs would produce.
+      const shortSlug = '260428-k7f-this-is-a-very-long-description-that-w';
+      const localConfig = {
+        execution: { active_context: shortSlug },
+        projects: {
+          'test-project': {
+            worktrees: {
+              [shortSlug]: {
+                type: 'quick',
+                repos: { 'deliver-great-systems': fixture.cwd },
+              },
+            },
+          },
+        },
+      };
+      fs.writeFileSync(path.join(fixture.cwd, 'config.local.json'),
+        JSON.stringify(localConfig), 'utf-8');
+    });
+
+    afterEach(() => {
+      fixture.cleanup();
+    });
+
+    it('task_dir basename matches active worktree slug (parity with getActiveQuick)', () => {
+      // Description deliberately long enough that init.cjs's own 40-char
+      // sanitiser would produce a descSlug differing from the worktree's
+      // 39-char descSlug by exactly one char (pre-fix). Post-fix, init
+      // defers to the worktree slug, so the two align.
+      const result = runInit(fixture.cwd,
+        'quick "this is a very long description that would otherwise"');
+
+      assert.ok(result.task_dir, 'task_dir should be set');
+      assert.equal(
+        path.basename(result.task_dir),
+        '260428-k7f-this-is-a-very-long-description-that-w',
+        'task_dir basename must equal active worktree slug (no second sanitiser pass)'
+      );
+      assert.equal(
+        result.slug,
+        'this-is-a-very-long-description-that-w',
+        'slug must be derived from worktree slug (39 chars), not recomputed from description (40 chars)'
+      );
+      assert.equal(result.quick_id, '260428-k7f',
+        'quick_id should still be extracted from worktree slug prefix (regression guard)');
+    });
+  });
+});
+
+// ─── init progress-all ───────────────────────────────────────────────────────
+
+describe('init progress-all: v2 fixture with 1 active project', () => {
+  let fixture;
+  let result;
+
+  beforeEach(() => {
+    fixture = createFixture({
+      'config.json': JSON.stringify({ current_project: 'alpha' }),
+      'PROJECTS.md': '# Projects\n\n| Project | Status |\n|---------|--------|\n| alpha | Active |\n',
+      'REPOS.md': '# Repos\n\n| Name | Path |\n|------|------|\n',
+      'projects/alpha/STATE.md': '# Project State\n\nPhase: 3\nStatus: In progress\nProgress: [####------] 40%\n',
+      'projects/alpha/ROADMAP.md': '# Roadmap\n\n- 🚧 **v2.0 Auth** — Phases 1-5 (in progress)\n',
+      'projects/alpha/PROJECT.md': '# Project',
+    });
+    result = runInit(fixture.cwd, 'progress-all --raw');
+  });
+
+  afterEach(() => {
+    fixture.cleanup();
+  });
+
+  it('returns valid JSON with product and projects keys', () => {
+    assert.ok(result.product, 'result.product must exist');
+    assert.ok(Array.isArray(result.projects), 'result.projects must be an array');
+  });
+
+  it('product has active_count, completed_count, and backlog', () => {
+    assert.equal(typeof result.product.active_count, 'number');
+    assert.equal(typeof result.product.completed_count, 'number');
+    assert.ok(result.product.backlog, 'product.backlog must exist');
+  });
+
+  it('product.backlog has all four int fields (todos, ideas, specs, debug_active)', () => {
+    assert.equal(typeof result.product.backlog.todos, 'number');
+    assert.equal(typeof result.product.backlog.ideas, 'number');
+    assert.equal(typeof result.product.backlog.specs, 'number');
+    assert.equal(typeof result.product.backlog.debug_active, 'number');
+  });
+
+  it('product.backlog counts are all zero on empty fixture', () => {
+    assert.equal(result.product.backlog.todos, 0);
+    assert.equal(result.product.backlog.ideas, 0);
+    assert.equal(result.product.backlog.specs, 0);
+    assert.equal(result.product.backlog.debug_active, 0);
+  });
+
+  it('product.quick_tasks_recent is [] when product-level STATE.md has no Quick Tasks table', () => {
+    assert.deepEqual(result.product.quick_tasks_recent, []);
+  });
+
+  it('product.shipped_milestones_recent is [] when product-level MILESTONES.md is missing', () => {
+    assert.deepEqual(result.product.shipped_milestones_recent, []);
+  });
+
+  it('projects array has 1 active project', () => {
+    assert.equal(result.projects.length, 1);
+    assert.equal(result.projects[0].name, 'alpha');
+  });
+
+  it('project entry has expected fields', () => {
+    const p = result.projects[0];
+    assert.equal(typeof p.name, 'string');
+    assert.equal(typeof p.status, 'string');
+    assert.equal(typeof p.current_phase, 'string');
+    assert.equal(typeof p.progress, 'number');
+    assert.equal(typeof p.repos_touched, 'string');
+    assert.ok('milestone_version' in p);
+    assert.ok('milestone_name' in p);
+  });
+
+  it('project milestone_version is parsed from ROADMAP.md', () => {
+    assert.equal(result.projects[0].milestone_version, 'v2.0');
+    assert.equal(result.projects[0].milestone_name, 'Auth');
+  });
+
+  it('returns top-level auth, dgs_mode, planner_model, executor_model', () => {
+    assert.ok('author' in result);
+    assert.equal(typeof result.dgs_mode, 'string');
+    assert.ok('planner_model' in result);
+    assert.ok('executor_model' in result);
+  });
+});
+
+describe('init progress-all: excludes completed projects', () => {
+  let fixture;
+  let result;
+
+  beforeEach(() => {
+    fixture = createFixture({
+      'config.json': JSON.stringify({}),
+      'PROJECTS.md': '# Projects\n',
+      'REPOS.md': '# Repos\n',
+      'projects/active-x/PROJECT.md': '# Project\n',
+      'projects/active-x/STATE.md': '# Project State\n\nPhase: 1\nStatus: In progress\nProgress: [#---------] 10%\n',
+      'projects/done-y/PROJECT.md': '# Project\n',
+      'projects/done-y/STATE.md': '# Project State\n\nPhase: 5\nStatus: completed\nProgress: [##########] 100%\nCompleted: 2026-01-20\n',
+    });
+    result = runInit(fixture.cwd, 'progress-all --raw');
+  });
+
+  afterEach(() => {
+    fixture.cleanup();
+  });
+
+  it('projects array excludes completed projects', () => {
+    assert.equal(result.projects.length, 1);
+    assert.equal(result.projects[0].name, 'active-x');
+  });
+
+  it('product.active_count and completed_count reflect the split', () => {
+    assert.equal(result.product.active_count, 1);
+    assert.equal(result.product.completed_count, 1);
+  });
+});
+
+describe('init progress-all: empty projects dir', () => {
+  let fixture;
+  let result;
+
+  beforeEach(() => {
+    fixture = createFixture({
+      'config.json': JSON.stringify({}),
+      'PROJECTS.md': '# Projects\n',
+      'REPOS.md': '# Repos\n',
+    });
+    result = runInit(fixture.cwd, 'progress-all --raw');
+  });
+
+  afterEach(() => {
+    fixture.cleanup();
+  });
+
+  it('projects is [] and active_count is 0', () => {
+    assert.deepEqual(result.projects, []);
+    assert.equal(result.product.active_count, 0);
+  });
+});
+
+describe('init progress-all: parses product-level STATE.md quick tasks', () => {
+  let fixture;
+  let result;
+
+  beforeEach(() => {
+    const productState = `# Project State
+
+## Accumulated Context
+
+### Quick Tasks Completed
+
+| # | Description | Date | Commit | Status | Directory |
+|---|-------------|------|--------|--------|-----------|
+| 260405-laf | Route product quick tasks | 2026-04-05 | 368074f | Verified | [260405-laf](./quick/260405-laf/) |
+| 260405-lvk | Strip trailing hyphen | 2026-04-05 | 536382a |  | fast |
+| 260405-mbu | Make fast context-aware | 2026-04-05 | d79ffbc | Verified | [260405-mbu](./quick/260405-mbu/) |
+`;
+    fixture = createFixture({
+      'config.json': JSON.stringify({}),
+      'PROJECTS.md': '# Projects\n',
+      'REPOS.md': '# Repos\n',
+      'STATE.md': productState,
+      'projects/alpha/STATE.md': '# Project State\n\nPhase: 1\nStatus: In progress\n',
+    });
+    result = runInit(fixture.cwd, 'progress-all --raw');
+  });
+
+  afterEach(() => {
+    fixture.cleanup();
+  });
+
+  it('parses quick_tasks_recent with 3 entries', () => {
+    assert.equal(result.product.quick_tasks_recent.length, 3);
+  });
+
+  it('quick task entries have id, description, date, commit fields', () => {
+    const q = result.product.quick_tasks_recent[0];
+    assert.ok(q.id);
+    assert.ok(q.description);
+    assert.ok(q.date);
+    assert.ok(q.commit);
+  });
+});
+
+describe('init progress-all: parses product-level MILESTONES.md shipped milestones', () => {
+  let fixture;
+  let result;
+
+  beforeEach(() => {
+    const milestones = `# Milestones
+
+## v19.0 Git Worktrees (Shipped: 2026-03-27)
+
+Some content.
+
+## v18.0 Root Layout (Shipped: 2026-03-25)
+
+Some content.
+
+## v1.0 Multi-Project Platform (Shipped: 2026-02-24)
+
+Some content.
+`;
+    fixture = createFixture({
+      'config.json': JSON.stringify({}),
+      'PROJECTS.md': '# Projects\n',
+      'REPOS.md': '# Repos\n',
+      'MILESTONES.md': milestones,
+      'projects/alpha/STATE.md': '# Project State\n\nPhase: 1\nStatus: In progress\n',
+    });
+    result = runInit(fixture.cwd, 'progress-all --raw');
+  });
+
+  afterEach(() => {
+    fixture.cleanup();
+  });
+
+  it('parses shipped_milestones_recent with 3 entries', () => {
+    assert.equal(result.product.shipped_milestones_recent.length, 3);
+  });
+
+  it('shipped milestone entries have version, name, shipped_date fields', () => {
+    const m = result.product.shipped_milestones_recent[0];
+    assert.equal(m.version, 'v19.0');
+    assert.equal(m.name, 'Git Worktrees');
+    assert.equal(m.shipped_date, '2026-03-27');
+  });
+});
+
+describe('init progress-all: counts backlog files', () => {
+  let fixture;
+  let result;
+
+  beforeEach(() => {
+    fixture = createFixture({
+      'config.json': JSON.stringify({}),
+      'PROJECTS.md': '# Projects\n',
+      'REPOS.md': '# Repos\n',
+      'todos/todo-1.md': '---\nstatus: pending\n---\n# todo 1',
+      'todos/todo-2.md': '---\nstatus: pending\n---\n# todo 2',
+      'ideas/idea-1.md': '---\nstatus: pending\n---\n# idea 1',
+      'specs/spec-1.md': '# spec 1',
+      'specs/spec-2.md': '# spec 2',
+      'specs/spec-3.md': '# spec 3',
+      'debug/active-session.md': '# debug',
+      'debug/session-resolved.md': '# resolved',
+      'projects/alpha/STATE.md': '# Project State\n\nPhase: 1\nStatus: In progress\n',
+    });
+    result = runInit(fixture.cwd, 'progress-all --raw');
+  });
+
+  afterEach(() => {
+    fixture.cleanup();
+  });
+
+  it('counts todos in todos/pending/', () => {
+    assert.equal(result.product.backlog.todos, 2);
+  });
+
+  it('counts ideas in ideas/pending/', () => {
+    assert.equal(result.product.backlog.ideas, 1);
+  });
+
+  it('counts specs in specs/ (top-level only)', () => {
+    assert.equal(result.product.backlog.specs, 3);
+  });
+
+  it('counts debug files excluding those with "resolved" in name', () => {
+    assert.equal(result.product.backlog.debug_active, 1);
+  });
+});
+
+// ─── v2 mode multi-project: init new-project <slug> ──────────────────────────
+
+describe('v2 mode multi-project: init new-project <slug>', () => {
+  it('returns project_exists false for a new, non-existing slug', () => {
+    const fixture = v2FixtureMultiProject();
+    try {
+      const result = runInit(fixture.cwd, 'new-project second-project');
+      assert.equal(result.project_exists, false);
+    } finally {
+      fixture.cleanup();
+    }
+  });
+
+  it('returns project_path under the requested slug, not current_project', () => {
+    const fixture = v2FixtureMultiProject();
+    try {
+      const result = runInit(fixture.cwd, 'new-project second-project');
+      assert.equal(result.project_path, path.join('projects', 'second-project', 'PROJECT.md'));
+    } finally {
+      fixture.cleanup();
+    }
+  });
+
+  it('returns state/roadmap/requirements/research paths under the requested slug', () => {
+    const fixture = v2FixtureMultiProject();
+    try {
+      const result = runInit(fixture.cwd, 'new-project second-project');
+      assert.equal(result.state_path, path.join('projects', 'second-project', 'STATE.md'));
+      assert.equal(result.roadmap_path, path.join('projects', 'second-project', 'ROADMAP.md'));
+      assert.equal(result.requirements_path, path.join('projects', 'second-project', 'REQUIREMENTS.md'));
+      assert.equal(result.research_dir, path.join('projects', 'second-project', 'research'));
+    } finally {
+      fixture.cleanup();
+    }
+  });
+
+  it('returns project_exists true when the slug DOES already exist', () => {
+    const fixture = v2FixtureWithProject();
+    try {
+      const result = runInit(fixture.cwd, 'new-project test-project');
+      assert.equal(result.project_exists, true);
+      assert.equal(result.project_path, path.join('projects', 'test-project', 'PROJECT.md'));
+    } finally {
+      fixture.cleanup();
+    }
+  });
+
+  it('normalizes the slug consistently with generateSlugInternal', () => {
+    // Lock in the contract that the resolver and `projects create` use the same normalizer.
+    const { generateSlugInternal } = require('./core.cjs');
+    assert.equal(generateSlugInternal('Second Project'), 'second-project');
+  });
+
+  it('exposes requested_slug on the result object', () => {
+    const fixture = v2FixtureMultiProject();
+    try {
+      const result = runInit(fixture.cwd, 'new-project second-project');
+      assert.equal(result.requested_slug, 'second-project');
+      // current_project should still report the active project.
+      assert.equal(result.current_project, 'test-project');
+    } finally {
+      fixture.cleanup();
+    }
+  });
+
+  // Regression: backwards-compatible no-slug behaviour
+  it('v2 with current_project but no slug arg: behaviour unchanged', () => {
+    const fixture = v2FixtureWithProject();
+    try {
+      const result = runInit(fixture.cwd, 'new-project');
+      assert.equal(result.project_path, path.join('projects', 'test-project', 'PROJECT.md'));
+      assert.equal(result.project_exists, true);
+    } finally {
+      fixture.cleanup();
+    }
+  });
+
+  it('v1 mode with no slug arg: behaviour unchanged', () => {
+    const fixture = v1Fixture();
+    try {
+      const result = runInit(fixture.cwd, 'new-project');
+      assert.equal(result.project_path, 'PROJECT.md');
+    } finally {
+      fixture.cleanup();
+    }
+  });
+});
+
+// ─── v2 mode multi-project: end-to-end ───────────────────────────────────────
+
+describe('v2 mode multi-project: end-to-end', () => {
+  it('init new-project <slug> agrees with projects create on the target directory', () => {
+    const fixture = v2FixtureMultiProject();
+    try {
+      // Step 1: init new-project resolves paths under projects/second-project/
+      const initResult = runInit(fixture.cwd, 'new-project second-project');
+      assert.equal(initResult.project_exists, false);
+      assert.equal(initResult.project_path, path.join('projects', 'second-project', 'PROJECT.md'));
+      assert.equal(initResult.requested_slug, 'second-project');
+      // current_project is still the active project — workflow uses requested_slug or
+      // project_path, not current_project, when creating.
+      assert.equal(initResult.current_project, 'test-project');
+
+      // Step 2: projects create creates the same folder init pointed at.
+      execSync(`node "${CLI}" projects create "Second Project"`, {
+        cwd: fixture.cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'],
+      });
+      const createdDir = path.join(fixture.cwd, 'projects', 'second-project');
+      assert.ok(fs.existsSync(createdDir), 'projects create should create projects/second-project/');
+      assert.ok(fs.existsSync(path.join(createdDir, 'PROJECT.md')), 'PROJECT.md should exist in created folder');
+
+      // Step 3: re-running init new-project for the same slug now reports it exists.
+      const reinit = runInit(fixture.cwd, 'new-project second-project');
+      assert.equal(reinit.project_exists, true);
+    } finally {
+      fixture.cleanup();
+    }
+  });
+});