dflow-sdd-ddd 0.8.0 → 0.10.0

package/lib/init.js

@@ -13,6 +13,16 @@ const COMMAND_REGISTRY_END = '<!-- dflow-command-registry:end -->';
 const COMMAND_ADAPTER_GENERATED_MARKER = '<!-- dflow-generated: command-adapter -->';
 const SKILL_ADAPTER_GENERATED_MARKER = '<!-- dflow-generated: skill-adapter -->';
 const WORKFLOW_BUNDLE_GENERATED_MARKER = '<!-- dflow-generated: workflow-bundle -->';
+const CODEX_TRIGGER_SECTION_START = '<!-- dflow-generated: codex-command-triggers START -->';
+const CODEX_TRIGGER_SECTION_END = '<!-- dflow-generated: codex-command-triggers END -->';
+// PROPOSAL-054: marker pair that wraps the Dflow base shim when it is appended
+// into a user-owned root agent file (CLAUDE.md / AGENTS.md / copilot-instructions).
+// It is ONLY used for the in-user-file block; a whole-file Dflow shim (freshly
+// created, or a pristine 0.8.0/0.9.0 shim) stays marker-free and is recognized by
+// the normalized template match (isPristineDflowAgentsShim), so we never have to
+// freeze the pre-marker shim template for back-compat.
+const AGENT_SHIM_SECTION_START = '<!-- dflow-generated: agent-shim START -->';
+const AGENT_SHIM_SECTION_END = '<!-- dflow-generated: agent-shim END -->';
 const WORKFLOW_BUNDLE_DEST = 'dflow/specs/shared/dflow-workflows';
 const WORKFLOW_BUNDLE_MANIFEST_PATH = `${WORKFLOW_BUNDLE_DEST}/.dflow-bundle-manifest.json`;
 const COMMON_SKILL_SOURCE_REL = 'common/skill/SKILL.md';
@@ -110,16 +120,42 @@ const OPTIONAL_FILE_OPTIONS = [
     key: 'overview',
     label: '_overview.md - system overview',
     aliases: ['overview', '_overview.md']
+  }
+];
+
+// Git policy is a mandatory team choice (PROPOSAL-047): both options use feature
+// branches; the choice selects the finish-stage merge guidance and drives the
+// runtime branch gates / commit checkpoints.
+const GIT_POLICY_OPTIONS = [
+  {
+    key: 'gitflow',
+    label: 'Git Flow - long-lived develop/release branches',
+    aliases: ['gitflow', 'git flow', 'flow']
+  },
+  {
+    key: 'trunk',
+    label: 'Trunk / GitHub Flow - short-lived feature branches (lightest)',
+    aliases: ['trunk', 'trunk-based', 'github flow', 'githubflow']
+  }
+];
+
+// How AI-made commits are marked (PROPOSAL-047). Chosen once at init; the
+// runtime does not re-ask. None is the default.
+const AI_COMMIT_MARKER_OPTIONS = [
+  {
+    key: 'none',
+    label: 'None - AI commits look like any other commit',
+    aliases: ['none', 'off', 'no']
   },
   {
-    key: 'git-trunk',
-    label: 'Git principles - trunk-based',
-    aliases: ['git principles - trunk-based', 'trunk', 'trunk-based']
+    key: 'co-authored-by',
+    label: 'Co-Authored-By trailer (dflow-ai) - filterable / auditable',
+    aliases: ['co-authored-by', 'co-author', 'trailer', 'coauthored']
   },
   {
-    key: 'git-flow',
-    label: 'Git principles - Git Flow',
-    aliases: ['git principles - git flow', 'git flow', 'gitflow']
+    key: 'prefix',
+    label: '[ai-assisted] commit-message prefix - visible at a glance',
+    aliases: ['prefix', 'ai-assisted', '[ai-assisted]']
   }
 ];
 
