@code-yeongyu/senpi 2026.8.4 → 2026.8.5

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 (63) hide show
  1. package/CHANGELOG.md +80 -0
  2. package/dist/core/agent-session.d.ts +0 -1
  3. package/dist/core/agent-session.d.ts.map +1 -1
  4. package/dist/core/agent-session.js +31 -35
  5. package/dist/core/agent-session.js.map +1 -1
  6. package/dist/core/extensions/builtin/claude-sdk-oauth/prompt-directive-dedupe.d.ts +26 -0
  7. package/dist/core/extensions/builtin/claude-sdk-oauth/prompt-directive-dedupe.d.ts.map +1 -0
  8. package/dist/core/extensions/builtin/claude-sdk-oauth/prompt-directive-dedupe.js +98 -0
  9. package/dist/core/extensions/builtin/claude-sdk-oauth/prompt-directive-dedupe.js.map +1 -0
  10. package/dist/core/extensions/builtin/claude-sdk-oauth/session-observability.d.ts +4 -0
  11. package/dist/core/extensions/builtin/claude-sdk-oauth/session-observability.d.ts.map +1 -1
  12. package/dist/core/extensions/builtin/claude-sdk-oauth/session-observability.js +2 -0
  13. package/dist/core/extensions/builtin/claude-sdk-oauth/session-observability.js.map +1 -1
  14. package/dist/core/extensions/builtin/claude-sdk-oauth/session-stream.d.ts.map +1 -1
  15. package/dist/core/extensions/builtin/claude-sdk-oauth/session-stream.js +11 -2
  16. package/dist/core/extensions/builtin/claude-sdk-oauth/session-stream.js.map +1 -1
  17. package/dist/core/extensions/builtin/claude-sdk-oauth/stream.d.ts.map +1 -1
  18. package/dist/core/extensions/builtin/claude-sdk-oauth/stream.js +3 -1
  19. package/dist/core/extensions/builtin/claude-sdk-oauth/stream.js.map +1 -1
  20. package/dist/core/extensions/builtin/mcp/expose/schema-compat.js +2 -0
  21. package/dist/core/extensions/builtin/mcp/expose/schema-compat.js.map +1 -1
  22. package/dist/core/extensions/builtin/mcp/service.d.ts +4 -0
  23. package/dist/core/extensions/builtin/mcp/service.d.ts.map +1 -1
  24. package/dist/core/extensions/builtin/mcp/service.js +11 -0
  25. package/dist/core/extensions/builtin/mcp/service.js.map +1 -1
  26. package/dist/core/extensions/builtin/rules/index.d.ts.map +1 -1
  27. package/dist/core/extensions/builtin/rules/index.js +3 -2
  28. package/dist/core/extensions/builtin/rules/index.js.map +1 -1
  29. package/dist/core/extensions/builtin/terminal/monitor-notify.d.ts +1 -1
  30. package/dist/core/extensions/builtin/terminal/monitor-notify.d.ts.map +1 -1
  31. package/dist/core/extensions/builtin/terminal/monitor-notify.js +14 -6
  32. package/dist/core/extensions/builtin/terminal/monitor-notify.js.map +1 -1
  33. package/dist/core/provider-timeout-retry.d.ts +21 -0
  34. package/dist/core/provider-timeout-retry.d.ts.map +1 -0
  35. package/dist/core/provider-timeout-retry.js +41 -0
  36. package/dist/core/provider-timeout-retry.js.map +1 -0
  37. package/dist/modes/interactive/components/continuity-notice.d.ts.map +1 -1
  38. package/dist/modes/interactive/components/continuity-notice.js +29 -2
  39. package/dist/modes/interactive/components/continuity-notice.js.map +1 -1
  40. package/docs/providers.md +10 -0
  41. package/node_modules/@code-yeongyu/senpi-codemode/CHANGELOG.md +24 -0
  42. package/node_modules/@code-yeongyu/senpi-codemode/package.json +4 -4
  43. package/node_modules/@earendil-works/pi-agent-core/package.json +2 -2
  44. package/node_modules/@earendil-works/pi-ai/dist/api/anthropic-messages.d.ts.map +1 -1
  45. package/node_modules/@earendil-works/pi-ai/dist/api/anthropic-messages.js +4 -1
  46. package/node_modules/@earendil-works/pi-ai/dist/api/anthropic-messages.js.map +1 -1
  47. package/node_modules/@earendil-works/pi-ai/dist/image-models.generated.js +1 -1
  48. package/node_modules/@earendil-works/pi-ai/dist/image-models.generated.js.map +1 -1
  49. package/node_modules/@earendil-works/pi-ai/dist/providers/data/.manifest.json +1 -1
  50. package/node_modules/@earendil-works/pi-ai/dist/providers/data/groq.json +1 -1
  51. package/node_modules/@earendil-works/pi-ai/dist/providers/data/opencode.json +1 -1
  52. package/node_modules/@earendil-works/pi-ai/dist/providers/data/openrouter.json +1 -1
  53. package/node_modules/@earendil-works/pi-ai/dist/utils/retry.d.ts.map +1 -1
  54. package/node_modules/@earendil-works/pi-ai/dist/utils/retry.js +15 -2
  55. package/node_modules/@earendil-works/pi-ai/dist/utils/retry.js.map +1 -1
  56. package/node_modules/@earendil-works/pi-ai/dist/utils/tool-schema-compat.d.ts +8 -0
  57. package/node_modules/@earendil-works/pi-ai/dist/utils/tool-schema-compat.d.ts.map +1 -1
  58. package/node_modules/@earendil-works/pi-ai/dist/utils/tool-schema-compat.js +71 -17
  59. package/node_modules/@earendil-works/pi-ai/dist/utils/tool-schema-compat.js.map +1 -1
  60. package/node_modules/@earendil-works/pi-ai/package.json +1 -1
  61. package/node_modules/@earendil-works/pi-pty/package.json +1 -1
  62. package/node_modules/@earendil-works/pi-tui/package.json +1 -1
  63. package/package.json +6 -6
@@ -1 +1 @@
1
- {"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../src/utils/retry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AA+GpD;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,qFAAqF;IACrF,UAAU,EAAE,MAAM,CAAC;IACnB,0FAA0F;IAC1F,WAAW,EAAE,MAAM,CAAC;CACpB;AAED,kFAAkF;AAClF,MAAM,WAAW,cAAc;IAC9B,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,CAClB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,KAChB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,mFAAmF;IACnF,mBAAmB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,mFAAmF;IACnF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnG;AA0BD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,kBAAkB,CACvC,OAAO,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,EACxC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,SAAS,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,gBAAgB,CAAC,CA4C3B;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAU5E;AAYD,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAE7E;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAIzE;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAIrE"}
1
+ {"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../src/utils/retry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AA6HpD;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,qFAAqF;IACrF,UAAU,EAAE,MAAM,CAAC;IACnB,0FAA0F;IAC1F,WAAW,EAAE,MAAM,CAAC;CACpB;AAED,kFAAkF;AAClF,MAAM,WAAW,cAAc;IAC9B,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,CAClB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,KAChB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,mFAAmF;IACnF,mBAAmB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,mFAAmF;IACnF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnG;AA0BD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,kBAAkB,CACvC,OAAO,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,EACxC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,SAAS,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,gBAAgB,CAAC,CA4C3B;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAU5E;AAYD,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAE7E;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAIzE;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAIrE"}
@@ -1,7 +1,7 @@
1
1
  function buildProviderErrorPattern(patterns) {
2
2
  return new RegExp(patterns.join("|"), "i");
3
3
  }
