@mcoda/codali 0.1.118 → 0.1.119
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.
|
@@ -13,6 +13,8 @@ import type { DocdexClient } from "../../docdex/DocdexClient.js";
|
|
|
13
13
|
* no path is given.
|
|
14
14
|
*/
|
|
15
15
|
export declare const toRepoRelativePath: (value: string | undefined, workspaceRoot?: string) => string | undefined;
|
|
16
|
+
/** Test seam: forget any open circuit. */
|
|
17
|
+
export declare const resetWebResearchBackoff: () => void;
|
|
16
18
|
/**
|
|
17
19
|
* Judges whether search results actually answer the question.
|
|
18
20
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocdexTools.d.ts","sourceRoot":"","sources":["../../../src/tools/docdex/DocdexTools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAuFjE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,kBAAkB,GAC7B,OAAO,MAAM,GAAG,SAAS,EACzB,gBAAgB,MAAM,KACrB,MAAM,GAAG,SAWX,CAAC;
|
|
1
|
+
{"version":3,"file":"DocdexTools.d.ts","sourceRoot":"","sources":["../../../src/tools/docdex/DocdexTools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAuFjE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,kBAAkB,GAC7B,OAAO,MAAM,GAAG,SAAS,EACzB,gBAAgB,MAAM,KACrB,MAAM,GAAG,SAWX,CAAC;AAyBF,0CAA0C;AAC1C,eAAO,MAAM,uBAAuB,QAAO,IAG1C,CAAC;AAqJF;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CAClB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAEvB,MAAM,WAAW,iBAAiB;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,YAAY,EACpB,UAAS,iBAAsB,KAC9B,cAAc,EAAgE,CAAC"}
|
|
@@ -107,6 +107,60 @@ export const toRepoRelativePath = (value, workspaceRoot) => {
|
|
|
107
107
|
candidate = candidate.replace(/^\.\//, "").replace(/^\/+/, "").replace(/\/{2,}/g, "/");
|
|
108
108
|
return candidate || undefined;
|
|
109
109
|
};
|
|
110
|
+
/**
|
|
111
|
+
* Stops paying for a quota that is already spent.
|
|
112
|
+
*
|
|
113
|
+
* Web discovery is metered upstream. When the provider answers 402 — or 401,
|
|
114
|
+
* 403, 429 — the answer will not change for the next caller, but nothing
|
|
115
|
+
* remembered that: every question kept asking, and each question asks more than
|
|
116
|
+
* once, because a search that finds nothing locally falls through to the web
|
|
117
|
+
* and a cache hit with no content is retried uncached. Measured upstream at
|
|
118
|
+
* roughly 366 attempts in two hours, about 4,400 a day, which empties a monthly
|
|
119
|
+
* allowance of 5,000 in a little over a day.
|
|
120
|
+
*
|
|
121
|
+
* So the first refusal opens the circuit for everyone until it is due to close.
|
|
122
|
+
* `Retry-After` decides when, since the provider knows and we are guessing;
|
|
123
|
+
* the fallback is deliberately short, because staying closed too long is a
|
|
124
|
+
* self-inflicted outage and reopening early costs one wasted call.
|
|
125
|
+
*/
|
|
126
|
+
const WEB_QUOTA_STATUSES = new Set([401, 402, 403, 429]);
|
|
127
|
+
const DEFAULT_WEB_BACKOFF_MS = 15 * 60000;
|
|
128
|
+
const MAX_WEB_BACKOFF_MS = 60 * 60000;
|
|
129
|
+
let webUnavailableUntilMs = 0;
|
|
130
|
+
let webUnavailableReason = "";
|
|
131
|
+
/** Test seam: forget any open circuit. */
|
|
132
|
+
export const resetWebResearchBackoff = () => {
|
|
133
|
+
webUnavailableUntilMs = 0;
|
|
134
|
+
webUnavailableReason = "";
|
|
135
|
+
};
|
|
136
|
+
const retryAfterMsFrom = (error) => {
|
|
137
|
+
const details = isRecord(error) && isRecord(error.details) ? error.details : undefined;
|
|
138
|
+
const raw = details?.retry_after_ms ??
|
|
139
|
+
details?.retryAfterMs ??
|
|
140
|
+
details?.["retry-after"] ??
|
|
141
|
+
details?.retryAfter;
|
|
142
|
+
if (typeof raw === "number" && Number.isFinite(raw) && raw > 0) {
|
|
143
|
+
// Seconds or milliseconds, depending on who wrote it.
|
|
144
|
+
return raw < 10000 ? raw * 1000 : raw;
|
|
145
|
+
}
|
|
146
|
+
if (typeof raw === "string") {
|
|
147
|
+
const seconds = Number(raw.trim());
|
|
148
|
+
if (Number.isFinite(seconds) && seconds > 0)
|
|
149
|
+
return seconds * 1000;
|
|
150
|
+
}
|
|
151
|
+
return undefined;
|
|
152
|
+
};
|
|
153
|
+
const isWebQuotaRefusal = (error) => {
|
|
154
|
+
const status = isRecord(error) && typeof error.status === "number" ? error.status : undefined;
|
|
155
|
+
return status !== undefined && WEB_QUOTA_STATUSES.has(status);
|
|
156
|
+
};
|
|
157
|
+
const noteWebRefusal = (error) => {
|
|
158
|
+
const backoff = Math.min(retryAfterMsFrom(error) ?? DEFAULT_WEB_BACKOFF_MS, MAX_WEB_BACKOFF_MS);
|
|
159
|
+
webUnavailableUntilMs = Date.now() + backoff;
|
|
160
|
+
const status = isRecord(error) && typeof error.status === "number" ? error.status : "unknown";
|
|
161
|
+
webUnavailableReason = `provider returned ${status}; not retrying for ${Math.round(backoff / 60000)}m`;
|
|
162
|
+
};
|
|
163
|
+
const webResearchBlocked = () => Date.now() < webUnavailableUntilMs ? webUnavailableReason : undefined;
|
|
110
164
|
/** Pages to keep from a web research call, and how much of each. */
|
|
111
165
|
const MAX_WEB_PAGES = 6;
|
|
112
166
|
const MAX_WEB_PAGE_CHARS = 6000;
|
|
@@ -275,16 +329,20 @@ const docdexToolDefinitions = (client, options) => [
|
|
|
275
329
|
// A judge that fails must not block a search that already succeeded.
|
|
276
330
|
}
|
|
277
331
|
}
|
|
278
|
-
if (!localAnswers) {
|
|
332
|
+
if (!localAnswers && !webResearchBlocked()) {
|
|
279
333
|
try {
|
|
280
334
|
const web = await client.search(query, { limit, forceWeb: true });
|
|
281
335
|
if (hasWebFindings(web)) {
|
|
282
336
|
return toOutput(web);
|
|
283
337
|
}
|
|
284
338
|
}
|
|
285
|
-
catch {
|
|
339
|
+
catch (error) {
|
|
286
340
|
// Web discovery being unavailable must not fail a local search that
|
|
287
|
-
// simply found nothing. Return the local (empty) result instead
|
|
341
|
+
// simply found nothing. Return the local (empty) result instead — and
|
|
342
|
+
// remember a refusal, because every search would otherwise pay to
|
|
343
|
+
// rediscover it.
|
|
344
|
+
if (isWebQuotaRefusal(error))
|
|
345
|
+
noteWebRefusal(error);
|
|
288
346
|
}
|
|
289
347
|
}
|
|
290
348
|
return toOutput(await withQueryCentredSnippets(client, query, local));
|
|
@@ -546,12 +604,28 @@ const docdexToolDefinitions = (client, options) => [
|
|
|
546
604
|
// a central bank's interest rate came back sourced to this repository's
|
|
547
605
|
// own documentation. Anything genuinely local is what `docdex_search` is
|
|
548
606
|
// for; a caller can still ask for the mixed behaviour explicitly.
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
}
|
|
607
|
+
const blocked = webResearchBlocked();
|
|
608
|
+
if (blocked) {
|
|
609
|
+
// Answering "the web is unavailable" costs nothing; asking again costs
|
|
610
|
+
// a request from an allowance that is already spent.
|
|
611
|
+
return toOutput({ query, pages: [], unavailable: blocked });
|
|
612
|
+
}
|
|
613
|
+
let result;
|
|
614
|
+
try {
|
|
615
|
+
result = await client.webResearch(query, {
|
|
616
|
+
forceWeb: forceWeb ?? true,
|
|
617
|
+
skipLocalSearch,
|
|
618
|
+
webLimit,
|
|
619
|
+
noCache,
|
|
620
|
+
});
|
|
621
|
+
}
|
|
622
|
+
catch (error) {
|
|
623
|
+
if (isWebQuotaRefusal(error)) {
|
|
624
|
+
noteWebRefusal(error);
|
|
625
|
+
return toOutput({ query, pages: [], unavailable: webResearchBlocked() });
|
|
626
|
+
}
|
|
627
|
+
throw error;
|
|
628
|
+
}
|
|
555
629
|
// A cache hit returns discovery metadata with no page content at all —
|
|
556
630
|
// no web_context, no hits — so the run sees that a search happened and
|
|
557
631
|
// nothing it can quote. Retrying uncached fetches the pages the cache
|
|
@@ -568,8 +642,12 @@ const docdexToolDefinitions = (client, options) => [
|
|
|
568
642
|
result = fresh;
|
|
569
643
|
}
|
|
570
644
|
}
|
|
571
|
-
catch {
|
|
572
|
-
// Keep the cached response rather than failing a search that worked
|
|
645
|
+
catch (error) {
|
|
646
|
+
// Keep the cached response rather than failing a search that worked —
|
|
647
|
+
// but a refusal is worth remembering, so the next question does not
|
|
648
|
+
// spend another request discovering the same thing.
|
|
649
|
+
if (isWebQuotaRefusal(error))
|
|
650
|
+
noteWebRefusal(error);
|
|
573
651
|
}
|
|
574
652
|
}
|
|
575
653
|
return toOutput(toWebResearchOutput(result));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mcoda/codali",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.119",
|
|
4
4
|
"description": "Standalone tool-runner adapter for mcoda.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@modelcontextprotocol/sdk": "1.30.0",
|
|
38
|
-
"@mcoda/db": "0.1.
|
|
39
|
-
"@mcoda/shared": "0.1.
|
|
38
|
+
"@mcoda/db": "0.1.119",
|
|
39
|
+
"@mcoda/shared": "0.1.119"
|
|
40
40
|
},
|
|
41
41
|
"scripts": {
|
|
42
42
|
"build": "tsc -p tsconfig.json",
|