@ktpartners/dgs-platform 3.0.4 → 3.3.0

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

@@ -150,8 +150,11 @@ describe('detectQuickMode', () => {
   });
 
   it('returns milestone-context when active_context points to milestone worktree', () => {
+    const wtPath = path.join(env.tmpDir, 'code-repo--tp-v1-0');
+    fs.mkdirSync(wtPath, { recursive: true });
+
     const config = readLocalConfig(env.planDir);
-    config.projects = { tp: { worktrees: { 'v1-0': { type: 'milestone', repos: {} } } } };
+    config.projects = { tp: { worktrees: { 'v1-0': { type: 'milestone', repos: { 'code-repo': wtPath } } } } };
     config.execution = { active_context: 'v1-0' };
     writeLocalConfig(env.planDir, config);
 
@@ -162,6 +165,56 @@ describe('detectQuickMode', () => {
     assert.equal(result.activeMilestone, 'v1-0');
   });
 
+  it('returns product mode when milestone entry has no repos (stale)', () => {
+    const config = readLocalConfig(env.planDir);
+    config.projects = { tp: { worktrees: { 'v1-0': { type: 'milestone', repos: {} } } } };
+    config.execution = { active_context: 'v1-0' };
+    writeLocalConfig(env.planDir, config);
+
+    const { detectQuickMode } = require('./quick.cjs');
+    const result = detectQuickMode(env.planDir, false);
+    assert.equal(result.mode, 'product');
+  });
+
+  it('returns product mode when milestone entry repos point to non-existent path (stale)', () => {
+    // Regression test for 260507-pdp: a stale milestone entry left over from
+    // an interrupted /dgs:complete-milestone (or aborted `worktrees remove`)
+    // silently re-routed every subsequent /dgs:quick to milestone-context.
+    // Pre-fix this returned 'milestone-context' — post-fix it falls through.
+    const config = readLocalConfig(env.planDir);
+    config.projects = { tp: { worktrees: { 'v1-0': { type: 'milestone', repos: { 'code-repo': '/nonexistent/path/v1-0' } } } } };
+    config.execution = { active_context: 'v1-0' };
+    writeLocalConfig(env.planDir, config);
+
+    const { detectQuickMode } = require('./quick.cjs');
+    const result = detectQuickMode(env.planDir, false);
+    assert.equal(result.mode, 'product');
+  });
+
+  it('does NOT auto-clear stale milestone entries from config', () => {
+    // Asymmetric to getActiveQuick by design: milestone state is heavier than
+    // quick state and may carry context worth inspecting; user clears manually
+    // via `dgs-tools worktrees remove <slug>`.
+    const config = readLocalConfig(env.planDir);
+    config.projects = { tp: { worktrees: { 'v1-0': { type: 'milestone', repos: { 'code-repo': '/nonexistent/path/v1-0' } } } } };
+    config.execution = { active_context: 'v1-0' };
+    writeLocalConfig(env.planDir, config);
+
+    const { detectQuickMode } = require('./quick.cjs');
+    const result = detectQuickMode(env.planDir, false);
+    assert.equal(result.mode, 'product');
+
+    // Re-read config and assert the milestone entry is STILL present
+    const updatedConfig = readLocalConfig(env.planDir);
+    const entry = updatedConfig.projects && updatedConfig.projects.tp
+      && updatedConfig.projects.tp.worktrees
+      && updatedConfig.projects.tp.worktrees['v1-0'];
+    assert.ok(entry, 'Stale milestone entry should NOT be auto-cleared');
+    assert.equal(entry.type, 'milestone');
+    assert.equal(updatedConfig.execution.active_context, 'v1-0',
+      'active_context should also still point to the stale milestone');
+  });
+
   it('returns product mode when active_context points to a quick worktree', () => {
     // Create a real quick worktree directory so it's not auto-cleared
     const wtPath = path.join(env.tmpDir, 'code-repo--tp-fix-bug');
@@ -266,17 +319,49 @@ describe('startProductQuick', () => {
     const { startProductQuick } = require('./quick.cjs');
     const result = startProductQuick(env.planDir, 'fix token bug', null);
     assert.equal(result.success, true);
-    assert.equal(result.slug, 'fix-token-bug');
+    // Slug now includes quickId prefix: YYMMDD-xxx-fix-token-bug
+    assert.ok(/^\d{6}-[a-z0-9]{3}-fix-token-bug$/.test(result.slug),
+      'Slug should have quickId prefix: ' + result.slug);
 
     // Verify active_context was set
     const config = readLocalConfig(env.planDir);
-    assert.equal(config.execution.active_context, 'fix-token-bug');
+    assert.equal(config.execution.active_context, result.slug);
 
     // Verify worktree entry exists
-    const entry = config.projects.tp.worktrees['fix-token-bug'];
+    const entry = config.projects.tp.worktrees[result.slug];
     assert.ok(entry, 'Worktree entry should exist');
     assert.equal(entry.type, 'quick');
   });
+
+  it('returns canonical slug that matches worktrees[] lookup key for long descriptions (regression: slug truncation)', () => {
+    // Regression for 260507-kq9: a title whose descSlug fills the 40-char cap
+    // produces a 51-char raw slug (10-char quickId + '-' + 40-char descSlug).
+    // cmdWorktreesCreate re-sanitises with a 50-char cap, so the worktrees[]
+    // entry is keyed under the 50-char canonical slug. Pre-fix, startProductQuick
+    // read back at the 51-char key → undefined → returned `repos: {}`.
+    // The workflow then injected no <worktree_context> and the executor
+    // committed to main of the registered repo instead of the quick branch.
+    const { startProductQuick } = require('./quick.cjs');
+    const longTitle = 'fix slug truncation mismatch causing empty repos and main commits';
+    const result = startProductQuick(env.planDir, longTitle, null);
+
+    assert.equal(result.success, true,
+      'startProductQuick should succeed; got error: ' + (result.error || '<none>'));
+    assert.ok(result.slug.length <= 50,
+      'Returned slug must respect canonical 50-char cap; got ' + result.slug.length + ' chars: ' + result.slug);
+    assert.ok(Object.keys(result.repos).length > 0,
+      'Returned repos must be populated (regression: was {} when slug exceeded 50 chars). repos: ' + JSON.stringify(result.repos));
+
+    // The slug-as-returned must equal the slug-as-keyed in config.local.json.
+    const config = readLocalConfig(env.planDir);
+    assert.equal(config.execution.active_context, result.slug,
+      'active_context should equal returned slug; active_context=' + config.execution.active_context + ' slug=' + result.slug);
+    const entry = config.projects.tp.worktrees[result.slug];
+    assert.ok(entry,
+      'worktrees[result.slug] must exist; available keys: ' +
+      JSON.stringify(Object.keys(config.projects.tp.worktrees || {})));
+    assert.equal(entry.type, 'quick');
+  });
 });
 
 // ─── quickComplete ───────────────────────────────────────────────────────────
@@ -593,4 +678,53 @@ describe('cmdQuickFinalize', () => {
     assert.equal(second.parsed.committed, false);
     assert.equal(second.parsed.commit_reason, 'nothing_to_commit');
   });
+
+  it('commits both flat PLAN.md and numbered {quickId}-01-SUMMARY.md (regression: idea #18)', () => {
+    env = createFinalizeEnv();
+    // Planner writes flat PLAN, executor writes numbered SUMMARY (the 260410-ckl shape)
+    fs.writeFileSync(path.join(env.taskDir, env.quickId + '-PLAN.md'), '# plan\n');
+    fs.writeFileSync(path.join(env.taskDir, env.quickId + '-01-SUMMARY.md'), '# summary\n');
+    fs.writeFileSync(env.statePath, '# state\n');
+
+    const res = runFinalize(env.repoDir, [
+      env.quickId,
+      '--quick-dir', env.quickDir,
+      '--state-path', env.statePath,
+      '--description', 'idea-18 regression',
+    ]);
+    assert.equal(res.exitCode, 0, 'stderr: ' + res.stderr);
+    assert.ok(res.parsed, 'expected parsed JSON, got: ' + res.stdout);
+    assert.equal(res.parsed.committed, true);
+    assert.equal(res.parsed.commit_reason, 'committed');
+    // 3 files: flat PLAN + numbered SUMMARY + STATE
+    assert.equal(res.parsed.files_committed.length, 3, 'files: ' + JSON.stringify(res.parsed.files_committed));
+
+    // Both file basenames must appear in the actual commit
+    const committedFiles = execSync(
+      'git log -1 --name-only --format=',
+      { cwd: env.repoDir, encoding: 'utf-8' }
+    ).trim().split('\n').filter(Boolean);
+    const hasFlat = committedFiles.some(f => f.endsWith(env.quickId + '-PLAN.md'));
+    const hasNumberedSummary = committedFiles.some(f => f.endsWith(env.quickId + '-01-SUMMARY.md'));
+    assert.ok(hasFlat, 'flat PLAN.md should be in commit, got: ' + JSON.stringify(committedFiles));
+    assert.ok(hasNumberedSummary, 'numbered SUMMARY should be in commit, got: ' + JSON.stringify(committedFiles));
+  });
+
+  it('commits fully numbered shape ({quickId}-01-PLAN.md + {quickId}-01-SUMMARY.md)', () => {
+    env = createFinalizeEnv();
+    fs.writeFileSync(path.join(env.taskDir, env.quickId + '-01-PLAN.md'), '# plan\n');
+    fs.writeFileSync(path.join(env.taskDir, env.quickId + '-01-SUMMARY.md'), '# summary\n');
+    fs.writeFileSync(env.statePath, '# state\n');
+
+    const res = runFinalize(env.repoDir, [
+      env.quickId,
+      '--quick-dir', env.quickDir,
+      '--state-path', env.statePath,
+      '--description', 'fully numbered shape',
+    ]);
+    assert.equal(res.exitCode, 0, 'stderr: ' + res.stderr);
+    assert.ok(res.parsed);
+    assert.equal(res.parsed.committed, true);
+    assert.equal(res.parsed.files_committed.length, 3);
+  });
 });

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

