@staff0rd/assist 0.449.0 → 0.451.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.449.0",
+  version: "0.451.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -1770,6 +1770,8 @@ function collectCommitRefs(message2) {
     const subject = message2.split("\n", 1)[0];
     if (subject) ref.title = subject;
     refs.push(ref);
+    const parent = git("rev-parse HEAD^");
+    if (parent) refs.push({ kind: "commit-parent", ref: parent });
   }
   return refs;
 }
@@ -3715,9 +3717,9 @@ function forbiddenStrings() {
     console.log("No forbidden-strings rules configured.");
     process.exit(0);
   }
-  const cache3 = /* @__PURE__ */ new Map();
+  const cache4 = /* @__PURE__ */ new Map();
   const readJson = (file) => {
-    if (cache3.has(file)) return cache3.get(file);
+    if (cache4.has(file)) return cache4.get(file);
     if (!existsSync12(file)) {
       console.log(`Forbidden-strings file not found: ${file}`);
       process.exit(1);
@@ -3729,7 +3731,7 @@ function forbiddenStrings() {
       console.log(`Could not parse ${file}: ${error.message}`);
       process.exit(1);
     }
-    cache3.set(file, parsed);
+    cache4.set(file, parsed);
     return parsed;
   };
   const violations = findForbiddenStrings(rules, readJson);
@@ -5190,6 +5192,14 @@ function pullIfConfigured() {
     );
     return;
   }
+  if (!hasUpstream()) {
+    console.warn(
+      chalk32.yellow(
+        "git pull skipped: the current branch has no upstream. Continuing."
+      )
+    );
+    return;
+  }
   try {
     execSync24("git pull --ff-only", { stdio: "inherit" });
   } catch {
@@ -5197,6 +5207,17 @@ function pullIfConfigured() {
     process.exit(1);
   }
 }
