agent-nuvira 3.5.5 → 3.5.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (229) hide show
  1. package/.agents/skills/index.json +16 -0
  2. package/.agents/skills/motion/SKILL.md +27 -0
  3. package/README.md +122 -1
  4. package/dist/cli/chat.d.ts +76 -17
  5. package/dist/cli/chat.d.ts.map +1 -1
  6. package/dist/cli/chat.js +330 -137
  7. package/dist/cli/chat.js.map +1 -1
  8. package/dist/cli/config.d.ts.map +1 -1
  9. package/dist/cli/config.js +17 -3
  10. package/dist/cli/config.js.map +1 -1
  11. package/dist/cli/doctor.d.ts +31 -2
  12. package/dist/cli/doctor.d.ts.map +1 -1
  13. package/dist/cli/doctor.js +143 -7
  14. package/dist/cli/doctor.js.map +1 -1
  15. package/dist/cli/execute.d.ts.map +1 -1
  16. package/dist/cli/execute.js +63 -22
  17. package/dist/cli/execute.js.map +1 -1
  18. package/dist/cli/failover-runner.js +4 -4
  19. package/dist/cli/failover-runner.js.map +1 -1
  20. package/dist/cli/gateway.js +13 -13
  21. package/dist/cli/gateway.js.map +1 -1
  22. package/dist/cli/loop-executor.d.ts +22 -0
  23. package/dist/cli/loop-executor.d.ts.map +1 -1
  24. package/dist/cli/loop-executor.js +60 -13
  25. package/dist/cli/loop-executor.js.map +1 -1
  26. package/dist/cli/parity.d.ts +12 -0
  27. package/dist/cli/parity.d.ts.map +1 -1
  28. package/dist/cli/parity.js +46 -1
  29. package/dist/cli/parity.js.map +1 -1
  30. package/dist/cli/stats.d.ts +62 -4
  31. package/dist/cli/stats.d.ts.map +1 -1
  32. package/dist/cli/stats.js +282 -5
  33. package/dist/cli/stats.js.map +1 -1
  34. package/dist/cli/tool-install-prompt.d.ts +2 -7
  35. package/dist/cli/tool-install-prompt.d.ts.map +1 -1
  36. package/dist/cli/tool-install-prompt.js +11 -28
  37. package/dist/cli/tool-install-prompt.js.map +1 -1
  38. package/dist/cli/ui/index.d.ts +2 -2
  39. package/dist/cli/ui/index.d.ts.map +1 -1
  40. package/dist/cli/ui/index.js +1 -1
  41. package/dist/cli/ui/index.js.map +1 -1
  42. package/dist/cli/ui/presenter.d.ts +43 -0
  43. package/dist/cli/ui/presenter.d.ts.map +1 -1
  44. package/dist/cli/ui/presenter.js +88 -1
  45. package/dist/cli/ui/presenter.js.map +1 -1
  46. package/dist/config/manager.d.ts +29 -1
  47. package/dist/config/manager.d.ts.map +1 -1
  48. package/dist/config/manager.js +178 -143
  49. package/dist/config/manager.js.map +1 -1
  50. package/dist/config/paths.d.ts +48 -1
  51. package/dist/config/paths.d.ts.map +1 -1
  52. package/dist/config/paths.js +59 -9
  53. package/dist/config/paths.js.map +1 -1
  54. package/dist/config/scratch-workspace.d.ts +134 -0
  55. package/dist/config/scratch-workspace.d.ts.map +1 -0
  56. package/dist/config/scratch-workspace.js +213 -0
  57. package/dist/config/scratch-workspace.js.map +1 -0
  58. package/dist/config/service-catalog.js +1 -1
  59. package/dist/config/service-catalog.js.map +1 -1
  60. package/dist/config/service-probe.js +1 -1
  61. package/dist/config/service-probe.js.map +1 -1
  62. package/dist/config/types.d.ts +22 -0
  63. package/dist/config/types.d.ts.map +1 -1
  64. package/dist/gateway/adapters.d.ts +24 -0
  65. package/dist/gateway/adapters.d.ts.map +1 -1
  66. package/dist/gateway/adapters.js +20 -8
  67. package/dist/gateway/adapters.js.map +1 -1
  68. package/dist/gateway/oversized-reply.d.ts +39 -0
  69. package/dist/gateway/oversized-reply.d.ts.map +1 -0
  70. package/dist/gateway/oversized-reply.js +54 -0
  71. package/dist/gateway/oversized-reply.js.map +1 -0
  72. package/dist/gateway/registry.d.ts +0 -10
  73. package/dist/gateway/registry.d.ts.map +1 -1
  74. package/dist/gateway/registry.js +149 -5
  75. package/dist/gateway/registry.js.map +1 -1
  76. package/dist/learning/auto-router.d.ts +30 -4
  77. package/dist/learning/auto-router.d.ts.map +1 -1
  78. package/dist/learning/auto-router.js +54 -38
  79. package/dist/learning/auto-router.js.map +1 -1
  80. package/dist/learning/cost-classification.d.ts +188 -0
  81. package/dist/learning/cost-classification.d.ts.map +1 -0
  82. package/dist/learning/cost-classification.js +294 -0
  83. package/dist/learning/cost-classification.js.map +1 -0
  84. package/dist/learning/cost-ledger-maintenance.d.ts +122 -0
  85. package/dist/learning/cost-ledger-maintenance.d.ts.map +1 -0
  86. package/dist/learning/cost-ledger-maintenance.js +289 -0
  87. package/dist/learning/cost-ledger-maintenance.js.map +1 -0
  88. package/dist/learning/cost-reconcile.d.ts +160 -0
  89. package/dist/learning/cost-reconcile.d.ts.map +1 -0
  90. package/dist/learning/cost-reconcile.js +238 -0
  91. package/dist/learning/cost-reconcile.js.map +1 -0
  92. package/dist/learning/cost-tracker.d.ts +134 -13
  93. package/dist/learning/cost-tracker.d.ts.map +1 -1
  94. package/dist/learning/cost-tracker.js +190 -68
  95. package/dist/learning/cost-tracker.js.map +1 -1
  96. package/dist/learning/model-pricing.d.ts +240 -0
  97. package/dist/learning/model-pricing.d.ts.map +1 -0
  98. package/dist/learning/model-pricing.js +309 -0
  99. package/dist/learning/model-pricing.js.map +1 -0
  100. package/dist/learning/model-selection.d.ts +15 -0
  101. package/dist/learning/model-selection.d.ts.map +1 -1
  102. package/dist/learning/model-selection.js +22 -2
  103. package/dist/learning/model-selection.js.map +1 -1
  104. package/dist/learning/model-warmup.d.ts.map +1 -1
  105. package/dist/learning/model-warmup.js +4 -1
  106. package/dist/learning/model-warmup.js.map +1 -1
  107. package/dist/learning/quota-ledger.d.ts +24 -0
  108. package/dist/learning/quota-ledger.d.ts.map +1 -1
  109. package/dist/learning/quota-ledger.js +40 -0
  110. package/dist/learning/quota-ledger.js.map +1 -1
  111. package/dist/learning/runtime-dependencies.d.ts +183 -0
  112. package/dist/learning/runtime-dependencies.d.ts.map +1 -0
  113. package/dist/learning/runtime-dependencies.js +349 -0
  114. package/dist/learning/runtime-dependencies.js.map +1 -0
  115. package/dist/learning/session-store.d.ts +1 -5
  116. package/dist/learning/session-store.d.ts.map +1 -1
  117. package/dist/learning/session-store.js +10 -1
  118. package/dist/learning/session-store.js.map +1 -1
  119. package/dist/learning/skill-store.d.ts.map +1 -1
  120. package/dist/learning/skill-store.js +6 -5
  121. package/dist/learning/skill-store.js.map +1 -1
  122. package/dist/learning/step-checkpoint.d.ts +32 -3
  123. package/dist/learning/step-checkpoint.d.ts.map +1 -1
  124. package/dist/learning/step-checkpoint.js +33 -4
  125. package/dist/learning/step-checkpoint.js.map +1 -1
  126. package/dist/mcp/settings.d.ts +15 -3
  127. package/dist/mcp/settings.d.ts.map +1 -1
  128. package/dist/mcp/settings.js +30 -15
  129. package/dist/mcp/settings.js.map +1 -1
  130. package/dist/parity/drivers.d.ts.map +1 -1
  131. package/dist/parity/drivers.js +31 -5
  132. package/dist/parity/drivers.js.map +1 -1
  133. package/dist/skills/bundled-skills-phase3.d.ts +14 -0
  134. package/dist/skills/bundled-skills-phase3.d.ts.map +1 -1
  135. package/dist/skills/bundled-skills-phase3.js +50 -0
  136. package/dist/skills/bundled-skills-phase3.js.map +1 -1
  137. package/dist/tools/child-agent-runtime.d.ts.map +1 -1
  138. package/dist/tools/child-agent-runtime.js +13 -7
  139. package/dist/tools/child-agent-runtime.js.map +1 -1
  140. package/dist/tools/followup-utils.d.ts +36 -0
  141. package/dist/tools/followup-utils.d.ts.map +1 -1
  142. package/dist/tools/followup-utils.js +66 -0
  143. package/dist/tools/followup-utils.js.map +1 -1
  144. package/dist/tools/modality/browser.js +2 -2
  145. package/dist/tools/modality/browser.js.map +1 -1
  146. package/dist/tools/modality/image-gen.d.ts +1 -1
  147. package/dist/tools/modality/image-gen.js +1 -1
  148. package/dist/tools/modality/image-providers.js +1 -1
  149. package/dist/tools/modality/image-providers.js.map +1 -1
  150. package/dist/tools/modality/motion-presets.d.ts +62 -0
  151. package/dist/tools/modality/motion-presets.d.ts.map +1 -0
  152. package/dist/tools/modality/motion-presets.js +399 -0
  153. package/dist/tools/modality/motion-presets.js.map +1 -0
  154. package/dist/tools/modality/motion-tool.d.ts +62 -0
  155. package/dist/tools/modality/motion-tool.d.ts.map +1 -0
  156. package/dist/tools/modality/motion-tool.js +220 -0
  157. package/dist/tools/modality/motion-tool.js.map +1 -0
  158. package/dist/tools/modality/motion.d.ts +298 -0
  159. package/dist/tools/modality/motion.d.ts.map +1 -0
  160. package/dist/tools/modality/motion.js +514 -0
  161. package/dist/tools/modality/motion.js.map +1 -0
  162. package/dist/tools/modality/vision.d.ts +1 -1
  163. package/dist/tools/modality/vision.js +1 -1
  164. package/dist/tools/modality/voice.js +2 -2
  165. package/dist/tools/modality/voice.js.map +1 -1
  166. package/dist/tools/neutts-synth.d.ts +3 -3
  167. package/dist/tools/neutts-synth.js +3 -3
  168. package/dist/tools/neutts-synth.js.map +1 -1
  169. package/dist/tools/process-liveness.d.ts +50 -0
  170. package/dist/tools/process-liveness.d.ts.map +1 -1
  171. package/dist/tools/process-liveness.js +82 -9
  172. package/dist/tools/process-liveness.js.map +1 -1
  173. package/dist/tools/registry.d.ts +1 -1
  174. package/dist/tools/registry.d.ts.map +1 -1
  175. package/dist/tools/registry.js +102 -4
  176. package/dist/tools/registry.js.map +1 -1
  177. package/dist/tools/run-terminal.d.ts.map +1 -1
  178. package/dist/tools/run-terminal.js +18 -1
  179. package/dist/tools/run-terminal.js.map +1 -1
  180. package/dist/tools/tool-loop.d.ts.map +1 -1
  181. package/dist/tools/tool-loop.js +71 -19
  182. package/dist/tools/tool-loop.js.map +1 -1
  183. package/dist/tools/toolsets.js +2 -2
  184. package/dist/tools/toolsets.js.map +1 -1
  185. package/dist/tools/web-research.d.ts +1 -1
  186. package/dist/tools/web-research.js +3 -3
  187. package/dist/tools/web-research.js.map +1 -1
  188. package/dist/utils/workspace-need.d.ts +84 -0
  189. package/dist/utils/workspace-need.d.ts.map +1 -0
  190. package/dist/utils/workspace-need.js +227 -0
  191. package/dist/utils/workspace-need.js.map +1 -0
  192. package/dist/web-dashboard/chat-console.d.ts +78 -0
  193. package/dist/web-dashboard/chat-console.d.ts.map +1 -1
  194. package/dist/web-dashboard/chat-console.js +122 -12
  195. package/dist/web-dashboard/chat-console.js.map +1 -1
  196. package/dist/web-dashboard/hub-data.d.ts +9 -1
  197. package/dist/web-dashboard/hub-data.d.ts.map +1 -1
  198. package/dist/web-dashboard/hub-data.js +2 -0
  199. package/dist/web-dashboard/hub-data.js.map +1 -1
  200. package/dist/web-dashboard/project-context.d.ts +1 -1
  201. package/dist/web-dashboard/project-context.d.ts.map +1 -1
  202. package/dist/web-dashboard/project-context.js +7 -1
  203. package/dist/web-dashboard/project-context.js.map +1 -1
  204. package/dist/web-dashboard/server.d.ts +33 -0
  205. package/dist/web-dashboard/server.d.ts.map +1 -1
  206. package/dist/web-dashboard/server.js +326 -23
  207. package/dist/web-dashboard/server.js.map +1 -1
  208. package/dist/web-dashboard/src/types.d.ts +109 -0
  209. package/dist/web-dashboard/src/types.d.ts.map +1 -1
  210. package/dist/web-dashboard/task-runner.d.ts +17 -1
  211. package/dist/web-dashboard/task-runner.d.ts.map +1 -1
  212. package/dist/web-dashboard/task-runner.js +40 -4
  213. package/dist/web-dashboard/task-runner.js.map +1 -1
  214. package/dist/web-dashboard/workspace-guard.d.ts +20 -21
  215. package/dist/web-dashboard/workspace-guard.d.ts.map +1 -1
  216. package/dist/web-dashboard/workspace-guard.js +20 -153
  217. package/dist/web-dashboard/workspace-guard.js.map +1 -1
  218. package/dist/web-dashboard/workspace-resolution.d.ts +23 -5
  219. package/dist/web-dashboard/workspace-resolution.d.ts.map +1 -1
  220. package/dist/web-dashboard/workspace-resolution.js +22 -4
  221. package/dist/web-dashboard/workspace-resolution.js.map +1 -1
  222. package/package.json +1 -1
  223. package/src/web-dashboard/public/assets/index-CzRU84ET.css +1 -0
  224. package/src/web-dashboard/public/assets/index-V0rIqVbg.js +236 -0
  225. package/src/web-dashboard/public/assets/index-V0rIqVbg.js.map +1 -0
  226. package/src/web-dashboard/public/index.html +2 -2
  227. package/src/web-dashboard/public/assets/index-DycGBWwy.js +0 -236
  228. package/src/web-dashboard/public/assets/index-DycGBWwy.js.map +0 -1
  229. package/src/web-dashboard/public/assets/index-aO3aG7ex.css +0 -1
