@ktpartners/dgs-platform 2.7.4 → 2.8.0

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

@@ -8,7 +8,8 @@ const assert = require('node:assert');
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
-const { createTempDir, cleanupDir, createTempProject } = require('./test-helpers.cjs');
+const { createTempDir, cleanupDir, createTempProject, initGitRepo } = require('./test-helpers.cjs');
+const { resetPaths } = require('./paths.cjs');
 const { findIdeaFile, parseIdeaFrontmatter, ensureIdeasDirs, cmdIdeasCreate, loadManifest, IDEA_STATES, buildIdeaContent, cmdIdeasConsolidate, cmdIdeasFindRelated, cmdIdeasUndoConsolidation } = require('./ideas.cjs');
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────
@@ -26,7 +27,7 @@ function createIdeaInState(cwd, state, id, title) {
   const paddedId = String(id).padStart(3, '0');
   const filename = `${paddedId}-${slug}.md`;
   const content = `---\nid: ${id}\ntitle: "${title}"\n---\n\nIdea body.\n`;
-  const dir = path.join(cwd, '.planning', 'ideas', state);
+  const dir = path.join(cwd, 'ideas', state);
   fs.mkdirSync(dir, { recursive: true });
   fs.writeFileSync(path.join(dir, filename), content, 'utf-8');
   return filename;
@@ -38,11 +39,11 @@ describe('findIdeaFile state detection', () => {
   let tmpDir;
 
   beforeEach(() => {
-    tmpDir = createTempDir('ideas-test-');
+    tmpDir = createTempDir('ideas-test-'); tmpDir = fs.realpathSync(tmpDir); initGitRepo(tmpDir);
     ensureIdeasDirs(tmpDir);
   });
 
-  afterEach(() => cleanupDir(tmpDir));
+  afterEach(() => { resetPaths(); cleanupDir(tmpDir); });
 
   it('returns state "pending" for idea in pending directory', () => {
     createIdeaInState(tmpDir, 'pending', 1, 'Test Pending');
@@ -95,11 +96,11 @@ describe('consolidated state', () => {
   let tmpDir;
 
   beforeEach(() => {
-    tmpDir = createTempDir('ideas-consolidated-test-');
+    tmpDir = createTempDir('ideas-consolidated-test-'); tmpDir = fs.realpathSync(tmpDir); initGitRepo(tmpDir);
     ensureIdeasDirs(tmpDir);
   });
 
-  afterEach(() => cleanupDir(tmpDir));
+  afterEach(() => { resetPaths(); cleanupDir(tmpDir); });
 
   it('IDEA_STATES includes consolidated', () => {
     assert.ok(IDEA_STATES.includes('consolidated'), 'IDEA_STATES should include "consolidated"');
@@ -107,7 +108,7 @@ describe('consolidated state', () => {
   });
 
   it('ensureIdeasDirs creates consolidated/ directory', () => {
-    const consolidatedDir = path.join(tmpDir, '.planning', 'ideas', 'consolidated');
+    const consolidatedDir = path.join(tmpDir, 'ideas', 'consolidated');
     assert.ok(fs.existsSync(consolidatedDir), 'consolidated/ directory should exist');
   });
 
@@ -477,11 +478,11 @@ describe('cmdIdeasReject guard messages', () => {
   let tmpDir;
 
   beforeEach(() => {
-    tmpDir = createTempDir('ideas-reject-test-');
+    tmpDir = createTempDir('ideas-reject-test-'); tmpDir = fs.realpathSync(tmpDir); initGitRepo(tmpDir);
     ensureIdeasDirs(tmpDir);
   });
 
-  afterEach(() => cleanupDir(tmpDir));
+  afterEach(() => { resetPaths(); cleanupDir(tmpDir); });
 
   it('errors with "already rejected" when rejecting a rejected idea', () => {
     createIdeaInState(tmpDir, 'rejected', 1, 'Already Rejected');
@@ -543,8 +544,8 @@ describe('ideas root layout', () => {
   let fixture;
   afterEach(() => { if (fixture) fixture.cleanup(); });
 
-  it('ensureIdeasDirs creates directories at root (not under .planning/)', () => {
-    fixture = createTempProject({ layout: 'root' });
+  it('ensureIdeasDirs creates directories at root (at root)', () => {
+    fixture = createTempProject();
     ensureIdeasDirs(fixture.cwd);
     assert.ok(fs.existsSync(path.join(fixture.cwd, 'ideas', 'pending')),
       'ideas/pending should exist at root');
@@ -554,12 +555,12 @@ describe('ideas root layout', () => {
       'ideas/rejected should exist at root');
     assert.ok(fs.existsSync(path.join(fixture.cwd, 'ideas', 'consolidated')),
       'ideas/consolidated should exist at root');
-    assert.ok(!fs.existsSync(path.join(fixture.cwd, '.planning', 'ideas')),
-      '.planning/ideas should NOT exist in root layout');
+    assert.ok(!fs.existsSync(path.join(fixture.cwd, 'ideas')),
+      'ideas should NOT exist in root layout');
   });
 
   it('findIdeaFile resolves ideas at root in root layout', () => {
-    fixture = createTempProject({ layout: 'root' });
+    fixture = createTempProject();
     // Create an idea directly at root/ideas/pending/
     const ideasDir = path.join(fixture.cwd, 'ideas', 'pending');
     fs.mkdirSync(ideasDir, { recursive: true });
@@ -573,7 +574,7 @@ describe('ideas root layout', () => {
   });
 
   it('loadManifest reads from root/ideas/manifest.json in root layout', () => {
-    fixture = createTempProject({ layout: 'root' });
+    fixture = createTempProject();
     const ideasDir = path.join(fixture.cwd, 'ideas');
     fs.mkdirSync(ideasDir, { recursive: true });
     fs.writeFileSync(path.join(ideasDir, 'manifest.json'), '{"next_id": 5}\n', 'utf-8');
@@ -598,11 +599,11 @@ describe('cmdIdeasConsolidate', () => {
     const now = new Date().toISOString();
     const tagsStr = tags.length > 0 ? `[${tags.map(t => `"${t}"`).join(', ')}]` : '[]';
     const content = `---\nid: ${id}\ntitle: "${title}"\ntags: ${tagsStr}\ncreated: ${now}\nupdated: ${now}\n---\n\n${title} body.\n`;
-    const dir2 = path.join(dir, '.planning', 'ideas', 'pending');
+    const dir2 = path.join(dir, 'ideas', 'pending');
     fs.mkdirSync(dir2, { recursive: true });
     fs.writeFileSync(path.join(dir2, filename), content, 'utf-8');
     // Update manifest so allocateId returns next ID correctly
-    const manifestDir = path.join(dir, '.planning', 'ideas');
+    const manifestDir = path.join(dir, 'ideas');
     const manifestPath = path.join(manifestDir, 'manifest.json');
     let manifest;
     try {
@@ -626,10 +627,10 @@ describe('cmdIdeasConsolidate', () => {
     const filename = `${paddedId}-${slug}.md`;
     const now = new Date().toISOString();
     const content = `---\nid: ${id}\ntitle: "${title}"\ntags: []\ncreated: ${now}\nupdated: ${now}\n---\n\n${title} body.\n`;
-    const stateDir = path.join(dir, '.planning', 'ideas', state);
+    const stateDir = path.join(dir, 'ideas', state);
     fs.mkdirSync(stateDir, { recursive: true });
     fs.writeFileSync(path.join(stateDir, filename), content, 'utf-8');
-    const manifestDir = path.join(dir, '.planning', 'ideas');
+    const manifestDir = path.join(dir, 'ideas');
     const manifestPath = path.join(manifestDir, 'manifest.json');
     let manifest;
     try {
@@ -652,7 +653,7 @@ describe('cmdIdeasConsolidate', () => {
     execSync('git config user.email "test@test.com"', { cwd: dir, stdio: 'pipe' });
     execSync('git config user.name "Test"', { cwd: dir, stdio: 'pipe' });
     for (const state of ['pending', 'done', 'rejected', 'consolidated']) {
-      const stateDir = path.join(dir, '.planning', 'ideas', state);
+      const stateDir = path.join(dir, 'ideas', state);
       fs.mkdirSync(stateDir, { recursive: true });
       fs.writeFileSync(path.join(stateDir, '.gitkeep'), '', 'utf-8');
     }
@@ -660,10 +661,10 @@ describe('cmdIdeasConsolidate', () => {
   }
 
   beforeEach(() => {
-    tmpDir = createTempDir('ideas-consolidate-test-');
+    tmpDir = createTempDir('ideas-consolidate-test-'); tmpDir = fs.realpathSync(tmpDir); initGitRepo(tmpDir);
   });
 
-  afterEach(() => cleanupDir(tmpDir));
+  afterEach(() => { resetPaths(); cleanupDir(tmpDir); });
 
   it('consolidates 2 pending ideas into new idea', () => {
     initLocalGitRepo(tmpDir);
@@ -686,8 +687,8 @@ describe('cmdIdeasConsolidate', () => {
     assert.strictEqual(json.moved_files.length, 2);
 
     // Source ideas moved to consolidated/
-    const consolidatedDir = path.join(tmpDir, '.planning', 'ideas', 'consolidated');
-    const pendingDir = path.join(tmpDir, '.planning', 'ideas', 'pending');
+    const consolidatedDir = path.join(tmpDir, 'ideas', 'consolidated');
+    const pendingDir = path.join(tmpDir, 'ideas', 'pending');
     const consolidatedFiles = fs.readdirSync(consolidatedDir).filter(f => f.endsWith('.md'));
     assert.strictEqual(consolidatedFiles.length, 2);
 
@@ -795,7 +796,7 @@ describe('cmdIdeasConsolidate', () => {
     const json = JSON.parse(result);
 
     // Read the new idea file to check tags
-    const newIdeaPath = path.join(tmpDir, '.planning', 'ideas', 'pending', json.filename);
+    const newIdeaPath = path.join(tmpDir, 'ideas', 'pending', json.filename);
     const content = fs.readFileSync(newIdeaPath, 'utf-8');
     const parsed = parseIdeaFrontmatter(content);
     const tags = parsed.frontmatter.tags;
@@ -843,7 +844,7 @@ describe('cmdIdeasConsolidate', () => {
     );
     const json = JSON.parse(result);
 
-    const newIdeaPath = path.join(tmpDir, '.planning', 'ideas', 'pending', json.filename);
+    const newIdeaPath = path.join(tmpDir, 'ideas', 'pending', json.filename);
     const content = fs.readFileSync(newIdeaPath, 'utf-8');
     assert.ok(content.includes('## Discussion Log'), 'should have Discussion Log section');
     assert.ok(content.includes('## Research Log'), 'should have Research Log section');
@@ -862,7 +863,7 @@ describe('cmdIdeasConsolidate', () => {
     );
 
     // Check sources in consolidated/ have consolidation notes
-    const consolidatedDir = path.join(tmpDir, '.planning', 'ideas', 'consolidated');
+    const consolidatedDir = path.join(tmpDir, 'ideas', 'consolidated');
     const files = fs.readdirSync(consolidatedDir).filter(f => f.endsWith('.md'));
     for (const f of files) {
       const content = fs.readFileSync(path.join(consolidatedDir, f), 'utf-8');
@@ -924,7 +925,7 @@ describe('cmdIdeasConsolidate', () => {
     assert.strictEqual(json.moved_files.length, 3);
 
     // Check tags on new idea
-    const newIdeaPath = path.join(tmpDir, '.planning', 'ideas', 'pending', json.filename);
+    const newIdeaPath = path.join(tmpDir, 'ideas', 'pending', json.filename);
     const content = fs.readFileSync(newIdeaPath, 'utf-8');
     const parsed = parseIdeaFrontmatter(content);
     assert.ok(parsed.frontmatter.tags.includes('api'));
@@ -949,11 +950,11 @@ describe('cmdIdeasFindRelated', () => {
     const now = new Date().toISOString();
     const tagsStr = tags.length > 0 ? `[${tags.map(t => `"${t}"`).join(', ')}]` : '[]';
     const content = `---\nid: ${id}\ntitle: "${title}"\ntags: ${tagsStr}\ncreated: ${now}\nupdated: ${now}\n---\n\n${body || title + ' body.'}\n`;
-    const dir2 = path.join(dir, '.planning', 'ideas', 'pending');
+    const dir2 = path.join(dir, 'ideas', 'pending');
     fs.mkdirSync(dir2, { recursive: true });
     fs.writeFileSync(path.join(dir2, filename), content, 'utf-8');
     // Update manifest so allocateId returns next ID correctly
-    const manifestDir = path.join(dir, '.planning', 'ideas');
+    const manifestDir = path.join(dir, 'ideas');
     const manifestPath = path.join(manifestDir, 'manifest.json');
     let manifest;
     try {
@@ -978,10 +979,10 @@ describe('cmdIdeasFindRelated', () => {
     const now = new Date().toISOString();
     const tagsStr = tags.length > 0 ? `[${tags.map(t => `"${t}"`).join(', ')}]` : '[]';
     const content = `---\nid: ${id}\ntitle: "${title}"\ntags: ${tagsStr}\ncreated: ${now}\nupdated: ${now}\n---\n\n${title} body.\n`;
-    const stateDir = path.join(dir, '.planning', 'ideas', state);
+    const stateDir = path.join(dir, 'ideas', state);
     fs.mkdirSync(stateDir, { recursive: true });
     fs.writeFileSync(path.join(stateDir, filename), content, 'utf-8');
-    const manifestDir = path.join(dir, '.planning', 'ideas');
+    const manifestDir = path.join(dir, 'ideas');
     const manifestPath = path.join(manifestDir, 'manifest.json');
     let manifest;
     try {
@@ -1014,11 +1015,11 @@ describe('cmdIdeasFindRelated', () => {
   }
 
   beforeEach(() => {
-    tmpDir = createTempDir('ideas-find-related-test-');
+    tmpDir = createTempDir('ideas-find-related-test-'); tmpDir = fs.realpathSync(tmpDir); initGitRepo(tmpDir);
     ensureIdeasDirs(tmpDir);
   });
 
-  afterEach(() => cleanupDir(tmpDir));
+  afterEach(() => { resetPaths(); cleanupDir(tmpDir); });
 
   it('returns empty results when only the anchor idea exists', () => {
     createPendingIdea(tmpDir, 1, 'Solo idea', ['api', 'reliability']);
@@ -1184,11 +1185,11 @@ describe('cmdIdeasUndoConsolidation', () => {
     const now = new Date().toISOString();
     const tagsStr = tags.length > 0 ? `[${tags.map(t => `"${t}"`).join(', ')}]` : '[]';
     const content = `---\nid: ${id}\ntitle: "${title}"\ntags: ${tagsStr}\ncreated: ${now}\nupdated: ${now}\n---\n\n${title} body.\n`;
-    const dir2 = path.join(dir, '.planning', 'ideas', 'pending');
+    const dir2 = path.join(dir, 'ideas', 'pending');
     fs.mkdirSync(dir2, { recursive: true });
     fs.writeFileSync(path.join(dir2, filename), content, 'utf-8');
     // Update manifest so allocateId returns next ID correctly
-    const manifestDir = path.join(dir, '.planning', 'ideas');
+    const manifestDir = path.join(dir, 'ideas');
     const manifestPath = path.join(manifestDir, 'manifest.json');
     let manifest;
     try {
@@ -1211,7 +1212,7 @@ describe('cmdIdeasUndoConsolidation', () => {
     execSync('git config user.email "test@test.com"', { cwd: dir, stdio: 'pipe' });
     execSync('git config user.name "Test"', { cwd: dir, stdio: 'pipe' });
     for (const state of ['pending', 'done', 'rejected', 'consolidated']) {
-      const stateDir = path.join(dir, '.planning', 'ideas', state);
+      const stateDir = path.join(dir, 'ideas', state);
       fs.mkdirSync(stateDir, { recursive: true });
       fs.writeFileSync(path.join(stateDir, '.gitkeep'), '', 'utf-8');
     }
@@ -1242,10 +1243,10 @@ describe('cmdIdeasUndoConsolidation', () => {
   }
 
   beforeEach(() => {
-    tmpDir = createTempDir('ideas-undo-consolidation-test-');
+    tmpDir = createTempDir('ideas-undo-consolidation-test-'); tmpDir = fs.realpathSync(tmpDir); initGitRepo(tmpDir);
   });
 
-  afterEach(() => cleanupDir(tmpDir));
+  afterEach(() => { resetPaths(); cleanupDir(tmpDir); });
 
   it('undoes consolidation and restores source ideas to pending', () => {
     initLocalGitRepo(tmpDir);
@@ -1260,7 +1261,7 @@ describe('cmdIdeasUndoConsolidation', () => {
     undoViaSubprocess(tmpDir, '3');
 
     // Verify: idea 3 no longer exists in pending/
-    const pendingDir = path.join(tmpDir, '.planning', 'ideas', 'pending');
+    const pendingDir = path.join(tmpDir, 'ideas', 'pending');
     const pendingFiles = fs.readdirSync(pendingDir).filter(f => f.endsWith('.md'));
     assert.ok(!pendingFiles.some(f => f.startsWith('003')), 'Consolidated idea 3 should be deleted from pending');
 
@@ -1269,7 +1270,7 @@ describe('cmdIdeasUndoConsolidation', () => {
     assert.ok(pendingFiles.some(f => f.startsWith('002')), 'Idea 2 should be restored to pending');
 
     // Verify: consolidated/ has no idea files
-    const consolidatedDir = path.join(tmpDir, '.planning', 'ideas', 'consolidated');
+    const consolidatedDir = path.join(tmpDir, 'ideas', 'consolidated');
     const consolidatedFiles = fs.readdirSync(consolidatedDir).filter(f => f.endsWith('.md'));
     assert.strictEqual(consolidatedFiles.length, 0, 'consolidated/ should have no idea files');
   });
@@ -1284,7 +1285,7 @@ describe('cmdIdeasUndoConsolidation', () => {
     undoViaSubprocess(tmpDir, '3');
 
     // Read each restored source idea and check consolidated_into is gone
-    const pendingDir = path.join(tmpDir, '.planning', 'ideas', 'pending');
+    const pendingDir = path.join(tmpDir, 'ideas', 'pending');
     const files = fs.readdirSync(pendingDir).filter(f => f.endsWith('.md'));
     for (const f of files) {
       const content = fs.readFileSync(path.join(pendingDir, f), 'utf-8');
@@ -1304,7 +1305,7 @@ describe('cmdIdeasUndoConsolidation', () => {
     undoViaSubprocess(tmpDir, '3');
 
     // Restored source ideas should NOT have consolidated_from (they never had it)
-    const pendingDir = path.join(tmpDir, '.planning', 'ideas', 'pending');
+    const pendingDir = path.join(tmpDir, 'ideas', 'pending');
     const files = fs.readdirSync(pendingDir).filter(f => f.endsWith('.md'));
     for (const f of files) {
       const content = fs.readFileSync(path.join(pendingDir, f), 'utf-8');
@@ -1401,7 +1402,7 @@ describe('cmdIdeasUndoConsolidation', () => {
     const json = JSON.parse(result);
 
     // All 3 source ideas should be restored to pending
-    const pendingDir = path.join(tmpDir, '.planning', 'ideas', 'pending');
+    const pendingDir = path.join(tmpDir, 'ideas', 'pending');
     const pendingFiles = fs.readdirSync(pendingDir).filter(f => f.endsWith('.md'));
     assert.ok(pendingFiles.some(f => f.startsWith('001')), 'Idea 1 should be restored');
     assert.ok(pendingFiles.some(f => f.startsWith('002')), 'Idea 2 should be restored');

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

@@ -190,7 +190,8 @@ function cmdInitExecutePhase(cwd, phase, raw) {
 
   const config = loadConfig(cwd);
   const ctx = resolveProjectContext(cwd);
-  const phaseInfo = findPhaseInternal(cwd, phase);
+  let phaseInfo = findPhaseInternal(cwd, phase);
+  if (phaseInfo?.archived) phaseInfo = null;
   const milestone = getMilestoneInfo(cwd);
   const planRootRel = path.relative(cwd, getPlanningRoot(cwd)) || '.';
 
@@ -304,7 +305,8 @@ function cmdInitPlanPhase(cwd, phase, raw) {
 
   const config = loadConfig(cwd);
   const ctx = resolveProjectContext(cwd);
-  const phaseInfo = findPhaseInternal(cwd, phase);
+  let phaseInfo = findPhaseInternal(cwd, phase);
+  if (phaseInfo?.archived) phaseInfo = null;
   const planRootRel = path.relative(cwd, getPlanningRoot(cwd)) || '.';
 
   const roadmapPhase = getRoadmapPhaseInternal(cwd, phase);
@@ -651,7 +653,8 @@ function cmdInitVerifyWork(cwd, phase, raw) {
 
   const config = loadConfig(cwd);
   const ctx = resolveProjectContext(cwd);
-  const phaseInfo = findPhaseInternal(cwd, phase);
+  let phaseInfo = findPhaseInternal(cwd, phase);
+  if (phaseInfo?.archived) phaseInfo = null;
 
   const result = {
     // Models
@@ -695,7 +698,8 @@ function cmdInitAuditPhase(cwd, phase, raw) {
 
   const config = loadConfig(cwd);
   const ctx = resolveProjectContext(cwd);
-  const phaseInfo = findPhaseInternal(cwd, phase);
+  let phaseInfo = findPhaseInternal(cwd, phase);
+  if (phaseInfo?.archived) phaseInfo = null;
 
   const result = {
     // Models
@@ -737,6 +741,7 @@ function cmdInitPhaseOp(cwd, phase, raw, workflow) {
   const ctx = resolveProjectContext(cwd);
   const planRootRel = path.relative(cwd, getPlanningRoot(cwd)) || '.';
   let phaseInfo = findPhaseInternal(cwd, phase);
+  if (phaseInfo?.archived) phaseInfo = null;
   const cadence = getCadence(workflow || 'plan-phase');
 
   // Fallback to ROADMAP.md if no directory exists (e.g., Plans: TBD)