@event4u/agent-config 9.26.0 → 9.28.0

package/dist/cli-delegate/{chunk-AIIUU73N.js → chunk-7OMQCH4V.js}

@@ -1,7 +1,7 @@
 import { createRequire as __acCreateRequire } from 'node:module'; const require = globalThis.require ?? __acCreateRequire(import.meta.url);
 import {
   load_agent_settings
-} from "./chunk-HJ6DAJHR.js";
+} from "./chunk-GB2FSUEE.js";
 
 // src/scripts/chat_history.ts
 import { createHash } from "node:crypto";

package/dist/cli-delegate/{chunk-HJ6DAJHR.js → chunk-GB2FSUEE.js}

@@ -68,19 +68,42 @@ var USER_GLOBAL_FILENAME = "agent-settings.yml";
 function DEFAULT_USER_GLOBAL_FILE() {
   return write_target(USER_GLOBAL_FILENAME);
 }
-function _resolve_user_global_file() {
-  const found = resolve_with_fallback(USER_GLOBAL_FILENAME);
-  if (found !== null) {
-    return found;
+var USER_GLOBAL_CANONICAL_RELATIVE = "settings/.agent-settings.yml";
+function user_global_settings_paths() {
+  const paths = [];
+  const flat = resolve_with_fallback(USER_GLOBAL_FILENAME);
+  if (flat !== null) {
+    paths.push(flat);
+  }
+  const canonical = resolve_with_fallback(USER_GLOBAL_CANONICAL_RELATIVE);
+  if (canonical !== null) {
+    paths.push(canonical);
   }
-  return DEFAULT_USER_GLOBAL_FILE();
+  if (paths.length === 0) {
+    paths.push(DEFAULT_USER_GLOBAL_FILE());
+  }
+  return paths;
 }
 var MERGEABLE_KEYS = [
+  // `name`, `ide` and `personal.bot_icon` are the PRE-MIGRATION spellings.
+  // `install.ts` migrates `ide` → `personal.ide` and `pr_comment_bot_icon`
+  // into its `personal.` home, and this list was never moved with them — so
+  // the whitelist named keys the template does not have while the keys it
+  // does have were filtered out silently. A user setting either preference
+  // user-globally got no error, no warning, and no effect
+  // (road-to-capability-answerability 4.3, ADR-219).
+  //
+  // Both spellings are listed rather than replaced: a legacy file that still
+  // uses the old name keeps working, and nothing that resolved before
+  // resolves differently. `name` has no reader anywhere and no template key;
+  // it is kept only so this change stays purely additive.
   "name",
   "ide",
+  "personal.ide",
   "rule_loading_tier",
   "memory.cadence",
   "personal.bot_icon",
+  "personal.pr_comment_bot_icon",
   "personal.autonomy",
   "telegraph.speak_scope",
   // Knowledge-card global cross-project sharing is a USER-GLOBAL setting
@@ -363,7 +386,10 @@ function load_agent_settings(options = {}) {
   const user_global_path = options.user_global_path ?? null;
   const verbose = options.verbose ?? false;
   const cwd = options.cwd ?? null;
-  const user_global_raw = _read_yaml(user_global_path ? user_global_path : _resolve_user_global_file()) ?? {};
+  const user_global_raw = {};
+  for (const p of user_global_path ? [user_global_path] : user_global_settings_paths()) {
+    _deep_merge(user_global_raw, _read_yaml(p) ?? {});
+  }
   const [user_global_filtered, ignored] = _filter_whitelist(user_global_raw, MERGEABLE_KEYS);
   if (verbose && ignored.length > 0) {
     logger.info(
@@ -382,6 +408,27 @@ function load_agent_settings(options = {}) {
   }
   return merged;
 }
+function* iter_setting_overrides(options = {}) {
+  const project_path = options.project_path ?? null;
+  const user_global_path = options.user_global_path ?? null;
+  const cwd = options.cwd ?? null;
+  for (const p of user_global_path ? [user_global_path] : user_global_settings_paths()) {
+    const raw = _read_yaml(p) ?? {};
+    const [filtered] = _filter_whitelist(raw, MERGEABLE_KEYS);
+    for (const key of _leaf_paths(filtered)) {
+      yield [key, _get_dotted(filtered, key), p];
+    }
+  }
+  for (const p of _resolve_cascade_paths(cwd, project_path)) {
+    const layer = _read_yaml(p);
+    if (!layer || Object.keys(layer).length === 0) {
+      continue;
+    }
+    for (const key of _leaf_paths(layer)) {
+      yield [key, _get_dotted(layer, key), p];
+    }
+  }
+}
 function _read_yaml(p) {
   if (!_is_file(p)) {
     return null;
@@ -491,6 +538,8 @@ export {
   LOCAL_PROJECT_FILE,
   LOCAL_PROJECT_SUBDIR,
   project_settings_path,
+  USER_GLOBAL_FILENAME,
+  MERGEABLE_KEYS,
   find_project_root_with_anchor,
   find_project_root,
   find_project_root_with_trace,
@@ -498,5 +547,6 @@ export {
   ROOT_OVERRIDE_ENV,
   ProjectRootError,
   resolve_project_root,
-  load_agent_settings
+  load_agent_settings,
+  iter_setting_overrides
 };

package/dist/cli-delegate/{chunk-WR6GTRHJ.js → chunk-JXARCGVN.js}

@@ -1,10 +1,10 @@
 import { createRequire as __acCreateRequire } from 'node:module'; const require = globalThis.require ?? __acCreateRequire(import.meta.url);
+import {
+  resolve_project_root
+} from "./chunk-GB2FSUEE.js";
 import {
   resolvePackageRoot
 } from "./chunk-MCJYCQPF.js";
-import {
-  resolve_project_root
-} from "./chunk-HJ6DAJHR.js";
 
 // src/scripts/_cli/cmd_migrate.ts
 import { spawnSync } from "node:child_process";