@@ -36,7 +36,13 @@ function resolve(opts) {
36
36
  const env = opts.env ?? process.env;
37
37
  const stream = opts.stream ?? process.stdout;
38
38
  const { name, theme } = resolveTheme(env);
39
- const width = opts.width ?? stream.columns ?? 80;
39
+ // A terminal that does not KNOW its size reports `columns` as 0 (or undefined),
40
+ // and `?? 80` only catches the undefined half: a 0 flowed all the way into the
41
+ // renderer, where `Painter` floors the width at 20 — measured on a PTY with no
42
+ // window size, a code box came out 14 columns wide with its lines cut mid-token
43
+ // ("const cap = 20 / 0;"). A width that cannot be read is 80, not 20.
44
+ const columns = opts.width ?? stream.columns;
45
+ const width = typeof columns === 'number' && columns > 0 ? columns : 80;
40
46
  const rich = shouldUseRichUi(opts);
41
47
  const color = opts.color ?? (name !== 'none' && !('NO_COLOR' in env));
42
48
  return { rich, theme: opts.theme ?? theme, themeName: name, width, color, stream };
@@ -115,6 +121,87 @@ export function createCardSink(opts = {}) {
115
121
  stop: attachShellCards(write),
116
122
  };
117
123
  }
124
+ /** The note shown while the model is working and nothing has arrived yet. */
125
+ export const THINKING_NOTE = 'thinking…';
126
+ export function createRunStream(meta = {}, opts = {}) {
127
+ if (!shouldUseRichUi(opts)) {
128
+ return {
129
+ overrides: {},
130
+ start: () => { },
131
+ // Byte-identical to the pre-layer path: the plain answer, written the way
132
+ // this CLI has always written it.
133
+ commit: (content) => {
134
+ presentAnswer(content, opts);
135
+ },
136
+ stop: () => { },
137
+ };
138
+ }
139
+ const stream = new AnswerStream(meta, opts);
140
+ let started = false;
141
+ let stopped = false;
142
+ const detachShell = attachShellCards((card) => stream.card(card));
143
+ /** Show a note without losing the frame (mounting it if it is not up yet). */
144
+ const noteFor = (note) => {
145
+ if (!started) {
146
+ started = true;
147
+ stream.begin({ ...meta, ...(note === undefined ? {} : { note }) });
148
+ return;
149
+ }
150
+ stream.setNote(note);
151
+ };
152
+ return {
153
+ overrides: {
154
+ onToken: (token) => {
155
+ if (!started) {
156
+ started = true;
157
+ stream.begin(meta);
158
+ }
159
+ // The text is the signal now — a stale `thinking…` beside streaming
160
+ // prose reads as a hang that is not happening.
161
+ stream.setNote(undefined);
162
+ stream.append(token);
163
+ },
164
+ onProgress: (line) => noteFor(line),
165
+ onToolCall: (phase, info) => {
166
+ if (phase === 'started') {
167
+ // The step's preamble is not the answer: clear it so the preview shows
168
+ // the call that is actually running (same rule as the chat REPL).
169
+ if (started)
170
+ stream.reset();
171
+ noteFor(`⚙ ${info.tool} …`);
172
+ return;
173
+ }
174
+ if (started)
175
+ stream.setNote(undefined);
176
+ stream.card(toolCallCard({
177
+ tool: info.tool,
178
+ ok: info.ok,
179
+ error: info.error,
180
+ result: info.result,
181
+ durationMs: info.durationMs,
182
+ args: info.args,
183
+ }));
184
+ },
185
+ onGitDiff: (payload) => stream.card(gitDiffCard(payload)),
186
+ },
187
+ start: (note) => noteFor(note ?? THINKING_NOTE),
188
+ commit: (content) => {
189
+ // Unmount WITHOUT archiving: the preview is not authoritative, and the
190
+ // caller's sanitized answer is written right below.
191
+ stream.finish({ archive: false });
192
+ presentAnswer(content, opts);
193
+ },
194
+ stop: () => {
195
+ // Idempotent on purpose: a caller stops on the failure path AND in a
196
+ // `finally`, and detaching the shell bus twice must not be a problem.
197
+ if (stopped)
198
+ return;
199
+ stopped = true;
200
+ detachShell();
201
+ stream.finish({ archive: false });
202
+ },
203
+ };
204
+ }
118
205
  /**
119
206
  * Live-streaming answer view.
120
207
  *
@@ -1 +1 @@
1
- {"version":3,"file":"presenter.js","sourceRoot":"","sources":["../../../src/cli/ui/presenter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"presenter.js","sourceRoot":"","sources":["../../../src/cli/ui/presenter.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,15 @@ export declare class ConfigManager {
19
19
  private configDir;
20
20
  /** mtime of the config file when `this.config` was last loaded (live re-read). */
