@herdctl/core 5.8.3 → 5.10.0
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.
- package/dist/config/__tests__/merge.test.js +20 -0
- package/dist/config/__tests__/merge.test.js.map +1 -1
- package/dist/config/__tests__/schema.test.js +48 -0
- package/dist/config/__tests__/schema.test.js.map +1 -1
- package/dist/config/index.d.ts +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +2 -2
- package/dist/config/index.js.map +1 -1
- package/dist/config/merge.d.ts +5 -1
- package/dist/config/merge.d.ts.map +1 -1
- package/dist/config/merge.js +9 -0
- package/dist/config/merge.js.map +1 -1
- package/dist/config/schema.d.ts +869 -13
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +118 -1
- package/dist/config/schema.js.map +1 -1
- package/dist/fleet-manager/job-control.d.ts.map +1 -1
- package/dist/fleet-manager/job-control.js +2 -0
- package/dist/fleet-manager/job-control.js.map +1 -1
- package/dist/fleet-manager/types.d.ts +14 -0
- package/dist/fleet-manager/types.d.ts.map +1 -1
- package/dist/runner/__tests__/sdk-adapter.test.js +41 -0
- package/dist/runner/__tests__/sdk-adapter.test.js.map +1 -1
- package/dist/runner/job-executor.d.ts.map +1 -1
- package/dist/runner/job-executor.js +1 -0
- package/dist/runner/job-executor.js.map +1 -1
- package/dist/runner/runtime/__tests__/cli-runtime.test.d.ts +2 -0
- package/dist/runner/runtime/__tests__/cli-runtime.test.d.ts.map +1 -0
- package/dist/runner/runtime/__tests__/cli-runtime.test.js +82 -0
- package/dist/runner/runtime/__tests__/cli-runtime.test.js.map +1 -0
- package/dist/runner/runtime/__tests__/cli-session-path.test.js +88 -1
- package/dist/runner/runtime/__tests__/cli-session-path.test.js.map +1 -1
- package/dist/runner/runtime/cli-runtime.d.ts.map +1 -1
- package/dist/runner/runtime/cli-runtime.js +175 -4
- package/dist/runner/runtime/cli-runtime.js.map +1 -1
- package/dist/runner/runtime/cli-session-path.d.ts +24 -0
- package/dist/runner/runtime/cli-session-path.d.ts.map +1 -1
- package/dist/runner/runtime/cli-session-path.js +36 -0
- package/dist/runner/runtime/cli-session-path.js.map +1 -1
- package/dist/runner/runtime/interface.d.ts +3 -1
- package/dist/runner/runtime/interface.d.ts.map +1 -1
- package/dist/runner/runtime/sdk-runtime.d.ts.map +1 -1
- package/dist/runner/runtime/sdk-runtime.js +20 -0
- package/dist/runner/runtime/sdk-runtime.js.map +1 -1
- package/dist/runner/sdk-adapter.d.ts.map +1 -1
- package/dist/runner/sdk-adapter.js +4 -0
- package/dist/runner/sdk-adapter.js.map +1 -1
- package/dist/runner/types.d.ts +4 -1
- package/dist/runner/types.d.ts.map +1 -1
- package/dist/state/__tests__/session-discovery.test.js +241 -8
- package/dist/state/__tests__/session-discovery.test.js.map +1 -1
- package/dist/state/session-discovery.d.ts +27 -5
- package/dist/state/session-discovery.d.ts.map +1 -1
- package/dist/state/session-discovery.js +114 -31
- package/dist/state/session-discovery.js.map +1 -1
- package/package.json +1 -1
package/dist/config/merge.js
CHANGED
|
@@ -79,6 +79,7 @@ export function deepMerge(base, override) {
|
|
|
79
79
|
* - model: Agent value overrides default
|
|
80
80
|
* - max_turns: Agent value overrides default
|
|
81
81
|
* - permission_mode: Agent value overrides default
|
|
82
|
+
* - tools: Agent array replaces default (arrays are not merged)
|
|
82
83
|
* - allowed_tools: Agent array replaces default (arrays are not merged)
|
|
83
84
|
* - denied_tools: Agent array replaces default (arrays are not merged)
|
|
84
85
|
*
|
|
@@ -135,12 +136,20 @@ export function mergeAgentConfig(defaults, agent) {
|
|
|
135
136
|
result.permission_mode = defaults.permission_mode;
|
|
136
137
|
}
|
|
137
138
|
// Merge array values (agent takes precedence if defined - arrays are replaced, not merged)
|
|
139
|
+
if (defaults.tools !== undefined && result.tools === undefined) {
|
|
140
|
+
result.tools = defaults.tools;
|
|
141
|
+
}
|
|
138
142
|
if (defaults.allowed_tools !== undefined && result.allowed_tools === undefined) {
|
|
139
143
|
result.allowed_tools = defaults.allowed_tools;
|
|
140
144
|
}
|
|
141
145
|
if (defaults.denied_tools !== undefined && result.denied_tools === undefined) {
|
|
142
146
|
result.denied_tools = defaults.denied_tools;
|
|
143
147
|
}
|
|
148
|
+
// Merge mcp_servers (deep merge — agent servers override defaults with same name,
|
|
149
|
+
// default servers not present in agent config are inherited)
|
|
150
|
+
if (defaults.mcp_servers || agent.mcp_servers) {
|
|
151
|
+
result.mcp_servers = deepMerge(defaults.mcp_servers, agent.mcp_servers);
|
|
152
|
+
}
|
|
144
153
|
return result;
|
|
145
154
|
}
|
|
146
155
|
/**
|
package/dist/config/merge.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/config/merge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/config/merge.ts"],"names":[],"mappings":"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"}
|