@staff0rd/assist 0.479.0 → 0.479.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.479.0",
+  version: "0.479.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -214,6 +214,19 @@ function loadRawYaml(path71) {
   }
 }
 
+// src/shared/deepMergeRawConfig.ts
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function deepMergeRawConfig(base, override) {
+  const merged = { ...base };
+  for (const [key, value] of Object.entries(override)) {
+    const existing = merged[key];
+    merged[key] = isPlainObject(existing) && isPlainObject(value) ? deepMergeRawConfig(existing, value) : value;
+  }
+  return merged;
+}
+
 // src/shared/mergeDenyRules.ts
 function mergeDenyRules(globalDeny, projectDeny) {
   if (!globalDeny && !projectDeny) return void 0;
@@ -248,7 +261,7 @@ function mergeRawConfigs(globalRaw, projectRaw) {
     globalRaw.run,
     projectRaw.run
   );
-  const merged = { ...globalRaw, ...projectRaw };
+  const merged = deepMergeRawConfig(globalRaw, projectRaw);
   if (deny !== void 0) {
     merged.deny = deny;
   }
@@ -312,19 +325,25 @@ function originKeyCandidates(origin) {
   const bare = segments[segments.length - 1] ?? displayName;
   return /* @__PURE__ */ new Set([origin, displayName, bare]);
 }
-function resolveRepoOverride(globalRaw, origin) {
+function matchRepoConfigKey(globalRaw, origin) {
   const repos2 = globalRaw.repos;
-  if (!repos2 || typeof repos2 !== "object" || Array.isArray(repos2)) return {};
+  if (!repos2 || typeof repos2 !== "object" || Array.isArray(repos2))
+    return void 0;
   const entries = repos2;
   const candidates = originKeyCandidates(origin);
   const matches = Object.keys(entries).filter((key) => candidates.has(key));
-  if (matches.length === 0) return {};
+  if (matches.length === 0) return void 0;
   if (matches.length > 1) {
     throw new AmbiguousRepoConfigError(
       `Ambiguous repos config in ~/.assist.yml: keys ${matches.map((m) => `"${m}"`).join(", ")} all match the current repository (${origin}). Keep a single key per repository.`
     );
   }
-  const override = entries[matches[0]];
+  return matches[0];
+}
+function resolveRepoOverride(globalRaw, origin) {
+  const matched = matchRepoConfigKey(globalRaw, origin);
+  if (matched === void 0) return {};
+  const override = globalRaw.repos[matched];
   if (!override || typeof override !== "object" || Array.isArray(override))
     return {};
   return override;
@@ -9423,19 +9442,30 @@ function isGlobalOnlyConfigKey(key) {
 // src/commands/config/readRawConfigLayers.ts
 function readRawConfigLayers(cwd) {
   const global = loadRawYaml(getGlobalConfigPath());
+  if (!global.repos)
+    return {
+      project: loadRawYaml(getConfigPathFrom(cwd)),
+      global,
+      repoOverride: {}
+    };
+  const origin = getCurrentOrigin(cwd);
   return {
     project: loadRawYaml(getConfigPathFrom(cwd)),
     global,
-    repoOverride: global.repos ? resolveRepoOverride(global, getCurrentOrigin(cwd)) : {}
+    repoOverride: resolveRepoOverride(global, origin),
+    repoKey: matchRepoConfigKey(global, origin)
   };
 }
 
-// src/commands/config/resolveConfigSource.ts
-function resolveConfigSource(key, layers) {
-  if (getNestedValue(layers.project, key) !== void 0) return "project";
-  if (getNestedValue(layers.repoOverride, key) !== void 0) return "global";
-  if (getNestedValue(layers.global, key) !== void 0) return "global";
-  return "default";
+// src/commands/config/resolveConfigSources.ts
+function resolveConfigSources(key, layers) {
+  const sources = [];
+  if (getNestedValue(layers.project, key) !== void 0)
+    sources.push("project");
+  if (getNestedValue(layers.repoOverride, key) !== void 0)
+    sources.push("repo");
+  if (getNestedValue(layers.global, key) !== void 0) sources.push("global");
+  return sources;
 }
 
 // src/shared/configNodeFieldName.ts
@@ -9530,13 +9560,19 @@ function readConfigEntries(cwd) {
   const config = loadConfigFrom(cwd);
   const layers = readRawConfigLayers(cwd);
   const schema2 = describeConfigNode(assistConfigSchema);
-  return describeConfigLeaves(assistConfigSchema).filter((leaf) => !KEYS_STRIPPED_FROM_MERGED_CONFIG.has(leaf.key)).map((leaf) => ({
-    ...leaf,
-    value: getNestedValue(config, leaf.key),
-    source: resolveConfigSource(leaf.key, layers),
-    globalOnly: isGlobalOnlyConfigKey(leaf.key),
-    node: configEntryNode(schema2, leaf.key)
-  }));
+  return describeConfigLeaves(assistConfigSchema).filter((leaf) => !KEYS_STRIPPED_FROM_MERGED_CONFIG.has(leaf.key)).map((leaf) => {
+    const sources = resolveConfigSources(leaf.key, layers);
+    const source = sources[0] ?? "default";
+    return {
+      ...leaf,
+      value: getNestedValue(config, leaf.key),
+      source,
+      sources,
+      ...source === "repo" && layers.repoKey ? { repoKey: layers.repoKey } : {},
+      globalOnly: isGlobalOnlyConfigKey(leaf.key),
+      node: configEntryNode(schema2, leaf.key)
+    };
+  });
 }
 
 // src/commands/sessions/web/getConfig.ts
@@ -10367,7 +10403,7 @@ function sessionView(_req, res) {
 }
 
 // src/commands/config/setNestedValue.ts
-function isPlainObject(val) {
+function isPlainObject2(val) {
   return val !== null && typeof val === "object" && !Array.isArray(val);
 }
 function isNumericKey(key) {
@@ -10392,7 +10428,7 @@ function ensureArray(container, key) {
 }
 function ensureObject(container, key) {
   const existing = getItem(container, key);
-  const obj = isPlainObject(existing) ? { ...existing } : {};
+  const obj = isPlainObject2(existing) ? { ...existing } : {};
   setItem(container, key, obj);
   return obj;
 }
@@ -10620,11 +10656,11 @@ function setConfig(req, res) {
 }
 
 // src/commands/config/unsetNestedValue.ts
-function isPlainObject2(val) {
+function isPlainObject3(val) {
   return val !== null && typeof val === "object" && !Array.isArray(val);
 }
 function isContainer(val) {
-  return Array.isArray(val) || isPlainObject2(val);
+  return Array.isArray(val) || isPlainObject3(val);
 }
 function isNumericKey2(key) {
   return /^\d+$/.test(key);
@@ -10660,7 +10696,7 @@ function withChild(container, key, child) {
   return { ...container, [key]: child };
 }
 function isPrunable(container) {
-  return isPlainObject2(container) && Object.keys(container).length === 0;
+  return isPlainObject3(container) && Object.keys(container).length === 0;
 }
 function replaceOrPrune(container, key, child) {
   return isPrunable(child) ? withoutKey(container, key) : withChild(container, key, child);
@@ -16163,8 +16199,8 @@ function exitWithConfigErrors(errors) {
 function applyRepoConfigSet(key, coerced, repoName) {
   const globalRaw = loadGlobalConfigRaw();
   const label2 = repoName === void 0 ? resolveRepoWriteLabel(globalRaw, getCurrentOrigin(process.cwd())) : resolveNamedRepoWriteLabel(globalRaw, repoName);
-  const repos2 = isPlainObject3(globalRaw.repos) ? { ...globalRaw.repos } : {};
-  const existingBlock = isPlainObject3(repos2[label2]) ? repos2[label2] : {};
+  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);
@@ -16172,7 +16208,7 @@ function applyRepoConfigSet(key, coerced, repoName) {
   saveGlobalConfig({ ...globalRaw, repos: repos2 });
   return label2;
 }
-function isPlainObject3(value) {
+function isPlainObject4(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 

package/package.json

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