21
21
  private configMtimeMs;
22
+ /** The file a WRITE goes to — see `resolveNuviraConfigPath` (nuviraconfig.json wins). */
22
23
  private configPath;
24
+ /**
25
+ * Both config file names, whether or not they exist yet — what the live
26
+ * re-read stats. Watching only the write target would miss a file another
27
+ * process CREATES under the other name, which is the exact case a user hits
28
+ * when they hand-write `nuviraconfig.json` next to a legacy profile.
29
+ */
30
+ private readonly configCandidatePaths;
23
31
  /**
24
32
  * Phase A1 secret vault. When attached, provider key reads/writes route
25
33
  * through the vault (`buffconfig.json` holds `vault:` refs instead of
@@ -30,7 +38,11 @@ export declare class ConfigManager {
30
38
  /** Phase A2 workspace store (lazy — see getWorkspaceStore). */
31
39
  private workspaceStore;
32
40
  constructor(configDir?: string);
33
- /** Best-effort current mtime of the config file (0 when absent). */
41
+ /**
42
+ * Best-effort newest mtime across BOTH config file names (0 when neither
43
+ * exists) — see {@link configCandidatePaths} for why it is not just the write
44
+ * target.
45
+ */
34
46
  private statMtime;
35
47
  /**
36
48
  * Live re-read (Session 36 — "update as and when"): a running process
@@ -56,6 +68,22 @@ export declare class ConfigManager {
56
68
  * Load config from disk, merging with defaults and env vars
57
69
  */