@@ -1101,10 +1101,6 @@ function cmdReposInitProduct(cwd, options, raw) {
   // Check if already initialized (idempotency)
   if (isV2Install(cwd)) {
     // Silently ensure v3.0 directories exist (backfill for upgrades)
-    const ideasStates = ['pending', 'rejected', 'done'];
-    for (const st of ideasStates) {
-      fs.mkdirSync(path.join(getPlanningRoot(cwd), 'ideas', st), { recursive: true });
-    }
     fs.mkdirSync(path.join(getPlanningRoot(cwd), 'specs'), { recursive: true });
     fs.mkdirSync(path.join(getPlanningRoot(cwd), 'docs', 'product'), { recursive: true });
     fs.mkdirSync(path.join(getPlanningRoot(cwd), 'quick'), { recursive: true });
@@ -1114,28 +1110,31 @@ function cmdReposInitProduct(cwd, options, raw) {
   // Planning root is cwd (root layout)
   fs.mkdirSync(getPlanningRoot(cwd), { recursive: true });
 
-  // Create ideas, specs, and docs directories for v3.0 features
-  const ideasStates = ['pending', 'rejected', 'done'];
-  for (const state of ideasStates) {
-    fs.mkdirSync(path.join(getPlanningRoot(cwd), 'ideas', state), { recursive: true });
-  }
+  // Create specs and docs directories for v3.0 features
+  // (ideas/ is created on demand by `dgs-tools ideas create`; flat-status frontmatter replaces directory-based state per idea #009)
   fs.mkdirSync(path.join(getPlanningRoot(cwd), 'specs'), { recursive: true });
   fs.mkdirSync(path.join(getPlanningRoot(cwd), 'docs', 'product'), { recursive: true });
   fs.mkdirSync(path.join(getPlanningRoot(cwd), 'quick'), { recursive: true });
 
   // Add .gitkeep files to empty directories so they survive git commit
   const gitkeepPaths = [
-    path.join(getPlanningRoot(cwd), 'ideas', 'pending', '.gitkeep'),
-    path.join(getPlanningRoot(cwd), 'ideas', 'rejected', '.gitkeep'),
-    path.join(getPlanningRoot(cwd), 'ideas', 'done', '.gitkeep'),
     path.join(getPlanningRoot(cwd), 'specs', '.gitkeep'),
     path.join(getPlanningRoot(cwd), 'docs', 'product', '.gitkeep'),
     path.join(getPlanningRoot(cwd), 'quick', '.gitkeep'),
   ];
+  // AGENT-13 contract: scaffolded_files lists all files this command writes/guarantees,
+  // derived from actual write list (never hardcoded). Workflows MUST consume this array
+  // and pass it to a subsequent commit step's --files argument. See
+  // references/workflow-conventions.md and references/agent-step-reliability.md.
+  const scaffoldedFiles = [];
   for (const gk of gitkeepPaths) {
     if (!fs.existsSync(gk)) {
       fs.writeFileSync(gk, '', 'utf-8');
     }
+    // Always include in scaffolded_files: contract is "files this command guarantees on
+    // disk that the caller MUST commit", not "files this run newly created" — fresh
+    // clones need them tracked even if a previous local run already wrote them.
+    scaffoldedFiles.push(path.relative(cwd, gk));
   }
 
   // Scaffold review-keys.json with empty template
@@ -1203,6 +1202,7 @@ function cmdReposInitProduct(cwd, options, raw) {
     docs_dir_created: true,
     bootstrapped_repos: bootstrappedRepos,
     files_created: ['config.json', 'config.local.json', 'REPOS.md', 'PROJECTS.md', 'ideas/', 'specs/', 'docs/', 'quick/', '.gitignore', 'review-keys.json'],
+    scaffolded_files: scaffoldedFiles,
   }, raw);
 }