zidane 5.1.22 → 5.2.0

package/dist/{presets-tvD28pCu.js → presets-AgF0RFx1.js}

@@ -1,4 +1,4 @@
-import { a as multiEdit, i as readFile, n as createSpawnTool, o as listFiles, r as shell, t as writeFile, u as edit } from "./tools-CMVruxF0.js";
+import { a as multiEdit, i as readFile, n as createSpawnTool, o as listFiles, r as shell, t as writeFile, u as edit } from "./tools-BRbbfdJh.js";
 //#region src/presets/basic.ts
 /**
 * Core tools available in every basic preset (without spawn).
@@ -38,10 +38,11 @@ function definePreset(config) {
 * objects shallow-merge; arrays and hook handler lists concatenate. Designed so
 * stacking presets does the obvious thing without the spread-collision footgun:
 *
-* - `name`, `system`, `eager`, `skills`           → last-defined wins
-* - `tools`, `toolAliases`, `behavior`            → shallow-merge (later keys override)
-* - `mcpServers`                                  → concat with last-wins on `name` collision
-* - `hooks`                                       → per-event concat; every handler fires
+* - `name`, `system`, `eager`, `skills`              → last-defined wins
+* - `tools`, `toolAliases`, `behavior`               → shallow-merge (later keys override)
+* - `behavior.dedupTools`, `behavior.toolBudgets`    → **deep-merge** (per-tool-name; later wins on collision)
+* - `mcpServers`                                     → concat with last-wins on `name` collision
+* - `hooks`                                          → per-event concat; every handler fires
 *
 * `hooks` always emerges as `event → handler[]` so downstream registration
 * (in `createAgent`) sees a uniform shape. Order of handlers within an event
@@ -50,6 +51,13 @@ function definePreset(config) {
 * `mcpServers` is deduped by `name` because shipping two servers with the same
 * name would trip the connector at runtime — a later preset overriding an
 * earlier preset's `github` server is the practical intent.
+*
+* `behavior.dedupTools` and `behavior.toolBudgets` get the same per-key deep-merge
+* because they are tool-name-keyed records — a preset that ships a dedup hasher
+* for one tool should not erase a hasher another preset ships for a different
+* tool. Last-wins still applies on a per-tool collision so a downstream preset
+* can override an upstream preset's policy for one specific tool. Other
+* `behavior` fields keep last-wins semantics.
 */
 function composePresets(...presets) {
 	const out = {};
@@ -68,10 +76,21 @@ function composePresets(...presets) {
 			...out.toolAliases,
 			...p.toolAliases
 		};
-		if (p.behavior) out.behavior = {
-			...out.behavior,
-			...p.behavior
-		};
+		if (p.behavior) {
+			const merged = {
+				...out.behavior,
+				...p.behavior
+			};
+			if (out.behavior?.dedupTools || p.behavior.dedupTools) merged.dedupTools = {
+				...out.behavior?.dedupTools,
+				...p.behavior.dedupTools
+			};
+			if (out.behavior?.toolBudgets || p.behavior.toolBudgets) merged.toolBudgets = {
+				...out.behavior?.toolBudgets,
+				...p.behavior.toolBudgets
+			};
+			out.behavior = merged;
+		}
 		if (p.mcpServers) for (const server of p.mcpServers) mcpByName.set(server.name, server);
 		if (p.hooks) for (const [event, handler] of Object.entries(p.hooks)) {
 			if (handler === void 0) continue;
@@ -87,4 +106,4 @@ function composePresets(...presets) {
 //#endregion
 export { basic_default as i, definePreset as n, basicTools as r, composePresets as t };
 
-//# sourceMappingURL=presets-tvD28pCu.js.map
+//# sourceMappingURL=presets-AgF0RFx1.js.map

package/dist/presets-AgF0RFx1.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"presets-AgF0RFx1.js","names":[],"sources":["../src/presets/basic.ts","../src/presets/index.ts"],"sourcesContent":["import { definePreset } from '.'\nimport { edit, listFiles, multiEdit, readFile, shell, writeFile } from '../tools'\nimport { createSpawnTool } from '../tools/spawn'\n\n/**\n * Core tools available in every basic preset (without spawn).\n *\n * `edit` and `multi_edit` ship in the basic set because surgical edits are the\n * default modality for production agents — `write_file` is for full overwrites.\n * `glob` and `grep` are exported but opt-in: not every agent needs codebase\n * search, and shipping them by default would force `tool:gate` work onto\n * consumers that prefer the model to use `shell` + classic Unix tools.\n */\nexport const basicTools = { shell, readFile, writeFile, listFiles, edit, multiEdit }\n\nexport default definePreset({\n  name: 'basic',\n  system: 'You are a helpful assistant with access to shell, file reading, file writing, surgical and multi-edit tools, directory listing, and sub-agent spawning. Prefer `edit` / `multi_edit` for in-place changes and `write_file` for full file overwrites. Use them to accomplish tasks in the project directory.',\n  // `persist: true` shares the parent's session with every child agent — child\n  // turns land in `session.turns` tagged with their own `runId`, and the run\n  // itself is recorded in `session.runs` with `parentRunId` + `depth`. That's\n  // what lets a reloaded TUI session reconstruct the full subagent tree (see\n  // `eventsFromTurns` in `tui/store.ts`). Hosts that want children in-memory\n  // only can construct their own preset with `createSpawnTool()`.\n  tools: { ...basicTools, spawn: createSpawnTool({ persist: true }) },\n})\n","import type { AgentHooks, AgentOptions } from '../agent'\n\nexport type { AgentHookMap } from '../agent'\n\n/**\n * A preset is a reusable slice of `AgentOptions` — spread it into `createAgent()`\n * to configure tools, a default system prompt, aliases, behavior defaults, and\n * agent-lifetime hooks.\n *\n * `provider`, `execution`, `session`, and internal fields are excluded so presets\n * remain shareable and composable.\n *\n * ```ts\n * import { basic } from 'zidane/presets'\n * createAgent({ ...basic, provider })\n * ```\n *\n * ### Composing multiple presets\n *\n * Bare `...spread` is shallow — `{ ...a, ...b }` overwrites every key `b`\n * defines, including `hooks`. Use {@link composePresets} when you want\n * field-aware merging (per-event hook concat, tools shallow-merge, etc.):\n *\n * ```ts\n * createAgent({ ...composePresets(basic, telemetry, mine), provider })\n * ```\n */\nexport type Preset = Omit<Partial<AgentOptions>, 'provider' | 'execution' | 'session' | 'mcpConnector'>\n\n/**\n * Identity helper for type inference when defining a preset.\n */\nexport function definePreset(config: Preset): Preset {\n  return config\n}\n\n/**\n * Field-aware composition of presets. Right-most preset wins for scalar fields;\n * objects shallow-merge; arrays and hook handler lists concatenate. Designed so\n * stacking presets does the obvious thing without the spread-collision footgun:\n *\n * - `name`, `system`, `eager`, `skills`              → last-defined wins\n * - `tools`, `toolAliases`, `behavior`               → shallow-merge (later keys override)\n * - `behavior.dedupTools`, `behavior.toolBudgets`    → **deep-merge** (per-tool-name; later wins on collision)\n * - `mcpServers`                                     → concat with last-wins on `name` collision\n * - `hooks`                                          → per-event concat; every handler fires\n *\n * `hooks` always emerges as `event → handler[]` so downstream registration\n * (in `createAgent`) sees a uniform shape. Order of handlers within an event\n * follows preset order: earlier presets register first.\n *\n * `mcpServers` is deduped by `name` because shipping two servers with the same\n * name would trip the connector at runtime — a later preset overriding an\n * earlier preset's `github` server is the practical intent.\n *\n * `behavior.dedupTools` and `behavior.toolBudgets` get the same per-key deep-merge\n * because they are tool-name-keyed records — a preset that ships a dedup hasher\n * for one tool should not erase a hasher another preset ships for a different\n * tool. Last-wins still applies on a per-tool collision so a downstream preset\n * can override an upstream preset's policy for one specific tool. Other\n * `behavior` fields keep last-wins semantics.\n */\nexport function composePresets(...presets: Preset[]): Preset {\n  const out: Preset = {}\n  const hooksByEvent: { [K in keyof AgentHooks]?: AgentHooks[K][] } = {}\n  // Keep mcpServers in source-order on first sight, but allow later\n  // declarations to override earlier ones with the same `name`. A `Map`\n  // keyed by name gives O(1) override + stable iteration.\n  const mcpByName = new Map<string, NonNullable<Preset['mcpServers']>[number]>()\n\n  for (const p of presets) {\n    if (p.name !== undefined)\n      out.name = p.name\n    if (p.system !== undefined)\n      out.system = p.system\n    if (p.eager !== undefined)\n      out.eager = p.eager\n    if (p.skills !== undefined)\n      out.skills = p.skills\n    if (p.tools)\n      out.tools = { ...out.tools, ...p.tools }\n    if (p.toolAliases)\n      out.toolAliases = { ...out.toolAliases, ...p.toolAliases }\n    if (p.behavior) {\n      // Top-level shallow-merge first; then deep-merge the two tool-name-keyed\n      // sub-records so per-tool entries from earlier presets aren't clobbered.\n      const merged: NonNullable<Preset['behavior']> = { ...out.behavior, ...p.behavior }\n      if (out.behavior?.dedupTools || p.behavior.dedupTools) {\n        merged.dedupTools = { ...out.behavior?.dedupTools, ...p.behavior.dedupTools }\n      }\n      if (out.behavior?.toolBudgets || p.behavior.toolBudgets) {\n        merged.toolBudgets = { ...out.behavior?.toolBudgets, ...p.behavior.toolBudgets }\n      }\n      out.behavior = merged\n    }\n    if (p.mcpServers) {\n      for (const server of p.mcpServers)\n        mcpByName.set(server.name, server)\n    }\n    if (p.hooks) {\n      for (const [event, handler] of Object.entries(p.hooks)) {\n        if (handler === undefined)\n          continue\n        const list = Array.isArray(handler) ? handler : [handler]\n        const key = event as keyof AgentHooks\n        // Safe cast: we read the loose `AgentHookMap` shape (handler-or-array)\n        // and re-emit only as arrays. Each `list` element matches the event's\n        // handler signature by construction (the input was typed `AgentHookMap`).\n        const bucket = (hooksByEvent[key] ??= []) as unknown[]\n        bucket.push(...(list as unknown[]))\n      }\n    }\n  }\n\n  if (mcpByName.size > 0)\n    out.mcpServers = [...mcpByName.values()]\n\n  if (Object.keys(hooksByEvent).length > 0)\n    out.hooks = hooksByEvent\n\n  return out\n}\n\nexport { default as basic, basicTools } from './basic'\n"],"mappings":";;;;;;;;;;;AAaA,MAAa,aAAa;CAAE;CAAO;CAAU;CAAW;CAAW;CAAM;CAAW;AAEpF,IAAA,gBAAe,aAAa;CAC1B,MAAM;CACN,QAAQ;CAOR,OAAO;EAAE,GAAG;EAAY,OAAO,gBAAgB,EAAE,SAAS,MAAM,CAAC;EAAE;CACpE,CAAC;;;;;;ACOF,SAAgB,aAAa,QAAwB;CACnD,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BT,SAAgB,eAAe,GAAG,SAA2B;CAC3D,MAAM,MAAc,EAAE;CACtB,MAAM,eAA8D,EAAE;CAItE,MAAM,4BAAY,IAAI,KAAwD;CAE9E,KAAK,MAAM,KAAK,SAAS;EACvB,IAAI,EAAE,SAAS,KAAA,GACb,IAAI,OAAO,EAAE;EACf,IAAI,EAAE,WAAW,KAAA,GACf,IAAI,SAAS,EAAE;EACjB,IAAI,EAAE,UAAU,KAAA,GACd,IAAI,QAAQ,EAAE;EAChB,IAAI,EAAE,WAAW,KAAA,GACf,IAAI,SAAS,EAAE;EACjB,IAAI,EAAE,OACJ,IAAI,QAAQ;GAAE,GAAG,IAAI;GAAO,GAAG,EAAE;GAAO;EAC1C,IAAI,EAAE,aACJ,IAAI,cAAc;GAAE,GAAG,IAAI;GAAa,GAAG,EAAE;GAAa;EAC5D,IAAI,EAAE,UAAU;GAGd,MAAM,SAA0C;IAAE,GAAG,IAAI;IAAU,GAAG,EAAE;IAAU;GAClF,IAAI,IAAI,UAAU,cAAc,EAAE,SAAS,YACzC,OAAO,aAAa;IAAE,GAAG,IAAI,UAAU;IAAY,GAAG,EAAE,SAAS;IAAY;GAE/E,IAAI,IAAI,UAAU,eAAe,EAAE,SAAS,aAC1C,OAAO,cAAc;IAAE,GAAG,IAAI,UAAU;IAAa,GAAG,EAAE,SAAS;IAAa;GAElF,IAAI,WAAW;;EAEjB,IAAI,EAAE,YACJ,KAAK,MAAM,UAAU,EAAE,YACrB,UAAU,IAAI,OAAO,MAAM,OAAO;EAEtC,IAAI,EAAE,OACJ,KAAK,MAAM,CAAC,OAAO,YAAY,OAAO,QAAQ,EAAE,MAAM,EAAE;GACtD,IAAI,YAAY,KAAA,GACd;GACF,MAAM,OAAO,MAAM,QAAQ,QAAQ,GAAG,UAAU,CAAC,QAAQ;GACzD,MAAM,MAAM;GAKZ,CADgB,aAAa,SAAS,EAAE,EACjC,KAAK,GAAI,KAAmB;;;CAKzC,IAAI,UAAU,OAAO,GACnB,IAAI,aAAa,CAAC,GAAG,UAAU,QAAQ,CAAC;CAE1C,IAAI,OAAO,KAAK,aAAa,CAAC,SAAS,GACrC,IAAI,QAAQ;CAEd,OAAO"}

package/dist/presets.d.ts

@@ -1,3 +1,3 @@
 import { n as AgentHookMap } from "./agent-CYpPKn5Z.js";
-import { a as basicTools, i as _default, n as composePresets, r as definePreset, t as Preset } from "./index-D-cTScN3.js";
+import { a as basicTools, i as _default, n as composePresets, r as definePreset, t as Preset } from "./index-BRTRan3z.js";
 export { AgentHookMap, Preset, _default as basic, basicTools, composePresets, definePreset };

package/dist/presets.js

@@ -1,2 +1,2 @@
-import { i as basic_default, n as definePreset, r as basicTools, t as composePresets } from "./presets-tvD28pCu.js";
+import { i as basic_default, n as definePreset, r as basicTools, t as composePresets } from "./presets-AgF0RFx1.js";
 export { basic_default as basic, basicTools, composePresets, definePreset };

package/dist/{tools-CMVruxF0.js → tools-BRbbfdJh.js}

@@ -480,6 +480,7 @@ function validateToolArgs(input, schema) {
 	};
 	let coerced;
 	const coercions = [];
+	let droppedItems;
 	for (const [key, value] of Object.entries(input)) {
 		const propSchema = properties[key];
 		if (!propSchema?.type) continue;
@@ -494,11 +495,138 @@ function validateToolArgs(input, schema) {
 			coerced[key] = outcome.value;
 			coercions.push(key);
 		}
+		const arrayValue = outcome.changed ? outcome.value : value;
+		if (propSchema.type === "array" && propSchema.items && Array.isArray(arrayValue)) {
+			const itemOutcome = validateArrayItems(arrayValue, propSchema);
+			if (itemOutcome.error) return {
+				valid: false,
+				error: `Field "${key}": ${itemOutcome.error}`
+			};
+			if (itemOutcome.changed || itemOutcome.dropped.length > 0 || itemOutcome.truncated) {
+				if (!coerced) coerced = { ...input };
+				coerced[key] = itemOutcome.items;
+				if (!coercions.includes(key)) coercions.push(key);
+			}
+			if (itemOutcome.dropped.length > 0) {
+				if (!droppedItems) droppedItems = {};
+				droppedItems[key] = itemOutcome.dropped;
+			}
+		}
 	}
 	return {
 		valid: true,
 		coercedInput: coerced ?? input,
-		coercions
+		coercions,
+		...droppedItems ? { droppedItems } : {}
+	};
+}
+function validateArrayItems(items, schema) {
+	if (schema.minItems !== void 0 && items.length < schema.minItems) return {
+		items,
+		changed: false,
+		truncated: false,
+		dropped: [],
+		error: `expected at least ${schema.minItems} item${schema.minItems === 1 ? "" : "s"}, got ${items.length}`
+	};
+	const itemSchema = schema.items;
+	if (!itemSchema) return {
+		items,
+		changed: false,
+		truncated: false,
+		dropped: []
+	};
+	const out = [];
+	const outOriginalIdx = [];
+	const dropped = [];
+	let changed = false;
+	for (let i = 0; i < items.length; i++) {
+		const item = items[i];
+		const v = validateOneItem(item, itemSchema);
+		if (v.dropped) {
+			dropped.push(i);
+			changed = true;
+			continue;
+		}
+		if (v.changed) changed = true;
+		out.push(v.value);
+		outOriginalIdx.push(i);
+	}
+	let truncated = false;
+	if (schema.maxItems !== void 0 && out.length > schema.maxItems) {
+		for (let i = schema.maxItems; i < out.length; i++) dropped.push(outOriginalIdx[i]);
+		out.length = schema.maxItems;
+		truncated = true;
+		changed = true;
+	}
+	dropped.sort((a, b) => a - b);
+	return {
+		items: out,
+		changed,
+		truncated,
+		dropped
+	};
+}
+function validateOneItem(item, schema) {
+	if (schema.type === "object") {
+		if (!item || typeof item !== "object" || Array.isArray(item)) return {
+			value: item,
+			changed: false,
+			dropped: true
+		};
+		const obj = item;
+		const required = schema.required ?? [];
+		for (const field of required) {
+			const v = obj[field];
+			if (v === void 0 || v === null) return {
+				value: item,
+				changed: false,
+				dropped: true
+			};
+		}
+		const properties = schema.properties ?? {};
+		let coercedItem;
+		for (const [key, value] of Object.entries(obj)) {
+			const subSchema = properties[key];
+			if (!subSchema?.type) continue;
+			if (value === void 0 || value === null) continue;
+			const outcome = coerceValue(value, subSchema);
+			if (outcome.error) return {
+				value: item,
+				changed: false,
+				dropped: true
+			};
+			if (outcome.changed) {
+				if (!coercedItem) coercedItem = { ...obj };
+				coercedItem[key] = outcome.value;
+			}
+		}
+		return coercedItem ? {
+			value: coercedItem,
+			changed: true,
+			dropped: false
+		} : {
+			value: item,
+			changed: false,
+			dropped: false
+		};
+	}
+	if (schema.type) {
+		const outcome = coerceValue(item, schema);
+		if (outcome.error) return {
+			value: item,
+			changed: false,
+			dropped: true
+		};
+		return {
+			value: outcome.value,
+			changed: outcome.changed,
+			dropped: false
+		};
+	}
+	return {
+		value: item,
+		changed: false,
+		dropped: false
 	};
 }
 function coerceValue(value, schema) {
@@ -4573,4 +4701,4 @@ const writeFile$1 = {
 //#endregion
 export { maybePersistToolResult as C, cleanupPersistedSession as S, getReadState as T, createSkillsReadTool as _, multiEdit as a, PERSISTENCE_PREVIEW_BYTES as b, grep as c, resolveOldString as d, styleReplacementForVia as f, createSkillsRunScriptTool as g, createSkillsUseTool as h, readFile$1 as i, glob as l, createToolSearchTool as m, createSpawnTool as n, listFiles as o, createAgent as p, shell as r, createInteractionTool as s, writeFile$1 as t, edit as u, validateToolArgs as v, resolvePersistDir as w, buildPersistedStub as x, PERSISTED_STUB_PREFIX as y };
 
-//# sourceMappingURL=tools-CMVruxF0.js.map
+//# sourceMappingURL=tools-BRbbfdJh.js.map