58
70
  private loadConfig;
71
+ /**
72
+ * Apply ONE config file's user values over `config` (defaults + the lower
73
+ * precedence file already applied).
74
+ *
75
+ * Section by section rather than a blanket spread, because each section's
76
+ * semantics differ: maps merge per key so two separate `config set` calls
77
+ * preserve each other, while `skills.disabled` and
78
+ * `gateway.statusRecipients` are WHOLE ARRAYS, where an empty list is a
79
+ * meaningful value ("nothing disabled", "nobody") that a merge would lose.
80
+ *
81
+ * Extracted from `loadConfig` when the config file went from one name to two:
82
+ * the same rules must apply to both files, and a second copy of them would
83
+ * drift (the original single-file merge already had two bugs of that class —
84
+ * `routing.*` and the extra `gateway.*` keys were dropped on load).
85
+ */
86
+ private applyUserConfig;
59
87
  /**
60
88
  * Override API keys from environment variables.
61
89
  * Environment variables take priority over the config file.
@@ -1 +1 @@
1
- {"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/config/manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAgB,cAAc,EAAE,MAAM,YAAY,CAAC;AAMtE,OAAO,EAAE,KAAK,EAAgC,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAqB,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAsB,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AA6BlF,yFAAyF;AACzF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAK3E;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CActF;AA8CD,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,GAAG,CAAqC;IAChD,OAAO,CAAC,SAAS,CAAS;IAC1B,kFAAkF;IAClF,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,UAAU,CAAS;IAC3B;;;;;OAKG;IACH,OAAO,CAAC,KAAK,CAAsB;IACnC,+DAA+D;IAC/D,OAAO,CAAC,cAAc,CAA+B;gBAEzC,SAAS,CAAC,EAAE,MAAM;IAuB9B,oEAAoE;IACpE,OAAO,CAAC,SAAS;IAQjB;;;;;;;OAOG;IACH,OAAO,CAAC,gBAAgB;IAcxB,6EAA6E;IAC7E,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI;IAItC,iEAAiE;IACjE,QAAQ,IAAI,KAAK,GAAG,IAAI;IAIxB;;;;;OAKG;IACH,iBAAiB,IAAI,cAAc;IAOnC;;OAEG;IACH,OAAO,CAAC,UAAU;IAoMlB;;;;;;;;OAQG;IACH,OAAO,CAAC,eAAe;IAgCvB;;;;;;;;;;OAUG;IACG,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAqCzC;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IA0E9E;;;;;;;;;OASG;IACH,OAAO,CAAC,gBAAgB;IA6BxB;;;;;;;;;OASG;IACH,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,cAAc,CAAA;KAAE;IAU9E;;OAEG;IACH,MAAM,IAAI,UAAU;IAKpB;;;OAGG;IACH,YAAY,IAAI,mBAAmB;IAKnC;;OAEG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI;IAgJvC;;;;;;;;;;;;;;OAcG;IACH,mBAAmB,CACjB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAyC7D;;;;;;;;;OASG;IACH,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAwBjD;;;;OAIG;IACH,mBAAmB,IAAI,IAAI;CAe5B"}
1
+ {"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/config/manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAgB,cAAc,EAAE,MAAM,YAAY,CAAC;AAetE,OAAO,EAAE,KAAK,EAAgC,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAqB,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAuC,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AA6BnG,yFAAyF;AACzF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAK3E;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CActF;AA8CD,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,GAAG,CAAqC;IAChD,OAAO,CAAC,SAAS,CAAS;IAC1B,kFAAkF;IAClF,OAAO,CAAC,aAAa,CAAK;IAC1B,yFAAyF;IACzF,OAAO,CAAC,UAAU,CAAS;IAC3B;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAW;IAChD;;;;;OAKG;IACH,OAAO,CAAC,KAAK,CAAsB;IACnC,+DAA+D;IAC/D,OAAO,CAAC,cAAc,CAA+B;gBAEzC,SAAS,CAAC,EAAE,MAAM;IAwB9B;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAYjB;;;;;;;OAOG;IACH,OAAO,CAAC,gBAAgB;IAcxB,6EAA6E;IAC7E,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI;IAItC,iEAAiE;IACjE,QAAQ,IAAI,KAAK,GAAG,IAAI;IAIxB;;;;;OAKG;IACH,iBAAiB,IAAI,cAAc;IAOnC;;OAEG;IACH,OAAO,CAAC,UAAU;IAwDlB;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,eAAe;IA2IvB;;;;;;;;OAQG;IACH,OAAO,CAAC,eAAe;IAgCvB;;;;;;;;;;OAUG;IACG,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAqCzC;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IA0E9E;;;;;;;;;OASG;IACH,OAAO,CAAC,gBAAgB;IA6BxB;;;;;;;;;OASG;IACH,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,cAAc,CAAA;KAAE;IAU9E;;OAEG;IACH,MAAM,IAAI,UAAU;IAKpB;;;OAGG;IACH,YAAY,IAAI,mBAAmB;IAKnC;;OAEG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI;IAgJvC;;;;;;;;;;;;;;OAcG;IACH,mBAAmB,CACjB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAyC7D;;;;;;;;;OASG;IACH,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAwBjD;;;;OAIG;IACH,mBAAmB,IAAI,IAAI;CAe5B"}
@@ -1,13 +1,16 @@
1
1
  import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync } from 'node:fs';
2
- import { join } from 'node:path';
3
- import { resolveBuffConfigDir } from './paths.js';
2
+ // ONE source of truth for the config FILE, not just the directory: the manager
3
+ // used to build `join(configDir, 'buffconfig.json')` itself while
4
+ // `resolveNuviraConfigPath()` resolved the new name first, so the two disagreed
5
+ // about which file the runtime reads (see `paths.ts` — `CONFIG_FILE_NAMES`).
6
+ import { resolveBuffConfigDir, resolveNuviraConfigCandidatePaths, resolveNuviraConfigPath, resolveNuviraConfigReadPaths, } from './paths.js';
4
7
  import { loadEnv } from '../utils/env.js';
5
8
  import { logger } from '../utils/logger.js';
6
9
  import { resolveDefaultProvider } from '../learning/model-selection.js';
7
10
  import { CATALOG_ENV_VARS, isCatalogKeyless } from '../inference/provider-catalog.js';
8
11
  import { Vault, isVaultRef, VAULT_REF_PREFIX } from '../enterprise/vault.js';
9
12
  import { getWorkspaceStore } from './workspace.js';
10
- import { resolveMcpSettings } from '../mcp/settings.js';
13
+ import { mergeMcpSetting, resolveMcpSettings } from '../mcp/settings.js';
11
14
  // NO hardcoded provider/model defaults: the default provider is the routing
12
15
  // directive 'auto' (the best AVAILABLE provider is resolved at runtime from
13
16
  // the user's keys + verified models — see resolveDefaultProvider), and every
@@ -116,7 +119,15 @@ export class ConfigManager {
116
119
  configDir;
117
120
  /** mtime of the config file when `this.config` was last loaded (live re-read). */
