@cleocode/core 2026.9.23 → 2026.9.24

package/dist/scaffold/project-identity.d.ts

@@ -1,33 +1,44 @@
 /**
- * Write-once portable project identity: decide, re-link, adopt (T12325).
+ * Write-once portable project identity: decide, re-link, adopt (T12325 · T12716).
  *
- * The tracked `.cleo/project-id` file (read by `@cleocode/paths`) is the one
- * project identifier that survives a fresh clone, a move, and a new device.
- * This module owns the two write-side rules ADR-094 (amending ADR-013 §9) depends on:
+ * The tracked identity — `.cleo/project.json` `{schemaVersion, id, name}`,
+ * with the ADR-094 `.cleo/project-id` kept as a legacy mirror (both read by
+ * `@cleocode/paths` `readPortableProjectId`) — is the one project identifier
+ * that survives a fresh clone, a move, and a new device. This module owns the
+ * write-side rules:
  *
- * 1. **Write once.** The file is created with `O_EXCL` and never rewritten. A
- *    conflicting or malformed file is reported, not repaired.
- * 2. **Never silently re-mint.** When no local or tracked id exists, the
+ * 1. **Write once.** The id is created with `O_EXCL` and never rewritten. A
+ *    conflicting or malformed file is reported, not repaired. Only the
+ *    manifest's `name` may change, through {@link renameProjectManifest}.
+ * 2. **Never silently re-mint.** When no tracked or local id exists, the
  *    global registry is searched for the project's previous identity (same
  *    path, its canonical-fingerprint alias, or a live checkout of the same remote). A
  *    unique candidate is re-linked; several candidates refuse to guess; a new
  *    id is minted only when nothing can be re-linked or when the caller asks
  *    for one explicitly.
+ * 3. **Never migrate on open.** Tracked files are created here only for a
+ *    project that has NONE yet. Turning a legacy `project-id` into
+ *    `project.json` is `cleo doctor project-identity --resolve` alone.
  *
- * Precedence when both files exist and disagree: the local
- * `project-info.json` id wins and the conflict is reported. Local state
- * (registry row, aliases, brain) is keyed by that id, so switching silently
- * would re-key it — the data-loss geometry this whole design avoids. Two ids
- * for one repository means two lineages (typically two devices that each ran
- * `cleo init` before this file existed); reconciling them is an explicit act.
+ * Precedence when the tracked id and the `project-info.json` cache disagree
+ * (T12716, reversing the T12325 rule): the TRACKED id wins, as it already did
+ * for every reader. The disagreement is reported. The cache is not rewritten
+ * here: local state (registry row, aliases) keyed by the old id is re-keyed,
+ * with the old id kept as an alias, only by `cleo doctor project-identity
+ * --resolve`. Two ids for one repository means two lineages (typically two
+ * devices that each ran `cleo init` before the id was tracked).
  *
  * @task T12325
+ * @task T12716
+ * @see ADR-096 — one committed `.cleo/project.json` (amends ADR-094)
  */
 /**
  * Where the identity a scaffold step settled on came from.
  *
- * - `project-info` — the existing local `project-info.json` id (adopted as-is).
- * - `tracked` — the committed `.cleo/project-id` (fresh clone).
+ * - `tracked` — the committed `.cleo/project.json` (or legacy `.cleo/project-id`);
+ *   it wins over the `project-info.json` cache (T12716).
+ * - `project-info` — the `project-info.json` cache, used only when no tracked
+ *   file exists yet (a project from before ADR-094).
  * - `registry-path` / `registry-alias` / `registry-remote` — re-linked from the
  *   global registry because neither file was present.
  * - `minted` — a new random id; only when nothing could be re-linked or the
@@ -54,11 +65,16 @@ export interface ProjectIdentityDecision {
     /** Human-readable facts to surface (conflicts, re-links, coverage gaps). */
     diagnostics: string[];
 }
-/** Outcome of making sure `.cleo/project-id` records the project's id. */
+/** Outcome of making sure the tracked files record the project's id. */
 export type PortableIdFileOutcome = 
-/** Already present with the same id. */
+/** `project.json` already records the same id. */
 'present'
