@omnicross/contracts 0.2.0 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -21
- package/README.md +15 -15
- package/dist/index.cjs +184 -2
- package/dist/index.d.cts +2 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.js +173 -1
- package/dist/search-compat.cjs +130 -0
- package/dist/search-compat.d.cts +93 -0
- package/dist/search-compat.d.ts +93 -0
- package/dist/search-compat.js +100 -0
- package/dist/search-types.cjs +102 -0
- package/dist/search-types.d.cts +420 -0
- package/dist/search-types.d.ts +420 -0
- package/dist/search-types.js +74 -0
- package/dist/websearch-types.d.cts +20 -2
- package/dist/websearch-types.d.ts +20 -2
- package/package.json +13 -2
package/LICENSE
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
MIT License
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2026 Sayo
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 Sayo
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
# @omnicross/contracts
|
|
2
|
-
|
|
3
|
-
Dependency-light, host-agnostic contract types + runtime-value helpers shared across the omnicross packages: LLM config, completion types + message blocks, provider presets, thinking config, usage, and subscription/account-token types.
|
|
4
|
-
|
|
5
|
-
Consumed via subpaths to keep the dependency graph tight, e.g. `@omnicross/contracts/llm-config`, `@omnicross/contracts/provider-presets`, `@omnicross/contracts/completion-types`.
|
|
6
|
-
|
|
7
|
-
Part of the [omnicross](https://github.com/Dumoedss/omnicross) monorepo — see the root README for the full overview.
|
|
8
|
-
|
|
9
|
-
```bash
|
|
10
|
-
npm install @omnicross/contracts
|
|
11
|
-
```
|
|
12
|
-
|
|
13
|
-
## License
|
|
14
|
-
|
|
15
|
-
[MIT](LICENSE)
|
|
1
|
+
# @omnicross/contracts
|
|
2
|
+
|
|
3
|
+
Dependency-light, host-agnostic contract types + runtime-value helpers shared across the omnicross packages: LLM config, completion types + message blocks, provider presets, thinking config, usage, and subscription/account-token types.
|
|
4
|
+
|
|
5
|
+
Consumed via subpaths to keep the dependency graph tight, e.g. `@omnicross/contracts/llm-config`, `@omnicross/contracts/provider-presets`, `@omnicross/contracts/completion-types`.
|
|
6
|
+
|
|
7
|
+
Part of the [omnicross](https://github.com/Dumoedss/omnicross) monorepo — see the root README for the full overview.
|
|
8
|
+
|
|
9
|
+
```bash
|
|
10
|
+
npm install @omnicross/contracts
|
|
11
|
+
```
|
|
12
|
+
|
|
13
|
+
## License
|
|
14
|
+
|
|
15
|
+
[MIT](LICENSE)
|
package/dist/index.cjs
CHANGED
|
@@ -38,6 +38,7 @@ __export(index_exports, {
|
|
|
38
38
|
IMAGE_GENERATION_ERROR_CODES: () => IMAGE_GENERATION_ERROR_CODES,
|
|
39
39
|
KNOWN_MODELS: () => KNOWN_MODELS,
|
|
40
40
|
LEGACY_THINKING_TOKEN_LIMITS: () => LEGACY_THINKING_TOKEN_LIMITS,
|
|
41
|
+
LEGACY_UNKNOWN_PROVIDER_ID: () => LEGACY_UNKNOWN_PROVIDER_ID,
|
|
41
42
|
LLM_PROVIDER_PRESETS: () => LLM_PROVIDER_PRESETS,
|
|
42
43
|
MAX_CONCURRENCY_DEFAULTS: () => MAX_CONCURRENCY_DEFAULTS,
|
|
43
44
|
MODEL_ALIASES: () => MODEL_ALIASES,
|
|
@@ -45,6 +46,7 @@ __export(index_exports, {
|
|
|
45
46
|
PROVIDER_SEARCH_CONFIGS: () => PROVIDER_SEARCH_CONFIGS,
|
|
46
47
|
REASONING_MODEL_PATTERNS: () => REASONING_MODEL_PATTERNS,
|
|
47
48
|
SUBSCRIPTION_MODEL_CATALOG: () => SUBSCRIPTION_MODEL_CATALOG,
|
|
49
|
+
SearchProviderError: () => SearchProviderError,
|
|
48
50
|
THINKING_TOKEN_MAP: () => THINKING_TOKEN_MAP,
|
|
49
51
|
WEBHOOK_DESTINATION_TYPES: () => WEBHOOK_DESTINATION_TYPES,
|
|
50
52
|
WEBHOOK_EVENT_KINDS: () => WEBHOOK_EVENT_KINDS,
|
|
@@ -56,6 +58,7 @@ __export(index_exports, {
|
|
|
56
58
|
canDisableThinking: () => canDisableThinking,
|
|
57
59
|
findLegacyTokenLimit: () => findLegacyTokenLimit,
|
|
58
60
|
findTokenLimit: () => findTokenLimit,
|
|
61
|
+
fromLegacyWebSearchResponse: () => fromLegacyWebSearchResponse,
|
|
59
62
|
getAllProviderPresets: () => getAllProviderPresets,
|
|
60
63
|
getClaudeMaxTokens: () => getClaudeMaxTokens,
|
|
61
64
|
getCodingPlanBaseUrl: () => getCodingPlanBaseUrl,
|
|
@@ -66,16 +69,23 @@ __export(index_exports, {
|
|
|
66
69
|
healthHttpStatus: () => healthHttpStatus,
|
|
67
70
|
isApiProvider: () => isApiProvider,
|
|
68
71
|
isExtendedContextCapable: () => isExtendedContextCapable,
|
|
72
|
+
isKnownSearchProviderId: () => isKnownSearchProviderId,
|
|
69
73
|
isLocalProvider: () => isLocalProvider,
|
|
70
74
|
isReasoningModel: () => isReasoningModel,
|
|
75
|
+
isSearchProviderError: () => isSearchProviderError,
|
|
71
76
|
legacyCliBackendToSubscriptionProvider: () => legacyCliBackendToSubscriptionProvider,
|
|
77
|
+
legacyErrorStringToSearchErrorCode: () => legacyErrorStringToSearchErrorCode,
|
|
78
|
+
legacyProviderIdToSearchProviderId: () => legacyProviderIdToSearchProviderId,
|
|
72
79
|
lookupCanonicalCapabilities: () => lookupCanonicalCapabilities,
|
|
73
80
|
normalizeModelId: () => normalizeModelId,
|
|
74
81
|
resolveFollowProviderModel: () => resolveFollowProviderModel,
|
|
75
82
|
resolveModelCapabilities: () => resolveModelCapabilities,
|
|
76
83
|
resolveProviderEndpoint: () => resolveProviderEndpoint,
|
|
84
|
+
searchErrorToLegacyWebSearchResponse: () => searchErrorToLegacyWebSearchResponse,
|
|
77
85
|
subscriptionProviderHasCatalog: () => subscriptionProviderHasCatalog,
|
|
78
|
-
subscriptionTargetForSession: () => subscriptionTargetForSession
|
|
86
|
+
subscriptionTargetForSession: () => subscriptionTargetForSession,
|
|
87
|
+
toLegacyWebSearchResponse: () => toLegacyWebSearchResponse,
|
|
88
|
+
toSearchErrorShape: () => toSearchErrorShape
|
|
79
89
|
});
|
|
80
90
|
module.exports = __toCommonJS(index_exports);
|
|
81
91
|
|
|
@@ -2582,6 +2592,168 @@ function getProviderSearchConfig(presetId) {
|
|
|
2582
2592
|
return PROVIDER_SEARCH_CONFIGS[presetId];
|
|
2583
2593
|
}
|
|
2584
2594
|
|
|
2595
|
+
// src/search-compat.ts
|
|
2596
|
+
var LEGACY_UNKNOWN_PROVIDER_ID = "legacy:unknown";
|
|
2597
|
+
var DEFAULT_LEGACY_ERROR_CODE = "upstream_unavailable";
|
|
2598
|
+
function legacyProviderIdToSearchProviderId(id) {
|
|
2599
|
+
return id;
|
|
2600
|
+
}
|
|
2601
|
+
var LEGACY_ERROR_RULES = [
|
|
2602
|
+
// Runtime facts first.
|
|
2603
|
+
{ pattern: /abort|cancell?ed|cancell?ing/i, code: "cancelled" },
|
|
2604
|
+
{ pattern: /timed ?out|timeout/i, code: "timeout" },
|
|
2605
|
+
// WebSearchService.search()
|
|
2606
|
+
{ pattern: /not configured/i, code: "config_missing" },
|
|
2607
|
+
{ pattern: /is disabled/i, code: "policy_denied" },
|
|
2608
|
+
{ pattern: /not implemented/i, code: "upstream_unavailable" },
|
|
2609
|
+
// HttpOnlyWebSearchService / WebSearchOrchestrator transport availability
|
|
2610
|
+
{ pattern: /unavailable in this host/i, code: "upstream_unavailable" },
|
|
2611
|
+
{ pattern: /HTTP search transport is unavailable/i, code: "upstream_unavailable" },
|
|
2612
|
+
// Exhausted-candidate summaries (both fallback implementations)
|
|
2613
|
+
{ pattern: /No eligible web search provider returned usable results/i, code: "upstream_unavailable" },
|
|
2614
|
+
{ pattern: /No keyless HTTP search provider returned usable results/i, code: "upstream_unavailable" },
|
|
2615
|
+
// Anti-bot / anti-decoy refusals — the page came back, it just cannot be trusted.
|
|
2616
|
+
{ pattern: /bot-challenge/i, code: "upstream_unavailable" },
|
|
2617
|
+
{
|
|
2618
|
+
pattern: /returned an untrusted search result page|refusing to return possible bot-decoy content/i,
|
|
2619
|
+
code: "upstream_unavailable"
|
|
2620
|
+
},
|
|
2621
|
+
{ pattern: /JavaScript-only search shell without result entries/i, code: "upstream_unavailable" },
|
|
2622
|
+
// Response the provider did return, but which could not be turned into results.
|
|
2623
|
+
{ pattern: /response contained no result entries/i, code: "parse_failed" },
|
|
2624
|
+
{ pattern: /returned an invalid response/i, code: "parse_failed" },
|
|
2625
|
+
{ pattern: /returned an invalid result list/i, code: "parse_failed" },
|
|
2626
|
+
{ pattern: /returned only duplicate results/i, code: "parse_failed" },
|
|
2627
|
+
{ pattern: /returned no usable direct results/i, code: "parse_failed" },
|
|
2628
|
+
{ pattern: /returned no results/i, code: "parse_failed" }
|
|
2629
|
+
];
|
|
2630
|
+
function legacyErrorStringToSearchErrorCode(message) {
|
|
2631
|
+
for (const rule of LEGACY_ERROR_RULES) {
|
|
2632
|
+
if (rule.pattern.test(message)) return rule.code;
|
|
2633
|
+
}
|
|
2634
|
+
return DEFAULT_LEGACY_ERROR_CODE;
|
|
2635
|
+
}
|
|
2636
|
+
function providerIdFromLegacyErrorString(message) {
|
|
2637
|
+
const match = /^Provider\s+(?!is\b|returned\b|request\b)(\S+)\s+(?:is|not)\b/i.exec(message);
|
|
2638
|
+
return match?.[1];
|
|
2639
|
+
}
|
|
2640
|
+
function toSearchResult(result) {
|
|
2641
|
+
return { title: result.title, url: result.url, content: result.content };
|
|
2642
|
+
}
|
|
2643
|
+
function fromLegacyWebSearchResponse(resp) {
|
|
2644
|
+
if (resp.success) {
|
|
2645
|
+
return {
|
|
2646
|
+
ok: true,
|
|
2647
|
+
response: {
|
|
2648
|
+
query: resp.query,
|
|
2649
|
+
providerId: resp.provider ?? LEGACY_UNKNOWN_PROVIDER_ID,
|
|
2650
|
+
results: resp.results.map(toSearchResult)
|
|
2651
|
+
}
|
|
2652
|
+
};
|
|
2653
|
+
}
|
|
2654
|
+
const message = resp.error ?? "Unknown error";
|
|
2655
|
+
const error = {
|
|
2656
|
+
code: legacyErrorStringToSearchErrorCode(message),
|
|
2657
|
+
message
|
|
2658
|
+
};
|
|
2659
|
+
const providerId = resp.provider ?? providerIdFromLegacyErrorString(message);
|
|
2660
|
+
if (providerId !== void 0) error.providerId = providerId;
|
|
2661
|
+
return { ok: false, error };
|
|
2662
|
+
}
|
|
2663
|
+
function toLegacyWebSearchResponse(response) {
|
|
2664
|
+
return {
|
|
2665
|
+
success: true,
|
|
2666
|
+
query: response.query,
|
|
2667
|
+
results: response.results.map((result) => ({
|
|
2668
|
+
title: result.title,
|
|
2669
|
+
content: result.content,
|
|
2670
|
+
url: result.url
|
|
2671
|
+
})),
|
|
2672
|
+
provider: response.providerId
|
|
2673
|
+
};
|
|
2674
|
+
}
|
|
2675
|
+
function searchErrorToLegacyWebSearchResponse(query, error) {
|
|
2676
|
+
const response = {
|
|
2677
|
+
success: false,
|
|
2678
|
+
query,
|
|
2679
|
+
results: [],
|
|
2680
|
+
error: error.message.trim().length > 0 ? error.message : error.code
|
|
2681
|
+
};
|
|
2682
|
+
if (error.providerId !== void 0) {
|
|
2683
|
+
response.provider = error.providerId;
|
|
2684
|
+
}
|
|
2685
|
+
return response;
|
|
2686
|
+
}
|
|
2687
|
+
|
|
2688
|
+
// src/search-types.ts
|
|
2689
|
+
var KNOWN_SEARCH_PROVIDER_IDS = /* @__PURE__ */ new Set([
|
|
2690
|
+
"http-bing",
|
|
2691
|
+
"http-duckduckgo",
|
|
2692
|
+
"tavily",
|
|
2693
|
+
"jina",
|
|
2694
|
+
"searxng",
|
|
2695
|
+
"zhipu",
|
|
2696
|
+
"z.ai"
|
|
2697
|
+
]);
|
|
2698
|
+
function isKnownSearchProviderId(id) {
|
|
2699
|
+
return KNOWN_SEARCH_PROVIDER_IDS.has(id);
|
|
2700
|
+
}
|
|
2701
|
+
var SEARCH_ERROR_CODES = /* @__PURE__ */ new Set([
|
|
2702
|
+
"config_missing",
|
|
2703
|
+
"auth_failed",
|
|
2704
|
+
"rate_limited",
|
|
2705
|
+
"timeout",
|
|
2706
|
+
"upstream_unavailable",
|
|
2707
|
+
"parse_failed",
|
|
2708
|
+
"cancelled",
|
|
2709
|
+
"policy_denied"
|
|
2710
|
+
]);
|
|
2711
|
+
var DEFAULT_SEARCH_ERROR_CODE = "upstream_unavailable";
|
|
2712
|
+
var SearchProviderError = class _SearchProviderError extends Error {
|
|
2713
|
+
/** Stable taxonomy code. */
|
|
2714
|
+
code;
|
|
2715
|
+
/** The provider that failed, when known. */
|
|
2716
|
+
providerId;
|
|
2717
|
+
/** Whether retrying the same provider could plausibly succeed. */
|
|
2718
|
+
retryable;
|
|
2719
|
+
/** Pre-sanitized string-valued context. */
|
|
2720
|
+
details;
|
|
2721
|
+
constructor(code, message, init = {}) {
|
|
2722
|
+
super(message, init.cause === void 0 ? void 0 : { cause: init.cause });
|
|
2723
|
+
this.name = "SearchProviderError";
|
|
2724
|
+
this.code = code;
|
|
2725
|
+
this.providerId = init.providerId;
|
|
2726
|
+
this.retryable = init.retryable;
|
|
2727
|
+
this.details = init.details;
|
|
2728
|
+
Object.setPrototypeOf(this, _SearchProviderError.prototype);
|
|
2729
|
+
}
|
|
2730
|
+
/** This error as its serializable {@link SearchErrorShape}. */
|
|
2731
|
+
toShape() {
|
|
2732
|
+
return toSearchErrorShape(this);
|
|
2733
|
+
}
|
|
2734
|
+
};
|
|
2735
|
+
function isSearchProviderError(value) {
|
|
2736
|
+
if (value instanceof SearchProviderError) return true;
|
|
2737
|
+
if (!(value instanceof Error)) return false;
|
|
2738
|
+
const code = value.code;
|
|
2739
|
+
return typeof code === "string" && SEARCH_ERROR_CODES.has(code);
|
|
2740
|
+
}
|
|
2741
|
+
function toSearchErrorShape(value) {
|
|
2742
|
+
if (isSearchProviderError(value)) {
|
|
2743
|
+
const shape = { code: value.code, message: value.message };
|
|
2744
|
+
if (value.providerId !== void 0) shape.providerId = value.providerId;
|
|
2745
|
+
if (value.retryable !== void 0) shape.retryable = value.retryable;
|
|
2746
|
+
if (value.details !== void 0) shape.details = value.details;
|
|
2747
|
+
return shape;
|
|
2748
|
+
}
|
|
2749
|
+
return { code: DEFAULT_SEARCH_ERROR_CODE, message: describeUnknownError(value) };
|
|
2750
|
+
}
|
|
2751
|
+
function describeUnknownError(value) {
|
|
2752
|
+
if (typeof value === "string") return value;
|
|
2753
|
+
if (value instanceof Error && value.message) return value.message;
|
|
2754
|
+
return "Unknown error";
|
|
2755
|
+
}
|
|
2756
|
+
|
|
2585
2757
|
// src/subscription-model-catalog.ts
|
|
2586
2758
|
var SUBSCRIPTION_MODEL_CATALOG = {
|
|
2587
2759
|
claude: ["claude-haiku-4-5", "claude-sonnet-5", "claude-opus-5", "claude-fable-5"],
|
|
@@ -2852,6 +3024,7 @@ function isLocalProvider(id) {
|
|
|
2852
3024
|
IMAGE_GENERATION_ERROR_CODES,
|
|
2853
3025
|
KNOWN_MODELS,
|
|
2854
3026
|
LEGACY_THINKING_TOKEN_LIMITS,
|
|
3027
|
+
LEGACY_UNKNOWN_PROVIDER_ID,
|
|
2855
3028
|
LLM_PROVIDER_PRESETS,
|
|
2856
3029
|
MAX_CONCURRENCY_DEFAULTS,
|
|
2857
3030
|
MODEL_ALIASES,
|
|
@@ -2859,6 +3032,7 @@ function isLocalProvider(id) {
|
|
|
2859
3032
|
PROVIDER_SEARCH_CONFIGS,
|
|
2860
3033
|
REASONING_MODEL_PATTERNS,
|
|
2861
3034
|
SUBSCRIPTION_MODEL_CATALOG,
|
|
3035
|
+
SearchProviderError,
|
|
2862
3036
|
THINKING_TOKEN_MAP,
|
|
2863
3037
|
WEBHOOK_DESTINATION_TYPES,
|
|
2864
3038
|
WEBHOOK_EVENT_KINDS,
|
|
@@ -2870,6 +3044,7 @@ function isLocalProvider(id) {
|
|
|
2870
3044
|
canDisableThinking,
|
|
2871
3045
|
findLegacyTokenLimit,
|
|
2872
3046
|
findTokenLimit,
|
|
3047
|
+
fromLegacyWebSearchResponse,
|
|
2873
3048
|
getAllProviderPresets,
|
|
2874
3049
|
getClaudeMaxTokens,
|
|
2875
3050
|
getCodingPlanBaseUrl,
|
|
@@ -2880,14 +3055,21 @@ function isLocalProvider(id) {
|
|
|
2880
3055
|
healthHttpStatus,
|
|
2881
3056
|
isApiProvider,
|
|
2882
3057
|
isExtendedContextCapable,
|
|
3058
|
+
isKnownSearchProviderId,
|
|
2883
3059
|
isLocalProvider,
|
|
2884
3060
|
isReasoningModel,
|
|
3061
|
+
isSearchProviderError,
|
|
2885
3062
|
legacyCliBackendToSubscriptionProvider,
|
|
3063
|
+
legacyErrorStringToSearchErrorCode,
|
|
3064
|
+
legacyProviderIdToSearchProviderId,
|
|
2886
3065
|
lookupCanonicalCapabilities,
|
|
2887
3066
|
normalizeModelId,
|
|
2888
3067
|
resolveFollowProviderModel,
|
|
2889
3068
|
resolveModelCapabilities,
|
|
2890
3069
|
resolveProviderEndpoint,
|
|
3070
|
+
searchErrorToLegacyWebSearchResponse,
|
|
2891
3071
|
subscriptionProviderHasCatalog,
|
|
2892
|
-
subscriptionTargetForSession
|
|
3072
|
+
subscriptionTargetForSession,
|
|
3073
|
+
toLegacyWebSearchResponse,
|
|
3074
|
+
toSearchErrorShape
|
|
2893
3075
|
});
|
package/dist/index.d.cts
CHANGED
|
@@ -15,6 +15,8 @@ export { DEFAULT_MCP_SESSION_CONFIG, MCPCallToolResponse, MCPTool, MCPToolRespon
|
|
|
15
15
|
export { MessageBlock, MessageBlockBase, MessageBlockType, TextBlock, ThinkingBlock, ToolResultBlock, ToolUseBlock } from './message-blocks.cjs';
|
|
16
16
|
export { DEFAULT_LITELLM_PRICING_URL, DEFAULT_OPENROUTER_PRICING_URL, PricingConflict, PricingConflictDecision, PricingEntry, PricingEntryInput, PricingFetchResult, PricingResolution, PricingSource, PricingSourceRefreshResult } from './pricing-types.cjs';
|
|
17
17
|
export { CATALOG_VERSION, CODING_PLAN_URL_PRESETS, DEFAULT_SEED_PRESET_IDS, LLM_PROVIDER_PRESETS, MAX_CONCURRENCY_DEFAULTS, PROVIDER_MODEL_MAPPINGS, PROVIDER_SEARCH_CONFIGS, getAllProviderPresets, getCodingPlanBaseUrl, getPresetById, getPresetRevision, getProviderSearchConfig, resolveFollowProviderModel } from './provider-presets/index.cjs';
|
|
18
|
+
export { LEGACY_UNKNOWN_PROVIDER_ID, fromLegacyWebSearchResponse, legacyErrorStringToSearchErrorCode, legacyProviderIdToSearchProviderId, searchErrorToLegacyWebSearchResponse, toLegacyWebSearchResponse } from './search-compat.cjs';
|
|
19
|
+
export { KnownSearchProviderId, OrchestratedSearchResponse, SearchAttempt, SearchAttemptEvent, SearchAttemptOutcome, SearchCompleteEvent, SearchContributionContext, SearchErrorCode, SearchErrorShape, SearchOptions, SearchPolicy, SearchProvider, SearchProviderCapabilities, SearchProviderContribution, SearchProviderDescriptor, SearchProviderDiagnostic, SearchProviderError, SearchProviderErrorInit, SearchProviderHealthStatus, SearchProviderId, SearchProviderSource, SearchRequest, SearchResponse, SearchResult, SearchRuntimeEvent, SearchRuntimeEventBase, SearchTimeRange, SearchTransportKind, SearchUrlReadResult, isKnownSearchProviderId, isSearchProviderError, toSearchErrorShape } from './search-types.cjs';
|
|
18
20
|
export { SUBSCRIPTION_MODEL_CATALOG, subscriptionProviderHasCatalog } from './subscription-model-catalog.cjs';
|
|
19
21
|
export { CANNOT_DISABLE_THINKING_PATTERNS, DEFAULT_MAX_TOKENS, EFFORT_RATIO, LEGACY_THINKING_TOKEN_LIMITS, REASONING_MODEL_PATTERNS, THINKING_TOKEN_MAP, buildAnthropicThinking, buildGeminiThinkingConfig, buildQwenThinkingConfig, calculateThinkingBudget, canDisableThinking, findLegacyTokenLimit, findTokenLimit, getClaudeMaxTokens, getOpenAIReasoningEffort, isReasoningModel } from './thinking-config.cjs';
|
|
20
22
|
export { ApiKeyUsageRow, MessageUsageRow, ModelUsageRow, SessionCacheStats, UsageCacheKeySource, UsageDateRange, UsageEventInput, UsageEventRecord, UsageQueryParams, UsageTimeBucket, UsageTimeSeriesBucket, UsageTotals } from './usage-stats-types.cjs';
|
package/dist/index.d.ts
CHANGED
|
@@ -15,6 +15,8 @@ export { DEFAULT_MCP_SESSION_CONFIG, MCPCallToolResponse, MCPTool, MCPToolRespon
|
|
|
15
15
|
export { MessageBlock, MessageBlockBase, MessageBlockType, TextBlock, ThinkingBlock, ToolResultBlock, ToolUseBlock } from './message-blocks.js';
|
|
16
16
|
export { DEFAULT_LITELLM_PRICING_URL, DEFAULT_OPENROUTER_PRICING_URL, PricingConflict, PricingConflictDecision, PricingEntry, PricingEntryInput, PricingFetchResult, PricingResolution, PricingSource, PricingSourceRefreshResult } from './pricing-types.js';
|
|
17
17
|
export { CATALOG_VERSION, CODING_PLAN_URL_PRESETS, DEFAULT_SEED_PRESET_IDS, LLM_PROVIDER_PRESETS, MAX_CONCURRENCY_DEFAULTS, PROVIDER_MODEL_MAPPINGS, PROVIDER_SEARCH_CONFIGS, getAllProviderPresets, getCodingPlanBaseUrl, getPresetById, getPresetRevision, getProviderSearchConfig, resolveFollowProviderModel } from './provider-presets/index.js';
|
|
18
|
+
export { LEGACY_UNKNOWN_PROVIDER_ID, fromLegacyWebSearchResponse, legacyErrorStringToSearchErrorCode, legacyProviderIdToSearchProviderId, searchErrorToLegacyWebSearchResponse, toLegacyWebSearchResponse } from './search-compat.js';
|
|
19
|
+
export { KnownSearchProviderId, OrchestratedSearchResponse, SearchAttempt, SearchAttemptEvent, SearchAttemptOutcome, SearchCompleteEvent, SearchContributionContext, SearchErrorCode, SearchErrorShape, SearchOptions, SearchPolicy, SearchProvider, SearchProviderCapabilities, SearchProviderContribution, SearchProviderDescriptor, SearchProviderDiagnostic, SearchProviderError, SearchProviderErrorInit, SearchProviderHealthStatus, SearchProviderId, SearchProviderSource, SearchRequest, SearchResponse, SearchResult, SearchRuntimeEvent, SearchRuntimeEventBase, SearchTimeRange, SearchTransportKind, SearchUrlReadResult, isKnownSearchProviderId, isSearchProviderError, toSearchErrorShape } from './search-types.js';
|
|
18
20
|
export { SUBSCRIPTION_MODEL_CATALOG, subscriptionProviderHasCatalog } from './subscription-model-catalog.js';
|
|
19
21
|
export { CANNOT_DISABLE_THINKING_PATTERNS, DEFAULT_MAX_TOKENS, EFFORT_RATIO, LEGACY_THINKING_TOKEN_LIMITS, REASONING_MODEL_PATTERNS, THINKING_TOKEN_MAP, buildAnthropicThinking, buildGeminiThinkingConfig, buildQwenThinkingConfig, calculateThinkingBudget, canDisableThinking, findLegacyTokenLimit, findTokenLimit, getClaudeMaxTokens, getOpenAIReasoningEffort, isReasoningModel } from './thinking-config.js';
|
|
20
22
|
export { ApiKeyUsageRow, MessageUsageRow, ModelUsageRow, SessionCacheStats, UsageCacheKeySource, UsageDateRange, UsageEventInput, UsageEventRecord, UsageQueryParams, UsageTimeBucket, UsageTimeSeriesBucket, UsageTotals } from './usage-stats-types.js';
|
package/dist/index.js
CHANGED
|
@@ -2501,6 +2501,168 @@ function getProviderSearchConfig(presetId) {
|
|
|
2501
2501
|
return PROVIDER_SEARCH_CONFIGS[presetId];
|
|
2502
2502
|
}
|
|
2503
2503
|
|
|
2504
|
+
// src/search-compat.ts
|
|
2505
|
+
var LEGACY_UNKNOWN_PROVIDER_ID = "legacy:unknown";
|
|
2506
|
+
var DEFAULT_LEGACY_ERROR_CODE = "upstream_unavailable";
|
|
2507
|
+
function legacyProviderIdToSearchProviderId(id) {
|
|
2508
|
+
return id;
|
|
2509
|
+
}
|
|
2510
|
+
var LEGACY_ERROR_RULES = [
|
|
2511
|
+
// Runtime facts first.
|
|
2512
|
+
{ pattern: /abort|cancell?ed|cancell?ing/i, code: "cancelled" },
|
|
2513
|
+
{ pattern: /timed ?out|timeout/i, code: "timeout" },
|
|
2514
|
+
// WebSearchService.search()
|
|
2515
|
+
{ pattern: /not configured/i, code: "config_missing" },
|
|
2516
|
+
{ pattern: /is disabled/i, code: "policy_denied" },
|
|
2517
|
+
{ pattern: /not implemented/i, code: "upstream_unavailable" },
|
|
2518
|
+
// HttpOnlyWebSearchService / WebSearchOrchestrator transport availability
|
|
2519
|
+
{ pattern: /unavailable in this host/i, code: "upstream_unavailable" },
|
|
2520
|
+
{ pattern: /HTTP search transport is unavailable/i, code: "upstream_unavailable" },
|
|
2521
|
+
// Exhausted-candidate summaries (both fallback implementations)
|
|
2522
|
+
{ pattern: /No eligible web search provider returned usable results/i, code: "upstream_unavailable" },
|
|
2523
|
+
{ pattern: /No keyless HTTP search provider returned usable results/i, code: "upstream_unavailable" },
|
|
2524
|
+
// Anti-bot / anti-decoy refusals — the page came back, it just cannot be trusted.
|
|
2525
|
+
{ pattern: /bot-challenge/i, code: "upstream_unavailable" },
|
|
2526
|
+
{
|
|
2527
|
+
pattern: /returned an untrusted search result page|refusing to return possible bot-decoy content/i,
|
|
2528
|
+
code: "upstream_unavailable"
|
|
2529
|
+
},
|
|
2530
|
+
{ pattern: /JavaScript-only search shell without result entries/i, code: "upstream_unavailable" },
|
|
2531
|
+
// Response the provider did return, but which could not be turned into results.
|
|
2532
|
+
{ pattern: /response contained no result entries/i, code: "parse_failed" },
|
|
2533
|
+
{ pattern: /returned an invalid response/i, code: "parse_failed" },
|
|
2534
|
+
{ pattern: /returned an invalid result list/i, code: "parse_failed" },
|
|
2535
|
+
{ pattern: /returned only duplicate results/i, code: "parse_failed" },
|
|
2536
|
+
{ pattern: /returned no usable direct results/i, code: "parse_failed" },
|
|
2537
|
+
{ pattern: /returned no results/i, code: "parse_failed" }
|
|
2538
|
+
];
|
|
2539
|
+
function legacyErrorStringToSearchErrorCode(message) {
|
|
2540
|
+
for (const rule of LEGACY_ERROR_RULES) {
|
|
2541
|
+
if (rule.pattern.test(message)) return rule.code;
|
|
2542
|
+
}
|
|
2543
|
+
return DEFAULT_LEGACY_ERROR_CODE;
|
|
2544
|
+
}
|
|
2545
|
+
function providerIdFromLegacyErrorString(message) {
|
|
2546
|
+
const match = /^Provider\s+(?!is\b|returned\b|request\b)(\S+)\s+(?:is|not)\b/i.exec(message);
|
|
2547
|
+
return match?.[1];
|
|
2548
|
+
}
|
|
2549
|
+
function toSearchResult(result) {
|
|
2550
|
+
return { title: result.title, url: result.url, content: result.content };
|
|
2551
|
+
}
|
|
2552
|
+
function fromLegacyWebSearchResponse(resp) {
|
|
2553
|
+
if (resp.success) {
|
|
2554
|
+
return {
|
|
2555
|
+
ok: true,
|
|
2556
|
+
response: {
|
|
2557
|
+
query: resp.query,
|
|
2558
|
+
providerId: resp.provider ?? LEGACY_UNKNOWN_PROVIDER_ID,
|
|
2559
|
+
results: resp.results.map(toSearchResult)
|
|
2560
|
+
}
|
|
2561
|
+
};
|
|
2562
|
+
}
|
|
2563
|
+
const message = resp.error ?? "Unknown error";
|
|
2564
|
+
const error = {
|
|
2565
|
+
code: legacyErrorStringToSearchErrorCode(message),
|
|
2566
|
+
message
|
|
2567
|
+
};
|
|
2568
|
+
const providerId = resp.provider ?? providerIdFromLegacyErrorString(message);
|
|
2569
|
+
if (providerId !== void 0) error.providerId = providerId;
|
|
2570
|
+
return { ok: false, error };
|
|
2571
|
+
}
|
|
2572
|
+
function toLegacyWebSearchResponse(response) {
|
|
2573
|
+
return {
|
|
2574
|
+
success: true,
|
|
2575
|
+
query: response.query,
|
|
2576
|
+
results: response.results.map((result) => ({
|
|
2577
|
+
title: result.title,
|
|
2578
|
+
content: result.content,
|
|
2579
|
+
url: result.url
|
|
2580
|
+
})),
|
|
2581
|
+
provider: response.providerId
|
|
2582
|
+
};
|
|
2583
|
+
}
|
|
2584
|
+
function searchErrorToLegacyWebSearchResponse(query, error) {
|
|
2585
|
+
const response = {
|
|
2586
|
+
success: false,
|
|
2587
|
+
query,
|
|
2588
|
+
results: [],
|
|
2589
|
+
error: error.message.trim().length > 0 ? error.message : error.code
|
|
2590
|
+
};
|
|
2591
|
+
if (error.providerId !== void 0) {
|
|
2592
|
+
response.provider = error.providerId;
|
|
2593
|
+
}
|
|
2594
|
+
return response;
|
|
2595
|
+
}
|
|
2596
|
+
|
|
2597
|
+
// src/search-types.ts
|
|
2598
|
+
var KNOWN_SEARCH_PROVIDER_IDS = /* @__PURE__ */ new Set([
|
|
2599
|
+
"http-bing",
|
|
2600
|
+
"http-duckduckgo",
|
|
2601
|
+
"tavily",
|
|
2602
|
+
"jina",
|
|
2603
|
+
"searxng",
|
|
2604
|
+
"zhipu",
|
|
2605
|
+
"z.ai"
|
|
2606
|
+
]);
|
|
2607
|
+
function isKnownSearchProviderId(id) {
|
|
2608
|
+
return KNOWN_SEARCH_PROVIDER_IDS.has(id);
|
|
2609
|
+
}
|
|
2610
|
+
var SEARCH_ERROR_CODES = /* @__PURE__ */ new Set([
|
|
2611
|
+
"config_missing",
|
|
2612
|
+
"auth_failed",
|
|
2613
|
+
"rate_limited",
|
|
2614
|
+
"timeout",
|
|
2615
|
+
"upstream_unavailable",
|
|
2616
|
+
"parse_failed",
|
|
2617
|
+
"cancelled",
|
|
2618
|
+
"policy_denied"
|
|
2619
|
+
]);
|
|
2620
|
+
var DEFAULT_SEARCH_ERROR_CODE = "upstream_unavailable";
|
|
2621
|
+
var SearchProviderError = class _SearchProviderError extends Error {
|
|
2622
|
+
/** Stable taxonomy code. */
|
|
2623
|
+
code;
|
|
2624
|
+
/** The provider that failed, when known. */
|
|
2625
|
+
providerId;
|
|
2626
|
+
/** Whether retrying the same provider could plausibly succeed. */
|
|
2627
|
+
retryable;
|
|
2628
|
+
/** Pre-sanitized string-valued context. */
|
|
2629
|
+
details;
|
|
2630
|
+
constructor(code, message, init = {}) {
|
|
2631
|
+
super(message, init.cause === void 0 ? void 0 : { cause: init.cause });
|
|
2632
|
+
this.name = "SearchProviderError";
|
|
2633
|
+
this.code = code;
|
|
2634
|
+
this.providerId = init.providerId;
|
|
2635
|
+
this.retryable = init.retryable;
|
|
2636
|
+
this.details = init.details;
|
|
2637
|
+
Object.setPrototypeOf(this, _SearchProviderError.prototype);
|
|
2638
|
+
}
|
|
2639
|
+
/** This error as its serializable {@link SearchErrorShape}. */
|
|
2640
|
+
toShape() {
|
|
2641
|
+
return toSearchErrorShape(this);
|
|
2642
|
+
}
|
|
2643
|
+
};
|
|
2644
|
+
function isSearchProviderError(value) {
|
|
2645
|
+
if (value instanceof SearchProviderError) return true;
|
|
2646
|
+
if (!(value instanceof Error)) return false;
|
|
2647
|
+
const code = value.code;
|
|
2648
|
+
return typeof code === "string" && SEARCH_ERROR_CODES.has(code);
|
|
2649
|
+
}
|
|
2650
|
+
function toSearchErrorShape(value) {
|
|
2651
|
+
if (isSearchProviderError(value)) {
|
|
2652
|
+
const shape = { code: value.code, message: value.message };
|
|
2653
|
+
if (value.providerId !== void 0) shape.providerId = value.providerId;
|
|
2654
|
+
if (value.retryable !== void 0) shape.retryable = value.retryable;
|
|
2655
|
+
if (value.details !== void 0) shape.details = value.details;
|
|
2656
|
+
return shape;
|
|
2657
|
+
}
|
|
2658
|
+
return { code: DEFAULT_SEARCH_ERROR_CODE, message: describeUnknownError(value) };
|
|
2659
|
+
}
|
|
2660
|
+
function describeUnknownError(value) {
|
|
2661
|
+
if (typeof value === "string") return value;
|
|
2662
|
+
if (value instanceof Error && value.message) return value.message;
|
|
2663
|
+
return "Unknown error";
|
|
2664
|
+
}
|
|
2665
|
+
|
|
2504
2666
|
// src/subscription-model-catalog.ts
|
|
2505
2667
|
var SUBSCRIPTION_MODEL_CATALOG = {
|
|
2506
2668
|
claude: ["claude-haiku-4-5", "claude-sonnet-5", "claude-opus-5", "claude-fable-5"],
|
|
@@ -2770,6 +2932,7 @@ export {
|
|
|
2770
2932
|
IMAGE_GENERATION_ERROR_CODES,
|
|
2771
2933
|
KNOWN_MODELS,
|
|
2772
2934
|
LEGACY_THINKING_TOKEN_LIMITS,
|
|
2935
|
+
LEGACY_UNKNOWN_PROVIDER_ID,
|
|
2773
2936
|
LLM_PROVIDER_PRESETS,
|
|
2774
2937
|
MAX_CONCURRENCY_DEFAULTS,
|
|
2775
2938
|
MODEL_ALIASES,
|
|
@@ -2777,6 +2940,7 @@ export {
|
|
|
2777
2940
|
PROVIDER_SEARCH_CONFIGS,
|
|
2778
2941
|
REASONING_MODEL_PATTERNS,
|
|
2779
2942
|
SUBSCRIPTION_MODEL_CATALOG,
|
|
2943
|
+
SearchProviderError,
|
|
2780
2944
|
THINKING_TOKEN_MAP,
|
|
2781
2945
|
WEBHOOK_DESTINATION_TYPES,
|
|
2782
2946
|
WEBHOOK_EVENT_KINDS,
|
|
@@ -2788,6 +2952,7 @@ export {
|
|
|
2788
2952
|
canDisableThinking,
|
|
2789
2953
|
findLegacyTokenLimit,
|
|
2790
2954
|
findTokenLimit,
|
|
2955
|
+
fromLegacyWebSearchResponse,
|
|
2791
2956
|
getAllProviderPresets,
|
|
2792
2957
|
getClaudeMaxTokens,
|
|
2793
2958
|
getCodingPlanBaseUrl,
|
|
@@ -2798,14 +2963,21 @@ export {
|
|
|
2798
2963
|
healthHttpStatus,
|
|
2799
2964
|
isApiProvider,
|
|
2800
2965
|
isExtendedContextCapable,
|
|
2966
|
+
isKnownSearchProviderId,
|
|
2801
2967
|
isLocalProvider,
|
|
2802
2968
|
isReasoningModel,
|
|
2969
|
+
isSearchProviderError,
|
|
2803
2970
|
legacyCliBackendToSubscriptionProvider,
|
|
2971
|
+
legacyErrorStringToSearchErrorCode,
|
|
2972
|
+
legacyProviderIdToSearchProviderId,
|
|
2804
2973
|
lookupCanonicalCapabilities,
|
|
2805
2974
|
normalizeModelId,
|
|
2806
2975
|
resolveFollowProviderModel,
|
|
2807
2976
|
resolveModelCapabilities,
|
|
2808
2977
|
resolveProviderEndpoint,
|
|
2978
|
+
searchErrorToLegacyWebSearchResponse,
|
|
2809
2979
|
subscriptionProviderHasCatalog,
|
|
2810
|
-
subscriptionTargetForSession
|
|
2980
|
+
subscriptionTargetForSession,
|
|
2981
|
+
toLegacyWebSearchResponse,
|
|
2982
|
+
toSearchErrorShape
|
|
2811
2983
|
};
|