4
- const NON_RETRYABLE_PROVIDER_LIMIT_ERROR_PATTERN = buildProviderErrorPattern([
4
+ const NON_RETRYABLE_PROVIDER_ERROR_PATTERN = buildProviderErrorPattern([
5
5
  // OpenCode Go/free-tier limits returned as 429 JSON error types by OpenCode's
6
6
  // Zen API. These are subscription/account limits, not transient throttles.
7
7
  "GoUsageLimitError",
@@ -22,6 +22,19 @@ const NON_RETRYABLE_PROVIDER_LIMIT_ERROR_PATTERN = buildProviderErrorPattern([
22
22
  // spend limit, so same-model retries can never recover it.
23
23
  "credits_required",
24
24
  "credits are required",
25
+ // Request-shape rejections: the provider refused the payload we built, not the
26
+ // work it describes. Gateways wrap these in whatever status they like — the
27
+ // observed Apitopia/Kimi case arrives as `500 server_error: Invalid request:
28
+ // tools.function.parameters.type is required and must be "object"` — so the
29
+ // status text alone would classify a permanent failure as transient. The same
30
+ // bytes are rejected on every attempt and on every fallback model, so retrying
31
+ // can only burn the turn. Anchored on the `tools[...]`/`functions[...]` request
32
+ // path so unrelated prose mentioning tools stays retryable.
33
+ "invalid request: tools\\.",
34
+ "invalid request: functions\\.",
35
+ "tools\\.[^ ]*function\\.parameters",
36
+ "tools\\.\\d+\\.function\\.parameters",
37
+ "invalid tool schema",
25
38
  ]);
26
39
  const RETRYABLE_PROVIDER_ERROR_PATTERN = buildProviderErrorPattern([
27
40
  // Generic provider load, HTTP status, and server-side transient failures.
@@ -222,7 +235,7 @@ export function isProviderTimeoutError(message) {
222
235
  export function isRetryableErrorMessage(errorMessage) {
223
236
  if (!errorMessage)
224
237
  return false;
225
- if (NON_RETRYABLE_PROVIDER_LIMIT_ERROR_PATTERN.test(errorMessage))
238
+ if (NON_RETRYABLE_PROVIDER_ERROR_PATTERN.test(errorMessage))
226
239
  return false;
227
240
  return RETRYABLE_PROVIDER_ERROR_PATTERN.test(errorMessage);
228
241
  }
@@ -1 +1 @@
1
- {"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/utils/retry.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AssistantMessage } from \"../types.ts\";\n\nfunction buildProviderErrorPattern(patterns: readonly string[]): RegExp {\n\treturn new RegExp(patterns.join(\"|\"), \"i\");\n}\n\nconst NON_RETRYABLE_PROVIDER_LIMIT_ERROR_PATTERN = buildProviderErrorPattern([\n\t// OpenCode Go/free-tier limits returned as 429 JSON error types by OpenCode's\n\t// Zen API. These are subscription/account limits, not transient throttles.\n\t\"GoUsageLimitError\",\n\t\"FreeUsageLimitError\",\n\n\t// OpenCode Go subscription-limit text asks users to enable available-balance\n\t// usage after rolling/weekly/monthly limits are reached.\n\t\"Monthly usage limit reached\",\n\t\"available balance\",\n\n\t// Generic quota/budget/billing exhaustion. `insufficient_quota` is OpenAI's\n\t// quota/billing error code; the other strings cover common gateway wording.\n\t\"insufficient_quota\",\n\t\"out of budget\",\n\t\"quota exceeded\",\n\t\"billing\",\n\n\t// Anthropic Console credit exhaustion: a 429 rate_limit_error whose details\n\t// carry error_code credits_required (\"Usage credits are required for this\n\t// model.\"). The account is dead until the user buys credits or raises the\n\t// spend limit, so same-model retries can never recover it.\n\t\"credits_required\",\n\t\"credits are required\",\n]);\n\nconst RETRYABLE_PROVIDER_ERROR_PATTERN = buildProviderErrorPattern([\n\t// Generic provider load, HTTP status, and server-side transient failures.\n\t\"overloaded\",\n\t\"rate.?limit\",\n\t\"too many requests\",\n\t\"429\",\n\t\"500\",\n\t\"502\",\n\t\"503\",\n\t\"504\",\n\t// Cloudflare 522 (Connection timed out): origin stopped responding; transient\n\t// like the other 5xx gateway statuses, surfaced as \"Error: error code: 522\".\n\t\"522\",\n\t\"524\",\n\t\"service.?unavailable\",\n\t\"server.?error\",\n\t\"internal.?error\",\n\n\t// Wrapper/provider text for transient upstream failures, including OpenRouter\n\t// \"Provider returned error\" responses (#2264).\n\t\"provider.?returned.?error\",\n\n\t// Network, proxy, and fetch transport failures. This includes OpenAI Codex\n\t// raw-fetch failures such as \"upstream connect\", \"connection refused\", and\n\t// \"reset before headers\" (#733), plus OpenRouter connection drops (#3317).\n\t\"network.?error\",\n\t\"connection.?error\",\n\t\"connection.?refused\",\n\t\"connection.?lost\",\n\t\"other side closed\",\n\t\"fetch failed\",\n\t\"getaddrinfo\",\n\t\"ENOTFOUND\",\n\t\"EAI_AGAIN\",\n\t\"upstream.?connect\",\n\t\"upstream.?unavailable\",\n\t\"reset before headers\",\n\t\"socket hang up\",\n\t\"socket connection was closed\",\n\t\"timed? out\",\n\t\"timeout\",\n\t\"terminated\",\n\n\t// WebSocket transports can report close/error text instead of HTTP/fetch text.\n\t\"websocket.?closed\",\n\t\"websocket.?error\",\n\n\t// Premature stream endings from SDKs and transports. Anthropic can throw\n\t// \"stream ended without ...\" and \"Anthropic stream ended before message_stop\"\n\t// (#4433); Bedrock/Smithy can throw an HTTP/2 no-response error (#3594).\n\t\"ended without\",\n\t\"stream ended before message_stop\",\n\t\"stream ended before a terminal response event\",\n\t\"http2 request did not get a response\",\n\n\t// Provider-requested retry delay cap failures should flow through the outer\n\t// retry policy so callers can surface/abort the backoff (#1123).\n\t\"retry delay\",\n\n\t// Explicit retry guidance emitted mid-stream by OpenAI Responses and Bedrock\n\t// stream exceptions (#6019).\n\t\"you can retry your request\",\n\t\"try your request again\",\n\t\"please retry your request\",\n\n\t// Anthropic server-tool pairing rejections, e.g. \"`web_search` tool use with id\n\t// `srvtoolu_...` was found without a corresponding `web_search_tool_result`\n\t// block\". A turn closed before its deferred server tool could answer leaves\n\t// the unpairable half in history, and replaying it 400s every later request.\n\t// The Anthropic request builder repairs the replayed history, so a retry sends\n\t// a valid payload; keeping the class retryable is what lets retry and the model\n\t// fallback chain unwedge such a session instead of dead-ending it. The trailing\n\t// backtick keeps the pattern on Anthropic's pairing-error template.\n\t\"was found without a corresponding `\",\n\n\t// gRPC based providers (e.g. NVIDIA NIM)\n\t\"ResourceExhausted\",\n]);\n\n/**\n * Retry policy: bounded attempts with exponential backoff (`baseDelayMs * 2^(attempt-1)`).\n * Matches `settings.retry` (`enabled`, `maxRetries`, `baseDelayMs`) in coding-agent; kept\n * here so the classifier and the policy-driven retry loop live together and stay reusable\n * by the SDK and other callers.\n */\nexport interface RetryPolicy {\n\tenabled: boolean;\n\t/** Max retry attempts (0 = no retries). The initial call never counts as a retry. */\n\tmaxRetries: number;\n\t/** Base delay in ms. Per-attempt delay is `baseDelayMs * 2^(attempt-1)` before jitter. */\n\tbaseDelayMs: number;\n}\n\n/** Optional callbacks emitted by {@link retryAssistantCall} around each retry. */\nexport interface RetryCallbacks {\n\t/** Emitted before the backoff sleep of each retry attempt (1-indexed). */\n\tonRetryScheduled?: (\n\t\tattempt: number,\n\t\tmaxAttempts: number,\n\t\tdelayMs: number,\n\t\terrorMessage: string,\n\t) => void | Promise<void>;\n\t/** Emitted after the backoff sleep, immediately before the retried call starts. */\n\tonRetryAttemptStart?: () => void | Promise<void>;\n\t/** Emitted once when the loop ends: success if a later call completed normally. */\n\tonRetryFinished?: (success: boolean, attempt: number, finalError?: string) => void | Promise<void>;\n}\n\nclass RetrySleepAbortError extends Error {\n\tconstructor() {\n\t\tsuper(\"Aborted\");\n\t}\n}\n\nfunction sleep(ms: number, signal?: AbortSignal): Promise<void> {\n\treturn new Promise((resolve, reject) => {\n\t\tif (signal?.aborted) {\n\t\t\treject(new RetrySleepAbortError());\n\t\t\treturn;\n\t\t}\n\t\tconst timeout = setTimeout(resolve, ms);\n\t\tsignal?.addEventListener(\n\t\t\t\"abort\",\n\t\t\t() => {\n\t\t\t\tclearTimeout(timeout);\n\t\t\t\treject(new RetrySleepAbortError());\n\t\t\t},\n\t\t\t{ once: true },\n\t\t);\n\t});\n}\n\n/**\n * Run a single assistant-producing call with bounded retry on transient errors.\n *\n * Behavior:\n * - A successful response is returned immediately. Aborts are terminal and never\n * retried, but reported as unsuccessful if they happen after a retry was scheduled.\n * Aborts during the backoff sleep are normalized to an aborted `AssistantMessage`\n * too, so callers do not need to care when cancellation happened.\n * - A non-retryable error (per {@link isRetryableAssistantError}, including quota/\n * billing exhaustion) is returned immediately so deterministic errors fail fast.\n * - Otherwise retries up to `maxRetries` times with exponential backoff, emitting\n * `onRetryScheduled` before each sleep, `onRetryAttemptStart` after each sleep before\n * the retried call starts, and `onRetryFinished` once at the end (whether the loop\n * ends in success, exhausted retries, or an aborted backoff).\n *\n * When `policy` is undefined or disabled, the first response is returned unchanged\n * (equivalent to calling `produce()` directly).\n */\nexport async function retryAssistantCall(\n\tproduce: () => Promise<AssistantMessage>,\n\tpolicy: RetryPolicy | undefined,\n\tsignal: AbortSignal | undefined,\n\tcallbacks?: RetryCallbacks,\n): Promise<AssistantMessage> {\n\tconst maxAttempts = policy?.enabled ? policy.maxRetries : 0;\n\n\tlet attempt = 0;\n\tlet lastRetry: { attempt: number; errorMessage: string } | undefined;\n\tfor (;;) {\n\t\tconst response = await produce();\n\n\t\t// Abort: terminal but not successful. Never retry an aborted message.\n\t\tif (response.stopReason === \"aborted\") {\n\t\t\tif (lastRetry) await callbacks?.onRetryFinished?.(false, lastRetry.attempt);\n\t\t\treturn response;\n\t\t}\n\n\t\t// Success: non-error, non-abort responses return as-is.\n\t\tif (response.stopReason !== \"error\") {\n\t\t\tif (lastRetry) await callbacks?.onRetryFinished?.(true, lastRetry.attempt);\n\t\t\treturn response;\n\t\t}\n\n\t\t// Non-retryable, or budget exhausted: return the final error message.\n\t\tif (attempt >= maxAttempts || !isRetryableAssistantError(response)) {\n\t\t\tif (lastRetry) await callbacks?.onRetryFinished?.(false, lastRetry.attempt, response.errorMessage);\n\t\t\treturn response;\n\t\t}\n\n\t\tattempt++;\n\t\tlastRetry = { attempt, errorMessage: response.errorMessage || \"Unknown error\" };\n\t\tconst delayMs = policy!.baseDelayMs * 2 ** (attempt - 1);\n\t\tawait callbacks?.onRetryScheduled?.(attempt, maxAttempts, delayMs, lastRetry.errorMessage);\n\n\t\t// Normalize aborts during retry backoff to the same AssistantMessage shape as\n\t\t// provider stream aborts, so callers do not need to care when cancellation happened.\n\t\ttry {\n\t\t\tawait sleep(delayMs, signal);\n\t\t} catch (error) {\n\t\t\tawait callbacks?.onRetryFinished?.(false, attempt, lastRetry.errorMessage);\n\t\t\tif (error instanceof RetrySleepAbortError) {\n\t\t\t\treturn { ...response, stopReason: \"aborted\", errorMessage: undefined };\n\t\t\t}\n\t\t\tthrow error;\n\t\t}\n\t\tawait callbacks?.onRetryAttemptStart?.();\n\t}\n}\n\n/**\n * Classifies whether a failed assistant message looks like a transient provider\n * or transport error, so callers can decide if the last assistant turn should be\n * restarted.\n *\n * This does not implement retry policy. Callers should first handle context\n * overflow separately, then apply their own retry budget, backoff, and reporting\n * before restarting the assistant turn.\n */\nexport function isRetryableAssistantError(message: AssistantMessage): boolean {\n\tif (\n\t\tmessage.stopReason !== \"error\" ||\n\t\tmessage.stopDetails?.type === \"refusal\" ||\n\t\tmessage.stopDetails?.type === \"sensitive\" ||\n\t\t!message.errorMessage\n\t) {\n\t\treturn false;\n\t}\n\treturn isRetryableErrorMessage(message.errorMessage);\n}\n\n/**\n * Matches the agent-loop stream watchdog failures (\"Idle timeout waiting for\n * provider stream after <n>ms\" and \"Provider stream start timed out after\n * <n>ms\"). These anchored shapes distinguish provider-stream stalls from\n * unrelated extension, command, or MCP timeout diagnostics.\n */\nconst PROVIDER_STREAM_STALL_ERROR_PATTERN =\n\t/^(?:Idle timeout waiting for provider stream after \\d+ms|Provider stream start timed out after \\d+ms)$/i;\nconst PROVIDER_TRANSPORT_TIMEOUT_ERROR_PATTERN = /^Request timed out\\.?$/i;\n\nexport function isProviderStreamStallError(message: AssistantMessage): boolean {\n\treturn message.stopReason === \"error\" && PROVIDER_STREAM_STALL_ERROR_PATTERN.test(message.errorMessage ?? \"\");\n}\n\n/**\n * Classifies timeout failures that originate from the provider stream or its\n * transport. Transport timeouts may arrive as `aborted`; stream watchdog\n * failures are ordinary error responses.\n */\nexport function isProviderTimeoutError(message: AssistantMessage): boolean {\n\tif (isProviderStreamStallError(message)) return true;\n\tif (message.stopReason !== \"error\" && message.stopReason !== \"aborted\") return false;\n\treturn PROVIDER_TRANSPORT_TIMEOUT_ERROR_PATTERN.test(message.errorMessage ?? \"\");\n}\n\n/**\n * Classifies a raw error-message string with the same transient-vs-terminal\n * rules as {@link isRetryableAssistantError}, for callers that hold a thrown\n * `Error` instead of an `AssistantMessage` (e.g. compaction summarization\n * failures that must decide between degrading and surfacing loudly).\n */\nexport function isRetryableErrorMessage(errorMessage: string): boolean {\n\tif (!errorMessage) return false;\n\tif (NON_RETRYABLE_PROVIDER_LIMIT_ERROR_PATTERN.test(errorMessage)) return false;\n\treturn RETRYABLE_PROVIDER_ERROR_PATTERN.test(errorMessage);\n}\n"]}
1
+ {"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/utils/retry.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AssistantMessage } from \"../types.ts\";\n\nfunction buildProviderErrorPattern(patterns: readonly string[]): RegExp {\n\treturn new RegExp(patterns.join(\"|\"), \"i\");\n}\n\nconst NON_RETRYABLE_PROVIDER_ERROR_PATTERN = buildProviderErrorPattern([\n\t// OpenCode Go/free-tier limits returned as 429 JSON error types by OpenCode's\n\t// Zen API. These are subscription/account limits, not transient throttles.\n\t\"GoUsageLimitError\",\n\t\"FreeUsageLimitError\",\n\n\t// OpenCode Go subscription-limit text asks users to enable available-balance\n\t// usage after rolling/weekly/monthly limits are reached.\n\t\"Monthly usage limit reached\",\n\t\"available balance\",\n\n\t// Generic quota/budget/billing exhaustion. `insufficient_quota` is OpenAI's\n\t// quota/billing error code; the other strings cover common gateway wording.\n\t\"insufficient_quota\",\n\t\"out of budget\",\n\t\"quota exceeded\",\n\t\"billing\",\n\n\t// Anthropic Console credit exhaustion: a 429 rate_limit_error whose details\n\t// carry error_code credits_required (\"Usage credits are required for this\n\t// model.\"). The account is dead until the user buys credits or raises the\n\t// spend limit, so same-model retries can never recover it.\n\t\"credits_required\",\n\t\"credits are required\",\n\n\t// Request-shape rejections: the provider refused the payload we built, not the\n\t// work it describes. Gateways wrap these in whatever status they like — the\n\t// observed Apitopia/Kimi case arrives as `500 server_error: Invalid request:\n\t// tools.function.parameters.type is required and must be \"object\"` — so the\n\t// status text alone would classify a permanent failure as transient. The same\n\t// bytes are rejected on every attempt and on every fallback model, so retrying\n\t// can only burn the turn. Anchored on the `tools[...]`/`functions[...]` request\n\t// path so unrelated prose mentioning tools stays retryable.\n\t\"invalid request: tools\\\\.\",\n\t\"invalid request: functions\\\\.\",\n\t\"tools\\\\.[^ ]*function\\\\.parameters\",\n\t\"tools\\\\.\\\\d+\\\\.function\\\\.parameters\",\n\t\"invalid tool schema\",\n]);\n\nconst RETRYABLE_PROVIDER_ERROR_PATTERN = buildProviderErrorPattern([\n\t// Generic provider load, HTTP status, and server-side transient failures.\n\t\"overloaded\",\n\t\"rate.?limit\",\n\t\"too many requests\",\n\t\"429\",\n\t\"500\",\n\t\"502\",\n\t\"503\",\n\t\"504\",\n\t// Cloudflare 522 (Connection timed out): origin stopped responding; transient\n\t// like the other 5xx gateway statuses, surfaced as \"Error: error code: 522\".\n\t\"522\",\n\t\"524\",\n\t\"service.?unavailable\",\n\t\"server.?error\",\n\t\"internal.?error\",\n\n\t// Wrapper/provider text for transient upstream failures, including OpenRouter\n\t// \"Provider returned error\" responses (#2264).\n\t\"provider.?returned.?error\",\n\n\t// Network, proxy, and fetch transport failures. This includes OpenAI Codex\n\t// raw-fetch failures such as \"upstream connect\", \"connection refused\", and\n\t// \"reset before headers\" (#733), plus OpenRouter connection drops (#3317).\n\t\"network.?error\",\n\t\"connection.?error\",\n\t\"connection.?refused\",\n\t\"connection.?lost\",\n\t\"other side closed\",\n\t\"fetch failed\",\n\t\"getaddrinfo\",\n\t\"ENOTFOUND\",\n\t\"EAI_AGAIN\",\n\t\"upstream.?connect\",\n\t\"upstream.?unavailable\",\n\t\"reset before headers\",\n\t\"socket hang up\",\n\t\"socket connection was closed\",\n\t\"timed? out\",\n\t\"timeout\",\n\t\"terminated\",\n\n\t// WebSocket transports can report close/error text instead of HTTP/fetch text.\n\t\"websocket.?closed\",\n\t\"websocket.?error\",\n\n\t// Premature stream endings from SDKs and transports. Anthropic can throw\n\t// \"stream ended without ...\" and \"Anthropic stream ended before message_stop\"\n\t// (#4433); Bedrock/Smithy can throw an HTTP/2 no-response error (#3594).\n\t\"ended without\",\n\t\"stream ended before message_stop\",\n\t\"stream ended before a terminal response event\",\n\t\"http2 request did not get a response\",\n\n\t// Provider-requested retry delay cap failures should flow through the outer\n\t// retry policy so callers can surface/abort the backoff (#1123).\n\t\"retry delay\",\n\n\t// Explicit retry guidance emitted mid-stream by OpenAI Responses and Bedrock\n\t// stream exceptions (#6019).\n\t\"you can retry your request\",\n\t\"try your request again\",\n\t\"please retry your request\",\n\n\t// Anthropic server-tool pairing rejections, e.g. \"`web_search` tool use with id\n\t// `srvtoolu_...` was found without a corresponding `web_search_tool_result`\n\t// block\". A turn closed before its deferred server tool could answer leaves\n\t// the unpairable half in history, and replaying it 400s every later request.\n\t// The Anthropic request builder repairs the replayed history, so a retry sends\n\t// a valid payload; keeping the class retryable is what lets retry and the model\n\t// fallback chain unwedge such a session instead of dead-ending it. The trailing\n\t// backtick keeps the pattern on Anthropic's pairing-error template.\n\t\"was found without a corresponding `\",\n\n\t// gRPC based providers (e.g. NVIDIA NIM)\n\t\"ResourceExhausted\",\n]);\n\n/**\n * Retry policy: bounded attempts with exponential backoff (`baseDelayMs * 2^(attempt-1)`).\n * Matches `settings.retry` (`enabled`, `maxRetries`, `baseDelayMs`) in coding-agent; kept\n * here so the classifier and the policy-driven retry loop live together and stay reusable\n * by the SDK and other callers.\n */\nexport interface RetryPolicy {\n\tenabled: boolean;\n\t/** Max retry attempts (0 = no retries). The initial call never counts as a retry. */\n\tmaxRetries: number;\n\t/** Base delay in ms. Per-attempt delay is `baseDelayMs * 2^(attempt-1)` before jitter. */\n\tbaseDelayMs: number;\n}\n\n/** Optional callbacks emitted by {@link retryAssistantCall} around each retry. */\nexport interface RetryCallbacks {\n\t/** Emitted before the backoff sleep of each retry attempt (1-indexed). */\n\tonRetryScheduled?: (\n\t\tattempt: number,\n\t\tmaxAttempts: number,\n\t\tdelayMs: number,\n\t\terrorMessage: string,\n\t) => void | Promise<void>;\n\t/** Emitted after the backoff sleep, immediately before the retried call starts. */\n\tonRetryAttemptStart?: () => void | Promise<void>;\n\t/** Emitted once when the loop ends: success if a later call completed normally. */\n\tonRetryFinished?: (success: boolean, attempt: number, finalError?: string) => void | Promise<void>;\n}\n\nclass RetrySleepAbortError extends Error {\n\tconstructor() {\n\t\tsuper(\"Aborted\");\n\t}\n}\n\nfunction sleep(ms: number, signal?: AbortSignal): Promise<void> {\n\treturn new Promise((resolve, reject) => {\n\t\tif (signal?.aborted) {\n\t\t\treject(new RetrySleepAbortError());\n\t\t\treturn;\n\t\t}\n\t\tconst timeout = setTimeout(resolve, ms);\n\t\tsignal?.addEventListener(\n\t\t\t\"abort\",\n\t\t\t() => {\n\t\t\t\tclearTimeout(timeout);\n\t\t\t\treject(new RetrySleepAbortError());\n\t\t\t},\n\t\t\t{ once: true },\n\t\t);\n\t});\n}\n\n/**\n * Run a single assistant-producing call with bounded retry on transient errors.\n *\n * Behavior:\n * - A successful response is returned immediately. Aborts are terminal and never\n * retried, but reported as unsuccessful if they happen after a retry was scheduled.\n * Aborts during the backoff sleep are normalized to an aborted `AssistantMessage`\n * too, so callers do not need to care when cancellation happened.\n * - A non-retryable error (per {@link isRetryableAssistantError}, including quota/\n * billing exhaustion) is returned immediately so deterministic errors fail fast.\n * - Otherwise retries up to `maxRetries` times with exponential backoff, emitting\n * `onRetryScheduled` before each sleep, `onRetryAttemptStart` after each sleep before\n * the retried call starts, and `onRetryFinished` once at the end (whether the loop\n * ends in success, exhausted retries, or an aborted backoff).\n *\n * When `policy` is undefined or disabled, the first response is returned unchanged\n * (equivalent to calling `produce()` directly).\n */\nexport async function retryAssistantCall(\n\tproduce: () => Promise<AssistantMessage>,\n\tpolicy: RetryPolicy | undefined,\n\tsignal: AbortSignal | undefined,\n\tcallbacks?: RetryCallbacks,\n): Promise<AssistantMessage> {\n\tconst maxAttempts = policy?.enabled ? policy.maxRetries : 0;\n\n\tlet attempt = 0;\n\tlet lastRetry: { attempt: number; errorMessage: string } | undefined;\n\tfor (;;) {\n\t\tconst response = await produce();\n\n\t\t// Abort: terminal but not successful. Never retry an aborted message.\n\t\tif (response.stopReason === \"aborted\") {\n\t\t\tif (lastRetry) await callbacks?.onRetryFinished?.(false, lastRetry.attempt);\n\t\t\treturn response;\n\t\t}\n\n\t\t// Success: non-error, non-abort responses return as-is.\n\t\tif (response.stopReason !== \"error\") {\n\t\t\tif (lastRetry) await callbacks?.onRetryFinished?.(true, lastRetry.attempt);\n\t\t\treturn response;\n\t\t}\n\n\t\t// Non-retryable, or budget exhausted: return the final error message.\n\t\tif (attempt >= maxAttempts || !isRetryableAssistantError(response)) {\n\t\t\tif (lastRetry) await callbacks?.onRetryFinished?.(false, lastRetry.attempt, response.errorMessage);\n\t\t\treturn response;\n\t\t}\n\n\t\tattempt++;\n\t\tlastRetry = { attempt, errorMessage: response.errorMessage || \"Unknown error\" };\n\t\tconst delayMs = policy!.baseDelayMs * 2 ** (attempt - 1);\n\t\tawait callbacks?.onRetryScheduled?.(attempt, maxAttempts, delayMs, lastRetry.errorMessage);\n\n\t\t// Normalize aborts during retry backoff to the same AssistantMessage shape as\n\t\t// provider stream aborts, so callers do not need to care when cancellation happened.\n\t\ttry {\n\t\t\tawait sleep(delayMs, signal);\n\t\t} catch (error) {\n\t\t\tawait callbacks?.onRetryFinished?.(false, attempt, lastRetry.errorMessage);\n\t\t\tif (error instanceof RetrySleepAbortError) {\n\t\t\t\treturn { ...response, stopReason: \"aborted\", errorMessage: undefined };\n\t\t\t}\n\t\t\tthrow error;\n\t\t}\n\t\tawait callbacks?.onRetryAttemptStart?.();\n\t}\n}\n\n/**\n * Classifies whether a failed assistant message looks like a transient provider\n * or transport error, so callers can decide if the last assistant turn should be\n * restarted.\n *\n * This does not implement retry policy. Callers should first handle context\n * overflow separately, then apply their own retry budget, backoff, and reporting\n * before restarting the assistant turn.\n */\nexport function isRetryableAssistantError(message: AssistantMessage): boolean {\n\tif (\n\t\tmessage.stopReason !== \"error\" ||\n\t\tmessage.stopDetails?.type === \"refusal\" ||\n\t\tmessage.stopDetails?.type === \"sensitive\" ||\n\t\t!message.errorMessage\n\t) {\n\t\treturn false;\n\t}\n\treturn isRetryableErrorMessage(message.errorMessage);\n}\n\n/**\n * Matches the agent-loop stream watchdog failures (\"Idle timeout waiting for\n * provider stream after <n>ms\" and \"Provider stream start timed out after\n * <n>ms\"). These anchored shapes distinguish provider-stream stalls from\n * unrelated extension, command, or MCP timeout diagnostics.\n */\nconst PROVIDER_STREAM_STALL_ERROR_PATTERN =\n\t/^(?:Idle timeout waiting for provider stream after \\d+ms|Provider stream start timed out after \\d+ms)$/i;\nconst PROVIDER_TRANSPORT_TIMEOUT_ERROR_PATTERN = /^Request timed out\\.?$/i;\n\nexport function isProviderStreamStallError(message: AssistantMessage): boolean {\n\treturn message.stopReason === \"error\" && PROVIDER_STREAM_STALL_ERROR_PATTERN.test(message.errorMessage ?? \"\");\n}\n\n/**\n * Classifies timeout failures that originate from the provider stream or its\n * transport. Transport timeouts may arrive as `aborted`; stream watchdog\n * failures are ordinary error responses.\n */\nexport function isProviderTimeoutError(message: AssistantMessage): boolean {\n\tif (isProviderStreamStallError(message)) return true;\n\tif (message.stopReason !== \"error\" && message.stopReason !== \"aborted\") return false;\n\treturn PROVIDER_TRANSPORT_TIMEOUT_ERROR_PATTERN.test(message.errorMessage ?? \"\");\n}\n\n/**\n * Classifies a raw error-message string with the same transient-vs-terminal\n * rules as {@link isRetryableAssistantError}, for callers that hold a thrown\n * `Error` instead of an `AssistantMessage` (e.g. compaction summarization\n * failures that must decide between degrading and surfacing loudly).\n */\nexport function isRetryableErrorMessage(errorMessage: string): boolean {\n\tif (!errorMessage) return false;\n\tif (NON_RETRYABLE_PROVIDER_ERROR_PATTERN.test(errorMessage)) return false;\n\treturn RETRYABLE_PROVIDER_ERROR_PATTERN.test(errorMessage);\n}\n"]}
@@ -16,4 +16,12 @@ export declare function normalizeToolParametersForOpenAICompat(schema: Record<st
16
16
  * normalization, drop non-structural annotation keywords that Moonshot rejects.
17
17
  */
18
18
  export declare function normalizeToolParametersForMoonshot(schema: Record<string, unknown>): Record<string, unknown>;
19
+ /**
20
+ * Resolve a tool's root parameters into a single object schema, without the
21
+ * OpenAI-specific rewrites. Wire formats that read a tool's parameters from
22
+ * top-level `properties`/`required` need this: a root union carries neither, so
23
+ * they would otherwise describe the tool to the model as taking no arguments.
24
+ * Schemas that are already plain objects are returned untouched.
25
+ */
26
+ export declare function resolveRootObjectSchema(schema: Record<string, unknown>): Record<string, unknown>;
19
27
  //# sourceMappingURL=tool-schema-compat.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tool-schema-compat.d.ts","sourceRoot":"","sources":["../../src/utils/tool-schema-compat.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC;AA4K/C;;;GAGG;AACH,wBAAgB,sCAAsC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE/G;AAED;;;GAGG;AACH,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAG3G"}
1
+ {"version":3,"file":"tool-schema-compat.d.ts","sourceRoot":"","sources":["../../src/utils/tool-schema-compat.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAoM/C;;;GAGG;AACH,wBAAgB,sCAAsC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAG/G;AAqBD;;;GAGG;AACH,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE3G;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEhG"}
@@ -81,13 +81,30 @@ function collapseConstUnion(node) {
81
81
  node.type = sharedType;
82
82
  node.enum = values;
83
83
  }
84
+ /**
85
+ * Collapse a root-level object union into one object schema.
86
+ *
87
+ * A tool's root parameters schema must be a plain `{"type":"object"}` schema:
88
+ * OpenAI-compatible gateways reject a root that only carries `anyOf`/`oneOf`
89
+ * with `tools.function.parameters.type is required and must be "object"`. The
90
+ * merge is intentionally lossy in the direction of permissiveness — branch
91
+ * exclusivity becomes advisory — but it must never lose a declared parameter,
92
+ * so the root's own `properties` and `required` are merged with the branches'
93
+ * rather than replaced by them.
94
+ */
84
95
  function mergeRootObjectUnion(schema) {
85
96
  const branches = Array.isArray(schema.anyOf) ? schema.anyOf : Array.isArray(schema.oneOf) ? schema.oneOf : undefined;
86
97
  if (branches === undefined || branches.length === 0)
87
98
  return undefined;
99
+ if (schema.properties !== undefined && !isJsonObject(schema.properties))
100
+ return undefined;
101
+ if (schema.required !== undefined && !Array.isArray(schema.required))
102
+ return undefined;
88
103
  const objectBranches = [];
89
104
  for (const branch of branches) {
90
- if (!isJsonObject(branch) || branch.type !== "object")
105
+ // An untyped branch is a constraint-only variant (e.g. `{ required: [...] }`)
106
+ // over the root's own properties, so it merges like an object branch.
107
+ if (!isJsonObject(branch) || (branch.type !== "object" && branch.type !== undefined))
91
108
  return undefined;
92
109
  if (branch.properties !== undefined && !isJsonObject(branch.properties))
93
110
  return undefined;
@@ -95,7 +112,7 @@ function mergeRootObjectUnion(schema) {
95
112
  return undefined;
96
113
  objectBranches.push(branch);
97
114
  }
98
- const properties = {};
115
+ const properties = isJsonObject(schema.properties) ? { ...schema.properties } : {};
99
116
  for (const branch of objectBranches) {
100
117
  if (!isJsonObject(branch.properties))
101
118
  continue;
@@ -107,25 +124,29 @@ function mergeRootObjectUnion(schema) {
107
124
  : { anyOf: [existing, propertySchema] };
108
125
  }
109
126
  }
110
- const firstRequired = objectBranches[0]?.required;
111
- let commonRequired = Array.isArray(firstRequired)
112
- ? firstRequired.filter((name) => typeof name === "string")
127
+ // Only names required by EVERY branch stay required; a name required by one
128
+ // branch alone would reject payloads the union accepts. Root-level `required`
129
+ // applies to all branches, so it is unioned back in.
130
+ const rootRequired = Array.isArray(schema.required)
131
+ ? schema.required.filter((name) => typeof name === "string")
113
132
  : [];
114
- for (const branch of objectBranches.slice(1)) {
115
- const branchRequired = new Set(Array.isArray(branch.required)
116
- ? branch.required.filter((name) => typeof name === "string")
117
- : []);
118
- commonRequired = commonRequired.filter((name) => branchRequired.has(name));
119
- }
133
+ const branchRequiredSets = objectBranches.map((branch) => new Set(Array.isArray(branch.required)
134
+ ? branch.required.filter((name) => typeof name === "string")
135
+ : []));
136
+ const firstBranchRequired = branchRequiredSets[0];
137
+ const commonBranchRequired = firstBranchRequired
138
+ ? [...firstBranchRequired].filter((name) => branchRequiredSets.every((names) => names.has(name)))
139
+ : [];
140
+ const required = [...new Set([...rootRequired, ...commonBranchRequired])];
120
141
  const { anyOf: _anyOf, oneOf: _oneOf, ...rest } = schema;
121
142
  return {
122
143
  ...rest,
123
144
  type: "object",
124
145
  properties,
125
- ...(commonRequired.length > 0 ? { required: commonRequired } : {}),
146
+ ...(required.length > 0 ? { required } : {}),
126
147
  };
127
148
  }
128
- function normalizeNode(node) {
149
+ function normalizeNode(node, isRoot = false) {
129
150
  if (Array.isArray(node)) {
130
151
  return node.map((child) => normalizeNode(child));
131
152
  }
@@ -133,7 +154,9 @@ function normalizeNode(node) {
133
154
  return node;
134
155
  }
135
156
  const hasCombiner = COMBINER_KEYS.some((key) => Array.isArray(node[key]));
136
- if (hasCombiner) {
157
+ // The root of a tool's parameters must keep `type: "object"`; hoisting it into
158
+ // the branches leaves a typeless root that gateways reject outright.
159
+ if (hasCombiner && !isRoot) {
137
160
  moveTypeIntoCombinerBranches(node);
138
161
  }
139
162
  for (const combiner of COMBINER_KEYS) {
@@ -165,15 +188,46 @@ function normalizeNode(node) {
165
188
  * for OpenAI-compatible Chat Completions backends.
166
189
  */
167
190
  export function normalizeToolParametersForOpenAICompat(schema) {
168
- return normalizeNode(structuredClone(schema));
191
+ const normalized = normalizeNode(structuredClone(schema), true);
192
+ return ensureRootObjectSchema(normalized);
193
+ }
194
+ /**
195
+ * Guarantee the wire shape every OpenAI-compatible backend requires for tool
196
+ * parameters: a root object schema. A root union of object shapes is merged into
197
+ * one object schema; a root that merely lost its `type` gets it restored.
198
+ *
199
+ * A root whose branches are not object shapes is left alone: forcing
200
+ * `type: "object"` onto a scalar union would assert something the schema
201
+ * contradicts, which is worse than the missing keyword. Tool parameters are
202
+ * objects in practice, so this only guards against corrupting an exotic schema.
203
+ */
204
+ function ensureRootObjectSchema(schema) {
205
+ const merged = mergeRootObjectUnion(schema);
206
+ if (merged)
207
+ return merged;
208
+ if (schema.type !== undefined)
209
+ return schema;
210
+ const hasCombiner = COMBINER_KEYS.some((key) => Array.isArray(schema[key]));
211
+ if (hasCombiner)
212
+ return schema;
213
+ return { ...schema, type: "object" };
169
214
  }
170
215
  /**
171
216
  * Moonshot-flavored JSON Schema subset: in addition to the OpenAI-compatible
172
217
  * normalization, drop non-structural annotation keywords that Moonshot rejects.
173
218
  */
174
219
  export function normalizeToolParametersForMoonshot(schema) {
175
- const normalized = normalizeToolParametersForOpenAICompat(schema);
176
- return stripMoonshotAnnotations(mergeRootObjectUnion(normalized) ?? normalized);
220
+ return stripMoonshotAnnotations(normalizeToolParametersForOpenAICompat(schema));
221
+ }
222
+ /**
223
+ * Resolve a tool's root parameters into a single object schema, without the
224
+ * OpenAI-specific rewrites. Wire formats that read a tool's parameters from
225
+ * top-level `properties`/`required` need this: a root union carries neither, so
226
+ * they would otherwise describe the tool to the model as taking no arguments.
227
+ * Schemas that are already plain objects are returned untouched.
228
+ */
229
+ export function resolveRootObjectSchema(schema) {
230
+ return mergeRootObjectUnion(structuredClone(schema)) ?? schema;
177
231
  }
178
232
  function stripMoonshotAnnotations(node) {
179
233
  if (Array.isArray(node)) {
@@ -1 +1 @@
1
- {"version":3,"file":"tool-schema-compat.js","sourceRoot":"","sources":["../../src/utils/tool-schema-compat.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * JSON Schema normalization for tool parameters sent to OpenAI-compatible\n * backends. Some gateways (e.g. Apitopia → Kimi / Moonshot) enforce a stricter\n * subset that rejects a sibling `type` keyword on schemas that also declare\n * `anyOf` / `oneOf` / `allOf`. This helper removes that redundancy while\n * preserving the schema's semantics.\n */\n\nexport type ToolSchemaFlavor = \"moonshot-mfjs\";\n\nconst COMBINER_KEYS = [\"anyOf\", \"oneOf\", \"allOf\"] as const;\nconst SCHEMA_MAP_KEYS = [\"properties\", \"patternProperties\", \"$defs\", \"definitions\"] as const;\nconst SCHEMA_SINGLE_KEYS = [\n\t\"items\",\n\t\"additionalProperties\",\n\t\"contains\",\n\t\"propertyNames\",\n\t\"if\",\n\t\"then\",\n\t\"else\",\n\t\"not\",\n] as const;\n\nfunction isJsonObject(value: unknown): value is Record<string, unknown> {\n\treturn value !== null && typeof value === \"object\" && !Array.isArray(value);\n}\n\nfunction isScalarType(type: unknown): type is \"string\" | \"number\" | \"integer\" | \"boolean\" {\n\treturn type === \"string\" || type === \"number\" || type === \"integer\" || type === \"boolean\";\n}\n\n/**\n * Move a parent-level `type` keyword into combiner branches that do not already\n * declare one, then drop the parent `type`. This keeps the schema equivalent\n * while satisfying validators that require `type` to live inside each branch.\n */\nfunction moveTypeIntoCombinerBranches(node: Record<string, unknown>): void {\n\tif (!(\"type\" in node)) return;\n\n\tconst parentType = node.type;\n\tfor (const combiner of COMBINER_KEYS) {\n\t\tconst branches = node[combiner];\n\t\tif (!Array.isArray(branches)) continue;\n\n\t\tfor (const branch of branches) {\n\t\t\tif (isJsonObject(branch) && !(\"type\" in branch)) {\n\t\t\t\tbranch.type = parentType;\n\t\t\t}\n\t\t}\n\t}\n\n\tdelete node.type;\n}\n\n/**\n * Collapse a homogeneous all-`const` union into a typed `enum`. This is the\n * wire shape many OpenAI-compatible gateways expect for literal unions.\n */\nfunction collapseConstUnion(node: Record<string, unknown>): void {\n\tconst branches = node.anyOf;\n\tif (!Array.isArray(branches) || branches.length < 2) return;\n\tif (\"type\" in node) return;\n\n\tconst values: unknown[] = [];\n\tlet sharedType: string | undefined;\n\n\tfor (const branch of branches) {\n\t\tif (!isJsonObject(branch)) return;\n\t\tif (!Object.hasOwn(branch, \"const\")) return;\n\n\t\tconst keys = Object.keys(branch);\n\t\tif (keys.length !== 2 || !keys.includes(\"type\")) return;\n\n\t\tconst branchType = branch.type;\n\t\tif (!isScalarType(branchType)) return;\n\n\t\tif (sharedType === undefined) {\n\t\t\tsharedType = branchType;\n\t\t} else if (sharedType !== branchType) {\n\t\t\treturn;\n\t\t}\n\n\t\tvalues.push(branch.const);\n\t}\n\n\tif (sharedType === undefined || values.length === 0) return;\n\n\tdelete node.anyOf;\n\tnode.type = sharedType;\n\tnode.enum = values;\n}\n\nfunction mergeRootObjectUnion(schema: Record<string, unknown>): Record<string, unknown> | undefined {\n\tconst branches = Array.isArray(schema.anyOf) ? schema.anyOf : Array.isArray(schema.oneOf) ? schema.oneOf : undefined;\n\tif (branches === undefined || branches.length === 0) return undefined;\n\n\tconst objectBranches: Record<string, unknown>[] = [];\n\tfor (const branch of branches) {\n\t\tif (!isJsonObject(branch) || branch.type !== \"object\") return undefined;\n\t\tif (branch.properties !== undefined && !isJsonObject(branch.properties)) return undefined;\n\t\tif (branch.required !== undefined && !Array.isArray(branch.required)) return undefined;\n\t\tobjectBranches.push(branch);\n\t}\n\n\tconst properties: Record<string, unknown> = {};\n\tfor (const branch of objectBranches) {\n\t\tif (!isJsonObject(branch.properties)) continue;\n\t\tfor (const [name, propertySchema] of Object.entries(branch.properties)) {\n\t\t\tconst existing = properties[name];\n\t\t\tproperties[name] =\n\t\t\t\texisting === undefined || JSON.stringify(existing) === JSON.stringify(propertySchema)\n\t\t\t\t\t? propertySchema\n\t\t\t\t\t: { anyOf: [existing, propertySchema] };\n\t\t}\n\t}\n\n\tconst firstRequired = objectBranches[0]?.required;\n\tlet commonRequired = Array.isArray(firstRequired)\n\t\t? firstRequired.filter((name): name is string => typeof name === \"string\")\n\t\t: [];\n\tfor (const branch of objectBranches.slice(1)) {\n\t\tconst branchRequired = new Set(\n\t\t\tArray.isArray(branch.required)\n\t\t\t\t? branch.required.filter((name): name is string => typeof name === \"string\")\n\t\t\t\t: [],\n\t\t);\n\t\tcommonRequired = commonRequired.filter((name) => branchRequired.has(name));\n\t}\n\n\tconst { anyOf: _anyOf, oneOf: _oneOf, ...rest } = schema;\n\treturn {\n\t\t...rest,\n\t\ttype: \"object\",\n\t\tproperties,\n\t\t...(commonRequired.length > 0 ? { required: commonRequired } : {}),\n\t};\n}\n\nfunction normalizeNode(node: unknown): unknown {\n\tif (Array.isArray(node)) {\n\t\treturn node.map((child) => normalizeNode(child));\n\t}\n\n\tif (!isJsonObject(node)) {\n\t\treturn node;\n\t}\n\n\tconst hasCombiner = COMBINER_KEYS.some((key) => Array.isArray(node[key]));\n\tif (hasCombiner) {\n\t\tmoveTypeIntoCombinerBranches(node);\n\t}\n\n\tfor (const combiner of COMBINER_KEYS) {\n\t\tconst branches = node[combiner];\n\t\tif (Array.isArray(branches)) {\n\t\t\tnode[combiner] = branches.map((branch) => normalizeNode(branch));\n\t\t}\n\t}\n\n\tif (Array.isArray(node.anyOf)) {\n\t\tcollapseConstUnion(node);\n\t}\n\n\tfor (const key of SCHEMA_SINGLE_KEYS) {\n\t\tif (Object.hasOwn(node, key)) {\n\t\t\tnode[key] = normalizeNode(node[key]);\n\t\t}\n\t}\n\n\tfor (const key of SCHEMA_MAP_KEYS) {\n\t\tconst map = node[key];\n\t\tif (!isJsonObject(map)) continue;\n\t\tfor (const name of Object.keys(map)) {\n\t\t\tmap[name] = normalizeNode(map[name]);\n\t\t}\n\t}\n\n\treturn node;\n}\n\n/**\n * Return a deep-normalized copy of a tool's JSON Schema parameters, suitable\n * for OpenAI-compatible Chat Completions backends.\n */\nexport function normalizeToolParametersForOpenAICompat(schema: Record<string, unknown>): Record<string, unknown> {\n\treturn normalizeNode(structuredClone(schema)) as Record<string, unknown>;\n}\n\n/**\n * Moonshot-flavored JSON Schema subset: in addition to the OpenAI-compatible\n * normalization, drop non-structural annotation keywords that Moonshot rejects.\n */\nexport function normalizeToolParametersForMoonshot(schema: Record<string, unknown>): Record<string, unknown> {\n\tconst normalized = normalizeToolParametersForOpenAICompat(schema);\n\treturn stripMoonshotAnnotations(mergeRootObjectUnion(normalized) ?? normalized);\n}\n\nfunction stripMoonshotAnnotations(node: unknown): Record<string, unknown> {\n\tif (Array.isArray(node)) {\n\t\treturn node.map((child) => stripMoonshotAnnotations(child)) as unknown as Record<string, unknown>;\n\t}\n\n\tif (!isJsonObject(node)) {\n\t\treturn node as Record<string, unknown>;\n\t}\n\n\t// Moonshot does not support JSON Schema validators like `format` or\n\t// annotation-only keywords like `examples` inside function parameters.\n\tdelete node.format;\n\tdelete node.examples;\n\tdelete node.readOnly;\n\tdelete node.writeOnly;\n\tdelete node.deprecated;\n\tdelete node.$schema;\n\tdelete node.$id;\n\n\tfor (const combiner of COMBINER_KEYS) {\n\t\tconst branches = node[combiner];\n\t\tif (Array.isArray(branches)) {\n\t\t\tnode[combiner] = branches.map((branch) => stripMoonshotAnnotations(branch));\n\t\t}\n\t}\n\n\tfor (const key of SCHEMA_SINGLE_KEYS) {\n\t\tif (Object.hasOwn(node, key)) {\n\t\t\tnode[key] = stripMoonshotAnnotations(node[key]);\n\t\t}\n\t}\n\n\tfor (const key of SCHEMA_MAP_KEYS) {\n\t\tconst map = node[key];\n\t\tif (!isJsonObject(map)) continue;\n\t\tfor (const name of Object.keys(map)) {\n\t\t\tmap[name] = stripMoonshotAnnotations(map[name]);\n\t\t}\n\t}\n\n\treturn node;\n}\n"]}
1
+ {"version":3,"file":"tool-schema-compat.js","sourceRoot":"","sources":["../../src/utils/tool-schema-compat.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * JSON Schema normalization for tool parameters sent to OpenAI-compatible\n * backends. Some gateways (e.g. Apitopia → Kimi / Moonshot) enforce a stricter\n * subset that rejects a sibling `type` keyword on schemas that also declare\n * `anyOf` / `oneOf` / `allOf`. This helper removes that redundancy while\n * preserving the schema's semantics.\n */\n\nexport type ToolSchemaFlavor = \"moonshot-mfjs\";\n\nconst COMBINER_KEYS = [\"anyOf\", \"oneOf\", \"allOf\"] as const;\nconst SCHEMA_MAP_KEYS = [\"properties\", \"patternProperties\", \"$defs\", \"definitions\"] as const;\nconst SCHEMA_SINGLE_KEYS = [\n\t\"items\",\n\t\"additionalProperties\",\n\t\"contains\",\n\t\"propertyNames\",\n\t\"if\",\n\t\"then\",\n\t\"else\",\n\t\"not\",\n] as const;\n\nfunction isJsonObject(value: unknown): value is Record<string, unknown> {\n\treturn value !== null && typeof value === \"object\" && !Array.isArray(value);\n}\n\nfunction isScalarType(type: unknown): type is \"string\" | \"number\" | \"integer\" | \"boolean\" {\n\treturn type === \"string\" || type === \"number\" || type === \"integer\" || type === \"boolean\";\n}\n\n/**\n * Move a parent-level `type` keyword into combiner branches that do not already\n * declare one, then drop the parent `type`. This keeps the schema equivalent\n * while satisfying validators that require `type` to live inside each branch.\n */\nfunction moveTypeIntoCombinerBranches(node: Record<string, unknown>): void {\n\tif (!(\"type\" in node)) return;\n\n\tconst parentType = node.type;\n\tfor (const combiner of COMBINER_KEYS) {\n\t\tconst branches = node[combiner];\n\t\tif (!Array.isArray(branches)) continue;\n\n\t\tfor (const branch of branches) {\n\t\t\tif (isJsonObject(branch) && !(\"type\" in branch)) {\n\t\t\t\tbranch.type = parentType;\n\t\t\t}\n\t\t}\n\t}\n\n\tdelete node.type;\n}\n\n/**\n * Collapse a homogeneous all-`const` union into a typed `enum`. This is the\n * wire shape many OpenAI-compatible gateways expect for literal unions.\n */\nfunction collapseConstUnion(node: Record<string, unknown>): void {\n\tconst branches = node.anyOf;\n\tif (!Array.isArray(branches) || branches.length < 2) return;\n\tif (\"type\" in node) return;\n\n\tconst values: unknown[] = [];\n\tlet sharedType: string | undefined;\n\n\tfor (const branch of branches) {\n\t\tif (!isJsonObject(branch)) return;\n\t\tif (!Object.hasOwn(branch, \"const\")) return;\n\n\t\tconst keys = Object.keys(branch);\n\t\tif (keys.length !== 2 || !keys.includes(\"type\")) return;\n\n\t\tconst branchType = branch.type;\n\t\tif (!isScalarType(branchType)) return;\n\n\t\tif (sharedType === undefined) {\n\t\t\tsharedType = branchType;\n\t\t} else if (sharedType !== branchType) {\n\t\t\treturn;\n\t\t}\n\n\t\tvalues.push(branch.const);\n\t}\n\n\tif (sharedType === undefined || values.length === 0) return;\n\n\tdelete node.anyOf;\n\tnode.type = sharedType;\n\tnode.enum = values;\n}\n\n/**\n * Collapse a root-level object union into one object schema.\n *\n * A tool's root parameters schema must be a plain `{\"type\":\"object\"}` schema:\n * OpenAI-compatible gateways reject a root that only carries `anyOf`/`oneOf`\n * with `tools.function.parameters.type is required and must be \"object\"`. The\n * merge is intentionally lossy in the direction of permissiveness — branch\n * exclusivity becomes advisory — but it must never lose a declared parameter,\n * so the root's own `properties` and `required` are merged with the branches'\n * rather than replaced by them.\n */\nfunction mergeRootObjectUnion(schema: Record<string, unknown>): Record<string, unknown> | undefined {\n\tconst branches = Array.isArray(schema.anyOf) ? schema.anyOf : Array.isArray(schema.oneOf) ? schema.oneOf : undefined;\n\tif (branches === undefined || branches.length === 0) return undefined;\n\tif (schema.properties !== undefined && !isJsonObject(schema.properties)) return undefined;\n\tif (schema.required !== undefined && !Array.isArray(schema.required)) return undefined;\n\n\tconst objectBranches: Record<string, unknown>[] = [];\n\tfor (const branch of branches) {\n\t\t// An untyped branch is a constraint-only variant (e.g. `{ required: [...] }`)\n\t\t// over the root's own properties, so it merges like an object branch.\n\t\tif (!isJsonObject(branch) || (branch.type !== \"object\" && branch.type !== undefined)) return undefined;\n\t\tif (branch.properties !== undefined && !isJsonObject(branch.properties)) return undefined;\n\t\tif (branch.required !== undefined && !Array.isArray(branch.required)) return undefined;\n\t\tobjectBranches.push(branch);\n\t}\n\n\tconst properties: Record<string, unknown> = isJsonObject(schema.properties) ? { ...schema.properties } : {};\n\tfor (const branch of objectBranches) {\n\t\tif (!isJsonObject(branch.properties)) continue;\n\t\tfor (const [name, propertySchema] of Object.entries(branch.properties)) {\n\t\t\tconst existing = properties[name];\n\t\t\tproperties[name] =\n\t\t\t\texisting === undefined || JSON.stringify(existing) === JSON.stringify(propertySchema)\n\t\t\t\t\t? propertySchema\n\t\t\t\t\t: { anyOf: [existing, propertySchema] };\n\t\t}\n\t}\n\n\t// Only names required by EVERY branch stay required; a name required by one\n\t// branch alone would reject payloads the union accepts. Root-level `required`\n\t// applies to all branches, so it is unioned back in.\n\tconst rootRequired = Array.isArray(schema.required)\n\t\t? schema.required.filter((name): name is string => typeof name === \"string\")\n\t\t: [];\n\tconst branchRequiredSets = objectBranches.map(\n\t\t(branch) =>\n\t\t\tnew Set(\n\t\t\t\tArray.isArray(branch.required)\n\t\t\t\t\t? branch.required.filter((name): name is string => typeof name === \"string\")\n\t\t\t\t\t: [],\n\t\t\t),\n\t);\n\tconst firstBranchRequired = branchRequiredSets[0];\n\tconst commonBranchRequired = firstBranchRequired\n\t\t? [...firstBranchRequired].filter((name) => branchRequiredSets.every((names) => names.has(name)))\n\t\t: [];\n\tconst required = [...new Set([...rootRequired, ...commonBranchRequired])];\n\n\tconst { anyOf: _anyOf, oneOf: _oneOf, ...rest } = schema;\n\treturn {\n\t\t...rest,\n\t\ttype: \"object\",\n\t\tproperties,\n\t\t...(required.length > 0 ? { required } : {}),\n\t};\n}\n\nfunction normalizeNode(node: unknown, isRoot = false): unknown {\n\tif (Array.isArray(node)) {\n\t\treturn node.map((child) => normalizeNode(child));\n\t}\n\n\tif (!isJsonObject(node)) {\n\t\treturn node;\n\t}\n\n\tconst hasCombiner = COMBINER_KEYS.some((key) => Array.isArray(node[key]));\n\t// The root of a tool's parameters must keep `type: \"object\"`; hoisting it into\n\t// the branches leaves a typeless root that gateways reject outright.\n\tif (hasCombiner && !isRoot) {\n\t\tmoveTypeIntoCombinerBranches(node);\n\t}\n\n\tfor (const combiner of COMBINER_KEYS) {\n\t\tconst branches = node[combiner];\n\t\tif (Array.isArray(branches)) {\n\t\t\tnode[combiner] = branches.map((branch) => normalizeNode(branch));\n\t\t}\n\t}\n\n\tif (Array.isArray(node.anyOf)) {\n\t\tcollapseConstUnion(node);\n\t}\n\n\tfor (const key of SCHEMA_SINGLE_KEYS) {\n\t\tif (Object.hasOwn(node, key)) {\n\t\t\tnode[key] = normalizeNode(node[key]);\n\t\t}\n\t}\n\n\tfor (const key of SCHEMA_MAP_KEYS) {\n\t\tconst map = node[key];\n\t\tif (!isJsonObject(map)) continue;\n\t\tfor (const name of Object.keys(map)) {\n\t\t\tmap[name] = normalizeNode(map[name]);\n\t\t}\n\t}\n\n\treturn node;\n}\n\n/**\n * Return a deep-normalized copy of a tool's JSON Schema parameters, suitable\n * for OpenAI-compatible Chat Completions backends.\n */\nexport function normalizeToolParametersForOpenAICompat(schema: Record<string, unknown>): Record<string, unknown> {\n\tconst normalized = normalizeNode(structuredClone(schema), true) as Record<string, unknown>;\n\treturn ensureRootObjectSchema(normalized);\n}\n\n/**\n * Guarantee the wire shape every OpenAI-compatible backend requires for tool\n * parameters: a root object schema. A root union of object shapes is merged into\n * one object schema; a root that merely lost its `type` gets it restored.\n *\n * A root whose branches are not object shapes is left alone: forcing\n * `type: \"object\"` onto a scalar union would assert something the schema\n * contradicts, which is worse than the missing keyword. Tool parameters are\n * objects in practice, so this only guards against corrupting an exotic schema.\n */\nfunction ensureRootObjectSchema(schema: Record<string, unknown>): Record<string, unknown> {\n\tconst merged = mergeRootObjectUnion(schema);\n\tif (merged) return merged;\n\tif (schema.type !== undefined) return schema;\n\tconst hasCombiner = COMBINER_KEYS.some((key) => Array.isArray(schema[key]));\n\tif (hasCombiner) return schema;\n\treturn { ...schema, type: \"object\" };\n}\n\n/**\n * Moonshot-flavored JSON Schema subset: in addition to the OpenAI-compatible\n * normalization, drop non-structural annotation keywords that Moonshot rejects.\n */\nexport function normalizeToolParametersForMoonshot(schema: Record<string, unknown>): Record<string, unknown> {\n\treturn stripMoonshotAnnotations(normalizeToolParametersForOpenAICompat(schema));\n}\n\n/**\n * Resolve a tool's root parameters into a single object schema, without the\n * OpenAI-specific rewrites. Wire formats that read a tool's parameters from\n * top-level `properties`/`required` need this: a root union carries neither, so\n * they would otherwise describe the tool to the model as taking no arguments.\n * Schemas that are already plain objects are returned untouched.\n */\nexport function resolveRootObjectSchema(schema: Record<string, unknown>): Record<string, unknown> {\n\treturn mergeRootObjectUnion(structuredClone(schema)) ?? schema;\n}\n\nfunction stripMoonshotAnnotations(node: unknown): Record<string, unknown> {\n\tif (Array.isArray(node)) {\n\t\treturn node.map((child) => stripMoonshotAnnotations(child)) as unknown as Record<string, unknown>;\n\t}\n\n\tif (!isJsonObject(node)) {\n\t\treturn node as Record<string, unknown>;\n\t}\n\n\t// Moonshot does not support JSON Schema validators like `format` or\n\t// annotation-only keywords like `examples` inside function parameters.\n\tdelete node.format;\n\tdelete node.examples;\n\tdelete node.readOnly;\n\tdelete node.writeOnly;\n\tdelete node.deprecated;\n\tdelete node.$schema;\n\tdelete node.$id;\n\n\tfor (const combiner of COMBINER_KEYS) {\n\t\tconst branches = node[combiner];\n\t\tif (Array.isArray(branches)) {\n\t\t\tnode[combiner] = branches.map((branch) => stripMoonshotAnnotations(branch));\n\t\t}\n\t}\n\n\tfor (const key of SCHEMA_SINGLE_KEYS) {\n\t\tif (Object.hasOwn(node, key)) {\n\t\t\tnode[key] = stripMoonshotAnnotations(node[key]);\n\t\t}\n\t}\n\n\tfor (const key of SCHEMA_MAP_KEYS) {\n\t\tconst map = node[key];\n\t\tif (!isJsonObject(map)) continue;\n\t\tfor (const name of Object.keys(map)) {\n\t\t\tmap[name] = stripMoonshotAnnotations(map[name]);\n\t\t}\n\t}\n\n\treturn node;\n}\n"]}
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@earendil-works/pi-ai",
3
3
  "private": true,
4
- "version": "2026.8.4",
4
+ "version": "2026.8.5",
5
5
  "description": "Unified LLM API with automatic model discovery and provider configuration",
6
6
  "type": "module",
7
7
  "main": "./dist/index.js",
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@earendil-works/pi-pty",
3
3
  "private": true,
4
- "version": "2026.8.4",
4
+ "version": "2026.8.5",
5
5
  "description": "Typed PTY session loader for Senpi persistent terminals",
6
6
  "type": "module",
7
7
  "main": "./dist/index.js",
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@earendil-works/pi-tui",
3
3
  "private": true,
4
- "version": "2026.8.4",
4
+ "version": "2026.8.5",
5
5
  "description": "Terminal User Interface library with differential rendering for efficient text-based applications",
6
6
  "type": "module",
7
7
  "main": "dist/index.js",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@code-yeongyu/senpi",
3
- "version": "2026.8.4",
3
+ "version": "2026.8.5",
4
4
  "description": "Coding agent CLI with read, bash, edit, write tools and session management",
5
5
  "type": "module",
6
6
  "piConfig": {
@@ -48,11 +48,11 @@
48
48
  "dependencies": {
49
49
  "@anthropic-ai/sdk": "0.91.1",
50
50
  "@aws-sdk/client-bedrock-runtime": "3.1095.0",
51
- "@code-yeongyu/senpi-codemode": "2026.8.4",
52
- "@earendil-works/pi-agent-core": "npm:@code-yeongyu/senpi-agent-core@2026.8.4",
53
- "@earendil-works/pi-ai": "npm:@code-yeongyu/senpi-ai@2026.8.4",
54
- "@earendil-works/pi-pty": "npm:@code-yeongyu/senpi-pty@2026.8.4",
55
- "@earendil-works/pi-tui": "npm:@code-yeongyu/senpi-tui@2026.8.4",
51
+ "@code-yeongyu/senpi-codemode": "2026.8.5",
52
+ "@earendil-works/pi-agent-core": "npm:@code-yeongyu/senpi-agent-core@2026.8.5",
53
+ "@earendil-works/pi-ai": "npm:@code-yeongyu/senpi-ai@2026.8.5",
54
+ "@earendil-works/pi-pty": "npm:@code-yeongyu/senpi-pty@2026.8.5",
55
+ "@earendil-works/pi-tui": "npm:@code-yeongyu/senpi-tui@2026.8.5",
56
56
  "@mistralai/mistralai": "2.5.0",
57
57
  "@modelcontextprotocol/sdk": "1.30.0",
58
58
  "@mozilla/readability": "0.6.0",