schub 0.1.10 → 0.1.11

package/README.md

@@ -64,9 +64,9 @@ schub proposals pull --proposal-id P0003
 - `schub tickets create` - Create a ticket from the ticket template.
 - `schub tickets list` - List all tickets in the current project context.
 - `schub tickets check` - Toggle a checklist item in a ticket.
-- `schub tickets update` - Move backlog tickets to `reviewed`, `rejected`, or `archived`.
+- `schub tickets update` - Move backlog tickets to any ticket status configured for the project in DB.
 - `schub tickets implement` - Move a ticket to `wip` and launch Opencode.
-- `schub ticket save` - Validate and save a ticket to DB/storage.
+- `schub tickets save` - Validate and save a ticket to DB/storage.
 
 ##### Ticket implementation
 
@@ -93,7 +93,7 @@ schub tickets update --id T0004 --id T0005 --status reviewed
 ```
 
 - `--id` (repeatable) selects backlog ticket IDs to move.
-- `--status` sets the target status: `reviewed`, `rejected`, or `archived`.
+- `--status` sets the target status and must match a project ticket status in DB.
 
 ##### Overview view shortcut
 

package/dist/index.js

@@ -31367,7 +31367,7 @@ var require_core = __commonJS((exports, module) => {
     return match && match.index === 0;
   }
   var BACKREF_RE = /\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;
-  function join20(regexps, separator = "|") {
+  function join21(regexps, separator = "|") {
     let numCaptures = 0;
     return regexps.map((regex2) => {
       numCaptures += 1;
@@ -31650,7 +31650,7 @@ var require_core = __commonJS((exports, module) => {
           this.exec = () => null;
         }
         const terminators = this.regexes.map((el) => el[1]);
-        this.matcherRe = langRe(join20(terminators), true);
+        this.matcherRe = langRe(join21(terminators), true);
         this.lastIndex = 0;
       }
       exec(s) {
@@ -84477,7 +84477,7 @@ var parseProposalsListOptions = (args) => {
 `);
     return;
   }
-  const lines = proposals.map((proposal) => `${proposal.id} ${proposal.title}`);
+  const lines = proposals.map((proposal) => `${proposal.id} ${proposal.input}`);
   process.stdout.write(`${lines.join(`
 `)}
 `);