-/** Created now (first adoption). */
+/**
+ * Only the legacy `project-id` records the same id. Reported, not migrated:
+ * `cleo doctor project-identity --resolve` writes `project.json` (T12716).
+ */
+ | 'legacy'
+/** Created now (first adoption): `project.json` plus the `project-id` mirror. */
  | 'written'
 /** Present with a DIFFERENT id — reported, not rewritten. */
  | 'conflict'
@@ -112,19 +128,95 @@ export declare function findRelinkCandidates(projectRoot: string, cleoHome?: str
  */
 export declare function decideProjectIdentity(projectRoot: string, localInfoId: string | undefined, options?: DecideProjectIdentityOptions): Promise<ProjectIdentityDecision>;
 /**
- * Make sure `<projectRoot>/.cleo/project-id` records `projectId` — write-once.
+ * Default display name for a project root: its directory basename, made a
+ * valid name (control characters and separators replaced, a leading `~`
+ * dropped, capped at {@link PROJECT_DISPLAY_NAME_MAX}). `project` when nothing
+ * usable is left.
+ *
+ * @param projectRoot - Project root.
+ * @returns A name that passes `isValidProjectDisplayName`.
+ *
+ * @example
+ * ```ts
+ * defaultProjectDisplayName('/work/cleocode'); // 'cleocode'
+ * ```
+ * @task T12716
+ */
+export declare function defaultProjectDisplayName(projectRoot: string): string;
+/**
+ * Create `.cleo/project.json` for `projectId` — create-only (`O_EXCL`).
  *
- * Creates the file only when absent (`O_EXCL`); a present file is compared,
- * never rewritten.
+ * @param projectRoot - Absolute project root.
+ * @param projectId - The identity to record; never changed afterwards.
+ * @param name - Display name; must pass `isValidProjectDisplayName`.
+ * @returns `written`, or — for a file that already exists — `present` (same
+ *   id), `conflict` (different id) or `invalid` (unparseable). Never rewrites.
+ *
+ * @example
+ * ```ts
+ * await createProjectManifest(root, 'c78d09c3a8ee', 'cleocode'); // 'written'
+ * ```
+ * @task T12716
+ */
+export declare function createProjectManifest(projectRoot: string, projectId: string, name: string): Promise<'written' | 'present' | 'conflict' | 'invalid' | 'no-cleo-dir'>;
+/**
+ * Create the legacy `.cleo/project-id` mirror for `projectId` — create-only.
+ * Older builds read only this file, so it is kept beside `project.json`
+ * until a later removal (T12716).
+ *
+ * @param projectRoot - Absolute project root.
+ * @param projectId - The identity to mirror.
+ * @returns `written`, or for an existing file `present` / `conflict` / `invalid`.
+ *
+ * @example
+ * ```ts
+ * await createProjectIdMirror(root, 'c78d09c3a8ee');
+ * ```
+ * @task T12716
+ */
+export declare function createProjectIdMirror(projectRoot: string, projectId: string): Promise<'written' | 'present' | 'conflict' | 'invalid' | 'no-cleo-dir'>;
+/**
+ * Make sure the tracked files record `projectId` — write-once.
+ *
+ * Only a project with NO tracked identity gets files: `project.json` and the
+ * legacy `project-id` mirror, both created with `O_EXCL`. A present file is
+ * compared, never rewritten, and a legacy-only project is reported as
+ * `legacy` rather than migrated (migration is `cleo doctor project-identity
+ * --resolve`, T12716).
  *
  * @param projectRoot - Absolute project root.
  * @param projectId - The identity to adopt.
- * @returns What happened; `conflict`/`invalid` are for the caller to report.
+ * @param name - Display name for a new `project.json`; defaults to
+ *   {@link defaultProjectDisplayName}. Ignored when a file already exists.
+ * @returns What happened; `legacy`/`conflict`/`invalid` are for the caller to report.
  *
  * @example
  * ```ts
  * const outcome = await ensurePortableProjectId(root, info.projectId);
  * ```
  */
-export declare function ensurePortableProjectId(projectRoot: string, projectId: string): Promise<PortableIdFileOutcome>;
+export declare function ensurePortableProjectId(projectRoot: string, projectId: string, name?: string): Promise<PortableIdFileOutcome>;
+/**
+ * Rename a project in its committed `.cleo/project.json`: only `name` changes;
+ * the id is carried over byte-identical and keys this build does not know are
+ * kept (`writeProjectManifestName`: a tmp file unique to the call, renamed
+ * into place, so a crash never leaves a half-written identity file).
+ *
+ * @param projectRoot - Absolute project root.
+ * @param name - New display name (trimmed; must pass `isValidProjectDisplayName`).
+ * @returns The previous and new manifest names.
+ * @throws {CleoError} `VALIDATION_ERROR` for an invalid name; `CONFIG_ERROR`
+ *   when `project.json` is absent (migrate first) or unusable.
+ *
+ * @example
+ * ```ts
+ * await renameProjectManifest(root, 'cleo-platform');
+ * ```
+ * @task T12716
+ */
+export declare function renameProjectManifest(projectRoot: string, name: string): Promise<{
+    oldName: string;
+    newName: string;
+    projectId: string;
+}>;
 //# sourceMappingURL=project-identity.d.ts.map

package/dist/scaffold/project-identity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-identity.d.ts","sourceRoot":"","sources":["../../src/scaffold/project-identity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAmBH;;;;;;;;;GASG;AACH,MAAM,MAAM,qBAAqB,GAC7B,cAAc,GACd,SAAS,GACT,eAAe,GACf,gBAAgB,GAChB,iBAAiB,GACjB,QAAQ,CAAC;AAEb,6DAA6D;AAC7D,MAAM,MAAM,SAAS,GAAG,eAAe,GAAG,gBAAgB,GAAG,iBAAiB,CAAC;AAE/E,2EAA2E;AAC3E,MAAM,WAAW,eAAe;IAC9B,2CAA2C;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC;IACpB,iCAAiC;IACjC,GAAG,EAAE,SAAS,CAAC;CAChB;AAED,wDAAwD;AACxD,MAAM,WAAW,uBAAuB;IACtC,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,+DAA+D;IAC/D,MAAM,EAAE,qBAAqB,CAAC;IAC9B,4EAA4E;IAC5E,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,0EAA0E;AAC1E,MAAM,MAAM,qBAAqB;AAC/B,wCAAwC;AACtC,SAAS;AACX,oCAAoC;GAClC,SAAS;AACX,6DAA6D;GAC3D,UAAU;AACZ,kEAAkE;GAChE,SAAS;AACX,yDAAyD;GACvD,aAAa,CAAC;AAElB,iDAAiD;AACjD,MAAM,WAAW,4BAA4B;IAC3C;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iFAAiF;IACjF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,6EAA6E;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAc1D;;;;;;;;;;;;GAYG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,QAAQ,GAAE,MAAsB,GAC/B,OAAO,CAAC;IAAE,UAAU,EAAE,eAAe,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAsDnE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,GAAE,4BAAiC,GACzC,OAAO,CAAC,uBAAuB,CAAC,CA0DlC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,qBAAqB,CAAC,CAoBhC"}
+{"version":3,"file":"project-identity.d.ts","sourceRoot":"","sources":["../../src/scaffold/project-identity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AA4BH;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,qBAAqB,GAC7B,cAAc,GACd,SAAS,GACT,eAAe,GACf,gBAAgB,GAChB,iBAAiB,GACjB,QAAQ,CAAC;AAEb,6DAA6D;AAC7D,MAAM,MAAM,SAAS,GAAG,eAAe,GAAG,gBAAgB,GAAG,iBAAiB,CAAC;AAE/E,2EAA2E;AAC3E,MAAM,WAAW,eAAe;IAC9B,2CAA2C;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC;IACpB,iCAAiC;IACjC,GAAG,EAAE,SAAS,CAAC;CAChB;AAED,wDAAwD;AACxD,MAAM,WAAW,uBAAuB;IACtC,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,+DAA+D;IAC/D,MAAM,EAAE,qBAAqB,CAAC;IAC9B,4EAA4E;IAC5E,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wEAAwE;AACxE,MAAM,MAAM,qBAAqB;AAC/B,kDAAkD;AAChD,SAAS;AACX;;;GAGG;GACD,QAAQ;AACV,iFAAiF;GAC/E,SAAS;AACX,6DAA6D;GAC3D,UAAU;AACZ,kEAAkE;GAChE,SAAS;AACX,yDAAyD;GACvD,aAAa,CAAC;AAElB,iDAAiD;AACjD,MAAM,WAAW,4BAA4B;IAC3C;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iFAAiF;IACjF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,6EAA6E;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAc1D;;;;;;;;;;;;GAYG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,QAAQ,GAAE,MAAsB,GAC/B,OAAO,CAAC;IAAE,UAAU,EAAE,eAAe,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAsDnE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,GAAE,4BAAiC,GACzC,OAAO,CAAC,uBAAuB,CAAC,CAoElC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAOrE;AAaD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,SAAS,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,aAAa,CAAC,CAazE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,SAAS,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,aAAa,CAAC,CAQzE;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,qBAAqB,CAAC,CAkBhC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CA0BlE"}

package/dist/scaffold/project-identity.js

@@ -1,34 +1,43 @@
 /**
- * Write-once portable project identity: decide, re-link, adopt (T12325).
+ * Write-once portable project identity: decide, re-link, adopt (T12325 · T12716).
  *
- * The tracked `.cleo/project-id` file (read by `@cleocode/paths`) is the one
- * project identifier that survives a fresh clone, a move, and a new device.
- * This module owns the two write-side rules ADR-094 (amending ADR-013 §9) depends on:
+ * The tracked identity — `.cleo/project.json` `{schemaVersion, id, name}`,
+ * with the ADR-094 `.cleo/project-id` kept as a legacy mirror (both read by
+ * `@cleocode/paths` `readPortableProjectId`) — is the one project identifier
+ * that survives a fresh clone, a move, and a new device. This module owns the
+ * write-side rules:
  *
- * 1. **Write once.** The file is created with `O_EXCL` and never rewritten. A
- *    conflicting or malformed file is reported, not repaired.
- * 2. **Never silently re-mint.** When no local or tracked id exists, the
+ * 1. **Write once.** The id is created with `O_EXCL` and never rewritten. A
+ *    conflicting or malformed file is reported, not repaired. Only the
+ *    manifest's `name` may change, through {@link renameProjectManifest}.
+ * 2. **Never silently re-mint.** When no tracked or local id exists, the
  *    global registry is searched for the project's previous identity (same
  *    path, its canonical-fingerprint alias, or a live checkout of the same remote). A
  *    unique candidate is re-linked; several candidates refuse to guess; a new
  *    id is minted only when nothing can be re-linked or when the caller asks
  *    for one explicitly.
+ * 3. **Never migrate on open.** Tracked files are created here only for a
+ *    project that has NONE yet. Turning a legacy `project-id` into
+ *    `project.json` is `cleo doctor project-identity --resolve` alone.
  *
- * Precedence when both files exist and disagree: the local
- * `project-info.json` id wins and the conflict is reported. Local state
- * (registry row, aliases, brain) is keyed by that id, so switching silently
- * would re-key it — the data-loss geometry this whole design avoids. Two ids
- * for one repository means two lineages (typically two devices that each ran
- * `cleo init` before this file existed); reconciling them is an explicit act.
+ * Precedence when the tracked id and the `project-info.json` cache disagree
+ * (T12716, reversing the T12325 rule): the TRACKED id wins, as it already did
+ * for every reader. The disagreement is reported. The cache is not rewritten
+ * here: local state (registry row, aliases) keyed by the old id is re-keyed,
+ * with the old id kept as an alias, only by `cleo doctor project-identity
+ * --resolve`. Two ids for one repository means two lineages (typically two
+ * devices that each ran `cleo init` before the id was tracked).
  *
  * @task T12325
+ * @task T12716
+ * @see ADR-096 — one committed `.cleo/project.json` (amends ADR-094)
  */
 import { randomUUID } from 'node:crypto';
 import { existsSync, readFileSync } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
-import { join, resolve } from 'node:path';
+import { basename, join, resolve } from 'node:path';
 import { ExitCode } from '@cleocode/contracts';
-import { canonicalizePath, computePathFingerprintId, formatPortableProjectId, getCleoHome, isValidPortableProjectId, portableProjectIdPath, readPortableProjectId, } from '@cleocode/paths';
+import { canonicalizePath, computePathFingerprintId, formatPortableProjectId, formatProjectManifest, getCleoHome, isValidPortableProjectId, isValidProjectDisplayName, PORTABLE_PROJECT_ID_FILE, PROJECT_DISPLAY_NAME_MAX, PROJECT_MANIFEST_FILE, PROJECT_MANIFEST_SCHEMA_VERSION, portableProjectIdPath, projectManifestPath, readPortableProjectId, readProjectIdFile, readProjectManifest, } from '@cleocode/paths';
 import { CleoError } from '../errors.js';
 import { normalizeRemoteUrl } from '../nexus/identity.js';
 /** Re-exported from its home in `nexus/identity` (moved there by T12470). */
@@ -127,17 +136,26 @@ export async function findRelinkCandidates(projectRoot, cleoHome = getCleoHome()
 export async function decideProjectIdentity(projectRoot, localInfoId, options = {}) {
     const tracked = readPortableProjectId(projectRoot);
     const diagnostics = [];
-    if (localInfoId) {
-        if (tracked.status === 'valid' && tracked.projectId !== localInfoId) {
-            diagnostics.push(`identity conflict: .cleo/project-id is '${tracked.projectId}' but project-info.json is '${localInfoId}'; keeping the local id — reconcile explicitly`);
-        }
-        return { projectId: localInfoId, source: 'project-info', diagnostics };
-    }
+    const trackedFile = `.cleo/${tracked.status !== 'absent' ? (tracked.file ?? PORTABLE_PROJECT_ID_FILE) : PROJECT_MANIFEST_FILE}`;
+    // T12716: the tracked id wins — the ONE place this rule lives. Readers
+    // (`readDeclaredProjectIdentity`, `decodeProjectInfo`) apply the same order.
     if (tracked.status === 'valid') {
+        if (localInfoId && localInfoId !== tracked.projectId) {
+            diagnostics.push(`identity conflict: ${trackedFile} is '${tracked.projectId}' but the project-info.json cache is '${localInfoId}'; the tracked id wins. Re-key local state with \`cleo doctor project-identity --resolve\` (the old id stays resolvable as an alias)`);
+        }
         return { projectId: tracked.projectId, source: 'tracked', diagnostics };
     }
     if (tracked.status === 'invalid') {
-        throw new CleoError(ExitCode.CONFIG_ERROR, `Tracked project identity ${portableProjectIdPath(projectRoot)} is unusable (${tracked.reason}); refusing to mint a replacement`, { fix: 'Restore it from version control: `git checkout -- .cleo/project-id`' });
+        if (localInfoId) {
+            // Never block a working checkout on a damaged tracked file, and never
+            // regenerate it: keep the cached id and report the file.
+            diagnostics.push(`${trackedFile} is unusable (${tracked.reason}); keeping the project-info.json id '${localInfoId}'. Restore it: \`git checkout -- ${trackedFile}\``);
+            return { projectId: localInfoId, source: 'project-info', diagnostics };
+        }
+        throw new CleoError(ExitCode.CONFIG_ERROR, `Tracked project identity ${join(projectRoot, trackedFile)} is unusable (${tracked.reason}); refusing to mint a replacement`, { fix: `Restore it from version control: \`git checkout -- ${trackedFile}\`` });
+    }
+    if (localInfoId) {
+        return { projectId: localInfoId, source: 'project-info', diagnostics };
     }
     if (options.mintNewIdentity) {
         diagnostics.push('minted a new identity on explicit request');
@@ -157,7 +175,7 @@ export async function decideProjectIdentity(projectRoot, localInfoId, options =
             throw new CleoError(ExitCode.CONFIG_ERROR, `Cannot re-link project identity for ${projectRoot}: ${ids.length} registered identities match by ${via} (${tier
                 .map((candidate) => `${candidate.projectId} @ ${candidate.projectPath}`)
                 .join(', ')})`, {
-                fix: 'Write the intended id to .cleo/project-id, or mint explicitly with `cleo init --new-identity`',
+                fix: 'Restore .cleo/project.json (or the legacy .cleo/project-id) with the intended id from version control, or mint explicitly with `cleo init --new-identity`',
             });
         }
     }
@@ -165,45 +183,179 @@ export async function decideProjectIdentity(projectRoot, localInfoId, options =
     return { projectId: randomUUID(), source: 'minted', diagnostics };
 }
 /**
- * Make sure `<projectRoot>/.cleo/project-id` records `projectId` — write-once.
+ * Default display name for a project root: its directory basename, made a
+ * valid name (control characters and separators replaced, a leading `~`
+ * dropped, capped at {@link PROJECT_DISPLAY_NAME_MAX}). `project` when nothing
+ * usable is left.
  *
- * Creates the file only when absent (`O_EXCL`); a present file is compared,
- * never rewritten.
+ * @param projectRoot - Project root.
+ * @returns A name that passes `isValidProjectDisplayName`.
+ *
+ * @example
+ * ```ts
+ * defaultProjectDisplayName('/work/cleocode'); // 'cleocode'
+ * ```
+ * @task T12716
+ */
+export function defaultProjectDisplayName(projectRoot) {
+    const cleaned = basename(resolve(projectRoot))
+        .replace(/[/\\\u0000-\u001f\u007f]/g, '-')
+        .replace(/^~+/, '')
+        .slice(0, PROJECT_DISPLAY_NAME_MAX)
+        .trim();
+    return isValidProjectDisplayName(cleaned) ? cleaned : 'project';
+}
+/** Create a file with `O_EXCL`; `false` when it already exists. */
+async function writeExclusive(path, content) {
+    try {
+        await writeFile(path, content, { flag: 'wx' });
+        return true;
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && error.code === 'EEXIST')
+            return false;
+        throw error;
+    }
+}
+/**
+ * Create `.cleo/project.json` for `projectId` — create-only (`O_EXCL`).
+ *
+ * @param projectRoot - Absolute project root.
+ * @param projectId - The identity to record; never changed afterwards.
+ * @param name - Display name; must pass `isValidProjectDisplayName`.
+ * @returns `written`, or — for a file that already exists — `present` (same
+ *   id), `conflict` (different id) or `invalid` (unparseable). Never rewrites.
+ *
+ * @example
+ * ```ts
+ * await createProjectManifest(root, 'c78d09c3a8ee', 'cleocode'); // 'written'
+ * ```
+ * @task T12716
+ */
+export async function createProjectManifest(projectRoot, projectId, name) {
+    if (!isValidPortableProjectId(projectId) || !isValidProjectDisplayName(name))
+        return 'invalid';
+    if (!existsSync(join(projectRoot, '.cleo')))
+        return 'no-cleo-dir';
+    const body = formatProjectManifest({
+        schemaVersion: PROJECT_MANIFEST_SCHEMA_VERSION,
+        id: projectId,
+        name,
+    });
+    if (await writeExclusive(projectManifestPath(projectRoot), body))
+        return 'written';
+    // Present (or lost a race): judge what is there, never overwrite it.
+    const current = readProjectManifest(projectRoot);
+    if (current.status !== 'valid')
+        return 'invalid';
+    return current.manifest.id === projectId ? 'present' : 'conflict';
+}
+/**
+ * Create the legacy `.cleo/project-id` mirror for `projectId` — create-only.
+ * Older builds read only this file, so it is kept beside `project.json`
+ * until a later removal (T12716).
+ *
+ * @param projectRoot - Absolute project root.
+ * @param projectId - The identity to mirror.
+ * @returns `written`, or for an existing file `present` / `conflict` / `invalid`.
+ *
+ * @example
+ * ```ts
+ * await createProjectIdMirror(root, 'c78d09c3a8ee');
+ * ```
+ * @task T12716
+ */
+export async function createProjectIdMirror(projectRoot, projectId) {
+    if (!isValidPortableProjectId(projectId))
+        return 'invalid';
+    if (!existsSync(join(projectRoot, '.cleo')))
+        return 'no-cleo-dir';
+    if (await writeExclusive(portableProjectIdPath(projectRoot), formatPortableProjectId(projectId)))
+        return 'written';
+    const current = readProjectIdFile(projectRoot);
+    if (current.status !== 'valid')
+        return 'invalid';
+    return current.projectId === projectId ? 'present' : 'conflict';
+}
+/**
+ * Make sure the tracked files record `projectId` — write-once.
+ *
+ * Only a project with NO tracked identity gets files: `project.json` and the
+ * legacy `project-id` mirror, both created with `O_EXCL`. A present file is
+ * compared, never rewritten, and a legacy-only project is reported as
+ * `legacy` rather than migrated (migration is `cleo doctor project-identity
+ * --resolve`, T12716).
  *
  * @param projectRoot - Absolute project root.
  * @param projectId - The identity to adopt.
- * @returns What happened; `conflict`/`invalid` are for the caller to report.
+ * @param name - Display name for a new `project.json`; defaults to
+ *   {@link defaultProjectDisplayName}. Ignored when a file already exists.
+ * @returns What happened; `legacy`/`conflict`/`invalid` are for the caller to report.
  *
  * @example
  * ```ts
  * const outcome = await ensurePortableProjectId(root, info.projectId);
  * ```
  */
-export async function ensurePortableProjectId(projectRoot, projectId) {
+export async function ensurePortableProjectId(projectRoot, projectId, name) {
     const current = readPortableProjectId(projectRoot);
-    if (current.status === 'valid')
-        return current.projectId === projectId ? 'present' : 'conflict';
+    if (current.status === 'valid') {
+        if (current.projectId !== projectId)
+            return 'conflict';
+        return current.file === PORTABLE_PROJECT_ID_FILE ? 'legacy' : 'present';
+    }
     if (current.status === 'invalid')
         return 'invalid';
     if (!isValidPortableProjectId(projectId))
         return 'invalid';
     if (!existsSync(join(projectRoot, '.cleo')))
         return 'no-cleo-dir';
-    try {
-        await writeFile(portableProjectIdPath(projectRoot), formatPortableProjectId(projectId), {
-            flag: 'wx',
-        });
-        return 'written';
+    const displayName = name !== undefined && isValidProjectDisplayName(name)
+        ? name
+        : defaultProjectDisplayName(projectRoot);
+    const manifest = await createProjectManifest(projectRoot, projectId, displayName);
+    if (manifest !== 'written' && manifest !== 'present')
+        return manifest;
+    const mirror = await createProjectIdMirror(projectRoot, projectId);
+    if (mirror === 'conflict' || mirror === 'invalid')
+        return mirror;
+    return manifest;
+}
+/**
+ * Rename a project in its committed `.cleo/project.json`: only `name` changes;
+ * the id is carried over byte-identical and keys this build does not know are
+ * kept (`writeProjectManifestName`: a tmp file unique to the call, renamed
+ * into place, so a crash never leaves a half-written identity file).
+ *
+ * @param projectRoot - Absolute project root.
+ * @param name - New display name (trimmed; must pass `isValidProjectDisplayName`).
+ * @returns The previous and new manifest names.
+ * @throws {CleoError} `VALIDATION_ERROR` for an invalid name; `CONFIG_ERROR`
+ *   when `project.json` is absent (migrate first) or unusable.
+ *
+ * @example
+ * ```ts
+ * await renameProjectManifest(root, 'cleo-platform');
+ * ```
+ * @task T12716
+ */
+export async function renameProjectManifest(projectRoot, name) {
+    const newName = name.trim();
+    if (!isValidProjectDisplayName(newName)) {
+        throw new CleoError(ExitCode.VALIDATION_ERROR, `Invalid project name '${newName}': use 1-${PROJECT_DISPLAY_NAME_MAX} characters with no "/", "\\", control characters or leading "~"`);
     }
-    catch (error) {
-        if (error instanceof Error && 'code' in error && error.code === 'EEXIST') {
-            // Lost a race with another writer: judge what they wrote, never overwrite it.
-            const raced = readPortableProjectId(projectRoot);
-            if (raced.status === 'valid')
-                return raced.projectId === projectId ? 'present' : 'conflict';
-            return 'invalid';
-        }
-        throw error;
+    const current = readProjectManifest(projectRoot);
+    if (current.status !== 'valid') {
+        throw new CleoError(ExitCode.CONFIG_ERROR, current.status === 'absent'
+            ? `${projectManifestPath(projectRoot)} does not exist yet`
+            : `${projectManifestPath(projectRoot)} is unusable (${current.reason})`, {
+            fix: current.status === 'absent'
+                ? 'Run `cleo doctor project-identity --resolve` to record the identity in .cleo/project.json'
+                : `Restore it from version control: \`git checkout -- .cleo/${PROJECT_MANIFEST_FILE}\``,
+        });
     }
+    // Only `name` changes; unknown keys survive; a per-call tmp file (T12716).
+    const { writeProjectManifestName } = await import('../project-info.js');
+    return writeProjectManifestName(projectRoot, newName);
 }
 //# sourceMappingURL=project-identity.js.map

package/dist/scaffold/project-identity.js.map

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