@@ -208,7 +244,7 @@ async function runInit(options = {}) {
     const detection = await detectProjectSignals(cwd);
     const answers = await promptForAnswers(rl, stdout, stderr, detection);
     const plan = await buildFilePlan(cwd, answers);
-    const warnings = [...preflight.warnings, ...buildDetectionWarnings(answers, detection), ...(plan.bundleWarnings || [])];
+    const warnings = [...preflight.warnings, ...buildDetectionWarnings(answers, detection), ...(plan.warnings || []), ...(plan.bundleWarnings || [])];
 
     renderPreview(stdout, plan, warnings);
     const confirmed = await askConfirmation(rl, 'Create these files? (y/N) ');
@@ -311,7 +347,8 @@ async function runConfigureAgents(options = {}) {
     result.warnings.push(...collectUnresolvedPlaceholderWarnings(plan, result.created));
 
     printResultReport(stdout, result, plan.deferred);
-    printConfigureAgentsNextSteps(stdout, Boolean(options.commandAdapters));
+    const usedSnippetFallback = plan.items.some((item) => item.snippetFallback);
+    printConfigureAgentsNextSteps(stdout, Boolean(options.commandAdapters), usedSnippetFallback);
     return 0;
   } catch (error) {
     if (rl) {
@@ -503,7 +540,13 @@ async function detectConfiguredAgents(cwd) {
   // can default to them instead of re-asking from scratch on every invocation.
   // Order matches AI_AGENT_OPTIONS so the prompt numbering lines up.
   const detected = [];
-  if (await pathExists(path.join(cwd, 'AGENTS.md'))) {
+  if (
+    (await pathExists(path.join(cwd, 'AGENTS.md'))) ||
+    // PROPOSAL-056 Phase 1: a project-level Codex skill counts as configured so
+    // re-runs default to the `agents` target, matching the .claude/skills check
+    // below for Claude.
+    (await pathExists(path.join(cwd, '.agents/skills/dflow')))
+  ) {
     detected.push('agents');
   }
   if (
@@ -513,7 +556,12 @@ async function detectConfiguredAgents(cwd) {
   ) {
     detected.push('claude');
   }
-  if (await pathExists(path.join(cwd, '.github/copilot-instructions.md'))) {
+  if (
+    (await pathExists(path.join(cwd, '.github/copilot-instructions.md'))) ||
+    // A project-level Copilot skill counts as configured too (parity with the
+    // .claude/skills and .agents/skills checks above).
+    (await pathExists(path.join(cwd, '.github/skills/dflow')))
+  ) {
     detected.push('copilot');
   }
   return detected;
@@ -612,6 +660,20 @@ async function promptForAnswers(rl, stdout, stderr, detection) {
     proseLanguage = await askCustomProseLanguage(rl, stderr);
   }
 
+  const gitPolicy = await askSelect(rl, stdout, stderr, {
+    id: 'Q5',
+    question: 'Which Git policy does the team follow? (drives branch gates and finish-stage merge guidance)',
+    options: GIT_POLICY_OPTIONS,
+    defaultKey: null
+  });
+
+  const aiCommitMarker = await askSelect(rl, stdout, stderr, {
+    id: 'Q6',
+    question: 'How should AI-made commits be marked? (the AI offers to commit at checkpoints; you can always decline)',
+    options: AI_COMMIT_MARKER_OPTIONS,
+    defaultKey: 'none'
+  });
+
   const optionalFiles = await askOptionalFiles(rl, stdout, stderr);
   const aiAgents = await askAiAgents(rl, stdout, stderr, detection.configuredAgents || []);
 
@@ -621,6 +683,8 @@ async function promptForAnswers(rl, stdout, stderr, detection) {
     techStackSummary,
     migrationContext,
     proseLanguage,
+    gitPolicy,
+    aiCommitMarker,
     optionalFiles,
     aiAgents
   };
@@ -645,10 +709,26 @@ async function inferProjectContext(cwd, rl, stdout, stderr) {
     techStackSummary: await inferTechStackSummary(cwd),
     migrationContext: await inferMigrationContext(cwd),
     proseLanguage: await inferProseLanguage(cwd),
+    gitPolicy: await inferGitPolicy(cwd),
+    aiCommitMarker: await inferAiCommitMarker(cwd),
     optionalFiles: []
   };
 }
 
+async function inferGitPolicy(cwd) {
+  const conventionsPath = path.join(cwd, 'dflow/specs/shared/_conventions.md');
+  const content = await fs.readFile(conventionsPath, 'utf8').catch(() => '');
+  const match = content.match(/Selected Git policy:\s*`([^`]+)`/);
+  return match ? match[1] : null;
+}
+
+async function inferAiCommitMarker(cwd) {
+  const conventionsPath = path.join(cwd, 'dflow/specs/shared/_conventions.md');
+  const content = await fs.readFile(conventionsPath, 'utf8').catch(() => '');
+  const match = content.match(/AI commit marker:\s*`([^`]+)`/);
+  return match ? match[1] : null;
+}
+
 async function inferExistingEdition(cwd) {
   if (await pathExists(path.join(cwd, 'dflow/specs/architecture/tech-debt.md'))) {
     return 'greenfield';
@@ -767,33 +847,22 @@ async function askOptionalFiles(rl, stdout, stderr) {
   while (true) {
     stdout.write('\nWhich optional starter files should Dflow seed?\n');
     OPTIONAL_FILE_OPTIONS.forEach((option, index) => {
-      const defaultMarker = option.key === 'overview' || option.key === 'git-trunk' ? ' (recommended)' : '';
+      const defaultMarker = option.key === 'overview' ? ' (recommended)' : '';
       stdout.write(`  ${index + 1}. ${option.label}${defaultMarker}\n`);
     });
 
-    const answer = await askLine(rl, 'Enter comma-separated choices, "none", or press Enter for recommended [1,2]: ');
-    const parsed = parseMultiselectAnswer(answer, OPTIONAL_FILE_OPTIONS, ['overview', 'git-trunk']);
+    const answer = await askLine(rl, 'Enter comma-separated choices, "none", or press Enter for recommended [1]: ');
+    const parsed = parseMultiselectAnswer(answer, OPTIONAL_FILE_OPTIONS, ['overview']);
 
     if (!parsed.valid) {
       failedAttempts += 1;
       if (failedAttempts >= 3) {
-        throw new InitError('Too many invalid attempts for Q5. Dflow init aborted.');
+        throw new InitError('Too many invalid attempts for Q7. Dflow init aborted.');
       }
       stderr.write(`${parsed.message} (${3 - failedAttempts} attempts left)\n`);
       continue;
     }
 
-    if (parsed.values.includes('git-trunk') && parsed.values.includes('git-flow')) {
-      const keepBoth = await askConfirmation(
-        rl,
-        'You selected both Git principles templates. Most projects choose one. Keep both? (y/N) '
-      );
-      if (!keepBoth) {
-        failedAttempts = 0;
-        continue;
-      }
-    }
-
     return parsed.values;
   }
 }
@@ -820,7 +889,7 @@ async function askAiAgents(rl, stdout, stderr, defaultKeys = []) {
     if (!parsed.valid) {
       failedAttempts += 1;
       if (failedAttempts >= 3) {
-        throw new InitError('Too many invalid attempts for Q6. Dflow init aborted.');
+        throw new InitError('Too many invalid attempts for Q8. Dflow init aborted.');
       }
       stderr.write(`${parsed.message} (${3 - failedAttempts} attempts left)\n`);
       continue;
@@ -997,6 +1066,7 @@ async function buildFilePlan(cwd, answers) {
     content = substitutePlaceholders(content, substitution);
     if (options.injectProseLanguage) {
       content = ensureProseLanguageSection(content, answers.proseLanguage);
+      content = ensureConventionPolicySections(content, answers);
     }
     items.push({
       relativePath,
@@ -1030,17 +1100,25 @@ async function buildFilePlan(cwd, answers) {
   if (answers.optionalFiles.includes('overview')) {
     await addTemplate('dflow/specs/shared/_overview.md', 'scaffolding/_overview.md', 'selected');
   }
-  if (answers.optionalFiles.includes('git-trunk')) {
-    await addTemplate('dflow/specs/shared/Git-principles-trunk.md', 'scaffolding/Git-principles-trunk.md', 'selected');
-  }
-  if (answers.optionalFiles.includes('git-flow')) {
-    await addTemplate('dflow/specs/shared/Git-principles-gitflow.md', 'scaffolding/Git-principles-gitflow.md', 'selected');
+
+  // PROPOSAL-047: the selected Git policy is mandatory — always project exactly
+  // the matching Git-principles file so the runtime branch gates have a policy.
+  if (answers.gitPolicy === 'gitflow') {
+    await addTemplate('dflow/specs/shared/Git-principles-gitflow.md', 'scaffolding/Git-principles-gitflow.md', 'mandatory, selected Git policy');
+  } else {
+    await addTemplate('dflow/specs/shared/Git-principles-trunk.md', 'scaffolding/Git-principles-trunk.md', 'mandatory, selected Git policy');
   }
 
+  // PROPOSAL-054: agent-shim auto-inject can emit fallback warnings (marker
+  // conflict). init previously never plumbed these — buildConfigureAgentsPlan had
+  // a warnings accumulator but buildFilePlan did not — so a fallback during init
+  // was silent. Collect them here and surface them in runInit alongside the
+  // preflight / detection / bundle warnings.
+  const warnings = [];
   if (answers.aiAgents.length > 0) {
     await addTemplate('dflow/specs/shared/AI-AGENT-GUIDE.md', 'scaffolding/AI-AGENT-GUIDE.md', 'selected, canonical AI agent guide');
     for (const agent of answers.aiAgents) {
-      await addAiAgentShim(cwd, items, agent, substitution);
+      await addAiAgentShim(cwd, items, agent, substitution, { warnings });
     }
   }
 
@@ -1054,6 +1132,7 @@ async function buildFilePlan(cwd, answers) {
     items,
     deferred: buildDeferredItems(answers.edition),
     bundleWarnings,
+    warnings,
     unresolvedInitPlaceholders: Array.from(substitution.entries())
       .filter(([placeholder, value]) => placeholder === value)
       .map(([placeholder]) => placeholder)
@@ -1080,7 +1159,7 @@ async function buildConfigureAgentsPlan(cwd, answers) {
   const commandRegistry = answers.commandAdapters ? parseDflowCommandRegistry(content) : [];
 
   for (const agent of answers.aiAgents) {
-    await addAiAgentShim(cwd, items, agent, substitution, { commandRegistry });
+    await addAiAgentShim(cwd, items, agent, substitution, { commandRegistry, warnings });
   }
 
   if (answers.commandAdapters) {
@@ -1115,6 +1194,16 @@ async function buildConfigureAgentsPlan(cwd, answers) {
 
 async function finalizePlanItems(cwd, items) {
   for (const item of items) {
+    // PROPOSAL-054: items whose action was already decided at plan time from the
+    // existing file content (root agent-file append / replace / skip / fallback)
+    // must not be re-derived from overwrite+existence here — that would discard
+    // the marked-region decision. Just make sure size is populated.
+    if (item.action) {
+      if (item.size === undefined) {
+        item.size = Buffer.byteLength(item.content || '', 'utf8');
+      }
+      continue;
+    }
     const absolute = path.join(cwd, item.relativePath);
     const targetExists = await pathExists(absolute);
     item.action = targetExists ? (item.overwrite ? 'update' : 'skip') : 'create';
@@ -1153,14 +1242,54 @@ async function listBundleSourceFiles(edition) {
   return files;
 }
 
+// Reads the per-project workflow bundle manifest, distinguishing "absent"
+// (normal: fresh init / first projection) from "corrupt" (unreadable or invalid
+// shape). A corrupt manifest must NOT be treated as absent: that would silently
+// disable stale cleanup and then overwrite the (recoverable) record. Callers
+// degrade on corrupt — skip cleanup, skip the manifest write, still project —
+// rather than hard-fail, because a corrupt project manifest is a user-project
+// state, not a broken package. An empty `files: []` is a valid manifest.
 async function readCurrentBundleManifest(cwd) {
   const manifestPath = path.join(cwd, WORKFLOW_BUNDLE_MANIFEST_PATH);
+  let raw;
+  try {
+    raw = await fs.readFile(manifestPath, 'utf8');
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      return { kind: 'absent' };
+    }
+    return { kind: 'corrupt', reason: `cannot read manifest (${error.code || error.message})` };
+  }
+
+  let parsed;
   try {
-    const raw = await fs.readFile(manifestPath, 'utf8');
-    return JSON.parse(raw);
+    parsed = JSON.parse(raw);
   } catch {
-    return null;
+    return { kind: 'corrupt', reason: 'manifest is not valid JSON' };
+  }
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    return { kind: 'corrupt', reason: 'manifest is not a JSON object' };
+  }
+  if (!Array.isArray(parsed.files) || !parsed.files.every((entry) => typeof entry === 'string')) {
+    return { kind: 'corrupt', reason: 'manifest "files" is not an array of strings' };
   }
+  return { kind: 'ok', manifest: parsed };
+}
+
+// True when a manifest `files` entry is a canonical, in-bundle, traversal-free
+// relative path. Manifest entries are produced canonically; a non-canonical
+// entry (hand-edited / corrupt manifest, e.g. one containing "..") is NOT acted
+// on, because (a) it cannot be reliably string-matched against the current
+// bundle set — so a path that *resolves* to a current file would otherwise be
+// scheduled for removal — and (b) it drives an unlink. Verifying canonical form
+// up front both blocks traversal and makes the newRelPaths string compare
+// reliable.
+function isCanonicalBundlePath(relPath) {
+  if (typeof relPath !== 'string' || relPath.length === 0) return false;
+  if (relPath.includes('\\')) return false;
+  if (path.posix.normalize(relPath) !== relPath) return false;
+  const prefix = `${WORKFLOW_BUNDLE_DEST}/`;
+  return relPath.startsWith(prefix) && relPath.length > prefix.length;
 }
 
 function buildBundleManifest(edition, version, files) {
@@ -1179,44 +1308,90 @@ function injectBundleMarker(content) {
 async function addWorkflowBundleItems(cwd, items, warnings, edition) {
   const bundleFiles = await listBundleSourceFiles(edition);
 
-  // Detect any previous manifest to handle edition-switch stale cleanup.
-  const existingManifest = await readCurrentBundleManifest(cwd);
-  const previousEdition = existingManifest ? existingManifest.edition : null;
+  // R3-02: a healthy edition's bundle source is never empty. An empty scan means
+  // a broken installed package — hard-fail BEFORE scheduling any removal or
+  // writing the manifest, so we never overwrite the manifest with files:[]
+  // (which would orphan every projected file and ship a workflow-less project).
+  if (bundleFiles.length === 0) {
+    throw new InitError(
+      `Internal error: no workflow bundle source files found for edition "${edition}" (expected files under templates/${edition}/references/ and templates/${edition}/templates/). The installed dflow package looks incomplete.`
+    );
+  }
 
-  // If the edition changed, schedule removal of stale generated files from prior edition.
-  if (previousEdition && previousEdition !== edition) {
-    const staleFiles = existingManifest.files || [];
-    for (const staleRelPath of staleFiles) {
+  const newRelPaths = new Set(bundleFiles.map((f) => `${WORKFLOW_BUNDLE_DEST}/${f.sourceRel}`));
+
+  // Read the previous manifest to drive stale cleanup. Distinguish absent
+  // (normal) from corrupt (degrade): on corrupt, skip cleanup AND skip the
+  // manifest write below — never hard-fail, since a corrupt project manifest is
+  // a user-project state (the package may be healthy and the user may be running
+  // configure-agents precisely to repair / update).
+  const manifestResult = await readCurrentBundleManifest(cwd);
+  const manifestCorrupt = manifestResult.kind === 'corrupt';
+  if (manifestCorrupt) {
+    warnings.push(
+      `Workflow bundle manifest is unreadable (${manifestResult.reason}); skipped stale cleanup and left the manifest untouched. Delete ${WORKFLOW_BUNDLE_MANIFEST_PATH} and re-run to rebuild it.`
+    );
+  }
+  const existingManifest = manifestResult.kind === 'ok' ? manifestResult.manifest : null;
+
+  // Stale removal (generalized from edition-change-only to a manifest diff):
+  // remove any path the previous manifest recorded but the current bundle source
+  // no longer includes. Edition change is just the case where the whole old set
+  // differs; a same-edition file-set shrink (e.g. a retired bundle file) is
+  // handled identically. The marker check (here) + content re-check (apply
+  // phase) still guard against deleting user-modified files.
+  if (existingManifest) {
+    const previousEdition = existingManifest.edition;
+    const editionChanged = Boolean(previousEdition) && previousEdition !== edition;
+    for (const staleRelPath of existingManifest.files) {
+      // Act only on canonical, in-bundle, traversal-free entries. A
+      // non-canonical entry (hand-edited / corrupt manifest) is skipped: acting
+      // on it would make the newRelPaths string compare unreliable (a path that
+      // resolves to a current bundle file could be scheduled for removal) and it
+      // drives an unlink. Checked FIRST so the membership compare below is sound.
+      if (!isCanonicalBundlePath(staleRelPath)) {
+        warnings.push(
+          `Ignored non-canonical workflow bundle manifest path: ${staleRelPath}`
+        );
+        continue;
+      }
+      // Still a current bundle file → it will be updated, not removed.
+      if (newRelPaths.has(staleRelPath)) {
+        continue;
+      }
       const staleAbsPath = path.join(cwd, staleRelPath);
-      let staleExists = false;
+      let staleStat = null;
       try {
-        await fs.stat(staleAbsPath);
-        staleExists = true;
+        staleStat = await fs.stat(staleAbsPath);
       } catch {
-        staleExists = false;
+        staleStat = null;
+      }
+      if (!staleStat) {
+        continue;
       }
-      if (!staleExists) {
+      // A non-file entry (e.g. a directory path in a hand-edited / corrupt
+      // manifest) must degrade gracefully, not crash readFile with EISDIR.
+      if (!staleStat.isFile()) {
+        warnings.push(`Ignored non-file workflow bundle manifest entry: ${staleRelPath}`);
         continue;
       }
       const staleContent = await fs.readFile(staleAbsPath, 'utf8');
       if (!staleContent.includes(WORKFLOW_BUNDLE_GENERATED_MARKER)) {
         warnings.push(
-          `Edition changed from ${previousEdition} to ${edition}; skipped removal of user-modified bundle file: ${staleRelPath}`
+          `Retired workflow bundle file is user-modified; left unchanged: ${staleRelPath}`
         );
         continue;
       }
-      // Check if this path is also in the new edition bundle — if so, it will be overwritten, not removed.
-      const newRelPaths = new Set(bundleFiles.map((f) => `${WORKFLOW_BUNDLE_DEST}/${f.sourceRel}`));
-      if (!newRelPaths.has(staleRelPath)) {
-        items.push({
-          relativePath: staleRelPath,
-          source: `stale-bundle:${previousEdition}`,
-          notes: `stale workflow bundle file from ${previousEdition} edition`,
-          action: 'remove',
-          size: Buffer.byteLength(staleContent, 'utf8'),
-          expectedContent: staleContent
-        });
-      }
+      items.push({
+        relativePath: staleRelPath,
+        source: editionChanged ? `stale-bundle:${previousEdition}` : 'stale-bundle:retired',
+        notes: editionChanged
+          ? `stale workflow bundle file from ${previousEdition} edition`
+          : 'retired workflow bundle file no longer in the package source',
+        action: 'remove',
+        size: Buffer.byteLength(staleContent, 'utf8'),
+        expectedContent: staleContent
+      });
     }
   }
 
@@ -1257,23 +1432,27 @@ async function addWorkflowBundleItems(cwd, items, warnings, edition) {
     });
   }
 
-  // Add the manifest file.
-  const manifestContent = JSON.stringify(
-    buildBundleManifest(edition, pkg.version, bundleFiles),
-    null,
-    2
-  ) + '\n';
-  const manifestExists = await pathExists(path.join(cwd, WORKFLOW_BUNDLE_MANIFEST_PATH));
+  // Add the manifest file — unless the existing manifest is corrupt, in which
+  // case leave it untouched (overwriting would destroy the only recoverable
+  // record and silently recreate the manifest-orphan problem).
+  if (!manifestCorrupt) {
+    const manifestContent = JSON.stringify(
+      buildBundleManifest(edition, pkg.version, bundleFiles),
+      null,
+      2
+    ) + '\n';
+    const manifestExists = await pathExists(path.join(cwd, WORKFLOW_BUNDLE_MANIFEST_PATH));
 
-  items.push({
-    relativePath: WORKFLOW_BUNDLE_MANIFEST_PATH,
-    source: `generated:workflow-bundle-manifest`,
-    notes: 'workflow bundle manifest',
-    content: manifestContent,
-    action: manifestExists ? 'update' : 'create',
-    overwrite: true,
-    size: Buffer.byteLength(manifestContent, 'utf8')
-  });
+    items.push({
+      relativePath: WORKFLOW_BUNDLE_MANIFEST_PATH,
+      source: `generated:workflow-bundle-manifest`,
+      notes: 'workflow bundle manifest',
+      content: manifestContent,
+      action: manifestExists ? 'update' : 'create',
+      overwrite: true,
+      size: Buffer.byteLength(manifestContent, 'utf8')
+    });
+  }
 }
 
 async function readPackagedBundleFile(edition, sourceRel) {
@@ -1302,45 +1481,355 @@ async function readPackagedBundleFile(edition, sourceRel) {
   }
 }
 
+// PROPOSAL-054: configure a tool's root agent file. A non-guide existing file used
+// to be parked as a side merge snippet ("hand-merge this yourself"); it is now an
+// auto-injected, marker-delimited Dflow block shown in the confirmation preview.
+// The snippet + warning survive only as a genuine-conflict fallback. Decision table
+// (read existing file content, then branch):
+//   1.  not exists                         -> create marker-free whole-file shim
+//   2a. pristine / prior whole-file shim   -> regenerate in place (idempotent / migrate)
+//   2b. one well-formed agent-shim block   -> replace that block (idempotent re-run)
+//   2c. malformed Dflow markers            -> snippet fallback + warning (file untouched)
+//   2d. references guide, not 2a/2b/2c     -> skip base shim (Codex: still upsert trigger, OQ#6c)
+//   2e. user-owned, non-guide existing     -> append the marked block(s)  <- core change
+// For Codex + --command-adapters the base-shim block and the trigger block are two
+// adjacent, independently-marked regions assembled into ONE plan item (per-item
+// writes are whole-file, so two items for one path would clobber each other).
 async function addAiAgentShim(cwd, items, agent, substitution, options = {}) {
   const target = getAiAgentTarget(agent);
   const targetPath = path.join(cwd, target.relativePath);
-  const targetExists = await pathExists(targetPath);
-  const targetConfigured = targetExists && await fileReferencesAiAgentGuide(targetPath);
   const commandRegistry = options.commandRegistry || [];
-  const codexCommandAdapterSnippet = target.relativePath === 'AGENTS.md' && commandRegistry.length > 0 && targetExists;
-  const relativePath = codexCommandAdapterSnippet
-    ? (targetConfigured ? 'dflow/specs/shared/AGENTS-md-command-adapters-snippet.md' : target.snippetPath)
-    : (targetExists && !targetConfigured ? target.snippetPath : target.relativePath);
-  const content = substitutePlaceholders(buildAiAgentShim(target.relativePath, options.commandRegistry), substitution);
-  let notes = 'selected, tool-specific shim';
-  if (codexCommandAdapterSnippet && targetConfigured) {
-    notes = `selected, ${target.relativePath} already points to AI-AGENT-GUIDE.md; merge this command trigger snippet manually`;
-  } else if (codexCommandAdapterSnippet) {
-    notes = `selected, ${target.relativePath} already exists; merge this command trigger snippet manually`;
-  } else if (targetConfigured) {
-    notes = `selected, ${target.relativePath} already points to AI-AGENT-GUIDE.md`;
-  } else if (targetExists) {
-    notes = `selected, ${target.relativePath} already exists; merge this snippet manually`;
+  const warnings = options.warnings;
+  const isCodex = target.relativePath === 'AGENTS.md';
+  const wantsTrigger = isCodex && commandRegistry.length > 0;
+  const source = `generated:${agent}-shim`;
+
+  // Marker-free whole-file forms. `fullShim` is what a freshly created or regenerated
+  // file contains (for Codex + --command-adapters it already embeds the trigger).
+  // `baseShimBody` is the trigger-free shim wrapped in agent-shim markers when
+  // appended into a user-owned file.
+  const baseShimBody = substitutePlaceholders(buildAiAgentShim(target.relativePath), substitution);
+  const fullShim = substitutePlaceholders(buildAiAgentShim(target.relativePath, commandRegistry), substitution);
+  const agentShimBlock = wrapAgentShimBlock(baseShimBody);
+  const triggerBlock = wantsTrigger
+    ? substitutePlaceholders(buildCodexCommandTriggerSection(commandRegistry), substitution).trim()
+    : '';
+
+  // Case 1 — create the marker-free whole-file shim. A re-run recognizes it through
+  // the normalized template match (case 2a), so it needs no marker of its own.
+  if (!(await pathExists(targetPath))) {
+    items.push({
+      relativePath: target.relativePath,
+      source,
+      notes: 'selected, tool-specific shim',
+      content: fullShim,
+      action: 'create',
+      size: Buffer.byteLength(fullShim, 'utf8')
+    });
+    return;
+  }
+
+  const existingContent = await fs.readFile(targetPath, 'utf8');
+  const eol = detectDominantEol(existingContent);
+  const lf = existingContent.replace(/\r\n/g, '\n');
+  const agentRegion = classifyMarkedRegion(lf, AGENT_SHIM_SECTION_START, AGENT_SHIM_SECTION_END);
+  // Classify the Codex trigger region on EVERY AGENTS.md run (not only when we are
+  // about to manage the trigger): even a non---command-adapters run replaces the
+  // agent-shim region, and a trigger region that overlaps it would be corrupted by
+  // that slice. We only need the region for the safety gate below; trigger writes
+  // still happen only when wantsTrigger.
+  const triggerRegion = isCodex
+    ? classifyMarkedRegion(lf, CODEX_TRIGGER_SECTION_START, CODEX_TRIGGER_SECTION_END)
+    : { state: 'absent' };
+
+  // Case 2c — Dflow markers cannot be edited safely; fall back to a previewed merge
+  // snippet + warning and leave the file untouched. Three unsafe shapes:
+  //   - the agent-shim marker pair is malformed (can't locate the block to manage);
+  //   - we are managing the trigger (--command-adapters) and the trigger pair is
+  //     malformed (can't locate the block to update);
+  //   - the agent-shim and trigger regions overlap / interleave, which the independent
+  //     region slices below would corrupt. This is checked on EVERY AGENTS.md run,
+  //     adapter or not, because case 2b slices the agent-shim region regardless.
+  // A malformed trigger on a NON-adapter run is deliberately NOT a blanket fallback: we
+  // never touch the trigger there. But slicing the agent-shim block IS unsafe when
+  // trigger markers straddle its boundary (some inside, some outside) — removing the
+  // inside one(s) can promote the remaining outside markers into a new well-formed
+  // trigger region wrapping the regenerated block. `triggerStraddlesAgent` catches that
+  // on every AGENTS.md run (a fully-inside set is cleaned with the block, a fully-
+  // outside set is untouched — both safe). The fallback ALWAYS warns (also closing the
+  // R2-02 asymmetry). When only the trigger pair is malformed in a guide-configured file
+  // under --command-adapters (no agent/overlap/straddle issue), the base shim is already
+  // present, so the fallback is the trigger-only snippet (OQ#6c).
+  const regionsOverlap = agentRegion.state === 'present' && triggerRegion.state === 'present' &&
+    agentRegion.startIdx < triggerRegion.endIdx && triggerRegion.startIdx < agentRegion.endIdx;
+  const triggerStraddlesAgent = isCodex && agentRegion.state === 'present' &&
+    codexTriggerMarkersStraddle(lf, agentRegion.startIdx, agentRegion.endIdx);
+  if (agentRegion.state === 'malformed' || (wantsTrigger && triggerRegion.state === 'malformed') ||
+      regionsOverlap || triggerStraddlesAgent) {
+    const triggerOnlyFallback = wantsTrigger && triggerRegion.state === 'malformed' &&
+      agentRegion.state !== 'malformed' && !regionsOverlap && !triggerStraddlesAgent &&
+      contentReferencesAiAgentGuide(existingContent);
+    const snippetPath = triggerOnlyFallback
+      ? 'dflow/specs/shared/AGENTS-md-command-adapters-snippet.md'
+      : target.snippetPath;
+    const snippetContent = triggerOnlyFallback
+      ? substitutePlaceholders(buildCodexCommandTriggerSection(commandRegistry), substitution)
+      : fullShim;
+    if (warnings) {
+      warnings.push(
+        `Existing ${target.relativePath} contains malformed Dflow markers; left it untouched and wrote ${snippetPath} for manual merge. Remove the stray Dflow markers and re-run to let Dflow manage the block.`
+      );
+    }
+    items.push({
+      relativePath: snippetPath,
+      source,
+      notes: `selected, ${target.relativePath} has conflicting Dflow markers; merge this snippet manually`,
+      content: snippetContent,
+      overwrite: true,
+      snippetFallback: true
+    });
+    return;
+  }
+
+  // Case 2b — exactly one well-formed agent-shim block: replace it in place. For
+  // Codex + --command-adapters also (re)place the adjacent trigger block in the SAME
+  // item.
+  if (agentRegion.state === 'present') {
+    let updated = lf.slice(0, agentRegion.startIdx) + agentShimBlock + lf.slice(agentRegion.endIdx);
+    if (wantsTrigger) {
+      updated = upsertCodexTriggerBlock(updated, triggerBlock);
+    }
+    pushRootInjectItem(items, {
+      relativePath: target.relativePath,
+      source,
+      notes: `selected, updated Dflow block in existing ${target.relativePath}`,
+      content: applyEol(updated, eol),
+      expectedContent: existingContent
+    });
+    return;
+  }
+
+  // No agent-shim marker below.
+
+  // Case 2a — the whole file is a shim Dflow itself would generate (a pristine
+  // 0.8/0.9 shim, or an earlier whole-file injection): regenerate it (idempotent +
+  // migrate an older template forward), preserving the file's dominant EOL. When this
+  // run is not (re)generating a trigger, keep any trigger block the file already has.
+  if (isPristineDflowAgentsShim(existingContent, baseShimBody, target.relativePath)) {
+    let newWhole = fullShim;
+    if (!wantsTrigger && isCodex) {
+      const existingTrigger = extractCodexTriggerBlock(lf);
+      if (existingTrigger) {
+        newWhole = `${baseShimBody.replace(/\n+$/, '')}\n\n${existingTrigger.trim()}\n`;
+      }
+    }
+    pushRootInjectItem(items, {
+      relativePath: target.relativePath,
+      source,
+      notes: `selected, regenerated Dflow ${target.relativePath} shim`,
+      content: applyEol(newWhole, eol),
+      expectedContent: existingContent
+    });
+    return;
   }
 
+  // Case 2d — the file already references the guide but is neither pristine nor
+  // marker-managed (a guide-configured file the user wrote / heavily edited). Keep
+  // the base shim skipped so we never duplicate their guide pointer. Under Codex
+  // --command-adapters still install / update the self-delimited trigger block (OQ#6c).
+  if (contentReferencesAiAgentGuide(existingContent)) {
+    if (wantsTrigger) {
+      pushRootInjectItem(items, {
+        relativePath: target.relativePath,
+        source,
+        notes: `selected, installed Dflow command triggers into existing ${target.relativePath}`,
+        content: applyEol(upsertCodexTriggerBlock(lf, triggerBlock), eol),
+        expectedContent: existingContent
+      });
+    } else {
+      items.push({
+        relativePath: target.relativePath,
+        source,
+        notes: `selected, ${target.relativePath} already points to AI-AGENT-GUIDE.md`,
+        content: fullShim,
+        action: 'skip',
+        intentionalSkip: true,
+        size: Buffer.byteLength(fullShim, 'utf8')
+      });
+    }
+    return;
+  }
+
+  // Case 2e — user-owned, non-guide existing file: append the marked Dflow block(s)
+  // at end of file (the core new behavior; replaces the old snippet-park). Append-only,
+  // previewed, reversible (delete the block to revert), idempotent on re-run (case 2b).
+  const blocks = wantsTrigger ? [agentShimBlock, triggerBlock] : [agentShimBlock];
+  pushRootInjectItem(items, {
+    relativePath: target.relativePath,
+    source,
+    notes: `selected, appended Dflow block to existing ${target.relativePath}`,
+    content: appendDflowBlocks(existingContent, blocks, eol),
+    expectedContent: existingContent
+  });
+}
+
+// Push one plan item that edits a user-owned root agent file. The write phase
+// (writeFilePlan rootInject branch) re-reads the file and requires raw-byte equality
+// with `expectedContent` before writing, so a file changed between preview and write
+// is never clobbered. When the computed content already equals the file, record a
+// quiet idempotent skip instead of a no-op write.
+function pushRootInjectItem(items, { relativePath, source, notes, content, expectedContent }) {
+  const size = Buffer.byteLength(content, 'utf8');
+  if (content === expectedContent) {
+    items.push({
+      relativePath,
+      source,
+      notes: `${notes}; already current`,
+      content,
+      action: 'skip',
+      intentionalSkip: true,
+      size
+    });
+    return;
+  }
   items.push({
     relativePath,
-    source: `generated:${agent}-shim`,
+    source,
     notes,
     content,
-    overwrite: codexCommandAdapterSnippet
+    expectedContent,
+    action: 'update',
+    overwrite: true,
+    rootInject: true,
+    size
   });
 }
 
-async function fileReferencesAiAgentGuide(targetPath) {
-  try {
-    const content = await fs.readFile(targetPath, 'utf8');
-    return content.includes('dflow/specs/shared/AI-AGENT-GUIDE.md') ||
-      content.includes('dflow\\specs\\shared\\AI-AGENT-GUIDE.md');
-  } catch {
-    return false;
+function contentReferencesAiAgentGuide(content) {
+  return content.includes('dflow/specs/shared/AI-AGENT-GUIDE.md') ||
+    content.includes('dflow\\specs\\shared\\AI-AGENT-GUIDE.md');
+}
+
+function wrapAgentShimBlock(shimBody) {
+  const body = shimBody.replace(/\n+$/, '');
+  return `${AGENT_SHIM_SECTION_START}\n${body}\n${AGENT_SHIM_SECTION_END}`;
+}
+
+// Append `block` (LF) at end of `lfContent` (LF) with a one-blank-line separator,
+// preserving the existing content and its final-newline convention exactly — trailing
+// whitespace is never stripped. Returns LF.
+function appendBlockLf(lfContent, block) {
+  if (lfContent === '') {
+    return `${block}\n`;
+  }
+  if (lfContent.endsWith('\n\n')) {
+    return `${lfContent}${block}\n`;
+  }
+  if (lfContent.endsWith('\n')) {
+    return `${lfContent}\n${block}\n`;
   }
+  return `${lfContent}\n\n${block}\n`;
+}
+
+// Append Dflow blocks at end of an existing user file. The user's content is kept in
+// full (never stripped or reordered) and the final-newline convention is preserved —
+// only a one-blank-line separator is added. The whole result is emitted in the file's
+// dominant EOL (the approved EOL policy), so a pure LF / pure CRLF user prefix
+// round-trips byte-for-byte. `blocks` are LF strings.
+function appendDflowBlocks(existingContent, blocks, eol) {
+  const lf = existingContent.replace(/\r\n/g, '\n');
+  return applyEol(appendBlockLf(lf, blocks.join('\n\n')), eol);
+}
+
+// Replace an existing well-formed Codex trigger block, or append one at EOF preserving
+// the existing content + final-newline convention (no stripping). Assumes the trigger
+// markers are absent or a single well-formed pair (malformed is handled upstream as a
+// snippet fallback). `lfContent` / `triggerBlock` are LF strings.
+function upsertCodexTriggerBlock(lfContent, triggerBlock) {
+  const region = classifyMarkedRegion(lfContent, CODEX_TRIGGER_SECTION_START, CODEX_TRIGGER_SECTION_END);
+  if (region.state === 'present') {
+    return lfContent.slice(0, region.startIdx) + triggerBlock + lfContent.slice(region.endIdx);
+  }
+  return appendBlockLf(lfContent, triggerBlock);
+}
+
+function extractCodexTriggerBlock(content) {
+  const region = classifyMarkedRegion(content, CODEX_TRIGGER_SECTION_START, CODEX_TRIGGER_SECTION_END);
+  return region.state === 'present' ? content.slice(region.startIdx, region.endIdx) : null;
+}
+
+// Classify a START/END marker pair in `content`:
+//   'absent'    neither marker appears
+//   'present'   exactly one START and one END, in order (startIdx/endIdx returned)
+//   'malformed' any other shape (partial / duplicated / nested / reversed)
+// The markers are single-line HTML comments, so classification is identical on raw or
+// LF-normalized content; callers slice on whichever string they passed in.
+function classifyMarkedRegion(content, startMarker, endMarker) {
+  const startCount = countOccurrences(content, startMarker);
+  const endCount = countOccurrences(content, endMarker);
+  if (startCount === 0 && endCount === 0) {
+    return { state: 'absent' };
+  }
+  if (startCount === 1 && endCount === 1) {
+    const startIdx = content.indexOf(startMarker);
+    const endInner = content.indexOf(endMarker);
+    if (startIdx < endInner) {
+      return { state: 'present', startIdx, endIdx: endInner + endMarker.length };
+    }
+  }
+  return { state: 'malformed' };
+}
+
+function countOccurrences(haystack, needle) {
+  if (!needle) {
+    return 0;
+  }
+  let count = 0;
+  let index = haystack.indexOf(needle);
+  while (index !== -1) {
+    count += 1;
+    index = haystack.indexOf(needle, index + needle.length);
+  }
+  return count;
+}
+
+function markerPositions(content, marker) {
+  const positions = [];
+  let index = content.indexOf(marker);
+  while (index !== -1) {
+    positions.push(index);
+    index = content.indexOf(marker, index + marker.length);
+  }
+  return positions;
+}
+
+// True when Codex trigger markers cross the [start, end) boundary — at least one inside
+// and at least one outside. Slicing [start, end) (the case-2b agent-shim replace) is
+// then unsafe: removing the inside marker(s) can leave the outside marker(s) forming a
+// new well-formed trigger region wrapping the regenerated block. All-inside (removed
+// with the block) and all-outside (untouched) are both safe; only a boundary cross is.
+function codexTriggerMarkersStraddle(content, start, end) {
+  const positions = [
+    ...markerPositions(content, CODEX_TRIGGER_SECTION_START),
+    ...markerPositions(content, CODEX_TRIGGER_SECTION_END)
+  ];
+  const inside = positions.some((position) => position >= start && position < end);
+  const outside = positions.some((position) => position < start || position >= end);
+  return inside && outside;
+}
+
+// Dominant line ending of a user file, so injected blocks match it (Windows projects
+// may be CRLF). The repo's own LF policy (.gitattributes) governs repo files only, not
+// an adopter's project files.
+function detectDominantEol(content) {
+  const crlf = (content.match(/\r\n/g) || []).length;
+  const lfOnly = (content.match(/\n/g) || []).length - crlf;
+  return crlf > lfOnly ? '\r\n' : '\n';
+}
+
+function applyEol(content, eol) {
+  const normalized = content.replace(/\r\n/g, '\n');
+  return eol === '\r\n' ? normalized.replace(/\n/g, '\r\n') : normalized;
 }
 
 function getAiAgentTarget(agent) {
@@ -1371,9 +1860,36 @@ function buildAiAgentShim(targetPath, commandRegistry = []) {
     ? buildCodexCommandTriggerSection(commandRegistry)
     : '';
 
-  const importHint = targetPath === 'CLAUDE.md'
-    ? '\nIf your tool supports Markdown imports, the canonical guide is imported below:\n\n@dflow/specs/shared/AI-AGENT-GUIDE.md\n'
-    : '';
+  return `# ${title}
+
+This project uses Dflow for spec-first AI-assisted development.
+
+For spec-impacting work — a new feature, a change to product, user-facing, or
+domain behavior, a new requirement, or a bug-fix workflow — read and follow:
+
+- \`dflow/specs/shared/AI-AGENT-GUIDE.md\` — command registry, routing rules, and project context.
+- \`dflow/specs/shared/dflow-workflows/\` — vendored workflow bundle with executable step definitions.
+
+For routine work (refactors, renames, chores, formatting, dependency bumps, or
+general code questions), proceed normally; you need not read the guide first.
+
+Keep tool-specific instruction files small. The guide and workflow bundle are
+the authoritative sources for Dflow workflow rules, slash-command behavior,
+spec locations, and SDD/DDD constraints.${commandTriggerHint}
+`;
+}
+
+// Frozen pre-scoping shim body (the wording shipped through v0.9.0 and the
+// Phase-2 @import-removal interim: "Before planning or editing code ..."). Used
+// ONLY by isPristineDflowAgentsShim so an adopter's older whole-file shim is
+// still recognized as Dflow-generated and regenerated to the current scoped
+// wording. Changing buildAiAgentShim's body without updating this matcher would
+// strand old shims on the guide-reference skip path — they would keep the old
+// body, and for CLAUDE.md the legacy @import.
+function buildLegacyAgentShimBody(targetPath) {
+  const title = targetPath === '.github/copilot-instructions.md'
+    ? 'GitHub Copilot Repository Instructions'
+    : `${targetPath} - Dflow Project Instructions`;
 
   return `# ${title}
 
@@ -1386,7 +1902,7 @@ Before planning or editing code, read and follow:
 
 Keep tool-specific instruction files small. The guide and workflow bundle are
 the authoritative sources for Dflow workflow rules, slash-command behavior,
-spec locations, and SDD/DDD constraints.${commandTriggerHint}${importHint}
+spec locations, and SDD/DDD constraints.
 `;
 }
 
@@ -1469,52 +1985,84 @@ async function buildDflowSkillAdapter() {
   return fs.readFile(sourcePath, 'utf8');
 }
 
+// Project-level skill paths per AI agent. Claude, Codex (the `agents` key,
+// labeled "Codex / Copilot coding agent"), and GitHub Copilot each get the SAME
+// edition-neutral thin skill projected to their own canonical skill path.
+// PROPOSAL-056 generalized this; the Copilot native projection (`.github/skills`)
+// was un-deferred after a spike confirmed Copilot discovers and auto-triggers a
+// skill from its own path with the cross-read `.claude`/`.agents` paths removed.
+// Note: Copilot also cross-reads `.claude/skills` and `.agents/skills`, so a
+// project that selects Copilot alongside Claude/Codex may surface the same
+// `dflow` skill from more than one path. The copies Dflow *generates* are
+// byte-identical (same name, body, and marker), so duplicate generated copies
+// carry identical behavior — but this duplicate-discovery case is not spiked,
+// and a pre-existing non-Dflow skill at a cross-read path is left unchanged by
+// the overwrite guard below and could differ. Remove/rename such a file to
+// avoid a divergent same-name duplicate.
+const SKILL_ADAPTER_TARGETS = {
+  claude: { relativePath: '.claude/skills/dflow/SKILL.md', source: 'generated:claude-skill-adapter' },
+  agents: { relativePath: '.agents/skills/dflow/SKILL.md', source: 'generated:agents-skill-adapter' },
+  copilot: { relativePath: '.github/skills/dflow/SKILL.md', source: 'generated:copilot-skill-adapter' }
+};
+
 async function addSkillAdapterItems(cwd, items, aiAgents, skills, warnings) {
   if (!skills) {
     return;
   }
 
-  if (!aiAgents.includes('claude')) {
+  const skillTargets = aiAgents
+    .filter((agent) => SKILL_ADAPTER_TARGETS[agent])
+    .map((agent) => SKILL_ADAPTER_TARGETS[agent]);
+
+  if (skillTargets.length === 0) {
+    // No skill-capable agent was selected at all. Nothing to project.
     warnings.push(
-      'The --skills flag currently supports Claude Code only; no skill adapter was generated because Claude Code was not a selected target.'
+      'The --skills flag projects a project-level skill for Claude Code, Codex, and GitHub Copilot; no skill adapter was generated because none was a selected target.'
     );
     return;
   }
 
-  const relativePath = '.claude/skills/dflow/SKILL.md';
-  const targetPath = path.join(cwd, relativePath);
-
   // The thin skill is edition-neutral (it only points to the per-edition guide),
   // so there is nothing edition-specific to go stale — re-running just rewrites
   // the same marker-guarded file (idempotent). No LEGACY skill set exists yet
   // (skills are new in PROPOSAL-038); future skill cleanup would extend the same
   // LEGACY_* / addLegacyCommandAdapterCleanupItems marker-fingerprint pattern.
-  let existingContent;
-  try {
-    existingContent = await fs.readFile(targetPath, 'utf8');
-  } catch (error) {
-    if (error.code !== 'ENOENT') {
-      throw error;
+  const skillContent = await buildDflowSkillAdapter();
+
+  for (const target of skillTargets) {
+    const targetPath = path.join(cwd, target.relativePath);
+
+    let existingContent;
+    try {
+      existingContent = await fs.readFile(targetPath, 'utf8');
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        throw error;
+      }
+      existingContent = undefined;
     }
-    existingContent = undefined;
-  }
 
-  if (existingContent !== undefined && !existingContent.includes(SKILL_ADAPTER_GENERATED_MARKER)) {
-    warnings.push(
-      'Existing .claude/skills/dflow/SKILL.md is not a Dflow-generated skill; left unchanged. Remove or rename it to let Dflow manage this skill.'
-    );
-    return;
-  }
+    if (existingContent !== undefined && !existingContent.includes(SKILL_ADAPTER_GENERATED_MARKER)) {
+      warnings.push(
+        `Existing ${target.relativePath} is not a Dflow-generated skill; left unchanged. Remove or rename it to let Dflow manage this skill.`
+      );
+      continue;
+    }
 
-  const skillContent = await buildDflowSkillAdapter();
-  items.push({
-    relativePath,
-    source: 'generated:claude-skill-adapter',
-    notes: 'skill adapter, thin skill pointing to AI-AGENT-GUIDE.md',
-    content: skillContent,
-    size: Buffer.byteLength(skillContent, 'utf8'),
-    overwrite: true
-  });
+    // addSkillAdapterItems runs AFTER finalizePlanItems, so these items never pass
+    // through that pass — set `action` explicitly here (the preview table and the
+    // result report read item.action directly). `overwrite: true` keeps the write
+    // phase rewriting an existing marker-stamped skill.
+    items.push({
+      relativePath: target.relativePath,
+      source: target.source,
+      notes: 'skill adapter, thin skill pointing to AI-AGENT-GUIDE.md',
+      content: skillContent,
+      size: Buffer.byteLength(skillContent, 'utf8'),
+      overwrite: true,
+      action: existingContent === undefined ? 'create' : 'update'
+    });
+  }
 }
 
 function buildLegacyCommandAdapterFingerprint(legacy, command) {
@@ -1544,6 +2092,63 @@ function normalizeCommandAdapterFingerprint(content) {
   return String(content).replace(/\r\n/g, '\n');
 }
 
+function normalizeShimForMatch(content) {
+  return String(content)
+    .replace(/\r\n/g, '\n')
+    .split('\n')
+    .map((line) => line.replace(/[ \t]+$/, ''))
+    .join('\n')
+    .replace(/\n{3,}/g, '\n\n')
+    .trim();
+}
+
+function stripCodexTriggerBlock(content) {
+  const escape = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const re = new RegExp(
+    `\\n*${escape(CODEX_TRIGGER_SECTION_START)}[\\s\\S]*?${escape(CODEX_TRIGGER_SECTION_END)}\\n*`
+  );
+  return content.replace(re, '\n');
+}
+
+// Removes the pre-Phase-2 Markdown `@import` block that old CLAUDE.md shims
+// appended after the shim body. Operates on already-normalized content (LF, no
+// trailing whitespace, blank runs collapsed, trimmed — see normalizeShimForMatch),
+// so editor-added trailing spaces, CRLF, or an extra blank line in an old file
+// do not defeat the match.
+function stripLegacyImportSuffix(normalizedContent) {
+  return normalizedContent.replace(
+    /\n+If your tool supports Markdown imports, the canonical guide is imported below:\n+@dflow\/specs\/shared\/AI-AGENT-GUIDE\.md$/,
+    ''
+  );
+}
+
+// A CLAUDE.md / AGENTS.md is a safely-injectable Dflow shim when, after removing
+// any previously-injected trigger block, it matches the shim Dflow itself
+// generates. This covers a pristine 0.8.0/0.9.0 shim (no marker, normalized
+// template match) and a shim Dflow already injected into (idempotent
+// re-projection). For CLAUDE.md ONLY, a pre-Phase-2 shim that still carries the
+// legacy `@import` also counts and is regenerated WITHOUT it, so the
+// progressive-disclosure fix reaches existing projects. The import was only ever
+// generated into CLAUDE.md, so scoping the strip there avoids clobbering a
+// user-added import block in a hand-edited AGENTS.md / Copilot shim. A
+// user-edited shim otherwise fails the match and degrades to a snippet.
+function isPristineDflowAgentsShim(existingContent, baseShim, relativePath) {
+  const target = normalizeShimForMatch(baseShim);
+  let existing = normalizeShimForMatch(stripCodexTriggerBlock(existingContent));
+  if (relativePath === 'CLAUDE.md') {
+    existing = stripLegacyImportSuffix(existing);
+  }
+  if (existing === target) {
+    return true;
+  }
+  // Back-compat: older Dflow shims (v0.9.0 / Phase-2 interim) used different body
+  // wording ("Before planning or editing code ..."). Recognize that frozen
+  // wording as pristine so configure-agents regenerates it to the current scoped
+  // wording (and, for CLAUDE.md, drops the legacy @import already stripped above).
+  // Without this, the body reword would strand old shims on the skip path.
+  return existing === normalizeShimForMatch(buildLegacyAgentShimBody(relativePath));
+}
+
 function buildCodexCommandTriggerSection(commandRegistry) {
   const triggers = commandRegistry
     .map((command) => {
@@ -1554,6 +2159,8 @@ function buildCodexCommandTriggerSection(commandRegistry) {
 
   return `
 
+${CODEX_TRIGGER_SECTION_START}
+
 ## Dflow Text Triggers
 
 Codex does not install Dflow command files. When the developer asks for a
@@ -1568,6 +2175,8 @@ and execute it.
 Recognized canonical triggers:
 
 ${triggers}
+
+${CODEX_TRIGGER_SECTION_END}
 `;
 }
 
@@ -1757,8 +2366,7 @@ const PLACEHOLDER_ALIASES = {
 
 function buildSubstitutionMap(cwd, answers) {
   const extracted = extractTechStackPlaceholders(answers.techStackSummary);
-  const gitSelection = answers.optionalFiles.filter((key) => key === 'git-trunk' || key === 'git-flow');
-  const gitStyle = gitSelection.length === 1 ? (gitSelection[0] === 'git-trunk' ? 'trunk' : 'gitflow') : null;
+  const gitStyle = answers.gitPolicy === 'gitflow' ? 'gitflow' : (answers.gitPolicy === 'trunk' ? 'trunk' : null);
   const systemName = path.basename(cwd);
 
   const map = new Map([
@@ -1990,6 +2598,70 @@ function stripProseLanguageSections(content) {
   return kept.join('\n');
 }
 
+function stripNamedSections(content, headings) {
+  const set = new Set(headings.map((heading) => `## ${heading}`));
+  const kept = [];
+  let skipping = false;
+
+  for (const line of content.split(/\r?\n/)) {
+    if (set.has(line.trim())) {
+      skipping = true;
+      continue;
+    }
+    if (skipping && /^## /.test(line)) {
+      skipping = false;
+    }
+    if (!skipping) {
+      kept.push(line);
+    }
+  }
+
+  return kept.join('\n');
+}
+
+function buildGitPolicySection(gitPolicy) {
+  const policy = gitPolicy === 'gitflow' ? 'gitflow' : 'trunk';
+  return `## Git Policy
+
+Selected Git policy: \`${policy}\`
+
+Dflow runtime branch gates and finish-feature guidance follow this policy. Both
+policies use feature branches; the policy selects the finish-stage merge
+guidance — \`gitflow\` introduces merge-commit / release+develop flow, while
+\`trunk\` (GitHub Flow) favors squash or fast-forward back to the main branch
+with small, frequent merges.`;
+}
+
+function buildAiCommitPolicySection(aiCommitMarker) {
+  const marker = ['none', 'co-authored-by', 'prefix'].includes(aiCommitMarker) ? aiCommitMarker : 'none';
+  return `## AI Commit Policy
+
+AI commit marker: \`${marker}\`
+
+At lifecycle checkpoints the AI may offer to commit using your Git identity; you
+can always decline (Y / N). Completed and skipped checkpoints are recorded in
+each feature's Checkpoint Log. Marker modes:
+
+- \`none\`: AI-made commits carry no extra marker.
+- \`co-authored-by\`: append a \`Co-Authored-By: dflow-ai <noreply@dflow.local>\`
+  trailer (teams may customize the name/email).
+- \`prefix\`: prefix the commit subject with \`[ai-assisted]\`.`;
+}
+
+function ensureConventionPolicySections(content, answers) {
+  const stripped = stripNamedSections(content, ['Git Policy', 'AI Commit Policy']).replace(/\n{3,}/g, '\n\n');
+  const sections = `${buildGitPolicySection(answers.gitPolicy)}\n\n${buildAiCommitPolicySection(answers.aiCommitMarker)}`;
+  const markerMatch = stripped.match(/^## Filling the Templates/m);
+
+  if (markerMatch && typeof markerMatch.index === 'number') {
+    const before = stripped.slice(0, markerMatch.index).replace(/\s*$/, '\n\n');
+    const after = stripped.slice(markerMatch.index).replace(/^\s*/, '');
+    return `${before}${sections}\n\n${after}`;
+  }
+
+  return `${stripped.replace(/\s*$/, '\n\n')}${sections}\n`;
+}
+
 function buildProseLanguageSection(proseLanguage) {
   return `## Prose Language
 
@@ -2058,7 +2730,7 @@ async function writeFilePlan(cwd, plan) {
         } catch (error) {
           if (error.code === 'ENOENT') {
             result.skipped.push(item.relativePath);
-            result.warnings.push(`Skipped missing stale adapter: ${item.relativePath}`);
+            result.warnings.push(`Skipped missing stale file: ${item.relativePath}`);
             continue;
           }
           throw error;
@@ -2066,14 +2738,14 @@ async function writeFilePlan(cwd, plan) {
 
         if (!stats.isFile()) {
           result.skipped.push(item.relativePath);
-          result.warnings.push(`Skipped stale adapter removal because target is not a file: ${item.relativePath}`);
+          result.warnings.push(`Skipped stale removal because target is not a file: ${item.relativePath}`);
           continue;
         }
 
         const currentContent = await fs.readFile(targetPath, 'utf8');
         if (normalizeCommandAdapterFingerprint(currentContent) !== normalizeCommandAdapterFingerprint(item.expectedContent || '')) {
           result.skipped.push(item.relativePath);
-          result.warnings.push(`Skipped stale adapter removal because content changed after preview: ${item.relativePath}`);
+          result.warnings.push(`Skipped stale removal because content changed after preview: ${item.relativePath}`);
           continue;
         }
 
@@ -2082,6 +2754,45 @@ async function writeFilePlan(cwd, plan) {
         continue;
       }
 
+      // PROPOSAL-054: a user-owned root agent file edit (append / replace / regenerate).
+      // Re-read and require RAW-byte equality with the previewed content before writing,
+      // so a file the user changed (or deleted, or replaced with a non-file) between the
+      // preview and the write is never clobbered — skip + warn + ask them to re-run. Raw
+      // equality is intentionally stricter than the normalized compare used for stale
+      // removal: any whitespace / EOL change counts as "changed after preview".
+      if (item.rootInject) {
+        let stats;
+        try {
+          stats = await fs.stat(targetPath);
+        } catch (error) {
+          if (error.code === 'ENOENT') {
+            result.skipped.push(item.relativePath);
+            result.warnings.push(`Skipped Dflow block update because ${item.relativePath} no longer exists; re-run to inject the Dflow block.`);
+            continue;
+          }
+          throw error;
+        }
+        if (!stats.isFile()) {
+          result.skipped.push(item.relativePath);
+          result.warnings.push(`Skipped Dflow block update because ${item.relativePath} is no longer a regular file; re-run to inject the Dflow block.`);
+          continue;
+        }
+        const currentRaw = await fs.readFile(targetPath, 'utf8');
+        if (currentRaw !== item.expectedContent) {
+          result.skipped.push(item.relativePath);
+          result.warnings.push(`Skipped Dflow block update because ${item.relativePath} changed after the preview; re-run to inject the Dflow block.`);
+          continue;
+        }
+        if (item.content === currentRaw) {
+          result.skipped.push(item.relativePath);
+          continue;
+        }
+        await fs.mkdir(path.dirname(targetPath), { recursive: true });
+        await fs.writeFile(targetPath, item.content);
+        result.updated.push(item.relativePath);
+        continue;
+      }
+
       if (await pathExists(targetPath)) {
         if (item.overwrite) {
           await fs.mkdir(path.dirname(targetPath), { recursive: true });
@@ -2091,7 +2802,12 @@ async function writeFilePlan(cwd, plan) {
         }
 
         result.skipped.push(item.relativePath);
-        result.warnings.push(`Skipped existing target: ${item.relativePath}`);
+        // PROPOSAL-054: an intentional skip (an already-configured agent file, or an
+        // already-current Dflow block) is expected, not a problem — don't emit the
+        // generic "skipped existing target" warning for it.
+        if (!item.intentionalSkip) {
+          result.warnings.push(`Skipped existing target: ${item.relativePath}`);
+        }
         if (item.relativePath === 'dflow/specs/shared/_conventions.md') {
           result.warnings.push(
             'Prose language was not written because dflow/specs/shared/_conventions.md already exists. Ensure it contains exactly one ## Prose Language section before running prose-generating flows.'
@@ -2100,6 +2816,15 @@ async function writeFilePlan(cwd, plan) {
         continue;
       }
 
+      // PROPOSAL-054: a plan item previewed as "skip" (an already-configured agent
+      // file, or an already-current Dflow block) must never write. If its target
+      // vanished between preview and write, do nothing — do NOT silently create a
+      // file the preview said would be left alone.
+      if (item.action === 'skip') {
+        result.skipped.push(item.relativePath);
+        continue;
+      }
+
       await fs.mkdir(path.dirname(targetPath), { recursive: true });
       await fs.writeFile(targetPath, item.content, { flag: 'wx' });
 
@@ -2214,20 +2939,25 @@ Recommended next steps:
 `);
 }
 
-function printConfigureAgentsNextSteps(stdout, commandAdapters = false) {
+function printConfigureAgentsNextSteps(stdout, commandAdapters = false, snippetFallback = false) {
   const commandAdapterStep = commandAdapters
     ? '- Command adapters use tool-specific invocation names: Claude Code `/dflow:<id>`; GitHub Copilot prompt menu `/dflow-<id>` or canonical `/dflow:<id>` as text; Codex CLI plain text without a slash, such as `dflow:status`. Canonical `/dflow:*` names remain defined in dflow/specs/shared/AI-AGENT-GUIDE.md. If upgrading from Dflow 0.5.0, stale `.claude/commands/dflow/dflow-*.md` files generated by 0.5.0 are detected and listed for removal in the confirmation preview, so Claude Code does not show both old and new command names; edited or non-Dflow files are kept with a warning.\n'
     : '';
 
+  // PROPOSAL-054: Dflow now auto-injects the marker-delimited block into existing
+  // agent files, so the merge-snippet step is shown only when a genuine-conflict
+  // fallback snippet was actually written this run.
+  const snippetStep = snippetFallback
+    ? '- A merge snippet was written because an existing agent file had conflicting Dflow markers; review it, fix or remove the stray markers, then merge the Dflow block into that file (or re-run to let Dflow manage it).\n'
+    : '';
+
   stdout.write(`
 Dflow AI agent configuration complete.
 
 Recommended next steps:
 - Keep AI-agent-specific root files small.
 - Put durable workflow changes in dflow/specs/shared/AI-AGENT-GUIDE.md.
-- If a merge snippet was created, review it and merge the pointer into the existing tool instruction file.
-${commandAdapterStep}
-`);
+${snippetStep}${commandAdapterStep}`);
 }
 
 function printList(stdout, values) {
@@ -2329,6 +3059,7 @@ async function runDoctor(options = {}) {
     await checkLegacyRootSpecsDir(cwd, findings);
     await checkLegacySharedDir(cwd, findings);
     await checkConventionsDflowVersion(cwd, findings);
+    await checkOrphanedWorkflowBundleFiles(cwd, findings);
 
     printDoctorReport(stdout, cwd, findings);
     return 0;
@@ -2386,6 +3117,69 @@ async function checkConventionsDflowVersion(cwd, findings) {
   }
 }
 
+// PROPOSAL-052 (c): read-only mop-up for the manifest-orphan edge. A
+// Dflow-generated bundle file that is no longer in the current package source
+// can linger if it was retired before generalized stale-removal shipped, or the
+// project was projected from a pre-release / non-registry source whose manifest
+// later forgot it. configure-agents only auto-removes files the manifest still
+// lists; a manifest-orphaned file (the manifest no longer lists it) must be
+// deleted by hand. Doctor detects and reports such files read-only (never
+// deletes). Detection requires a directory scan because, by definition, the
+// manifest no longer lists the orphan — but a read-only scan is safe here.
+async function checkOrphanedWorkflowBundleFiles(cwd, findings) {
+  const bundleDir = path.join(cwd, WORKFLOW_BUNDLE_DEST);
+  if (!(await pathExists(bundleDir))) return;
+
+  const edition = await inferProjectBundleEdition(cwd);
+  if (!edition) return;
+
+  let sourceFiles;
+  try {
+    sourceFiles = await listBundleSourceFiles(edition);
+  } catch {
+    return;
+  }
+  const sourceRel = new Set(sourceFiles.map((f) => `${WORKFLOW_BUNDLE_DEST}/${f.sourceRel}`));
+
+  for (const dir of ['references', 'templates']) {
+    const projectedDir = path.join(bundleDir, dir);
+    let entries;
+    try {
+      entries = await fs.readdir(projectedDir);
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      const rel = `${WORKFLOW_BUNDLE_DEST}/${dir}/${entry}`;
+      if (sourceRel.has(rel)) continue;
+      const abs = path.join(projectedDir, entry);
+      const fileStat = await fs.stat(abs).catch(() => null);
+      if (!fileStat || !fileStat.isFile()) continue;
+      const content = await fs.readFile(abs, 'utf8').catch(() => '');
+      if (!content.includes(WORKFLOW_BUNDLE_GENERATED_MARKER)) continue;
+      findings.push({
+        level: 'info',
+        title: `Retired workflow bundle file: ${rel}`,
+        detail: 'A Dflow-generated bundle file that is no longer part of the package source for this edition (a retired file left behind).',
+        action: 'Delete it manually to remove it. (Re-running `dflow configure-agents` only auto-removes files the manifest still lists; a manifest-orphaned file must be deleted by hand.)'
+      });
+    }
+  }
+}
+
+// Infers the project's bundle edition for read-only checks: prefer the manifest
+// (authoritative for what was projected), fall back to project structure.
+async function inferProjectBundleEdition(cwd) {
+  const manifestResult = await readCurrentBundleManifest(cwd);
+  if (
+    manifestResult.kind === 'ok' &&
+    (manifestResult.manifest.edition === 'greenfield' || manifestResult.manifest.edition === 'brownfield')
+  ) {
+    return manifestResult.manifest.edition;
+  }
+  return inferExistingEdition(cwd);
+}
+
 function printDoctorReport(stdout, cwd, findings) {
   stdout.write(`Dflow Doctor ${pkg.version}\n`);
   stdout.write(`Project: ${cwd}\n\n`);
@@ -2413,5 +3207,9 @@ module.exports = {
   runInit,
   validateProseLanguage,
   ensureProseLanguageSection,
-  buildFilePlan
+  buildFilePlan,
+  // Exported for tests: the write phase enforces the PROPOSAL-054 raw-equality guard
+  // for user-owned root agent files (changed-after-preview -> skip), which cannot be
+  // exercised through the CLI because preview and write happen in one process.
+  writeFilePlan
 };