+function hasUpstream() {
+  try {
+    execSync24("git rev-parse --abbrev-ref --symbolic-full-name @{upstream}", {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function hasLocalChanges() {
   try {
     const status3 = execSync24("git status --porcelain", {
@@ -6091,7 +6112,13 @@ var backlogCommentSchema = z3.strictObject({
   timestamp: z3.string(),
   type: backlogCommentTypeSchema
 });
-var gitRefKindSchema = z3.enum(["branch", "commit", "pr", "slack"]);
+var gitRefKindSchema = z3.enum([
+  "branch",
+  "commit",
+  "commit-parent",
+  "pr",
+  "slack"
+]);
 var gitRefSchema = z3.strictObject({
   kind: gitRefKindSchema,
   ref: z3.string(),
@@ -8372,19 +8399,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 cache3;
+  let cache4;
   return (req, res) => {
     const mtimeMs = statSync2(file).mtimeMs;
-    if (cache3?.mtimeMs !== mtimeMs) {
+    if (cache4?.mtimeMs !== mtimeMs) {
       const body = readFileSync19(file, "utf8");
       const etag = `"${createHash("sha256").update(body).digest("hex").slice(0, 16)}"`;
-      cache3 = { body, etag, mtimeMs };
+      cache4 = { body, etag, mtimeMs };
     }
     const headers = {
-      ETag: cache3.etag,
+      ETag: cache4.etag,
       "Cache-Control": "no-cache"
     };
-    if (req.headers["if-none-match"] === cache3.etag) {
+    if (req.headers["if-none-match"] === cache4.etag) {
       res.writeHead(304, headers);
       res.end();
       return;
@@ -8393,7 +8420,7 @@ function createBundleHandler(importMetaUrl, bundlePath, contentType = "applicati
       "Content-Type": contentType,
       ...headers
     });
-    res.end(cache3.body);
+    res.end(cache4.body);
   };
 }
 
@@ -8881,6 +8908,73 @@ function getCwdParam(req, res) {
   return cwd;
 }
 
+// src/commands/sessions/web/getSessionParam.ts
+function getSessionParam(req) {
+  const url = new URL(req.url ?? "/", "http://localhost");
+  return url.searchParams.get("session") ?? void 0;
+}
+
+// src/shared/db/findCommitAnchor.ts
+import { and as and7, asc as asc6, eq as eq16, 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(
+    and7(
+      eq16(itemGitRefs.itemId, itemId2),
+      inArray3(itemGitRefs.kind, ["commit", "commit-parent"])
+    )
+  ).orderBy(asc6(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/shared/db/findItemBySessionId.ts
+import { asc as asc7, eq as eq17 } from "drizzle-orm";
+async function findItemBySessionId(db, claudeSessionId) {
+  const rows = await db.select({ itemId: phaseUsage.itemId }).from(phaseUsage).where(eq17(phaseUsage.claudeSessionId, claudeSessionId)).orderBy(asc7(phaseUsage.itemId), asc7(phaseUsage.phaseIdx)).limit(1);
+  return rows[0]?.itemId;
+}
+
+// src/commands/sessions/web/sessionCommitAnchor.ts
+var EMPTY_TTL_MS = 3e4;
+var cache3 = /* @__PURE__ */ new Map();
+var inFlight = /* @__PURE__ */ new Map();
+async function sessionCommitAnchor(sessionId) {
+  const cached = cache3.get(sessionId);
+  if (cached && cached.expiresAt > Date.now()) return cached.anchor;
+  const pending = inFlight.get(sessionId);
+  if (pending) return pending;
+  const lookup = loadAnchor(sessionId).finally(
+    () => inFlight.delete(sessionId)
+  );
+  inFlight.set(sessionId, lookup);
+  return lookup;
+}
+async function loadAnchor(sessionId) {
+  const anchor = await queryAnchor(sessionId);
+  const found = Boolean(anchor.commit || anchor.parent);
+  cache3.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/windowsCwdToWslPath.ts
 function windowsCwdToWslPath(cwd) {
   const match = /^([A-Za-z]):[\\/](.*)$/.exec(cwd);
@@ -8914,7 +9008,13 @@ async function refExists2(cwd, ref) {
     return false;
   }
 }
-async function resolveDiffBase(cwd) {
+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));
@@ -8923,6 +9023,10 @@ async function resolveDiffBase(cwd) {
   } 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 {
@@ -8960,7 +9064,7 @@ async function diff2(req, res) {
   const cwd = getCwdParam(req, res);
   if (!cwd) return;
   try {
-    const base = await resolveDiffBase(cwd);
+    const base = await resolveDiffBase(cwd, getSessionParam(req));
     const tracked = await execGit(cwd, ["diff", base], {
       maxBuffer: MAX_DIFF_BYTES
     });
@@ -9280,7 +9384,7 @@ async function gitStatus(req, res) {
   const cwd = getCwdParam(req, res);
   if (!cwd) return;
   try {
-    const base = await resolveDiffBase(cwd);
+    const base = await resolveDiffBase(cwd, getSessionParam(req));
     respondJson(
       res,
       200,
@@ -9569,7 +9673,7 @@ async function listNewsItems(_req, res) {
 }
 
 // src/shared/db/listUsagePeaks.ts
-import { and as and7, count, desc as desc2, eq as eq16, getTableColumns, sql as sql16 } from "drizzle-orm";
+import { and as and8, count, desc as desc2, eq as eq18, getTableColumns, sql as sql16 } from "drizzle-orm";
 async function listUsagePeaks(db, paging) {
   const avgContext = db.select({
     window: phaseCycleContext.window,
@@ -9585,9 +9689,9 @@ async function listUsagePeaks(db, paging) {
     phaseCount: avgContext.phaseCount
   }).from(usagePeaks).leftJoin(
     avgContext,
-    and7(
-      eq16(usagePeaks.window, avgContext.window),
-      eq16(usagePeaks.resetsAt, avgContext.resetsAt)
+    and8(
+      eq18(usagePeaks.window, avgContext.window),
+      eq18(usagePeaks.resetsAt, avgContext.resetsAt)
     )
   ).orderBy(
     desc2(usagePeaks.resetsAt),
@@ -9644,11 +9748,11 @@ var execFileAsync4 = promisify5(execFile5);
 var CACHE_TTL_MS2 = 3e4;
 function createCachedGhJson(args, parse3, fallback, options2 = {}) {
   const { cacheFallback = true } = options2;
-  const cache3 = /* @__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 = cache3.get(key);
+    const cached = cache4.get(key);
     if (cached && cached.expires > now) return cached.value;
     let value = fallback;
     try {
@@ -9661,7 +9765,7 @@ function createCachedGhJson(args, parse3, fallback, options2 = {}) {
       value = fallback;
     }
     if (cacheFallback || value !== fallback)
-      cache3.set(key, { value, expires: now + CACHE_TTL_MS2 });
+      cache4.set(key, { value, expires: now + CACHE_TTL_MS2 });
     return value;
   };
 }
@@ -10172,22 +10276,22 @@ import { readFileSync as readFileSync21 } from "fs";
 import { createRequire as createRequire2 } from "module";
 var require3 = createRequire2(import.meta.url);
 function createCssHandler(packageEntry) {
-  let cache3;
+  let cache4;
   return (req, res) => {
-    if (!cache3) {
+    if (!cache4) {
       const resolved = require3.resolve(packageEntry);
       const body = readFileSync21(resolved, "utf8");
       const etag = `"${createHash2("sha256").update(body).digest("hex").slice(0, 16)}"`;
-      cache3 = { body, etag };
+      cache4 = { body, etag };
     }
-    const headers = { ETag: cache3.etag, "Cache-Control": "no-cache" };
-    if (req.headers["if-none-match"] === cache3.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(cache3.body);
+    res.end(cache4.body);
   };
 }
 
@@ -10685,11 +10789,11 @@ function registerActivityCommands(cmd) {
 
 // src/commands/backlog/associate-github/index.ts
 import chalk64 from "chalk";
-import { eq as eq18 } from "drizzle-orm";
+import { eq as eq20 } from "drizzle-orm";
 
 // src/commands/backlog/beginAssociation.ts
 import chalk63 from "chalk";
-import { eq as eq17 } from "drizzle-orm";
+import { eq as eq19 } from "drizzle-orm";
 async function beginAssociation(id, options2, clearPatch, label2) {
   const found = await findOneItem(id);
   if (!found) {
@@ -10699,7 +10803,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(eq17(items.id, itemId2));
+    await orm.update(items).set(clearPatch).where(eq19(items.id, itemId2));
     console.log(
       chalk63.green(
         `Cleared ${label2} association on item ${formatItemId(itemId2)}.`
@@ -10767,7 +10871,7 @@ async function associateGithub(id, issue, options2) {
     return;
   }
   const title = fetchGithubIssueTitle(normalized);
-  await orm.update(items).set({ githubIssue: normalized, jiraKey: null }).where(eq18(items.id, itemId2));
+  await orm.update(items).set({ githubIssue: normalized, jiraKey: null }).where(eq20(items.id, itemId2));
   console.log(
     chalk64.green(`Associated ${normalized} with item ${formatItemId(itemId2)}.`),
     title ? chalk64.dim(`(${title})`) : ""
@@ -10781,7 +10885,7 @@ function registerAssociateGithubCommand(cmd) {
 
 // src/commands/backlog/associate-jira/index.ts
 import chalk66 from "chalk";
-import { eq as eq19 } from "drizzle-orm";
+import { eq as eq21 } from "drizzle-orm";
 
 // src/commands/jira/fetchIssue.ts
 import { execSync as execSync32 } from "child_process";
@@ -10846,7 +10950,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(eq19(items.id, itemId2));
+  await orm.update(items).set({ jiraKey: normalized, githubIssue: null }).where(eq21(items.id, itemId2));
   console.log(
     chalk66.green(`Associated ${normalized} with item ${formatItemId(itemId2)}.`),
     summary ? chalk66.dim(`(${summary})`) : ""
@@ -11219,15 +11323,15 @@ function registerImportCommand(cmd) {
 import chalk74 from "chalk";
 
 // src/commands/backlog/insertPhaseAt.ts
-import { eq as eq21 } from "drizzle-orm";
+import { eq as eq23 } from "drizzle-orm";
 
 // src/commands/backlog/shiftPhasesUp.ts
-import { and as and8, desc as desc3, eq as eq20, gte } from "drizzle-orm";
+import { and as and9, desc as desc3, eq as eq22, gte } from "drizzle-orm";
 async function shiftPhasesUp(db, itemId2, fromIdx) {
-  const toShift = await db.select({ idx: planPhases.idx }).from(planPhases).where(and8(eq20(planPhases.itemId, itemId2), gte(planPhases.idx, fromIdx))).orderBy(desc3(planPhases.idx));
+  const toShift = await db.select({ idx: planPhases.idx }).from(planPhases).where(and9(eq22(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(and8(eq20(planTasks.itemId, itemId2), eq20(planTasks.phaseIdx, p.idx)));
-    await db.update(planPhases).set({ idx: p.idx + 1 }).where(and8(eq20(planPhases.itemId, itemId2), eq20(planPhases.idx, p.idx)));
+    await db.update(planTasks).set({ phaseIdx: p.idx + 1 }).where(and9(eq22(planTasks.itemId, itemId2), eq22(planTasks.phaseIdx, p.idx)));
+    await db.update(planPhases).set({ idx: p.idx + 1 }).where(and9(eq22(planPhases.itemId, itemId2), eq22(planPhases.idx, p.idx)));
   }
 }
 
@@ -11240,7 +11344,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(eq21(items.id, itemId2));
+      await tx.update(items).set({ currentPhase: phaseIdx + 1 }).where(eq23(items.id, itemId2));
     }
   });
 }
@@ -11403,9 +11507,9 @@ import chalk76 from "chalk";
 
 // src/commands/backlog/resolveInsertPosition.ts
 import chalk75 from "chalk";
-import { count as count2, eq as eq22 } from "drizzle-orm";
+import { count as count2, eq as eq24 } from "drizzle-orm";
 async function resolveInsertPosition(orm, itemId2, position) {
-  const [row] = await orm.select({ cnt: count2() }).from(planPhases).where(eq22(planPhases.itemId, itemId2));
+  const [row] = await orm.select({ cnt: count2() }).from(planPhases).where(eq24(planPhases.itemId, itemId2));
   const phaseCount = row?.cnt ?? 0;
   if (position === void 0) return phaseCount;
   const pos = Number.parseInt(position, 10);
@@ -11734,9 +11838,9 @@ function hasCycle(adjacency, fromId, toId) {
 }
 
 // src/commands/backlog/loadDependencyGraph.ts
-import { eq as eq23 } from "drizzle-orm";
+import { eq as eq25 } from "drizzle-orm";
 async function loadDependencyGraph(orm) {
-  const rows = await orm.select({ itemId: links.itemId, targetId: links.targetId }).from(links).where(eq23(links.type, "depends-on"));
+  const rows = await orm.select({ itemId: links.itemId, targetId: links.targetId }).from(links).where(eq25(links.type, "depends-on"));
   const graph = /* @__PURE__ */ new Map();
   for (const { itemId: itemId2, targetId } of rows) {
     const bucket = graph.get(itemId2);
@@ -11803,7 +11907,7 @@ async function link(fromId, toId, opts) {
 
 // src/commands/backlog/unlink.ts
 import chalk82 from "chalk";
-import { and as and9, eq as eq24 } from "drizzle-orm";
+import { and as and10, eq as eq26 } from "drizzle-orm";
 async function unlink(fromId, toId) {
   const fromNum = parseItemId(fromId);
   const toNum = parseItemId(toId);
@@ -11827,7 +11931,7 @@ async function unlink(fromId, toId) {
     );
     return;
   }
-  await orm.delete(links).where(and9(eq24(links.itemId, fromNum), eq24(links.targetId, toNum)));
+  await orm.delete(links).where(and10(eq26(links.itemId, fromNum), eq26(links.targetId, toNum)));
   console.log(
     chalk82.green(
       `Removed link from ${formatItemId(fromNum)} to ${formatItemId(toNum)}.`
@@ -11847,7 +11951,7 @@ function registerLinkCommands(cmd) {
 
 // src/commands/backlog/move-repo/index.ts
 import chalk84 from "chalk";
-import { eq as eq26 } from "drizzle-orm";
+import { eq as eq28 } from "drizzle-orm";
 
 // src/commands/backlog/move-repo/confirmMove.ts
 import chalk83 from "chalk";
@@ -11862,9 +11966,9 @@ async function confirmMove(cnt, oldOrigin, newOrigin) {
 }
 
 // src/commands/backlog/move-repo/countByOrigin.ts
-import { count as count3, eq as eq25 } from "drizzle-orm";
+import { count as count3, eq as eq27 } from "drizzle-orm";
 async function countByOrigin(orm, origin) {
-  const [{ cnt }] = await orm.select({ cnt: count3() }).from(items).where(eq25(items.origin, origin));
+  const [{ cnt }] = await orm.select({ cnt: count3() }).from(items).where(eq27(items.origin, origin));
   return cnt;
 }
 
@@ -11907,7 +12011,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(eq26(items.origin, oldOrigin));
+  await orm.update(items).set({ origin: newOrigin }).where(eq28(items.origin, oldOrigin));
   console.log(
     chalk84.green(
       `Moved ${pluralItems(cnt)} from "${oldOrigin}" to "${newOrigin}".`
@@ -12324,10 +12428,10 @@ async function start(id) {
 
 // src/commands/backlog/stop/index.ts
 import chalk96 from "chalk";
-import { and as and10, eq as eq27 } from "drizzle-orm";
+import { and as and11, eq as eq29 } from "drizzle-orm";
 async function stop() {
   const { orm } = await getReady();
-  const stopped = await orm.update(items).set({ status: "todo", currentPhase: 1 }).where(and10(eq27(items.status, "in-progress"), eq27(items.origin, getOrigin()))).returning({ id: items.id, name: items.name });
+  const stopped = await orm.update(items).set({ status: "todo", currentPhase: 1 }).where(and11(eq29(items.status, "in-progress"), eq29(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;
@@ -12444,13 +12548,13 @@ async function findSubtask(id, index3) {
 }
 
 // src/commands/backlog/updateSubtask.ts
-import { and as and11, eq as eq28 } from "drizzle-orm";
+import { and as and12, eq as eq30 } 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(and11(eq28(itemSubtasks.itemId, itemId2), eq28(itemSubtasks.idx, idx))).returning({ title: itemSubtasks.title });
+  const [row] = await orm.update(itemSubtasks).set(set).where(and12(eq30(itemSubtasks.itemId, itemId2), eq30(itemSubtasks.idx, idx))).returning({ title: itemSubtasks.title });
   return row?.title;
 }
 
@@ -12505,16 +12609,16 @@ async function editSubtask(id, index3, options2) {
 import chalk102 from "chalk";
 
 // src/commands/backlog/deleteSubtask.ts
-import { and as and12, asc as asc6, eq as eq29 } from "drizzle-orm";
+import { and as and13, asc as asc8, eq as eq31 } from "drizzle-orm";
 async function deleteSubtask(orm, itemId2, idx) {
-  const [row] = await orm.delete(itemSubtasks).where(and12(eq29(itemSubtasks.itemId, itemId2), eq29(itemSubtasks.idx, idx))).returning({ title: itemSubtasks.title });
+  const [row] = await orm.delete(itemSubtasks).where(and13(eq31(itemSubtasks.itemId, itemId2), eq31(itemSubtasks.idx, idx))).returning({ title: itemSubtasks.title });
   if (!row) return void 0;
-  const remaining = await orm.select({ idx: itemSubtasks.idx }).from(itemSubtasks).where(eq29(itemSubtasks.itemId, itemId2)).orderBy(asc6(itemSubtasks.idx));
+  const remaining = await orm.select({ idx: itemSubtasks.idx }).from(itemSubtasks).where(eq31(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(
-      and12(eq29(itemSubtasks.itemId, itemId2), eq29(itemSubtasks.idx, oldIdx))
+      and13(eq31(itemSubtasks.itemId, itemId2), eq31(itemSubtasks.idx, oldIdx))
     );
   }
   return row.title;
@@ -12583,20 +12687,20 @@ function registerSubtaskCommands(cmd) {
 
 // src/commands/backlog/movePhase.ts
 import chalk104 from "chalk";
-import { count as count5, eq as eq32 } from "drizzle-orm";
+import { count as count5, eq as eq34 } from "drizzle-orm";
 
 // src/commands/backlog/reorderPhaseRows.ts
-import { and as and14, asc as asc8, eq as eq31 } from "drizzle-orm";
+import { and as and15, asc as asc10, eq as eq33 } from "drizzle-orm";
 
 // src/commands/backlog/reindexPhases.ts
-import { and as and13, asc as asc7, count as count4, eq as eq30 } from "drizzle-orm";
+import { and as and14, asc as asc9, count as count4, eq as eq32 } from "drizzle-orm";
 async function reindexPhases(db, itemId2) {
-  const remaining = await db.select({ idx: planPhases.idx }).from(planPhases).where(eq30(planPhases.itemId, itemId2)).orderBy(asc7(planPhases.idx));
+  const remaining = await db.select({ idx: planPhases.idx }).from(planPhases).where(eq32(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(and13(eq30(planTasks.itemId, itemId2), eq30(planTasks.phaseIdx, oldIdx)));
-    await db.update(planPhases).set({ idx: i }).where(and13(eq30(planPhases.itemId, itemId2), eq30(planPhases.idx, oldIdx)));
+    await db.update(planTasks).set({ phaseIdx: i }).where(and14(eq32(planTasks.itemId, itemId2), eq32(planTasks.phaseIdx, oldIdx)));
+    await db.update(planPhases).set({ idx: i }).where(and14(eq32(planPhases.itemId, itemId2), eq32(planPhases.idx, oldIdx)));
   }
 }
 async function adjustCurrentPhase(db, item, removedIdx) {
@@ -12604,24 +12708,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(eq30(items.id, item.id));
+    await db.update(items).set({ currentPhase: currentPhase - 1 }).where(eq32(items.id, item.id));
     return;
   }
   if (removedIdx !== currentIdx) return;
-  const [row] = await db.select({ cnt: count4() }).from(planPhases).where(eq30(planPhases.itemId, item.id));
+  const [row] = await db.select({ cnt: count4() }).from(planPhases).where(eq32(planPhases.itemId, item.id));
   const cnt = row?.cnt ?? 0;
-  await db.update(items).set({ currentPhase: cnt === 0 ? null : Math.min(currentPhase, cnt) }).where(eq30(items.id, item.id));
+  await db.update(items).set({ currentPhase: cnt === 0 ? null : Math.min(currentPhase, cnt) }).where(eq32(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(and14(eq31(planPhases.itemId, itemId2), eq31(planPhases.idx, fromIdx)));
-    const tasks = await tx.select({ idx: planTasks.idx, task: planTasks.task }).from(planTasks).where(and14(eq31(planTasks.itemId, itemId2), eq31(planTasks.phaseIdx, fromIdx))).orderBy(asc8(planTasks.idx));
+    const [phaseRow] = await tx.select({ name: planPhases.name, manualChecks: planPhases.manualChecks }).from(planPhases).where(and15(eq33(planPhases.itemId, itemId2), eq33(planPhases.idx, fromIdx)));
+    const tasks = await tx.select({ idx: planTasks.idx, task: planTasks.task }).from(planTasks).where(and15(eq33(planTasks.itemId, itemId2), eq33(planTasks.phaseIdx, fromIdx))).orderBy(asc10(planTasks.idx));
     await tx.delete(planTasks).where(
-      and14(eq31(planTasks.itemId, itemId2), eq31(planTasks.phaseIdx, fromIdx))
+      and15(eq33(planTasks.itemId, itemId2), eq33(planTasks.phaseIdx, fromIdx))
     );
-    await tx.delete(planPhases).where(and14(eq31(planPhases.itemId, itemId2), eq31(planPhases.idx, fromIdx)));
+    await tx.delete(planPhases).where(and15(eq33(planPhases.itemId, itemId2), eq33(planPhases.idx, fromIdx)));
     await reindexPhases(tx, itemId2);
     await shiftPhasesUp(tx, itemId2, toIdx);
     await tx.insert(planPhases).values({
@@ -12662,7 +12766,7 @@ async function movePhase(id, from, to) {
   if (!found) return;
   const { orm, item } = found;
   const itemId2 = item.id;
-  const [row] = await orm.select({ cnt: count5() }).from(planPhases).where(eq32(planPhases.itemId, itemId2));
+  const [row] = await orm.select({ cnt: count5() }).from(planPhases).where(eq34(planPhases.itemId, itemId2));
   const phaseCount = row?.cnt ?? 0;
   const fromIdx = toIndex(from, phaseCount);
   if (fromIdx === void 0) return;
@@ -12678,22 +12782,22 @@ async function movePhase(id, from, to) {
 import chalk106 from "chalk";
 
 // src/commands/backlog/applyPhaseUpdate.ts
-import { and as and15, eq as eq33 } from "drizzle-orm";
+import { and as and16, eq as eq35 } 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(
-        and15(eq33(planPhases.itemId, itemId2), eq33(planPhases.idx, phaseIdx))
+        and16(eq35(planPhases.itemId, itemId2), eq35(planPhases.idx, phaseIdx))
       );
     }
     if (fields.manualCheck) {
       await tx.update(planPhases).set({ manualChecks: JSON.stringify(fields.manualCheck) }).where(
-        and15(eq33(planPhases.itemId, itemId2), eq33(planPhases.idx, phaseIdx))
+        and16(eq35(planPhases.itemId, itemId2), eq35(planPhases.idx, phaseIdx))
       );
     }
     if (fields.task) {
       await tx.delete(planTasks).where(
-        and15(eq33(planTasks.itemId, itemId2), eq33(planTasks.phaseIdx, phaseIdx))
+        and16(eq35(planTasks.itemId, itemId2), eq35(planTasks.phaseIdx, phaseIdx))
       );
       if (fields.task.length) {
         await tx.insert(planTasks).values(
@@ -12711,14 +12815,14 @@ async function applyPhaseUpdate(orm, itemId2, phaseIdx, fields) {
 
 // src/commands/backlog/findPhase.ts
 import chalk105 from "chalk";
-import { and as and16, count as count6, eq as eq34 } from "drizzle-orm";
+import { and as and17, count as count6, eq as eq36 } 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: count6() }).from(planPhases).where(and16(eq34(planPhases.itemId, itemId2), eq34(planPhases.idx, phaseIdx)));
+  const [row] = await orm.select({ cnt: count6() }).from(planPhases).where(and17(eq36(planPhases.itemId, itemId2), eq36(planPhases.idx, phaseIdx)));
   if (!row || row.cnt === 0) {
     console.log(
       chalk105.red(
@@ -12891,16 +12995,16 @@ function registerUpdatePhaseCommand(cmd) {
 
 // src/commands/backlog/removePhase.ts
 import chalk107 from "chalk";
-import { and as and17, eq as eq35 } from "drizzle-orm";
+import { and as and18, eq as eq37 } 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(
-      and17(eq35(planTasks.itemId, itemId2), eq35(planTasks.phaseIdx, phaseIdx))
+      and18(eq37(planTasks.itemId, itemId2), eq37(planTasks.phaseIdx, phaseIdx))
     );
-    await tx.delete(planPhases).where(and17(eq35(planPhases.itemId, itemId2), eq35(planPhases.idx, phaseIdx)));
+    await tx.delete(planPhases).where(and18(eq37(planPhases.itemId, itemId2), eq37(planPhases.idx, phaseIdx)));
     await reindexPhases(tx, itemId2);
     await adjustCurrentPhase(tx, item, phaseIdx);
   });
@@ -12913,7 +13017,7 @@ async function removePhase(id, phase) {
 
 // src/commands/backlog/update/update.ts
 import chalk111 from "chalk";
-import { eq as eq36 } from "drizzle-orm";
+import { eq as eq38 } from "drizzle-orm";
 
 // src/commands/backlog/update/buildUpdateValues.ts
 import chalk108 from "chalk";
@@ -13024,7 +13128,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(eq36(items.id, itemId2));
+  await orm.update(items).set(built.set).where(eq38(items.id, itemId2));
   console.log(
     chalk111.green(`Updated ${built.fields} on item ${formatItemId(itemId2)}.`)
   );
@@ -17107,9 +17211,9 @@ function registerGithub(program2) {
 }
 
 // src/commands/handover/countPendingHandovers.ts
-import { and as and18, eq as eq37, isNull, sql as sql18 } from "drizzle-orm";
+import { and as and19, eq as eq39, isNull, sql as sql18 } from "drizzle-orm";
 async function countPendingHandovers(orm, origin) {
-  const [row] = await orm.select({ count: sql18`count(*)::int` }).from(handovers).where(and18(eq37(handovers.origin, origin), isNull(handovers.recalledAt)));
+  const [row] = await orm.select({ count: sql18`count(*)::int` }).from(handovers).where(and19(eq39(handovers.origin, origin), isNull(handovers.recalledAt)));
   return row?.count ?? 0;
 }
 
@@ -17249,13 +17353,13 @@ async function load2(options2 = {}) {
 }
 
 // src/commands/handover/listPendingHandovers.ts
-import { and as and19, desc as desc4, eq as eq38, isNull as isNull2 } from "drizzle-orm";
+import { and as and20, desc as desc4, eq as eq40, 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(and19(eq38(handovers.origin, origin), isNull2(handovers.recalledAt))).orderBy(desc4(handovers.createdAt), desc4(handovers.id));
+  }).from(handovers).where(and20(eq40(handovers.origin, origin), isNull2(handovers.recalledAt))).orderBy(desc4(handovers.createdAt), desc4(handovers.id));
 }
 
 // src/commands/handover/printPendingHandovers.ts
@@ -17268,17 +17372,17 @@ async function printPendingHandovers() {
 }
 
 // src/commands/handover/recallHandover.ts
-import { and as and20, desc as desc5, eq as eq39, isNull as isNull3 } from "drizzle-orm";
+import { and as and21, desc as desc5, eq as eq41, isNull as isNull3 } from "drizzle-orm";
 async function recallHandover(orm, origin, id) {
   const [row] = await orm.select().from(handovers).where(
-    and20(
-      eq39(handovers.origin, origin),
+    and21(
+      eq41(handovers.origin, origin),
       isNull3(handovers.recalledAt),
-      ...id === void 0 ? [] : [eq39(handovers.id, id)]
+      ...id === void 0 ? [] : [eq41(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(eq39(handovers.id, row.id));
+  await orm.update(handovers).set({ recalledAt: /* @__PURE__ */ new Date() }).where(eq41(handovers.id, row.id));
   return row.content;
 }
 
@@ -17861,7 +17965,7 @@ function runInstall(worktreePath, clone, install, onSeeded) {
   }
   const windows = /^[A-Za-z]:[\\/]/.test(worktreePath);
   const shell = windows ? "cmd.exe" : process.env.SHELL ?? "bash";
-  const shellArgs = windows ? ["/c", command] : ["-l", "-c", command];
+  const shellArgs = windows ? ["/c", `cd /d ${quoteForCmd(worktreePath)} && ${command}`] : ["-l", "-c", `cd ${quoteForPosixShell(worktreePath)} && ${command}`];
   daemonLog(`worktree ${worktreePath} installing deps: ${command}`);
   execFile8(shell, shellArgs, { cwd: worktreePath }, (error) => {
     daemonLog(
@@ -17870,6 +17974,12 @@ function runInstall(worktreePath, clone, install, onSeeded) {
     onSeeded();
   });
 }
+function quoteForPosixShell(value) {
+  return `'${value.replaceAll("'", `'\\''`)}'`;
+}
+function quoteForCmd(value) {
+  return `"${value.replaceAll('"', "")}"`;
+}
 function message(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -19281,20 +19391,20 @@ function resolveThread(threadId) {
   }
 }
 function requireCache(prNumber) {
-  const cache3 = loadCommentsCache(prNumber);
-  if (!cache3) {
+  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 cache3;
+  return cache4;
 }
 function findLineComment(comments3, commentId) {
   return comments3.find((c) => c.type === "line" && c.id === commentId);
 }
-function requireLineComment(cache3, commentId) {
-  const comment3 = findLineComment(cache3.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.`
@@ -19303,8 +19413,8 @@ function requireLineComment(cache3, commentId) {
   }
   return comment3;
 }
-function cleanupCacheIfDone(cache3, prNumber, commentId) {
-  const hasRemaining = cache3.comments.some(
+function cleanupCacheIfDone(cache4, prNumber, commentId) {
+  const hasRemaining = cache4.comments.some(
     (c) => c.type === "line" && c.id !== commentId
   );
   if (!hasRemaining) deleteCommentsCache(prNumber);
@@ -19312,13 +19422,13 @@ function cleanupCacheIfDone(cache3, prNumber, commentId) {
 function resolveCommentWithReply(commentId, message2) {
   const prNumber = getCurrentPrNumber();
   const { org, repo } = getRepoInfo();
-  const cache3 = requireCache(prNumber);
-  const comment3 = requireLineComment(cache3, 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(cache3, prNumber, commentId);
+  cleanupCacheIfDone(cache4, prNumber, commentId);
 }
 
 // src/commands/prs/fixed.ts
@@ -19739,7 +19849,7 @@ async function recordPrActivity() {
 }
 
 // src/commands/prs/placePr.ts
-function hasUpstream() {
+function hasUpstream2() {
   try {
     execFileSync8(
       "git",
@@ -19752,7 +19862,7 @@ function hasUpstream() {
   }
 }
 function ensureBranchPushed() {
-  const args = hasUpstream() ? ["push"] : ["push", "--set-upstream", "origin", "HEAD"];
+  const args = hasUpstream2() ? ["push"] : ["push", "--set-upstream", "origin", "HEAD"];
   execFileSync8("git", args, { stdio: "inherit" });
 }
 async function placePr(prNumber, title, body, options2) {
@@ -26478,6 +26588,7 @@ function toSessionInfo({
   serverOrigin,
   assistArgs,
   cwd,
+  claudeSessionId,
   restored,
   error,
   activity: activity2,
@@ -26508,6 +26619,7 @@ function toSessionInfo({
     remoteOrigin: serverOrigin ?? originForCwd(cwd),
     assistArgs,
     cwd,
+    claudeSessionId,
     repoGroup: repoGroupForCwd(cwd),
     restored,
     error,
@@ -27296,10 +27408,10 @@ function applyReviewPause(session, activity2) {
 }
 
 // src/shared/db/getPhaseActiveMs.ts
-import { and as and21, eq as eq40 } from "drizzle-orm";
+import { and as and22, eq as eq42 } from "drizzle-orm";
 async function getPhaseActiveMs(db, itemId2, phaseIdx) {
   const [row] = await db.select({ activeMs: phaseUsage.activeMs }).from(phaseUsage).where(
-    and21(eq40(phaseUsage.itemId, itemId2), eq40(phaseUsage.phaseIdx, phaseIdx))
+    and22(eq42(phaseUsage.itemId, itemId2), eq42(phaseUsage.phaseIdx, phaseIdx))
   );
   return row?.activeMs ?? 0;
 }
@@ -27810,17 +27922,17 @@ async function recordPhaseTranscriptUsage(db, itemId2, phaseIdx, responses) {
 }
 
 // src/shared/db/recordWindowTokens.ts
-import { and as and22, eq as eq41, sql as sql24 } from "drizzle-orm";
+import { and as and23, eq as eq43, 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(
-    and22(
-      eq41(usagePeaks.window, window),
-      eq41(usagePeaks.resetsAt, resetsAt),
-      eq41(usagePeaks.segment, 0)
+    and23(
+      eq43(usagePeaks.window, window),
+      eq43(usagePeaks.resetsAt, resetsAt),
+      eq43(usagePeaks.segment, 0)
     )
   );
 }
@@ -30278,7 +30390,7 @@ var sessionsConfigHelp = [
   {
     key: "sessions.includeCommittedChanges",
     setter: "assist config set sessions.includeCommittedChanges true -g",
-    note: "session card counts and /diff span the whole branch (merge-base with the default branch) instead of just uncommitted work (default off)"
+    note: "session card counts and /diff span the whole session (its first commit's parent, else merge-base with the default branch) instead of just uncommitted work (default off)"
   },
   {
     key: "worktree.enabled",