@ktpartners/dgs-platform 3.3.0 → 3.4.1

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

@@ -12,6 +12,7 @@ const { parseReposMd, validateReposMdEager } = require('./repos.cjs');
 const { getCadence, pullAll } = require('./sync.cjs');
 const { detectQuickMode, generateQuickId, getActiveQuick } = require('./quick.cjs');
 const { listProjectsReadonly } = require('./projects.cjs');
+const { resolveMilestoneSlug } = require('./worktrees.cjs');
 
 /**
  * Safely resolve the current git author string.
@@ -88,6 +89,54 @@ function applySyncPull(cwd, workflowName, result) {
   result.needs_pull = false;
 }
 
+// ─── Brownfield detection ───────────────────────────────────────────────────
+
+/**
+ * Detect whether the directory tree rooted at cwd contains any source
+ * files in a small set of common languages, ignoring node_modules and .git,
+ * with a maximum recursion depth of 3 (cwd itself is depth 0).
+ *
+ * Returns true on first match (early termination).
+ * Returns false on any error (e.g. permission denied on top-level dir).
+ *
+ * Pure Node — replaces the prior `find ... | grep ... | head -5` shell
+ * pipeline that does not exist on Windows.
+ *
+ * @param {string} cwd - Directory to scan.
+ * @returns {boolean}
+ */
+function hasCodeFiles(cwd) {
+  const CODE_EXTENSIONS = new Set(['.ts', '.js', '.py', '.go', '.rs', '.swift', '.java']);
+  const SKIP_DIRS = new Set(['node_modules', '.git']);
+  const MAX_DEPTH = 3;
+
+  function walk(dir, depth) {
+    if (depth > MAX_DEPTH) return false;
+    let entries;
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return false;
+    }
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        if (SKIP_DIRS.has(entry.name)) continue;
+        if (walk(path.join(dir, entry.name), depth + 1)) return true;
+      } else if (entry.isFile()) {
+        const ext = path.extname(entry.name).toLowerCase();
+        if (CODE_EXTENSIONS.has(ext)) return true;
+      }
+    }
+    return false;
+  }
+
+  try {
+    return walk(cwd, 0);
+  } catch {
+    return false;
+  }
+}
+
 // ─── v2 Project Context Resolution ──────────────────────────────────────────
 
 /**
@@ -204,6 +253,10 @@ function cmdInitExecutePhase(cwd, phase, raw) {
     : null;
   const phase_req_ids = (reqExtracted && reqExtracted !== 'TBD') ? reqExtracted : null;
 
+  // Multi-project determination for the structural milestone slug's project
+  // prefix: only prefix with <project> when more than one ACTIVE project exists.
+  const multiProject = listProjectsReadonly(cwd).projects.length > 1;
+
   // Resolve {project} in a branch template — errors if template uses {project} but current_project is not set
   function resolveProjectInTemplate(template, currentProject) {
     if (template.includes('{project}')) {
@@ -253,13 +306,13 @@ function cmdInitExecutePhase(cwd, phase, raw) {
       if (resolved.error) return resolved.error;
       return resolved.value
         .replace('{milestone}', milestone.version)
-        .replace('{slug}', generateSlugInternal(milestone.name) || 'milestone');
+        .replace('{slug}', resolveMilestoneSlug(cwd, ctx.current_project, { version: milestone.version, name: milestone.name, multiProject }));
     })(),
 
     // Milestone info
     milestone_version: milestone.version,
     milestone_name: milestone.name,
-    milestone_slug: generateSlugInternal(milestone.name),
+    milestone_slug: resolveMilestoneSlug(cwd, ctx.current_project, { version: milestone.version, name: milestone.name, multiProject }),
 
     // File existence
     state_exists: ctx.root ? pathExistsInternal(cwd, path.join(ctx.root, 'STATE.md')) : false,
@@ -411,17 +464,9 @@ function cmdInitNewProject(cwd, slugArg, raw) {
   const braveKeyFile = path.join(homedir, '.dgs', 'brave_api_key');
   const hasBraveSearch = !!(process.env.BRAVE_API_KEY || fs.existsSync(braveKeyFile));
 
-  // Detect existing code
-  let hasCode = false;
+  // Detect existing code (pure-Node walk, Windows-safe)
+  const hasCode = hasCodeFiles(cwd);
   let hasPackageFile = false;
-  try {
-    const files = execSync('find . -maxdepth 3 \\( -name "*.ts" -o -name "*.js" -o -name "*.py" -o -name "*.go" -o -name "*.rs" -o -name "*.swift" -o -name "*.java" \\) 2>/dev/null | grep -v node_modules | grep -v .git | head -5', {
-      cwd,
-      encoding: 'utf-8',
-      stdio: ['pipe', 'pipe', 'pipe'],
-    });
-    hasCode = files.trim().length > 0;
-  } catch {}
 
   hasPackageFile = pathExistsInternal(cwd, 'package.json') ||
                    pathExistsInternal(cwd, 'requirements.txt') ||
@@ -1005,6 +1050,7 @@ function cmdInitMilestoneOp(cwd, raw, workflow) {
   const milestone = getMilestoneInfo(cwd);
   const planRootRel = path.relative(cwd, getPlanningRoot(cwd)) || '.';
   const cadence = getCadence(workflow || 'complete-milestone');
+  const multiProject = listProjectsReadonly(cwd).projects.length > 1;
 
   // Count phases (project-qualified)
   let phaseCount = 0;
@@ -1049,7 +1095,7 @@ function cmdInitMilestoneOp(cwd, raw, workflow) {
     // Current milestone
     milestone_version: milestone.version,
     milestone_name: milestone.name,
-    milestone_slug: generateSlugInternal(milestone.name),
+    milestone_slug: resolveMilestoneSlug(cwd, ctx.current_project, { version: milestone.version, name: milestone.name, multiProject }),
 
     // Phase counts
     phase_count: phaseCount,
@@ -1547,4 +1593,5 @@ module.exports = {
   cmdInitProgress,
   cmdInitProgressAll,
   applySyncPull,
+  hasCodeFiles,
 };

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

@@ -1177,7 +1177,10 @@ describe('branch_name with {project} resolution', () => {
     });
     try {
       const result = runInit(fixture.cwd, 'execute-phase 3');
-      assert.equal(result.branch_name, 'dgs/myapp/v1.0-milestone');
+      // Structural slug now embeds the version segment (v1.0 -> v1-0) so a
+      // placeholder/default 'milestone' name no longer collapses to a bare
+      // milestone/milestone branch (branch-name collision fix).
+      assert.equal(result.branch_name, 'dgs/myapp/v1.0-v1-0-milestone');
     } finally {
       fixture.cleanup();
     }
@@ -1196,7 +1199,7 @@ describe('branch_name with {project} resolution', () => {
     });
     try {
       const result = runInit(fixture.cwd, 'execute-phase 1');
-      assert.equal(result.branch_name, 'dgs/checkout/v1.0-milestone');
+      assert.equal(result.branch_name, 'dgs/checkout/v1.0-v1-0-milestone');
     } finally {
       fixture.cleanup();
     }
@@ -1216,7 +1219,7 @@ describe('branch_name with {project} resolution', () => {
     });
     try {
       const result = runInit(fixture.cwd, 'execute-phase 3');
-      assert.equal(result.branch_name, 'dgs/myapp/v1.0-milestone');
+      assert.equal(result.branch_name, 'dgs/myapp/v1.0-v1-0-milestone');
     } finally {
       fixture.cleanup();
     }
@@ -1240,6 +1243,61 @@ describe('branch_name with {project} resolution', () => {
   });
 });
 
+// ─── milestone_slug resolution (stamped / legacy fallback) ───────────────────
+
+describe('milestone_slug resolution via resolveMilestoneSlug', () => {
+  // ROADMAP carries an in-progress marker so version+name are deterministic:
+  // 'v25.0' + 'Cool Thing' -> composed slug 'v25-0-cool-thing';
+  // old bare-name slug 'cool-thing'.
+  const roadmap = '# Roadmap\n\n- 🚧 **v25.0 Cool Thing** — Phases 1-2 (in progress)\n';
+
+  function fixtureWithWorktrees(worktrees) {
+    return createFixture({
+      'config.json': JSON.stringify({ current_project: 'test-project' }),
+      'config.local.json': JSON.stringify({
+        current_project: 'test-project',
+        projects: { 'test-project': { worktrees } },
+      }),
+      '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',
+    });
+  }
+
+  it('returns the stamped NEW composed slug when an entry exists under it', () => {
+    const fixture = fixtureWithWorktrees({ 'v25-0-cool-thing': { type: 'milestone', milestone_slug: 'v25-0-cool-thing', slug_formula: 'v2' } });
+    try {
+      const result = runInit(fixture.cwd, 'milestone-op');
+      assert.equal(result.milestone_slug, 'v25-0-cool-thing');
+    } finally {
+      fixture.cleanup();
+    }
+  });
+
+  it('LEGACY FALLBACK: returns the OLD bare-name slug when only an old-style entry exists (no orphaning)', () => {
+    const fixture = fixtureWithWorktrees({ 'cool-thing': { type: 'milestone' } });
+    try {
+      const result = runInit(fixture.cwd, 'milestone-op');
+      assert.equal(result.milestone_slug, 'cool-thing', 'pre-upgrade in-flight milestone must still resolve');
+    } finally {
+      fixture.cleanup();
+    }
+  });
+
+  it('returns the NEW composed slug when neither entry exists (fresh)', () => {
+    const fixture = fixtureWithWorktrees({});
+    try {
+      const result = runInit(fixture.cwd, 'milestone-op');
+      assert.equal(result.milestone_slug, 'v25-0-cool-thing');
+    } finally {
+      fixture.cleanup();
+    }
+  });
+});
+
 // ─── Backward Compatibility ──────────────────────────────────────────────────
 
 // ─── Sync Pull: needs_pull field tests ────────────────────────────────────────