@@ -84486,8 +84486,7 @@ var parseProposalsListOptions = (args) => {
   const services = await createCliServices(options2.dbPath);
   const proposal = services.proposals.create(options2.projectId, {
     agent: "opencode",
-    title: options2.title,
-    description: options2.description
+    input: options2.title
   });
   process.stdout.write(`[OK] Created proposal ${proposal.id}
 `);
@@ -90778,12 +90777,12 @@ var runApi = (startDir, options = {}) => {
 };
 
 // src/commands/changes.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync6, readdirSync as readdirSync7, readFileSync as readFileSync10, rmSync as rmSync3, writeFileSync as writeFileSync6 } from "node:fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync5, readdirSync as readdirSync7, readFileSync as readFileSync10, rmSync as rmSync3, writeFileSync as writeFileSync6 } from "node:fs";
 import { dirname as dirname7, join as join12, relative as relative5 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 
 // src/features/changes/index.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync5, readdirSync as readdirSync6, readFileSync as readFileSync9, renameSync as renameSync2, rmSync as rmSync2, statSync as statSync8, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4, readdirSync as readdirSync6, readFileSync as readFileSync9, renameSync, rmSync as rmSync2, statSync as statSync8, writeFileSync as writeFileSync5 } from "node:fs";
 import { dirname as dirname6, join as join11, relative as relative4 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 
@@ -91039,8 +91038,17 @@ var toggleChecklistItem = (content, itemNumber) => {
   throw new Error(`Checklist item ${itemNumber} not found.`);
 };
 // src/features/tickets/backlog/constants.ts
-var TICKET_STATUSES = ["backlog", "reviewed", "wip", "blocked", "done", "rejected", "archived"];
-var DEFAULT_TICKET_STATUSES = ["backlog", "reviewed", "wip", "blocked", "done", "archived"];
+var TICKET_STATUSES = [
+  "backlog",
+  "ready",
+  "reviewed",
+  "wip",
+  "blocked",
+  "done",
+  "rejected",
+  "archived"
+];
+var DEFAULT_TICKET_STATUSES = ["backlog", "ready", "reviewed", "wip", "blocked", "done", "archived"];
 // src/features/tickets/backlog/create.ts
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
@@ -91159,8 +91167,8 @@ var resolveChangeSource = (rootDir, changeIdInput) => {
 var BUNDLED_TICKET_TEMPLATE_PATH = fileURLToPath2(new URL("../../../templates/create-tickets/ticket-template.md", import.meta.url));
 var lockWaitHandle = new Int32Array(new SharedArrayBuffer(4));
 // src/features/tickets/backlog/filesystem.ts
-import { existsSync as existsSync2, mkdirSync, readdirSync as readdirSync4, readFileSync as readFileSync5, renameSync, statSync as statSync6, writeFileSync } from "node:fs";
-import { basename as basename3, dirname as dirname5, join as join6, relative as relative2, resolve as resolve7 } from "node:path";
+import { existsSync as existsSync2, readdirSync as readdirSync4, readFileSync as readFileSync5, statSync as statSync6, writeFileSync } from "node:fs";
+import { dirname as dirname5, join as join6, relative as relative2, resolve as resolve7 } from "node:path";
 
 // src/features/tickets/backlog/sorting.ts
 var ticketNumber = (id) => {
@@ -91198,22 +91206,43 @@ var findSchubRoot = (startDir = process.cwd()) => {
     current = parent;
   }
 };
-var parseTicketFilename = (fileName) => {
-  if (!fileName.endsWith(".md")) {
-    return null;
+var isTicketFolder = (dirPath, fileName) => {
+  const match = fileName.match(/^(TK\d+)_(.+)$/);
+  if (!match)
+    return false;
+  const ticketMdPath = join6(dirPath, fileName, "ticket.md");
+  try {
+    return existsSync2(ticketMdPath) && statSync6(ticketMdPath).isFile();
+  } catch {
+    return false;
   }
-  const baseName = fileName.slice(0, -3);
-  const underscoreIndex = baseName.indexOf("_");
-  if (underscoreIndex <= 0) {
+};
+var parseTicketFolderName = (folderName) => {
+  const underscoreIndex = folderName.indexOf("_");
+  if (underscoreIndex <= 0)
     return null;
-  }
-  const id = baseName.slice(0, underscoreIndex);
-  if (!/^(T|TK)\d+$/.test(id)) {
+  const id = folderName.slice(0, underscoreIndex);
+  if (!/^TK\d+$/.test(id))
     return null;
-  }
-  const titleSlug = baseName.slice(underscoreIndex + 1);
+  const titleSlug = folderName.slice(underscoreIndex + 1);
   return { id, title: titleSlug.replace(/-/g, " ") };
 };
+var getTicketFilePath = (ticketsRoot, folderName) => {
+  return join6(ticketsRoot, folderName, "ticket.md");
+};
+var parseTicketStatus = (value) => {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "in_review") {
+    return "reviewed";
+  }
+  if (TICKET_STATUSES.includes(normalized)) {
+    return normalized;
+  }
+  return null;
+};
 var parseChecklistCounts = (content) => {
   const lines = content.split(/\r?\n/);
   let inSteps = false;
@@ -91268,10 +91297,11 @@ var parseTicketFile = (filePath, fallback) => {
   try {
     content = readFileSync5(filePath, "utf8");
   } catch {
-    return { ...fallback, dependsOn: [] };
+    return { ...fallback, status: "backlog", dependsOn: [] };
   }
   const title = extractTitle(content, fallback.id);
   const { data } = readFrontmatter(content);
+  const status = parseTicketStatus(data.status) ?? "backlog";
   const changeIdValue = data.change_id;
   const changeId = typeof changeIdValue === "string" ? changeIdValue.trim() : undefined;
   const dependsValue = data.depends_on;
@@ -91287,6 +91317,7 @@ var parseTicketFile = (filePath, fallback) => {
   return {
     id: fallback.id,
     title,
+    status,
     dependsOn,
     changeId,
     blockedReason: blockedReason || undefined,
@@ -91301,33 +91332,29 @@ var loadTicketFiles = (schubDir, statuses = DEFAULT_TICKET_STATUSES) => {
   const allowed = new Set(statuses);
   const repoRoot = dirname5(schubDir);
   const tickets = [];
-  for (const status of TICKET_STATUSES) {
-    if (!allowed.has(status)) {
+  const entries = readdirSync4(ticketsRoot, { withFileTypes: true });
+  for (const entry of entries) {
+    if (!entry.isDirectory()) {
       continue;
     }
-    const statusDir = join6(ticketsRoot, status);
-    if (!existsSync2(statusDir) || !isDirectory3(statusDir)) {
+    if (!isTicketFolder(ticketsRoot, entry.name)) {
       continue;
     }
-    const entries = readdirSync4(statusDir, { withFileTypes: true });
-    for (const entry of entries) {
-      if (!entry.isFile()) {
-        continue;
-      }
-      const parsed = parseTicketFilename(entry.name);
-      if (!parsed) {
-        continue;
-      }
-      const filePath = join6(statusDir, entry.name);
-      const parsedFile = parseTicketFile(filePath, parsed);
-      tickets.push({
-        id: parsed.id,
-        title: parsed.title,
-        status,
-        path: relative2(repoRoot, filePath),
-        parsedFile
-      });
+    const parsed = parseTicketFolderName(entry.name);
+    if (!parsed)
+      continue;
+    const filePath = getTicketFilePath(ticketsRoot, entry.name);
+    const parsedFile = parseTicketFile(filePath, parsed);
+    if (!allowed.has(parsedFile.status)) {
+      continue;
     }
+    tickets.push({
+      id: parsed.id,
+      title: parsed.title,
+      status: parsedFile.status,
+      path: relative2(repoRoot, filePath),
+      parsedFile
+    });
   }
   return tickets;
 };
@@ -91398,21 +91425,43 @@ var clearTicketsForChange = (schubDir, changeId) => {
   }
   return cleared;
 };
-var updateTicketStatuses = (schubDir, ticketIds, status) => {
-  const ticketsRoot = join6(schubDir, "tickets");
-  const targetRoot = join6(ticketsRoot, status);
-  mkdirSync(targetRoot, { recursive: true });
+var updateTicketFileStatus = (ticketPath, status, blockedReason) => {
+  const frontmatterStatus = status === "reviewed" ? "in_review" : status;
+  const content = readFileSync5(ticketPath, "utf8");
+  let updated = content;
+  try {
+    updated = updateFrontmatterValue(content, "status", frontmatterStatus);
+  } catch {
+    updated = ensureFrontmatterValue(content, "status", frontmatterStatus);
+  }
+  if (blockedReason !== undefined) {
+    try {
+      updated = updateFrontmatterValue(updated, "blocked_reason", blockedReason);
+    } catch {
+      updated = ensureFrontmatterValue(updated, "blocked_reason", blockedReason);
+    }
+  } else if (status !== "blocked") {
+    try {
+      updated = updateFrontmatterValue(updated, "blocked_reason", "");
+    } catch {}
+  }
+  if (updated !== content) {
+    writeFileSync(ticketPath, updated, "utf8");
+  }
+};
+var updateTicketStatuses = (schubDir, ticketIds, status, blockedReason) => {
   const repoRoot = dirname5(schubDir);
-  const sourceTickets = listTickets(schubDir, ["backlog", "reviewed"]);
+  const sourceTickets = listTickets(schubDir, TICKET_STATUSES);
   const ticketsById = new Map(sourceTickets.map((ticket) => [ticket.id, ticket]));
   return ticketIds.map((ticketId) => ticketsById.get(ticketId)).filter((ticket) => Boolean(ticket)).map((ticket) => {
     const currentPath = join6(repoRoot, ticket.path);
-    const nextPath = join6(targetRoot, basename3(ticket.path));
-    renameSync(currentPath, nextPath);
+    updateTicketFileStatus(currentPath, status, blockedReason);
+    const updatedReason = blockedReason !== undefined ? blockedReason : status === "blocked" ? ticket.blockedReason : undefined;
     return {
       ...ticket,
       status,
-      path: relative2(repoRoot, nextPath)
+      path: ticket.path,
+      blockedReason: updatedReason
     };
   });
 };
@@ -91422,54 +91471,28 @@ var assignTicketToWip = (schubDir, ticketId) => {
   if (!normalizedId) {
     throw new Error("Provide --id.");
   }
-  const ticketsRoot = join6(schubDir, "tickets");
-  const targetRoot = join6(ticketsRoot, "wip");
-  mkdirSync(targetRoot, { recursive: true });
   const repoRoot = dirname5(schubDir);
-  for (const status of ACTIVE_TICKET_STATUSES) {
-    const statusDir = join6(ticketsRoot, status);
-    if (!existsSync2(statusDir) || !isDirectory3(statusDir)) {
-      continue;
-    }
-    const entries = readdirSync4(statusDir, { withFileTypes: true });
-    for (const entry of entries) {
-      if (!entry.isFile()) {
-        continue;
-      }
-      const parsed = parseTicketFilename(entry.name);
-      if (!parsed || parsed.id !== normalizedId) {
-        continue;
-      }
-      const currentPath = join6(statusDir, entry.name);
-      const nextPath = join6(targetRoot, entry.name);
-      if (currentPath !== nextPath) {
-        renameSync(currentPath, nextPath);
-      }
-      return {
-        id: parsed.id,
-        title: parsed.title,
-        status: "wip",
-        path: relative2(repoRoot, nextPath)
-      };
-    }
+  const ticket = listTickets(schubDir, ACTIVE_TICKET_STATUSES).find((active) => active.id === normalizedId);
+  if (!ticket) {
+    throw new Error(`Ticket ${normalizedId} not found.`);
   }
-  throw new Error(`Ticket ${normalizedId} not found.`);
+  updateTicketFileStatus(join6(repoRoot, ticket.path), "wip");
+  return {
+    ...ticket,
+    status: "wip"
+  };
 };
 var archiveTicketsForChange = (schubDir, changeId) => {
   const normalizedChangeId = changeId.trim();
-  const ticketsRoot = join6(schubDir, "tickets");
-  const archiveRoot = join6(ticketsRoot, "archived");
-  mkdirSync(archiveRoot, { recursive: true });
   const repoRoot = dirname5(schubDir);
   const tickets = loadTicketDependencies(schubDir, ACTIVE_TICKET_STATUSES).filter((ticket) => ticket.changeId === normalizedChangeId);
   return tickets.map((ticket) => {
     const currentPath = join6(repoRoot, ticket.path);
-    const archivePath = join6(archiveRoot, basename3(ticket.path));
-    renameSync(currentPath, archivePath);
+    updateTicketFileStatus(currentPath, "archived");
     return {
       ...ticket,
       status: "archived",
-      path: relative2(repoRoot, archivePath)
+      path: ticket.path
     };
   });
 };
@@ -91508,7 +91531,7 @@ var hasUnimplementedTemplateTokens = (content) => {
 };
 // src/features/tickets/backlog/worktree.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync4, mkdirSync as mkdirSync3 } from "node:fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync2 } from "node:fs";
 import { join as join8, resolve as resolve9 } from "node:path";
 
 // src/helpers/git.ts
@@ -91528,7 +91551,7 @@ var resolveGitRoot = (startDir) => {
 };
 
 // src/features/config/project-config.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync6, writeFileSync as writeFileSync2 } from "node:fs";
 import { join as join7 } from "node:path";
 var readProjectConfig = (rootDir) => {
   const configPath = join7(rootDir, ".schub", "config.json");
@@ -91546,7 +91569,7 @@ var writeProjectConfig = (rootDir, projectId) => {
     throw new Error("Provide project_id.");
   }
   const configDir = join7(rootDir, ".schub");
-  mkdirSync2(configDir, { recursive: true });
+  mkdirSync(configDir, { recursive: true });
   const configPath = join7(configDir, "config.json");
   const payload = { project_id: projectId };
   writeFileSync2(configPath, `${JSON.stringify(payload, null, 2)}
@@ -91589,7 +91612,7 @@ var createTicketWorktree = ({ repoRoot, ticketId, projectId, worktreeRoot }) =>
   if (branchCheck.status === 0) {
     throw new Error(`Branch ${branchName} already exists.`);
   }
-  mkdirSync3(resolvedRoot, { recursive: true });
+  mkdirSync2(resolvedRoot, { recursive: true });
   const worktreeResult = runGit(gitRoot, ["worktree", "add", "-b", branchName, worktreePath]);
   if (worktreeResult.status !== 0) {
     const message = worktreeResult.stderr?.trim();
@@ -91599,7 +91622,7 @@ var createTicketWorktree = ({ repoRoot, ticketId, projectId, worktreeRoot }) =>
   return { worktreePath, branchName, gitRoot };
 };
 // src/features/tickets/create.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readdirSync as readdirSync5, readFileSync as readFileSync7, rmSync, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync3, readdirSync as readdirSync5, readFileSync as readFileSync7, rmSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { join as join9 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 var BUNDLED_TICKET_TEMPLATE_PATH2 = fileURLToPath3(new URL("../../../templates/create-ticket/ticket-template.md", import.meta.url));
@@ -91618,7 +91641,7 @@ var waitForCreateTicketsLock = () => {
 };
 var acquireCreateTicketsLock = (schubDir) => {
   const ticketsRoot = join9(schubDir, "tickets");
-  mkdirSync4(ticketsRoot, { recursive: true });
+  mkdirSync3(ticketsRoot, { recursive: true });
   const lockPath = join9(ticketsRoot, ".create-tickets.lock");
   while (true) {
     try {
@@ -91637,16 +91660,15 @@ var acquireCreateTicketsLock = (schubDir) => {
   };
 };
 var TICKET_PREFIX = "TK";
-var TICKET_PATTERN = new RegExp(`^${TICKET_PREFIX}(\\d+)(?:_.*)?\\.md$`);
 var nextTicketId = (ticketsRoot) => {
   const existingNumbers = new Set;
   if (existsSync5(ticketsRoot)) {
     const entries = readdirSync5(ticketsRoot, { withFileTypes: true });
     for (const entry of entries) {
-      if (entry.isDirectory()) {
+      if (!entry.isDirectory()) {
         continue;
       }
-      const match = entry.name.match(TICKET_PATTERN);
+      const match = entry.name.match(/^TK(\d+)_/);
       if (!match) {
         continue;
       }
@@ -91673,17 +91695,19 @@ var createTicket2 = (schubDir, templateRoot, options) => {
     const ticketsRoot = join9(schubDir, "tickets");
     const ticketId = nextTicketId(ticketsRoot);
     const slug = title.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-    const ticketPath = join9(ticketsRoot, `${ticketId}_${slug}.md`);
+    const ticketFolderName = `${ticketId}_${slug}`;
+    const ticketFolderPath = join9(ticketsRoot, ticketFolderName);
+    const ticketFilePath = join9(ticketFolderPath, "ticket.md");
     const template = readTicketTemplate(templateRoot);
     const today = new Date().toISOString().split("T")[0];
     const complexity = (options.complexity || "[low|medium|high]").trim();
     const rendered = template.replaceAll("{{TICKET_ID}}", ticketId).replace("{{TICKET_TITLE}}", title).replace("{{DATE}}", today).replace("{{STATUS}}", status).replace("[low|medium|high]", complexity).replace("{{INPUT}}", input).replace("{{CHANGE_ID}}", changeId);
-    if (existsSync5(ticketPath) && !options.overwrite) {
-      throw new Error(`Refusing to overwrite existing file: ${ticketPath}`);
+    if (existsSync5(ticketFilePath) && !options.overwrite) {
+      throw new Error(`Refusing to overwrite existing file: ${ticketFilePath}`);
     }
-    mkdirSync4(ticketsRoot, { recursive: true });
-    writeFileSync3(ticketPath, rendered, "utf8");
-    return ticketPath;
+    mkdirSync3(ticketFolderPath, { recursive: true });
+    writeFileSync3(ticketFilePath, rendered, "utf8");
+    return ticketFilePath;
   } finally {
     releaseLock();
   }
@@ -91887,9 +91911,9 @@ Add a 'status' field in frontmatter before updating status.`);
     if (existsSync6(archivePath)) {
       throw new Error(`Archive already exists: ${archivePath}`);
     }
-    mkdirSync5(archiveRoot, { recursive: true });
+    mkdirSync4(archiveRoot, { recursive: true });
     writeFileSync5(summary.proposalPath, updated, "utf8");
-    renameSync2(summary.changeDir, archivePath);
+    renameSync(summary.changeDir, archivePath);
     return {
       changeId: summary.changeId,
       proposalPath: join11(archivePath, "proposal.md"),
@@ -91901,9 +91925,9 @@ Add a 'status' field in frontmatter before updating status.`);
     if (existsSync6(activePath)) {
       throw new Error(`Change already exists: ${activePath}`);
     }
-    mkdirSync5(join11(schubDir, "proposals"), { recursive: true });
+    mkdirSync4(join11(schubDir, "proposals"), { recursive: true });
     writeFileSync5(summary.proposalPath, updated, "utf8");
-    renameSync2(summary.changeDir, activePath);
+    renameSync(summary.changeDir, activePath);
     return {
       changeId: summary.changeId,
       proposalPath: join11(activePath, "proposal.md"),
@@ -91949,7 +91973,7 @@ var saveChange = (changeRoot, schubRoot, changeId) => {
   const summary = readChangeSummary(changeRoot, changeId);
   const sourceDir = summary.changeDir;
   const targetDir = join11(schubRoot, "proposals", summary.changeId);
-  mkdirSync5(targetDir, { recursive: true });
+  mkdirSync4(targetDir, { recursive: true });
   const reviewPath = join11(sourceDir, "REVIEW_ME.md");
   const targetReviewPath = join11(targetDir, "REVIEW_ME.md");
   const hasReviewFile = existsSync6(reviewPath) || existsSync6(targetReviewPath);
@@ -91994,7 +92018,7 @@ var loadChange = (changeRoot, schubRoot, changeId) => {
   const archiveDir = join11(schubRoot, "archive", "proposals", source.changeId);
   const targetDir = shouldArchive ? archiveDir : activeDir;
   const staleDir = shouldArchive ? activeDir : archiveDir;
-  mkdirSync5(targetDir, { recursive: true });
+  mkdirSync4(targetDir, { recursive: true });
   const loaded = [];
   const removed = [];
   for (const fileName of CHANGE_SAVE_FILES) {
@@ -92149,7 +92173,7 @@ var createChange = (schubDir, options) => {
   if (existsSync6(proposalPath) && !options.overwrite) {
     throw new Error(`Refusing to overwrite existing file: ${proposalPath}`);
   }
-  mkdirSync5(changeDir, { recursive: true });
+  mkdirSync4(changeDir, { recursive: true });
   writeFileSync5(proposalPath, normalized, "utf8");
   return proposalPath;
 };
@@ -92853,7 +92877,7 @@ var pullChangeFromServices = async (schubRoot, changeIdInput, services, projectI
   for (const directory of existingDirs) {
     rmSync3(directory, { recursive: true, force: true });
   }
-  mkdirSync6(targetDir, { recursive: true });
+  mkdirSync5(targetDir, { recursive: true });
   const writtenFiles = new Set;
   writeFileSync6(join12(targetDir, "proposal.md"), proposalContent, "utf8");
   writtenFiles.add("proposal.md");
@@ -92862,7 +92886,7 @@ var pullChangeFromServices = async (schubRoot, changeIdInput, services, projectI
       continue;
     }
     const outputPath = join12(targetDir, file.file_name);
-    mkdirSync6(dirname7(outputPath), { recursive: true });
+    mkdirSync5(dirname7(outputPath), { recursive: true });
     const data2 = readFileSync10(file.storage_path);
     writeFileSync6(outputPath, data2);
     writtenFiles.add(file.file_name);
@@ -93170,7 +93194,7 @@ var prepareDashboardApiEnv = async (env2, options = {}) => {
 };
 
 // src/commands/review.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync7, readFileSync as readFileSync12, unlinkSync, writeFileSync as writeFileSync7 } from "node:fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync12, unlinkSync, writeFileSync as writeFileSync7 } from "node:fs";
 import { dirname as dirname9, join as join14, resolve as resolve11 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 var BUNDLED_REVIEW_TEMPLATE_PATH = fileURLToPath6(new URL("../../templates/review-proposal/review-me-template.md", import.meta.url));
@@ -93248,7 +93272,7 @@ var runReviewComplete = (args, startDir) => {
 };
 
 // src/commands/template.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync8, readFileSync as readFileSync13, writeFileSync as writeFileSync8 } from "node:fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync7, readFileSync as readFileSync13, writeFileSync as writeFileSync8 } from "node:fs";
 import { dirname as dirname10, join as join15 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 var BUNDLED_ADR_TEMPLATE_PATH = fileURLToPath7(new URL("../../templates/create-proposal/adr-template.md", import.meta.url));
@@ -93380,14 +93404,14 @@ var runTemplateCreate = (args, startDir) => {
   const templatePath = resolveTemplatePath(schubDir, definition.templatePath, definition.bundledPath);
   const template = readFileSync13(templatePath, "utf8");
   const rendered = definition.render(template, summary, options);
-  mkdirSync8(dirname10(outputPath), { recursive: true });
+  mkdirSync7(dirname10(outputPath), { recursive: true });
   writeFileSync8(outputPath, rendered, "utf8");
   process.stdout.write(`[OK] Wrote template ${options.name}: ${outputPath}
 `);
 };
 
 // src/commands/tickets.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync9, readdirSync as readdirSync8, writeFileSync as writeFileSync9 } from "node:fs";
+import { existsSync as existsSync10, mkdirSync as mkdirSync8, readdirSync as readdirSync8, writeFileSync as writeFileSync9 } from "node:fs";
 import { dirname as dirname11, join as join16 } from "node:path";
 var parseTicketsCreateOptions = (args) => {
   let title;
@@ -93567,10 +93591,6 @@ var runTicketsSave = async (options, startDir) => {
   process.stdout.write(`[OK] Saved ticket: ${saved.path}
 `);
 };
-var frontmatterString2 = (data, key) => {
-  const value = data[key];
-  return typeof value === "string" ? value.trim() : undefined;
-};
 var runTicketsPull = async (startDir) => {
   const schubDir = resolveSchubRoot(startDir);
   const { dbPath, storagePath } = resolveServicesConfig2(schubDir);
@@ -93579,24 +93599,40 @@ var runTicketsPull = async (startDir) => {
   const tickets = services.tickets.list(projectId);
   const activeTickets = tickets.filter((ticket) => ticket.archived !== 1);
   const ticketsRoot = join16(schubDir, "tickets");
-  mkdirSync9(ticketsRoot, { recursive: true });
+  mkdirSync8(ticketsRoot, { recursive: true });
   for (const ticket of activeTickets) {
     if (!ticket.content)
       continue;
-    const { data } = readFrontmatter(ticket.content);
-    const ticketId = frontmatterString2(data, "ticket_id") || ticket.id;
     const titleMatch = ticket.content.match(/^#+\s+(.*)$/m);
-    const title = titleMatch?.[1]?.trim() || "Untitled";
-    const slug = title.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-    const fileName = `${ticketId}${slug ? `_${slug}` : ""}.md`;
-    const filePath = join16(ticketsRoot, fileName);
+    let title = titleMatch?.[1]?.trim();
+    if (!title) {
+      const firstLine = ticket.content.split(`
+`)[0]?.trim();
+      title = firstLine || "untitled";
+    }
+    if (title.startsWith("Ticket:")) {
+      title = title.replace(/^Ticket:\s*\w+\s*/, "").trim() || "untitled";
+    }
+    const baseSlug = title.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+    let slug = baseSlug.slice(0, 50);
+    if (baseSlug.length > 50 && !slug.endsWith("-")) {
+      const lastHyphen = slug.lastIndexOf("-");
+      if (lastHyphen > 0) {
+        slug = slug.slice(0, lastHyphen);
+      }
+    }
+    const folderName = `${ticket.shorthand}_${slug}`;
+    const folderPath = join16(ticketsRoot, folderName);
+    mkdirSync8(folderPath, { recursive: true });
+    const filePath = join16(folderPath, "ticket.md");
     writeFileSync9(filePath, ticket.content, "utf8");
-    process.stdout.write(`[OK] Pulled ticket: ${ticketId} -> ${filePath}
+    process.stdout.write(`[OK] Pulled ticket: ${ticket.shorthand} -> ${filePath}
 `);
   }
 };
-var runTicketSave = runTicketsSave;
 
+// src/commands/tickets-backlog.ts
+import { dirname as dirname14, join as join20 } from "node:path";
 // src/commands/tickets-check.ts
 import { readFileSync as readFileSync14, writeFileSync as writeFileSync10 } from "node:fs";
 import { dirname as dirname12, join as join17 } from "node:path";
@@ -93691,7 +93727,7 @@ import { dirname as dirname13, join as join19 } from "node:path";
 
 // src/executors/opencode-impl.ts
 import { spawn as spawn3, spawnSync as spawnSync3 } from "node:child_process";
-import { basename as basename4 } from "node:path";
+import { basename as basename3 } from "node:path";
 var opencodeSpawnOptions = { stdio: "ignore", detached: true };
 var spawnOpencode = (command2, args, spawner, overrides) => {
   const child = spawner(command2, args, { ...opencodeSpawnOptions, ...overrides });
@@ -93708,7 +93744,7 @@ var runOpencodeCommand = (args) => {
 var buildSessionTitle = (repoRoot, label, id, detail) => {
   const trimmedDetail = detail?.trim();
   const suffix = trimmedDetail ? ` ${trimmedDetail}` : "";
-  return `(${basename4(repoRoot)}) ${label} ${id}${suffix}`;
+  return `(${basename3(repoRoot)}) ${label} ${id}${suffix}`;
 };
 var formatChangeId = (value) => {
   const match = value.match(/^([CPcp]\d+)_/);
@@ -93821,7 +93857,7 @@ globalThis.__REAL_launchOpencodeImplement = launchOpencodeImplement;
 globalThis.__REAL_launchOpencodeCreateTickets = launchOpencodeCreateTickets;
 // src/features/context/prepare-implement-context.ts
 import { readdirSync as readdirSync9, readFileSync as readFileSync15 } from "node:fs";
-import { basename as basename5, join as join18 } from "node:path";
+import { basename as basename4, join as join18 } from "node:path";
 var listMarkdownFiles = (root, relativeRoot = "") => {
   const entries = readdirSync9(join18(root, relativeRoot), { withFileTypes: true });
   const paths = [];
@@ -93842,7 +93878,7 @@ var readChangeMarkdown = (schubDir, changeId) => {
   return entries.sort().map((relativePath) => {
     const filePath = join18(changeDir, relativePath);
     return {
-      filename: basename5(relativePath),
+      filename: basename4(relativePath),
       content: readFileSync15(filePath, "utf8")
     };
   });
@@ -93991,24 +94027,59 @@ var runTicketsImplement = (schubDir, args) => {
 };
 
 // src/commands/tickets-backlog.ts
-var parseStatusFilter = (value) => {
+var CLI_IN_REVIEW_STATUS = "in_review";
+var INTERNAL_REVIEWED_STATUS = "reviewed";
+var formatCliTicketStatus = (status) => status === INTERNAL_REVIEWED_STATUS ? CLI_IN_REVIEW_STATUS : status;
+var parseListTicketStatus = (status) => {
+  const normalized = status.trim().toLowerCase();
+  if (normalized === CLI_IN_REVIEW_STATUS) {
+    return INTERNAL_REVIEWED_STATUS;
+  }
+  if (normalized === INTERNAL_REVIEWED_STATUS) {
+    return null;
+  }
+  if (TICKET_STATUSES.includes(normalized)) {
+    return normalized;
+  }
+  return null;
+};
+var parseUpdateTicketStatus = (status) => {
+  const normalized = status.trim().toLowerCase();
+  if (normalized === CLI_IN_REVIEW_STATUS) {
+    return INTERNAL_REVIEWED_STATUS;
+  }
+  if (normalized === INTERNAL_REVIEWED_STATUS) {
+    return null;
+  }
+  if (TICKET_STATUSES.includes(normalized)) {
+    return normalized;
+  }
+  return null;
+};
+var CLI_TICKET_STATUSES = TICKET_STATUSES.map(formatCliTicketStatus);
+var parseStatusFilter = (value, skipDefault = false) => {
   if (!value) {
-    return [...DEFAULT_TICKET_STATUSES];
+    return skipDefault ? null : [...DEFAULT_TICKET_STATUSES];
   }
   const normalized = value.split(",").map((status) => status.trim().toLowerCase()).filter(Boolean);
-  const allowed = new Set(TICKET_STATUSES);
-  const invalid = normalized.filter((status) => !allowed.has(status));
+  const parsed = normalized.map(parseListTicketStatus);
+  const invalid = normalized.filter((_, index) => parsed[index] === null);
   if (invalid.length > 0) {
     throw new Error(`Unknown status filter: ${invalid.join(", ")}`);
   }
-  return normalized;
+  return parsed.filter((status) => status !== null);
 };
 var parseTicketListOptions = (args) => {
   let statusValue;
   let json = false;
+  let openFilter;
   const unknown = [];
   for (let index = 0;index < args.length; index += 1) {
     const arg = args[index];
+    if (arg === "open") {
+      openFilter = true;
+      continue;
+    }
     if (arg === "--json") {
       json = true;
       continue;
@@ -94030,11 +94101,12 @@ var parseTicketListOptions = (args) => {
   if (unknown.length > 0) {
     throw new Error(`Unknown option(s): ${unknown.join(", ")}`);
   }
-  return { statuses: parseStatusFilter(statusValue), json };
+  const statuses = parseStatusFilter(statusValue, openFilter !== undefined);
+  return { statuses: statuses ?? [], json, openFilter };
 };
-var BACKLOG_UPDATE_STATUSES = ["reviewed", "rejected", "archived"];
 var parseTicketUpdateOptions = (args) => {
   let statusValue;
+  let blockedReason;
   const ticketIds = [];
   const unknown = [];
   const rejectUnsupported = (flag) => {
@@ -94067,6 +94139,18 @@ var parseTicketUpdateOptions = (args) => {
       ticketIds.push(arg.slice("--id=".length));
       continue;
     }
+    if (arg === "--blocked-reason") {
+      blockedReason = args[index + 1];
+      if (!blockedReason) {
+        throw new Error("Missing value for --blocked-reason.");
+      }
+      index += 1;
+      continue;
+    }
+    if (arg.startsWith("--blocked-reason=")) {
+      blockedReason = arg.slice("--blocked-reason=".length);
+      continue;
+    }
     if (arg === "--schub-root" || arg === "--agent-root") {
       rejectUnsupported(arg);
     }
@@ -94084,9 +94168,9 @@ var parseTicketUpdateOptions = (args) => {
   if (!statusValue) {
     throw new Error("Provide --status.");
   }
-  const normalizedStatus = statusValue.trim().toLowerCase();
-  if (!BACKLOG_UPDATE_STATUSES.includes(normalizedStatus)) {
-    throw new Error(`Invalid status '${statusValue}'. Use reviewed, rejected, or archived.`);
+  const parsedStatus = parseUpdateTicketStatus(statusValue);
+  if (!parsedStatus) {
+    throw new Error(`Invalid status '${statusValue}'. Use ${CLI_TICKET_STATUSES.join(", ")}.`);
   }
   const normalizedIds = ticketIds.map((id) => id.trim()).filter(Boolean);
   if (normalizedIds.length === 0) {
@@ -94094,37 +94178,123 @@ var parseTicketUpdateOptions = (args) => {
   }
   const options = {
     ticketIds: normalizedIds,
-    status: normalizedStatus
+    status: parsedStatus,
+    blockedReason
   };
   return options;
 };
-var runTicketsList = (schubDir, args) => {
+var resolveServicesConfig3 = (schubDir) => ({
+  dbPath: process.env.SCHUB_DB_PATH ?? join20(schubDir, "schub.db"),
+  storagePath: process.env.SCHUB_STORAGE_PATH ?? join20(schubDir, "storage")
+});
+var resolveProjectId2 = (schubDir, services) => {
+  const repoRoot = dirname14(schubDir);
+  const config = readProjectConfig(repoRoot);
+  if (!config) {
+    throw new Error(`Project config not found: ${join20(repoRoot, ".schub", "config.json")}`);
+  }
+  const project = services.projects.get(config.project_id);
+  if (!project) {
+    throw new Error(`Project '${config.project_id}' from .schub/config.json was not found in the database.`);
+  }
+  return config.project_id;
+};
+var listAllowedTicketUpdateStatuses = async (schubDir) => {
+  const { dbPath, storagePath } = resolveServicesConfig3(schubDir);
+  const services = await createCliServices(dbPath, storagePath);
+  const projectId = resolveProjectId2(schubDir, services);
+  const statuses = services.ticketStatuses.list(projectId).map((status) => status.name.trim().toLowerCase()).filter(Boolean);
+  return [...new Set(statuses)];
+};
+var findStatusId2 = (services, projectId, status) => {
+  const normalized = status.trim().toLowerCase();
+  const match = services.ticketStatuses.list(projectId).find((ticketStatus) => ticketStatus.name.trim().toLowerCase() === normalized);
+  return match?.id;
+};
+var runTicketsList = async (schubDir, args) => {
   if (!schubDir) {
     throw new Error("No .schub directory found.");
   }
   const options = parseTicketListOptions(args);
-  const tickets = listTickets(schubDir, options.statuses);
+  const { dbPath, storagePath } = resolveServicesConfig3(schubDir);
+  const services = await createCliServices(dbPath, storagePath);
+  const projectId = resolveProjectId2(schubDir, services);
+  const allTickets = services.tickets.list(projectId);
+  const allStatuses = services.ticketStatuses.list(projectId);
+  const statusMap = new Map(allStatuses.map((s) => [s.id, s.name.toLowerCase()]));
+  const statusOpenMap = new Map(allStatuses.map((s) => [s.id, s.is_open === 1]));
+  const tickets = allTickets.filter((ticket) => {
+    if (options.openFilter !== undefined) {
+      const isOpen = ticket.status_id ? statusOpenMap.get(ticket.status_id) ?? true : true;
+      if (isOpen !== options.openFilter) {
+        return false;
+      }
+    }
+    if (options.statuses.length === 0) {
+      return true;
+    }
+    const status = ticket.status_id ? statusMap.get(ticket.status_id) : "backlog";
+    return options.statuses.includes(status);
+  }).map((ticket) => {
+    const status = ticket.status_id ? statusMap.get(ticket.status_id) ?? "backlog" : "backlog";
+    const titleMatch = ticket.content?.match(/^#+\s+(.*)$/m);
+    let title = titleMatch?.[1]?.trim();
+    if (!title) {
+      const firstLine = ticket.content?.split(`
+`)[0]?.trim();
+      title = firstLine || "untitled";
+    }
+    if (title.startsWith("Ticket:")) {
+      title = title.replace(/^Ticket:\s*\w+\s*/, "").trim() || "untitled";
+    }
+    return {
+      id: ticket.shorthand,
+      title,
+      status: formatCliTicketStatus(status)
+    };
+  }).sort((a, b) => a.id.localeCompare(b.id));
   if (options.json) {
     process.stdout.write(`${JSON.stringify(tickets, null, 2)}
 `);
     return;
   }
-  const lines = tickets.map((ticket) => {
-    const checklistSuffix = typeof ticket.checklistRemaining === "number" && typeof ticket.checklistTotal === "number" ? ` (${ticket.checklistRemaining}/${ticket.checklistTotal})` : "";
-    return `${ticket.id} ${ticket.title} (${ticket.status})${checklistSuffix}`;
-  });
+  const lines = tickets.map((ticket) => `${ticket.id} ${ticket.title} (${ticket.status})`);
   process.stdout.write(`${lines.join(`
 `)}
 `);
 };
-var runTicketsUpdate = (schubDir, args) => {
+var runTicketsUpdate = async (schubDir, args) => {
   if (!schubDir) {
     throw new Error("No .schub directory found.");
   }
   const options = parseTicketUpdateOptions(args);
-  const updated = updateTicketStatuses(schubDir, options.ticketIds, options.status);
+  const allowedStatuses = await listAllowedTicketUpdateStatuses(schubDir);
+  if (allowedStatuses.length === 0) {
+    throw new Error("No ticket statuses configured for this project.");
+  }
+  if (!allowedStatuses.includes(options.status)) {
+    throw new Error(`Invalid status '${options.status}'. Use ${allowedStatuses.join(", ")}.`);
+  }
+  const updated = updateTicketStatuses(schubDir, options.ticketIds, options.status, options.blockedReason);
+  const updatedIds = new Set(updated.map((t) => t.id));
+  const missingIds = options.ticketIds.filter((id) => !updatedIds.has(id));
+  if (missingIds.length > 0) {
+    throw new Error(`Ticket(s) not found: ${missingIds.join(", ")}`);
+  }
+  const { dbPath, storagePath } = resolveServicesConfig3(schubDir);
+  const services = await createCliServices(dbPath, storagePath);
+  const projectId = resolveProjectId2(schubDir, services);
+  const statusId = findStatusId2(services, projectId, options.status);
   for (const ticket of updated) {
-    process.stdout.write(`[OK] Updated ticket ${ticket.id}: backlog -> ${ticket.status}
+    if (statusId) {
+      services.tickets.save({
+        id: ticket.id,
+        project_id: projectId,
+        status_id: statusId,
+        blocked_reason: options.blockedReason !== undefined ? options.blockedReason : ticket.blockedReason
+      });
+    }
+    process.stdout.write(`[OK] Updated ticket ${ticket.id}: ${formatCliTicketStatus(ticket.status)}
 `);
   }
 };
@@ -99533,12 +99703,12 @@ var import_react61 = __toESM(require_react(), 1);
 // src/tui/app.tsx
 import { readFileSync as readFileSync18 } from "node:fs";
 import { homedir } from "node:os";
-import { basename as basename6, dirname as dirname16, resolve as resolve13 } from "node:path";
+import { basename as basename5, dirname as dirname17, resolve as resolve13 } from "node:path";
 var import_react60 = __toESM(require_react(), 1);
 // package.json
 var package_default = {
   name: "schub",
-  version: "0.1.10",
+  version: "0.1.11",
   type: "module",
   bin: {
     schub: "./dist/index.js"
@@ -99561,7 +99731,6 @@ var package_default = {
     node: ">=24"
   },
   dependencies: {
-    "@pstdio/schub-services": "workspace:*",
     "@inkjs/ui": "^2.0.0",
     chalk: "^5.6.2",
     ink: "^6.6.0",
@@ -99572,6 +99741,7 @@ var package_default = {
     yargs: "^18.0.0"
   },
   devDependencies: {
+    "@pstdio/schub-services": "workspace:*",
     "@types/bun": "latest",
     "@types/marked-terminal": "^6.0.0",
     "@types/node": "^24.3.0",
@@ -104966,9 +105136,10 @@ function PreviewPage({ fileName, markdown, height, onClose }) {
 
 // src/tui/components/status-view-data.ts
 import { readFileSync as readFileSync17 } from "node:fs";
-import { dirname as dirname14, join as join20, normalize as normalize2, sep } from "node:path";
+import { dirname as dirname15, join as join21, normalize as normalize2, sep } from "node:path";
 var TICKET_STATUS_LABELS = {
   backlog: "Backlog",
+  ready: "Ready",
   reviewed: "Reviewed",
   wip: "WIP",
   blocked: "Blocked",
@@ -105078,7 +105249,7 @@ var buildChangeTicketCounts = (tickets) => {
   return changeTicketCounts;
 };
 var hasDraftTokens = (repoRoot, ticket) => {
-  const content = readFileSync17(join20(repoRoot, ticket.path), "utf8");
+  const content = readFileSync17(join21(repoRoot, ticket.path), "utf8");
   return hasUnimplementedTemplateTokens(content);
 };
 var isReadyTicket = (ticket, ticketsById) => {
@@ -105192,7 +105363,7 @@ var buildTicketListItems = (schubDir, statuses = DEFAULT_TICKET_STATUSES) => {
   }
   const allTickets = loadTicketDependencies(schubDir, TICKET_STATUSES);
   const ticketsById = new Map(allTickets.map((ticket) => [ticket.id, ticket]));
-  const repoRoot = dirname14(schubDir);
+  const repoRoot = dirname15(schubDir);
   const allowed = new Set(statuses);
   const changeTitles = new Map(listChangeOverview(schubDir).map((change) => [change.id, formatChangeMenuName(change.id, change.title)]));
   return allTickets.filter((ticket) => allowed.has(ticket.status)).map((ticket) => ({
@@ -105693,7 +105864,7 @@ function SessionView({ state }) {
 }
 
 // src/tui/components/status-view.tsx
-import { dirname as dirname15, resolve as resolve12 } from "node:path";
+import { dirname as dirname16, resolve as resolve12 } from "node:path";
 var import_react59 = __toESM(require_react(), 1);
 
 // src/tui/hooks/use-refresh-interval.ts
@@ -106343,7 +106514,7 @@ function StatusView({
     reviewed,
     backlog: backlog2
   } = buildStatusData(schubDir);
-  const repoRoot = schubDir ? dirname15(schubDir) : "";
+  const repoRoot = schubDir ? dirname16(schubDir) : "";
   const changeListItems = buildChangeListItems(schubDir);
   const ticketListItems = buildTicketListItems(schubDir);
   const showAllTicketListItems = buildTicketListItems(schubDir, TICKET_STATUSES);
@@ -106814,7 +106985,7 @@ function App2({
     }
     return targetDir;
   })();
-  const repoRoot = schubDir ? dirname16(schubDir) : "";
+  const repoRoot = schubDir ? dirname17(schubDir) : "";
   const isPreviewActive = Boolean(preview);
   const isDetailActive = Boolean(proposalDetail);
   const isSessionActive = Boolean(sessionView);
@@ -106864,7 +107035,7 @@ function App2({
   const handleOpenPreview = (repoRoot2, relativePath) => {
     const targetPath = resolve13(repoRoot2, relativePath);
     const markdown = readFileSync18(targetPath, "utf8");
-    setPreview({ fileName: basename6(relativePath), markdown });
+    setPreview({ fileName: basename5(relativePath), markdown });
   };
   const handleClosePreview = () => {
     setPreview(null);
@@ -107215,19 +107386,19 @@ var runCommand = async () => {
     await runChangesList(rawArgs.slice(2), startDir);
   }).demandCommand(1, "Provide a proposals command."), () => {}).command("tickets", "Ticket commands", (command2) => command2.strict().command("create [args..]", "Create ticket files for a proposal", (sub) => sub.strict(false), () => {
     runTicketsCreate(rawArgs.slice(2), startDir);
-  }).command("list [args..]", "List tickets", (sub) => sub.strict(false), () => {
-    runTicketsList(resolveSchubDir(), rawArgs.slice(2));
+  }).command("list [args..]", "List tickets", (sub) => sub.strict(false), async () => {
+    await runTicketsList(resolveSchubDir(), rawArgs.slice(2));
   }).command("check [args..]", "Update ticket checklist item", (sub) => sub.strict(false), () => {
     runTicketsCheck(resolveSchubDir(), rawArgs.slice(2));
-  }).command("update [args..]", "Update backlog ticket status", (sub) => sub.strict(false), () => {
-    runTicketsUpdate(resolveSchubDir(), rawArgs.slice(2));
+  }).command("update [args..]", "Update ticket status", (sub) => sub.strict(false), async () => {
+    await runTicketsUpdate(resolveSchubDir(), rawArgs.slice(2));
   }).command("implement [args..]", "Assign a ticket for implementation", (sub) => sub.strict(false), () => {
     runTicketsImplement(resolveSchubDir(), rawArgs.slice(2));
+  }).command("save [args..]", "Save a ticket", (sub) => sub.strict(false), async (argv) => {
+    await runTicketsSave({ id: argv.id }, startDir);
   }).command("pull [args..]", "Pull all non-archived tickets from the database", (sub) => sub.strict(false), async () => {
     await runTicketsPull(startDir);
-  }).demandCommand(1, "Provide a tickets command."), () => {}).command("ticket", "Single-ticket commands", (command2) => command2.strict().command("save [args..]", "Save a ticket", (sub) => sub.strict(false), async (argv) => {
-    await runTicketSave({ id: argv.id }, startDir);
-  }).demandCommand(1, "Provide a ticket command."), () => {}).command("services", "Database service commands", (command2) => command2.strict().command("projects", "Project service commands", (projectCommand) => projectCommand.strict().command("list [args..]", "List projects", (sub) => sub.strict(false), async () => {
+  }).demandCommand(1, "Provide a tickets command."), () => {}).command("services", "Database service commands", (command2) => command2.strict().command("projects", "Project service commands", (projectCommand) => projectCommand.strict().command("list [args..]", "List projects", (sub) => sub.strict(false), async () => {
     const { runServicesProjectsList: runServicesProjectsList2 } = await Promise.resolve().then(() => (init_projects(), exports_projects));
     await runServicesProjectsList2(rawArgs.slice(3));
   }).command("create [args..]", "Create a project", (sub) => sub.strict(false), async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "schub",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "type": "module",
   "bin": {
     "schub": "./dist/index.js"
@@ -23,7 +23,6 @@
     "node": ">=24"
   },
   "dependencies": {
-    "@pstdio/schub-services": "workspace:*",
     "@inkjs/ui": "^2.0.0",
     "chalk": "^5.6.2",
     "ink": "^6.6.0",
@@ -34,6 +33,7 @@
     "yargs": "^18.0.0"
   },
   "devDependencies": {
+    "@pstdio/schub-services": "workspace:*",
     "@types/bun": "latest",
     "@types/marked-terminal": "^6.0.0",
     "@types/node": "^24.3.0",

package/skills/create-ticket/SKILL.md

@@ -16,10 +16,7 @@ $ARGUMENTS
    - Otherwise set status to `wip`.
 2. Derive a concise, verb-led ticket title from the user request and immediately run the schub CLI to create the ticket.
    - Run `bunx schub tickets create --title "<ticket title>" --input "<user prompt verbatim>" --status "<status>"`.
-   - If the ticket maps to a proposal, include `--proposal-id "<proposal-id or shorthand>"`.
-   - Optional flags: `--overwrite`.
-    - Capture the ticket file path from the command output (under `.schub/tickets/TK####_slug.md`).
-
+   - If the ticket maps to a proposal, include `--proposal-id "<shorthand>"`.
 3. Fill the ticket template with concrete details:
    - Priority (P1/P2/P3)
    - Parallelizable (yes/no)
@@ -28,10 +25,13 @@ $ARGUMENTS
    - Implementation Notes with key files/modules and decisions
    - Acceptance with explicit tests, file paths, and exact commands
    - Documentation updates, or an explicit “no docs” note
-   - If blocked, set `blocked_reason` and add `depends_on`
-4. Run `bunx schub tickets save --id "<ticket id>"` to persist the updated ticket content.
-5. If the user only asked to create the ticket, stop after the ticket file(s) are created and saved and do not implement code. Otherwise start the ticket implementation.
+   - If blocked, run `bunx schub tickets update --id "<ticket-id>" --status blocked --blocked-reason <reason>`
+4. When defining acceptance, list the exact test file paths, cases covered, and commands to run. Tests must live in the same ticket as the feature/bugfix work. Do not create standalone “add tests” tickets. Tests belong with the functional change they validate.
+5. Resolve blockers by checking all existing tickets that are not done. If another ticket is a blocker, add it to `depends_on` in frontmatter.
+6. Run `bunx schub tickets save --id "<ticket id>"` to persist the updated ticket content.
+7. If the user only asked to create the ticket, stop after the ticket file(s) are created and saved and do not implement code. Otherwise start the ticket implementation.
 
 ## Output Locations
 
-- `.schub/tickets/TK####_slug.md`
+- Tickets: `.schub/tickets/<ticket-id>_<ticket-name>/ticket.md`
+- Validation Artifacts: `.schub/tickets/<ticket-id>_<ticket-name>/`

package/skills/create-tickets-for-proposal/SKILL.md

@@ -12,7 +12,7 @@ $ARGUMENTS
 ## Workflow
 
 1. Load the proposal files locally (they may not exist yet):
-   - Run `bunx schub proposals load --proposal-id "<proposal-id or shorthand>"`.
+   - Run `bunx schub proposals load --proposal-id "<shorthand>"`.
 2. Confirm `.schub/proposals/<proposal-id>/proposal.md` exists and that it is marked accepted. If it is missing, ask the user to run the create-proposal skill first. If it is still a draft, ask the user to review it first.
 3. Read the proposal and other files in the `<proposal-id>` folder.
 4. Derive tickets, each ticket should be:
@@ -24,30 +24,27 @@ $ARGUMENTS
    - Include `Acceptance` criteria with explicit tests (file paths, cases covered) and exact commands to run.
    - Include corresponding documentation updates.
 5. Create tickets via the CLI (one command per ticket).
-   - Run `bunx schub tickets create --title "<ticket title>" --proposal-id "<proposal-id or shorthand>" --status "<status>"`.
-   - Optional flags: `--overwrite`.
-    - Capture the ticket file path from the command output (under `.schub/tickets/TK####_slug.md`).
-
-6. Fill the template fields with concrete details
+   - Run `bunx schub tickets create --title "<ticket title>" --proposal-id "<shorthand>" --status "<status>"`.
+6. Fill the ticket template with concrete details:
    - Priority (P1/P2/P3)
    - Parallelizable (yes/no)
-   - Goal, scope, steps, and evidence
-   - References (link to cookbook/proposal/spec files when available)
-   - Implementation Notes (assumptions, key decisions, and code pointers; record missing cookbook assumptions here)
-   - Acceptance (explicit tests with file paths, cases covered, and exact commands)
+   - Goal, scope, steps, acceptance, and evidence
+   - References to existing docs/specs (if any), otherwise record gaps as assumptions
+   - Implementation Notes with key files/modules and decisions
+   - Acceptance with explicit tests, file paths, and exact commands
    - Documentation updates, or an explicit “no docs” note
-   - If the ticket is blocked, set `blocked_reason` in the ticket frontmatter
-7. When defining acceptance, list the exact test file paths, cases covered, and commands to run. Tests must live in the same ticket as the feature/bugfix work—do not create standalone “add tests” tickets. Tests belong with the functional change they validate.
+   - If blocked, run `bunx schub tickets update --id "<ticket-id>" --status blocked --blocked-reason <reason>`
+7. When defining acceptance, list the exact test file paths, cases covered, and commands to run. Tests must live in the same ticket as the feature/bugfix work. Do not create standalone “add tests” tickets. Tests belong with the functional change they validate.
 8. Resolve blockers by checking all existing tickets that are not done. If another ticket is a blocker, add it to `depends_on` in frontmatter.
 9. Run `bunx schub tickets save --id "<ticket id>"` to persist updated tickets.
 10. Stop after the ticket files are created. Do not implement code or modify the plan or supporting artifacts.
 
 ## Output Locations
 
-- `.schub/tickets/TK####_slug.md`
+- Tickets: `.schub/tickets/<ticket-id>_<ticket-name>/ticket.md`
+- Validation Artifacts: `.schub/tickets/<ticket-id>_<ticket-name>/`
 
 ## Ticket Notes
 
-- Use the plan's acceptance alignment to define acceptance criteria.
 - Split tickets that span multiple systems or large scopes.
 - Record assumptions in Implementation Notes when cookbook references or key details are missing.

package/skills/implement-task/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: implement-ticket
-description: "Implement a single ticket end-to-end: locate the ticket file by id, move it across status folders (`reviewed`, `wip`, `blocked`, `done`). Use when asked to implement or complete a ticket."
+description: "Implement a single ticket end-to-end: locate the ticket file by id, then update its status (`in_review`, `wip`, `blocked`) via CLI. Use when asked to implement or complete a ticket."
 ---
 
 ## User Input
@@ -16,35 +16,30 @@ Use `--mode none` to skip worktree creation and run from the repo root. Use `--w
 
 ## Workflow
 
-1. **Identify the ticket**
+1. Identify the ticket
    - Accept: ticket id, full filename, or `next` / `continue`.
    - If unclear or missing, ask for **one**: ticket id (kebab-case), exact filename, or `next`.
-
-2. **Find the ticket file**
-   - If `next` / `continue`: sort `.schub/tickets/reviewed/`, pick the first file.
-   - Otherwise search `.schub/tickets/{reviewed,backlog,wip,done,blocked}/` for `<ticket-id>_*.md`.
+2. Find the ticket file
+   - If `next` / `continue`: run `bunx schub tickets list --status ready --json`, then pick the first ticket by id order.
+   - Otherwise run `bunx schub tickets list --id <shorthand> --json`.
    - If multiple matches, ask the user to choose.
    - If none found, ask the user to confirm the ticket id.
-
-3. **Move the ticket before work**
-   - If starting work: move to `.schub/tickets/wip/` (create folder if needed).
-   - If blocked: move to `.schub/tickets/blocked/` and set `blocked_reason` in the ticket frontmatter.
-   - If complete: move to `.schub/tickets/done/` after confirming all checklists are checked.
-   - Keep the ticket in **exactly one** status folder.
-
-4. **TDD loop**
-   - **Write tests first (Red)**
+3. Update the ticket status
+   - When starting work, run: `bunx schub tickets update --id "<ticket-id>" --status wip`.
+   - If blocked: run `bunx schub tickets update --id "<ticket-id>" --status blocked --blocked-reason <reason>` and stop the workflow.
+   - If complete: after confirming all checklists are checked, run `bunx schub tickets update --id "<ticket-id>" --status in_review`.
+4. TDD loop
+   - Write tests first (Red)
      - Add/extend tests based on `## Acceptance` (and key `## Steps`).
      - Run tests and confirm they fail for the right reason.
-   - **Implement the smallest change (Green)**
+   - Implement the smallest change (Green)
      - Write minimal code to make the failing test pass.
      - Re-run tests until green.
-   - **Refactor (Refactor)**
+   - Refactor (Refactor)
      - Clean up code and tests (names, structure, duplication) without changing behavior.
      - Re-run tests to confirm still green.
    - Repeat until all acceptance criteria are covered by tests and passing.
-
-6. **Update ticket checklists as you go**
+5. Update ticket checklists as you go
    - Check off `## Steps` only when:
      - A test exists that covers it, and
      - Tests pass, and
@@ -52,21 +47,20 @@ Use `--mode none` to skip worktree creation and run from the repo root. Use `--w
    - Check off `## Acceptance` only when:
      - There’s test coverage for it, and
      - The full test suite is green.
-
-7. **Evidence**
+6. Evidence
+   - Store artifacts under `.schub/tickets/<ticket-id>_<ticket-name>/`
    - Update the ticket file `## Evidence` section to reference generated artifacts.
    - If tests/commands can’t be run, record why in `## Evidence`.
-
-8. **Finish**
+7. Finish
    - Confirm everything in `## Steps` and `## Acceptance` is checked.
-   - If the ticket is not completed due to errors, move the ticket file to `.schub/tickets/blocked/`.
-   - If the ticket is completed, move the ticket file to `.schub/tickets/done/`.
+   - If the ticket is not completed due to errors, run `bunx schub tickets update --id "<ticket-id>" --status blocked --blocked-reason <reason>`, then run `bunx schub ticket save --id "<ticket-id>"`.
+   - If the ticket is completed, run `bunx schub tickets update --id "<ticket-id>" --status in_review`.
+   - Commit the implementation changes before handing off, including ticket updates and evidence references.
    - Report completed files and artifacts.
 
 ## Validation
 
-To be considered "done", a ticket should provide Validation Artifacts. Validation Artifacts are **verifiable outputs** produced while doing the ticket.
-e.g. by running `some_command &> some-logs.txt`
+To be considered complete and ready for review, a ticket should provide Validation Artifacts. Validation Artifacts are **verifiable outputs** produced while doing the ticket e.g. by running `some_command &> some-logs.txt`
 
 Agents should dump and review artifacts, including:
 
@@ -85,5 +79,5 @@ Artifacts **must** be:
 
 ## Output Locations
 
-- Tickets: `.schub/tickets/{reviewed,backlog,wip,done,blocked}/<ticket-id>_<ticket-name>.md`
-- Validation Artifacts: `.schub/artifacts/<ticket-id>/`
+- Tickets: `.schub/tickets/<ticket-id>_<ticket-name>/ticket.md`
+- Validation Artifacts: `.schub/tickets/<ticket-id>_<ticket-name>/`

package/skills/review-proposal/SKILL.md

@@ -11,19 +11,21 @@ $ARGUMENTS
 
 ## Workflow
 
-0. If the user provides shorthand `C####`, resolve it to the matching `C####_<suffix>` proposal folder (error if ambiguous). Mark the proposal Status as "In Review"
-1. Review the proposal by checking the [MISSING INFORMATION] tags and the potential issues listed.
-2. If there are issues, or missing information, run `bunx schub review create --proposal-id "<proposal-id>"` to scaffold `.schub/proposals/<proposal-id>/REVIEW_ME.md`.
-3. Triage each item:
+1. Load the proposal files locally (they may not exist yet):
+   - Run `bunx schub proposals load --proposal-id "<shorthand>"`.
+2. Confirm `.schub/proposals/<proposal-id>/proposal.md` exists. If it is missing, ask the user to run the create-proposal skill first. If it is still a draft, ask the user to review it first.
+3. Review the proposal by checking the [MISSING INFORMATION] tags and the potential issues listed.
+4. If there are issues, or missing information, run `bunx schub review create --proposal-id "<proposal-id>"` to scaffold `.schub/proposals/<proposal-id>/REVIEW_ME.md`.
+5. Triage each item:
    - **High-stakes** (scope, risks, dependencies, security, performance): create a bullet point item in the review checklist.
    - **Minute details** (naming, copy, formatting, low-impact defaults): make a decision update the proposal and mark as an assumption in the proposal.
-4. Once the review checklist is completed, gather unchecked items (`- [ ]`) in order.
-5. Start the review loop (process unchecked items in order), ask each item as a question. If unclear, ask a quick follow-up and do not advance.
+6. Once the review checklist is completed, gather unchecked items (`- [ ]`) in order.
+7. Start the review loop (process unchecked items in order), ask each item as a question. If unclear, ask a quick follow-up and do not advance.
    - Update the review checklist accordingly inline with the answers.
-6. When no unchecked items remain, update the plan with the new information.
-7. When no unchecked items remain, run `bunx schub review complete --proposal-id "<proposal-id>"` to create `.schub/proposals/<proposal-id>/Q&A.md`.
+8. When no unchecked items remain, update the plan with the new information.
+9. When no unchecked items remain, run `bunx schub review complete --proposal-id "<proposal-id>"` to create `.schub/proposals/<proposal-id>/Q&A.md`.
    - Ask the LLM to migrate the TODO block into the Q&A sections and remove the TODO block.
-8. Mark the proposal Status as "Accepted".
+10. Mark the proposal Status as "Accepted".
 
 ## Output Locations
 

package/skills/save-proposal/SKILL.md

@@ -1,22 +0,0 @@
----
-name: save-proposal
-description: "Persist proposal files via schub proposals save. Use when asked to save or persist a proposal."
----
-
-## User Input
-
-```text
-$ARGUMENTS
-```
-
-## Workflow
-
-1. Parse the user input for a proposal-id.
-   - Accept `C####`, `C####_<suffix>`, or a full proposal-id.
-   - If the user provides shorthand `C####`, resolve it to the matching `C####_<suffix>` folder under `.schub/proposals/` (error if ambiguous or missing).
-2. Run `bunx schub proposals save --proposal-id "<proposal-id>"`.
-3. Use the CLI output as the confirmation of success. If the command errors, report it and ask for the correct proposal-id or for the user to run the create-proposal skill first.
-
-## Notes
-
-- **Do not start the implementation** only save the `.schub/proposals` folder.