118
121
  configMtimeMs = 0;
122
+ /** The file a WRITE goes to — see `resolveNuviraConfigPath` (nuviraconfig.json wins). */
119
123
  configPath;
124
+ /**
125
+ * Both config file names, whether or not they exist yet — what the live
126
+ * re-read stats. Watching only the write target would miss a file another
127
+ * process CREATES under the other name, which is the exact case a user hits
128
+ * when they hand-write `nuviraconfig.json` next to a legacy profile.
129
+ */
130
+ configCandidatePaths;
120
131
  /**
121
132
  * Phase A1 secret vault. When attached, provider key reads/writes route
122
133
  * through the vault (`buffconfig.json` holds `vault:` refs instead of
@@ -132,7 +143,8 @@ export class ConfigManager {
132
143
  // already honor it, so the config manager must too: a hermetic run pointed
133
144
  // at NUVIRA_CONFIG_DIR must never read/write the real ~/.nuvira config.
134
145
  this.configDir = resolveBuffConfigDir(configDir);
135
- this.configPath = join(this.configDir, 'buffconfig.json');
146
+ this.configPath = resolveNuviraConfigPath(this.configDir);
147
+ this.configCandidatePaths = resolveNuviraConfigCandidatePaths(this.configDir);
136
148
  // Phase A1: auto-open the secret vault so refs resolve at READ time. Every
137
149
  // runtime command (BaseCommand, Orchestrator) constructs its OWN fresh
138
150
  // ConfigManager — boot-time hydration in index.ts only touches a throwaway
@@ -149,14 +161,22 @@ export class ConfigManager {
149
161
  this.config = this.loadConfig();
150
162
  this.configMtimeMs = this.statMtime();
151
163
  }
152
- /** Best-effort current mtime of the config file (0 when absent). */
164
+ /**
165
+ * Best-effort newest mtime across BOTH config file names (0 when neither
166
+ * exists) — see {@link configCandidatePaths} for why it is not just the write
167
+ * target.
168
+ */
153
169
  statMtime() {
154
- try {
155
- return statSync(this.configPath).mtimeMs;
156
- }
157
- catch {
158
- return 0;
170
+ let newest = 0;
171
+ for (const path of this.configCandidatePaths) {
172
+ try {
173
+ newest = Math.max(newest, statSync(path).mtimeMs);
174
+ }
175
+ catch {
176
+ // Absent is the normal case for at least one of the two names.
177
+ }
159
178
  }
179
+ return newest;
160
180
  }
161
181
  /**
162
182
  * Live re-read (Session 36 — "update as and when"): a running process
@@ -231,140 +251,15 @@ export class ConfigManager {
231
251
  subagent: { ...(DEFAULT_CONFIG.mcp?.subagent || {}) },
232
252
  servers: { ...(DEFAULT_CONFIG.mcp?.servers || {}) },
233
253
  };
234
- if (existsSync(this.configPath)) {
254
+ // BOTH config file names are read, LOWEST precedence first, so the new
255
+ // name wins key by key and neither file is silently discarded. The manager
256
+ // used to open `buffconfig.json` alone while `resolveNuviraConfigPath()`
257
+ // resolved `nuviraconfig.json` first: a profile under the NEW name was
258
+ // valid, resolved by one reader and ignored by every runtime reader here —
259
+ // silently, because the file it opened was a valid one either way.
260
+ for (const path of [...resolveNuviraConfigReadPaths(this.configDir)].reverse()) {
235
261
  try {
236
- const raw = readFileSync(this.configPath, 'utf-8');
237
- const userConfig = JSON.parse(raw);
238
- if (userConfig.defaultProvider) {
239
- config.defaultProvider = userConfig.defaultProvider;
240
- }
241
- if (userConfig.providers) {
242
- for (const [key, value] of Object.entries(userConfig.providers)) {
243
- const provider = key;
244
- if (config.providers[provider]) {
245
- config.providers[provider] = { ...config.providers[provider], ...value };
246
- }
247
- else {
248
- config.providers[provider] = value;
249
- }
250
- }
251
- }
252
- // Merge history config
253
- if (userConfig.history) {
254
- config.history = { ...config.history, ...userConfig.history };
255
- }
256
- // Merge fallback config
257
- if (userConfig.fallback) {
258
- config.fallback = { ...config.fallback, ...userConfig.fallback };
259
- }
260
- // Merge pricing overrides (deep — per provider)
261
- if (userConfig.pricing) {
262
- config.pricing = { ...config.pricing };
263
- for (const [provider, pricing] of Object.entries(userConfig.pricing)) {
264
- config.pricing[provider] = { ...(config.pricing[provider] || {}), ...pricing };
265
- }
266
- }
267
- // Merge routing config (learning router). FIX: this was previously
268
- // dropped entirely on load, so `nuvira config set routing.*` (bandit,
269
- // quota, governance, contextWindows, nuviraSidecar) never survived a
270
- // restart. Nested maps are deep-merged so separate sets preserve each
271
- // other (governance.allowProviders + governance.maxCostUsd coexist).
272
- if (userConfig.routing) {
273
- const loadedRouting = userConfig.routing;
274
- config.routing = {
275
- ...(config.routing || {}),
276
- ...loadedRouting,
277
- quota: { ...(config.routing?.quota || {}), ...(loadedRouting.quota || {}) },
278
- governance: { ...(config.routing?.governance || {}), ...(loadedRouting.governance || {}) },
279
- contextWindows: { ...(config.routing?.contextWindows || {}), ...(loadedRouting.contextWindows || {}) },
280
- nuviraSidecar: { ...(config.routing?.nuviraSidecar || {}), ...(loadedRouting.nuviraSidecar || {}) },
281
- };
282
- }
283
- // Merge toolsets config (deep per toolset — separate toggles preserve
284
- // each other; a missing entry means enabled).
285
- if (userConfig.tools) {
286
- config.tools = {
287
- ...(config.tools || {}),
288
- ...userConfig.tools,
289
- toolsets: { ...(config.tools?.toolsets || {}), ...(userConfig.tools.toolsets || {}) },
290
- };
291
- }
292
- // Merge MCP config. Deep per-key merge so separate `config set`
293
- // commands preserve each other (maxToolsTotal + subagent.inherit +
294
- // servers.<name>.runtime), and per-server so one server's override
295
- // never drops another's.
296
- if (userConfig.mcp) {
297
- const loadedMcp = userConfig.mcp;
298
- config.mcp = {
299
- ...(config.mcp || {}),
300
- ...loadedMcp,
301
- subagent: { ...(config.mcp?.subagent || {}), ...(loadedMcp.subagent || {}) },
302
- servers: {
303
- ...(config.mcp?.servers || {}),
304
- ...Object.fromEntries(Object.entries(loadedMcp.servers ?? {}).map(([name, override]) => [
305
- name,
306
- { ...(config.mcp?.servers?.[name] || {}), ...(override || {}) },
307
- ])),
308
- },
309
- };
310
- }
311
- // Merge I7 skills config (disabled[] + registries[]) — whole-array
312
- // semantics: an empty array is meaningful ("nothing disabled") and
313
- // must survive a load.
314
- if (userConfig.skills) {
315
- config.skills = {
316
- ...(config.skills || {}),
317
- ...(userConfig.skills.disabled !== undefined ? { disabled: userConfig.skills.disabled } : {}),
318
- ...(userConfig.skills.registries !== undefined ? { registries: userConfig.skills.registries } : {}),
319
- };
320
- }
321
- // Modality backend selection (`modality.image.*`). Merged per-subkey so
322
- // `nuvira config set modality.image.provider` — or the dashboard's
323
- // workspace/providers UI — is READ BACK. Without this block the setting
324
- // saved to the file and was silently dropped on load: the CLI printed a
325
- // success line and the agent kept auto-selecting. Same whitelisting
326
- // class as the gateway block below.
327
- if (userConfig.modality) {
328
- config.modality = {
329
- ...(config.modality || {}),
330
- ...userConfig.modality,
331
- image: { ...(config.modality?.image || {}), ...(userConfig.modality.image || {}) },
332
- };
333
- }
334
- // Dashboard runtime settings — the directory an unattached chat turn
335
- // runs in (`dashboard.cwd`). Persisted and loaded like every other
336
- // top-level key; a dropped value here would put the accidental-cwd
337
- // fallback back without anyone noticing.
338
- if (userConfig.dashboard) {
339
- config.dashboard = { ...(config.dashboard || {}), ...userConfig.dashboard };
340
- }
341
- // Merge gateway config. The gate is `userConfig.gateway` (any key), not
342
- // `policies || statusRecipients`: a file carrying ONLY another gateway
343
- // setting (askUserWait, askUserTimeoutMs) must still load.
344
- //
345
- // `...userConfig.gateway` carries EVERY other key through. This block
346
- // used to rebuild the object from policies + statusRecipients alone, so
347
- // any other gateway setting was silently DROPPED on load — the value
348
- // was in the file and still read back as absent. (Same class as the
349
- // whitelisting bug in save(): a new setting appears to save and appear
350
- // to load while doing neither.)
351
- if (userConfig.gateway) {
352
- config.gateway = {
353
- ...(config.gateway || {}),
354
- ...userConfig.gateway,
355
- policies: {
356
- ...(config.gateway?.policies || {}),
357
- ...Object.fromEntries(Object.entries(userConfig.gateway?.policies ?? {}).map(([platform, pol]) => [
358
- platform,
359
- { ...(config.gateway?.policies?.[platform] || {}), ...(pol || {}) },
360
- ])),
361
- },
362
- // Whole-array semantics: an empty list is meaningful ("nobody").
363
- ...(userConfig.gateway?.statusRecipients !== undefined
364
- ? { statusRecipients: userConfig.gateway.statusRecipients }
365
- : {}),
366
- };
367
- }
262
+ this.applyUserConfig(config, JSON.parse(readFileSync(path, 'utf-8')));
368
263
  }
369
264
  catch {
370
265
  // If config is corrupted, fall back to defaults
@@ -374,6 +269,146 @@ export class ConfigManager {
374
269
  this.overrideFromEnv(config);
375
270
  return config;
376
271
  }
272
+ /**
273
+ * Apply ONE config file's user values over `config` (defaults + the lower
274
+ * precedence file already applied).
275
+ *
276
+ * Section by section rather than a blanket spread, because each section's
277
+ * semantics differ: maps merge per key so two separate `config set` calls
278
+ * preserve each other, while `skills.disabled` and
279
+ * `gateway.statusRecipients` are WHOLE ARRAYS, where an empty list is a
280
+ * meaningful value ("nothing disabled", "nobody") that a merge would lose.
281
+ *
282
+ * Extracted from `loadConfig` when the config file went from one name to two:
283
+ * the same rules must apply to both files, and a second copy of them would
284
+ * drift (the original single-file merge already had two bugs of that class —
285
+ * `routing.*` and the extra `gateway.*` keys were dropped on load).
286
+ */
287
+ applyUserConfig(config, userConfig) {
288
+ if (userConfig.defaultProvider) {
289
+ config.defaultProvider = userConfig.defaultProvider;
290
+ }
291
+ if (userConfig.providers) {
292
+ for (const [key, value] of Object.entries(userConfig.providers)) {
293
+ const provider = key;
294
+ if (config.providers[provider]) {
295
+ config.providers[provider] = { ...config.providers[provider], ...value };
296
+ }
297
+ else {
298
+ config.providers[provider] = value;
299
+ }
300
+ }
301
+ }
302
+ // Merge history config
303
+ if (userConfig.history) {
304
+ config.history = { ...config.history, ...userConfig.history };
305
+ }
306
+ // Merge fallback config
307
+ if (userConfig.fallback) {
308
+ config.fallback = { ...config.fallback, ...userConfig.fallback };
309
+ }
310
+ // Merge pricing overrides (deep — per provider)
311
+ if (userConfig.pricing) {
312
+ config.pricing = { ...config.pricing };
313
+ for (const [provider, pricing] of Object.entries(userConfig.pricing)) {
314
+ config.pricing[provider] = { ...(config.pricing[provider] || {}), ...pricing };
315
+ }
316
+ }
317
+ // Merge routing config (learning router). FIX: this was previously
318
+ // dropped entirely on load, so `nuvira config set routing.*` (bandit,
319
+ // quota, governance, contextWindows, nuviraSidecar) never survived a
320
+ // restart. Nested maps are deep-merged so separate sets preserve each
321
+ // other (governance.allowProviders + governance.maxCostUsd coexist).
322
+ if (userConfig.routing) {
323
+ const loadedRouting = userConfig.routing;
324
+ config.routing = {
325
+ ...(config.routing || {}),
326
+ ...loadedRouting,
327
+ quota: { ...(config.routing?.quota || {}), ...(loadedRouting.quota || {}) },
328
+ governance: { ...(config.routing?.governance || {}), ...(loadedRouting.governance || {}) },
329
+ contextWindows: { ...(config.routing?.contextWindows || {}), ...(loadedRouting.contextWindows || {}) },
330
+ nuviraSidecar: { ...(config.routing?.nuviraSidecar || {}), ...(loadedRouting.nuviraSidecar || {}) },
331
+ };
332
+ }
333
+ // Merge toolsets config (deep per toolset — separate toggles preserve
334
+ // each other; a missing entry means enabled).
335
+ if (userConfig.tools) {
336
+ config.tools = {
337
+ ...(config.tools || {}),
338
+ ...userConfig.tools,
339
+ toolsets: { ...(config.tools?.toolsets || {}), ...(userConfig.tools.toolsets || {}) },
340
+ };
341
+ }
342
+ // Merge MCP config through the ONE merge the `mcp.*` setter uses, instead of
343
+ // a local spread. WHY: `runtime` is a nested object set in two commands
344
+ // (`runtime.command` for the interpreter, `runtime.args` for the script), and
345
+ // this block spread the incoming override over the stored one, so a file
346
+ // carrying `runtime.args` REPLACED the `runtime.command` an earlier file (or
347
+ // an earlier `config set`) had stored — the server then ran without the
348
+ // interpreter that was configured for it, and nothing said so.
349
+ // `mergeMcpSetting` keeps the field a patch does not mention, which is also
350
+ // what makes reading TWO config files behave like reading one.
351
+ if (userConfig.mcp) {
352
+ config.mcp = mergeMcpSetting(config.mcp, userConfig.mcp);
353
+ }
354
+ // Merge I7 skills config (disabled[] + registries[]) — whole-array
355
+ // semantics: an empty array is meaningful ("nothing disabled") and
356
+ // must survive a load.
357
+ if (userConfig.skills) {
358
+ config.skills = {
359
+ ...(config.skills || {}),
360
+ ...(userConfig.skills.disabled !== undefined ? { disabled: userConfig.skills.disabled } : {}),
361
+ ...(userConfig.skills.registries !== undefined ? { registries: userConfig.skills.registries } : {}),
362
+ };
363
+ }
364
+ // Modality backend selection (`modality.image.*`). Merged per-subkey so
365
+ // `nuvira config set modality.image.provider` — or the dashboard's
366
+ // workspace/providers UI — is READ BACK. Without this block the setting
367
+ // saved to the file and was silently dropped on load: the CLI printed a
368
+ // success line and the agent kept auto-selecting. Same whitelisting
369
+ // class as the gateway block below.
370
+ if (userConfig.modality) {
371
+ config.modality = {
372
+ ...(config.modality || {}),
373
+ ...userConfig.modality,
374
+ image: { ...(config.modality?.image || {}), ...(userConfig.modality.image || {}) },
375
+ };
376
+ }
377
+ // Dashboard runtime settings — the directory an unattached chat turn
378
+ // runs in (`dashboard.cwd`). Persisted and loaded like every other
379
+ // top-level key; a dropped value here would put the accidental-cwd
380
+ // fallback back without anyone noticing.
381
+ if (userConfig.dashboard) {
382
+ config.dashboard = { ...(config.dashboard || {}), ...userConfig.dashboard };
383
+ }
384
+ // Merge gateway config. The gate is `userConfig.gateway` (any key), not
385
+ // `policies || statusRecipients`: a file carrying ONLY another gateway
386
+ // setting (askUserWait, askUserTimeoutMs) must still load.
387
+ //
388
+ // `...userConfig.gateway` carries EVERY other key through. This block
389
+ // used to rebuild the object from policies + statusRecipients alone, so
390
+ // any other gateway setting was silently DROPPED on load — the value
391
+ // was in the file and still read back as absent. (Same class as the
392
+ // whitelisting bug in save(): a new setting appears to save and appear
393
+ // to load while doing neither.)
394
+ if (userConfig.gateway) {
395
+ config.gateway = {
396
+ ...(config.gateway || {}),
397
+ ...userConfig.gateway,
398
+ policies: {
399
+ ...(config.gateway?.policies || {}),
400
+ ...Object.fromEntries(Object.entries(userConfig.gateway?.policies ?? {}).map(([platform, pol]) => [
401
+ platform,
402
+ { ...(config.gateway?.policies?.[platform] || {}), ...(pol || {}) },
403
+ ])),
404
+ },
405
+ // Whole-array semantics: an empty list is meaningful ("nobody").
406
+ ...(userConfig.gateway?.statusRecipients !== undefined
407
+ ? { statusRecipients: userConfig.gateway.statusRecipients }
408
+ : {}),
409
+ };
410
+ }
411
+ }
377
412
  /**
378
413
  * Override API keys from environment variables.
379
414
  * Environment variables take priority over the config file.