@staff0rd/assist 0.482.1 → 0.483.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.482.1",
+  version: "0.483.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -399,7 +399,7 @@ var DEFAULT_WAKE_WORDS = ["computer"];
 var DEFAULT_MODELS_DIR = "~/.assist/voice/models";
 var DEFAULT_BACKUP_DIR = "~/.assist/backups";
 var DEFAULT_CLONE_DIR = "~/git";
-var assistConfigSchema = z2.strictObject({
+var assistConfigShape = {
   backup: z2.strictObject({
     dir: z2.string().default(DEFAULT_BACKUP_DIR)
   }).default({ dir: DEFAULT_BACKUP_DIR }),
@@ -451,7 +451,6 @@ var assistConfigSchema = z2.strictObject({
     required: z2.boolean().default(false),
     promptJira: z2.boolean().default(false)
   }).optional(),
-  repos: z2.record(z2.string(), z2.record(z2.string(), z2.unknown())).optional(),
   worktree: z2.strictObject({
     enabled: z2.boolean().default(false),
     trunk: z2.boolean().default(false),
@@ -571,6 +570,11 @@ var assistConfigSchema = z2.strictObject({
     modelsDir: DEFAULT_MODELS_DIR,
     models: {}
   })
+};
+var repoConfigSchema = z2.strictObject(assistConfigShape).partial();
+var assistConfigSchema = z2.strictObject({
+  ...assistConfigShape,
+  repos: z2.record(z2.string(), repoConfigSchema).optional()
 });
 
 // src/shared/loadConfigFrom.ts
@@ -9568,7 +9572,7 @@ function readConfigEntries(cwd) {
       value: getNestedValue(config, leaf.key),
       source,
       sources,
-      ...source === "repo" && layers.repoKey ? { repoKey: layers.repoKey } : {},
+      ...layers.repoKey ? { repoKey: layers.repoKey } : {},
       globalOnly: isGlobalOnlyConfigKey(leaf.key),
       node: configEntryNode(schema2, leaf.key)
     };
@@ -10402,90 +10406,6 @@ function sessionView(_req, res) {
   respondJson(res, 200, { floatWaiting });
 }
 
-// src/commands/config/setNestedValue.ts
-function isPlainObject2(val) {
-  return val !== null && typeof val === "object" && !Array.isArray(val);
-}
-function isNumericKey(key) {
-  return /^\d+$/.test(key);
-}
-function resolveKey(key) {
-  return isNumericKey(key) ? Number.parseInt(key, 10) : key;
-}
-function getItem(container, key) {
-  if (Array.isArray(container)) return container[key];
-  return container[key];
-}
-function setItem(container, key, value) {
-  if (Array.isArray(container)) container[key] = value;
-  else container[key] = value;
-}
-function ensureArray(container, key) {
-  const existing = getItem(container, key);
-  const arr = Array.isArray(existing) ? [...existing] : [];
-  setItem(container, key, arr);
-  return arr;
-}
-function ensureObject(container, key) {
-  const existing = getItem(container, key);
-  const obj = isPlainObject2(existing) ? { ...existing } : {};
-  setItem(container, key, obj);
-  return obj;
-}
-function stepIntoNested(container, key, nextKey) {
-  const resolved = resolveKey(key);
-  if (nextKey !== void 0 && isNumericKey(nextKey)) {
-    return ensureArray(container, resolved);
-  }
-  return ensureObject(container, resolved);
-}
-function setNestedValue(obj, path71, value) {
-  const keys = path71.split(".");
-  const result = { ...obj };
-  let current = result;
-  for (let i = 0; i < keys.length - 1; i++) {
-    current = stepIntoNested(current, keys[i], keys[i + 1]);
-  }
-  setItem(current, resolveKey(keys[keys.length - 1]), value);
-  return result;
-}
-
-// src/commands/config/validateConfig.ts
-function validateConfig(updated, key) {
-  const result = assistConfigSchema.safeParse(updated);
-  if (result.success) return { ok: true };
-  return {
-    ok: false,
-    errors: result.error.issues.map((issue) => formatIssue(issue, key))
-  };
-}
-function formatIssue(issue, key) {
-  const path71 = issue.path.length > 0 ? issue.path.join(".") : key;
-  return `${path71}: ${issue.message}`;
-}
-
-// src/commands/config/applyConfigSet.ts
-function applyConfigSet(key, coerced, global, cwd = process.cwd()) {
-  if (!global && isGlobalOnlyConfigKey(key)) {
-    return {
-      ok: false,
-      errors: [
-        `"${key}" is a global-only key. Use --global to set it in ~/.assist.yml`
-      ]
-    };
-  }
-  const raw = global ? loadGlobalConfigRaw() : loadProjectConfig(cwd);
-  const updated = setNestedValue(raw, key, coerced);
-  const validation = validateConfig(updated, key);
-  if (!validation.ok) return validation;
-  if (global) {
-    saveGlobalConfig(updated);
-    return { ok: true, target: "global" };
-  }
-  saveConfig(updated, cwd);
-  return { ok: true, target: "project" };
-}
-
 // src/commands/config/coerceConfigScalar.ts
 function coerceConfigScalar(key, raw, type) {
   if (type === "boolean") return coerceBoolean(key, raw);
@@ -10534,10 +10454,10 @@ function coerceStructuredConfigValue(key, raw) {
     return { ok: true, value: parsed.data };
   return {
     ok: false,
-    error: parsed.error.issues.map((issue) => formatIssue2(key, issue)).join("\n")
+    error: parsed.error.issues.map((issue) => formatIssue(key, issue)).join("\n")
   };
 }
-function formatIssue2(key, issue) {
+function formatIssue(key, issue) {
   const path71 = formatConfigPath([
     { kind: "key", name: key },
     ...issue.path.map(toSegment)
@@ -10591,6 +10511,152 @@ function coerceUnion(key, raw, types) {
   return { ok: false, error: `${key}: expected ${types.join(" or ")}` };
 }
 
+// src/commands/config/setNestedValue.ts
+function isPlainObject2(val) {
+  return val !== null && typeof val === "object" && !Array.isArray(val);
+}
+function isNumericKey(key) {
+  return /^\d+$/.test(key);
+}
+function resolveKey(key) {
+  return isNumericKey(key) ? Number.parseInt(key, 10) : key;
+}
+function getItem(container, key) {
+  if (Array.isArray(container)) return container[key];
+  return container[key];
+}
+function setItem(container, key, value) {
+  if (Array.isArray(container)) container[key] = value;
+  else container[key] = value;
+}
+function ensureArray(container, key) {
+  const existing = getItem(container, key);
+  const arr = Array.isArray(existing) ? [...existing] : [];
+  setItem(container, key, arr);
+  return arr;
+}
+function ensureObject(container, key) {
+  const existing = getItem(container, key);
+  const obj = isPlainObject2(existing) ? { ...existing } : {};
+  setItem(container, key, obj);
+  return obj;
+}
+function stepIntoNested(container, key, nextKey) {
+  const resolved = resolveKey(key);
+  if (nextKey !== void 0 && isNumericKey(nextKey)) {
+    return ensureArray(container, resolved);
+  }
+  return ensureObject(container, resolved);
+}
+function setNestedValue(obj, path71, value) {
+  const keys = path71.split(".");
+  const result = { ...obj };
+  let current = result;
+  for (let i = 0; i < keys.length - 1; i++) {
+    current = stepIntoNested(current, keys[i], keys[i + 1]);
+  }
+  setItem(current, resolveKey(keys[keys.length - 1]), value);
+  return result;
+}
+
+// src/commands/config/validateConfig.ts
+function validateConfig(updated, key, schema2 = assistConfigSchema) {
+  const result = schema2.safeParse(updated);
+  if (result.success) return { ok: true };
+  return {
+    ok: false,
+    errors: result.error.issues.map((issue) => formatIssue2(issue, key))
+  };
+}
+function formatIssue2(issue, key) {
+  const path71 = issue.path.length > 0 ? issue.path.join(".") : key;
+  return `${path71}: ${issue.message}`;
+}
+
+// src/commands/config/applyConfigSet.ts
+function applyConfigSet(key, coerced, global, cwd = process.cwd()) {
+  if (!global && isGlobalOnlyConfigKey(key)) {
+    return {
+      ok: false,
+      errors: [
+        `"${key}" is a global-only key. Use --global to set it in ~/.assist.yml`
+      ]
+    };
+  }
+  const raw = global ? loadGlobalConfigRaw() : loadProjectConfig(cwd);
+  const updated = setNestedValue(raw, key, coerced);
+  const validation = validateConfig(updated, key);
+  if (!validation.ok) return validation;
+  if (global) {
+    saveGlobalConfig(updated);
+    return { ok: true, target: "global" };
+  }
+  saveConfig(updated, cwd);
+  return { ok: true, target: "project" };
+}
+
+// src/shared/resolveNamedRepoWriteLabel.ts
+var UnknownRepoConfigError = class extends Error {
+  name = "UnknownRepoConfigError";
+};
+function resolveNamedRepoWriteLabel(globalRaw, name) {
+  const repos2 = globalRaw.repos;
+  const entries = repos2 && typeof repos2 === "object" && !Array.isArray(repos2) ? repos2 : {};
+  const candidates = originKeyCandidates(name);
+  const matches = Object.keys(entries).filter((key) => candidates.has(key));
+  if (matches.length === 0) {
+    throw new UnknownRepoConfigError(
+      `No repo in ~/.assist.yml matches "${name}". Use an existing repos key (full origin, org/repo, or bare repo name).`
+    );
+  }
+  if (matches.length > 1) {
+    throw new AmbiguousRepoConfigError(
+      `Ambiguous repos config in ~/.assist.yml: keys ${matches.map((m) => `"${m}"`).join(", ")} all match "${name}". Keep a single key per repository.`
+    );
+  }
+  return matches[0];
+}
+
+// src/commands/config/applyRepoConfigSet.ts
+function applyRepoConfigSet(key, coerced, repoName, cwd = process.cwd()) {
+  if (isGlobalOnlyConfigKey(key)) {
+    return {
+      ok: false,
+      errors: [
+        `"${key}" is a global-only key. Set it in ~/.assist.yml rather than under repos:`
+      ]
+    };
+  }
+  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 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) {
+  if (scope === "repo") {
+    const result2 = applyRepoConfigSet(key, value, void 0, cwd);
+    return result2.ok ? { ok: true, payload: { target: result2.target, repoKey: result2.label } } : result2;
+  }
+  const result = applyConfigSet(key, value, scope === "global", cwd);
+  return result.ok ? { ok: true, payload: { target: result.target } } : result;
+}
+
+// src/commands/config/ConfigWriteScope.ts
+function isConfigWriteScope(value) {
+  return value === "project" || value === "global" || value === "repo";
+}
+
 // src/commands/sessions/web/readJsonBody.ts
 async function readJsonBody(req) {
   const chunks = [];
@@ -10611,9 +10677,9 @@ async function parseConfigWriteRequest(req) {
     return { ok: false, error: "Missing key" };
   if (typeof cwd !== "string" || cwd === "")
     return { ok: false, error: "Missing cwd" };
-  if (scope !== "project" && scope !== "global")
-    return { ok: false, error: 'scope must be "project" or "global"' };
-  return { ok: true, key, value: body.value, cwd, global: scope === "global" };
+  if (!isConfigWriteScope(scope))
+    return { ok: false, error: 'scope must be "project", "global" or "repo"' };
+  return { ok: true, key, value: body.value, cwd, scope };
 }
 
 // src/commands/sessions/web/handleConfigWrite.ts
@@ -10645,22 +10711,21 @@ function setConfig(req, res) {
   return handleConfigWrite(req, res, (request) => {
     const coerced = coerceConfigValue(request.key, request.value);
     if (!coerced.ok) return { ok: false, errors: [coerced.error] };
-    const result = applyConfigSet(
+    return applyScopedConfigSet(
       request.key,
       coerced.value,
-      request.global,
-      request.cwd
+      request.cwd,
+      request.scope
     );
-    return result.ok ? { ok: true, payload: { target: result.target } } : result;
   });
 }
 
 // src/commands/config/unsetNestedValue.ts
-function isPlainObject3(val) {
+function isPlainObject4(val) {
   return val !== null && typeof val === "object" && !Array.isArray(val);
 }
 function isContainer(val) {
-  return Array.isArray(val) || isPlainObject3(val);
+  return Array.isArray(val) || isPlainObject4(val);
 }
 function isNumericKey2(key) {
   return /^\d+$/.test(key);
@@ -10696,7 +10761,7 @@ function withChild(container, key, child) {
   return { ...container, [key]: child };
 }
 function isPrunable(container) {
-  return isPlainObject3(container) && Object.keys(container).length === 0;
+  return isPlainObject4(container) && Object.keys(container).length === 0;
 }
 function replaceOrPrune(container, key, child) {
   return isPrunable(child) ? withoutKey(container, key) : withChild(container, key, child);
@@ -10755,7 +10820,18 @@ function unsetConfig(req, res) {
   return handleConfigWrite(req, res, (request) => {
     if (!isKnownConfigKey(request.key))
       return { ok: false, errors: [`Unknown config key "${request.key}"`] };
-    const result = applyConfigUnset(request.key, request.global, request.cwd);
+    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 }
@@ -16166,28 +16242,6 @@ function exitKeyNotSet(key) {
 // src/commands/config/configSet.ts
 import chalk131 from "chalk";
 
-// src/shared/resolveNamedRepoWriteLabel.ts
-var UnknownRepoConfigError = class extends Error {
-  name = "UnknownRepoConfigError";
-};
-function resolveNamedRepoWriteLabel(globalRaw, name) {
-  const repos2 = globalRaw.repos;
-  const entries = repos2 && typeof repos2 === "object" && !Array.isArray(repos2) ? repos2 : {};
-  const candidates = originKeyCandidates(name);
-  const matches = Object.keys(entries).filter((key) => candidates.has(key));
-  if (matches.length === 0) {
-    throw new UnknownRepoConfigError(
-      `No repo in ~/.assist.yml matches "${name}". Use an existing repos key (full origin, org/repo, or bare repo name).`
-    );
-  }
-  if (matches.length > 1) {
-    throw new AmbiguousRepoConfigError(
-      `Ambiguous repos config in ~/.assist.yml: keys ${matches.map((m) => `"${m}"`).join(", ")} all match "${name}". Keep a single key per repository.`
-    );
-  }
-  return matches[0];
-}
-
 // src/commands/config/exitWithConfigErrors.ts
 import chalk130 from "chalk";
 function exitWithConfigErrors(errors) {
@@ -16195,23 +16249,6 @@ function exitWithConfigErrors(errors) {
   process.exit(1);
 }
 
-// src/commands/config/applyRepoConfigSet.ts
-function applyRepoConfigSet(key, coerced, repoName) {
-  const globalRaw = loadGlobalConfigRaw();
-  const label2 = repoName === void 0 ? resolveRepoWriteLabel(globalRaw, getCurrentOrigin(process.cwd())) : resolveNamedRepoWriteLabel(globalRaw, repoName);
-  const repos2 = isPlainObject4(globalRaw.repos) ? { ...globalRaw.repos } : {};
-  const existingBlock = isPlainObject4(repos2[label2]) ? repos2[label2] : {};
-  const updatedBlock = setNestedValue(existingBlock, key, coerced);
-  const validation = validateConfig(updatedBlock, key);
-  if (!validation.ok) exitWithConfigErrors(validation.errors);
-  repos2[label2] = updatedBlock;
-  saveGlobalConfig({ ...globalRaw, repos: repos2 });
-  return label2;
-}
-function isPlainObject4(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-
 // src/commands/config/resolveRepoTarget.ts
 function resolveRepoTarget(key, value, repo) {
   if (typeof repo === "string") {
@@ -16237,7 +16274,7 @@ function configSet(key, value, options2 = {}) {
     process.exit(1);
   }
   const coerced = coerceValue(resolved.value);
-  const target = resolved.useRepo ? `repo: ${applyRepoConfigSet(resolved.key, coerced, resolved.repoName)}` : applyOrExit(resolved.key, coerced, options2.global ?? false);
+  const target = resolved.useRepo ? `repo: ${applyRepoOrExit(resolved.key, coerced, resolved.repoName)}` : applyOrExit(resolved.key, coerced, options2.global ?? false);
   console.log(
     chalk131.green(`Set ${resolved.key} = ${JSON.stringify(coerced)} (${target})`)
   );
@@ -16247,6 +16284,11 @@ function applyOrExit(key, coerced, global) {
   if (!result.ok) exitWithConfigErrors(result.errors);
   return result.target;
 }
+function applyRepoOrExit(key, coerced, repoName) {
+  const result = applyRepoConfigSet(key, coerced, repoName);
+  if (!result.ok) exitWithConfigErrors(result.errors);
+  return result.label;
+}
 function coerceValue(value) {
   if (value === "true") return true;
   if (value === "false") return false;

package/package.json

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