@staff0rd/assist 0.474.0 → 0.475.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.474.0",
+  version: "0.475.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -3887,9 +3887,9 @@ function forbiddenStrings() {
     console.log("No forbidden-strings rules configured.");
     process.exit(0);
   }
-  const cache5 = /* @__PURE__ */ new Map();
+  const cache4 = /* @__PURE__ */ new Map();
   const readJson = (file) => {
-    if (cache5.has(file)) return cache5.get(file);
+    if (cache4.has(file)) return cache4.get(file);
     if (!existsSync12(file)) {
       console.log(`Forbidden-strings file not found: ${file}`);
       process.exit(1);
@@ -3901,7 +3901,7 @@ function forbiddenStrings() {
       console.log(`Could not parse ${file}: ${error.message}`);
       process.exit(1);
     }
-    cache5.set(file, parsed);
+    cache4.set(file, parsed);
     return parsed;
   };
   const violations = findForbiddenStrings(rules, readJson);
@@ -8570,19 +8570,19 @@ import { dirname as dirname19, join as join23 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function createBundleHandler(importMetaUrl, bundlePath, contentType = "application/javascript") {
   const file = join23(dirname19(fileURLToPath4(importMetaUrl)), bundlePath);
-  let cache5;
+  let cache4;
   return (req, res) => {
     const mtimeMs = statSync2(file).mtimeMs;
-    if (cache5?.mtimeMs !== mtimeMs) {
+    if (cache4?.mtimeMs !== mtimeMs) {
       const body = readFileSync19(file, "utf8");
       const etag = `"${createHash("sha256").update(body).digest("hex").slice(0, 16)}"`;
-      cache5 = { body, etag, mtimeMs };
+      cache4 = { body, etag, mtimeMs };
     }
     const headers = {
-      ETag: cache5.etag,
+      ETag: cache4.etag,
       "Cache-Control": "no-cache"
     };
-    if (req.headers["if-none-match"] === cache5.etag) {
+    if (req.headers["if-none-match"] === cache4.etag) {
       res.writeHead(304, headers);
       res.end();
       return;
@@ -8591,7 +8591,7 @@ function createBundleHandler(importMetaUrl, bundlePath, contentType = "applicati
       "Content-Type": contentType,
       ...headers
     });
-    res.end(cache5.body);
+    res.end(cache4.body);
   };
 }
 
@@ -9723,111 +9723,6 @@ function parseGitStatus(output) {
   return result;
 }
 
-// src/shared/db/findCommitAnchor.ts
-import { and as and8, asc as asc8, eq as eq18, inArray as inArray3 } from "drizzle-orm";
-async function findCommitAnchor(db, itemId2) {
-  const rows = await db.select({ kind: itemGitRefs.kind, ref: itemGitRefs.ref }).from(itemGitRefs).where(
-    and8(
-      eq18(itemGitRefs.itemId, itemId2),
-      inArray3(itemGitRefs.kind, ["commit", "commit-parent"])
-    )
-  ).orderBy(asc8(itemGitRefs.createdAt));
-  const anchor = {};
-  for (const row of rows) {
-    if (row.kind === "commit") anchor.commit ??= row.ref;
-    else anchor.parent ??= row.ref;
-  }
-  return anchor;
-}
-
-// src/commands/sessions/web/sessionCommitAnchor.ts
-var EMPTY_TTL_MS = 3e4;
-var cache4 = /* @__PURE__ */ new Map();
-var inFlight2 = /* @__PURE__ */ new Map();
-async function sessionCommitAnchor(sessionId) {
-  const cached = cache4.get(sessionId);
-  if (cached && cached.expiresAt > Date.now()) return cached.anchor;
-  const pending = inFlight2.get(sessionId);
-  if (pending) return pending;
-  const lookup = loadAnchor(sessionId).finally(
-    () => inFlight2.delete(sessionId)
-  );
-  inFlight2.set(sessionId, lookup);
-  return lookup;
-}
-async function loadAnchor(sessionId) {
-  const anchor = await queryAnchor(sessionId);
-  const found = Boolean(anchor.commit || anchor.parent);
-  cache4.set(sessionId, {
-    anchor,
-    expiresAt: found ? Number.POSITIVE_INFINITY : Date.now() + EMPTY_TTL_MS
-  });
-  return anchor;
-}
-async function queryAnchor(sessionId) {
-  try {
-    if (!process.env.ASSIST_DATABASE_URL && !loadConfig().database.url)
-      return {};
-    const db = await getDb();
-    const itemId2 = await findItemBySessionId(db, sessionId);
-    if (itemId2 === void 0) return {};
-    return await findCommitAnchor(db, itemId2);
-  } catch {
-    return {};
-  }
-}
-
-// src/commands/sessions/web/resolveDiffBase.ts
-function baseCandidates(defaultBranch) {
-  return [
-    defaultBranch && `origin/${defaultBranch}`,
-    defaultBranch,
-    "origin/main",
-    "origin/master",
-    "main",
-    "master"
-  ].filter((candidate) => Boolean(candidate));
-}
-async function refExists2(cwd, ref) {
-  try {
-    await execGit(cwd, ["rev-parse", "--verify", "--quiet", `${ref}^{commit}`]);
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function anchoredBase(cwd, sessionId) {
-  const { commit: commit2, parent } = await sessionCommitAnchor(sessionId);
-  if (parent && await refExists2(cwd, parent)) return parent;
-  if (commit2 && await refExists2(cwd, `${commit2}^`)) return `${commit2}^`;
-  return void 0;
-}
-async function resolveDiffBase(cwd, sessionId) {
-  let defaultBranch;
-  try {
-    const config = loadConfigFrom(toGitCwd(cwd));
-    if (!config.sessions?.includeCommittedChanges) return "HEAD";
-    defaultBranch = config.branch?.defaultBranch;
-  } catch {
-    return "HEAD";
-  }
-  if (sessionId) {
-    const anchored = await anchoredBase(cwd, sessionId);
-    if (anchored) return anchored;
-  }
-  for (const candidate of baseCandidates(defaultBranch)) {
-    if (!await refExists2(cwd, candidate)) continue;
-    try {
-      const base = await execGit(cwd, ["merge-base", "HEAD", candidate]);
-      const sha = base.trim();
-      if (sha) return sha;
-    } catch {
-    }
-    return "HEAD";
-  }
-  return "HEAD";
-}
-
 // src/commands/sessions/web/gitStatus.ts
 async function untrackedPaths(cwd) {
   const list5 = await execGit(cwd, [
@@ -9837,9 +9732,13 @@ async function untrackedPaths(cwd) {
   ]);
   return list5.split("\n").filter(Boolean);
 }
-async function branchCounts(cwd, base) {
-  const output = await execGit(cwd, ["diff", "--name-status", base]);
-  const counts = parseDiffNameStatus(output);
+async function groupedCounts(cwd, groups) {
+  const outputs = await Promise.all(
+    groups.map(
+      (group) => execGit(cwd, ["diff", "--name-status", group.base, "--", ...group.paths])
+    )
+  );
+  const counts = parseDiffNameStatus(outputs.join(""));
   counts.new.push(...await untrackedPaths(cwd));
   return counts;
 }
@@ -9855,12 +9754,22 @@ async function gitStatus(req, res) {
   const cwd = getCwdParam(req, res);
   if (!cwd) return;
   try {
-    const base = await resolveDiffBase(cwd, getSessionParam(req));
-    respondJson(
-      res,
-      200,
-      base === "HEAD" ? await workingTreeCounts(cwd) : await branchCounts(cwd, base)
+    const changeSet = await itemChangeSet(cwd, getSessionParam(req)).catch(
+      () => void 0
     );
+    if (!changeSet) {
+      respondJson(res, 200, await workingTreeCounts(cwd));
+      return;
+    }
+    const [counts, uncommitted] = await Promise.all([
+      groupedCounts(cwd, changeSet.groups),
+      workingTreeCounts(cwd)
+    ]);
+    respondJson(res, 200, {
+      ...counts,
+      uncommitted,
+      hasCommits: changeSet.commits.length > 0
+    });
   } catch {
     respondJson(res, 200, { new: [], modified: [], deleted: [] });
   }
@@ -10144,14 +10053,14 @@ async function listNewsItems(_req, res) {
 }
 
 // src/shared/db/countUsagePeaks.ts
-import { count, eq as eq19 } from "drizzle-orm";
+import { count, eq as eq18 } from "drizzle-orm";
 async function countUsagePeaks(db, window) {
-  const [row] = await db.select({ value: count() }).from(usagePeaks).where(window ? eq19(usagePeaks.window, window) : void 0);
+  const [row] = await db.select({ value: count() }).from(usagePeaks).where(window ? eq18(usagePeaks.window, window) : void 0);
   return row?.value ?? 0;
 }
 
 // src/shared/db/listUsagePeaks.ts
-import { and as and9, desc as desc2, eq as eq20, getTableColumns } from "drizzle-orm";
+import { and as and8, desc as desc2, eq as eq19, getTableColumns } from "drizzle-orm";
 
 // src/shared/db/avgContextPerCycle.ts
 import { count as count2, sql as sql16 } from "drizzle-orm";
@@ -10175,11 +10084,11 @@ async function listUsagePeaks(db, options2) {
     phaseCount: avgContext.phaseCount
   }).from(usagePeaks).leftJoin(
     avgContext,
-    and9(
-      eq20(usagePeaks.window, avgContext.window),
-      eq20(usagePeaks.resetsAt, avgContext.resetsAt)
+    and8(
+      eq19(usagePeaks.window, avgContext.window),
+      eq19(usagePeaks.resetsAt, avgContext.resetsAt)
     )
-  ).where(options2?.window ? eq20(usagePeaks.window, options2.window) : void 0).orderBy(
+  ).where(options2?.window ? eq19(usagePeaks.window, options2.window) : void 0).orderBy(
     desc2(usagePeaks.resetsAt),
     usagePeaks.window,
     desc2(usagePeaks.createdAt),
@@ -10234,11 +10143,11 @@ var execFileAsync4 = promisify5(execFile5);
 var CACHE_TTL_MS3 = 3e4;
 function createCachedGhJson(args, parse3, fallback, options2 = {}) {
   const { cacheFallback = true } = options2;
-  const cache5 = /* @__PURE__ */ new Map();
+  const cache4 = /* @__PURE__ */ new Map();
   return async (cwd, extraArgs = []) => {
     const key = extraArgs.length ? `${cwd}\0${extraArgs.join("\0")}` : cwd;
     const now = Date.now();
-    const cached = cache5.get(key);
+    const cached = cache4.get(key);
     if (cached && cached.expires > now) return cached.value;
     let value = fallback;
     try {
@@ -10251,7 +10160,7 @@ function createCachedGhJson(args, parse3, fallback, options2 = {}) {
       value = fallback;
     }
     if (cacheFallback || value !== fallback)
-      cache5.set(key, { value, expires: now + CACHE_TTL_MS3 });
+      cache4.set(key, { value, expires: now + CACHE_TTL_MS3 });
     return value;
   };
 }
@@ -10950,22 +10859,22 @@ import { readFileSync as readFileSync21 } from "fs";
 import { createRequire as createRequire2 } from "module";
 var require3 = createRequire2(import.meta.url);
 function createCssHandler(packageEntry) {
-  let cache5;
+  let cache4;
   return (req, res) => {
-    if (!cache5) {
+    if (!cache4) {
       const resolved = require3.resolve(packageEntry);
       const body = readFileSync21(resolved, "utf8");
       const etag = `"${createHash2("sha256").update(body).digest("hex").slice(0, 16)}"`;
-      cache5 = { body, etag };
+      cache4 = { body, etag };
     }
-    const headers = { ETag: cache5.etag, "Cache-Control": "no-cache" };
-    if (req.headers["if-none-match"] === cache5.etag) {
+    const headers = { ETag: cache4.etag, "Cache-Control": "no-cache" };
+    if (req.headers["if-none-match"] === cache4.etag) {
       res.writeHead(304, headers);
       res.end();
       return;
     }
     res.writeHead(200, { "Content-Type": "text/css", ...headers });
-    res.end(cache5.body);
+    res.end(cache4.body);
   };
 }
 
@@ -11467,11 +11376,11 @@ function registerActivityCommands(cmd) {
 
 // src/commands/backlog/associate-github/index.ts
 import chalk64 from "chalk";
-import { eq as eq22 } from "drizzle-orm";
+import { eq as eq21 } from "drizzle-orm";
 
 // src/commands/backlog/beginAssociation.ts
 import chalk63 from "chalk";
-import { eq as eq21 } from "drizzle-orm";
+import { eq as eq20 } from "drizzle-orm";
 async function beginAssociation(id, options2, clearPatch, label2) {
   const found = await findOneItem(id);
   if (!found) {
@@ -11481,7 +11390,7 @@ async function beginAssociation(id, options2, clearPatch, label2) {
   const { orm } = found;
   const itemId2 = found.item.id;
   if (options2.clear) {
-    await orm.update(items).set(clearPatch).where(eq21(items.id, itemId2));
+    await orm.update(items).set(clearPatch).where(eq20(items.id, itemId2));
     console.log(
       chalk63.green(
         `Cleared ${label2} association on item ${formatItemId(itemId2)}.`
@@ -11549,7 +11458,7 @@ async function associateGithub(id, issue, options2) {
     return;
   }
   const title = fetchGithubIssueTitle(normalized);
-  await orm.update(items).set({ githubIssue: normalized, jiraKey: null }).where(eq22(items.id, itemId2));
+  await orm.update(items).set({ githubIssue: normalized, jiraKey: null }).where(eq21(items.id, itemId2));
   console.log(
     chalk64.green(`Associated ${normalized} with item ${formatItemId(itemId2)}.`),
     title ? chalk64.dim(`(${title})`) : ""
@@ -11563,7 +11472,7 @@ function registerAssociateGithubCommand(cmd) {
 
 // src/commands/backlog/associate-jira/index.ts
 import chalk66 from "chalk";
-import { eq as eq23 } from "drizzle-orm";
+import { eq as eq22 } from "drizzle-orm";
 
 // src/commands/jira/fetchIssue.ts
 import { execSync as execSync33 } from "child_process";
@@ -11628,7 +11537,7 @@ async function associateJira(id, key, options2) {
   const parsed = fetchIssue(normalized, "summary");
   const fields = parsed?.fields;
   const summary = fields?.summary;
-  await orm.update(items).set({ jiraKey: normalized, githubIssue: null }).where(eq23(items.id, itemId2));
+  await orm.update(items).set({ jiraKey: normalized, githubIssue: null }).where(eq22(items.id, itemId2));
   console.log(
     chalk66.green(`Associated ${normalized} with item ${formatItemId(itemId2)}.`),
     summary ? chalk66.dim(`(${summary})`) : ""
@@ -12006,15 +11915,15 @@ function isClaudeCode() {
 }
 
 // src/commands/backlog/insertPhaseAt.ts
-import { eq as eq25 } from "drizzle-orm";
+import { eq as eq24 } from "drizzle-orm";
 
 // src/commands/backlog/shiftPhasesUp.ts
-import { and as and10, desc as desc3, eq as eq24, gte } from "drizzle-orm";
+import { and as and9, desc as desc3, eq as eq23, gte } from "drizzle-orm";
 async function shiftPhasesUp(db, itemId2, fromIdx) {
-  const toShift = await db.select({ idx: planPhases.idx }).from(planPhases).where(and10(eq24(planPhases.itemId, itemId2), gte(planPhases.idx, fromIdx))).orderBy(desc3(planPhases.idx));
+  const toShift = await db.select({ idx: planPhases.idx }).from(planPhases).where(and9(eq23(planPhases.itemId, itemId2), gte(planPhases.idx, fromIdx))).orderBy(desc3(planPhases.idx));
   for (const p of toShift) {
-    await db.update(planTasks).set({ phaseIdx: p.idx + 1 }).where(and10(eq24(planTasks.itemId, itemId2), eq24(planTasks.phaseIdx, p.idx)));
-    await db.update(planPhases).set({ idx: p.idx + 1 }).where(and10(eq24(planPhases.itemId, itemId2), eq24(planPhases.idx, p.idx)));
+    await db.update(planTasks).set({ phaseIdx: p.idx + 1 }).where(and9(eq23(planTasks.itemId, itemId2), eq23(planTasks.phaseIdx, p.idx)));
+    await db.update(planPhases).set({ idx: p.idx + 1 }).where(and9(eq23(planPhases.itemId, itemId2), eq23(planPhases.idx, p.idx)));
   }
 }
 
@@ -12027,7 +11936,7 @@ async function insertPhaseAt(orm, itemId2, phaseIdx, name, tasks, manualChecks,
       await tx.insert(planTasks).values(tasks.map((task, i) => ({ itemId: itemId2, phaseIdx, idx: i, task })));
     }
     if (currentPhase !== void 0 && currentPhase - 1 >= phaseIdx) {
-      await tx.update(items).set({ currentPhase: phaseIdx + 1 }).where(eq25(items.id, itemId2));
+      await tx.update(items).set({ currentPhase: phaseIdx + 1 }).where(eq24(items.id, itemId2));
     }
   });
 }
@@ -12199,9 +12108,9 @@ import chalk76 from "chalk";
 
 // src/commands/backlog/resolveInsertPosition.ts
 import chalk75 from "chalk";
-import { count as count3, eq as eq26 } from "drizzle-orm";
+import { count as count3, eq as eq25 } from "drizzle-orm";
 async function resolveInsertPosition(orm, itemId2, position) {
-  const [row] = await orm.select({ cnt: count3() }).from(planPhases).where(eq26(planPhases.itemId, itemId2));
+  const [row] = await orm.select({ cnt: count3() }).from(planPhases).where(eq25(planPhases.itemId, itemId2));
   const phaseCount = row?.cnt ?? 0;
   if (position === void 0) return phaseCount;
   const pos = Number.parseInt(position, 10);
@@ -12560,9 +12469,9 @@ function hasCycle(adjacency, fromId, toId) {
 }
 
 // src/commands/backlog/loadDependencyGraph.ts
-import { eq as eq27 } from "drizzle-orm";
+import { eq as eq26 } from "drizzle-orm";
 async function loadDependencyGraph(orm) {
-  const rows = await orm.select({ itemId: links.itemId, targetId: links.targetId }).from(links).where(eq27(links.type, "depends-on"));
+  const rows = await orm.select({ itemId: links.itemId, targetId: links.targetId }).from(links).where(eq26(links.type, "depends-on"));
   const graph = /* @__PURE__ */ new Map();
   for (const { itemId: itemId2, targetId } of rows) {
     const bucket = graph.get(itemId2);
@@ -12629,7 +12538,7 @@ async function link(fromId, toId, opts) {
 
 // src/commands/backlog/unlink.ts
 import chalk82 from "chalk";
-import { and as and11, eq as eq28 } from "drizzle-orm";
+import { and as and10, eq as eq27 } from "drizzle-orm";
 async function unlink(fromId, toId) {
   const fromNum = parseItemId(fromId);
   const toNum = parseItemId(toId);
@@ -12653,7 +12562,7 @@ async function unlink(fromId, toId) {
     );
     return;
   }
-  await orm.delete(links).where(and11(eq28(links.itemId, fromNum), eq28(links.targetId, toNum)));
+  await orm.delete(links).where(and10(eq27(links.itemId, fromNum), eq27(links.targetId, toNum)));
   console.log(
     chalk82.green(
       `Removed link from ${formatItemId(fromNum)} to ${formatItemId(toNum)}.`
@@ -12673,7 +12582,7 @@ function registerLinkCommands(cmd) {
 
 // src/commands/backlog/move-repo/index.ts
 import chalk84 from "chalk";
-import { eq as eq30 } from "drizzle-orm";
+import { eq as eq29 } from "drizzle-orm";
 
 // src/commands/backlog/move-repo/confirmMove.ts
 import chalk83 from "chalk";
@@ -12688,9 +12597,9 @@ async function confirmMove(cnt, oldOrigin, newOrigin) {
 }
 
 // src/commands/backlog/move-repo/countByOrigin.ts
-import { count as count4, eq as eq29 } from "drizzle-orm";
+import { count as count4, eq as eq28 } from "drizzle-orm";
 async function countByOrigin(orm, origin) {
-  const [{ cnt }] = await orm.select({ cnt: count4() }).from(items).where(eq29(items.origin, origin));
+  const [{ cnt }] = await orm.select({ cnt: count4() }).from(items).where(eq28(items.origin, origin));
   return cnt;
 }
 
@@ -12733,7 +12642,7 @@ async function moveRepo(oldOriginRaw, newOriginRaw, options2 = {}) {
     console.log(chalk84.yellow("Move cancelled; no changes made."));
     return;
   }
-  await orm.update(items).set({ origin: newOrigin }).where(eq30(items.origin, oldOrigin));
+  await orm.update(items).set({ origin: newOrigin }).where(eq29(items.origin, oldOrigin));
   console.log(
     chalk84.green(
       `Moved ${pluralItems(cnt)} from "${oldOrigin}" to "${newOrigin}".`
@@ -13150,10 +13059,10 @@ async function start(id) {
 
 // src/commands/backlog/stop/index.ts
 import chalk96 from "chalk";
-import { and as and12, eq as eq31 } from "drizzle-orm";
+import { and as and11, eq as eq30 } from "drizzle-orm";
 async function stop() {
   const { orm } = await getReady();
-  const stopped = await orm.update(items).set({ status: "todo", currentPhase: 1 }).where(and12(eq31(items.status, "in-progress"), eq31(items.origin, getOrigin()))).returning({ id: items.id, name: items.name });
+  const stopped = await orm.update(items).set({ status: "todo", currentPhase: 1 }).where(and11(eq30(items.status, "in-progress"), eq30(items.origin, getOrigin()))).returning({ id: items.id, name: items.name });
   if (stopped.length === 0) {
     console.log(chalk96.yellow("No in-progress items to stop."));
     return;
@@ -13270,13 +13179,13 @@ async function findSubtask(id, index3) {
 }
 
 // src/commands/backlog/updateSubtask.ts
-import { and as and13, eq as eq32 } from "drizzle-orm";
+import { and as and12, eq as eq31 } from "drizzle-orm";
 async function updateSubtask(orm, itemId2, idx, fields) {
   const set = {};
   if (fields.title !== void 0) set.title = fields.title;
   if (fields.description !== void 0) set.description = fields.description;
   if (fields.status !== void 0) set.status = fields.status;
-  const [row] = await orm.update(itemSubtasks).set(set).where(and13(eq32(itemSubtasks.itemId, itemId2), eq32(itemSubtasks.idx, idx))).returning({ title: itemSubtasks.title });
+  const [row] = await orm.update(itemSubtasks).set(set).where(and12(eq31(itemSubtasks.itemId, itemId2), eq31(itemSubtasks.idx, idx))).returning({ title: itemSubtasks.title });
   return row?.title;
 }
 
@@ -13331,16 +13240,16 @@ async function editSubtask(id, index3, options2) {
 import chalk102 from "chalk";
 
 // src/commands/backlog/deleteSubtask.ts
-import { and as and14, asc as asc9, eq as eq33 } from "drizzle-orm";
+import { and as and13, asc as asc8, eq as eq32 } from "drizzle-orm";
 async function deleteSubtask(orm, itemId2, idx) {
-  const [row] = await orm.delete(itemSubtasks).where(and14(eq33(itemSubtasks.itemId, itemId2), eq33(itemSubtasks.idx, idx))).returning({ title: itemSubtasks.title });
+  const [row] = await orm.delete(itemSubtasks).where(and13(eq32(itemSubtasks.itemId, itemId2), eq32(itemSubtasks.idx, idx))).returning({ title: itemSubtasks.title });
   if (!row) return void 0;
-  const remaining = await orm.select({ idx: itemSubtasks.idx }).from(itemSubtasks).where(eq33(itemSubtasks.itemId, itemId2)).orderBy(asc9(itemSubtasks.idx));
+  const remaining = await orm.select({ idx: itemSubtasks.idx }).from(itemSubtasks).where(eq32(itemSubtasks.itemId, itemId2)).orderBy(asc8(itemSubtasks.idx));
   for (let i = 0; i < remaining.length; i++) {
     const oldIdx = remaining[i].idx;
     if (oldIdx === i) continue;
     await orm.update(itemSubtasks).set({ idx: i }).where(
-      and14(eq33(itemSubtasks.itemId, itemId2), eq33(itemSubtasks.idx, oldIdx))
+      and13(eq32(itemSubtasks.itemId, itemId2), eq32(itemSubtasks.idx, oldIdx))
     );
   }
   return row.title;
@@ -13409,20 +13318,20 @@ function registerSubtaskCommands(cmd) {
 
 // src/commands/backlog/movePhase.ts
 import chalk104 from "chalk";
-import { count as count6, eq as eq36 } from "drizzle-orm";
+import { count as count6, eq as eq35 } from "drizzle-orm";
 
 // src/commands/backlog/reorderPhaseRows.ts
-import { and as and16, asc as asc11, eq as eq35 } from "drizzle-orm";
+import { and as and15, asc as asc10, eq as eq34 } from "drizzle-orm";
 
 // src/commands/backlog/reindexPhases.ts
-import { and as and15, asc as asc10, count as count5, eq as eq34 } from "drizzle-orm";
+import { and as and14, asc as asc9, count as count5, eq as eq33 } from "drizzle-orm";
 async function reindexPhases(db, itemId2) {
-  const remaining = await db.select({ idx: planPhases.idx }).from(planPhases).where(eq34(planPhases.itemId, itemId2)).orderBy(asc10(planPhases.idx));
+  const remaining = await db.select({ idx: planPhases.idx }).from(planPhases).where(eq33(planPhases.itemId, itemId2)).orderBy(asc9(planPhases.idx));
   for (let i = 0; i < remaining.length; i++) {
     const oldIdx = remaining[i].idx;
     if (oldIdx === i) continue;
-    await db.update(planTasks).set({ phaseIdx: i }).where(and15(eq34(planTasks.itemId, itemId2), eq34(planTasks.phaseIdx, oldIdx)));
-    await db.update(planPhases).set({ idx: i }).where(and15(eq34(planPhases.itemId, itemId2), eq34(planPhases.idx, oldIdx)));
+    await db.update(planTasks).set({ phaseIdx: i }).where(and14(eq33(planTasks.itemId, itemId2), eq33(planTasks.phaseIdx, oldIdx)));
+    await db.update(planPhases).set({ idx: i }).where(and14(eq33(planPhases.itemId, itemId2), eq33(planPhases.idx, oldIdx)));
   }
 }
 async function adjustCurrentPhase(db, item, removedIdx) {
@@ -13430,24 +13339,24 @@ async function adjustCurrentPhase(db, item, removedIdx) {
   if (currentPhase === void 0) return;
   const currentIdx = currentPhase - 1;
   if (removedIdx < currentIdx) {
-    await db.update(items).set({ currentPhase: currentPhase - 1 }).where(eq34(items.id, item.id));
+    await db.update(items).set({ currentPhase: currentPhase - 1 }).where(eq33(items.id, item.id));
     return;
   }
   if (removedIdx !== currentIdx) return;
-  const [row] = await db.select({ cnt: count5() }).from(planPhases).where(eq34(planPhases.itemId, item.id));
+  const [row] = await db.select({ cnt: count5() }).from(planPhases).where(eq33(planPhases.itemId, item.id));
   const cnt = row?.cnt ?? 0;
-  await db.update(items).set({ currentPhase: cnt === 0 ? null : Math.min(currentPhase, cnt) }).where(eq34(items.id, item.id));
+  await db.update(items).set({ currentPhase: cnt === 0 ? null : Math.min(currentPhase, cnt) }).where(eq33(items.id, item.id));
 }
 
 // src/commands/backlog/reorderPhaseRows.ts
 async function reorderPhaseRows(orm, itemId2, fromIdx, toIdx) {
   await orm.transaction(async (tx) => {
-    const [phaseRow] = await tx.select({ name: planPhases.name, manualChecks: planPhases.manualChecks }).from(planPhases).where(and16(eq35(planPhases.itemId, itemId2), eq35(planPhases.idx, fromIdx)));
-    const tasks = await tx.select({ idx: planTasks.idx, task: planTasks.task }).from(planTasks).where(and16(eq35(planTasks.itemId, itemId2), eq35(planTasks.phaseIdx, fromIdx))).orderBy(asc11(planTasks.idx));
+    const [phaseRow] = await tx.select({ name: planPhases.name, manualChecks: planPhases.manualChecks }).from(planPhases).where(and15(eq34(planPhases.itemId, itemId2), eq34(planPhases.idx, fromIdx)));
+    const tasks = await tx.select({ idx: planTasks.idx, task: planTasks.task }).from(planTasks).where(and15(eq34(planTasks.itemId, itemId2), eq34(planTasks.phaseIdx, fromIdx))).orderBy(asc10(planTasks.idx));
     await tx.delete(planTasks).where(
-      and16(eq35(planTasks.itemId, itemId2), eq35(planTasks.phaseIdx, fromIdx))
+      and15(eq34(planTasks.itemId, itemId2), eq34(planTasks.phaseIdx, fromIdx))
     );
-    await tx.delete(planPhases).where(and16(eq35(planPhases.itemId, itemId2), eq35(planPhases.idx, fromIdx)));
+    await tx.delete(planPhases).where(and15(eq34(planPhases.itemId, itemId2), eq34(planPhases.idx, fromIdx)));
     await reindexPhases(tx, itemId2);
     await shiftPhasesUp(tx, itemId2, toIdx);
     await tx.insert(planPhases).values({
@@ -13488,7 +13397,7 @@ async function movePhase(id, from, to) {
   if (!found) return;
   const { orm, item } = found;
   const itemId2 = item.id;
-  const [row] = await orm.select({ cnt: count6() }).from(planPhases).where(eq36(planPhases.itemId, itemId2));
+  const [row] = await orm.select({ cnt: count6() }).from(planPhases).where(eq35(planPhases.itemId, itemId2));
   const phaseCount = row?.cnt ?? 0;
   const fromIdx = toIndex2(from, phaseCount);
   if (fromIdx === void 0) return;
@@ -13504,22 +13413,22 @@ async function movePhase(id, from, to) {
 import chalk106 from "chalk";
 
 // src/commands/backlog/applyPhaseUpdate.ts
-import { and as and17, eq as eq37 } from "drizzle-orm";
+import { and as and16, eq as eq36 } from "drizzle-orm";
 async function applyPhaseUpdate(orm, itemId2, phaseIdx, fields) {
   await orm.transaction(async (tx) => {
     if (fields.name) {
       await tx.update(planPhases).set({ name: fields.name }).where(
-        and17(eq37(planPhases.itemId, itemId2), eq37(planPhases.idx, phaseIdx))
+        and16(eq36(planPhases.itemId, itemId2), eq36(planPhases.idx, phaseIdx))
       );
     }
     if (fields.manualCheck) {
       await tx.update(planPhases).set({ manualChecks: JSON.stringify(fields.manualCheck) }).where(
-        and17(eq37(planPhases.itemId, itemId2), eq37(planPhases.idx, phaseIdx))
+        and16(eq36(planPhases.itemId, itemId2), eq36(planPhases.idx, phaseIdx))
       );
     }
     if (fields.task) {
       await tx.delete(planTasks).where(
-        and17(eq37(planTasks.itemId, itemId2), eq37(planTasks.phaseIdx, phaseIdx))
+        and16(eq36(planTasks.itemId, itemId2), eq36(planTasks.phaseIdx, phaseIdx))
       );
       if (fields.task.length) {
         await tx.insert(planTasks).values(
@@ -13537,14 +13446,14 @@ async function applyPhaseUpdate(orm, itemId2, phaseIdx, fields) {
 
 // src/commands/backlog/findPhase.ts
 import chalk105 from "chalk";
-import { and as and18, count as count7, eq as eq38 } from "drizzle-orm";
+import { and as and17, count as count7, eq as eq37 } from "drizzle-orm";
 async function findPhase(id, phase) {
   const found = await findOneItem(id);
   if (!found) return void 0;
   const { orm, item } = found;
   const itemId2 = item.id;
   const phaseIdx = Number.parseInt(phase, 10) - 1;
-  const [row] = await orm.select({ cnt: count7() }).from(planPhases).where(and18(eq38(planPhases.itemId, itemId2), eq38(planPhases.idx, phaseIdx)));
+  const [row] = await orm.select({ cnt: count7() }).from(planPhases).where(and17(eq37(planPhases.itemId, itemId2), eq37(planPhases.idx, phaseIdx)));
   if (!row || row.cnt === 0) {
     console.log(
       chalk105.red(
@@ -13717,16 +13626,16 @@ function registerUpdatePhaseCommand(cmd) {
 
 // src/commands/backlog/removePhase.ts
 import chalk107 from "chalk";
-import { and as and19, eq as eq39 } from "drizzle-orm";
+import { and as and18, eq as eq38 } from "drizzle-orm";
 async function removePhase(id, phase) {
   const found = await findPhase(id, phase);
   if (!found) return;
   const { item, orm, itemId: itemId2, phaseIdx } = found;
   await orm.transaction(async (tx) => {
     await tx.delete(planTasks).where(
-      and19(eq39(planTasks.itemId, itemId2), eq39(planTasks.phaseIdx, phaseIdx))
+      and18(eq38(planTasks.itemId, itemId2), eq38(planTasks.phaseIdx, phaseIdx))
     );
-    await tx.delete(planPhases).where(and19(eq39(planPhases.itemId, itemId2), eq39(planPhases.idx, phaseIdx)));
+    await tx.delete(planPhases).where(and18(eq38(planPhases.itemId, itemId2), eq38(planPhases.idx, phaseIdx)));
     await reindexPhases(tx, itemId2);
     await adjustCurrentPhase(tx, item, phaseIdx);
   });
@@ -13739,7 +13648,7 @@ async function removePhase(id, phase) {
 
 // src/commands/backlog/update/update.ts
 import chalk111 from "chalk";
-import { eq as eq40 } from "drizzle-orm";
+import { eq as eq39 } from "drizzle-orm";
 
 // src/commands/backlog/update/buildUpdateValues.ts
 import chalk108 from "chalk";
@@ -13850,7 +13759,7 @@ async function update(id, options2) {
   if (!built) return;
   const { orm } = found;
   const itemId2 = found.item.id;
-  await orm.update(items).set(built.set).where(eq40(items.id, itemId2));
+  await orm.update(items).set(built.set).where(eq39(items.id, itemId2));
   console.log(
     chalk111.green(`Updated ${built.fields} on item ${formatItemId(itemId2)}.`)
   );
@@ -13871,7 +13780,7 @@ function readPlanUpdate(source) {
 }
 
 // src/commands/backlog/updatePlan/replacePlan.ts
-import { eq as eq41 } from "drizzle-orm";
+import { eq as eq40 } from "drizzle-orm";
 
 // src/commands/backlog/updatePlan/clampCurrentPhase.ts
 function clampCurrentPhase(currentPhase, phaseCount) {
@@ -13882,8 +13791,8 @@ function clampCurrentPhase(currentPhase, phaseCount) {
 // src/commands/backlog/updatePlan/replacePlan.ts
 async function replacePlan(orm, itemId2, phases, currentPhase) {
   await orm.transaction(async (tx) => {
-    await tx.delete(planTasks).where(eq41(planTasks.itemId, itemId2));
-    await tx.delete(planPhases).where(eq41(planPhases.itemId, itemId2));
+    await tx.delete(planTasks).where(eq40(planTasks.itemId, itemId2));
+    await tx.delete(planPhases).where(eq40(planPhases.itemId, itemId2));
     if (phases.length > 0) {
       await tx.insert(planPhases).values(
         phases.map((phase, idx) => ({
@@ -13901,7 +13810,7 @@ async function replacePlan(orm, itemId2, phases, currentPhase) {
     if (currentPhase === void 0) return;
     const clamped = clampCurrentPhase(currentPhase, phases.length);
     if (clamped === currentPhase) return;
-    await tx.update(items).set({ currentPhase: clamped }).where(eq41(items.id, itemId2));
+    await tx.update(items).set({ currentPhase: clamped }).where(eq40(items.id, itemId2));
   });
 }
 
@@ -18184,9 +18093,9 @@ function registerGithub(program2) {
 }
 
 // src/commands/handover/countPendingHandovers.ts
-import { and as and20, eq as eq42, isNull, sql as sql18 } from "drizzle-orm";
+import { and as and19, eq as eq41, isNull, sql as sql18 } from "drizzle-orm";
 async function countPendingHandovers(orm, origin) {
-  const [row] = await orm.select({ count: sql18`count(*)::int` }).from(handovers).where(and20(eq42(handovers.origin, origin), isNull(handovers.recalledAt)));
+  const [row] = await orm.select({ count: sql18`count(*)::int` }).from(handovers).where(and19(eq41(handovers.origin, origin), isNull(handovers.recalledAt)));
   return row?.count ?? 0;
 }
 
@@ -18326,13 +18235,13 @@ async function load2(options2 = {}) {
 }
 
 // src/commands/handover/listPendingHandovers.ts
-import { and as and21, desc as desc4, eq as eq43, isNull as isNull2 } from "drizzle-orm";
+import { and as and20, desc as desc4, eq as eq42, isNull as isNull2 } from "drizzle-orm";
 async function listPendingHandovers(orm, origin) {
   return orm.select({
     id: handovers.id,
     summary: handovers.summary,
     createdAt: handovers.createdAt
-  }).from(handovers).where(and21(eq43(handovers.origin, origin), isNull2(handovers.recalledAt))).orderBy(desc4(handovers.createdAt), desc4(handovers.id));
+  }).from(handovers).where(and20(eq42(handovers.origin, origin), isNull2(handovers.recalledAt))).orderBy(desc4(handovers.createdAt), desc4(handovers.id));
 }
 
 // src/commands/handover/printPendingHandovers.ts
@@ -18345,17 +18254,17 @@ async function printPendingHandovers() {
 }
 
 // src/commands/handover/recallHandover.ts
-import { and as and22, desc as desc5, eq as eq44, isNull as isNull3 } from "drizzle-orm";
+import { and as and21, desc as desc5, eq as eq43, isNull as isNull3 } from "drizzle-orm";
 async function recallHandover(orm, origin, id) {
   const [row] = await orm.select().from(handovers).where(
-    and22(
-      eq44(handovers.origin, origin),
+    and21(
+      eq43(handovers.origin, origin),
       isNull3(handovers.recalledAt),
-      ...id === void 0 ? [] : [eq44(handovers.id, id)]
+      ...id === void 0 ? [] : [eq43(handovers.id, id)]
     )
   ).orderBy(desc5(handovers.createdAt), desc5(handovers.id)).limit(1);
   if (!row) return void 0;
-  await orm.update(handovers).set({ recalledAt: /* @__PURE__ */ new Date() }).where(eq44(handovers.id, row.id));
+  await orm.update(handovers).set({ recalledAt: /* @__PURE__ */ new Date() }).where(eq43(handovers.id, row.id));
   return row.content;
 }
 
@@ -20373,20 +20282,20 @@ function resolveThread(threadId) {
   }
 }
 function requireCache(prNumber) {
-  const cache5 = loadCommentsCache(prNumber);
-  if (!cache5) {
+  const cache4 = loadCommentsCache(prNumber);
+  if (!cache4) {
     console.error(
       `Error: No cached comments found for PR #${prNumber}. Run "assist prs list-comments" first.`
     );
     process.exit(1);
   }
-  return cache5;
+  return cache4;
 }
 function findLineComment(comments3, commentId) {
   return comments3.find((c) => c.type === "line" && c.id === commentId);
 }
-function requireLineComment(cache5, commentId) {
-  const comment3 = findLineComment(cache5.comments, commentId);
+function requireLineComment(cache4, commentId) {
+  const comment3 = findLineComment(cache4.comments, commentId);
   if (!comment3 || comment3.type !== "line" || !comment3.threadId) {
     console.error(
       `Error: Comment #${commentId} not found or has no thread ID.`
@@ -20395,8 +20304,8 @@ function requireLineComment(cache5, commentId) {
   }
   return comment3;
 }
-function cleanupCacheIfDone(cache5, prNumber, commentId) {
-  const hasRemaining = cache5.comments.some(
+function cleanupCacheIfDone(cache4, prNumber, commentId) {
+  const hasRemaining = cache4.comments.some(
     (c) => c.type === "line" && c.id !== commentId
   );
   if (!hasRemaining) deleteCommentsCache(prNumber);
@@ -20404,13 +20313,13 @@ function cleanupCacheIfDone(cache5, prNumber, commentId) {
 function resolveCommentWithReply(commentId, message2) {
   const prNumber = getCurrentPrNumber();
   const { org, repo } = getRepoInfo();
-  const cache5 = requireCache(prNumber);
-  const comment3 = requireLineComment(cache5, commentId);
+  const cache4 = requireCache(prNumber);
+  const comment3 = requireLineComment(cache4, commentId);
   replyToComment(org, repo, prNumber, commentId, message2);
   console.log("Reply posted successfully.");
   resolveThread(comment3.threadId);
   console.log("Thread resolved successfully.");
-  cleanupCacheIfDone(cache5, prNumber, commentId);
+  cleanupCacheIfDone(cache4, prNumber, commentId);
 }
 
 // src/commands/prs/fixed.ts
@@ -28732,10 +28641,10 @@ function applyReviewPause(session, activity2) {
 }
 
 // src/shared/db/getPhaseActiveMs.ts
-import { and as and23, eq as eq45 } from "drizzle-orm";
+import { and as and22, eq as eq44 } from "drizzle-orm";
 async function getPhaseActiveMs(db, itemId2, phaseIdx) {
   const [row] = await db.select({ activeMs: phaseUsage.activeMs }).from(phaseUsage).where(
-    and23(eq45(phaseUsage.itemId, itemId2), eq45(phaseUsage.phaseIdx, phaseIdx))
+    and22(eq44(phaseUsage.itemId, itemId2), eq44(phaseUsage.phaseIdx, phaseIdx))
   );
   return row?.activeMs ?? 0;
 }
@@ -29281,17 +29190,17 @@ async function recordPhaseTranscriptUsage(db, itemId2, phaseIdx, responses) {
 }
 
 // src/shared/db/recordWindowTokens.ts
-import { and as and24, eq as eq46, sql as sql24 } from "drizzle-orm";
+import { and as and23, eq as eq45, sql as sql24 } from "drizzle-orm";
 async function recordWindowTokens(db, window, resetsAt, tokensUp, tokensDown) {
   if (tokensUp <= 0 && tokensDown <= 0) return;
   await db.update(usagePeaks).set({
     tokensUp: sql24`${usagePeaks.tokensUp} + ${tokensUp}`,
     tokensDown: sql24`${usagePeaks.tokensDown} + ${tokensDown}`
   }).where(
-    and24(
-      eq46(usagePeaks.window, window),
-      eq46(usagePeaks.resetsAt, resetsAt),
-      eq46(usagePeaks.segment, 0)
+    and23(
+      eq45(usagePeaks.window, window),
+      eq45(usagePeaks.resetsAt, resetsAt),
+      eq45(usagePeaks.segment, 0)
     )
   );
 }