@yolk-sdk/agent 0.1.0-canary.55 → 0.1.0-canary.57

package/README.md

@@ -13,6 +13,7 @@ pnpm add @yolk-sdk/agent@canary effect
 Add `react` if you use `@yolk-sdk/agent/react`.
 
 Canary APIs are unstable. Keep all `@yolk-sdk/*` packages on the same version.
+Published package metadata requires Node.js 22+.
 
 ## Subpaths
 
@@ -107,21 +108,40 @@ const program = run({
 // Provide LLM provider, loop config, context transformer, and tool executor layers in the host app.
 ```
 
+## OAuth credentials
+
+`@yolk-sdk/agent/oauth` defines provider-neutral access-token, broker, freshness, and credential-source
+contracts. Provider subpaths add vendor request/response conversion without owning persistence.
+
+```ts
+import { credentialSourceFromBroker, type TokenBrokerClient } from '@yolk-sdk/agent/oauth'
+
+const makeTokenProgram = (hostBroker: TokenBrokerClient) =>
+  credentialSourceFromBroker(hostBroker, {
+    provider: 'openai-codex',
+    subjectId: 'host-user-id'
+  }).getAccessToken({ minTtlSeconds: 300 })
+```
+
+`hostBroker` is a host implementation of `TokenBrokerClient`. The host stores, refreshes, revokes,
+and authorizes credentials; the package receives short-lived access tokens and never persists
+secrets.
+
 ## Provider configuration
 
-Provider output limits are required and host-owned. Yolk does not infer model limits or apply hidden
-fallbacks.
+Provider output limits are host-owned when the endpoint supports them. Yolk does not infer model
+limits or apply hidden fallbacks.
 
-| Provider factory                   | Required output-limit field |
-| ---------------------------------- | --------------------------- |
-| `makeOpenAiProviderLayer`          | `maxCompletionTokens`       |
-| `makeOpenAiCodexProviderLayer`     | `maxOutputTokens`           |
-| `makeAnthropicClaudeProviderLayer` | `maxTokens`                 |
+| Provider factory                   | Output-limit field    |
+| ---------------------------------- | --------------------- |
+| `makeOpenAiProviderLayer`          | `maxCompletionTokens` |
+| `makeOpenAiCodexProviderLayer`     | none                  |
+| `makeAnthropicClaudeProviderLayer` | `maxTokens`           |
 
-The public `toOpenAiRequestBody`, `toOpenAiCodexRequestBody`, and
-`toAnthropicClaudeRequestBody` helpers require the same limit configuration. ChatGPT subscription
-Codex rejects vendor `max_output_tokens`, so the Codex adapter retains the required host config but
-omits that field from requests. `OpenAiProviderLayer` reads both `OPENAI_API_KEY` and integer
+The public `toOpenAiRequestBody` and `toAnthropicClaudeRequestBody` helpers require the matching
+limit configuration. ChatGPT subscription Codex rejects vendor `max_output_tokens`, so
+`makeOpenAiCodexProviderLayer` and `toOpenAiCodexRequestBody` ignore the optional deprecated
+`maxOutputTokens` compatibility field. `OpenAiProviderLayer` reads both `OPENAI_API_KEY` and integer
 `OPENAI_MAX_COMPLETION_TOKENS` through Effect Config.
 
 Set optional `reasoningEffort` on `run` or `runRuntime`; provider adapters lower it to vendor
@@ -129,6 +149,15 @@ configuration. Anthropic Claude forwards `low`, `medium`, `high`, and `xhigh` th
 `output_config.effort`. It omits `minimal`, which Anthropic does not support. Hosts remain
 responsible for choosing an effort accepted by the selected provider and model.
 
+### Anthropic tool schemas
+
+Claude subscription OAuth rejects some valid JSON Schema constructs that Effect Schema can emit
+for unions, refinements, and tuples. The Claude adapter therefore projects tool parameters to a
+provider-compatible object schema without `anyOf`, `oneOf`, `allOf`, or tuple-only `prefixItems`.
+When a constraint cannot be represented faithfully, the projection widens the model-facing schema
+rather than excluding a valid call. Tool execution remains safe because `makeTool` validates the
+returned arguments against the original Effect Schema before invoking the executor.
+
 ## Provider failures and retries
 
 Provider adapters classify safe failure metadata at the boundary. The loop owns bounded retry
@@ -194,6 +223,14 @@ transformers. Exact provider-request accounting must also include system prompts
 vendor framing, and a safety margin. Reuse one estimator for warnings, planning, and before/after
 checks; tokenizer dependencies remain host-owned.
 
+## Skillsets
+
+`@yolk-sdk/agent/skillset` parses skill Markdown and slash-command Markdown into portable
+`SkillInfo`, `CommandInfo`, and `SkillsetManifest` data. Use `parseSkillMarkdown` /
+`parseCommandMarkdown` at file or database boundaries, `renderCommand` for command invocation, and
+`mergeSkillsets` to combine host sources. Earlier sources win name conflicts; duplicate names
+inside one source fail validation. Hosts own file discovery, storage, enablement, and source order.
+
 ## Protocol content
 
 `Content` is either plain text or ordered parts:
@@ -403,7 +440,8 @@ Recommended setup:
 - use `makeSubagentRunId(call.id)` for protocol-aligned run ids
 - optionally configure model and reasoning-effort choices so the parent can select child runtime settings
 - treat omitted `model` and `reasoning_effort` parameters as inheritance of host runtime settings
-- return `makeSubagentToolResult(...)` so UI can show subagent id, type, status, model, reasoning effort, and timing
+- return `makeSubagentToolResult(...)` so UI can show subagent id, type, status, model, reasoning effort, timing, optional usage/turns, and typed failure metadata
+- use `subagentUsageFromToolResult(...)` when a host must add child usage to cumulative workflow usage
 
 Keep host-owned subagent execution wiring outside this package; pass only the package subagent contract across the boundary.
 
@@ -422,7 +460,9 @@ aborts, and implementation bugs outside typed tool execution.
 ## Host responsibilities
 
 - Choose models/providers and provide an LLM provider layer, using SDK provider subpaths or host adapters.
+- Store, refresh, revoke, and authorize OAuth credentials; expose only runtime access tokens.
 - Configure model-specific provider output-token limits.
+- Build UI components and styling, own auth, and wire headless React hooks to host transports.
 - Persist sessions, transcripts, and append logs.
 - Persist/return one `ToolResultMessage` for every host tool call, including `isError` failures.
 - Persist terminal provider failures and clear active run ids where applicable.

package/dist/compaction/budget.d.mts

@@ -8,7 +8,8 @@ type ContextBudget = {
 };
 type ContextBudgetInput = {
   readonly contextWindowTokens: number;
-  readonly reservedOutputTokens: number;
+  readonly reservedOutputTokens: number; /** Optional provider- or endpoint-specific ceiling below the model's total context window. */
+  readonly maxInputTokens?: number;
   readonly warningRatio: number;
   readonly compactionRatio: number;
 };

package/dist/compaction/budget.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"budget.d.mts","names":[],"sources":["../../src/compaction/budget.ts"],"mappings":";KAAY,aAAA;EAAA,SACD,mBAAA;EAAA,SACA,oBAAA;EAAA,SACA,iBAAA;EAAA,SACA,kBAAA;EAAA,SACA,qBAAA;AAAA;AAAA,KAGC,kBAAA;EAAA,SACD,mBAAA;EAAA,SACA,oBAAA;EAAA,SACA,YAAA;EAAA,SACA,eAAA;AAAA;AAAA,cAGE,iBAAA,GAAqB,KAAA,EAAO,kBAAA,KAAqB,aAU7D;AAAA,cAEY,uBAAA,GAA2B,MAAA,UAAgB,MAAA,EAAQ,aAAa;AAAA,KAGjE,mBAAA;AAAA,cAEC,mBAAA,GAAuB,MAAA,UAAgB,MAAA,EAAQ,aAAA,KAAgB,mBAU3E"}
+{"version":3,"file":"budget.d.mts","names":[],"sources":["../../src/compaction/budget.ts"],"mappings":";KAAY,aAAA;EAAA,SACD,mBAAA;EAAA,SACA,oBAAA;EAAA,SACA,iBAAA;EAAA,SACA,kBAAA;EAAA,SACA,qBAAA;AAAA;AAAA,KAGC,kBAAA;EAAA,SACD,mBAAA;EAAA,SACA,oBAAA,UALqB;EAAA,SAOrB,cAAA;EAAA,SACA,YAAA;EAAA,SACA,eAAA;AAAA;AAAA,cAGE,iBAAA,GAAqB,KAAA,EAAO,kBAAA,KAAqB,aAkB7D;AAAA,cAEY,uBAAA,GAA2B,MAAA,UAAgB,MAAA,EAAQ,aAAa;AAAA,KAGjE,mBAAA;AAAA,cAEC,mBAAA,GAAuB,MAAA,UAAgB,MAAA,EAAQ,aAAA,KAAgB,mBAU3E"}

package/dist/compaction/budget.mjs

@@ -1,6 +1,8 @@
 //#region src/compaction/budget.ts
 const makeContextBudget = (input) => {
-	const usableInputTokens = Math.max(0, input.contextWindowTokens - input.reservedOutputTokens);
+	const contextUsableInputTokens = Math.max(0, input.contextWindowTokens - input.reservedOutputTokens);
+	const maxInputTokens = input.maxInputTokens === void 0 || !Number.isFinite(input.maxInputTokens) ? contextUsableInputTokens : Math.max(0, input.maxInputTokens);
+	const usableInputTokens = Math.min(contextUsableInputTokens, maxInputTokens);
 	return {
 		contextWindowTokens: input.contextWindowTokens,
 		reservedOutputTokens: input.reservedOutputTokens,

package/dist/compaction/budget.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"budget.mjs","names":[],"sources":["../../src/compaction/budget.ts"],"sourcesContent":["export type ContextBudget = {\n  readonly contextWindowTokens: number\n  readonly reservedOutputTokens: number\n  readonly usableInputTokens: number\n  readonly warningInputTokens: number\n  readonly compactionInputTokens: number\n}\n\nexport type ContextBudgetInput = {\n  readonly contextWindowTokens: number\n  readonly reservedOutputTokens: number\n  readonly warningRatio: number\n  readonly compactionRatio: number\n}\n\nexport const makeContextBudget = (input: ContextBudgetInput): ContextBudget => {\n  const usableInputTokens = Math.max(0, input.contextWindowTokens - input.reservedOutputTokens)\n\n  return {\n    contextWindowTokens: input.contextWindowTokens,\n    reservedOutputTokens: input.reservedOutputTokens,\n    usableInputTokens,\n    warningInputTokens: Math.floor(usableInputTokens * input.warningRatio),\n    compactionInputTokens: Math.floor(usableInputTokens * input.compactionRatio)\n  }\n}\n\nexport const contextBudgetUsageRatio = (tokens: number, budget: ContextBudget) =>\n  budget.usableInputTokens === 0 ? 0 : tokens / budget.usableInputTokens\n\nexport type ContextBudgetStatus = 'idle' | 'normal' | 'warning' | 'compact'\n\nexport const contextBudgetStatus = (tokens: number, budget: ContextBudget): ContextBudgetStatus => {\n  if (tokens <= 0) {\n    return 'idle'\n  }\n\n  if (tokens >= budget.compactionInputTokens) {\n    return 'compact'\n  }\n\n  return tokens >= budget.warningInputTokens ? 'warning' : 'normal'\n}\n"],"mappings":";AAeA,MAAa,qBAAqB,UAA6C;CAC7E,MAAM,oBAAoB,KAAK,IAAI,GAAG,MAAM,sBAAsB,MAAM,oBAAoB;CAE5F,OAAO;EACL,qBAAqB,MAAM;EAC3B,sBAAsB,MAAM;EAC5B;EACA,oBAAoB,KAAK,MAAM,oBAAoB,MAAM,YAAY;EACrE,uBAAuB,KAAK,MAAM,oBAAoB,MAAM,eAAe;CAC7E;AACF;AAEA,MAAa,2BAA2B,QAAgB,WACtD,OAAO,sBAAsB,IAAI,IAAI,SAAS,OAAO;AAIvD,MAAa,uBAAuB,QAAgB,WAA+C;CACjG,IAAI,UAAU,GACZ,OAAO;CAGT,IAAI,UAAU,OAAO,uBACnB,OAAO;CAGT,OAAO,UAAU,OAAO,qBAAqB,YAAY;AAC3D"}
+{"version":3,"file":"budget.mjs","names":[],"sources":["../../src/compaction/budget.ts"],"sourcesContent":["export type ContextBudget = {\n  readonly contextWindowTokens: number\n  readonly reservedOutputTokens: number\n  readonly usableInputTokens: number\n  readonly warningInputTokens: number\n  readonly compactionInputTokens: number\n}\n\nexport type ContextBudgetInput = {\n  readonly contextWindowTokens: number\n  readonly reservedOutputTokens: number\n  /** Optional provider- or endpoint-specific ceiling below the model's total context window. */\n  readonly maxInputTokens?: number\n  readonly warningRatio: number\n  readonly compactionRatio: number\n}\n\nexport const makeContextBudget = (input: ContextBudgetInput): ContextBudget => {\n  const contextUsableInputTokens = Math.max(\n    0,\n    input.contextWindowTokens - input.reservedOutputTokens\n  )\n  const maxInputTokens =\n    input.maxInputTokens === undefined || !Number.isFinite(input.maxInputTokens)\n      ? contextUsableInputTokens\n      : Math.max(0, input.maxInputTokens)\n  const usableInputTokens = Math.min(contextUsableInputTokens, maxInputTokens)\n\n  return {\n    contextWindowTokens: input.contextWindowTokens,\n    reservedOutputTokens: input.reservedOutputTokens,\n    usableInputTokens,\n    warningInputTokens: Math.floor(usableInputTokens * input.warningRatio),\n    compactionInputTokens: Math.floor(usableInputTokens * input.compactionRatio)\n  }\n}\n\nexport const contextBudgetUsageRatio = (tokens: number, budget: ContextBudget) =>\n  budget.usableInputTokens === 0 ? 0 : tokens / budget.usableInputTokens\n\nexport type ContextBudgetStatus = 'idle' | 'normal' | 'warning' | 'compact'\n\nexport const contextBudgetStatus = (tokens: number, budget: ContextBudget): ContextBudgetStatus => {\n  if (tokens <= 0) {\n    return 'idle'\n  }\n\n  if (tokens >= budget.compactionInputTokens) {\n    return 'compact'\n  }\n\n  return tokens >= budget.warningInputTokens ? 'warning' : 'normal'\n}\n"],"mappings":";AAiBA,MAAa,qBAAqB,UAA6C;CAC7E,MAAM,2BAA2B,KAAK,IACpC,GACA,MAAM,sBAAsB,MAAM,oBACpC;CACA,MAAM,iBACJ,MAAM,mBAAmB,KAAA,KAAa,CAAC,OAAO,SAAS,MAAM,cAAc,IACvE,2BACA,KAAK,IAAI,GAAG,MAAM,cAAc;CACtC,MAAM,oBAAoB,KAAK,IAAI,0BAA0B,cAAc;CAE3E,OAAO;EACL,qBAAqB,MAAM;EAC3B,sBAAsB,MAAM;EAC5B;EACA,oBAAoB,KAAK,MAAM,oBAAoB,MAAM,YAAY;EACrE,uBAAuB,KAAK,MAAM,oBAAoB,MAAM,eAAe;CAC7E;AACF;AAEA,MAAa,2BAA2B,QAAgB,WACtD,OAAO,sBAAsB,IAAI,IAAI,SAAS,OAAO;AAIvD,MAAa,uBAAuB,QAAgB,WAA+C;CACjG,IAAI,UAAU,GACZ,OAAO;CAGT,IAAI,UAAU,OAAO,uBACnB,OAAO;CAGT,OAAO,UAAU,OAAO,qBAAqB,YAAY;AAC3D"}

package/dist/providers/anthropic/claude-provider.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-provider.d.mts","names":[],"sources":["../../../src/providers/anthropic/claude-provider.ts"],"mappings":";;;;;;KAoDY,6BAAA;EAAA,SACD,KAAA,EAAO,gBAAA;EAAA,SACP,WAAA;EAAA,SACA,SAAA;EAAA,SACA,YAAA,GAAe,QAAA,CAAS,MAAA;AAAA;AAAA,KAG9B,kBAAA;EAAA,SACM,IAAA;EAAA,SACA,IAAI;AAAA;AAAA,KAGV,oBAAA,GAAuB,kBAAkB;AAAA,KAEzC,mBAAA;EAAA,SACM,IAAA;EAAA,SACA,MAAA;IAAA,SAEM,IAAA;IAAA,SACA,UAAA;IAAA,SACA,IAAA;EAAA;IAAA,SAGA,IAAA;IAAA,SACA,GAAA;EAAA;AAAA;AAAA,KAIZ,sBAAA;EAAA,SACM,IAAA;EAAA,SACA,MAAA;IAAA,SAEM,IAAA;IAAA,SACA,UAAA;IAAA,SACA,IAAA;EAAA;IAAA,SAGA,IAAA;IAAA,SACA,GAAA;EAAA;EAAA,SAEN,KAAA;AAAA;AAAA,KAGN,qBAAA;EAAA,SACM,IAAA;EAAA,SACA,EAAA;EAAA,SACA,IAAA;EAAA,SACA,KAAA;AAAA;AAAA,KAGN,+BAAA,GACD,kBAAA,GACA,mBAAA,GACA,sBAAA;AAAA,KAEC,wBAAA;EAAA,SACM,IAAA;EAAA,SACA,WAAA;EAAA,SACA,OAAA,WAAkB,aAAa,CAAC,+BAAA;EAAA,SAChC,QAAA;AAAA;AAAA,KAGN,kBAAA,GACD,kBAAA,GACA,mBAAA,GACA,sBAAA,GACA,wBAAA;AAAA,KACC,uBAAA,GAA0B,kBAAA,GAAqB,qBAAqB;AAAA,KAEpE,gBAAA;EAAA,SACU,IAAA;EAAA,SAAuB,OAAA,WAAkB,aAAA,CAAc,kBAAA;AAAA;EAAA,SACvD,IAAA;EAAA,SAA4B,OAAA,EAAS,aAAA,CAAc,uBAAA;AAAA;AAAA,KAS7D,aAAA;EAAA,SACM,IAAA;EAAA,SACA,WAAA;EAAA,SACA,YAAA;AAAA;AAAA,KAGN,oBAAA;EAAA,SACM,KAAA;EAAA,SACA,MAAA,EAAQ,aAAA,CAAc,oBAAA;EAAA,SACtB,QAAA,EAAU,aAAA,CAAc,gBAAA;EAAA,SACxB,UAAA;EAAA,SACA,aAAA;IAAA,SACE,MAAA;EAAA;EAAA,SAEF,MAAA;EAAA,SACA,KAAA,GAAQ,aAAA,CAAc,aAAA;AAAA;AAAA,cA4zBpB,4BAAA,GACX,OAAA,EAAS,UAAA,EACT,MAAA;EAAA,SAAmB,SAAA;EAAA,SAA4B,MAAA;AAAA,MAC9C,MAAA,CAAO,MAAA,CAAO,oBAAA,EAAsB,QAAA;AAAA,cAmmB1B,6BAAA,GACX,QAAA,EAAU,kBAAA,CAAmB,kBAAA,KAC5B,MAAA,CAAO,MAAA,CAAO,QAAA,EAAU,QAAA;AAAA,cAoGd,gCAAA,GAAoC,MAAA,EAAQ,6BAAA,KAA6B,KAAA,CAAA,KAAA,CAAA,WAAA,SAAA,UAAA,CAAA,UAAA"}
+{"version":3,"file":"claude-provider.d.mts","names":[],"sources":["../../../src/providers/anthropic/claude-provider.ts"],"mappings":";;;;;;KAoDY,6BAAA;EAAA,SACD,KAAA,EAAO,gBAAA;EAAA,SACP,WAAA;EAAA,SACA,SAAA;EAAA,SACA,YAAA,GAAe,QAAA,CAAS,MAAA;AAAA;AAAA,KAG9B,kBAAA;EAAA,SACM,IAAA;EAAA,SACA,IAAI;AAAA;AAAA,KAGV,oBAAA,GAAuB,kBAAkB;AAAA,KAEzC,mBAAA;EAAA,SACM,IAAA;EAAA,SACA,MAAA;IAAA,SAEM,IAAA;IAAA,SACA,UAAA;IAAA,SACA,IAAA;EAAA;IAAA,SAGA,IAAA;IAAA,SACA,GAAA;EAAA;AAAA;AAAA,KAIZ,sBAAA;EAAA,SACM,IAAA;EAAA,SACA,MAAA;IAAA,SAEM,IAAA;IAAA,SACA,UAAA;IAAA,SACA,IAAA;EAAA;IAAA,SAGA,IAAA;IAAA,SACA,GAAA;EAAA;EAAA,SAEN,KAAA;AAAA;AAAA,KAGN,qBAAA;EAAA,SACM,IAAA;EAAA,SACA,EAAA;EAAA,SACA,IAAA;EAAA,SACA,KAAA;AAAA;AAAA,KAGN,+BAAA,GACD,kBAAA,GACA,mBAAA,GACA,sBAAA;AAAA,KAEC,wBAAA;EAAA,SACM,IAAA;EAAA,SACA,WAAA;EAAA,SACA,OAAA,WAAkB,aAAa,CAAC,+BAAA;EAAA,SAChC,QAAA;AAAA;AAAA,KAGN,kBAAA,GACD,kBAAA,GACA,mBAAA,GACA,sBAAA,GACA,wBAAA;AAAA,KACC,uBAAA,GAA0B,kBAAA,GAAqB,qBAAqB;AAAA,KAEpE,gBAAA;EAAA,SACU,IAAA;EAAA,SAAuB,OAAA,WAAkB,aAAA,CAAc,kBAAA;AAAA;EAAA,SACvD,IAAA;EAAA,SAA4B,OAAA,EAAS,aAAA,CAAc,uBAAA;AAAA;AAAA,KAS7D,aAAA;EAAA,SACM,IAAA;EAAA,SACA,WAAA;EAAA,SACA,YAAA;AAAA;AAAA,KAGN,oBAAA;EAAA,SACM,KAAA;EAAA,SACA,MAAA,EAAQ,aAAA,CAAc,oBAAA;EAAA,SACtB,QAAA,EAAU,aAAA,CAAc,gBAAA;EAAA,SACxB,UAAA;EAAA,SACA,aAAA;IAAA,SACE,MAAA;EAAA;EAAA,SAEF,MAAA;EAAA,SACA,KAAA,GAAQ,aAAA,CAAc,aAAA;AAAA;AAAA,cAg7BpB,4BAAA,GACX,OAAA,EAAS,UAAA,EACT,MAAA;EAAA,SAAmB,SAAA;EAAA,SAA4B,MAAA;AAAA,MAC9C,MAAA,CAAO,MAAA,CAAO,oBAAA,EAAsB,QAAA;AAAA,cAmmB1B,6BAAA,GACX,QAAA,EAAU,kBAAA,CAAmB,kBAAA,KAC5B,MAAA,CAAO,MAAA,CAAO,QAAA,EAAU,QAAA;AAAA,cAoGd,gCAAA,GAAoC,MAAA,EAAQ,6BAAA,KAA6B,KAAA,CAAA,KAAA,CAAA,WAAA,SAAA,UAAA,CAAA,UAAA"}

package/dist/providers/anthropic/claude-provider.mjs

@@ -288,11 +288,12 @@ const topLevelJsonSchemaCombinator = (schema) => {
 	}
 };
 const withoutTopLevelJsonSchemaCombinators = (schema) => Object.fromEntries(Object.entries(schema).filter(([key]) => !isTopLevelJsonSchemaCombinatorKey(key)));
-const withoutJsonSchemaCombinatorsAndTupleHints = (schema) => Object.fromEntries(Object.entries(schema).filter(([key]) => !isTopLevelJsonSchemaCombinatorKey(key) && key !== "prefixItems"));
-const jsonSchemaProperties = (schema) => {
-	const properties = jsonObjectField(schema, "properties");
-	return isJsonObject(properties) ? properties : {};
+const withoutJsonSchemaCombinatorsAndTupleHints = (schema) => Object.fromEntries(Object.entries(schema).filter(([key]) => !isTopLevelJsonSchemaCombinatorKey(key) && key !== "prefixItems" && key !== "not" && key !== "if" && key !== "then" && key !== "else"));
+const jsonSchemaMap = (schema, key) => {
+	const value = jsonObjectField(schema, key);
+	return isJsonObject(value) ? value : {};
 };
+const jsonSchemaProperties = (schema) => jsonSchemaMap(schema, "properties");
 const jsonSchemaDefinitions = (schema) => {
 	const definitions = jsonObjectField(schema, "$defs");
 	return isJsonObject(definitions) ? definitions : {};
@@ -321,24 +322,21 @@ const mergeEnumPropertySchemas = (left, right) => {
 	const leftEnum = jsonObjectField(left, "enum");
 	const rightEnum = jsonObjectField(right, "enum");
 	if (!Array.isArray(leftEnum) || !Array.isArray(rightEnum)) return;
-	if (jsonObjectField(left, "type") !== jsonObjectField(right, "type")) return;
+	const leftType = jsonObjectField(left, "type");
+	if (leftType !== jsonObjectField(right, "type")) return;
+	const description = [jsonObjectField(left, "description"), jsonObjectField(right, "description")].find((value) => typeof value === "string");
 	return {
-		...left,
-		...right,
-		enum: uniqueUnknownArray([...leftEnum, ...rightEnum])
+		...leftType === void 0 ? {} : { type: leftType },
+		enum: uniqueUnknownArray([...leftEnum, ...rightEnum]),
+		...description === void 0 ? {} : { description }
 	};
 };
-const jsonSchemaAnyOfItems = (schema) => {
-	if (!isJsonObject(schema)) return [schema];
-	const anyOf = jsonObjectField(schema, "anyOf");
-	return Array.isArray(anyOf) ? anyOf : [schema];
-};
 const mergePropertySchemas = (left, right) => {
 	const leftKey = jsonValueKey(left);
 	if (leftKey !== void 0 && leftKey === jsonValueKey(right)) return left;
 	const mergedEnum = mergeEnumPropertySchemas(left, right);
 	if (mergedEnum !== void 0) return mergedEnum;
-	return { anyOf: uniqueUnknownArray([...jsonSchemaAnyOfItems(left), ...jsonSchemaAnyOfItems(right)]) };
+	return {};
 };
 const mergeJsonSchemaObjects = (objects) => {
 	const merged = /* @__PURE__ */ new Map();
@@ -346,48 +344,115 @@ const mergeJsonSchemaObjects = (objects) => {
 	else merged.set(key, value);
 	return Object.fromEntries(merged);
 };
-const normalizeJsonSchemaObjectFields = (schema) => Object.fromEntries(Object.entries(withoutJsonSchemaCombinatorsAndTupleHints(schema)).map(([key, value]) => [key, normalizeAnthropicToolSchema(value)]));
+const mergeUnionJsonSchemaObjects = (objects, owners) => {
+	const keys = new Set(objects.flatMap((object) => Object.keys(object)));
+	return Object.fromEntries(Array.from(keys, (key) => {
+		const [first, ...rest] = objects.flatMap((object, index) => {
+			if (Object.hasOwn(object, key)) return [jsonObjectField(object, key)];
+			const additionalProperties = owners?.[index];
+			if (additionalProperties === void 0) return [];
+			const additionalPropertySchema = jsonObjectField(additionalProperties, "additionalProperties");
+			if (additionalPropertySchema === false) return [];
+			return [isJsonObject(additionalPropertySchema) ? additionalPropertySchema : {}];
+		});
+		return [key, rest.reduce(mergePropertySchemas, first)];
+	}));
+};
+const mergeRightBiasedJsonSchemaObjects = (objects) => Object.assign({}, ...objects);
+const mergeAllOfSchemaObjects = (objects) => {
+	const merged = mergeRightBiasedJsonSchemaObjects(objects);
+	const properties = mergeRightBiasedJsonSchemaObjects(objects.map(jsonSchemaProperties));
+	const required = mergeJsonSchemaRequired("allOf", objects);
+	const definitions = mergeJsonSchemaObjects(objects.map(jsonSchemaDefinitions));
+	return {
+		...merged,
+		...Object.keys(properties).length === 0 ? {} : { properties },
+		...required.length === 0 ? {} : { required },
+		...Object.keys(definitions).length === 0 ? {} : { $defs: definitions }
+	};
+};
+const jsonSchemaMapKeywords = new Set([
+	"properties",
+	"patternProperties",
+	"$defs",
+	"definitions",
+	"dependentSchemas"
+]);
+const jsonSchemaDataKeywords = new Set([
+	"const",
+	"default",
+	"enum",
+	"examples"
+]);
+const normalizeJsonSchemaObjectFields = (schema) => {
+	const normalized = Object.fromEntries(Object.entries(withoutJsonSchemaCombinatorsAndTupleHints(schema)).map(([key, value]) => {
+		if (jsonSchemaDataKeywords.has(key)) return [key, value];
+		if (key === "dependencies" && isJsonObject(value)) return [key, Object.fromEntries(Object.entries(value).map(([name, dependency]) => [name, Array.isArray(dependency) ? dependency : normalizeAnthropicToolSchema(dependency)]))];
+		if (jsonSchemaMapKeywords.has(key) && isJsonObject(value)) return [key, Object.fromEntries(Object.entries(value).map(([name, childSchema]) => [name, normalizeAnthropicToolSchema(childSchema)]))];
+		return [key, normalizeAnthropicToolSchema(value)];
+	}));
+	if (Array.isArray(jsonObjectField(schema, "prefixItems"))) return {
+		...normalized,
+		items: {}
+	};
+	return normalized;
+};
 const jsonSchemaType = (schema) => {
 	const type = jsonObjectField(schema, "type");
 	return typeof type === "string" ? type : void 0;
 };
-const isNullJsonSchema = (schema) => jsonSchemaType(schema) === "null";
 const firstJsonObject = (items) => items[0];
-const mergeCompatibleVariants = (variants) => {
-	const first = firstJsonObject(variants);
-	if (first === void 0) return void 0;
-	let merged = first;
-	for (const variant of variants.slice(1)) merged = mergePropertySchemas(merged, variant);
-	if (!isJsonObject(merged)) return void 0;
-	if (Array.isArray(jsonObjectField(merged, "anyOf"))) return void 0;
-	return merged;
-};
-const samePrimitiveTypeVariant = (variants) => {
+const independentCommonVariantKeys = new Set([
+	"type",
+	"enum",
+	"const",
+	"format",
+	"pattern",
+	"minLength",
+	"maxLength",
+	"minimum",
+	"maximum",
+	"exclusiveMinimum",
+	"exclusiveMaximum",
+	"multipleOf",
+	"minItems",
+	"maxItems",
+	"uniqueItems",
+	"minProperties",
+	"maxProperties",
+	"description"
+]);
+const commonVariantFields = (variants) => {
 	const first = firstJsonObject(variants);
-	const type = first === void 0 ? void 0 : jsonSchemaType(first);
-	if (type === void 0 || type === "object" || type === "array" || type === "null") return;
-	return variants.every((variant) => jsonSchemaType(variant) === type) ? first : void 0;
+	if (first === void 0) return {};
+	if (variants.length === 1) return first;
+	return Object.fromEntries(Object.entries(first).filter(([key, value]) => {
+		if (!independentCommonVariantKeys.has(key)) return false;
+		const valueKey = jsonValueKey(value);
+		return valueKey !== void 0 && variants.every((variant) => valueKey === jsonValueKey(jsonObjectField(variant, key)));
+	}));
 };
 const objectVariant = (variants) => {
-	if (variants.length === 0 || variants.some((variant) => {
-		const type = jsonSchemaType(variant);
-		return type !== void 0 && type !== "object";
-	})) return;
+	if (variants.length === 0 || variants.some((variant) => jsonSchemaType(variant) !== "object")) return;
+	if (variants.some((variant) => Object.keys(jsonSchemaMap(variant, "patternProperties")).length > 0)) return { type: "object" };
+	const additionalProperties = mergeAdditionalProperties(variants);
 	return {
 		type: "object",
-		properties: mergeJsonSchemaObjects(variants.map(jsonSchemaProperties)),
+		properties: mergeUnionJsonSchemaObjects(variants.map(jsonSchemaProperties), variants),
 		required: mergeJsonSchemaRequired("oneOf", variants),
 		$defs: mergeJsonSchemaObjects(variants.map(jsonSchemaDefinitions)),
-		additionalProperties: mergeAdditionalProperties(variants) ?? false
+		...additionalProperties === void 0 ? {} : { additionalProperties }
 	};
 };
 const normalizeJsonSchemaCombinator = (schema, combinator) => {
 	const base = normalizeJsonSchemaObjectFields(schema);
-	const variants = combinator.items.map(normalizeAnthropicToolSchema).filter(isJsonObject).filter((variant) => !isNullJsonSchema(variant));
+	const normalizedItems = combinator.items.map(normalizeAnthropicToolSchema);
+	const variants = normalizedItems.filter(isJsonObject);
 	const first = firstJsonObject(variants);
+	if (combinator.key === "allOf") return mergeAllOfSchemaObjects([base, ...variants]);
+	if (normalizedItems.includes(true)) return base;
 	if (first === void 0) return base;
-	if (combinator.key === "allOf") return mergeJsonSchemaObjects([base, ...variants]);
-	return mergeJsonSchemaObjects([base, mergeCompatibleVariants(variants) ?? samePrimitiveTypeVariant(variants) ?? objectVariant(variants) ?? first]);
+	return mergeAllOfSchemaObjects([objectVariant(variants) ?? commonVariantFields(variants), base]);
 };
 function normalizeAnthropicToolSchema(value) {
 	if (Array.isArray(value)) return value.map(normalizeAnthropicToolSchema);
@@ -410,22 +475,26 @@ const mergeAdditionalProperties = (objects) => {
 const flattenTopLevelCombinatorToolSchema = (schema, combinator) => {
 	const base = withoutTopLevelJsonSchemaCombinators(schema);
 	const objectVariants = combinator.items.filter(isJsonObject);
+	const hasUnconstrainedUnion = combinator.key !== "allOf" && combinator.items.some((item) => item === true || !isJsonObject(item));
 	const additionalProperties = mergeAdditionalProperties(objectVariants);
 	const flattened = {
 		...base,
 		type: "object",
-		properties: mergeJsonSchemaObjects(objectVariants.map(jsonSchemaProperties)),
-		required: mergeJsonSchemaRequired(combinator.key, objectVariants),
+		properties: hasUnconstrainedUnion ? {} : combinator.key === "allOf" ? mergeRightBiasedJsonSchemaObjects(objectVariants.map(jsonSchemaProperties)) : mergeUnionJsonSchemaObjects(objectVariants.map(jsonSchemaProperties), objectVariants),
+		required: hasUnconstrainedUnion ? [] : mergeJsonSchemaRequired(combinator.key, objectVariants),
 		$defs: mergeJsonSchemaObjects([jsonSchemaDefinitions(schema), ...objectVariants.map(jsonSchemaDefinitions)])
 	};
-	if (additionalProperties === void 0) return flattened;
+	if (hasUnconstrainedUnion || additionalProperties === void 0) return flattened;
 	return {
 		...flattened,
 		additionalProperties
 	};
 };
 const anthropicToolInputSchema = (schema) => {
-	if (!isJsonObject(schema)) return {
+	if (!isJsonObject(schema)) return schema === true ? {
+		type: "object",
+		properties: {}
+	} : {
 		type: "object",
 		properties: {},
 		required: [],