@staff0rd/assist 0.487.2 → 0.488.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.487.2",
+  version: "0.488.1",
   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
@@ -10881,6 +10891,18 @@ function resolveNamedRepoWriteLabel(globalRaw, name) {
   return matches[0];
 }
 
+// src/commands/config/resolveRepoConfigBlock.ts
+function resolveRepoConfigBlock(repoName, cwd) {
+  const globalRaw = loadGlobalConfigRaw();
+  const label2 = repoName === void 0 ? resolveRepoWriteLabel(globalRaw, getCurrentOrigin(cwd)) : resolveNamedRepoWriteLabel(globalRaw, repoName);
+  const repos2 = isPlainObject3(globalRaw.repos) ? { ...globalRaw.repos } : {};
+  const block = isPlainObject3(repos2[label2]) ? repos2[label2] : {};
+  return { globalRaw, repos: repos2, label: label2, block };
+}
+function isPlainObject3(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
 // src/commands/config/applyRepoConfigSet.ts
 function applyRepoConfigSet(key, coerced, repoName, cwd = process.cwd()) {
   if (isGlobalOnlyConfigKey(key)) {
@@ -10891,20 +10913,17 @@ function applyRepoConfigSet(key, coerced, repoName, cwd = process.cwd()) {
       ]
     };
   }
-  const globalRaw = loadGlobalConfigRaw();
-  const label2 = repoName === void 0 ? resolveRepoWriteLabel(globalRaw, getCurrentOrigin(cwd)) : resolveNamedRepoWriteLabel(globalRaw, repoName);
-  const repos2 = isPlainObject3(globalRaw.repos) ? { ...globalRaw.repos } : {};
-  const existingBlock = isPlainObject3(repos2[label2]) ? repos2[label2] : {};
-  const updatedBlock = setNestedValue(existingBlock, key, coerced);
+  const { globalRaw, repos: repos2, label: label2, block } = resolveRepoConfigBlock(
+    repoName,
+    cwd
+  );
+  const updatedBlock = setNestedValue(block, key, coerced);
   const validation = validateConfig(updatedBlock, key, repoConfigSchema);
   if (!validation.ok) return validation;
   repos2[label2] = updatedBlock;
   saveGlobalConfig({ ...globalRaw, repos: repos2 });
   return { ok: true, target: "repo", label: label2 };
 }
-function isPlainObject3(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
 
 // src/commands/sessions/web/applyScopedConfigSet.ts
 function applyScopedConfigSet(key, value, cwd, scope) {
@@ -10984,6 +11003,11 @@ function setConfig(req, res) {
   });
 }
 
