@staff0rd/assist 0.469.5 → 0.471.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.469.5",
+  version: "0.471.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -506,7 +506,8 @@ var assistConfigSchema = z2.strictObject({
     windowsDaemonPort: z2.number().optional(),
     windowsVersionCheck: z2.enum(["block", "warn", "off"]).default("block"),
     includeCommittedChanges: z2.boolean().default(false),
-    topBar: z2.boolean().default(true)
+    topBar: z2.boolean().default(true),
+    floatWaiting: z2.boolean().default(false)
   }).optional(),
   database: z2.strictObject({
     url: z2.string().optional()
@@ -9045,28 +9046,6 @@ async function handleItemRoute(req, res, pathname) {
   return false;
 }
 
-// src/commands/sessions/web/execGit.ts
-import { execFile as execFile3 } from "child_process";
-import { promisify as promisify2 } from "util";
-var execFileAsync2 = promisify2(execFile3);
-async function execGit(cwd, args, opts = {}) {
-  const { maxBuffer, allowFailure } = opts;
-  const { file, argv } = /^[A-Za-z]:[\\/]/.test(cwd) ? { file: "git.exe", argv: ["-C", cwd, ...args] } : { file: "git", argv: args };
-  try {
-    const { stdout } = await execFileAsync2(file, argv, {
-      encoding: "utf8",
-      ...maxBuffer ? { maxBuffer } : {},
-      ...file === "git" ? { cwd } : {}
-    });
-    return stdout;
-  } catch (error) {
-    if (allowFailure && error && typeof error === "object" && "stdout" in error) {
-      return String(error.stdout);
-    }
-    throw error;
-  }
-}
-
 // src/commands/sessions/web/getCwdParam.ts
 function getCwdParam(req, res) {
   const url = new URL(req.url ?? "/", "http://localhost");
@@ -9084,6 +9063,31 @@ function getSessionParam(req) {
   return url.searchParams.get("session") ?? void 0;
 }
 
+// src/commands/sessions/web/windowsCwdToWslPath.ts
+function windowsCwdToWslPath(cwd) {
+  const match = /^([A-Za-z]):[\\/](.*)$/.exec(cwd);
+  if (!match) return cwd;
+  const drive = match[1].toLowerCase();
+  const rest = match[2].replace(/\\/g, "/");
+  return `/mnt/${drive}/${rest}`;
+}
+
+// src/commands/sessions/web/toGitCwd.ts
+function toGitCwd(cwd) {
+  return detectPlatform() === "wsl" ? windowsCwdToWslPath(cwd) : cwd;
+}
+
+// src/commands/sessions/web/includesCommittedChanges.ts
+function includesCommittedChanges(cwd) {
+  try {
+    return Boolean(
+      loadConfigFrom(toGitCwd(cwd)).sessions?.includeCommittedChanges
+    );
+  } catch {
+    return false;
+  }
+}
+
 // src/shared/db/findItemBySessionId.ts
 import { asc as asc6, eq as eq16 } from "drizzle-orm";
 async function findItemBySessionId(db, claudeSessionId) {
@@ -9120,15 +9124,53 @@ async function itemCommits(sessionId) {
   }
 }
 
+// src/commands/sessions/web/itemScopeCommits.ts
+async function itemScopeCommits(cwd, sessionId) {
+  if (!sessionId || !includesCommittedChanges(cwd)) return [];
+  return itemCommits(sessionId);
+}
+
+// src/commands/sessions/web/resolveDiffScope.ts
+async function resolveDiffScope(cwd, sessionId, scope) {
+  if (!scope || scope === "all") return { kind: "all" };
+  if (scope === "uncommitted") return { kind: "uncommitted" };
+  const commits2 = await itemScopeCommits(cwd, sessionId);
+  if (!commits2.some((commit2) => commit2.sha === scope)) return void 0;
+  return { kind: "commit", sha: scope };
+}
+
+// src/commands/sessions/web/execGit.ts
+import { execFile as execFile3 } from "child_process";
+import { promisify as promisify2 } from "util";
+var execFileAsync2 = promisify2(execFile3);
+async function execGit(cwd, args, opts = {}) {
+  const { maxBuffer, allowFailure } = opts;
+  const { file, argv } = /^[A-Za-z]:[\\/]/.test(cwd) ? { file: "git.exe", argv: ["-C", cwd, ...args] } : { file: "git", argv: args };
+  try {
+    const { stdout } = await execFileAsync2(file, argv, {
+      encoding: "utf8",
+      ...maxBuffer ? { maxBuffer } : {},
+      ...file === "git" ? { cwd } : {}
+    });
+    return stdout;
+  } catch (error) {
+    if (allowFailure && error && typeof error === "object" && "stdout" in error) {
+      return String(error.stdout);
+    }
+    throw error;
+  }
+}
+
 // src/commands/sessions/web/resolveCommit.ts
 var GIT_EMPTY_TREE_HASH = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
-async function resolveCommit(cwd, sha) {
+async function commitBase(cwd, sha) {
   if (!await commitExists(cwd, sha)) return void 0;
-  const parent = await parentOf(cwd, sha);
-  return {
-    base: parent ?? GIT_EMPTY_TREE_HASH,
-    paths: await commitPaths(cwd, sha)
-  };
+  return await parentOf(cwd, sha) ?? GIT_EMPTY_TREE_HASH;
+}
+async function resolveCommit(cwd, sha) {
+  const base = await commitBase(cwd, sha);
+  if (!base) return void 0;
+  return { base, paths: await commitPaths(cwd, sha) };
 }
 async function commitExists(cwd, sha) {
   try {
@@ -9197,20 +9239,6 @@ async function loadCommittedPaths(cwd, sessionId) {
   return { commits: commits2, bases };
 }
 
-// src/commands/sessions/web/windowsCwdToWslPath.ts
-function windowsCwdToWslPath(cwd) {
-  const match = /^([A-Za-z]):[\\/](.*)$/.exec(cwd);
-  if (!match) return cwd;
-  const drive = match[1].toLowerCase();
-  const rest = match[2].replace(/\\/g, "/");
-  return `/mnt/${drive}/${rest}`;
-}
-
-// src/commands/sessions/web/toGitCwd.ts
-function toGitCwd(cwd) {
-  return detectPlatform() === "wsl" ? windowsCwdToWslPath(cwd) : cwd;
-}
-
 // src/commands/sessions/web/itemChangeSet.ts
 async function itemChangeSet(cwd, sessionId) {
   if (!sessionId || !includesCommittedChanges(cwd)) return void 0;
@@ -9221,15 +9249,6 @@ async function itemChangeSet(cwd, sessionId) {
   if (dirty.length > 0) groups.push({ base: "HEAD", paths: dirty });
   return { commits: commits2, groups };
 }
-function includesCommittedChanges(cwd) {
-  try {
-    return Boolean(
-      loadConfigFrom(toGitCwd(cwd)).sessions?.includeCommittedChanges
-    );
-  } catch {
-    return false;
-  }
-}
 function groupByBase(bases) {
   const groups = /* @__PURE__ */ new Map();
   for (const [path71, base] of bases) {
@@ -9244,8 +9263,13 @@ async function dirtyPaths(cwd, bases) {
   return output.split("\n").filter((path71) => path71 && !bases.has(path71)).sort();
 }
 
-// src/commands/sessions/web/diff.ts
+// src/commands/sessions/web/scopedDiff.ts
 var MAX_DIFF_BYTES = 50 * 1024 * 1024;
+async function scopedDiff(cwd, session, scope) {
+  if (scope.kind === "commit") return commitDiff(cwd, scope.sha);
+  const tracked = scope.kind === "uncommitted" ? await workingTreeDiff(cwd) : await trackedDiff(cwd, session);
+  return tracked + await untrackedDiff(cwd);
+}
 async function untrackedFileDiff(cwd, path71) {
   return execGit(cwd, ["diff", "--no-index", "--", "/dev/null", path71], {
     maxBuffer: MAX_DIFF_BYTES,
@@ -9274,25 +9298,56 @@ async function groupedDiff(cwd, groups) {
   );
   return diffs.join("");
 }
+async function workingTreeDiff(cwd) {
+  return execGit(cwd, ["diff", "HEAD"], { maxBuffer: MAX_DIFF_BYTES });
+}
 async function trackedDiff(cwd, session) {
   const changeSet = await itemChangeSet(cwd, session);
   if (changeSet) return groupedDiff(cwd, changeSet.groups);
-  return execGit(cwd, ["diff", "HEAD"], { maxBuffer: MAX_DIFF_BYTES });
+  return workingTreeDiff(cwd);
+}
+async function commitDiff(cwd, sha) {
+  const base = await commitBase(cwd, sha);
+  if (!base) return "";
+  return execGit(cwd, ["diff", base, sha], { maxBuffer: MAX_DIFF_BYTES });
+}
+
+// src/commands/sessions/web/diff.ts
+function getScopeParam(req) {
+  const url = new URL(req.url ?? "/", "http://localhost");
+  return url.searchParams.get("scope") ?? void 0;
 }
 async function diff2(req, res) {
   const cwd = getCwdParam(req, res);
   if (!cwd) return;
+  const session = getSessionParam(req);
   try {
-    const tracked = await trackedDiff(cwd, getSessionParam(req));
-    const untracked = await untrackedDiff(cwd);
+    const scope = await resolveDiffScope(cwd, session, getScopeParam(req));
+    if (!scope) {
+      respondJson(res, 400, { error: "Invalid scope" });
+      return;
+    }
+    const body = await scopedDiff(cwd, session, scope);
     res.writeHead(200, { "Content-Type": "text/plain; charset=utf-8" });
-    res.end(tracked + untracked);
+    res.end(body);
   } catch {
     res.writeHead(500, { "Content-Type": "text/plain; charset=utf-8" });
     res.end("");
   }
 }
 
+// src/commands/sessions/web/diffScopes.ts
+async function diffScopes(req, res) {
+  const cwd = getCwdParam(req, res);
+  if (!cwd) return;
+  try {
+    const commits2 = await itemScopeCommits(cwd, getSessionParam(req));
+    respondJson(res, 200, { commits: commits2 });
+  } catch {
+    respondJson(res, 200, { commits: [] });
+  }
+}
+
 // src/commands/sessions/web/fileContent.ts
 import { readFile, stat as stat2 } from "fs/promises";
 import { isAbsolute, relative as relative2, resolve as resolve9 } from "path";
@@ -10396,6 +10451,12 @@ function sessionLayout(_req, res) {
   respondJson(res, 200, { topBar });
 }
 
+// src/commands/sessions/web/sessionView.ts
+function sessionView(_req, res) {
+  const floatWaiting = loadConfig().sessions?.floatWaiting ?? false;
+  respondJson(res, 200, { floatWaiting });
+}
+
 // src/commands/config/setNestedValue.ts
 function isPlainObject(val) {
   return val !== null && typeof val === "object" && !Array.isArray(val);
@@ -10930,11 +10991,13 @@ var routes2 = {
   "GET /api/github-url": githubUrl,
   "GET /api/git-status": gitStatus,
   "GET /api/diff": diff2,
+  "GET /api/diff-scopes": diffScopes,
   "GET /api/file": fileContent,
   "GET /api/files": listFiles,
   "GET /api/jira-site": jiraSite,
   "GET /api/harness": harnessCapabilities,
   "GET /api/session-layout": sessionLayout,
+  "GET /api/session-view": sessionView,
   "GET /api/pr-status": prStatus,
   "GET /api/server-runs": handleServerRuns,
   "GET /api/pr-list": prList,
@@ -27494,6 +27557,7 @@ function toSessionInfo({
   startedAt,
   runningMs,
   runningSince,
+  waitingSince,
   runName,
   runArgs,
   server,
@@ -27526,6 +27590,7 @@ function toSessionInfo({
     startedAt,
     runningMs,
     runningSince,
+    waitingSince,
     runName,
     runArgs,
     server,
@@ -27768,6 +27833,7 @@ function sessionBase(id, status3) {
     /* why: runningMs counts only running stretches, so a session that starts
      * waiting (idle, awaiting first input) has no open stretch to stamp. */
     runningSince: status3 === "running" ? startedAt : null,
+    waitingSince: status3 === "waiting" ? startedAt : null,
     scrollback: ""
   };
 }
@@ -27976,7 +28042,13 @@ function setStatus2(session, newStatus) {
     session.runningMs += now - session.runningSince;
   }
   session.runningSince = newStatus === "running" ? now : null;
+  session.waitingSince = newStatus === "waiting" ? now : null;
   session.status = newStatus;
+  if (newStatus === "waiting") {
+    daemonLog(
+      `session ${session.id} waiting since ${new Date(now).toISOString()}`
+    );
+  }
 }
 
 // src/commands/sessions/daemon/worktree/watchGitState.ts
@@ -29290,6 +29362,7 @@ function errorSession(id, persisted, error) {
     startedAt: persisted.startedAt,
     runningMs: persisted.runningMs ?? 0,
     runningSince: null,
+    waitingSince: null,
     pty: null,
     runName: persisted.runName,
     runArgs: persisted.runArgs,
@@ -29336,6 +29409,7 @@ function restoredSession(base, persisted, pty2, status3) {
     startedAt,
     runningMs: persisted.runningMs ?? 0,
     runningSince: status3 === "running" ? startedAt : null,
+    waitingSince: status3 === "waiting" ? startedAt : null,
     pty: pty2,
     claudeSessionId: persisted.claudeSessionId,
     restored: true,
@@ -29382,6 +29456,7 @@ function notRestoredStub(base, persisted) {
     startedAt: persisted.startedAt,
     runningMs: persisted.runningMs ?? 0,
     runningSince: null,
+    waitingSince: null,
     pty: null,
     runName: persisted.runName,
     runArgs: persisted.runArgs,
@@ -29397,6 +29472,7 @@ function updatedSession(id, persisted) {
     startedAt: persisted.startedAt,
     runningMs: persisted.runningMs ?? 0,
     runningSince: null,
+    waitingSince: null,
     pty: null
   };
 }
@@ -30655,6 +30731,7 @@ function createAssistSession(id, assistArgs, cwd, meta, holdPty) {
     startedAt,
     runningMs: 0,
     runningSince: startedAt,
+    waitingSince: null,
     ...startOrHoldPty(
       () => spawnPty(["assist", ...assistArgs], cwd, id),
       holdPty
@@ -30676,6 +30753,7 @@ function resumeSession(id, sessionId, cwd, name) {
     startedAt,
     runningMs: 0,
     runningSince: null,
+    waitingSince: startedAt,
     pty: spawnClaude2({ resumeSessionId: sessionId, cwd, sessionId: id }),
     scrollback: "",
     cwd,
@@ -31444,6 +31522,11 @@ var sessionsConfigHelp = [
     setter: "assist config set sessions.topBar false -g",
     note: "set false to keep the active session's phase, elapsed, restored indicator, toggles and actions on its card instead of a sticky top bar above the terminal (default on)"
   },
+  {
+    key: "sessions.floatWaiting",
+    setter: "assist config set sessions.floatWaiting true -g",
+    note: "float sessions that have been waiting on input for a few seconds above the other unstarred cards in the sidebar (default off)"
+  },
   {
     key: "worktree.enabled",
     setter: "assist config set worktree.enabled true -g --repo",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.469.5",
+	"version": "0.471.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {