@cleocode/core 2026.10.5 → 2026.10.6

package/dist/scaffold/ensure-config.d.ts

@@ -3,6 +3,7 @@
  * project-info.json, and related template/version utilities.
  */
 import type { ScaffoldResult } from '@cleocode/contracts/scaffold-diagnostics';
+import type { UpgradeFileJournal } from './upgrade-file-journal.js';
 /**
  * Resolve the `.cleo` directory for scaffold steps.
  *
@@ -73,33 +74,43 @@ export declare function getCleoVersion(): string;
  */
 export declare function createDefaultConfig(): Record<string, unknown>;
 /**
- * Create or repair .cleo/.gitignore from template.
- * Idempotent: skips if file already exists with correct content.
+ * Options for the repair of user-owned rule files
+ * ({@link ensureGitignore}, {@link ensureWorktreeInclude}).
+ */
+export interface RuleFileRepairOptions {
+    /** Journal that backs up the file before it changes and lists it (upgrade, T13409). */
+    journal?: UpgradeFileJournal;
+}
+/**
+ * Create .cleo/.gitignore from the template, or append the template rules an
+ * existing file lacks. Idempotent; never drops or reorders the user's lines (T13409).
  *
  * @param projectRoot - Absolute path to the project root directory
+ * @param opts - Backup journal (upgrade)
  * @returns Scaffold result indicating whether the gitignore was created, repaired, or skipped
  */
-export declare function ensureGitignore(projectRoot: string): Promise<ScaffoldResult>;
+export declare function ensureGitignore(projectRoot: string, opts?: RuleFileRepairOptions): Promise<ScaffoldResult>;
 /**
- * Create or repair `.worktreeinclude` (canonical, at project root) from the
- * shipped template. Idempotent — skips when the existing file already
- * matches the template byte-for-byte (after CR-LF + trim normalisation).
+ * Create `.worktreeinclude` (canonical, at project root) from the shipped
+ * template, or append the template entries an existing file lacks.
+ * Idempotent; never drops or reorders the user's lines (T13409).
  *
  * Resolution rules (T9983):
- * - If `<projectRoot>/.worktreeinclude` already exists → keep + compare to
- *   the template; repair if drifted.
+ * - If `<projectRoot>/.worktreeinclude` already exists → keep it and append
+ *   only the missing template entries.
  * - Else if legacy `<projectRoot>/.cleo/worktree-include` exists → SKIP
  *   (do not overwrite the legacy file in place; `cleo doctor
  *   --migrate-worktree-include` is the explicit migration path).
  * - Else → write the canonical template.
  *
  * @param projectRoot - Absolute path to the project root directory
+ * @param opts - Backup journal (upgrade)
  * @returns Scaffold result indicating whether `.worktreeinclude` was
  *          created, repaired, or skipped.
  *
  * @task T9983
  */
-export declare function ensureWorktreeInclude(projectRoot: string): Promise<ScaffoldResult>;
+export declare function ensureWorktreeInclude(projectRoot: string, opts?: RuleFileRepairOptions): Promise<ScaffoldResult>;
 /**
  * Create default config.json if missing.
  * Idempotent: skips if file already exists.

package/dist/scaffold/ensure-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-config.d.ts","sourceRoot":"","sources":["../../src/scaffold/ensure-config.ts"],"names":[],"mappings":"AACA;;;GAGG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAM/E;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAWlE;AAED;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,ihDAwDnC,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,oaAarC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAKvC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAW5C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAelD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAQvC;AAgBD;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoD7D;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAiBlF;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA6BxF;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GACzB,OAAO,CAAC,cAAc,CAAC,CAsCzB;AAaD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,GACpD,OAAO,CAAC,cAAc,CAAC,CA0IzB;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAMvF"}
+{"version":3,"file":"ensure-config.d.ts","sourceRoot":"","sources":["../../src/scaffold/ensure-config.ts"],"names":[],"mappings":"AACA;;;GAGG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAK/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAWlE;AAED;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,ihDAwDnC,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,oaAarC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAKvC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAW5C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAelD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAQvC;AAgBD;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoD7D;AAKD;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,uFAAuF;IACvF,OAAO,CAAC,EAAE,kBAAkB,CAAC;CAC9B;AAiCD;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,qBAAqB,GAC3B,OAAO,CAAC,cAAc,CAAC,CAWzB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,qBAAqB,GAC3B,OAAO,CAAC,cAAc,CAAC,CAuBzB;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GACzB,OAAO,CAAC,cAAc,CAAC,CAsCzB;AAaD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,GACpD,OAAO,CAAC,cAAc,CAAC,CAoJzB;AAWD;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAMvF"}

package/dist/scaffold/ensure-config.js

@@ -267,60 +267,78 @@ export function createDefaultConfig() {
         },
     };
 }
+/** Comment written above rules a repair appends to a user-owned ignore/include file. */
+const APPENDED_RULES_HEADER = '# Added by cleo: CLEO-required entries missing from this file';
 /**
- * Create or repair .cleo/.gitignore from template.
- * Idempotent: skips if file already exists with correct content.
+ * Append the template entries an existing rule file lacks, never dropping or
+ * reordering the user's lines (T13409).
+ *
+ * A bare `*` is never appended: in a file without it, the user chose not to
+ * deny everything, and a trailing `*` would override every allow rule they wrote.
+ */
+async function repairRuleFile(path, templateContent, opts) {
+    // Loaded lazily: this module is on the startup path of read commands (gate 39).
+    const { appendMissingLines, writeIfChanged } = await import('./upgrade-file-journal.js');
+    const existing = readFileSync(path, 'utf-8');
+    const template = templateContent
+        .split(/\r?\n/)
+        .filter((line) => line.trim() !== '*')
+        .join('\n');
+    const { content, added } = appendMissingLines(existing, template, APPENDED_RULES_HEADER);
+    if (added.length === 0) {
+        return { action: 'skipped', path, details: 'All CLEO-required entries present' };
+    }
+    await writeIfChanged(path, content, opts?.journal);
+    return {
+        action: 'repaired',
+        path,
+        details: `Appended ${added.length} missing CLEO-required entr${added.length === 1 ? 'y' : 'ies'}: ${added.join(', ')}`,
+    };
+}
+/**
+ * Create .cleo/.gitignore from the template, or append the template rules an
+ * existing file lacks. Idempotent; never drops or reorders the user's lines (T13409).
  *
  * @param projectRoot - Absolute path to the project root directory
+ * @param opts - Backup journal (upgrade)
  * @returns Scaffold result indicating whether the gitignore was created, repaired, or skipped
  */