+// src/commands/config/isKnownConfigKey.ts
+function isKnownConfigKey(key) {
+  return enumerateConfigLeafKeys(assistConfigSchema).includes(key);
+}
+
 // src/commands/config/unsetNestedValue.ts
 function isPlainObject4(val) {
   return val !== null && typeof val === "object" && !Array.isArray(val);
@@ -11074,9 +11098,48 @@ function applyConfigUnset(key, global, cwd = process.cwd()) {
   return { ok: true, target, removed: true };
 }
 
-// src/commands/config/isKnownConfigKey.ts
-function isKnownConfigKey(key) {
-  return enumerateConfigLeafKeys(assistConfigSchema).includes(key);
+// src/commands/config/applyRepoConfigUnset.ts
+function applyRepoConfigUnset(key, repoName, cwd = process.cwd()) {
+  if (isGlobalOnlyConfigKey(key)) {
+    return {
+      ok: false,
+      errors: [
+        `"${key}" is a global-only key. Unset it in ~/.assist.yml rather than under repos:`
+      ]
+    };
+  }
+  const { globalRaw, repos: repos2, label: label2, block } = resolveRepoConfigBlock(
+    repoName,
+    cwd
+  );
+  const { config: updatedBlock, removed } = unsetNestedValue(block, key);
+  if (!removed) return { ok: true, target: "repo", label: label2, removed: false };
+  const validation = validateConfig(updatedBlock, key, repoConfigSchema);
+  if (!validation.ok) return validation;
+  if (Object.keys(updatedBlock).length === 0) delete repos2[label2];
+  else repos2[label2] = updatedBlock;
+  const next3 = { ...globalRaw };
+  if (Object.keys(repos2).length === 0) delete next3.repos;
+  else next3.repos = repos2;
+  saveGlobalConfig(next3);
+  return { ok: true, target: "repo", label: label2, removed: true };
+}
+
+// src/commands/sessions/web/applyScopedConfigUnset.ts
+function applyScopedConfigUnset(key, cwd, scope) {
+  if (scope === "repo") {
+    const result2 = applyRepoConfigUnset(key, void 0, cwd);
+    return result2.ok ? {
+      ok: true,
+      payload: {
+        target: result2.target,
+        repoKey: result2.label,
+        removed: result2.removed
+      }
+    } : result2;
+  }
+  const result = applyConfigUnset(key, scope === "global", cwd);
+  return result.ok ? { ok: true, payload: { target: result.target, removed: result.removed } } : result;
 }
 
 // src/commands/sessions/web/unsetConfig.ts
@@ -11084,22 +11147,7 @@ function unsetConfig(req, res) {
   return handleConfigWrite(req, res, (request) => {
     if (!isKnownConfigKey(request.key))
       return { ok: false, errors: [`Unknown config key "${request.key}"`] };
-    if (request.scope === "repo")
-      return {
-        ok: false,
-        errors: [
-          "Clearing a repos override is not supported \u2014 remove the key from repos: in ~/.assist.yml"
-        ]
-      };
-    const result = applyConfigUnset(
-      request.key,
-      request.scope === "global",
-      request.cwd
-    );
-    return result.ok ? {
-      ok: true,
-      payload: { target: result.target, removed: result.removed }
-    } : result;
+    return applyScopedConfigUnset(request.key, request.cwd, request.scope);
   });
 }
 
@@ -16556,16 +16604,48 @@ function applyRepoOrExit(key, coerced, repoName) {
 
 // src/commands/config/configUnset.ts
 import chalk132 from "chalk";
+
+// src/commands/config/resolveRepoUnsetTarget.ts
+function resolveRepoUnsetTarget(key, repo) {
+  if (typeof repo === "string") {
+    if (key === void 0)
+      return { key: repo, useRepo: true, repoName: void 0 };
+    return { key, useRepo: true, repoName: repo };
+  }
+  return { key, useRepo: repo === true, repoName: void 0 };
+}
+
+// src/commands/config/configUnset.ts
 function configUnset(key, options2 = {}) {
-  const result = applyConfigUnset(key, options2.global ?? false);
+  if (options2.repo !== void 0 && !options2.global) {
+    console.error(
+      chalk132.red(
+        "--repo removes from the global config; add -g (e.g. -g --repo)"
+      )
+    );
+    process.exit(1);
+  }
+  const resolved = resolveRepoUnsetTarget(key, options2.repo);
+  if (resolved.key === void 0) {
+    console.error(chalk132.red("Missing required argument 'key'"));
+    process.exit(1);
+    return;
+  }
+  const result = resolved.useRepo ? applyRepoConfigUnset(resolved.key, resolved.repoName) : applyConfigUnset(resolved.key, options2.global ?? false);
   if (!result.ok) exitWithConfigErrors(result.errors);
   if (!result.removed) {
     console.log(
-      chalk132.yellow(`${key} is not set in the ${result.target} config`)
+      chalk132.yellow(`${resolved.key} is not set in ${whereLabel(result)}`)
     );
     return;
   }
-  console.log(chalk132.green(`Unset ${key} (${result.target})`));
+  console.log(chalk132.green(`Unset ${resolved.key} (${targetLabel(result)})`));
+}
+function whereLabel(result) {
+  return result.target === "repo" ? `repos.${result.label}` : `the ${result.target} config`;
+}
+function targetLabel(result) {
+  return result.target === "repo" ? `repo: ${result.label}` : result.target;
 }
 
 // src/commands/registerConfig.ts
@@ -16575,7 +16655,10 @@ function registerConfig(program2) {
     "-r, --repo [name]",
     "Requires -g: scope the global write to a repo's identity (defaults to the current repo)"
   ).action((key, value, options2) => configSet(key, value, options2));
-  configCommand.command("unset <key>").description("Remove a config value (e.g. commit.push)").option("-g, --global", "Remove from global ~/.assist.yml").action((key, options2) => configUnset(key, options2));
+  configCommand.command("unset [key]").description("Remove a config value (e.g. commit.push)").option("-g, --global", "Remove from global ~/.assist.yml").option(
+    "-r, --repo [name]",
+    "Requires -g: remove the key from a repo's identity block (defaults to the current repo)"
+  ).action((key, options2) => configUnset(key, options2));
   configCommand.command("get <key>").description("Get a config value").action(configGet);
   configCommand.command("list").description("List all config values").action(configList);
 }
@@ -32380,6 +32463,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.2",
+	"version": "0.488.1",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {