@kitsy/coop 2.2.2 → 2.2.3

package/dist/index.js

@@ -32,7 +32,31 @@ var SEQ_MARKER = "COOPSEQTOKEN";
 var DEFAULT_ID_NAMING_TEMPLATE = "<TYPE>-<TITLE16>-<SEQ>";
 var DEFAULT_ARTIFACTS_DIR = "docs";
 var DEFAULT_TITLE_TOKEN_LENGTH = 16;
+var DEFAULT_NAMING_TEMPLATES = {
+  task: DEFAULT_ID_NAMING_TEMPLATE,
+  idea: DEFAULT_ID_NAMING_TEMPLATE,
+  track: "<NAME_SLUG>",
+  delivery: "<NAME_SLUG>",
+  run: "<TYPE>-<YYMMDD>-<RAND>"
+};
 var SEMANTIC_WORD_MAX = 4;
+var BUILT_IN_NAMING_TOKENS = /* @__PURE__ */ new Set([
+  "TYPE",
+  "ENTITY",
+  "TITLE",
+  "TITLE16",
+  "TITLE24",
+  "TRACK",
+  "STATUS",
+  "TASK_TYPE",
+  "PREFIX",
+  "USER",
+  "YYMMDD",
+  "RAND",
+  "SEQ",
+  "NAME",
+  "NAME_SLUG"
+]);
 var SEMANTIC_STOP_WORDS = /* @__PURE__ */ new Set([
   "A",
   "AN",
@@ -60,8 +84,12 @@ function resolveCoopHome() {
 }
 function resolveRepoRoot(start = process.cwd()) {
   let current = path.resolve(start);
+  const configuredCoopHome = path.resolve(resolveCoopHome());
+  const defaultCoopHome = path.resolve(path.join(os.homedir(), ".coop"));
   while (true) {
-    if (fs.existsSync(path.join(current, ".git")) || fs.existsSync(path.join(current, ".coop"))) {
+    const coopDir2 = path.join(current, ".coop");
+    const isGlobalCoopHome = path.resolve(coopDir2) === configuredCoopHome || path.resolve(coopDir2) === defaultCoopHome;
+    if (fs.existsSync(path.join(current, ".git")) || fs.existsSync(coopDir2) && !isGlobalCoopHome) {
       return current;
     }
     const parent = path.dirname(current);
@@ -126,6 +154,8 @@ function readCoopConfig(root, projectId = resolveRequestedProject()) {
       taskPrefix: "PM",
       indexDataFormat: "yaml",
       idNamingTemplate: DEFAULT_ID_NAMING_TEMPLATE,
+      idNamingTemplates: { ...DEFAULT_NAMING_TEMPLATES },
+      idTokens: {},
       idSeqPadding: 0,
       artifactsDir: DEFAULT_ARTIFACTS_DIR,
       projectName: repoName || "COOP Workspace",
@@ -147,9 +177,10 @@ function readCoopConfig(root, projectId = resolveRequestedProject()) {
   const indexRaw = typeof config.index === "object" && config.index !== null ? config.index : {};
   const indexDataRaw = indexRaw.data;
   const indexDataFormat = indexDataRaw === "json" ? "json" : "yaml";
+  const idNamingTemplates = readNamingTemplates(config);
+  const idNamingTemplate = idNamingTemplates.task;
+  const idTokens = readNamingTokens(config);
   const idRaw = typeof config.id === "object" && config.id !== null ? config.id : {};
-  const idNamingTemplateRaw = idRaw.naming;
-  const idNamingTemplate = typeof idNamingTemplateRaw === "string" && idNamingTemplateRaw.trim().length > 0 ? idNamingTemplateRaw.trim() : DEFAULT_ID_NAMING_TEMPLATE;
   const idSeqPaddingRaw = idRaw.seq_padding;
   const idSeqPadding = Number.isInteger(idSeqPaddingRaw) && Number(idSeqPaddingRaw) >= 0 ? Number(idSeqPaddingRaw) : 0;
   const artifactsRaw = typeof config.artifacts === "object" && config.artifacts !== null ? config.artifacts : {};
@@ -159,6 +190,8 @@ function readCoopConfig(root, projectId = resolveRequestedProject()) {
     taskPrefix,
     indexDataFormat,
     idNamingTemplate,
+    idNamingTemplates,
+    idTokens,
     idSeqPadding,
     artifactsDir,
     projectName: projectName || "COOP Workspace",
@@ -176,6 +209,59 @@ function sanitizeIdentityPart(value, fallback) {
   const normalized = value.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
   return normalized || fallback;
 }
+function slugifyLower(value, fallback = "item") {
+  const normalized = value.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
+  return normalized || fallback;
+}
+function normalizeNamingTokenName(value) {
+  const normalized = value.trim().toLowerCase().replace(/[^a-z0-9_]+/g, "_").replace(/^_+|_+$/g, "").replace(/_+/g, "_");
+  if (!normalized) {
+    throw new Error("Naming token names must contain letters, numbers, or underscores.");
+  }
+  return normalized;
+}
+function normalizeNamingTokenValue(value) {
+  const normalized = value.trim().toUpperCase().replace(/[^A-Z0-9]+/g, "_").replace(/^_+|_+$/g, "").replace(/_+/g, "_");
+  if (!normalized) {
+    throw new Error("Naming token values must contain letters or numbers.");
+  }
+  return normalized;
+}
+function readNamingTemplates(rawConfig) {
+  const idRaw = typeof rawConfig.id === "object" && rawConfig.id !== null ? rawConfig.id : {};
+  const namingRaw = idRaw.naming;
+  if (typeof namingRaw === "string" && namingRaw.trim().length > 0) {
+    return {
+      ...DEFAULT_NAMING_TEMPLATES,
+      task: namingRaw.trim(),
+      idea: namingRaw.trim()
+    };
+  }
+  const namingRecord = typeof namingRaw === "object" && namingRaw !== null ? namingRaw : {};
+  return {
+    task: typeof namingRecord.task === "string" && namingRecord.task.trim().length > 0 ? namingRecord.task.trim() : DEFAULT_NAMING_TEMPLATES.task,
+    idea: typeof namingRecord.idea === "string" && namingRecord.idea.trim().length > 0 ? namingRecord.idea.trim() : DEFAULT_NAMING_TEMPLATES.idea,
+    track: typeof namingRecord.track === "string" && namingRecord.track.trim().length > 0 ? namingRecord.track.trim() : DEFAULT_NAMING_TEMPLATES.track,
+    delivery: typeof namingRecord.delivery === "string" && namingRecord.delivery.trim().length > 0 ? namingRecord.delivery.trim() : DEFAULT_NAMING_TEMPLATES.delivery,
+    run: typeof namingRecord.run === "string" && namingRecord.run.trim().length > 0 ? namingRecord.run.trim() : DEFAULT_NAMING_TEMPLATES.run
+  };
+}
+function readNamingTokens(rawConfig) {
+  const idRaw = typeof rawConfig.id === "object" && rawConfig.id !== null ? rawConfig.id : {};
+  const tokensRaw = typeof idRaw.tokens === "object" && idRaw.tokens !== null ? idRaw.tokens : {};
+  const tokens = {};
+  for (const [rawName, rawValue] of Object.entries(tokensRaw)) {
+    const name = normalizeNamingTokenName(rawName);
+    const valuesRecord = typeof rawValue === "object" && rawValue !== null ? rawValue : {};
+    const values = Array.isArray(valuesRecord.values) ? Array.from(
+      new Set(
+        valuesRecord.values.filter((entry) => typeof entry === "string" && entry.trim().length > 0).map((entry) => normalizeNamingTokenValue(entry))
+      )
+    ).sort((a, b) => a.localeCompare(b)) : [];
+    tokens[name] = { values };
+  }
+  return tokens;
+}
 function repoDisplayName(root) {
   const base = path.basename(path.resolve(root)).trim();
   return base || "COOP Workspace";
@@ -278,6 +364,19 @@ function sanitizeTemplateValue(input2, fallback = "X") {
   const normalized = input2.toUpperCase().replace(/[^A-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
   return normalized || fallback;
 }
+function normalizeEntityIdValue(entityType, input2, fallback = "COOP-ID") {
+  if (entityType === "track" || entityType === "delivery") {
+    return slugifyLower(input2, slugifyLower(fallback, "item"));
+  }
+  return sanitizeTemplateValue(input2, fallback);
+}
+function extractTemplateTokens(template) {
+  return Array.from(
+    new Set(
+      Array.from(template.matchAll(/<([^>]+)>/g)).map((match) => match[1]?.trim().toUpperCase()).filter((token) => Boolean(token))
+    )
+  );
+}
 function sanitizeSemanticWord(input2) {
   return input2.toUpperCase().replace(/[^A-Z0-9]+/g, "").trim();
 }
@@ -332,8 +431,8 @@ function namingTokenExamples(title = "Natural-language COOP command recommender"
   };
 }
 function sequenceForPattern(existingIds, prefix, suffix) {
-  const escapedPrefix = prefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const escapedSuffix = suffix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const escapedPrefix = prefix.toUpperCase().replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const escapedSuffix = suffix.toUpperCase().replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const regex = new RegExp(`^${escapedPrefix}(\\d+)${escapedSuffix}$`);
   let max = 0;
   for (const id of existingIds) {
@@ -359,6 +458,7 @@ function buildIdContext(root, config, context) {
   const track = context.track?.trim() || "";
   const status = context.status?.trim() || "";
   const title = context.title?.trim() || "";
+  const name = context.name?.trim() || context.title?.trim() || "";
   const prefix = context.prefix?.trim() || (context.entityType === "idea" ? config.ideaPrefix : config.taskPrefix);
   const actor = inferActor(root);
   const map = {
@@ -373,13 +473,26 @@ function buildIdContext(root, config, context) {
     STATUS: sanitizeTemplateValue(status || "TODO", "TODO"),
     TASK_TYPE: sanitizeTemplateValue(taskType || "FEATURE", "FEATURE"),
     PREFIX: sanitizeTemplateValue(prefix, "COOP"),
+    NAME: name || "item",
+    NAME_SLUG: slugifyLower(name || "item"),
     RAND: randomToken()
   };
   for (const [key, value] of Object.entries(fields)) {
     if (!value || !value.trim()) continue;
-    const upper = key.toUpperCase();
+    const tokenName = normalizeNamingTokenName(key);
+    const upper = tokenName.toUpperCase();
     if (Object.prototype.hasOwnProperty.call(map, upper)) continue;
-    map[upper] = sanitizeTemplateValue(value);
+    const tokenConfig = config.idTokens[tokenName];
+    if (!tokenConfig) {
+      continue;
+    }
+    const normalizedValue = normalizeNamingTokenValue(value);
+    if (tokenConfig.values.length > 0 && !tokenConfig.values.includes(normalizedValue)) {
+      throw new Error(
+        `Invalid value '${value}' for naming token '${tokenName}'. Allowed values: ${tokenConfig.values.join(", ")}.`
+      );
+    }
+    map[upper] = normalizedValue;
   }
   return map;
 }
@@ -398,52 +511,137 @@ function replaceTemplateToken(token, contextMap) {
   if (upper === "TASK_TYPE") return contextMap.TASK_TYPE;
   if (upper === "STATUS") return contextMap.STATUS;
   if (upper === "PREFIX") return contextMap.PREFIX;
+  if (upper === "NAME") return contextMap.NAME;
+  if (upper === "NAME_SLUG") return contextMap.NAME_SLUG;
   const dynamic = contextMap[upper];
   if (dynamic) return dynamic;
   return sanitizeTemplateValue(upper);
 }
-function renderNamingTemplate(template, contextMap) {
+function renderNamingTemplate(template, contextMap, entityType) {
   const normalizedTemplate = template.trim().length > 0 ? template : DEFAULT_ID_NAMING_TEMPLATE;
   const replaced = normalizedTemplate.replace(/<([^>]+)>/g, (_, token) => replaceTemplateToken(token, contextMap));
-  return sanitizeTemplateValue(replaced, "COOP-ID");
+  return normalizeEntityIdValue(entityType, replaced, "COOP-ID");
 }
 function defaultCoopAuthor(root) {
   const actor = inferActor(root);
   return actor.trim() || "unknown";
 }
+function normalizeEntityId(entityType, value) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    throw new Error(`Invalid ${entityType} id. Provide a non-empty value.`);
+  }
+  return normalizeEntityIdValue(entityType, trimmed, entityType);
+}
+function namingTemplatesForRoot(root) {
+  return readCoopConfig(root).idNamingTemplates;
+}
+function namingTokensForRoot(root) {
+  return readCoopConfig(root).idTokens;
+}
+function generateStableShortId(root, entityType, primaryId, existingShortIds = []) {
+  const config = readCoopConfig(root);
+  const digest = crypto.createHash("sha256").update(`${config.projectId}:${entityType}:${primaryId}`).digest("hex").toLowerCase();
+  const existing = new Set(existingShortIds.map((value) => value.toLowerCase()));
+  for (let width = 12; width <= digest.length; width += 2) {
+    const candidate = digest.slice(0, width);
+    if (!existing.has(candidate)) {
+      return candidate;
+    }
+  }
+  throw new Error(`Unable to generate a unique short id for ${entityType} '${primaryId}'.`);
+}
+function extractDynamicTokenFlags(commandPath, knownValueOptions, knownBooleanOptions = [], argv = process.argv.slice(2)) {
+  const start = argv.findIndex((_, index) => commandPath.every((segment, offset) => argv[index + offset] === segment));
+  if (start < 0) {
+    return {};
+  }
+  const result = {};
+  const valueOptions = new Set(knownValueOptions);
+  const booleanOptions = new Set(knownBooleanOptions);
+  for (let index = start + commandPath.length; index < argv.length; index += 1) {
+    const token = argv[index] ?? "";
+    if (!token.startsWith("--")) {
+      continue;
+    }
+    const [rawName, inlineValue] = token.slice(2).split("=", 2);
+    const name = rawName.trim();
+    if (!name) {
+      continue;
+    }
+    if (valueOptions.has(name)) {
+      if (inlineValue === void 0) {
+        index += 1;
+      }
+      continue;
+    }
+    if (booleanOptions.has(name) || name.startsWith("no-")) {
+      continue;
+    }
+    const value = inlineValue ?? argv[index + 1];
+    if (!value || value.startsWith("-")) {
+      throw new Error(`Dynamic naming flag '--${name}' requires a value.`);
+    }
+    result[name] = value;
+    if (inlineValue === void 0) {
+      index += 1;
+    }
+  }
+  return result;
+}
 function previewNamingTemplate(template, context, root = process.cwd()) {
   const config = readCoopConfig(root);
+  const usedTemplate = template.trim().length > 0 ? template : config.idNamingTemplates[context.entityType];
+  const referencedTokens = extractTemplateTokens(usedTemplate);
+  for (const token of referencedTokens) {
+    if (!BUILT_IN_NAMING_TOKENS.has(token) && !config.idTokens[token.toLowerCase()]) {
+      throw new Error(`Naming template references unknown token <${token}>.`);
+    }
+  }
   const contextMap = buildIdContext(root, config, context);
-  const rendered = renderNamingTemplate(template, {
+  const rendered = renderNamingTemplate(usedTemplate, {
     ...contextMap,
     RAND: "AB12CD34",
     YYMMDD: "260320",
     USER: "PKVSI"
-  });
+  }, context.entityType);
   return rendered.replace(SEQ_MARKER, "1");
 }
 function generateConfiguredId(root, existingIds, context) {
   const config = readCoopConfig(root);
+  const template = config.idNamingTemplates[context.entityType];
+  const referencedTokens = extractTemplateTokens(template);
+  for (const token of referencedTokens) {
+    if (BUILT_IN_NAMING_TOKENS.has(token)) {
+      continue;
+    }
+    if (!config.idTokens[token.toLowerCase()]) {
+      throw new Error(`Naming template references unknown token <${token}>.`);
+    }
+    if (!context.fields || !Object.keys(context.fields).some((key) => normalizeNamingTokenName(key) === token.toLowerCase())) {
+      throw new Error(`Naming template requires token <${token}>. Pass --${token.toLowerCase()} <value>.`);
+    }
+  }
   const contextMap = buildIdContext(root, config, context);
   const existing = existingIds.map((id) => id.toUpperCase());
   for (let attempt = 0; attempt < 32; attempt += 1) {
-    const rendered = renderNamingTemplate(config.idNamingTemplate, {
+    const rendered = renderNamingTemplate(template, {
       ...contextMap,
       RAND: randomToken()
-    });
+    }, context.entityType);
     const seqMarker = SEQ_MARKER;
-    const upperRendered = rendered.toUpperCase();
-    if (!upperRendered.includes(seqMarker)) {
-      if (!existing.includes(upperRendered)) {
-        return upperRendered;
+    const normalizedRendered = context.entityType === "track" || context.entityType === "delivery" ? rendered : rendered.toUpperCase();
+    if (!normalizedRendered.includes(seqMarker)) {
+      if (!existing.includes(normalizedRendered.toUpperCase())) {
+        return normalizedRendered;
       }
       continue;
     }
-    const [prefix, suffix] = upperRendered.split(seqMarker);
+    const [prefix, suffix] = normalizedRendered.split(seqMarker);
     const nextSeq = sequenceForPattern(existing, prefix ?? "", suffix ?? "");
     const seq = padSequence(nextSeq, config.idSeqPadding);
     const candidate = `${prefix ?? ""}${seq}${suffix ?? ""}`.replace(/-+/g, "-").replace(/^-+|-+$/g, "");
-    if (!existing.includes(candidate)) {
+    if (!existing.includes(candidate.toUpperCase())) {
       return candidate;
     }
   }
@@ -551,32 +749,58 @@ function rebuildAliasIndex(root) {
   ensureCoopInitialized(root);
   const items = {};
   const aliases = {};
+  const shortIds = {};
   const ids = /* @__PURE__ */ new Set();
   const taskFiles = listTaskFiles(root);
+  const usedTaskShortIds = taskFiles.map((filePath) => parseTaskFile2(filePath)).map((parsed) => parsed.task.short_id?.trim().toLowerCase()).filter((value) => Boolean(value));
   for (const filePath of taskFiles) {
     const parsed = parseTaskFile2(filePath);
     const id = parsed.task.id.toUpperCase();
     const source = path2.relative(root, filePath);
+    const shortId = parsed.task.short_id?.trim() ? parsed.task.short_id.trim().toLowerCase() : generateStableShortId(root, "task", parsed.task.id, usedTaskShortIds);
+    if (!parsed.task.short_id?.trim()) {
+      usedTaskShortIds.push(shortId);
+      const nextRaw = { ...parsed.raw, short_id: shortId };
+      const nextTask = { ...parsed.task, short_id: shortId };
+      writeTask(nextTask, { body: parsed.body, raw: nextRaw, filePath });
+    }
     ids.add(id);
     items[id] = {
       type: "task",
       aliases: parseAliases(parsed.raw, source),
-      file: toPosixPath(path2.relative(root, filePath))
+      file: toPosixPath(path2.relative(root, filePath)),
+      short_id: shortId
     };
   }
   const ideaFiles = listIdeaFiles(root);
+  const usedIdeaShortIds = ideaFiles.map((filePath) => parseIdeaFile(filePath)).map((parsed) => parsed.idea.short_id?.trim().toLowerCase()).filter((value) => Boolean(value));
   for (const filePath of ideaFiles) {
     const parsed = parseIdeaFile(filePath);
     const id = parsed.idea.id.toUpperCase();
     const source = path2.relative(root, filePath);
+    const shortId = parsed.idea.short_id?.trim() ? parsed.idea.short_id.trim().toLowerCase() : generateStableShortId(root, "idea", parsed.idea.id, usedIdeaShortIds);
+    if (!parsed.idea.short_id?.trim()) {
+      usedIdeaShortIds.push(shortId);
+      const nextRaw = { ...parsed.raw, short_id: shortId };
+      const output2 = stringifyFrontmatter(nextRaw, parsed.body);
+      fs2.writeFileSync(filePath, output2, "utf8");
+    }
     ids.add(id);
     items[id] = {
       type: "idea",
       aliases: parseAliases(parsed.raw, source),
-      file: toPosixPath(path2.relative(root, filePath))
+      file: toPosixPath(path2.relative(root, filePath)),
+      short_id: shortId
     };
   }
   for (const [id, item] of Object.entries(items)) {
+    if (item.short_id) {
+      const existingShort = shortIds[item.short_id];
+      if (existingShort && existingShort.id !== id) {
+        throw new Error(`Short id '${item.short_id}' is already mapped to '${existingShort.id}'.`);
+      }
+      shortIds[item.short_id] = { id, type: item.type, file: item.file, short_id: item.short_id };
+    }
     for (const alias of item.aliases) {
       if (ids.has(alias)) {
         throw new Error(`Alias '${alias}' conflicts with existing item id '${alias}'.`);
@@ -592,6 +816,7 @@ function rebuildAliasIndex(root) {
     version: 1,
     generated_at: (/* @__PURE__ */ new Date()).toISOString(),
     aliases,
+    short_ids: shortIds,
     items
   };
   writeIndexFile(root, data);
@@ -604,7 +829,7 @@ function loadAliasIndex(root) {
     return rebuildAliasIndex(root);
   }
   const parsed = readIndexFile(root, aliasIndexPath);
-  if (!parsed || typeof parsed !== "object" || !parsed.aliases || !parsed.items) {
+  if (!parsed || typeof parsed !== "object" || !parsed.aliases || !parsed.items || !parsed.short_ids) {
     return rebuildAliasIndex(root);
   }
   return parsed;
@@ -619,6 +844,27 @@ function resolveReference(root, idOrAlias, expectedType) {
     }
     return { id: idCandidate, type: item.type, file: item.file };
   }
+  const shortCandidate = idOrAlias.trim().toLowerCase();
+  const shortMatch = index.short_ids[shortCandidate];
+  if (shortMatch) {
+    if (expectedType && shortMatch.type !== expectedType) {
+      throw new Error(`'${idOrAlias}' resolves to ${shortMatch.type} '${shortMatch.id}', expected ${expectedType}.`);
+    }
+    return shortMatch;
+  }
+  if (shortCandidate.length >= 6) {
+    const prefixMatches = Object.entries(index.short_ids).filter(([shortId]) => shortId.startsWith(shortCandidate)).map(([, target]) => target);
+    if (prefixMatches.length === 1) {
+      const match2 = prefixMatches[0];
+      if (expectedType && match2.type !== expectedType) {
+        throw new Error(`'${idOrAlias}' resolves to ${match2.type} '${match2.id}', expected ${expectedType}.`);
+      }
+      return match2;
+    }
+    if (prefixMatches.length > 1) {
+      throw new Error(`Ambiguous short id '${idOrAlias}'. Candidates: ${prefixMatches.map((entry) => entry.id).join(", ")}.`);
+    }
+  }
   const alias = normalizeAlias(idOrAlias);
   const match = index.aliases[alias];
   if (!match) {
@@ -725,17 +971,28 @@ function removeAliases(root, idOrAlias, values) {
 }
 
 // src/utils/table.ts
+var ANSI_PATTERN = /\u001B\[[0-9;]*m/g;
+function visibleLength(value) {
+  return value.replace(ANSI_PATTERN, "").length;
+}
+function padEndAnsi(value, width) {
+  const visible = visibleLength(value);
+  if (visible >= width) {
+    return value;
+  }
+  return `${value}${" ".repeat(width - visible)}`;
+}
 function formatTable(headers, rows) {
   const table = [headers, ...rows];
   const widths = [];
   for (let col = 0; col < headers.length; col += 1) {
-    let width = headers[col].length;
+    let width = visibleLength(headers[col] ?? "");
     for (const row of table) {
-      width = Math.max(width, (row[col] ?? "").length);
+      width = Math.max(width, visibleLength(row[col] ?? ""));
     }
     widths.push(width + 2);
   }
-  return table.map((row) => row.map((cell, index) => (cell ?? "").padEnd(widths[index])).join("").trimEnd()).join("\n");
+  return table.map((row) => row.map((cell, index) => padEndAnsi(cell ?? "", widths[index])).join("").trimEnd()).join("\n");
 }
 
 // src/commands/alias.ts
@@ -1398,38 +1655,101 @@ import {
   stringifyFrontmatter as stringifyFrontmatter2,
   validateStructural as validateStructural2,
   validateSemantic,
+  writeYamlFile as writeYamlFile3,
   writeTask as writeTask3
 } from "@kitsy/coop-core";
-function existingTrackMap(root) {
-  const map = /* @__PURE__ */ new Map();
-  for (const filePath of listTrackFiles(root)) {
-    const track = parseYamlFile2(filePath);
-    if (track.id?.trim()) {
-      map.set(track.id.trim().toLowerCase(), track.id.trim());
+function writeTrackFile(filePath, track) {
+  writeYamlFile3(filePath, track);
+}
+function writeDeliveryFile(filePath, delivery, raw, body) {
+  const payload = { ...raw, ...delivery };
+  if (body.trim().length > 0) {
+    fs3.writeFileSync(filePath, stringifyFrontmatter2(payload, body), "utf8");
+    return;
+  }
+  writeYamlFile3(filePath, payload);
+}
+function loadTrackEntries(root) {
+  const rawEntries = listTrackFiles(root).map((filePath) => ({ track: parseYamlFile2(filePath), filePath })).sort((a, b) => a.track.id.localeCompare(b.track.id));
+  const used = rawEntries.map((entry) => entry.track.short_id?.trim().toLowerCase()).filter((value) => Boolean(value));
+  let mutated = false;
+  for (const entry of rawEntries) {
+    if (entry.track.short_id?.trim()) {
+      continue;
     }
+    entry.track.short_id = generateStableShortId(root, "track", entry.track.id, used);
+    used.push(entry.track.short_id);
+    writeTrackFile(entry.filePath, entry.track);
+    mutated = true;
   }
-  return map;
+  return mutated ? rawEntries.map((entry) => ({ track: parseYamlFile2(entry.filePath), filePath: entry.filePath })) : rawEntries;
 }
-function existingDeliveryMap(root) {
-  const map = /* @__PURE__ */ new Map();
-  for (const filePath of listDeliveryFiles(root)) {
-    const delivery = parseDeliveryFile(filePath).delivery;
-    if (delivery.id?.trim()) {
-      map.set(delivery.id.trim().toLowerCase(), delivery.id.trim());
+function loadDeliveryEntries(root) {
+  const rawEntries = listDeliveryFiles(root).map((filePath) => {
+    const parsed = parseDeliveryFile(filePath);
+    return { delivery: parsed.delivery, filePath, body: parsed.body, raw: parsed.raw };
+  }).sort((a, b) => a.delivery.id.localeCompare(b.delivery.id));
+  const used = rawEntries.map((entry) => entry.delivery.short_id?.trim().toLowerCase()).filter((value) => Boolean(value));
+  let mutated = false;
+  for (const entry of rawEntries) {
+    if (entry.delivery.short_id?.trim()) {
+      continue;
     }
+    entry.delivery.short_id = generateStableShortId(root, "delivery", entry.delivery.id, used);
+    used.push(entry.delivery.short_id);
+    writeDeliveryFile(entry.filePath, entry.delivery, entry.raw, entry.body);
+    mutated = true;
   }
-  return map;
+  return mutated ? rawEntries.map((entry) => {
+    const parsed = parseDeliveryFile(entry.filePath);
+    return { delivery: parsed.delivery, filePath: entry.filePath, body: parsed.body, raw: parsed.raw };
+  }) : rawEntries;
+}
+function resolveUniqueShortId(entries, value) {
+  const normalized = value.trim().toLowerCase();
+  if (!normalized) return void 0;
+  const exact = entries.find((entry) => entry.short_id?.toLowerCase() === normalized);
+  if (exact) return exact;
+  if (normalized.length < 6) return void 0;
+  const matches = entries.filter((entry) => entry.short_id?.toLowerCase().startsWith(normalized));
+  if (matches.length === 1) {
+    return matches[0];
+  }
+  if (matches.length > 1) {
+    throw new Error(`Ambiguous short id '${value}'. Candidates: ${matches.map((entry) => entry.id).join(", ")}.`);
+  }
+  return void 0;
 }
 function resolveExistingTrackId(root, trackId) {
   const normalized = trackId.trim().toLowerCase();
   if (!normalized) return void 0;
   if (normalized === "unassigned") return "unassigned";
-  return existingTrackMap(root).get(normalized);
+  const entries = loadTrackEntries(root);
+  const byId = entries.find((entry) => entry.track.id.trim().toLowerCase() === normalized);
+  if (byId) return byId.track.id.trim();
+  const byShort = resolveUniqueShortId(entries.map((entry) => entry.track), normalized);
+  if (byShort) return byShort.id.trim();
+  const byName = entries.filter((entry) => entry.track.name.trim().toLowerCase() === normalized);
+  if (byName.length === 1) return byName[0].track.id.trim();
+  if (byName.length > 1) {
+    throw new Error(`Multiple tracks match '${trackId}'. Use the track id or short id.`);
+  }
+  return void 0;
 }
 function resolveExistingDeliveryId(root, deliveryId) {
   const normalized = deliveryId.trim().toLowerCase();
   if (!normalized) return void 0;
-  return existingDeliveryMap(root).get(normalized);
+  const entries = loadDeliveryEntries(root);
+  const byId = entries.find((entry) => entry.delivery.id.trim().toLowerCase() === normalized);
+  if (byId) return byId.delivery.id.trim();
+  const byShort = resolveUniqueShortId(entries.map((entry) => entry.delivery), normalized);
+  if (byShort) return byShort.id.trim();
+  const byName = entries.filter((entry) => entry.delivery.name.trim().toLowerCase() === normalized);
+  if (byName.length === 1) return byName[0].delivery.id.trim();
+  if (byName.length > 1) {
+    throw new Error(`Multiple deliveries match '${deliveryId}'. Use the delivery id or short id.`);
+  }
+  return void 0;
 }
 function assertExistingTrackId(root, trackId) {
   const resolved = resolveExistingTrackId(root, trackId);
@@ -1480,11 +1800,27 @@ function resolveIdeaFile(root, idOrAlias) {
 }
 function loadTaskEntry(root, idOrAlias) {
   const filePath = resolveTaskFile(root, idOrAlias);
-  return { filePath, parsed: parseTaskFile4(filePath) };
+  const parsed = parseTaskFile4(filePath);
+  if (!parsed.task.short_id?.trim()) {
+    const shortId = generateStableShortId(root, "task", parsed.task.id);
+    const nextTask = { ...parsed.task, short_id: shortId };
+    const nextRaw = { ...parsed.raw, short_id: shortId };
+    writeTask3(nextTask, { body: parsed.body, raw: nextRaw, filePath });
+    return { filePath, parsed: parseTaskFile4(filePath) };
+  }
+  return { filePath, parsed };
 }
 function loadIdeaEntry(root, idOrAlias) {
   const filePath = resolveIdeaFile(root, idOrAlias);
-  return { filePath, parsed: parseIdeaFile2(filePath) };
+  const parsed = parseIdeaFile2(filePath);
+  if (!parsed.idea.short_id?.trim()) {
+    const shortId = generateStableShortId(root, "idea", parsed.idea.id);
+    const nextRaw = { ...parsed.raw, short_id: shortId };
+    const output2 = stringifyFrontmatter2(nextRaw, parsed.body);
+    fs3.writeFileSync(filePath, output2, "utf8");
+    return { filePath, parsed: parseIdeaFile2(filePath) };
+  }
+  return { filePath, parsed };
 }
 function writeIdeaFile(filePath, parsed, idea, body = parsed.body) {
   const output2 = stringifyFrontmatter2({ ...parsed.raw, ...idea }, body);
@@ -1566,18 +1902,18 @@ function taskEffectivePriority(task, track) {
   return effective_priority(task, track);
 }
 function resolveDeliveryEntry(root, ref) {
-  const files = listDeliveryFiles(root);
   const target = ref.trim().toLowerCase();
-  const entries = files.map((filePath) => {
-    const parsed = parseDeliveryFile(filePath);
-    return { filePath, delivery: parsed.delivery, body: parsed.body };
-  });
+  const entries = loadDeliveryEntries(root);
   const direct = entries.find((entry) => entry.delivery.id.toLowerCase() === target);
   if (direct) return direct;
+  const byShort = resolveUniqueShortId(entries.map((entry) => entry.delivery), target);
+  if (byShort) {
+    return entries.find((entry) => entry.delivery.id === byShort.id);
+  }
   const byName = entries.filter((entry) => entry.delivery.name.toLowerCase() === target);
   if (byName.length === 1) return byName[0];
   if (byName.length > 1) {
-    throw new Error(`Multiple deliveries match '${ref}'. Use the delivery id.`);
+    throw new Error(`Multiple deliveries match '${ref}'. Use the delivery id or short id.`);
   }
   throw new Error(`Delivery '${ref}' not found.`);
 }
@@ -1716,6 +2052,7 @@ function selectTopReadyTask(root = resolveRepoRoot(), options = {}) {
 function formatSelectedTask(entry, selection = {}) {
   const lines = [
     `Selected task: ${entry.task.id}`,
+    `Short ID: ${entry.task.short_id ?? "-"}`,
     `Title: ${entry.task.title}`,
     `Priority: ${selection.track && entry.task.priority_context?.[selection.track] ? `${entry.task.priority ?? "-"} -> ${entry.task.priority_context[selection.track]}` : entry.task.priority ?? "-"}`,
     `Track: ${entry.task.track ?? "-"}`,
@@ -2038,7 +2375,9 @@ function writeIdNamingValue(root, value) {
   const config = readCoopConfig(root).raw;
   const next = { ...config };
   const idRaw = typeof next.id === "object" && next.id !== null ? { ...next.id } : {};
-  idRaw.naming = nextValue;
+  const namingRaw = typeof idRaw.naming === "object" && idRaw.naming !== null ? { ...idRaw.naming } : typeof idRaw.naming === "string" ? { task: idRaw.naming, idea: idRaw.naming } : {};
+  namingRaw.task = nextValue;
+  idRaw.naming = namingRaw;
   next.id = idRaw;
   writeCoopConfig(root, next);
 }
@@ -2209,8 +2548,10 @@ import {
   TaskType as TaskType2,
   check_permission as check_permission2,
   load_auth_config as load_auth_config2,
+  parseDeliveryFile as parseDeliveryFile2,
   parseTaskFile as parseTaskFile7,
-  writeYamlFile as writeYamlFile3,
+  parseYamlFile as parseYamlFile3,
+  writeYamlFile as writeYamlFile4,
   stringifyFrontmatter as stringifyFrontmatter4,
   writeTask as writeTask6
 } from "@kitsy/coop-core";
@@ -2713,6 +3054,41 @@ function plusDaysIso(days) {
 function unique2(values) {
   return Array.from(new Set(values));
 }
+function assertNoCaseInsensitiveNameConflict(kind, entries, candidateId, candidateName) {
+  const normalizedName = candidateName.trim().toLowerCase();
+  if (!normalizedName) {
+    return;
+  }
+  const conflict = entries.find(
+    (entry) => entry.id.trim().toLowerCase() !== candidateId.trim().toLowerCase() && entry.name.trim().toLowerCase() === normalizedName
+  );
+  if (!conflict) {
+    return;
+  }
+  throw new Error(
+    `${kind === "track" ? "Track" : "Delivery"} name '${candidateName}' conflicts with existing ${kind} '${conflict.id}' (${conflict.name}). Names are matched case-insensitively.`
+  );
+}
+function taskShortIds(root) {
+  return listTaskFiles(root).map((filePath) => parseTaskFile7(filePath).task.short_id?.trim().toLowerCase()).filter((value) => Boolean(value));
+}
+function ideaShortIds(root) {
+  return listIdeaFiles(root).map((filePath) => parseIdeaFile3(filePath).idea.short_id?.trim().toLowerCase()).filter((value) => Boolean(value));
+}
+function trackShortIds(root) {
+  return listTrackFiles(root).map((filePath) => parseYamlFile3(filePath).short_id?.trim().toLowerCase()).filter((value) => Boolean(value));
+}
+function deliveryShortIds(root) {
+  return listDeliveryFiles(root).map((filePath) => parseDeliveryFile2(filePath).delivery.short_id?.trim().toLowerCase()).filter((value) => Boolean(value));
+}
+function assertKnownDynamicFields(root, fields) {
+  const tokens = namingTokensForRoot(root);
+  for (const key of Object.keys(fields)) {
+    if (!tokens[key]) {
+      throw new Error(`Unknown naming token '${key}'. Define it first with \`coop naming token create ${key}\`.`);
+    }
+  }
+}
 function resolveIdeaFile2(root, idOrAlias) {
   const target = resolveReference(root, idOrAlias, "idea");
   return path8.join(root, ...target.file.split("/"));
@@ -2741,10 +3117,33 @@ function makeTaskDraft(input2) {
 }
 function registerCreateCommand(program) {
   const create = program.command("create").description("Create COOP entities");
-  create.command("task").description("Create a task").argument("[title]", "Task title").option("--id <id>", "Task id").option("--from <idea>", "Create task(s) from an idea id/alias").option("--ai", "Use AI-assisted decomposition for --from").option("--title <title>", "Task title").option("--type <type>", `Task type (${Object.values(TaskType2).join(", ")})`).option("--status <status>", `Task status (${Object.values(TaskStatus3).join(", ")})`).option("--track <track>", "Home/origin track id").option("--delivery <delivery>", "Primary delivery id").option("--priority <priority>", "Task priority").option("--body <body>", "Markdown body").option("--acceptance <items>", "Comma-separated acceptance criteria", collectMultiValue, []).option("--tests-required <items>", "Comma-separated required tests", collectMultiValue, []).option("--authority-ref <ref>", "Authority document reference", collectMultiValue, []).option("--derived-ref <ref>", "Derived planning document reference", collectMultiValue, []).option("--from-file <path>", "Create task(s) from task draft/refinement draft file").option("--stdin", "Read task draft/refinement draft from stdin").option("--interactive", "Prompt for optional fields").action(async (titleArg, options) => {
+  create.command("task").description("Create a task").allowUnknownOption().allowExcessArguments().argument("[title]", "Task title").option("--id <id>", "Task id").option("--from <idea>", "Create task(s) from an idea id/alias").option("--ai", "Use AI-assisted decomposition for --from").option("--title <title>", "Task title").option("--type <type>", `Task type (${Object.values(TaskType2).join(", ")})`).option("--status <status>", `Task status (${Object.values(TaskStatus3).join(", ")})`).option("--track <track>", "Home/origin track id").option("--delivery <delivery>", "Primary delivery id").option("--priority <priority>", "Task priority").option("--body <body>", "Markdown body").option("--acceptance <items>", "Comma-separated acceptance criteria", collectMultiValue, []).option("--tests-required <items>", "Comma-separated required tests", collectMultiValue, []).option("--authority-ref <ref>", "Authority document reference", collectMultiValue, []).option("--derived-ref <ref>", "Derived planning document reference", collectMultiValue, []).option("--from-file <path>", "Create task(s) from task draft/refinement draft file").option("--stdin", "Read task draft/refinement draft from stdin").option("--interactive", "Prompt for optional fields").action(async (titleArg, options) => {
     const root = resolveRepoRoot();
     const coop = ensureCoopInitialized(root);
     const interactive = Boolean(options.interactive);
+    const dynamicFields = extractDynamicTokenFlags(
+      ["create", "task"],
+      [
+        "id",
+        "from",
+        "title",
+        "type",
+        "status",
+        "track",
+        "delivery",
+        "priority",
+        "body",
+        "acceptance",
+        "tests-required",
+        "authority-ref",
+        "derived-ref",
+        "from-file",
+        "stdin",
+        "interactive",
+        "ai"
+      ]
+    );
+    assertKnownDynamicFields(root, dynamicFields);
     if (options.fromFile?.trim() || options.stdin) {
       if (options.id || options.from || options.ai || options.title || titleArg || options.type || options.status || options.track || options.delivery || options.priority || options.body || (options.acceptance?.length ?? 0) > 0 || (options.testsRequired?.length ?? 0) > 0 || (options.authorityRef?.length ?? 0) > 0 || (options.derivedRef?.length ?? 0) > 0) {
         throw new Error("Cannot combine --from-file/--stdin with direct task field flags. Use one input mode.");
@@ -2854,23 +3253,28 @@ function registerCreateCommand(program) {
     }
     const existingIds = listTaskFiles(root).map((filePath) => path8.basename(filePath, ".md"));
     const createdIds = [];
+    const existingShortIds = taskShortIds(root);
+    const createdShortIds = [];
     for (let index = 0; index < drafts.length; index += 1) {
       const draft = drafts[index];
       if (!draft) continue;
-      const id = options.id?.trim()?.toUpperCase() || generateConfiguredId(root, [...existingIds, ...createdIds], {
+      const id = (options.id?.trim() ? normalizeEntityId("task", options.id) : void 0) || generateConfiguredId(root, [...existingIds, ...createdIds], {
         entityType: "task",
         title: draft.title,
         taskType: draft.type,
         track: draft.track,
         status: draft.status,
+        name: draft.title,
         fields: {
           track: draft.track,
           type: draft.type,
-          feature: draft.track || draft.type
+          feature: draft.track || draft.type,
+          ...dynamicFields
         }
       });
       const task = {
         id,
+        short_id: generateStableShortId(root, "task", id, [...existingShortIds, ...createdShortIds]),
         title: draft.title,
         type: draft.type,
         status: draft.status,
@@ -2895,6 +3299,9 @@ function registerCreateCommand(program) {
         filePath
       });
       createdIds.push(id);
+      if (normalizedTask.short_id) {
+        createdShortIds.push(normalizedTask.short_id);
+      }
       console.log(`Created task: ${path8.relative(root, filePath)}`);
     }
     if (sourceIdeaPath && sourceIdeaParsed && createdIds.length > 0) {
@@ -2908,10 +3315,15 @@ function registerCreateCommand(program) {
       console.log(`Linked ${createdIds.length} task(s) to idea: ${sourceIdeaParsed.idea.id}`);
     }
   });
-  create.command("idea").description("Create an idea").argument("[title]", "Idea title").option("--id <id>", "Idea id").option("--title <title>", "Idea title").option("--author <author>", "Idea author").option("--source <source>", "Idea source").option("--status <status>", `Idea status (${Object.values(IdeaStatus2).join(", ")})`).option("--tags <tags>", "Comma-separated tags").option("--body <body>", "Markdown body").option("--from-file <path>", "Create an idea from an idea draft file").option("--stdin", "Read idea draft from stdin").option("--interactive", "Prompt for optional fields").action(async (titleArg, options) => {
+  create.command("idea").description("Create an idea").allowUnknownOption().allowExcessArguments().argument("[title]", "Idea title").option("--id <id>", "Idea id").option("--title <title>", "Idea title").option("--author <author>", "Idea author").option("--source <source>", "Idea source").option("--status <status>", `Idea status (${Object.values(IdeaStatus2).join(", ")})`).option("--tags <tags>", "Comma-separated tags").option("--body <body>", "Markdown body").option("--from-file <path>", "Create an idea from an idea draft file").option("--stdin", "Read idea draft from stdin").option("--interactive", "Prompt for optional fields").action(async (titleArg, options) => {
     const root = resolveRepoRoot();
     const coop = ensureCoopInitialized(root);
     const interactive = Boolean(options.interactive);
+    const dynamicFields = extractDynamicTokenFlags(
+      ["create", "idea"],
+      ["id", "title", "author", "source", "status", "tags", "body", "from-file", "stdin", "interactive"]
+    );
+    assertKnownDynamicFields(root, dynamicFields);
     if (options.fromFile?.trim() || options.stdin) {
       if (options.id || options.title || titleArg || options.author || options.source || options.status || options.tags || options.body) {
         throw new Error("Cannot combine --from-file/--stdin with direct idea field flags. Use one input mode.");
@@ -2933,17 +3345,21 @@ function registerCreateCommand(program) {
     const tags = options.tags ? parseCsv(options.tags) : interactive ? parseCsv(await ask("Tags (comma-separated)", "")) : [];
     const body = options.body ?? (interactive ? await ask("Idea body (optional)", "") : "");
     const existingIds = listIdeaFiles(root).map((filePath2) => path8.basename(filePath2, ".md"));
-    const id = options.id?.trim()?.toUpperCase() || generateConfiguredId(root, existingIds, {
+    const id = (options.id?.trim() ? normalizeEntityId("idea", options.id) : void 0) || generateConfiguredId(root, existingIds, {
       entityType: "idea",
       title,
+      name: title,
       status,
       fields: {
         source,
-        author
+        author,
+        ...dynamicFields
       }
     });
+    const shortId = generateStableShortId(root, "idea", id, ideaShortIds(root));
     const frontmatter = {
       id,
+      short_id: shortId,
       title,
       created: todayIsoDate(),
       aliases: [],
@@ -2960,10 +3376,15 @@ function registerCreateCommand(program) {
     fs7.writeFileSync(filePath, stringifyFrontmatter4(frontmatter, body), "utf8");
     console.log(`Created idea: ${path8.relative(root, filePath)}`);
   });
-  create.command("track").description("Create a track").argument("[name]", "Track name").option("--id <id>", "Track id").option("--name <name>", "Track name").option("--profiles <profiles>", "Comma-separated capacity profile ids").option("--max-wip <number>", "Max concurrent tasks").option("--allowed-types <types>", "Comma-separated allowed task types").option("--interactive", "Prompt for optional fields").action(async (nameArg, options) => {
+  create.command("track").description("Create a track").allowUnknownOption().allowExcessArguments().argument("[name]", "Track name").option("--id <id>", "Track id").option("--name <name>", "Track name").option("--profiles <profiles>", "Comma-separated capacity profile ids").option("--max-wip <number>", "Max concurrent tasks").option("--allowed-types <types>", "Comma-separated allowed task types").option("--interactive", "Prompt for optional fields").action(async (nameArg, options) => {
     const root = resolveRepoRoot();
     const coop = ensureCoopInitialized(root);
     const interactive = Boolean(options.interactive);
+    const dynamicFields = extractDynamicTokenFlags(
+      ["create", "track"],
+      ["id", "name", "profiles", "max-wip", "allowed-types", "interactive"]
+    );
+    assertKnownDynamicFields(root, dynamicFields);
     const name = options.name?.trim() || nameArg?.trim() || await ask("Track name");
     if (!name) throw new Error("Track name is required.");
     const capacityProfiles = unique2(
@@ -2985,19 +3406,21 @@ function registerCreateCommand(program) {
       }
     }
     const existingIds = listTrackFiles(root).map((filePath2) => path8.basename(filePath2).replace(/\.(yml|yaml)$/i, ""));
-    const config = readCoopConfig(root);
-    const idPrefixesRaw = typeof config.raw.id_prefixes === "object" && config.raw.id_prefixes !== null ? config.raw.id_prefixes : {};
-    const prefix = typeof idPrefixesRaw.track === "string" ? idPrefixesRaw.track : "TRK";
-    const id = options.id?.trim()?.toUpperCase() || generateConfiguredId(root, existingIds, {
+    const id = (options.id?.trim() ? normalizeEntityId("track", options.id) : void 0) || generateConfiguredId(root, existingIds, {
       entityType: "track",
-      prefix,
       title: name,
+      name,
       fields: {
-        name
+        name,
+        ...dynamicFields
       }
     });
+    const existingTracks = listTrackFiles(root).map((filePath2) => parseYamlFile3(filePath2));
+    assertNoCaseInsensitiveNameConflict("track", existingTracks, id, name);
+    const shortId = generateStableShortId(root, "track", id, trackShortIds(root));
     const payload = {
       id,
+      short_id: shortId,
       name,
       capacity_profiles: capacityProfiles,
       constraints: {
@@ -3006,13 +3429,32 @@ function registerCreateCommand(program) {
       }
     };
     const filePath = path8.join(coop, "tracks", `${id}.yml`);
-    writeYamlFile3(filePath, payload);
+    writeYamlFile4(filePath, payload);
     console.log(`Created track: ${path8.relative(root, filePath)}`);
   });
-  create.command("delivery").description("Create a delivery").argument("[name]", "Delivery name").option("--id <id>", "Delivery id").option("--name <name>", "Delivery name").option("--status <status>", `Delivery status (${Object.values(DeliveryStatus).join(", ")})`).option("--commit", "Create delivery directly in committed state").option("--target-date <date>", "Target date (YYYY-MM-DD)").option("--budget-hours <hours>", "Engineering budget hours").option("--budget-cost <usd>", "Cost budget in USD").option("--profiles <profiles>", "Comma-separated capacity profile ids").option("--scope <ids>", "Comma-separated task ids to include in scope").option("--exclude <ids>", "Comma-separated task ids to exclude from scope").option("--user <user>", "Current user for advisory authorization checks").option("--force", "Override advisory authorization checks").option("--interactive", "Prompt for optional fields").action(async (nameArg, options) => {
+  create.command("delivery").description("Create a delivery").allowUnknownOption().allowExcessArguments().argument("[name]", "Delivery name").option("--id <id>", "Delivery id").option("--name <name>", "Delivery name").option("--status <status>", `Delivery status (${Object.values(DeliveryStatus).join(", ")})`).option("--commit", "Create delivery directly in committed state").option("--target-date <date>", "Target date (YYYY-MM-DD)").option("--budget-hours <hours>", "Engineering budget hours").option("--budget-cost <usd>", "Cost budget in USD").option("--profiles <profiles>", "Comma-separated capacity profile ids").option("--scope <ids>", "Comma-separated task ids to include in scope").option("--exclude <ids>", "Comma-separated task ids to exclude from scope").option("--user <user>", "Current user for advisory authorization checks").option("--force", "Override advisory authorization checks").option("--interactive", "Prompt for optional fields").action(async (nameArg, options) => {
     const root = resolveRepoRoot();
     const coop = ensureCoopInitialized(root);
     const interactive = Boolean(options.interactive);
+    const dynamicFields = extractDynamicTokenFlags(
+      ["create", "delivery"],
+      [
+        "id",
+        "name",
+        "status",
+        "commit",
+        "target-date",
+        "budget-hours",
+        "budget-cost",
+        "profiles",
+        "scope",
+        "exclude",
+        "user",
+        "force",
+        "interactive"
+      ]
+    );
+    assertKnownDynamicFields(root, dynamicFields);
     const user = options.user?.trim() || defaultCoopAuthor(root);
     const config = readCoopConfig(root);
     const auth = load_auth_config2(config.raw);
@@ -3088,21 +3530,22 @@ function registerCreateCommand(program) {
         throw new Error(`Scope exclude task '${id2}' does not exist.`);
       }
     }
-    const existingIds = listDeliveryFiles(root).map(
-      (filePath2) => path8.basename(filePath2).replace(/\.(yml|yaml|md)$/i, "")
-    );
-    const idPrefixesRaw = typeof config.raw.id_prefixes === "object" && config.raw.id_prefixes !== null ? config.raw.id_prefixes : {};
-    const prefix = typeof idPrefixesRaw.delivery === "string" ? idPrefixesRaw.delivery : "DEL";
-    const id = options.id?.trim()?.toUpperCase() || generateConfiguredId(root, existingIds, {
+    const existingIds = listDeliveryFiles(root).map((filePath2) => path8.basename(filePath2).replace(/\.(yml|yaml|md)$/i, ""));
+    const id = (options.id?.trim() ? normalizeEntityId("delivery", options.id) : void 0) || generateConfiguredId(root, existingIds, {
       entityType: "delivery",
-      prefix,
       title: name,
+      name,
       fields: {
-        status
+        status,
+        ...dynamicFields
       }
     });
+    const existingDeliveries = listDeliveryFiles(root).map((filePath2) => parseDeliveryFile2(filePath2).delivery);
+    assertNoCaseInsensitiveNameConflict("delivery", existingDeliveries, id, name);
+    const shortId = generateStableShortId(root, "delivery", id, deliveryShortIds(root));
     const payload = {
       id,
+      short_id: shortId,
       name,
       status,
       target_date: targetDate,
@@ -3119,7 +3562,7 @@ function registerCreateCommand(program) {
       }
     };
     const filePath = path8.join(coop, "deliveries", `${id}.yml`);
-    writeYamlFile3(filePath, payload);
+    writeYamlFile4(filePath, payload);
     console.log(`Created delivery: ${path8.relative(root, filePath)}`);
   });
 }
@@ -3411,6 +3854,7 @@ var catalog = {
     "Use `coop project show` first to confirm the active workspace and project.",
     "Use `coop use show` to inspect the current user-local working defaults for track, delivery, and version.",
     "Before assigning `track` or `delivery` values to tasks, inspect or create named entities with `coop list tracks`, `coop list deliveries`, `coop create track`, and `coop create delivery`.",
+    "Track and delivery references accept exact ids, stable short ids, and unique case-insensitive names.",
     "Use `coop graph next --delivery <delivery>` or `coop next task` to choose work. Do not reprioritize outside COOP unless the user explicitly overrides it.",
     "Commands resolve selection scope from: explicit CLI arg, then `coop use` working context, then shared project defaults.",
     "Use `--track` for the workstream lens (home track or delivery_tracks). Use `--delivery` for release/scope membership.",
@@ -3471,8 +3915,11 @@ var catalog = {
         { usage: "coop list tracks", purpose: "List valid named tracks before assigning or updating task track values." },
         { usage: "coop list deliveries", purpose: "List valid named deliveries before assigning or updating task delivery values." },
         { usage: "coop current", purpose: "Show the active project, working context, my active tasks, and the next ready task." },
-        { usage: "coop naming", purpose: "Explain the current naming template, tokens, and examples." },
-        { usage: 'coop naming preview "Natural-language COOP command recommender"', purpose: "Preview a semantic ID before creating an item." }
+        { usage: "coop naming", purpose: "Explain the effective per-entity naming rules, custom tokens, and examples." },
+        { usage: 'coop naming preview "Natural-language COOP command recommender" --entity task', purpose: "Preview the generated ID before creating an item." },
+        { usage: "coop naming set task <TYPE>-<TITLE16>-<SEQ>", purpose: "Set one entity's naming template without editing config by hand." },
+        { usage: "coop naming token create proj", purpose: "Create a custom naming token." },
+        { usage: "coop naming token value add proj UX", purpose: "Register an allowed value for a naming token." }
       ]
     },
     {
@@ -3483,8 +3930,10 @@ var catalog = {
         { usage: "coop create idea --from-file idea-draft.yml", purpose: "Ingest a structured idea draft file." },
         { usage: "cat idea.md | coop create idea --stdin", purpose: "Ingest an idea draft from stdin." },
         { usage: 'coop create task "Implement webhook pipeline"', purpose: "Create a task with defaults." },
+        { usage: 'coop create task "UX: Auth user journey" --id UX-AUTH-1', purpose: "Create a task with an explicit primary ID." },
+        { usage: 'coop create task "UX: Auth user journey" --proj UX --feat AUTH', purpose: "Create a task using configured naming tokens." },
         { usage: 'coop create task --title "Lock auth contract" --track MVP --delivery MVP', purpose: "Create a task directly inside a track and delivery scope." },
-        { usage: "coop create track --id mvp --name MVP", purpose: "Create a named track before tasks refer to it." },
+        { usage: "coop create track MVP", purpose: "Create a named track with slug-style default ID." },
         {
           usage: 'coop create task --title "Lock auth contract" --acceptance "Contract approved,Client mapping documented" --tests-required "Contract fixture test" --authority-ref docs/webapp-mvp-plan.md#auth',
           purpose: "Create a planning-grade task with acceptance, tests, and origin refs."
@@ -3628,9 +4077,10 @@ function renderTopicPayload(topic) {
   return {
     topic,
     naming_guidance: [
-      "Use `coop naming` to inspect the current naming template and token behavior.",
-      'Use `coop naming preview "<title>"` before creating a new idea, task, or delivery if predictable IDs matter.',
-      "Use `coop config id.naming ...` to override the default semantic naming template."
+      "Use `coop naming` to inspect per-entity templates, custom tokens, and examples.",
+      'Use `coop naming preview "<title>" --entity <entity>` before creating a new item if predictable IDs matter.',
+      "Use `coop naming set <entity> <template>` to update one entity's naming rule.",
+      "Use `coop naming token create <token>` and `coop naming token value add <token> <value>` before passing custom token flags like `--proj UX`."
     ]
   };
 }
@@ -4358,7 +4808,13 @@ id_prefixes:
   run: "RUN"
 
 id:
-  naming: ${JSON.stringify(namingTemplate)}
+  naming:
+    task: ${JSON.stringify(namingTemplate)}
+    idea: ${JSON.stringify(namingTemplate)}
+    track: "<NAME_SLUG>"
+    delivery: "<NAME_SLUG>"
+    run: "<TYPE>-<YYMMDD>-<RAND>"
+  tokens: {}
   seq_padding: 0
 
 defaults:
@@ -4720,15 +5176,14 @@ import path15 from "path";
 import {
   effective_priority as effective_priority3,
   load_graph as load_graph6,
-  parseDeliveryFile as parseDeliveryFile2,
   parseIdeaFile as parseIdeaFile4,
   parseTaskFile as parseTaskFile10,
-  parseYamlFile as parseYamlFile3,
   schedule_next as schedule_next3
 } from "@kitsy/coop-core";
 import chalk2 from "chalk";
 var TASK_COLUMN_WIDTHS = {
   id: 24,
+  short: 12,
   title: 30,
   status: 12,
   priority: 4,
@@ -4740,6 +5195,7 @@ var TASK_COLUMN_WIDTHS = {
 };
 var IDEA_COLUMN_WIDTHS = {
   id: 24,
+  short: 12,
   title: 30,
   status: 12,
   file: 30
@@ -4786,36 +5242,36 @@ function parseColumns(input2) {
 }
 function normalizeTaskColumns(value, ready) {
   if (!value?.trim()) {
-    return ready ? ["id", "title", "priority", "status", "assignee", "score"] : ["id", "title", "priority", "status", "assignee"];
+    return ready ? ["id", "title", "priority", "status", "assignee", "track", "delivery", "score"] : ["id", "title", "priority", "status", "assignee", "track", "delivery"];
   }
   const raw = parseColumns(value);
   if (raw.length === 1 && raw[0] === "all") {
-    return ["id", "title", "priority", "status", "assignee", "track", "delivery", "score", "file"];
+    return ["id", "short", "title", "priority", "status", "assignee", "track", "delivery", "score", "file"];
   }
   const normalized = raw.map((column) => {
     if (column === "p") return "priority";
     return column;
   });
-  const valid = /* @__PURE__ */ new Set(["id", "title", "status", "priority", "assignee", "track", "delivery", "score", "file"]);
+  const valid = /* @__PURE__ */ new Set(["id", "short", "title", "status", "priority", "assignee", "track", "delivery", "score", "file"]);
   for (const column of normalized) {
     if (!valid.has(column)) {
-      throw new Error(`Invalid task column '${column}'. Expected id|title|status|priority|assignee|track|delivery|score|file|all.`);
+      throw new Error(`Invalid task column '${column}'. Expected id|short|title|status|priority|assignee|track|delivery|score|file|all.`);
     }
   }
   return normalized;
 }
 function normalizeIdeaColumns(value) {
   if (!value?.trim()) {
-    return ["id", "title", "status"];
+    return ["id", "short", "title", "status"];
   }
   const raw = parseColumns(value);
   if (raw.length === 1 && raw[0] === "all") {
-    return ["id", "title", "status", "file"];
+    return ["id", "short", "title", "status", "file"];
   }
-  const valid = /* @__PURE__ */ new Set(["id", "title", "status", "file"]);
+  const valid = /* @__PURE__ */ new Set(["id", "short", "title", "status", "file"]);
   for (const column of raw) {
     if (!valid.has(column)) {
-      throw new Error(`Invalid idea column '${column}'. Expected id|title|status|file|all.`);
+      throw new Error(`Invalid idea column '${column}'. Expected id|short|title|status|file|all.`);
     }
   }
   return raw;
@@ -4952,6 +5408,8 @@ function sortTaskRows(rows, sortMode, readyOrder, track) {
 }
 function taskColumnHeader(column) {
   switch (column) {
+    case "short":
+      return "Short";
     case "priority":
       return "P";
     case "assignee":
@@ -4975,6 +5433,8 @@ function taskColumnHeader(column) {
 }
 function ideaColumnHeader(column) {
   switch (column) {
+    case "short":
+      return "Short";
     case "file":
       return "File";
     case "status":
@@ -5051,6 +5511,7 @@ function listTasks(options) {
   }).map(({ task, filePath }) => ({
     task,
     id: task.id,
+    shortId: task.short_id ?? "-",
     title: task.title,
     status: task.status,
     priority: taskEffectivePriority(task, resolvedTrack.value),
@@ -5071,10 +5532,12 @@ function listTasks(options) {
         (entry) => columns.map((column) => {
           const rawValue = (() => {
             switch (column) {
+              case "short":
+                return entry.shortId;
               case "title":
                 return entry.title;
               case "status":
-                return statusColor(entry.status);
+                return entry.status;
               case "priority":
                 return entry.priority;
               case "assignee":
@@ -5092,7 +5555,8 @@ function listTasks(options) {
                 return entry.id;
             }
           })();
-          return column === "file" ? truncateMiddleCell(rawValue, TASK_COLUMN_WIDTHS[column]) : truncateCell(rawValue, TASK_COLUMN_WIDTHS[column]);
+          const truncated = column === "file" ? truncateMiddleCell(rawValue, TASK_COLUMN_WIDTHS[column]) : truncateCell(rawValue, TASK_COLUMN_WIDTHS[column]);
+          return column === "status" ? statusColor(truncated) : truncated;
         })
       )
     )
@@ -5110,6 +5574,7 @@ function listIdeas(options) {
     return true;
   }).map(({ idea, filePath }) => ({
     id: idea.id,
+    shortId: idea.short_id ?? "-",
     title: idea.title,
     status: idea.status,
     priority: "-",
@@ -5142,8 +5607,9 @@ function listIdeas(options) {
       columns.map(ideaColumnHeader),
       sorted.map(
         (entry) => columns.map((column) => {
-          const rawValue = column === "title" ? entry.title : column === "status" ? statusColor(entry.status) : column === "file" ? path15.relative(root, entry.filePath) : entry.id;
-          return column === "file" ? truncateMiddleCell(rawValue, IDEA_COLUMN_WIDTHS[column]) : truncateCell(rawValue, IDEA_COLUMN_WIDTHS[column]);
+          const rawValue = column === "short" ? entry.shortId : column === "title" ? entry.title : column === "status" ? entry.status : column === "file" ? path15.relative(root, entry.filePath) : entry.id;
+          const truncated = column === "file" ? truncateMiddleCell(rawValue, IDEA_COLUMN_WIDTHS[column]) : truncateCell(rawValue, IDEA_COLUMN_WIDTHS[column]);
+          return column === "status" ? statusColor(truncated) : truncated;
         })
       )
     )
@@ -5153,10 +5619,11 @@ Total ideas: ${sorted.length}`);
 }
 function listDeliveries() {
   const root = resolveRepoRoot();
-  const rows = listDeliveryFiles(root).map((filePath) => ({ delivery: parseDeliveryFile2(filePath).delivery, filePath })).map(({ delivery, filePath }) => [
+  const rows = loadDeliveryEntries(root).map(({ delivery, filePath }) => [
     truncateCell(delivery.id, 24),
+    truncateCell(delivery.short_id ?? "-", 12),
     truncateCell(delivery.name, 30),
-    truncateCell(statusColor(delivery.status), 12),
+    statusColor(truncateCell(delivery.status, 12)),
     truncateCell(delivery.target_date ?? "-", 16),
     truncateMiddleCell(path15.relative(root, filePath), 30)
   ]);
@@ -5164,12 +5631,13 @@ function listDeliveries() {
     console.log("No deliveries found.");
     return;
   }
-  console.log(formatTable(["ID", "Name", "Status", "Target", "File"], rows));
+  console.log(formatTable(["ID", "Short", "Name", "Status", "Target", "File"], rows));
 }
 function listTracks() {
   const root = resolveRepoRoot();
-  const rows = listTrackFiles(root).map((filePath) => ({ track: parseYamlFile3(filePath), filePath })).sort((a, b) => a.track.id.localeCompare(b.track.id)).map(({ track, filePath }) => [
+  const rows = loadTrackEntries(root).map(({ track, filePath }) => [
     truncateCell(track.id, 24),
+    truncateCell(track.short_id ?? "-", 12),
     truncateCell(track.name, 30),
     truncateCell((track.capacity_profiles ?? []).join(", ") || "-", 24),
     truncateCell(String(track.constraints?.max_concurrent_tasks ?? "-"), 8),
@@ -5179,14 +5647,14 @@ function listTracks() {
     console.log("No tracks found.");
     return;
   }
-  console.log(formatTable(["ID", "Name", "Profiles", "Max WIP", "File"], rows));
+  console.log(formatTable(["ID", "Short", "Name", "Profiles", "Max WIP", "File"], rows));
 }
 function registerListCommand(program) {
   const list = program.command("list").description("List COOP entities");
-  list.command("tasks").description("List tasks").option("--status <status>", "Filter by status").option("--track <track>", "Filter by home/contributing track lens, using `coop use track` if omitted").option("--delivery <delivery>", "Filter by delivery membership, using `coop use delivery` if omitted").option("--priority <priority>", "Filter by effective priority").option("--assignee <assignee>", "Filter by assignee").option("--version <version>", "Filter by fix/released version, using `coop use version` if omitted").option("--mine", "Filter to the current default COOP author").option("--ready", "Only list ready tasks in scored order").option("--sort <sort>", "Sort by id|priority|status|title|updated|created|score").option("--columns <columns>", "Columns: id,title,status,priority,assignee,track,delivery,score,file or all").action((options) => {
+  list.command("tasks").alias("task").description("List tasks").option("--status <status>", "Filter by status").option("--track <track>", "Filter by home/contributing track lens, using `coop use track` if omitted").option("--delivery <delivery>", "Filter by delivery membership, using `coop use delivery` if omitted").option("--priority <priority>", "Filter by effective priority").option("--assignee <assignee>", "Filter by assignee").option("--version <version>", "Filter by fix/released version, using `coop use version` if omitted").option("--mine", "Filter to the current default COOP author").option("--ready", "Only list ready tasks in scored order").option("--sort <sort>", "Sort by id|priority|status|title|updated|created|score").option("--columns <columns>", "Columns: id,short,title,status,priority,assignee,track,delivery,score,file or all").action((options) => {
     listTasks(options);
   });
-  list.command("ideas").description("List ideas").option("--status <status>", "Filter by status").option("--sort <sort>", "Sort by id|status|title|updated|created").option("--columns <columns>", "Columns: id,title,status,file or all").action((options) => {
+  list.command("ideas").alias("idea").description("List ideas").option("--status <status>", "Filter by status").option("--sort <sort>", "Sort by id|status|title|updated|created").option("--columns <columns>", "Columns: id,short,title,status,file or all").action((options) => {
     listIdeas(options);
   });
   list.command("alias").description("List aliases").argument("[pattern]", "Wildcard pattern, e.g. PAY*").action((pattern) => {
@@ -5202,18 +5670,21 @@ function registerListCommand(program) {
 
 // src/utils/logger.ts
 import fs11 from "fs";
+import os2 from "os";
 import path16 from "path";
 function resolveWorkspaceRoot(start = process.cwd()) {
   let current = path16.resolve(start);
+  const configuredCoopHome = path16.resolve(resolveCoopHome());
+  const defaultCoopHome = path16.resolve(path16.join(os2.homedir(), ".coop"));
   while (true) {
     const gitDir = path16.join(current, ".git");
     const coopDir2 = coopWorkspaceDir(current);
     const workspaceConfig = path16.join(coopDir2, "config.yml");
-    const projectsDir = path16.join(coopDir2, "projects");
     if (fs11.existsSync(gitDir)) {
       return current;
     }
-    if (fs11.existsSync(workspaceConfig) || fs11.existsSync(projectsDir)) {
+    const resolvedCoopDir = path16.resolve(coopDir2);
+    if (resolvedCoopDir !== configuredCoopHome && resolvedCoopDir !== defaultCoopHome && fs11.existsSync(workspaceConfig)) {
       return current;
     }
     const parent = path16.dirname(current);
@@ -5340,7 +5811,7 @@ import fs12 from "fs";
 import path17 from "path";
 import { createInterface } from "readline/promises";
 import { stdin as input, stdout as output } from "process";
-import { CURRENT_SCHEMA_VERSION as CURRENT_SCHEMA_VERSION2, IndexManager as IndexManager3, migrate_repository, parseYamlFile as parseYamlFile4, writeYamlFile as writeYamlFile4 } from "@kitsy/coop-core";
+import { CURRENT_SCHEMA_VERSION as CURRENT_SCHEMA_VERSION2, IndexManager as IndexManager3, migrate_repository, parseYamlFile as parseYamlFile5, writeYamlFile as writeYamlFile5 } from "@kitsy/coop-core";
 var COOP_IGNORE_TEMPLATE2 = `.index/
 logs/
 tmp/
@@ -5507,7 +5978,7 @@ async function migrateWorkspaceLayout(root, options) {
   }
   const movedConfigPath = path17.join(projectRoot, "config.yml");
   if (fs12.existsSync(movedConfigPath)) {
-    const movedConfig = parseYamlFile4(movedConfigPath);
+    const movedConfig = parseYamlFile5(movedConfigPath);
     const nextProject = typeof movedConfig.project === "object" && movedConfig.project !== null ? { ...movedConfig.project } : {};
     nextProject.name = identity.projectName;
     nextProject.id = projectId;
@@ -5515,7 +5986,7 @@ async function migrateWorkspaceLayout(root, options) {
     const nextHooks = typeof movedConfig.hooks === "object" && movedConfig.hooks !== null ? { ...movedConfig.hooks } : {};
     nextHooks.on_task_transition = `.coop/projects/${projectId}/hooks/on-task-transition.sh`;
     nextHooks.on_delivery_complete = `.coop/projects/${projectId}/hooks/on-delivery-complete.sh`;
-    writeYamlFile4(movedConfigPath, {
+    writeYamlFile5(movedConfigPath, {
       ...movedConfig,
       project: nextProject,
       hooks: nextHooks
@@ -5569,25 +6040,55 @@ function registerMigrateCommand(program) {
 }
 
 // src/commands/naming.ts
+var ENTITY_NAMES = ["task", "idea", "track", "delivery", "run"];
+function assertNamingEntity(value) {
+  const entity = value?.trim().toLowerCase() || "task";
+  if (!ENTITY_NAMES.includes(entity)) {
+    throw new Error(`Invalid entity '${value}'. Expected ${ENTITY_NAMES.join("|")}.`);
+  }
+  return entity;
+}
+function readConfigRecord(root) {
+  return readCoopConfig(root).raw;
+}
+function writeNamingConfig(root, update) {
+  writeCoopConfig(root, update(readConfigRecord(root)));
+}
 function printNamingOverview() {
   const root = resolveRepoRoot();
   const config = readCoopConfig(root);
+  const templates = namingTemplatesForRoot(root);
+  const tokens = namingTokensForRoot(root);
   const sampleTitle = "Natural-language COOP command recommender";
   const sampleTaskTitle = "Implement billing payment contract review";
   console.log("COOP Naming");
-  console.log(`Current template: ${config.idNamingTemplate}`);
-  console.log(`Default template: ${DEFAULT_ID_NAMING_TEMPLATE}`);
-  console.log("Tokens:");
+  console.log(`Legacy task template: ${config.idNamingTemplate}`);
+  console.log(`Default task template: ${DEFAULT_ID_NAMING_TEMPLATE}`);
+  console.log("Per-entity templates:");
+  for (const entity of ENTITY_NAMES) {
+    console.log(`- ${entity}: ${templates[entity]}`);
+  }
+  console.log("Built-in tokens:");
   console.log("  <TYPE>     entity type such as IDEA, TASK, DELIVERY");
   console.log("  <TITLE>    semantic title token (defaults to TITLE16)");
   console.log("  <TITLE16>  semantic title token capped to 16 chars");
   console.log("  <TITLE24>  semantic title token capped to 24 chars");
   console.log("  <TRACK>    task track");
+  console.log("  <NAME>     entity name/title");
+  console.log("  <NAME_SLUG> lower-case slug of the entity name");
   console.log("  <SEQ>      sequential number within the rendered pattern");
   console.log("  <USER>     actor/user namespace");
   console.log("  <YYMMDD>   short date token");
   console.log("  <RAND>     random uniqueness token");
   console.log("  <PREFIX>   entity prefix override");
+  console.log("Custom tokens:");
+  if (Object.keys(tokens).length === 0) {
+    console.log("- none");
+  } else {
+    for (const [token, definition] of Object.entries(tokens)) {
+      console.log(`- <${token.toUpperCase()}>: ${definition.values.length > 0 ? definition.values.join(", ") : "(no values)"}`);
+    }
+  }
   console.log("Examples:");
   const tokenExamples = namingTokenExamples(sampleTitle);
   for (const [token, value] of Object.entries(tokenExamples)) {
@@ -5597,7 +6098,7 @@ function printNamingOverview() {
     entityType: "idea",
     title: sampleTitle
   }, root)}`);
-  console.log(`Preview (${config.idNamingTemplate}): ${previewNamingTemplate(config.idNamingTemplate, {
+  console.log(`Preview (${templates.task}): ${previewNamingTemplate(templates.task, {
     entityType: "task",
     title: sampleTaskTitle,
     track: "mvp",
@@ -5606,35 +6107,187 @@ function printNamingOverview() {
   }, root)}`);
   console.log("Try:");
   console.log(`  coop naming preview "${sampleTitle}"`);
-  console.log('  coop config id.naming "<TYPE>-<TITLE24>"');
-  console.log('  coop config id.naming "<TRACK>-<SEQ>"');
+  console.log("  coop naming set task <TYPE>-<TITLE24>-<SEQ>");
+  console.log("  coop naming token create proj");
+  console.log("  coop naming token value add proj UX");
+}
+function setEntityNamingTemplate(root, entity, template) {
+  const nextTemplate = template.trim();
+  if (!nextTemplate) {
+    throw new Error("Naming template must be non-empty.");
+  }
+  writeNamingConfig(root, (config) => {
+    const next = { ...config };
+    const idRaw = typeof next.id === "object" && next.id !== null ? { ...next.id } : {};
+    const namingRaw = typeof idRaw.naming === "object" && idRaw.naming !== null ? { ...idRaw.naming } : typeof idRaw.naming === "string" ? { task: idRaw.naming, idea: idRaw.naming } : {};
+    namingRaw[entity] = nextTemplate;
+    idRaw.naming = namingRaw;
+    next.id = idRaw;
+    return next;
+  });
+}
+function ensureTokenRecord(config) {
+  const next = { ...config };
+  const idRaw = typeof next.id === "object" && next.id !== null ? { ...next.id } : {};
+  const tokensRaw = typeof idRaw.tokens === "object" && idRaw.tokens !== null ? { ...idRaw.tokens } : {};
+  idRaw.tokens = tokensRaw;
+  next.id = idRaw;
+  return { next, tokens: tokensRaw };
+}
+function listTokens() {
+  const root = resolveRepoRoot();
+  const tokens = namingTokensForRoot(root);
+  if (Object.keys(tokens).length === 0) {
+    console.log("No naming tokens defined.");
+    return;
+  }
+  for (const [token, definition] of Object.entries(tokens)) {
+    console.log(`${token}: ${definition.values.length > 0 ? definition.values.join(", ") : "(no values)"}`);
+  }
 }
 function registerNamingCommand(program) {
-  const naming = program.command("naming").description("Explain COOP ID naming templates and preview examples");
+  const naming = program.command("naming").description("Manage COOP naming templates, tokens, and previews");
   naming.action(() => {
     printNamingOverview();
   });
-  naming.command("preview").description("Preview the current or supplied naming template for a sample title").argument("<title>", "Sample title to render").option("--template <template>", "Override naming template").option("--entity <entity>", "Entity type: idea|task|track|delivery|run", "task").option("--track <track>", "Track token value").option("--status <status>", "Status token value").option("--task-type <taskType>", "Task type token value").action(
+  naming.command("preview").description("Preview the effective or supplied naming template for a sample title").allowUnknownOption().allowExcessArguments().argument("<title>", "Sample title to render").option("--template <template>", "Override naming template").option("--entity <entity>", "Entity type: idea|task|track|delivery|run", "task").option("--track <track>", "Track token value").option("--status <status>", "Status token value").option("--task-type <taskType>", "Task type token value").action(
     (title, options) => {
       const root = resolveRepoRoot();
-      const config = readCoopConfig(root);
-      const entity = options.entity?.trim().toLowerCase() || "task";
-      const template = options.template?.trim() || config.idNamingTemplate;
+      const entity = assertNamingEntity(options.entity);
+      const templates = namingTemplatesForRoot(root);
+      const dynamicFields = extractDynamicTokenFlags(
+        ["naming", "preview"],
+        ["template", "entity", "track", "status", "task-type"]
+      );
+      const tokens = namingTokensForRoot(root);
+      for (const key of Object.keys(dynamicFields)) {
+        if (!tokens[key]) {
+          throw new Error(`Unknown naming token '${key}'. Define it first with \`coop naming token create ${key}\`.`);
+        }
+      }
       console.log(
         previewNamingTemplate(
-          template,
+          options.template?.trim() || templates[entity],
           {
             entityType: entity,
             title,
+            name: title,
             track: options.track,
             status: options.status,
-            taskType: options.taskType
+            taskType: options.taskType,
+            fields: dynamicFields
           },
           root
         )
       );
     }
   );
+  naming.command("set").description("Set the naming template for one entity type").argument("<entity>", "Entity: task|idea|track|delivery|run").argument("<template>", "Naming template").action((entity, template) => {
+    const root = resolveRepoRoot();
+    setEntityNamingTemplate(root, assertNamingEntity(entity), template);
+    console.log(`${assertNamingEntity(entity)}=${namingTemplatesForRoot(root)[assertNamingEntity(entity)]}`);
+  });
+  const token = naming.command("token").description("Manage custom naming tokens");
+  token.command("list").description("List naming tokens").action(() => {
+    listTokens();
+  });
+  token.command("create").description("Create a custom naming token").argument("<token>", "Token name").action((tokenName) => {
+    const root = resolveRepoRoot();
+    const normalizedToken = normalizeNamingTokenName(tokenName);
+    writeNamingConfig(root, (config) => {
+      const { next, tokens } = ensureTokenRecord(config);
+      if (tokens[normalizedToken]) {
+        throw new Error(`Naming token '${normalizedToken}' already exists.`);
+      }
+      tokens[normalizedToken] = { values: [] };
+      return next;
+    });
+    console.log(`Created naming token: ${normalizedToken}`);
+  });
+  token.command("rename").description("Rename a custom naming token").argument("<token>", "Existing token name").argument("<next>", "New token name").action((tokenName, nextToken) => {
+    const root = resolveRepoRoot();
+    const normalizedToken = normalizeNamingTokenName(tokenName);
+    const normalizedNext = normalizeNamingTokenName(nextToken);
+    const tokens = namingTokensForRoot(root);
+    if (!tokens[normalizedToken]) {
+      throw new Error(`Naming token '${normalizedToken}' does not exist.`);
+    }
+    if (tokens[normalizedNext]) {
+      throw new Error(`Naming token '${normalizedNext}' already exists.`);
+    }
+    writeNamingConfig(root, (config) => {
+      const { next, tokens: tokensRaw } = ensureTokenRecord(config);
+      tokensRaw[normalizedNext] = tokensRaw[normalizedToken];
+      delete tokensRaw[normalizedToken];
+      return next;
+    });
+    console.log(`Renamed naming token: ${normalizedToken} -> ${normalizedNext}`);
+  });
+  token.command("delete").description("Delete a custom naming token").argument("<token>", "Token name").action((tokenName) => {
+    const root = resolveRepoRoot();
+    const normalizedToken = normalizeNamingTokenName(tokenName);
+    writeNamingConfig(root, (config) => {
+      const { next, tokens } = ensureTokenRecord(config);
+      delete tokens[normalizedToken];
+      return next;
+    });
+    console.log(`Deleted naming token: ${normalizedToken}`);
+  });
+  const tokenValue = token.command("value").description("Manage allowed values for a naming token");
+  tokenValue.command("list").description("List allowed values for a naming token").argument("<token>", "Token name").action((tokenName) => {
+    const normalizedToken = normalizeNamingTokenName(tokenName);
+    const tokens = namingTokensForRoot(resolveRepoRoot());
+    const values = tokens[normalizedToken]?.values;
+    if (!values) {
+      throw new Error(`Naming token '${normalizedToken}' does not exist.`);
+    }
+    if (values.length === 0) {
+      console.log("(no values)");
+      return;
+    }
+    for (const value of values) {
+      console.log(value);
+    }
+  });
+  tokenValue.command("add").description("Add an allowed value for a naming token").argument("<token>", "Token name").argument("<value>", "Token value").action((tokenName, value) => {
+    const root = resolveRepoRoot();
+    const normalizedToken = normalizeNamingTokenName(tokenName);
+    const normalizedValue = normalizeNamingTokenValue(value);
+    writeNamingConfig(root, (config) => {
+      const { next, tokens } = ensureTokenRecord(config);
+      const tokenRecord = typeof tokens[normalizedToken] === "object" && tokens[normalizedToken] !== null ? { ...tokens[normalizedToken] } : null;
+      if (!tokenRecord) {
+        throw new Error(`Naming token '${normalizedToken}' does not exist.`);
+      }
+      const values = Array.isArray(tokenRecord.values) ? Array.from(
+        new Set(
+          tokenRecord.values.filter((entry) => typeof entry === "string" && entry.trim().length > 0).map((entry) => normalizeNamingTokenValue(entry))
+        )
+      ) : [];
+      values.push(normalizedValue);
+      tokenRecord.values = Array.from(new Set(values)).sort((a, b) => a.localeCompare(b));
+      tokens[normalizedToken] = tokenRecord;
+      return next;
+    });
+    console.log(`Added naming token value: ${normalizedToken}=${normalizedValue}`);
+  });
+  tokenValue.command("remove").description("Remove an allowed value for a naming token").argument("<token>", "Token name").argument("<value>", "Token value").action((tokenName, value) => {
+    const root = resolveRepoRoot();
+    const normalizedToken = normalizeNamingTokenName(tokenName);
+    const normalizedValue = normalizeNamingTokenValue(value);
+    writeNamingConfig(root, (config) => {
+      const { next, tokens } = ensureTokenRecord(config);
+      const tokenRecord = typeof tokens[normalizedToken] === "object" && tokens[normalizedToken] !== null ? { ...tokens[normalizedToken] } : null;
+      if (!tokenRecord) {
+        throw new Error(`Naming token '${normalizedToken}' does not exist.`);
+      }
+      const values = Array.isArray(tokenRecord.values) ? tokenRecord.values.filter((entry) => typeof entry === "string" && entry.trim().length > 0).map((entry) => normalizeNamingTokenValue(entry)).filter((entry) => entry !== normalizedValue) : [];
+      tokenRecord.values = Array.from(new Set(values)).sort((a, b) => a.localeCompare(b));
+      tokens[normalizedToken] = tokenRecord;
+      return next;
+    });
+    console.log(`Removed naming token value: ${normalizedToken}=${normalizedValue}`);
+  });
 }
 
 // src/commands/plan.ts
@@ -5955,7 +6608,13 @@ id_prefixes:
   run: "RUN"
 
 id:
-  naming: ${JSON.stringify(namingTemplate)}
+  naming:
+    task: ${JSON.stringify(namingTemplate)}
+    idea: ${JSON.stringify(namingTemplate)}
+    track: "<NAME_SLUG>"
+    delivery: "<NAME_SLUG>"
+    run: "<TYPE>-<YYMMDD>-<RAND>"
+  tokens: {}
   seq_padding: 0
 
 defaults:
@@ -6375,7 +7034,7 @@ function registerRunCommand(program) {
 }
 
 // src/commands/search.ts
-import { load_graph as load_graph9, parseDeliveryFile as parseDeliveryFile3, parseIdeaFile as parseIdeaFile6, parseTaskFile as parseTaskFile13 } from "@kitsy/coop-core";
+import { load_graph as load_graph9, parseDeliveryFile as parseDeliveryFile4, parseIdeaFile as parseIdeaFile6, parseTaskFile as parseTaskFile13 } from "@kitsy/coop-core";
 function haystackForTask(task) {
   return [
     task.id,
@@ -6454,7 +7113,7 @@ ${parsed.body}`, query)) continue;
     }
     if (options.kind === "all" || options.kind === "delivery") {
       for (const filePath of listDeliveryFiles(root)) {
-        const parsed = parseDeliveryFile3(filePath);
+        const parsed = parseDeliveryFile4(filePath);
         if (options.status && parsed.delivery.status !== options.status) continue;
         if (!includesQuery(haystackForDelivery(parsed.delivery, parsed.body), query)) continue;
         rows.push({
@@ -6798,6 +7457,7 @@ function showTask(taskId, options = {}) {
   if (options.compact) {
     const compactLines = [
       `Task: ${task.id}`,
+      `Short ID: ${task.short_id ?? "-"}`,
       `Title: ${task.title}`,
       `Status: ${task.status}`,
       `Priority: ${task.priority ?? "-"}`,
@@ -6815,6 +7475,7 @@ function showTask(taskId, options = {}) {
   }
   const lines = [
     `Task: ${task.id}`,
+    `Short ID: ${task.short_id ?? "-"}`,
     `Title: ${task.title}`,
     `Status: ${task.status}`,
     `Type: ${task.type}`,
@@ -6888,6 +7549,7 @@ function showIdea(ideaId, options = {}) {
     console.log(
       [
         `Idea: ${idea.id}`,
+        `Short ID: ${idea.short_id ?? "-"}`,
         `Title: ${idea.title}`,
         `Status: ${idea.status}`,
         `Tags: ${stringify(idea.tags)}`,
@@ -6899,6 +7561,7 @@ function showIdea(ideaId, options = {}) {
   }
   const lines = [
     `Idea: ${idea.id}`,
+    `Short ID: ${idea.short_id ?? "-"}`,
     `Title: ${idea.title}`,
     `Status: ${idea.status}`,
     `Author: ${idea.author}`,
@@ -6921,6 +7584,7 @@ function showDelivery(ref, options = {}) {
     console.log(
       [
         `Delivery: ${delivery.id}`,
+        `Short ID: ${delivery.short_id ?? "-"}`,
         `Name: ${delivery.name}`,
         `Status: ${delivery.status}`,
         `Target Date: ${delivery.target_date ?? "-"}`,
@@ -6932,6 +7596,7 @@ function showDelivery(ref, options = {}) {
   }
   const lines = [
     `Delivery: ${delivery.id}`,
+    `Short ID: ${delivery.short_id ?? "-"}`,
     `Name: ${delivery.name}`,
     `Status: ${delivery.status}`,
     `Target Date: ${delivery.target_date ?? "-"}`,
@@ -6947,6 +7612,28 @@ function showDelivery(ref, options = {}) {
   ];
   console.log(lines.join("\n"));
 }
+function showTrack(ref, options = {}) {
+  const root = resolveRepoRoot();
+  const resolvedId = resolveExistingTrackId(root, ref);
+  if (!resolvedId) {
+    throw new Error(`Track '${ref}' not found.`);
+  }
+  const entry = loadTrackEntries(root).find((candidate) => candidate.track.id === resolvedId);
+  if (!entry) {
+    throw new Error(`Track '${ref}' not found.`);
+  }
+  const track = entry.track;
+  const base = [
+    `Track: ${track.id}`,
+    `Short ID: ${track.short_id ?? "-"}`,
+    `Name: ${track.name}`,
+    `Profiles: ${(track.capacity_profiles ?? []).join(", ") || "-"}`,
+    `Max WIP: ${track.constraints?.max_concurrent_tasks ?? "-"}`,
+    `Allowed Types: ${(track.constraints?.allowed_types ?? []).join(", ") || "-"}`,
+    `File: ${path22.relative(root, entry.filePath)}`
+  ];
+  console.log((options.compact ? base.filter((line) => !line.startsWith("Allowed Types")) : base).join("\n"));
+}
 function showByReference(ref, options = {}) {
   const root = resolveRepoRoot();
   try {
@@ -6958,7 +7645,11 @@ function showByReference(ref, options = {}) {
     showIdea(ref, options);
     return;
   } catch {
-    showDelivery(ref, options);
+    try {
+      showDelivery(ref, options);
+    } catch {
+      showTrack(ref, options);
+    }
   }
 }
 function registerShowCommand(program) {
@@ -6974,6 +7665,9 @@ function registerShowCommand(program) {
   show.command("idea").description("Show idea details").argument("<id>", "Idea ID").option("--compact", "Show a smaller summary view").action((id, options) => {
     showIdea(id, options);
   });
+  show.command("track").description("Show track details").argument("<id>", "Track id, short id, or unique name").option("--compact", "Show a smaller summary view").action((id, options) => {
+    showTrack(id, options);
+  });
   show.command("delivery").description("Show delivery details").argument("<id>", "Delivery id or name").option("--compact", "Show a smaller summary view").action((id, options) => {
     showDelivery(id, options);
   });
@@ -7556,6 +8250,10 @@ function registerUseCommand(program) {
     const root = resolveRepoRoot();
     printContext(clearWorkingContext(root, resolveCoopHome(), scope));
   });
+  use.command("reset").description("Clear all working-context values").action(() => {
+    const root = resolveRepoRoot();
+    printContext(clearWorkingContext(root, resolveCoopHome(), "all"));
+  });
 }
 
 // src/commands/view.ts
@@ -7896,7 +8594,7 @@ function registerWebhookCommand(program) {
 
 // src/merge-driver/merge-driver.ts
 import fs21 from "fs";
-import os2 from "os";
+import os3 from "os";
 import path25 from "path";
 import { spawnSync as spawnSync5 } from "child_process";
 import { stringifyFrontmatter as stringifyFrontmatter6, parseFrontmatterContent as parseFrontmatterContent3, parseYamlContent as parseYamlContent3, stringifyYamlContent as stringifyYamlContent2 } from "@kitsy/coop-core";
@@ -7987,7 +8685,7 @@ function mergeTaskFile(ancestorPath, oursPath, theirsPath) {
   const ours = parseTaskDocument(oursRaw, oursPath);
   const theirs = parseTaskDocument(theirsRaw, theirsPath);
   const mergedFrontmatter = mergeTaskFrontmatter(ancestor.frontmatter, ours.frontmatter, theirs.frontmatter);
-  const tempDir = fs21.mkdtempSync(path25.join(os2.tmpdir(), "coop-merge-body-"));
+  const tempDir = fs21.mkdtempSync(path25.join(os3.tmpdir(), "coop-merge-body-"));
   try {
     const ancestorBody = path25.join(tempDir, "ancestor.md");
     const oursBody = path25.join(tempDir, "ours.md");
@@ -8035,6 +8733,8 @@ function renderBasicHelp() {
     "- `coop current`: show working context, active work, and the next ready task",
     "- `coop use track <id>` / `coop use delivery <id>`: set working scope defaults",
     "- `coop list tracks` / `coop list deliveries`: inspect valid named values before assigning them",
+    "- `coop naming`: inspect per-entity ID rules and naming tokens",
+    '- `coop naming preview "Title" --entity task`: preview the generated ID before creating an item',
     "- `coop next task` or `coop pick task`: choose work from COOP",
     "- `coop show <id>`: inspect a task, idea, or delivery",
     "- `coop list tasks --track <id>`: browse scoped work",
@@ -8082,6 +8782,7 @@ Common day-to-day commands:
   coop current
   coop next task
   coop show <id>
+  coop naming
 `);
   registerInitCommand(program);
   registerCreateCommand(program);