@staff0rd/assist 0.487.1 → 0.488.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.487.1",
+  version: "0.488.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -580,7 +580,8 @@ var assistConfigShape = {
     windowsVersionCheck: z2.enum(["block", "warn", "off"]).default("block"),
     includeCommittedChanges: z2.boolean().default(true),
     topBar: z2.boolean().default(true),
-    floatWaiting: z2.boolean().default(true)
+    floatWaiting: z2.boolean().default(true),
+    floatWaitingAfterMs: z2.number().default(5e3)
   }).optional(),
   database: z2.strictObject({
     url: z2.string().optional()
@@ -10664,10 +10665,19 @@ function sessionLayout(_req, res) {
   respondJson(res, 200, { topBar });
 }
 
+// src/commands/sessions/shared/sessionViewDefaults.ts
+var sessionViewDefaults = {
+  floatWaiting: true,
+  floatWaitingAfterMs: 5e3
+};
+
 // src/commands/sessions/web/sessionView.ts
 function sessionView(_req, res) {
-  const floatWaiting = loadConfig().sessions?.floatWaiting ?? true;
-  respondJson(res, 200, { floatWaiting });
+  const sessions = loadConfig().sessions;
+  respondJson(res, 200, {
+    floatWaiting: sessions?.floatWaiting ?? sessionViewDefaults.floatWaiting,
+    floatWaitingAfterMs: sessions?.floatWaitingAfterMs ?? sessionViewDefaults.floatWaitingAfterMs
+  });
 }
 
 // src/commands/config/coerceConfigScalar.ts
@@ -19052,7 +19062,11 @@ function allocateTree(requestedCwd, boundTreeRoots2, options2 = {}) {
     return { cwd: requestedCwd, kind: "primary", created: false };
   const clone = mainWorktree(repoRoot) ?? repoRoot;
   const reuse = { ...options2, includeDrafts: cfg.includeDrafts };
-  if (reusesClone(clone, boundTreeRoots2, reuse))
+  if (mustLeaveTrunk(cfg.trunk, options2))
+    daemonLog(
+      `committing session spilled out of the clone ${clone}: worktree.trunk is on, so a commit here would land on the local mainline`
+    );
+  else if (reusesClone(clone, boundTreeRoots2, reuse))
     return { cwd: clone, kind: "primary", created: false, clone };
   const path71 = createWorktree(
     clone,
@@ -19061,6 +19075,9 @@ function allocateTree(requestedCwd, boundTreeRoots2, options2 = {}) {
   );
   return { cwd: path71, kind: "worktree", created: true, clone };
 }
+function mustLeaveTrunk(trunk, options2) {
+  return trunk === true && options2.commits === true;
+}
 function keptInPlace(cwd) {
   daemonLog(
     `session kept in ${cwd}: launched against work already checked out there`
@@ -31585,6 +31602,15 @@ function isPrCheckoutArgs(args) {
   return rest.some((arg) => /^[1-9]\d*$/.test(arg));
 }
 
+// src/commands/sessions/daemon/worktree/isCommittingArgs.ts
+var ITEM_ID = /^a?\d+$/;
+function isCommittingArgs(args) {
+  if (isPrCheckoutArgs(args)) return true;
+  const [command, subcommand, ...rest] = args;
+  if (command !== "backlog" || subcommand !== "run") return false;
+  return rest.some((arg) => ITEM_ID.test(arg));
+}
+
 // src/commands/sessions/daemon/worktree/spawnInTree.ts
 function allocateAndBind(ctx, cwd, create, options2 = {}) {
   const alloc = allocateTree(cwd, boundTreeRoots(ctx.sessions), options2);
@@ -31607,6 +31633,7 @@ function spawnAssistInTree(ctx, assistArgs, cwd, meta) {
     (sid, resolvedCwd, holdUntilSeeded) => createAssistSession(sid, assistArgs, resolvedCwd, meta, holdUntilSeeded),
     {
       forCheckout: isPrCheckoutArgs(assistArgs),
+      commits: isCommittingArgs(assistArgs),
       draftLike: isDraftCommand(assistArgs[0]),
       inPlace: meta?.inPlace
     }
@@ -32363,6 +32390,11 @@ var sessionsConfigHelp = [
     setter: "assist config set sessions.floatWaiting false -g",
     note: "set false to stop the sidebar floating sessions that have been waiting on input for a few seconds above the other unstarred cards (default on)"
   },
+  {
+    key: "sessions.floatWaitingAfterMs",
+    setter: "assist config set sessions.floatWaitingAfterMs 15000 -g",
+    note: "how long a session must have been waiting on input before it floats (default: 5000ms)"
+  },
   {
     key: "worktree.enabled",
     setter: "assist config set worktree.enabled true -g --repo",

package/package.json

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