@kitsy/coop 2.2.0 → 2.2.2

package/dist/index.js

@@ -237,8 +237,8 @@ function findTaskFileById(root, id) {
 function todayIsoDate() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
 }
-function normalizeIdPart(input3, fallback, maxLength = 12) {
-  const normalized = input3.toUpperCase().replace(/[^A-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-").replace(/-/g, "");
+function normalizeIdPart(input2, fallback, maxLength = 12) {
+  const normalized = input2.toUpperCase().replace(/[^A-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-").replace(/-/g, "");
   if (!normalized) return fallback;
   return normalized.slice(0, maxLength);
 }
@@ -274,24 +274,24 @@ function shortDateToken(now = /* @__PURE__ */ new Date()) {
 function randomToken() {
   return crypto.randomBytes(4).toString("hex").toUpperCase();
 }
-function sanitizeTemplateValue(input3, fallback = "X") {
-  const normalized = input3.toUpperCase().replace(/[^A-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
+function sanitizeTemplateValue(input2, fallback = "X") {
+  const normalized = input2.toUpperCase().replace(/[^A-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
   return normalized || fallback;
 }
-function sanitizeSemanticWord(input3) {
-  return input3.toUpperCase().replace(/[^A-Z0-9]+/g, "").trim();
+function sanitizeSemanticWord(input2) {
+  return input2.toUpperCase().replace(/[^A-Z0-9]+/g, "").trim();
 }
-function semanticWords(input3) {
-  const rawWords = input3.split(/[^a-zA-Z0-9]+/g).map(sanitizeSemanticWord).filter(Boolean);
+function semanticWords(input2) {
+  const rawWords = input2.split(/[^a-zA-Z0-9]+/g).map(sanitizeSemanticWord).filter(Boolean);
   if (rawWords.length <= 1) {
     return rawWords;
   }
   const filtered = rawWords.filter((word) => !SEMANTIC_STOP_WORDS.has(word));
   return filtered.length > 0 ? filtered : rawWords;
 }
-function semanticTitleToken(input3, maxLength = DEFAULT_TITLE_TOKEN_LENGTH) {
+function semanticTitleToken(input2, maxLength = DEFAULT_TITLE_TOKEN_LENGTH) {
   const safeMaxLength = Number.isFinite(maxLength) ? Math.max(4, Math.floor(maxLength)) : DEFAULT_TITLE_TOKEN_LENGTH;
-  const words = semanticWords(input3);
+  const words = semanticWords(input2);
   if (words.length === 0) {
     return "UNTITLED";
   }
@@ -452,27 +452,27 @@ function generateConfiguredId(root, existingIds, context) {
 
 // src/utils/aliases.ts
 var ALIAS_PATTERN = /^[A-Z0-9]+(?:[.-][A-Z0-9]+)*$/;
-function toPosixPath(input3) {
-  return input3.replace(/\\/g, "/");
+function toPosixPath(input2) {
+  return input2.replace(/\\/g, "/");
 }
 function indexFilePath(root) {
   const { indexDataFormat } = readCoopConfig(root);
   const extension = indexDataFormat === "json" ? "json" : "yml";
   return path2.join(ensureCoopInitialized(root), ".index", `aliases.${extension}`);
 }
-function normalizeAliasValue(input3) {
-  return input3.trim().toUpperCase().replace(/_/g, ".").replace(/\.+/g, ".");
+function normalizeAliasValue(input2) {
+  return input2.trim().toUpperCase().replace(/_/g, ".").replace(/\.+/g, ".");
 }
-function normalizePatternValue(input3) {
-  return input3.trim().toUpperCase().replace(/_/g, ".");
+function normalizePatternValue(input2) {
+  return input2.trim().toUpperCase().replace(/_/g, ".");
 }
-function normalizeAlias(input3) {
-  const normalized = normalizeAliasValue(input3);
+function normalizeAlias(input2) {
+  const normalized = normalizeAliasValue(input2);
   if (!normalized) {
     throw new Error("Alias cannot be empty.");
   }
   if (!ALIAS_PATTERN.test(normalized)) {
-    throw new Error(`Invalid alias '${input3}'. Use letters/numbers with '.' and '-'.`);
+    throw new Error(`Invalid alias '${input2}'. Use letters/numbers with '.' and '-'.`);
   }
   return normalized;
 }
@@ -659,8 +659,8 @@ function updateTaskAliases(filePath, aliases) {
 function updateIdeaAliases(filePath, aliases) {
   const parsed = parseIdeaFile(filePath);
   const nextRaw = { ...parsed.raw, aliases };
-  const output3 = stringifyFrontmatter(nextRaw, parsed.body);
-  fs2.writeFileSync(filePath, output3, "utf8");
+  const output2 = stringifyFrontmatter(nextRaw, parsed.body);
+  fs2.writeFileSync(filePath, output2, "utf8");
 }
 function resolveFilePath(root, target) {
   return path2.join(root, ...target.file.split("/"));
@@ -832,8 +832,8 @@ import { Octokit } from "octokit";
 function isObject(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
-function sanitizeBranchPart(input3, fallback) {
-  const normalized = input3.trim().toLowerCase().replace(/[^a-z0-9/_-]+/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "");
+function sanitizeBranchPart(input2, fallback) {
+  const normalized = input2.trim().toLowerCase().replace(/[^a-z0-9/_-]+/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "");
   return normalized || fallback;
 }
 function readGitRemote(root) {
@@ -993,15 +993,15 @@ function toGitHubClient(config) {
     baseUrl: config.apiBaseUrl
   });
   return {
-    async createPullRequest(input3) {
+    async createPullRequest(input2) {
       const response = await octokit.rest.pulls.create({
-        owner: input3.owner,
-        repo: input3.repo,
-        title: input3.title,
-        body: input3.body,
-        head: input3.head,
-        base: input3.base,
-        draft: input3.draft
+        owner: input2.owner,
+        repo: input2.repo,
+        title: input2.title,
+        body: input2.body,
+        head: input2.head,
+        base: input2.base,
+        draft: input2.draft
       });
       return {
         number: response.data.number,
@@ -1011,14 +1011,14 @@ function toGitHubClient(config) {
         draft: response.data.draft
       };
     },
-    async updatePullRequest(input3) {
+    async updatePullRequest(input2) {
       const response = await octokit.rest.pulls.update({
-        owner: input3.owner,
-        repo: input3.repo,
-        pull_number: input3.pull_number,
-        title: input3.title,
-        body: input3.body,
-        base: input3.base
+        owner: input2.owner,
+        repo: input2.repo,
+        pull_number: input2.pull_number,
+        title: input2.title,
+        body: input2.body,
+        base: input2.base
       });
       return {
         number: response.data.number,
@@ -1028,11 +1028,11 @@ function toGitHubClient(config) {
         draft: response.data.draft
       };
     },
-    async getPullRequest(input3) {
+    async getPullRequest(input2) {
       const response = await octokit.rest.pulls.get({
-        owner: input3.owner,
-        repo: input3.repo,
-        pull_number: input3.pull_number
+        owner: input2.owner,
+        repo: input2.repo,
+        pull_number: input2.pull_number
       });
       return {
         number: response.data.number,
@@ -1042,12 +1042,12 @@ function toGitHubClient(config) {
         draft: response.data.draft
       };
     },
-    async mergePullRequest(input3) {
+    async mergePullRequest(input2) {
       const response = await octokit.rest.pulls.merge({
-        owner: input3.owner,
-        repo: input3.repo,
-        pull_number: input3.pull_number,
-        merge_method: input3.merge_method
+        owner: input2.owner,
+        repo: input2.repo,
+        pull_number: input2.pull_number,
+        merge_method: input2.merge_method
       });
       return {
         merged: response.data.merged,
@@ -1391,6 +1391,7 @@ import fs3 from "fs";
 import path3 from "path";
 import {
   effective_priority,
+  parseYamlFile as parseYamlFile2,
   parseDeliveryFile,
   parseIdeaFile as parseIdeaFile2,
   parseTaskFile as parseTaskFile4,
@@ -1399,6 +1400,76 @@ import {
   validateSemantic,
   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());
+    }
+  }
+  return map;
+}
+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());
+    }
+  }
+  return map;
+}
+function resolveExistingTrackId(root, trackId) {
+  const normalized = trackId.trim().toLowerCase();
+  if (!normalized) return void 0;
+  if (normalized === "unassigned") return "unassigned";
+  return existingTrackMap(root).get(normalized);
+}
+function resolveExistingDeliveryId(root, deliveryId) {
+  const normalized = deliveryId.trim().toLowerCase();
+  if (!normalized) return void 0;
+  return existingDeliveryMap(root).get(normalized);
+}
+function assertExistingTrackId(root, trackId) {
+  const resolved = resolveExistingTrackId(root, trackId);
+  if (resolved) {
+    return resolved;
+  }
+  throw new Error(
+    `Unknown track '${trackId}'. Create it first with \`coop create track --id ${trackId} --name "${trackId}"\` or use \`unassigned\`.`
+  );
+}
+function assertExistingDeliveryId(root, deliveryId) {
+  const resolved = resolveExistingDeliveryId(root, deliveryId);
+  if (resolved) {
+    return resolved;
+  }
+  throw new Error(`Unknown delivery '${deliveryId}'. Create it first with \`coop create delivery --id ${deliveryId} --name "${deliveryId}"\`.`);
+}
+function unique(values) {
+  return Array.from(new Set(values));
+}
+function normalizeTaskReferences(root, task) {
+  const next = { ...task };
+  if (next.track?.trim()) {
+    next.track = assertExistingTrackId(root, next.track.trim());
+  }
+  if (next.delivery?.trim()) {
+    next.delivery = assertExistingDeliveryId(root, next.delivery.trim());
+  }
+  if (next.delivery_tracks?.length) {
+    next.delivery_tracks = unique(next.delivery_tracks.map((trackId) => assertExistingTrackId(root, trackId)));
+  }
+  if (next.priority_context && typeof next.priority_context === "object") {
+    const normalized = {};
+    for (const [trackId, priority] of Object.entries(next.priority_context)) {
+      normalized[assertExistingTrackId(root, trackId)] = priority;
+    }
+    next.priority_context = normalized;
+  }
+  return next;
+}
 function resolveTaskFile(root, idOrAlias) {
   const reference = resolveReference(root, idOrAlias, "task");
   return path3.join(root, ...reference.file.split("/"));
@@ -1416,20 +1487,22 @@ function loadIdeaEntry(root, idOrAlias) {
   return { filePath, parsed: parseIdeaFile2(filePath) };
 }
 function writeIdeaFile(filePath, parsed, idea, body = parsed.body) {
-  const output3 = stringifyFrontmatter2({ ...parsed.raw, ...idea }, body);
-  fs3.writeFileSync(filePath, output3, "utf8");
+  const output2 = stringifyFrontmatter2({ ...parsed.raw, ...idea }, body);
+  fs3.writeFileSync(filePath, output2, "utf8");
 }
-function validateTaskForWrite(task, filePath) {
-  const structuralIssues = validateStructural2(task, { filePath });
-  const semanticIssues = validateSemantic(task);
+function validateTaskForWrite(root, task, filePath) {
+  const normalized = normalizeTaskReferences(root, task);
+  const structuralIssues = validateStructural2(normalized, { filePath });
+  const semanticIssues = validateSemantic(normalized);
   const errors = [...structuralIssues, ...semanticIssues].filter((issue) => issue.level === "error");
   if (errors.length > 0) {
     throw new Error(errors.map((issue) => `- ${issue.message}`).join("\n"));
   }
+  return normalized;
 }
-function writeTaskEntry(filePath, parsed, task, body = parsed.body) {
-  validateTaskForWrite(task, filePath);
-  writeTask3(task, {
+function writeTaskEntry(root, filePath, parsed, task, body = parsed.body) {
+  const normalized = validateTaskForWrite(root, task, filePath);
+  writeTask3(normalized, {
     body,
     raw: parsed.raw,
     filePath
@@ -1574,12 +1647,12 @@ function clearWorkingContext(root, coopHome, scope) {
   delete next[scope];
   return writeWorkingContext(root, coopHome, next);
 }
-function resolveContextValueWithSource(explicit, contextValue, sharedDefault2) {
+function resolveContextValueWithSource(explicit, contextValue2, sharedDefault2) {
   if (explicit?.trim()) {
     return { value: explicit.trim(), source: "arg" };
   }
-  if (contextValue?.trim()) {
-    return { value: contextValue.trim(), source: "use" };
+  if (contextValue2?.trim()) {
+    return { value: contextValue2.trim(), source: "use" };
   }
   if (sharedDefault2?.trim()) {
     return { value: sharedDefault2.trim(), source: "config" };
@@ -1613,10 +1686,12 @@ function configDefaultVersion(root) {
 }
 function resolveSelectionOptions(root, options) {
   const context = readWorkingContext(root, resolveCoopHome());
+  const track = options.track?.trim() || context.track?.trim() || configDefaultTrack(root);
+  const delivery = options.delivery?.trim() || context.delivery?.trim() || configDefaultDelivery(root);
   return {
     ...options,
-    track: options.track?.trim() || context.track?.trim() || configDefaultTrack(root),
-    delivery: options.delivery?.trim() || context.delivery?.trim() || configDefaultDelivery(root),
+    track: track ? resolveExistingTrackId(root, track) ?? track : void 0,
+    delivery: delivery ? resolveExistingDeliveryId(root, delivery) ?? delivery : void 0,
     version: options.version?.trim() || context.version?.trim() || configDefaultVersion(root)
   };
 }
@@ -1885,7 +1960,7 @@ function registerCommentCommand(program) {
     const root = resolveRepoRoot();
     const { filePath, parsed } = loadTaskEntry(root, id);
     const task = appendTaskComment(parsed.task, options.author?.trim() || defaultCoopAuthor(root), options.message.trim());
-    writeTaskEntry(filePath, parsed, task);
+    writeTaskEntry(root, filePath, parsed, task);
     console.log(`Commented ${task.id}`);
   });
 }
@@ -2137,16 +2212,16 @@ import {
   parseTaskFile as parseTaskFile7,
   writeYamlFile as writeYamlFile3,
   stringifyFrontmatter as stringifyFrontmatter4,
-  validateStructural as validateStructural5,
   writeTask as writeTask6
 } from "@kitsy/coop-core";
 import { create_provider_idea_decomposer, decompose_idea_to_tasks } from "@kitsy/coop-ai";
 
 // src/utils/prompt.ts
-import readline from "readline/promises";
+import readline from "readline";
+import readlinePromises from "readline/promises";
 import process2 from "process";
 async function ask(question, defaultValue = "") {
-  const rl = readline.createInterface({
+  const rl = readlinePromises.createInterface({
     input: process2.stdin,
     output: process2.stdout
   });
@@ -2155,6 +2230,76 @@ async function ask(question, defaultValue = "") {
   rl.close();
   return answer || defaultValue;
 }
+function renderSelect(question, choices, selected) {
+  process2.stdout.write(`${question}
+`);
+  for (let index = 0; index < choices.length; index += 1) {
+    const choice = choices[index];
+    const prefix = index === selected ? ">" : " ";
+    const hint = choice.hint ? ` - ${choice.hint}` : "";
+    process2.stdout.write(` ${prefix} ${choice.label}${hint}
+`);
+  }
+  process2.stdout.write("\nUse Up/Down arrows to choose, Enter to confirm.\n");
+}
+function moveCursorUp(lines) {
+  if (lines <= 0) return;
+  readline.moveCursor(process2.stdout, 0, -lines);
+  readline.clearScreenDown(process2.stdout);
+}
+async function select(question, choices, defaultIndex = 0) {
+  if (choices.length === 0) {
+    throw new Error(`No choices available for '${question}'.`);
+  }
+  if (!process2.stdin.isTTY || !process2.stdout.isTTY) {
+    return choices[Math.min(Math.max(defaultIndex, 0), choices.length - 1)].value;
+  }
+  readline.emitKeypressEvents(process2.stdin);
+  const previousRawMode = process2.stdin.isRaw;
+  const wasPaused = typeof process2.stdin.isPaused === "function" ? process2.stdin.isPaused() : false;
+  process2.stdin.setRawMode(true);
+  process2.stdin.resume();
+  let selected = Math.min(Math.max(defaultIndex, 0), choices.length - 1);
+  const renderedLines = choices.length + 2;
+  renderSelect(question, choices, selected);
+  return await new Promise((resolve, reject) => {
+    const cleanup = () => {
+      process2.stdin.off("keypress", onKeypress);
+      process2.stdin.setRawMode(previousRawMode ?? false);
+      if (wasPaused) {
+        process2.stdin.pause();
+      }
+      process2.stdout.write("\n");
+    };
+    const rerender = () => {
+      moveCursorUp(renderedLines + 1);
+      renderSelect(question, choices, selected);
+    };
+    const onKeypress = (_input, key) => {
+      if (key.name === "up") {
+        selected = selected === 0 ? choices.length - 1 : selected - 1;
+        rerender();
+        return;
+      }
+      if (key.name === "down") {
+        selected = selected === choices.length - 1 ? 0 : selected + 1;
+        rerender();
+        return;
+      }
+      if (key.name === "return") {
+        const value = choices[selected].value;
+        cleanup();
+        resolve(value);
+        return;
+      }
+      if (key.ctrl && key.name === "c") {
+        cleanup();
+        reject(new Error("Prompt cancelled."));
+      }
+    };
+    process2.stdin.on("keypress", onKeypress);
+  });
+}
 
 // src/utils/idea-drafts.ts
 import fs5 from "fs";
@@ -2565,7 +2710,7 @@ function plusDaysIso(days) {
   date.setUTCDate(date.getUTCDate() + days);
   return date.toISOString().slice(0, 10);
 }
-function unique(values) {
+function unique2(values) {
   return Array.from(new Set(values));
 }
 function resolveIdeaFile2(root, idOrAlias) {
@@ -2573,35 +2718,35 @@ function resolveIdeaFile2(root, idOrAlias) {
   return path8.join(root, ...target.file.split("/"));
 }
 function updateIdeaLinkedTasks(filePath, idea, raw, body, linked) {
-  const next = unique([...idea.linked_tasks ?? [], ...linked]).sort((a, b) => a.localeCompare(b));
+  const next = unique2([...idea.linked_tasks ?? [], ...linked]).sort((a, b) => a.localeCompare(b));
   const nextRaw = {
     ...raw,
     linked_tasks: next
   };
   fs7.writeFileSync(filePath, stringifyFrontmatter4(nextRaw, body), "utf8");
 }
-function makeTaskDraft(input3) {
+function makeTaskDraft(input2) {
   return {
-    title: input3.title,
-    type: input3.type,
-    status: input3.status,
-    track: input3.track,
-    priority: input3.priority,
-    body: input3.body,
-    acceptance: unique(input3.acceptance ?? []),
-    testsRequired: unique(input3.testsRequired ?? []),
-    authorityRefs: unique(input3.authorityRefs ?? []),
-    derivedRefs: unique(input3.derivedRefs ?? [])
+    title: input2.title,
+    type: input2.type,
+    status: input2.status,
+    track: input2.track,
+    priority: input2.priority,
+    body: input2.body,
+    acceptance: unique2(input2.acceptance ?? []),
+    testsRequired: unique2(input2.testsRequired ?? []),
+    authorityRefs: unique2(input2.authorityRefs ?? []),
+    derivedRefs: unique2(input2.derivedRefs ?? [])
   };
 }
 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>", "Track 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").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);
     if (options.fromFile?.trim() || options.stdin) {
-      if (options.id || options.from || options.ai || options.title || titleArg || options.type || options.status || options.track || options.priority || options.body || (options.acceptance?.length ?? 0) > 0 || (options.testsRequired?.length ?? 0) > 0 || (options.authorityRef?.length ?? 0) > 0 || (options.derivedRef?.length ?? 0) > 0) {
+      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.");
       }
       const draftInput = await readDraftContent(root, {
@@ -2623,11 +2768,12 @@ function registerCreateCommand(program) {
     const statusInput = (options.status?.trim() || (interactive ? await ask("Task status", "todo") : "todo")).toLowerCase();
     const track = options.track?.trim() || (interactive ? await ask("Track", "unassigned") : "unassigned");
     const priority = options.priority?.trim() || (interactive ? await ask("Priority", "p2") : "p2");
+    const delivery = options.delivery?.trim() || (interactive ? await ask("Delivery (optional)", "") : "");
     const body = options.body ?? (interactive ? await ask("Task body (optional)", "") : "");
-    const acceptance = options.acceptance && options.acceptance.length > 0 ? unique(options.acceptance) : interactive ? parseCsv(await ask("Acceptance criteria (comma-separated, optional)", "")) : [];
-    const testsRequired = options.testsRequired && options.testsRequired.length > 0 ? unique(options.testsRequired) : interactive ? parseCsv(await ask("Tests required (comma-separated, optional)", "")) : [];
-    const authorityRefs = options.authorityRef && options.authorityRef.length > 0 ? unique(options.authorityRef) : interactive ? parseCsv(await ask("Authority refs (comma-separated, optional)", "")) : [];
-    const derivedRefs = options.derivedRef && options.derivedRef.length > 0 ? unique(options.derivedRef) : interactive ? parseCsv(await ask("Derived refs (comma-separated, optional)", "")) : [];
+    const acceptance = options.acceptance && options.acceptance.length > 0 ? unique2(options.acceptance) : interactive ? parseCsv(await ask("Acceptance criteria (comma-separated, optional)", "")) : [];
+    const testsRequired = options.testsRequired && options.testsRequired.length > 0 ? unique2(options.testsRequired) : interactive ? parseCsv(await ask("Tests required (comma-separated, optional)", "")) : [];
+    const authorityRefs = options.authorityRef && options.authorityRef.length > 0 ? unique2(options.authorityRef) : interactive ? parseCsv(await ask("Authority refs (comma-separated, optional)", "")) : [];
+    const derivedRefs = options.derivedRef && options.derivedRef.length > 0 ? unique2(options.derivedRef) : interactive ? parseCsv(await ask("Derived refs (comma-separated, optional)", "")) : [];
     const date = todayIsoDate();
     const drafts = [];
     let sourceIdeaPath = null;
@@ -2733,6 +2879,7 @@ function registerCreateCommand(program) {
         aliases: [],
         track: draft.track,
         priority: draft.priority,
+        delivery: delivery || void 0,
         acceptance: draft.acceptance,
         tests_required: draft.testsRequired,
         origin: draft.authorityRefs.length > 0 || draft.derivedRefs.length > 0 || options.from?.trim() ? {
@@ -2742,13 +2889,8 @@ function registerCreateCommand(program) {
         } : void 0
       };
       const filePath = path8.join(coop, "tasks", `${id}.md`);
-      const structuralIssues = validateStructural5(task, { filePath });
-      if (structuralIssues.length > 0) {
-        const message = structuralIssues.map((issue) => `- ${issue.message}`).join("\n");
-        throw new Error(`Task failed structural validation:
-${message}`);
-      }
-      writeTask6(task, {
+      const normalizedTask = validateTaskForWrite(root, task, filePath);
+      writeTask6(normalizedTask, {
         body: draft.body,
         filePath
       });
@@ -2824,7 +2966,7 @@ ${message}`);
     const interactive = Boolean(options.interactive);
     const name = options.name?.trim() || nameArg?.trim() || await ask("Track name");
     if (!name) throw new Error("Track name is required.");
-    const capacityProfiles = unique(
+    const capacityProfiles = unique2(
       options.profiles ? parseCsv(options.profiles) : interactive ? parseCsv(await ask("Capacity profiles (comma-separated)", "backend_team")) : ["backend_team"]
     );
     const maxWipInput = options.maxWip?.trim() || (interactive ? await ask("Max concurrent tasks", "6") : "6");
@@ -2832,7 +2974,7 @@ ${message}`);
     if (typeof maxWip !== "number" || maxWip <= 0 || !Number.isInteger(maxWip)) {
       throw new Error("max-wip must be a positive integer.");
     }
-    const allowed = unique(
+    const allowed = unique2(
       options.allowedTypes ? parseCsv(options.allowedTypes).map((entry) => entry.toLowerCase()) : interactive ? parseCsv(await ask("Allowed types (comma-separated)", "feature,bug,chore,spike")).map(
         (entry) => entry.toLowerCase()
       ) : ["feature", "bug", "chore", "spike"]
@@ -2914,7 +3056,7 @@ ${message}`);
       options.budgetCost?.trim() || (interactive ? await ask("Budget cost USD (optional)", "") : void 0),
       "budget-cost"
     );
-    const capacityProfiles = unique(
+    const capacityProfiles = unique2(
       options.profiles ? parseCsv(options.profiles) : interactive ? parseCsv(await ask("Capacity profiles (comma-separated)", "backend_team")) : ["backend_team"]
     );
     const tasks = listTaskFiles(root).map((filePath2) => {
@@ -2927,12 +3069,12 @@ ${message}`);
         console.log(`- ${task.id}: ${task.title}`);
       }
     }
-    const scopeInclude = unique(
+    const scopeInclude = unique2(
       options.scope ? parseCsv(options.scope).map((value) => value.toUpperCase()) : interactive ? parseCsv(await ask("Scope include task IDs (comma-separated)", tasks.map((task) => task.id).join(","))).map(
         (value) => value.toUpperCase()
       ) : []
     );
-    const scopeExclude = unique(
+    const scopeExclude = unique2(
       options.exclude ? parseCsv(options.exclude).map((value) => value.toUpperCase()) : interactive ? parseCsv(await ask("Scope exclude task IDs (comma-separated)", "")).map((value) => value.toUpperCase()) : []
     );
     const knownTaskIds = new Set(tasks.map((task) => task.id));
@@ -2983,6 +3125,27 @@ ${message}`);
 }
 
 // src/commands/current.ts
+function contextValue(value) {
+  return value?.trim() || "unset";
+}
+function selectionScope(context) {
+  if (context.delivery?.trim()) {
+    return `delivery '${context.delivery.trim()}'`;
+  }
+  if (context.track?.trim()) {
+    return `track '${context.track.trim()}'`;
+  }
+  return "workspace-wide (no working track or delivery set)";
+}
+function selectionReason(context, score) {
+  if (context.delivery?.trim()) {
+    return `top ready task for delivery '${context.delivery.trim()}' with score ${score.toFixed(1)}`;
+  }
+  if (context.track?.trim()) {
+    return `top ready task for track '${context.track.trim()}' with score ${score.toFixed(1)}`;
+  }
+  return `top ready task across the workspace with score ${score.toFixed(1)}`;
+}
 function registerCurrentCommand(program) {
   program.command("current").description("Show active project, working context, my in-progress tasks, and the next ready task").action(() => {
     const root = resolveRepoRoot();
@@ -2994,9 +3157,14 @@ function registerCurrentCommand(program) {
     );
     console.log(`Project: ${identity.name} (${identity.id})`);
     console.log(`Actor: ${actor}`);
-    console.log(`Track: ${context.track ?? "-"}`);
-    console.log(`Delivery: ${context.delivery ?? "-"}`);
-    console.log(`Version: ${context.version ?? "-"}`);
+    console.log("");
+    console.log("Working Context:");
+    console.log(`- Track: ${contextValue(context.track)}`);
+    console.log(`- Delivery: ${contextValue(context.delivery)}`);
+    console.log(`- Version: ${contextValue(context.version)}`);
+    if (!context.track?.trim() && !context.delivery?.trim()) {
+      console.log("- Hint: use `coop use track <id>` and/or `coop use delivery <id>` to set your working context.");
+    }
     console.log("");
     console.log("My Active Tasks:");
     if (inProgress.length === 0) {
@@ -3014,6 +3182,11 @@ function registerCurrentCommand(program) {
         delivery: context.delivery,
         version: context.version
       });
+      console.log(`Selection scope: ${selectionScope(context)}`);
+      console.log(`Why selected: ${selectionReason(context, selected.entry.score)}`);
+      if ((selected.entry.task.track ?? "").trim().toLowerCase() === "unassigned") {
+        console.log("Warning: selected task has no assigned track.");
+      }
       console.log(formatSelectedTask(selected.entry, selected.selection));
     } catch (error) {
       console.log(error instanceof Error ? error.message : String(error));
@@ -3024,7 +3197,7 @@ function registerCurrentCommand(program) {
 // src/commands/deps.ts
 import { load_graph as load_graph3 } from "@kitsy/coop-core";
 function registerDepsCommand(program) {
-  program.command("deps").description("Show dependencies and reverse dependencies for a task").argument("<id>", "Task id or alias").action((id) => {
+  program.command("deps").description("Show dependencies and reverse dependencies for a task, including status and title").argument("<id>", "Task id or alias").action((id) => {
     const root = resolveRepoRoot();
     const graph = load_graph3(coopDir(root));
     const reference = resolveReference(root, id, "task");
@@ -3033,9 +3206,25 @@ function registerDepsCommand(program) {
       throw new Error(`Task '${reference.id}' not found.`);
     }
     const reverse = Array.from(graph.reverse.get(task.id) ?? []).sort((a, b) => a.localeCompare(b));
-    console.log(`Task: ${task.id}`);
-    console.log(`Depends On: ${task.depends_on && task.depends_on.length > 0 ? task.depends_on.join(", ") : "-"}`);
-    console.log(`Required By: ${reverse.length > 0 ? reverse.join(", ") : "-"}`);
+    console.log(`Task: ${task.id} [${task.status}] ${task.title}`);
+    console.log("Depends On:");
+    if (!task.depends_on || task.depends_on.length === 0) {
+      console.log("- none");
+    } else {
+      for (const depId of task.depends_on) {
+        const dep = graph.nodes.get(depId);
+        console.log(`- ${depId}${dep ? ` [${dep.status}] ${dep.title}` : " [missing]"}`);
+      }
+    }
+    console.log("Required By:");
+    if (reverse.length === 0) {
+      console.log("- none");
+    } else {
+      for (const dependentId of reverse) {
+        const dependent = graph.nodes.get(dependentId);
+        console.log(`- ${dependentId}${dependent ? ` [${dependent.status}] ${dependent.title}` : " [missing]"}`);
+      }
+    }
   });
 }
 
@@ -3055,10 +3244,10 @@ import {
 function normalize(value) {
   return value.trim().toLowerCase();
 }
-function resolveDelivery(graph, input3) {
-  const direct = graph.deliveries.get(input3);
+function resolveDelivery(graph, input2) {
+  const direct = graph.deliveries.get(input2);
   if (direct) return direct;
-  const target = normalize(input3);
+  const target = normalize(input2);
   const byId = Array.from(graph.deliveries.values()).find((delivery) => normalize(delivery.id) === target);
   if (byId) return byId;
   const byName = Array.from(graph.deliveries.values()).filter((delivery) => normalize(delivery.name) === target);
@@ -3066,9 +3255,9 @@ function resolveDelivery(graph, input3) {
     return byName[0];
   }
   if (byName.length > 1) {
-    throw new Error(`Multiple deliveries match '${input3}'. Use delivery id instead.`);
+    throw new Error(`Multiple deliveries match '${input2}'. Use delivery id instead.`);
   }
-  throw new Error(`Delivery '${input3}' not found.`);
+  throw new Error(`Delivery '${input2}' not found.`);
 }
 
 // src/commands/graph.ts
@@ -3221,8 +3410,10 @@ var catalog = {
   selection_rules: [
     "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`.",
     "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.",
     "Use `coop show <id>` or `coop show task <id>` before implementation to read acceptance, tests_required, dependencies, origin refs, and task metadata.",
     "Use `coop refine idea` or `coop refine task` when the task lacks planning detail. COOP owns canonical writes; agents should not edit `.coop` files directly."
   ],
@@ -3277,6 +3468,8 @@ var catalog = {
         { usage: "coop use track <id>", purpose: "Set the default working track for commands that can infer scope." },
         { usage: "coop use delivery <id>", purpose: "Set the default working delivery for commands that need delivery scope." },
         { usage: "coop use version <id>", purpose: "Set the default working version for promotion and prompt generation." },
+        { 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." }
@@ -3290,6 +3483,8 @@ 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 --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 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."
@@ -3333,15 +3528,20 @@ var catalog = {
       description: "Read backlog state, task details, and planning output.",
       commands: [
         { usage: "coop list tasks --status todo", purpose: "List tasks with filters." },
-        { usage: "coop list tasks --track MVP --delivery MVP --ready", purpose: "List ready tasks with track and delivery filtering." },
+        { usage: "coop list tracks", purpose: "List valid named tracks." },
+        { usage: "coop list deliveries", purpose: "List valid named deliveries." },
+        { usage: "coop list tasks --track MVP --delivery MVP --ready --columns id,title,p,assignee,score", purpose: "List ready tasks with lean columns and score visible." },
         { usage: "coop list tasks --mine", purpose: "List tasks assigned to the current default COOP author." },
         { usage: 'coop search "auth and login form"', purpose: "Run deterministic non-AI search across tasks, ideas, and deliveries." },
         { usage: 'coop search "auth" --open', purpose: "Require a single match and print the resolved summary row." },
         { usage: "coop show PM-101", purpose: "Resolve a task, idea, or delivery by reference without an extra entity noun." },
+        { usage: "coop show PM-101 --compact", purpose: "Show a smaller summary view for a large task." },
         { usage: "coop show task PM-101", purpose: "Show a task with acceptance, tests_required, refs, and runbook sections." },
         { usage: "coop show idea IDEA-101", purpose: "Show an idea." },
-        { usage: "coop deps PM-101", purpose: "Show task dependencies and reverse dependencies." },
+        { usage: "coop deps PM-101", purpose: "Show task dependencies and reverse dependencies with status and title." },
         { usage: "coop prompt PM-101 --format markdown", purpose: "Generate a manual handoff prompt from a task and current working context." },
+        { usage: "coop update PM-101 --track MVP --delivery MVP", purpose: "Update a task's home track or primary delivery without editing `.coop` files directly." },
+        { usage: "coop update PM-101 --add-delivery-track MVP --priority-in MVP:p0", purpose: "Add a contributing track lens and scoped priority override." },
         { usage: "coop update PM-101 --priority p1 --add-fix-version v2", purpose: "Update task metadata without editing `.coop` files directly." },
         { usage: 'coop comment PM-101 --message "Needs API review"', purpose: "Append a comment to a task." },
         { usage: 'coop log-time PM-101 --hours 2 --kind worked --note "pairing"', purpose: "Append a planned or worked time log to a task." },
@@ -3595,6 +3795,9 @@ function renderAiHelp(format) {
   const heading = format === "markdown" ? "# COOP AI Help" : "COOP AI Help";
   lines.push(heading, "");
   lines.push(catalog.purpose, "");
+  lines.push("Fast agent handoff:");
+  lines.push("- `coop help-ai --initial-prompt --strict --repo C:/path/to/repo --delivery MVP --command coop.cmd`");
+  lines.push("");
   const bullet = (value) => format === "markdown" ? `- ${value}` : `- ${value}`;
   lines.push(format === "markdown" ? "## Selection Rules" : "Selection Rules");
   for (const rule of catalog.selection_rules) {
@@ -3680,7 +3883,7 @@ function registerHelpAiCommand(program) {
     } catch {
       artifactsDir = "docs";
     }
-    const output3 = options.initialPrompt ? renderAiInitialPrompt({
+    const output2 = options.initialPrompt ? renderAiInitialPrompt({
       repoPath: options.repo,
       delivery: options.delivery,
       track: options.track,
@@ -3688,7 +3891,7 @@ function registerHelpAiCommand(program) {
       rigour,
       artifactsDir
     }) : topic ? renderAiHelpTopic(format, topic) : renderAiHelp(format);
-    console.log(output3.trimEnd());
+    console.log(output2.trimEnd());
   });
 }
 function resolveHelpTopic(options) {
@@ -3711,11 +3914,11 @@ function resolveHelpTopic(options) {
   if (options.naming) {
     requestedTopics.push("naming");
   }
-  const unique3 = [...new Set(requestedTopics)];
-  if (unique3.length > 1) {
-    throw new Error(`Specify only one focused help-ai topic at a time. Received: ${unique3.join(", ")}.`);
+  const unique4 = [...new Set(requestedTopics)];
+  if (unique4.length > 1) {
+    throw new Error(`Specify only one focused help-ai topic at a time. Received: ${unique4.join(", ")}.`);
   }
-  const topic = unique3[0];
+  const topic = unique4[0];
   if (topic !== void 0 && topic !== "state-transitions" && topic !== "artifacts" && topic !== "post-execution" && topic !== "selection" && topic !== "naming") {
     throw new Error(`Unsupported help-ai topic '${topic}'. Expected state-transitions|artifacts|post-execution|selection|naming.`);
   }
@@ -3775,15 +3978,13 @@ function registerIndexCommand(program) {
 import fs10 from "fs";
 import path13 from "path";
 import { spawnSync as spawnSync4 } from "child_process";
-import { createInterface } from "readline/promises";
-import { stdin as input, stdout as output } from "process";
 import { CURRENT_SCHEMA_VERSION, write_schema_version } from "@kitsy/coop-core";
 
 // src/hooks/pre-commit.ts
 import fs8 from "fs";
 import path11 from "path";
 import { spawnSync as spawnSync3 } from "child_process";
-import { detect_cycle, parseTaskContent, parseTaskFile as parseTaskFile8, validateStructural as validateStructural6 } from "@kitsy/coop-core";
+import { detect_cycle, parseTaskContent, parseTaskFile as parseTaskFile8, validateStructural as validateStructural5 } from "@kitsy/coop-core";
 var HOOK_BLOCK_START = "# COOP_PRE_COMMIT_START";
 var HOOK_BLOCK_END = "# COOP_PRE_COMMIT_END";
 function runGit(repoRoot, args, allowFailure = false) {
@@ -3867,7 +4068,7 @@ function parseStagedTasks(repoRoot, relativePaths) {
       errors.push(`[COOP] ${message}`);
       continue;
     }
-    const issues = validateStructural6(task, { filePath: absolutePath });
+    const issues = validateStructural5(task, { filePath: absolutePath });
     for (const issue of issues) {
       errors.push(`[COOP] ${relativePath}: ${issue.message}`);
     }
@@ -4101,6 +4302,28 @@ function installPostMergeHook(repoRoot) {
 }
 
 // src/commands/init.ts
+var NAMING_TEMPLATE_PRESETS = [
+  {
+    label: "<TYPE>-<TITLE16>-<SEQ>",
+    value: "<TYPE>-<TITLE16>-<SEQ>",
+    hint: "Balanced semantic default"
+  },
+  {
+    label: "<TYPE>-<TRACK>-<TITLE16>-<SEQ>",
+    value: "<TYPE>-<TRACK>-<TITLE16>-<SEQ>",
+    hint: "Include track in ids"
+  },
+  {
+    label: "<TYPE>-<USER>-<YYMMDD>-<RAND>",
+    value: "<TYPE>-<USER>-<YYMMDD>-<RAND>",
+    hint: "Actor/date/random oriented"
+  },
+  {
+    label: "Custom template",
+    value: "__custom__",
+    hint: "Enter a custom naming template manually"
+  }
+];
 function normalizeProjectId(value) {
   return value.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
 }
@@ -4321,36 +4544,27 @@ function installMergeDrivers(root) {
   return "Updated .gitattributes but could not register merge drivers in git config.";
 }
 async function promptInitIdentity(root, options) {
-  const rl = createInterface({ input, output });
-  const ask2 = async (question, fallback) => {
-    try {
-      const answer = await rl.question(`${question} [${fallback}]: `);
-      return answer.trim() || fallback;
-    } catch {
-      return fallback;
-    }
-  };
   const defaultName = repoDisplayName(root);
-  try {
-    const initialName = options.name?.trim() || defaultName;
-    const projectName = options.name?.trim() || await ask2("Project name", initialName);
-    const defaultId = options.id?.trim() || normalizeProjectId(projectName) || repoIdentityId(root);
-    const projectIdRaw = options.id?.trim() || await ask2("Project id", defaultId);
-    const projectId = normalizeProjectId(projectIdRaw);
-    if (!projectId) {
-      throw new Error("Invalid project id. Use letters, numbers, and hyphens.");
-    }
-    const aliasesInput = options.aliases !== void 0 ? options.aliases : await ask2("Aliases (csv, optional)", "");
-    const namingTemplate = options.naming?.trim() || await ask2("ID naming template", DEFAULT_ID_NAMING_TEMPLATE);
-    return {
-      projectName,
-      projectId,
-      projectAliases: parseAliases2(aliasesInput),
-      namingTemplate
-    };
-  } finally {
-    rl.close();
+  const initialName = options.name?.trim() || defaultName;
+  const projectName = options.name?.trim() || await ask("Project name", initialName);
+  const defaultId = options.id?.trim() || normalizeProjectId(projectName) || repoIdentityId(root);
+  const projectIdRaw = options.id?.trim() || await ask("Project id", defaultId);
+  const projectId = normalizeProjectId(projectIdRaw);
+  if (!projectId) {
+    throw new Error("Invalid project id. Use letters, numbers, and hyphens.");
+  }
+  const aliasesInput = options.aliases !== void 0 ? options.aliases : await ask("Aliases (csv, optional)", "");
+  let namingTemplate = options.naming?.trim();
+  if (!namingTemplate) {
+    const selected = await select("ID naming template", [...NAMING_TEMPLATE_PRESETS], 0);
+    namingTemplate = selected === "__custom__" ? await ask("Custom ID naming template", DEFAULT_ID_NAMING_TEMPLATE) : selected;
   }
+  return {
+    projectName,
+    projectId,
+    projectAliases: parseAliases2(aliasesInput),
+    namingTemplate
+  };
 }
 async function resolveInitIdentity(root, options) {
   const defaultName = repoDisplayName(root);
@@ -4358,7 +4572,7 @@ async function resolveInitIdentity(root, options) {
   const fallbackId = normalizeProjectId(options.id?.trim() || fallbackName) || repoIdentityId(root);
   const fallbackAliases = parseAliases2(options.aliases);
   const fallbackNaming = options.naming?.trim() || DEFAULT_ID_NAMING_TEMPLATE;
-  const interactive = Boolean(options.interactive || !options.yes && input.isTTY && output.isTTY);
+  const interactive = Boolean(options.interactive || !options.yes && process.stdin.isTTY && process.stdout.isTTY);
   if (interactive) {
     return promptInitIdentity(root, options);
   }
@@ -4435,6 +4649,8 @@ function registerInitCommand(program) {
     console.log('  1. coop create idea "Describe the idea"');
     console.log('  2. coop create task "Describe the task"');
     console.log("  3. coop graph validate");
+    console.log(`  4. coop help-ai --initial-prompt --strict --repo ${root.replace(/\\/g, "/")} --command coop.cmd`);
+    console.log("  5. after you create a delivery, add --delivery <id> to that help-ai prompt for agent handoff");
   });
 }
 
@@ -4501,8 +4717,54 @@ function registerLifecycleCommands(program) {
 
 // src/commands/list.ts
 import path15 from "path";
-import { load_graph as load_graph6, parseDeliveryFile as parseDeliveryFile2, parseIdeaFile as parseIdeaFile4, parseTaskFile as parseTaskFile10, schedule_next as schedule_next3 } from "@kitsy/coop-core";
+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,
+  title: 30,
+  status: 12,
+  priority: 4,
+  assignee: 16,
+  track: 16,
+  delivery: 16,
+  score: 6,
+  file: 30
+};
+var IDEA_COLUMN_WIDTHS = {
+  id: 24,
+  title: 30,
+  status: 12,
+  file: 30
+};
+function truncateCell(value, maxWidth) {
+  if (maxWidth <= 0 || value.length <= maxWidth) {
+    return value;
+  }
+  if (maxWidth <= 3) {
+    return value.slice(0, maxWidth);
+  }
+  return `${value.slice(0, maxWidth - 3)}...`;
+}
+function truncateMiddleCell(value, maxWidth) {
+  if (maxWidth <= 0 || value.length <= maxWidth) {
+    return value;
+  }
+  if (maxWidth <= 3) {
+    return value.slice(0, maxWidth);
+  }
+  const available = maxWidth - 3;
+  const head = Math.ceil(available / 2);
+  const tail = Math.floor(available / 2);
+  return `${value.slice(0, head)}...${value.slice(value.length - tail)}`;
+}
 function statusColor(status) {
   switch (status) {
     case "done":
@@ -4519,8 +4781,210 @@ function statusColor(status) {
       return status;
   }
 }
-function sortByIdAsc(items) {
-  return [...items].sort((a, b) => a.id.localeCompare(b.id));
+function parseColumns(input2) {
+  return (input2 ?? "").split(",").map((value) => value.trim().toLowerCase()).filter(Boolean);
+}
+function normalizeTaskColumns(value, ready) {
+  if (!value?.trim()) {
+    return ready ? ["id", "title", "priority", "status", "assignee", "score"] : ["id", "title", "priority", "status", "assignee"];
+  }
+  const raw = parseColumns(value);
+  if (raw.length === 1 && raw[0] === "all") {
+    return ["id", "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"]);
+  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.`);
+    }
+  }
+  return normalized;
+}
+function normalizeIdeaColumns(value) {
+  if (!value?.trim()) {
+    return ["id", "title", "status"];
+  }
+  const raw = parseColumns(value);
+  if (raw.length === 1 && raw[0] === "all") {
+    return ["id", "title", "status", "file"];
+  }
+  const valid = /* @__PURE__ */ new Set(["id", "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.`);
+    }
+  }
+  return raw;
+}
+function normalizeTaskSort(value, fallback) {
+  switch ((value ?? "").trim().toLowerCase()) {
+    case "":
+      return fallback;
+    case "id":
+    case "priority":
+    case "status":
+    case "title":
+    case "updated":
+    case "created":
+    case "score":
+      return value.trim().toLowerCase();
+    default:
+      throw new Error(`Invalid sort '${value}'. Expected id|priority|status|title|updated|created|score.`);
+  }
+}
+function normalizeIdeaSort(value, fallback) {
+  switch ((value ?? "").trim().toLowerCase()) {
+    case "":
+      return fallback;
+    case "id":
+    case "status":
+    case "title":
+    case "updated":
+    case "created":
+      return value.trim().toLowerCase();
+    default:
+      throw new Error(`Invalid sort '${value}'. Expected id|status|title|updated|created.`);
+  }
+}
+function priorityRank(value) {
+  switch (value) {
+    case "p0":
+      return 0;
+    case "p1":
+      return 1;
+    case "p2":
+      return 2;
+    case "p3":
+      return 3;
+    default:
+      return 4;
+  }
+}
+function taskStatusRank(value) {
+  switch (value) {
+    case "in_progress":
+      return 0;
+    case "in_review":
+      return 1;
+    case "todo":
+      return 2;
+    case "blocked":
+      return 3;
+    case "done":
+      return 4;
+    case "canceled":
+      return 5;
+    default:
+      return 6;
+  }
+}
+function ideaStatusRank(value) {
+  switch (value) {
+    case "active":
+      return 0;
+    case "captured":
+      return 1;
+    case "validated":
+      return 2;
+    case "rejected":
+      return 3;
+    case "promoted":
+      return 4;
+    default:
+      return 5;
+  }
+}
+function compareDatesDesc(a, b) {
+  return (b ?? "").localeCompare(a ?? "");
+}
+function compareTaskScoreLike(a, b, readyOrder, track) {
+  const aReady = readyOrder.get(a.id);
+  const bReady = readyOrder.get(b.id);
+  if (aReady !== void 0 || bReady !== void 0) {
+    if (aReady === void 0) return 1;
+    if (bReady === void 0) return -1;
+    return aReady - bReady;
+  }
+  const status = taskStatusRank(a.status) - taskStatusRank(b.status);
+  if (status !== 0) return status;
+  const priority = priorityRank(effective_priority3(b.task, track)) - priorityRank(effective_priority3(a.task, track));
+  if (priority !== 0) return priority;
+  const updated = compareDatesDesc(a.task.updated, b.task.updated);
+  if (updated !== 0) return updated;
+  return a.id.localeCompare(b.id);
+}
+function sortTaskRows(rows, sortMode, readyOrder, track) {
+  return [...rows].sort((a, b) => {
+    switch (sortMode) {
+      case "score":
+        return compareTaskScoreLike(a, b, readyOrder, track);
+      case "priority": {
+        const priority = priorityRank(a.priority) - priorityRank(b.priority);
+        if (priority !== 0) return priority;
+        return a.id.localeCompare(b.id);
+      }
+      case "status": {
+        const status = taskStatusRank(a.status) - taskStatusRank(b.status);
+        if (status !== 0) return status;
+        return a.id.localeCompare(b.id);
+      }
+      case "title":
+        return a.title.localeCompare(b.title);
+      case "updated": {
+        const updated = compareDatesDesc(a.task.updated, b.task.updated);
+        if (updated !== 0) return updated;
+        return a.id.localeCompare(b.id);
+      }
+      case "created": {
+        const created = compareDatesDesc(a.task.created, b.task.created);
+        if (created !== 0) return created;
+        return a.id.localeCompare(b.id);
+      }
+      case "id":
+      default:
+        return a.id.localeCompare(b.id);
+    }
+  });
+}
+function taskColumnHeader(column) {
+  switch (column) {
+    case "priority":
+      return "P";
+    case "assignee":
+      return "Assignee";
+    case "track":
+      return "Track";
+    case "delivery":
+      return "Delivery";
+    case "score":
+      return "Score";
+    case "file":
+      return "File";
+    case "status":
+      return "Status";
+    case "title":
+      return "Title";
+    case "id":
+    default:
+      return "ID";
+  }
+}
+function ideaColumnHeader(column) {
+  switch (column) {
+    case "file":
+      return "File";
+    case "status":
+      return "Status";
+    case "title":
+      return "Title";
+    case "id":
+    default:
+      return "ID";
+  }
 }
 function loadTasks2(root) {
   return listTaskFiles(root).map((filePath) => ({
@@ -4539,24 +5003,38 @@ function listTasks(options) {
   ensureCoopInitialized(root);
   const context = readWorkingContext(root, resolveCoopHome());
   const graph = load_graph6(coopDir(root));
-  const resolvedTrack = resolveContextValueWithSource(options.track, context.track, sharedDefault(root, "track"));
-  const resolvedDelivery = resolveContextValueWithSource(options.delivery, context.delivery, sharedDefault(root, "delivery"));
+  const rawResolvedTrack = resolveContextValueWithSource(options.track, context.track);
+  const rawResolvedDelivery = resolveContextValueWithSource(options.delivery, context.delivery);
+  const resolvedTrack = {
+    ...rawResolvedTrack,
+    value: rawResolvedTrack.value ? resolveExistingTrackId(root, rawResolvedTrack.value) ?? rawResolvedTrack.value : void 0
+  };
+  const resolvedDelivery = {
+    ...rawResolvedDelivery,
+    value: rawResolvedDelivery.value ? resolveExistingDeliveryId(root, rawResolvedDelivery.value) ?? rawResolvedDelivery.value : void 0
+  };
+  const resolvedVersion = resolveContextValueWithSource(options.version, context.version);
   const assignee = options.mine ? defaultCoopAuthor(root) : options.assignee?.trim();
   const deliveryScope = resolvedDelivery.value ? new Set(graph.deliveries.get(resolvedDelivery.value)?.scope.include ?? []) : null;
+  const defaultSort = options.ready || resolvedTrack.value || resolvedDelivery.value ? "score" : "id";
+  const sortMode = normalizeTaskSort(options.sort, defaultSort);
+  const columns = normalizeTaskColumns(options.columns, Boolean(options.ready));
   if (isVerboseRequested()) {
     for (const line of formatResolvedContextMessage({
       track: resolvedTrack,
-      delivery: resolvedDelivery
+      delivery: resolvedDelivery,
+      version: resolvedVersion
     })) {
       console.log(line);
     }
   }
-  const readyEntries = options.ready ? schedule_next3(load_graph6(ensureCoopInitialized(root)), {
+  const scoredEntries = sortMode === "score" || options.ready ? schedule_next3(graph, {
     track: resolvedTrack.value,
     delivery: resolvedDelivery.value
-  }) : null;
-  const readyIds = readyEntries ? new Set(readyEntries.map((entry) => entry.task.id)) : null;
-  const readyOrder = readyEntries ? new Map(readyEntries.map((entry, index) => [entry.task.id, index])) : null;
+  }) : [];
+  const readyIds = options.ready ? new Set(scoredEntries.map((entry) => entry.task.id)) : null;
+  const readyOrder = new Map(scoredEntries.map((entry, index) => [entry.task.id, index]));
+  const scoreMap = new Map(scoredEntries.map((entry) => [entry.task.id, entry.score]));
   const rows = loadTasks2(root).filter(({ task }) => {
     if (readyIds && !readyIds.has(task.id)) return false;
     if (options.status && task.status !== options.status) return false;
@@ -4566,11 +5044,12 @@ function listTasks(options) {
     if (resolvedDelivery.value && task.delivery !== resolvedDelivery.value && !deliveryScope?.has(task.id)) return false;
     if (options.priority && taskEffectivePriority(task, resolvedTrack.value) !== options.priority) return false;
     if (assignee && (task.assignee ?? "") !== assignee) return false;
-    if (options.version && !(task.fix_versions ?? []).includes(options.version) && !(task.released_in ?? []).includes(options.version)) {
+    if (resolvedVersion.value && !(task.fix_versions ?? []).includes(resolvedVersion.value) && !(task.released_in ?? []).includes(resolvedVersion.value)) {
       return false;
     }
     return true;
   }).map(({ task, filePath }) => ({
+    task,
     id: task.id,
     title: task.title,
     status: task.status,
@@ -4580,24 +5059,42 @@ function listTasks(options) {
     delivery: task.delivery ?? "-",
     filePath
   }));
-  const sorted = readyOrder ? [...rows].sort((a, b) => (readyOrder.get(a.id) ?? Number.MAX_SAFE_INTEGER) - (readyOrder.get(b.id) ?? Number.MAX_SAFE_INTEGER)) : sortByIdAsc(rows);
+  const sorted = sortTaskRows(rows, sortMode, readyOrder, resolvedTrack.value);
   if (sorted.length === 0) {
     console.log("No tasks found.");
     return;
   }
   console.log(
     formatTable(
-      ["ID", "Title", "Status", "Priority", "Track", "Assignee", "Delivery", "File"],
-      sorted.map((entry) => [
-        entry.id,
-        entry.title,
-        statusColor(entry.status),
-        entry.priority,
-        entry.track,
-        entry.assignee,
-        entry.delivery,
-        path15.relative(root, entry.filePath)
-      ])
+      columns.map(taskColumnHeader),
+      sorted.map(
+        (entry) => columns.map((column) => {
+          const rawValue = (() => {
+            switch (column) {
+              case "title":
+                return entry.title;
+              case "status":
+                return statusColor(entry.status);
+              case "priority":
+                return entry.priority;
+              case "assignee":
+                return entry.assignee;
+              case "track":
+                return entry.track;
+              case "delivery":
+                return entry.delivery;
+              case "score":
+                return scoreMap.has(entry.id) ? scoreMap.get(entry.id).toFixed(1) : "-";
+              case "file":
+                return path15.relative(root, entry.filePath);
+              case "id":
+              default:
+                return entry.id;
+            }
+          })();
+          return column === "file" ? truncateMiddleCell(rawValue, TASK_COLUMN_WIDTHS[column]) : truncateCell(rawValue, TASK_COLUMN_WIDTHS[column]);
+        })
+      )
     )
   );
   console.log(`
@@ -4606,6 +5103,8 @@ Total tasks: ${sorted.length}`);
 function listIdeas(options) {
   const root = resolveRepoRoot();
   ensureCoopInitialized(root);
+  const sortMode = normalizeIdeaSort(options.sort, "id");
+  const columns = normalizeIdeaColumns(options.columns);
   const rows = loadIdeas(root).filter(({ idea }) => {
     if (options.status && idea.status !== options.status) return false;
     return true;
@@ -4617,22 +5116,36 @@ function listIdeas(options) {
     track: "-",
     filePath
   }));
-  const sorted = sortByIdAsc(rows);
+  const sorted = [...rows].sort((a, b) => {
+    switch (sortMode) {
+      case "status": {
+        const status = ideaStatusRank(a.status) - ideaStatusRank(b.status);
+        if (status !== 0) return status;
+        return a.id.localeCompare(b.id);
+      }
+      case "title":
+        return a.title.localeCompare(b.title);
+      case "updated":
+      case "created":
+        return a.id.localeCompare(b.id);
+      case "id":
+      default:
+        return a.id.localeCompare(b.id);
+    }
+  });
   if (sorted.length === 0) {
     console.log("No ideas found.");
     return;
   }
   console.log(
     formatTable(
-      ["ID", "Title", "Status", "Priority", "Track", "File"],
-      sorted.map((entry) => [
-        entry.id,
-        entry.title,
-        statusColor(entry.status),
-        entry.priority,
-        entry.track,
-        path15.relative(root, entry.filePath)
-      ])
+      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]);
+        })
+      )
     )
   );
   console.log(`
@@ -4641,11 +5154,11 @@ Total ideas: ${sorted.length}`);
 function listDeliveries() {
   const root = resolveRepoRoot();
   const rows = listDeliveryFiles(root).map((filePath) => ({ delivery: parseDeliveryFile2(filePath).delivery, filePath })).map(({ delivery, filePath }) => [
-    delivery.id,
-    delivery.name,
-    statusColor(delivery.status),
-    delivery.target_date ?? "-",
-    path15.relative(root, filePath)
+    truncateCell(delivery.id, 24),
+    truncateCell(delivery.name, 30),
+    truncateCell(statusColor(delivery.status), 12),
+    truncateCell(delivery.target_date ?? "-", 16),
+    truncateMiddleCell(path15.relative(root, filePath), 30)
   ]);
   if (rows.length === 0) {
     console.log("No deliveries found.");
@@ -4653,18 +5166,36 @@ function listDeliveries() {
   }
   console.log(formatTable(["ID", "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 }) => [
+    truncateCell(track.id, 24),
+    truncateCell(track.name, 30),
+    truncateCell((track.capacity_profiles ?? []).join(", ") || "-", 24),
+    truncateCell(String(track.constraints?.max_concurrent_tasks ?? "-"), 8),
+    truncateMiddleCell(path15.relative(root, filePath), 30)
+  ]);
+  if (rows.length === 0) {
+    console.log("No tracks found.");
+    return;
+  }
+  console.log(formatTable(["ID", "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 track, using `coop use track` if omitted").option("--delivery <delivery>", "Filter by delivery, 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").action((options) => {
+  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) => {
     listTasks(options);
   });
-  list.command("ideas").description("List ideas").option("--status <status>", "Filter by status").action((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) => {
     listIdeas(options);
   });
   list.command("alias").description("List aliases").argument("[pattern]", "Wildcard pattern, e.g. PAY*").action((pattern) => {
     listAliasRows(pattern);
   });
-  list.command("deliveries").description("List deliveries").action(() => {
+  list.command("tracks").alias("track").description("List tracks").action(() => {
+    listTracks();
+  });
+  list.command("deliveries").alias("delivery").description("List deliveries").action(() => {
     listDeliveries();
   });
 }
@@ -4672,17 +5203,30 @@ function registerListCommand(program) {
 // src/utils/logger.ts
 import fs11 from "fs";
 import path16 from "path";
-function resolveRepoSafe(start = process.cwd()) {
-  try {
-    return resolveRepoRoot(start);
-  } catch {
-    return path16.resolve(start);
+function resolveWorkspaceRoot(start = process.cwd()) {
+  let current = path16.resolve(start);
+  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)) {
+      return current;
+    }
+    const parent = path16.dirname(current);
+    if (parent === current) {
+      return null;
+    }
+    current = parent;
   }
 }
 function resolveCliLogFile(start = process.cwd()) {
-  const root = resolveRepoSafe(start);
-  const workspace = coopWorkspaceDir(root);
-  if (fs11.existsSync(workspace)) {
+  const root = resolveWorkspaceRoot(start);
+  if (root) {
+    const workspace = coopWorkspaceDir(root);
     return path16.join(workspace, "logs", "cli.log");
   }
   return path16.join(resolveCoopHome(), "logs", "cli.log");
@@ -4786,7 +5330,7 @@ function registerLogTimeCommand(program) {
       hours,
       options.note?.trim() || void 0
     );
-    writeTaskEntry(filePath, parsed, task);
+    writeTaskEntry(root, filePath, parsed, task);
     console.log(`Logged ${hours}h ${options.kind} on ${task.id}`);
   });
 }
@@ -4794,9 +5338,9 @@ function registerLogTimeCommand(program) {
 // src/commands/migrate.ts
 import fs12 from "fs";
 import path17 from "path";
-import { createInterface as createInterface2 } from "readline/promises";
-import { stdin as input2, stdout as output2 } from "process";
-import { CURRENT_SCHEMA_VERSION as CURRENT_SCHEMA_VERSION2, IndexManager as IndexManager3, migrate_repository, parseYamlFile as parseYamlFile2, writeYamlFile as writeYamlFile4 } from "@kitsy/coop-core";
+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";
 var COOP_IGNORE_TEMPLATE2 = `.index/
 logs/
 tmp/
@@ -4868,7 +5412,7 @@ function parseAliases3(value) {
   );
 }
 async function promptProjectIdentity(defaults, options) {
-  const rl = createInterface2({ input: input2, output: output2 });
+  const rl = createInterface({ input, output });
   const ask2 = async (question, fallback) => {
     try {
       const answer = await rl.question(`${question} [${fallback}]: `);
@@ -4901,7 +5445,7 @@ async function resolveMigrationIdentity(root, options) {
     projectId: normalizeProjectId2(existing.projectId || repoIdentityId(root)) || repoIdentityId(root),
     projectAliases: options.aliases !== void 0 ? parseAliases3(options.aliases) : existing.projectAliases
   };
-  const interactive = Boolean(options.interactive || !options.yes && input2.isTTY && output2.isTTY);
+  const interactive = Boolean(options.interactive || !options.yes && input.isTTY && output.isTTY);
   if (interactive) {
     return promptProjectIdentity(defaults, options);
   }
@@ -4963,7 +5507,7 @@ async function migrateWorkspaceLayout(root, options) {
   }
   const movedConfigPath = path17.join(projectRoot, "config.yml");
   if (fs12.existsSync(movedConfigPath)) {
-    const movedConfig = parseYamlFile2(movedConfigPath);
+    const movedConfig = parseYamlFile4(movedConfigPath);
     const nextProject = typeof movedConfig.project === "object" && movedConfig.project !== null ? { ...movedConfig.project } : {};
     nextProject.name = identity.projectName;
     nextProject.id = projectId;
@@ -5358,7 +5902,7 @@ function registerPromoteCommand(program) {
       track: resolvedTrack.value,
       version: resolvedVersion.value
     });
-    writeTaskEntry(filePath, parsed, task);
+    writeTaskEntry(root, filePath, parsed, task);
     console.log(`Promoted ${task.id}`);
   });
 }
@@ -5638,15 +6182,15 @@ function registerPromptCommand(program) {
     const root = resolveRepoRoot();
     const payload = buildPayload(root, id);
     const format = options.format ?? "text";
-    let output3 = "";
+    let output2 = "";
     if (format === "json") {
-      output3 = `${JSON.stringify(payload, null, 2)}
+      output2 = `${JSON.stringify(payload, null, 2)}
 `;
     } else {
-      output3 = renderMarkdown(payload);
+      output2 = renderMarkdown(payload);
     }
     if (options.save) {
-      fs14.writeFileSync(options.save, output3, "utf8");
+      fs14.writeFileSync(options.save, output2, "utf8");
     }
     if (isVerboseRequested()) {
       for (const line of formatResolvedContextMessage({
@@ -5657,7 +6201,7 @@ function registerPromptCommand(program) {
         console.log(line);
       }
     }
-    console.log(output3.trimEnd());
+    console.log(output2.trimEnd());
   });
 }
 
@@ -6244,13 +6788,31 @@ function formatTimeSummary(task) {
   const plannedLogged = (task.time?.logs ?? []).filter((entry) => entry.kind === "planned").reduce((sum, entry) => sum + entry.hours, 0);
   return `planned_hours=${planned ?? "-"} | planned_logged=${plannedLogged || 0} | worked=${worked || 0}`;
 }
-function showTask(taskId) {
+function showTask(taskId, options = {}) {
   const root = resolveRepoRoot();
   const context = readWorkingContext(root, resolveCoopHome());
   const { filePath, parsed } = loadTaskEntry(root, taskId);
   const task = parsed.task;
   const body = parsed.body.trim();
   const computed = loadComputedFromIndex(root, task.id);
+  if (options.compact) {
+    const compactLines = [
+      `Task: ${task.id}`,
+      `Title: ${task.title}`,
+      `Status: ${task.status}`,
+      `Priority: ${task.priority ?? "-"}`,
+      `Effective Priority: ${taskEffectivePriority(task, context.track)}`,
+      `Track: ${task.track ?? "-"}`,
+      `Delivery: ${task.delivery ?? "-"}`,
+      `Assignee: ${task.assignee ?? "-"}`,
+      `Depends On: ${stringify(task.depends_on)}`,
+      `Acceptance: ${task.acceptance && task.acceptance.length > 0 ? task.acceptance.join(" | ") : "-"}`,
+      `Tests Required: ${task.tests_required && task.tests_required.length > 0 ? task.tests_required.join(", ") : "-"}`,
+      `File: ${path22.relative(root, filePath)}`
+    ];
+    console.log(compactLines.join("\n"));
+    return;
+  }
   const lines = [
     `Task: ${task.id}`,
     `Title: ${task.title}`,
@@ -6315,13 +6877,26 @@ function showTask(taskId) {
   }
   console.log(lines.join("\n"));
 }
-function showIdea(ideaId) {
+function showIdea(ideaId, options = {}) {
   const root = resolveRepoRoot();
   const target = resolveReference(root, ideaId, "idea");
   const ideaFile = path22.join(root, ...target.file.split("/"));
   const parsed = parseIdeaFile7(ideaFile);
   const idea = parsed.idea;
   const body = parsed.body.trim();
+  if (options.compact) {
+    console.log(
+      [
+        `Idea: ${idea.id}`,
+        `Title: ${idea.title}`,
+        `Status: ${idea.status}`,
+        `Tags: ${stringify(idea.tags)}`,
+        `Linked Tasks: ${stringify(idea.linked_tasks)}`,
+        `File: ${path22.relative(root, ideaFile)}`
+      ].join("\n")
+    );
+    return;
+  }
   const lines = [
     `Idea: ${idea.id}`,
     `Title: ${idea.title}`,
@@ -6339,9 +6914,22 @@ function showIdea(ideaId) {
   ];
   console.log(lines.join("\n"));
 }
-function showDelivery(ref) {
+function showDelivery(ref, options = {}) {
   const root = resolveRepoRoot();
   const { filePath, delivery, body } = resolveDeliveryEntry(root, ref);
+  if (options.compact) {
+    console.log(
+      [
+        `Delivery: ${delivery.id}`,
+        `Name: ${delivery.name}`,
+        `Status: ${delivery.status}`,
+        `Target Date: ${delivery.target_date ?? "-"}`,
+        `Scope Include: ${delivery.scope.include.length > 0 ? delivery.scope.include.join(", ") : "-"}`,
+        `File: ${path22.relative(root, filePath)}`
+      ].join("\n")
+    );
+    return;
+  }
   const lines = [
     `Delivery: ${delivery.id}`,
     `Name: ${delivery.name}`,
@@ -6359,35 +6947,35 @@ function showDelivery(ref) {
   ];
   console.log(lines.join("\n"));
 }
-function showByReference(ref) {
+function showByReference(ref, options = {}) {
   const root = resolveRepoRoot();
   try {
     const resolved = resolveReference(root, ref);
     if (resolved.type === "task") {
-      showTask(ref);
+      showTask(ref, options);
       return;
     }
-    showIdea(ref);
+    showIdea(ref, options);
     return;
   } catch {
-    showDelivery(ref);
+    showDelivery(ref, options);
   }
 }
 function registerShowCommand(program) {
-  const show = program.command("show").description("Show detailed COOP entities").argument("[ref]", "Task, idea, or delivery reference").action((ref) => {
+  const show = program.command("show").description("Show detailed COOP entities").argument("[ref]", "Task, idea, or delivery reference").option("--compact", "Show a smaller summary view").action((ref, options) => {
     if (!ref?.trim()) {
       throw new Error("Provide a task, idea, or delivery reference.");
     }
-    showByReference(ref);
+    showByReference(ref, options);
   });
-  show.command("task").description("Show task details").argument("<id>", "Task ID").action((id) => {
-    showTask(id);
+  show.command("task").description("Show task details").argument("<id>", "Task ID").option("--compact", "Show a smaller summary view").action((id, options) => {
+    showTask(id, options);
   });
-  show.command("idea").description("Show idea details").argument("<id>", "Idea ID").action((id) => {
-    showIdea(id);
+  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("delivery").description("Show delivery details").argument("<id>", "Delivery id or name").action((id) => {
-    showDelivery(id);
+  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);
   });
 }
 
@@ -6563,7 +7151,7 @@ function maybePromote(root, taskId, options) {
     track: options.track ?? context.track,
     version: options.version ?? context.version
   });
-  writeTaskEntry(filePath, parsed, promoted);
+  writeTaskEntry(root, filePath, parsed, promoted);
   console.log(`Promoted ${promoted.id}`);
 }
 function printResolvedSelectionContext(root, options) {
@@ -6581,7 +7169,7 @@ function printResolvedSelectionContext(root, options) {
 }
 function registerTaskFlowCommands(program) {
   const next = program.command("next").description("Select the next COOP work item");
-  next.command("task").description("Show the top ready task").option("--track <track>", "Filter by track, else config.defaults.track if set").option("--delivery <delivery>", "Filter by delivery").option("--executor <executor>", "Filter by executor (human|ai|ci|hybrid)").option("--today <date>", "Evaluation date (YYYY-MM-DD)").action((options) => {
+  next.command("task").description("Show the top ready task").option("--track <track>", "Filter by the home/contributing track lens, else config.defaults.track if set").option("--delivery <delivery>", "Filter by delivery membership").option("--executor <executor>", "Filter by executor (human|ai|ci|hybrid)").option("--today <date>", "Evaluation date (YYYY-MM-DD)").action((options) => {
     const root = resolveRepoRoot();
     printResolvedSelectionContext(root, options);
     const selected = selectTopReadyTask(root, {
@@ -6593,7 +7181,7 @@ function registerTaskFlowCommands(program) {
     console.log(formatSelectedTask(selected.entry, selected.selection));
   });
   const pick = program.command("pick").description("Pick the next COOP work item");
-  pick.command("task").description("Select the top ready task and move it into active work").argument("[id]", "Task ID or alias").option("--track <track>", "Filter by track, else config.defaults.track if set").option("--delivery <delivery>", "Filter by delivery").option("--executor <executor>", "Filter by executor (human|ai|ci|hybrid)").option("--today <date>", "Evaluation date (YYYY-MM-DD)").option("--promote", "Promote the task in the current track/version context before starting it").option("--to <assignee>", "Assign the selected task before starting it").option("--claim", "Assign the selected task to the actor/user/default author before starting it").option("--actor <actor>", "Actor performing assignment/transition").option("--user <user>", "Current user for advisory authorization checks").option("--force", "Override advisory authorization checks").action(async (id, options) => {
+  pick.command("task").description("Select the top ready task and move it into active work").argument("[id]", "Task ID or alias").option("--track <track>", "Filter by the home/contributing track lens, else config.defaults.track if set").option("--delivery <delivery>", "Filter by delivery membership").option("--executor <executor>", "Filter by executor (human|ai|ci|hybrid)").option("--today <date>", "Evaluation date (YYYY-MM-DD)").option("--promote", "Promote the task in the current track/version context before starting it").option("--to <assignee>", "Assign the selected task before starting it").option("--claim", "Assign the selected task to the actor/user/default author before starting it").option("--actor <actor>", "Actor performing assignment/transition").option("--user <user>", "Current user for advisory authorization checks").option("--force", "Override advisory authorization checks").action(async (id, options) => {
     const root = resolveRepoRoot();
     printResolvedSelectionContext(root, options);
     const selected = id?.trim() ? {
@@ -6623,7 +7211,7 @@ function registerTaskFlowCommands(program) {
     await claimAndStart(root, selected.entry.task.id, options);
   });
   const start = program.command("start").description("Start COOP work on a task");
-  start.command("task").description("Start a specific task, or the top ready task if no id is provided").argument("[id]", "Task ID or alias").option("--track <track>", "Filter by track when no id is provided, else config.defaults.track if set").option("--delivery <delivery>", "Filter by delivery when no id is provided").option("--executor <executor>", "Filter by executor (human|ai|ci|hybrid) when no id is provided").option("--today <date>", "Evaluation date (YYYY-MM-DD) when no id is provided").option("--promote", "Promote the task in the current track/version context before starting it").option("--to <assignee>", "Assign the task before starting it").option("--claim", "Assign the task to the actor/user/default author before starting it").option("--actor <actor>", "Actor performing assignment/transition").option("--user <user>", "Current user for advisory authorization checks").option("--force", "Override advisory authorization checks").action(async (id, options) => {
+  start.command("task").description("Start a specific task, or the top ready task if no id is provided").argument("[id]", "Task ID or alias").option("--track <track>", "Filter by the home/contributing track lens when no id is provided, else config.defaults.track if set").option("--delivery <delivery>", "Filter by delivery membership when no id is provided").option("--executor <executor>", "Filter by executor (human|ai|ci|hybrid) when no id is provided").option("--today <date>", "Evaluation date (YYYY-MM-DD) when no id is provided").option("--promote", "Promote the task in the current track/version context before starting it").option("--to <assignee>", "Assign the task before starting it").option("--claim", "Assign the task to the actor/user/default author before starting it").option("--actor <actor>", "Actor performing assignment/transition").option("--user <user>", "Current user for advisory authorization checks").option("--force", "Override advisory authorization checks").action(async (id, options) => {
     const root = resolveRepoRoot();
     printResolvedSelectionContext(root, options);
     const taskId = id?.trim() || selectTopReadyTask(root, {
@@ -6775,7 +7363,7 @@ import { IdeaStatus as IdeaStatus3, TaskPriority as TaskPriority3, TaskStatus as
 function collect(value, previous = []) {
   return [...previous, value];
 }
-function unique2(items) {
+function unique3(items) {
   return [...new Set(items.map((item) => item.trim()).filter(Boolean))];
 }
 function removeValues(source, values) {
@@ -6785,7 +7373,7 @@ function removeValues(source, values) {
   return next.length > 0 ? next : void 0;
 }
 function addValues(source, values) {
-  const next = unique2([...source ?? [], ...values ?? []]);
+  const next = unique3([...source ?? [], ...values ?? []]);
   return next.length > 0 ? next : void 0;
 }
 function loadBody(options) {
@@ -6867,13 +7455,13 @@ function updateTask(id, options) {
     tests_required: addValues(removeValues(next.tests_required, options.testsRemove), options.testsAdd)
   };
   next = clearTrackPriorityOverrides(applyTrackPriorityOverrides(next, options.priorityIn), options.clearPriorityIn);
-  validateTaskForWrite(next, filePath);
+  next = validateTaskForWrite(root, next, filePath);
   const nextBody = loadBody(options) ?? parsed.body;
   if (options.dryRun) {
     console.log(renderTaskPreview(next, nextBody).trimEnd());
     return;
   }
-  writeTaskEntry(filePath, parsed, next, nextBody);
+  writeTaskEntry(root, filePath, parsed, next, nextBody);
   console.log(`Updated ${next.id}`);
 }
 function updateIdea(id, options) {
@@ -6899,7 +7487,7 @@ function updateIdea(id, options) {
   console.log(`Updated ${next.id}`);
 }
 function registerUpdateCommand(program) {
-  program.command("update").description("Update an existing COOP task or idea").argument("<id-or-type>", "Task or idea id/alias, or an explicit entity type").argument("[id]", "Entity id when an explicit type is provided").option("--title <title>").option("--priority <priority>").option("--status <status>").option("--assign <user>").option("--track <id>").option("--delivery <id>").option("--story-points <n>").option("--planned-hours <n>").option("--add-delivery-track <id>", "", collect, []).option("--remove-delivery-track <id>", "", collect, []).option("--priority-in <track:priority>", "", collect, []).option("--clear-priority-in <track>", "", collect, []).option("--add-dep <id>", "", collect, []).option("--remove-dep <id>", "", collect, []).option("--add-tag <tag>", "", collect, []).option("--remove-tag <tag>", "", collect, []).option("--add-fix-version <v>", "", collect, []).option("--remove-fix-version <v>", "", collect, []).option("--add-released-in <v>", "", collect, []).option("--remove-released-in <v>", "", collect, []).option("--acceptance-add <text>", "", collect, []).option("--acceptance-remove <text>", "", collect, []).option("--tests-add <text>", "", collect, []).option("--tests-remove <text>", "", collect, []).option("--add-linked-task <id>", "", collect, []).option("--remove-linked-task <id>", "", collect, []).option("--body-file <path>").option("--body-stdin").option("--dry-run").action((first, second, options) => {
+  program.command("update").description("Update an existing COOP task or idea").argument("<id-or-type>", "Task or idea id/alias, or an explicit entity type").argument("[id]", "Entity id when an explicit type is provided").option("--title <title>").option("--priority <priority>").option("--status <status>").option("--assign <user>").option("--track <id>", "Set the task home/origin track").option("--delivery <id>", "Set the task primary delivery id").option("--story-points <n>").option("--planned-hours <n>").option("--add-delivery-track <id>", "", collect, []).option("--remove-delivery-track <id>", "", collect, []).option("--priority-in <track:priority>", "", collect, []).option("--clear-priority-in <track>", "", collect, []).option("--add-dep <id>", "", collect, []).option("--remove-dep <id>", "", collect, []).option("--add-tag <tag>", "", collect, []).option("--remove-tag <tag>", "", collect, []).option("--add-fix-version <v>", "", collect, []).option("--remove-fix-version <v>", "", collect, []).option("--add-released-in <v>", "", collect, []).option("--remove-released-in <v>", "", collect, []).option("--acceptance-add <text>", "", collect, []).option("--acceptance-remove <text>", "", collect, []).option("--tests-add <text>", "", collect, []).option("--tests-remove <text>", "", collect, []).option("--add-linked-task <id>", "", collect, []).option("--remove-linked-task <id>", "", collect, []).option("--body-file <path>").option("--body-stdin").option("--dry-run").action((first, second, options) => {
     let resolved = resolveOptionalEntityArg(first, second, ["task", "idea"], "task");
     if (!second && resolved.entity === "task") {
       try {
@@ -6923,9 +7511,17 @@ function registerUpdateCommand(program) {
 
 // src/commands/use.ts
 function printContext(values) {
-  console.log(`Track: ${values.track ?? "-"}`);
-  console.log(`Delivery: ${values.delivery ?? "-"}`);
-  console.log(`Version: ${values.version ?? "-"}`);
+  const track = values.track?.trim() || "unset";
+  const delivery = values.delivery?.trim() || "unset";
+  const version = values.version?.trim() || "unset";
+  console.log("Working Context:");
+  console.log(`- Track: ${track}`);
+  console.log(`- Delivery: ${delivery}`);
+  console.log(`- Version: ${version}`);
+  if (track === "unset" && delivery === "unset" && version === "unset") {
+    console.log("");
+    console.log("Hint: use `coop use track <id>`, `coop use delivery <id>`, or `coop use version <id>`.");
+  }
 }
 function registerUseCommand(program) {
   const use = program.command("use").description("Manage user-local working defaults for the current COOP project");
@@ -6935,11 +7531,19 @@ function registerUseCommand(program) {
   });
   use.command("track").description("Set the default working track").argument("<id>", "Track id").action((id) => {
     const root = resolveRepoRoot();
-    printContext(updateWorkingContext(root, resolveCoopHome(), { track: id }));
+    const trackId = resolveExistingTrackId(root, id);
+    if (!trackId) {
+      throw new Error(`Unknown track '${id}'. Create it first with \`coop create track --id ${id} --name "${id}"\` or use \`unassigned\`.`);
+    }
+    printContext(updateWorkingContext(root, resolveCoopHome(), { track: trackId }));
   });
   use.command("delivery").description("Set the default working delivery").argument("<id>", "Delivery id").action((id) => {
     const root = resolveRepoRoot();
-    printContext(updateWorkingContext(root, resolveCoopHome(), { delivery: id }));
+    const deliveryId = resolveExistingDeliveryId(root, id);
+    if (!deliveryId) {
+      throw new Error(`Unknown delivery '${id}'. Create it first with \`coop create delivery --id ${id} --name "${id}"\`.`);
+    }
+    printContext(updateWorkingContext(root, resolveCoopHome(), { delivery: deliveryId }));
   });
   use.command("version").description("Set the default working version").argument("<id>", "Version label").action((id) => {
     const root = resolveRepoRoot();
@@ -7352,16 +7956,16 @@ function chooseFieldValue(key, baseValue, oursValue, theirsValue, oursUpdated, t
 }
 function mergeTaskFrontmatter(base, ours, theirs) {
   const keys = /* @__PURE__ */ new Set([...Object.keys(base), ...Object.keys(ours), ...Object.keys(theirs)]);
-  const output3 = {};
+  const output2 = {};
   const oursUpdated = asTimestamp(ours.updated);
   const theirsUpdated = asTimestamp(theirs.updated);
   for (const key of keys) {
     const merged = chooseFieldValue(key, base[key], ours[key], theirs[key], oursUpdated, theirsUpdated);
     if (merged !== void 0) {
-      output3[key] = merged;
+      output2[key] = merged;
     }
   }
-  return output3;
+  return output2;
 }
 function mergeTextWithGit(ancestor, ours, theirs) {
   const result = spawnSync5("git", ["merge-file", "-p", ours, ancestor, theirs], {
@@ -7392,8 +7996,8 @@ function mergeTaskFile(ancestorPath, oursPath, theirsPath) {
     fs21.writeFileSync(oursBody, ours.body, "utf8");
     fs21.writeFileSync(theirsBody, theirs.body, "utf8");
     const mergedBody = mergeTextWithGit(ancestorBody, oursBody, theirsBody);
-    const output3 = stringifyFrontmatter6(mergedFrontmatter, mergedBody.output);
-    fs21.writeFileSync(oursPath, output3, "utf8");
+    const output2 = stringifyFrontmatter6(mergedFrontmatter, mergedBody.output);
+    fs21.writeFileSync(oursPath, output2, "utf8");
     return mergedBody.ok ? 0 : 1;
   } finally {
     fs21.rmSync(tempDir, { recursive: true, force: true });
@@ -7422,6 +8026,28 @@ function runMergeDriver(kind, ancestorPath, oursPath, theirsPath) {
   return mergeTaskFile(ancestorPath, oursPath, theirsPath);
 }
 
+// src/utils/basic-help.ts
+function renderBasicHelp() {
+  return [
+    "COOP Basics",
+    "",
+    "Day-to-day commands:",
+    "- `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 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",
+    "- `coop update <id> --track <id> --delivery <id>`: update task metadata",
+    '- `coop comment <id> --message "..."`: append a task comment',
+    "- `coop log-time <id> --hours 2 --kind worked`: append time spent",
+    "- `coop review task <id>` / `coop complete task <id>`: move work through lifecycle",
+    "- `coop help-ai --initial-prompt --strict --repo C:/path/to/repo --delivery MVP --command coop.cmd`: hand off COOP context to an agent",
+    "",
+    "Use `coop <command> --help` for detailed flags."
+  ].join("\n");
+}
+
 // src/utils/not-implemented.ts
 function printNotImplemented(command, phase) {
   console.log(`${command}: Not yet implemented - coming in Phase ${phase}.`);
@@ -7447,9 +8073,16 @@ function createProgram() {
   const program = new Command();
   program.name("coop");
   program.version(readVersion());
-  program.description("COOP CLI");
+  program.description("COOP CLI for Git-native planning, backlog management, task execution, and delivery workflows.");
   program.option("--verbose", "Print stack traces for command errors");
   program.option("-p, --project <id>", "Select the active COOP project");
+  program.addHelpText("after", `
+Common day-to-day commands:
+  coop basics
+  coop current
+  coop next task
+  coop show <id>
+`);
   registerInitCommand(program);
   registerCreateCommand(program);
   registerCurrentCommand(program);
@@ -7485,6 +8118,9 @@ function createProgram() {
   registerViewCommand(program);
   registerWebhookCommand(program);
   registerPhasePlaceholder(program, "ext", 3, "Plugin extension commands");
+  program.command("basics").alias("help-basic").description("Show the small set of COOP commands that cover most day-to-day work").action(() => {
+    console.log(renderBasicHelp());
+  });
   const hooks = program.command("hook");
   hooks.command("pre-commit").option("--repo <path>", "Repository root", process.cwd()).action((options) => {
     const repoRoot = options.repo ?? process.cwd();