-export async function ensureGitignore(projectRoot) {
+export async function ensureGitignore(projectRoot, opts) {
     const cleoDir = resolveScaffoldCleoDir(projectRoot);
     const gitignorePath = join(cleoDir, '.gitignore');
     const templateContent = getGitignoreContent();
     if (existsSync(gitignorePath)) {
-        const existing = readFileSync(gitignorePath, 'utf-8');
-        const normalize = (s) => s.trim().replace(/\r\n/g, '\n');
-        if (normalize(existing) === normalize(templateContent)) {
-            return { action: 'skipped', path: gitignorePath, details: 'Already matches template' };
-        }
-        await writeFile(gitignorePath, templateContent);
-        return { action: 'repaired', path: gitignorePath, details: 'Updated to match template' };
+        return repairRuleFile(gitignorePath, templateContent, opts);
     }
     await writeFile(gitignorePath, templateContent);
     return { action: 'created', path: gitignorePath };
 }
 /**
- * Create or repair `.worktreeinclude` (canonical, at project root) from the
- * shipped template. Idempotent — skips when the existing file already
- * matches the template byte-for-byte (after CR-LF + trim normalisation).
+ * Create `.worktreeinclude` (canonical, at project root) from the shipped
+ * template, or append the template entries an existing file lacks.
+ * Idempotent; never drops or reorders the user's lines (T13409).
  *
  * Resolution rules (T9983):
- * - If `<projectRoot>/.worktreeinclude` already exists → keep + compare to
- *   the template; repair if drifted.
+ * - If `<projectRoot>/.worktreeinclude` already exists → keep it and append
+ *   only the missing template entries.
  * - Else if legacy `<projectRoot>/.cleo/worktree-include` exists → SKIP
  *   (do not overwrite the legacy file in place; `cleo doctor
  *   --migrate-worktree-include` is the explicit migration path).
  * - Else → write the canonical template.
  *
  * @param projectRoot - Absolute path to the project root directory
+ * @param opts - Backup journal (upgrade)
  * @returns Scaffold result indicating whether `.worktreeinclude` was
  *          created, repaired, or skipped.
  *
  * @task T9983
  */
-export async function ensureWorktreeInclude(projectRoot) {
+export async function ensureWorktreeInclude(projectRoot, opts) {
     const canonicalPath = join(projectRoot, '.worktreeinclude');
     const legacyPath = join(resolveScaffoldCleoDir(projectRoot), 'worktree-include');
     const templateContent = getWorktreeIncludeContent();
     if (existsSync(canonicalPath)) {
-        const existing = readFileSync(canonicalPath, 'utf-8');
-        const normalize = (s) => s.trim().replace(/\r\n/g, '\n');
-        if (normalize(existing) === normalize(templateContent)) {
-            return { action: 'skipped', path: canonicalPath, details: 'Already matches template' };
-        }
-        await writeFile(canonicalPath, templateContent);
-        return { action: 'repaired', path: canonicalPath, details: 'Updated to match template' };
+        return repairRuleFile(canonicalPath, templateContent, opts);
     }
     // T9983: when only the legacy file exists, leave it in place. The reader
     // honours it under a one-cycle deprecation warning. Users opt-in to the
@@ -536,10 +554,25 @@ export async function ensureProjectInfo(projectRoot, opts) {
             projectContext: projectContextSchemaVersion,
         },
     };
+    // T13409: a regenerate that changes nothing but the timestamp writes nothing,
+    // so a second `cleo upgrade` reports no applied action.
+    if (existing) {
+        const { lastUpdated: _next, ...nextFields } = projectInfo;
+        const { lastUpdated: _prev, ...prevFields } = existing;
+        if (stableStringify(nextFields) === stableStringify(prevFields)) {
+            return { action: 'skipped', path: projectInfoPath, details: 'project-info.json current' };
+        }
+    }
     await writeFile(projectInfoPath, JSON.stringify(projectInfo, null, 2));
     const action = opts?.force && existsSync(projectInfoPath) ? 'regenerated' : 'created';
     return { action, path: projectInfoPath, details: await describeIdentity() };
 }
+/** JSON with object keys sorted at every level, so key order never counts as a change. */
+function stableStringify(value) {
+    return JSON.stringify(value, (_key, v) => v !== null && typeof v === 'object' && !Array.isArray(v)
+        ? Object.fromEntries(Object.entries(v).sort(([a], [b]) => a.localeCompare(b)))
+        : v);
+}
 /**
  * No-op. Kept for API compatibility.
  *

package/dist/scaffold/ensure-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-config.js","sourceRoot":"","sources":["../../src/scaffold/ensure-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ensure-config.js","sourceRoot":"","sources":["../../src/scaffold/ensure-config.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC3F,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAGvF;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CAAC,WAAmB;IACxD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAChD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC;QACzD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,CAAC;QACH,OAAO,cAAc,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,YAAY,CAAC;IACtB,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDtC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;;;;;;;;;;CAaxC,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,cAAc;IAC5B,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChD,wDAAwD;IACxD,yCAAyC;IACzC,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAChD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB;IACjC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC;QACtE,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,OAAO,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,WAAW;IACb,CAAC;IACD,OAAO,uBAAuB,CAAC;AACjC,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,yBAAyB;IACvC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;QACrC,MAAM,qBAAqB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAChF,IAAI,UAAU,CAAC,qBAAqB,CAAC,EAAE,CAAC;YACtC,OAAO,YAAY,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC;QAC9E,IAAI,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACnC,OAAO,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,WAAW;IACb,CAAC;IACD,OAAO,yBAAyB,CAAC;AACnC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc;IAC5B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,EAAE,cAAc,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACvD,OAAO,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED,uEAAuE;AACvE,SAAS,wBAAwB,CAAC,WAAmB;IACnD,MAAM,MAAM,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QAAE,OAAO,KAAK,CAAC;IACjE,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAE9E,CAAC;QACF,OAAO,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,OAAO,EAAE,QAAQ;QACjB,MAAM,EAAE;YACN,aAAa,EAAE,MAAM;YACrB,SAAS,EAAE,IAAI;YACf,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE,UAAU;SACvB;QACD,MAAM,EAAE;YACN,qBAAqB,EAAE,EAAE;YACzB,gBAAgB,EAAE,CAAC;SACpB;QACD,SAAS,EAAE;YACT,QAAQ,EAAE,CAAC;YACX,WAAW,EAAE,CAAC;SACf;QACD,OAAO,EAAE;YACP,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,UAAU;SACjB;QACD,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,gBAAgB,EAAE,MAAM;aACzB;SACF;QACD,WAAW,EAAE;YACX,UAAU,EAAE;gBACV,IAAI,EAAE,MAAM;aACb;SACF;QACD,KAAK,EAAE;YACL,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE;gBACZ,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,IAAI;gBACjB,YAAY,EAAE,IAAI;aACnB;YACD,aAAa,EAAE;gBACb,OAAO,EAAE,IAAI;aACd;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,IAAI;aACd;YACD,aAAa,EAAE;gBACb,OAAO,EAAE,KAAK;aACf;SACF;KACF,CAAC;AACJ,CAAC;AAED,wFAAwF;AACxF,MAAM,qBAAqB,GAAG,+DAA+D,CAAC;AAW9F;;;;;;GAMG;AACH,KAAK,UAAU,cAAc,CAC3B,IAAY,EACZ,eAAuB,EACvB,IAA4B;IAE5B,gFAAgF;IAChF,MAAM,EAAE,kBAAkB,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACzF,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,eAAe;SAC7B,KAAK,CAAC,OAAO,CAAC;SACd,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC;SACrC,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,qBAAqB,CAAC,CAAC;IACzF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC;IACnF,CAAC;IACD,MAAM,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACnD,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI;QACJ,OAAO,EAAE,YAAY,KAAK,CAAC,MAAM,8BAA8B,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;KACvH,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAAmB,EACnB,IAA4B;IAE5B,MAAM,OAAO,GAAG,sBAAsB,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAClD,MAAM,eAAe,GAAG,mBAAmB,EAAE,CAAC;IAE9C,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9B,OAAO,cAAc,CAAC,aAAa,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,SAAS,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAChD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;AACpD,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,WAAmB,EACnB,IAA4B;IAE5B,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACjF,MAAM,eAAe,GAAG,yBAAyB,EAAE,CAAC;IAEpD,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9B,OAAO,cAAc,CAAC,aAAa,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,yEAAyE;IACzE,wEAAwE;IACxE,0DAA0D;IAC1D,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,UAAU;YAChB,OAAO,EACL,kHAAkH;SACrH,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAChD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;AACpD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,WAAmB,EACnB,IAA0B;IAE1B,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAE9C,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAA4B,CAAC;YAC1F,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,wBAAwB,CAAC,WAAW,CAAC,EAAE,CAAC;gBACtE,QAAQ,CAAC,aAAa,CAAC,GAAG;oBACxB,oBAAoB,EAAE,IAAI;oBAC1B,MAAM,EAAE,UAAU;oBAClB,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACrC,CAAC;gBACF,MAAM,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC/D,OAAO;oBACL,MAAM,EAAE,UAAU;oBAClB,IAAI,EAAE,UAAU;oBAChB,OAAO,EAAE,mCAAmC;iBAC7C,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,eAAe;QACjB,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnF,CAAC;IAED,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;IACrC,IAAI,wBAAwB,CAAC,WAAW,CAAC,EAAE,CAAC;QACzC,MAAkC,CAAC,aAAa,CAAC,GAAG;YACnD,oBAAoB,EAAE,IAAI;YAC1B,MAAM,EAAE,UAAU;YAClB,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACrC,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACnC,OAAO;QACL,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;QACvD,IAAI,EAAE,UAAU;KACjB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,2BAA2B,GAAG;IAClC,aAAa;IACb,oBAAoB;IACpB,gBAAgB;CACR,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,WAAmB,EACnB,IAAqD;IAErD,MAAM,OAAO,GAAG,sBAAsB,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;IAE3D,IAAI,QAA6C,CAAC;IAClD,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAA4B,CAAC;QAC3F,CAAC;QAAC,MAAM,CAAC;YACP,6CAA6C;QAC/C,CAAC;IACH,CAAC;IACD,MAAM,iBAAiB,GACrB,OAAO,QAAQ,EAAE,CAAC,WAAW,CAAC,KAAK,QAAQ,IAAI,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC;QAC7E,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;QACvB,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,iBAAiB,EAAE;QAC3E,eAAe,EAAE,IAAI,EAAE,eAAe;KACvC,CAAC,CAAC;IACH,+EAA+E;IAC/E,MAAM,eAAe,GAAG,iBAAiB,IAAI,QAAQ,CAAC,SAAS,CAAC;IAChE,MAAM,YAAY,GAChB,OAAO,QAAQ,EAAE,CAAC,MAAM,CAAC,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC;QACnE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;QAClB,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,gBAAgB,GAAG,KAAK,IAAqB,EAAE;QACnD,MAAM,OAAO,GAAG,MAAM,uBAAuB,CAAC,WAAW,EAAE,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAC7F,OAAO;YACL,YAAY,QAAQ,CAAC,SAAS,KAAK,QAAQ,CAAC,MAAM,uBAAuB,OAAO,EAAE;YAClF,GAAG,QAAQ,CAAC,WAAW;SACxB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC,CAAC;IAEF,IAAI,QAAQ,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;QAC7B,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,QAAQ,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC;YAC3C,QAAQ,CAAC,aAAa,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACnD,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;QAED,kEAAkE;QAClE,IAAI,OAAO,QAAQ,CAAC,MAAM,CAAC,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1E,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;YAClD,QAAQ,CAAC,aAAa,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACnD,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACpE,OAAO;gBACL,MAAM,EAAE,UAAU;gBAClB,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,8BAA8B,MAAM,gBAAgB,EAAE,EAAE;aAClE,CAAC;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,mBAAmB,MAAM,gBAAgB,EAAE,EAAE;SACvD,CAAC;IACJ,CAAC;IAED,8DAA8D;IAC9D,MAAM,iBAAiB,GACrB,OAAO,QAAQ,EAAE,CAAC,WAAW,CAAC,KAAK,QAAQ,IAAI,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC;QAC7E,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;QACvB,CAAC,CAAC,SAAS,CAAC;IAEhB,wEAAwE;IACxE,MAAM,qBAAqB,GACzB,OAAO,QAAQ,EAAE,CAAC,eAAe,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE1F,2EAA2E;IAC3E,+EAA+E;IAC/E,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,KAAK,MAAM,KAAK,IAAI,2BAA2B;QAC7C,IAAI,QAAQ,EAAE,CAAC,KAAK,CAAC,KAAK,SAAS;YAAE,OAAO,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExE,yEAAyE;IACzE,uEAAuE;IACvE,yEAAyE;IACzE,wDAAwD;IACxD,4EAA4E;IAC5E,sEAAsE;IACtE,0EAA0E;IAC1E,6EAA6E;IAC7E,eAAe;IACf,MAAM,WAAW,GACf,OAAO,QAAQ,EAAE,CAAC,aAAa,CAAC,KAAK,QAAQ,IAAI,QAAQ,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC;QACjF,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;QACzB,CAAC,CAAC,IAAI,EAAE,eAAe,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ;YACrD,CAAC,CAAC,0BAA0B,CAAC,QAAQ,CAAC,SAAS,CAAC;YAChD,CAAC,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAErC,iEAAiE;IACjE,IAAI,SAAS,GAAkB,IAAI,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;QAClE,SAAS,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,+DAA+D;IACjE,CAAC;IAED,MAAM,EAAE,yBAAyB,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;IACxF,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACrE,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,oBAAoB,CAAC,IAAI,WAAW,CAAC;IAC3F,MAAM,2BAA2B,GAC/B,yBAAyB,CAAC,6BAA6B,CAAC,IAAI,OAAO,CAAC;IAEtE,MAAM,WAAW,GAAG;QAClB,OAAO,EAAE,oCAAoC;QAC7C,aAAa,EAAE,OAAO;QACtB,SAAS,EAAE,eAAe;QAC1B,WAAW;QACX,wEAAwE;QACxE,yEAAyE;QACzE,0CAA0C;QAC1C,IAAI,EAAE,YAAY,IAAI,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACpD,GAAG,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC;QAC/B,WAAW;QACX,SAAS,EAAE,iBAAiB,IAAI,GAAG;QACnC,GAAG,CAAC,qBAAqB,IAAI,EAAE,aAAa,EAAE,qBAAqB,EAAE,CAAC;QACtE,GAAG,OAAO;QACV,WAAW,EAAE,GAAG;QAChB,OAAO,EAAE;YACP,MAAM,EAAE,mBAAmB;YAC3B,MAAM,EAAE,qBAAqB;YAC7B,cAAc,EAAE,2BAA2B;SAC5C;KACF,CAAC;IAEF,8EAA8E;IAC9E,wDAAwD;IACxD,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;QAC1D,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,UAAU,EAAE,GAAG,QAAQ,CAAC;QACvD,IAAI,eAAe,CAAC,UAAU,CAAC,KAAK,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC;YAChE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC;QAC5F,CAAC;IACH,CAAC;IAED,MAAM,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,IAAI,EAAE,KAAK,IAAI,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;IACtF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,gBAAgB,EAAE,EAAE,CAAC;AAC9E,CAAC;AAED,0FAA0F;AAC1F,SAAS,eAAe,CAAC,KAAc;IACrC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CACvC,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC,CACN,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,WAAmB;IAC5D,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,wCAAwC;KAClD,CAAC;AACJ,CAAC"}

package/dist/scaffold/ensure-skills.d.ts

@@ -3,6 +3,7 @@
  * project-context.json.
  */
 import type { ScaffoldResult } from '@cleocode/contracts/scaffold-diagnostics';
+import type { UpgradeFileJournal } from './upgrade-file-journal.js';
 /**
  * Detect and write project-context.json.
  * Idempotent: skips if file exists and is less than staleDays old (default: 30).
@@ -11,10 +12,19 @@ import type { ScaffoldResult } from '@cleocode/contracts/scaffold-diagnostics';
  * @param opts - Optional configuration
  * @param opts.force - When true, regenerate even if the file is fresh
  * @param opts.staleDays - Age threshold in days before regeneration (default: 30)
+ * @param opts.journal - Backs the file up before it changes and lists it (upgrade, T13409)
  * @returns Scaffold result indicating the action taken
+ *
+ * @remarks
+ * Regenerating an existing file keeps every key it has, in its order: detected
+ * values are updated in place, keys detection does not produce are kept, and
+ * new keys are appended (T13409: a refresh once dropped `build.outputDir` and
+ * reordered the tracked file). When nothing but `detectedAt` would change, the
+ * file is left byte-identical.
  */
 export declare function ensureProjectContext(projectRoot: string, opts?: {
     force?: boolean;
     staleDays?: number;
+    journal?: UpgradeFileJournal;
 }): Promise<ScaffoldResult>;
 //# sourceMappingURL=ensure-skills.d.ts.map

package/dist/scaffold/ensure-skills.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-skills.d.ts","sourceRoot":"","sources":["../../src/scaffold/ensure-skills.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAI/E;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAC7C,OAAO,CAAC,cAAc,CAAC,CAqGzB"}
+{"version":3,"file":"ensure-skills.d.ts","sourceRoot":"","sources":["../../src/scaffold/ensure-skills.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAG/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,kBAAkB,CAAA;CAAE,GAC3E,OAAO,CAAC,cAAc,CAAC,CAiHzB"}

package/dist/scaffold/ensure-skills.js

@@ -3,7 +3,6 @@
  * project-context.json.
  */
 import { existsSync, readFileSync } from 'node:fs';
-import { writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { pushWarning } from '../output.js';
@@ -16,7 +15,15 @@ import { resolveScaffoldCleoDir } from './ensure-config.js';
  * @param opts - Optional configuration
  * @param opts.force - When true, regenerate even if the file is fresh
  * @param opts.staleDays - Age threshold in days before regeneration (default: 30)
+ * @param opts.journal - Backs the file up before it changes and lists it (upgrade, T13409)
  * @returns Scaffold result indicating the action taken
+ *
+ * @remarks
+ * Regenerating an existing file keeps every key it has, in its order: detected
+ * values are updated in place, keys detection does not produce are kept, and
+ * new keys are appended (T13409: a refresh once dropped `build.outputDir` and
+ * reordered the tracked file). When nothing but `detectedAt` would change, the
+ * file is left byte-identical.
  */
 export async function ensureProjectContext(projectRoot, opts) {
     const cleoDir = resolveScaffoldCleoDir(projectRoot);
@@ -46,6 +53,7 @@ export async function ensureProjectContext(projectRoot, opts) {
     const context = detectProjectType(projectRoot);
     // Blocks only the user writes (`release`, `evidence`), carried over verbatim.
     let declared = {};
+    let previous = null;
     // Preserve user-supplied command overrides from existing file so
     // regeneration does not silently clobber them (T12027 / #1122 / #1129).
     if (existsSync(contextPath)) {
@@ -53,12 +61,23 @@ export async function ensureProjectContext(projectRoot, opts) {
             const existing = JSON.parse(readFileSync(contextPath, 'utf-8'));
             preserveUserOverrides(existing, context);
             declared = declaredBlocks(existing);
+            previous = asRecord(existing);
         }
         catch {
             // If we can't parse existing, proceed with freshly-detected context
         }
     }
-    const output = { ...context, ...declared };
+    const detected = { ...context, ...declared };
+    const output = previous ? mergeKeepingExisting(previous, detected) : detected;
+    if (previous && sameIgnoringDetectedAt(previous, output)) {
+        return {
+            action: 'skipped',
+            path: contextPath,
+            details: 'Re-detection found nothing new; project-context.json left unchanged',
+        };
+    }
+    if (previous && 'detectedAt' in previous)
+        output.detectedAt = detected.detectedAt;
     try {
         const schemaPath = join(dirname(fileURLToPath(import.meta.url)), '../../schemas/project-context.schema.json');
         if (existsSync(schemaPath)) {
@@ -83,7 +102,8 @@ export async function ensureProjectContext(projectRoot, opts) {
     catch {
         // Schema validation is best-effort — never block the write
     }
-    await writeFile(contextPath, JSON.stringify(output, null, 2));
+    const { writeIfChanged } = await import('./upgrade-file-journal.js');
+    await writeIfChanged(contextPath, JSON.stringify(output, null, 2), opts?.journal);
     // T13125: propose, never persist, the affected-scope command. A written
     // template would read as declared, outlive an edit to testing.command and
     // run a different script than the user's (review of #1818); tool:test
@@ -156,6 +176,30 @@ function preserveUserOverrides(existing, context) {
         context['security-scan'] = { command: secscanCmd };
     }
 }
+/**
+ * Merge freshly detected context into an existing file's object (T13409):
+ * every existing key keeps its position, a detected value replaces the old one,
+ * a key detection does not produce (such as `build.outputDir`) is kept as is,
+ * and keys new to the file are appended.
+ */
+function mergeKeepingExisting(existing, detected) {
+    const merged = {};
+    for (const [key, value] of Object.entries(existing)) {
+        const ours = asRecord(value);
+        const theirs = asRecord(detected[key]);
+        merged[key] = ours && theirs ? mergeKeepingExisting(ours, theirs) : (detected[key] ?? value);
+    }
+    for (const [key, value] of Object.entries(detected)) {
+        if (!(key in merged) && value !== undefined)
+            merged[key] = value;
+    }
+    return merged;
+}
+/** Whether two context objects serialize identically once `detectedAt` is ignored. */
+function sameIgnoringDetectedAt(a, b) {
+    const strip = ({ detectedAt: _ignored, ...rest }) => rest;
+    return JSON.stringify(strip(a)) === JSON.stringify(strip(b));
+}
 /** A parsed JSON value as an object, or `null` when it is not a plain object. */
 function asRecord(value) {
     return value !== null && typeof value === 'object' && !Array.isArray(value)

package/dist/scaffold/ensure-skills.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-skills.js","sourceRoot":"","sources":["../../src/scaffold/ensure-skills.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ensure-skills.js","sourceRoot":"","sources":["../../src/scaffold/ensure-skills.ts"],"names":[],"mappings":"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"}

package/dist/scaffold/upgrade-file-journal.d.ts

@@ -0,0 +1,79 @@
+/**
+ * Backed-up, change-only file writes for `cleo upgrade` (T13409).
+ *
+ * Upgrade edits files the project owns (AGENTS.md, CLAUDE.md, `.cleo/.gitignore`,
+ * `.worktreeinclude`, `project-context.json`). Every edit goes through a journal:
+ * an unchanged file is never rewritten, and a changed file's previous bytes are
+ * copied under `.cleo/backups/upgrade/<stamp>/` before the new bytes land. The
+ * journal's entries are listed in the upgrade result so the owner sees every
+ * path that changed and where its backup is.
+ *
+ * Also holds the line-merge used for `.gitignore`-style files: upgrade only ever
+ * appends the template lines a file is missing, never drops or reorders the
+ * user's lines.
+ *
+ * @task T13409
+ */
+/** One file an upgrade changed. */
+export interface UpgradeFileChange {
+    /** Absolute path of the changed file. */
+    path: string;
+    /** Absolute path of the copy holding its previous bytes; `null` when the file was created. */
+    backupPath: string | null;
+}
+/** Records the files one upgrade run changed and where their backups are. */
+export interface UpgradeFileJournal {
+    /** Project root; backups keep each file's path relative to it. */
+    readonly projectRoot: string;
+    /** Directory receiving this run's backups. */
+    readonly backupDir: string;
+    /** Files changed so far, in write order. */
+    readonly changes: UpgradeFileChange[];
+}
+/**
+ * Create the journal for one upgrade run.
+ *
+ * @param projectRoot - Absolute project root.
+ * @param cleoDir - The project's `.cleo` directory.
+ * @returns An empty journal whose backups land in `<cleoDir>/backups/upgrade/<stamp>/`.
+ */
+export declare function createUpgradeFileJournal(projectRoot: string, cleoDir: string): UpgradeFileJournal;
+/**
+ * Copy `path`'s current bytes into the journal's backup directory and record the change.
+ *
+ * Call before replacing a file whose new content differs. A missing file is
+ * recorded as created, with no backup.
+ *
+ * @param journal - The run's journal.
+ * @param path - Absolute path about to change.
+ * @returns The recorded change.
+ */
+export declare function backupBeforeChange(journal: UpgradeFileJournal, path: string): Promise<UpgradeFileChange>;
+/**
+ * Write `content` to `path` only when it differs from what is there, backing
+ * the old bytes up first when a journal is given.
+ *
+ * @param path - Absolute file path.
+ * @param content - New file content.
+ * @param journal - The run's journal; omitted outside upgrade (init writes fresh files).
+ * @returns `true` when the file was written, `false` when it already held `content`.
+ */
+export declare function writeIfChanged(path: string, content: string, journal?: UpgradeFileJournal): Promise<boolean>;
+/**
+ * Append the template's rule lines that `existing` lacks, keeping every user
+ * line, comment and their order byte-for-byte.
+ *
+ * Only non-blank, non-comment lines count; comparison trims whitespace. The
+ * appended lines keep the template's relative order, so an allow rule still
+ * follows the deny rule it depends on.
+ *
+ * @param existing - Current file content.
+ * @param template - Shipped template content.
+ * @param header - Comment line written above the appended lines.
+ * @returns The merged content, and the lines that were appended.
+ */
+export declare function appendMissingLines(existing: string, template: string, header: string): {
+    content: string;
+    added: string[];
+};
+//# sourceMappingURL=upgrade-file-journal.d.ts.map

package/dist/scaffold/upgrade-file-journal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade-file-journal.d.ts","sourceRoot":"","sources":["../../src/scaffold/upgrade-file-journal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAOH,mCAAmC;AACnC,MAAM,WAAW,iBAAiB;IAChC,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,8FAA8F;IAC9F,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,6EAA6E;AAC7E,MAAM,WAAW,kBAAkB;IACjC,kEAAkE;IAClE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,8CAA8C;IAC9C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,4CAA4C;IAC5C,QAAQ,CAAC,OAAO,EAAE,iBAAiB,EAAE,CAAC;CACvC;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAOjG;AASD;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,iBAAiB,CAAC,CAU5B;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAoBtC"}

package/dist/scaffold/upgrade-file-journal.js

@@ -0,0 +1,111 @@
+/**
+ * Backed-up, change-only file writes for `cleo upgrade` (T13409).
+ *
+ * Upgrade edits files the project owns (AGENTS.md, CLAUDE.md, `.cleo/.gitignore`,
+ * `.worktreeinclude`, `project-context.json`). Every edit goes through a journal:
+ * an unchanged file is never rewritten, and a changed file's previous bytes are
+ * copied under `.cleo/backups/upgrade/<stamp>/` before the new bytes land. The
+ * journal's entries are listed in the upgrade result so the owner sees every
+ * path that changed and where its backup is.
+ *
+ * Also holds the line-merge used for `.gitignore`-style files: upgrade only ever
+ * appends the template lines a file is missing, never drops or reorders the
+ * user's lines.
+ *
+ * @task T13409
+ */
+import { existsSync, readFileSync } from 'node:fs';
+import { copyFile, mkdir } from 'node:fs/promises';
+import { dirname, isAbsolute, join, relative } from 'node:path';
+import { writeFileAtomic } from '../tools/fs.js';
+/**
+ * Create the journal for one upgrade run.
+ *
+ * @param projectRoot - Absolute project root.
+ * @param cleoDir - The project's `.cleo` directory.
+ * @returns An empty journal whose backups land in `<cleoDir>/backups/upgrade/<stamp>/`.
+ */
+export function createUpgradeFileJournal(projectRoot, cleoDir) {
+    const stamp = new Date().toISOString().replace(/[:.]/g, '-');
+    return {
+        projectRoot,
+        backupDir: join(cleoDir, 'backups', 'upgrade', stamp),
+        changes: [],
+    };
+}
+/** Backup location for `path`: its project-relative path, or its absolute path re-rooted. */
+function backupPathFor(journal, path) {
+    const rel = relative(journal.projectRoot, path);
+    const inside = rel !== '' && !rel.startsWith('..') && !isAbsolute(rel);
+    return join(journal.backupDir, inside ? rel : join('_external', path.replace(/^[/\\]+/, '')));
+}
+/**
+ * Copy `path`'s current bytes into the journal's backup directory and record the change.
+ *
+ * Call before replacing a file whose new content differs. A missing file is
+ * recorded as created, with no backup.
+ *
+ * @param journal - The run's journal.
+ * @param path - Absolute path about to change.
+ * @returns The recorded change.
+ */
+export async function backupBeforeChange(journal, path) {
+    let backupPath = null;
+    if (existsSync(path)) {
+        backupPath = backupPathFor(journal, path);
+        await mkdir(dirname(backupPath), { recursive: true });
+        await copyFile(path, backupPath);
+    }
+    const change = { path, backupPath };
+    journal.changes.push(change);
+    return change;
+}
+/**
+ * Write `content` to `path` only when it differs from what is there, backing
+ * the old bytes up first when a journal is given.
+ *
+ * @param path - Absolute file path.
+ * @param content - New file content.
+ * @param journal - The run's journal; omitted outside upgrade (init writes fresh files).
+ * @returns `true` when the file was written, `false` when it already held `content`.
+ */
+export async function writeIfChanged(path, content, journal) {
+    if (existsSync(path) && readFileSync(path, 'utf-8') === content)
+        return false;
+    if (journal)
+        await backupBeforeChange(journal, path);
+    await writeFileAtomic({ path, content });
+    return true;
+}
+/**
+ * Append the template's rule lines that `existing` lacks, keeping every user
+ * line, comment and their order byte-for-byte.
+ *
+ * Only non-blank, non-comment lines count; comparison trims whitespace. The
+ * appended lines keep the template's relative order, so an allow rule still
+ * follows the deny rule it depends on.
+ *
+ * @param existing - Current file content.
+ * @param template - Shipped template content.
+ * @param header - Comment line written above the appended lines.
+ * @returns The merged content, and the lines that were appended.
+ */
+export function appendMissingLines(existing, template, header) {
+    const isRule = (line) => line.trim() !== '' && !line.trim().startsWith('#');
+    const present = new Set(existing
+        .split(/\r?\n/)
+        .filter(isRule)
+        .map((line) => line.trim()));
+    const added = [
+        ...new Set(template
+            .split(/\r?\n/)
+            .filter(isRule)
+            .map((line) => line.trim())
+            .filter((line) => !present.has(line))),
+    ];
+    if (added.length === 0)
+        return { content: existing, added };
+    const base = existing === '' || existing.endsWith('\n') ? existing : `${existing}\n`;
+    return { content: `${base}\n${header}\n${added.join('\n')}\n`, added };
+}
+//# sourceMappingURL=upgrade-file-journal.js.map

package/dist/scaffold/upgrade-file-journal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade-file-journal.js","sourceRoot":"","sources":["../../src/scaffold/upgrade-file-journal.ts"],"names":[],"mappings":"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"}