@burtson-labs/agent-core 1.6.16 → 1.6.18
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/README.md +2 -0
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -1
- package/dist/index.js.map +1 -1
- package/dist/mcp/activation.js +16 -8
- package/dist/mcp/activation.js.map +1 -1
- package/dist/mcp/clientPool.js +40 -22
- package/dist/mcp/clientPool.js.map +1 -1
- package/dist/mcp/server.js +16 -10
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/toolAdapter.js +21 -11
- package/dist/mcp/toolAdapter.js.map +1 -1
- package/dist/providers/deterministic-provider.d.ts +1 -1
- package/dist/providers/deterministic-provider.d.ts.map +1 -1
- package/dist/runtime/AgentRuntime.d.ts +2 -2
- package/dist/runtime/AgentRuntime.d.ts.map +1 -1
- package/dist/security/secretPatterns.js +4 -2
- package/dist/security/secretPatterns.js.map +1 -1
- package/dist/telemetry/otlpExporter.d.ts +69 -0
- package/dist/telemetry/otlpExporter.d.ts.map +1 -0
- package/dist/telemetry/otlpExporter.js +321 -0
- package/dist/telemetry/otlpExporter.js.map +1 -0
- package/dist/tools/ask-user-tool.js +8 -4
- package/dist/tools/ask-user-tool.js.map +1 -1
- package/dist/tools/compactMessages.js +6 -3
- package/dist/tools/compactMessages.js.map +1 -1
- package/dist/tools/core-tools.js +151 -81
- package/dist/tools/core-tools.js.map +1 -1
- package/dist/tools/git-tools.js +22 -11
- package/dist/tools/git-tools.js.map +1 -1
- package/dist/tools/language-adapters.d.ts +1 -1
- package/dist/tools/language-adapters.d.ts.map +1 -1
- package/dist/tools/language-adapters.js +36 -18
- package/dist/tools/language-adapters.js.map +1 -1
- package/dist/tools/loop/finalAnswerNudges.js +12 -6
- package/dist/tools/loop/finalAnswerNudges.js.map +1 -1
- package/dist/tools/loop/goalAnchor.d.ts.map +1 -1
- package/dist/tools/loop/goalAnchor.js +2 -1
- package/dist/tools/loop/goalAnchor.js.map +1 -1
- package/dist/tools/loop/llmStream.js +11 -8
- package/dist/tools/loop/llmStream.js.map +1 -1
- package/dist/tools/loop/loopShared.d.ts +20 -0
- package/dist/tools/loop/loopShared.d.ts.map +1 -0
- package/dist/tools/loop/loopShared.js +105 -0
- package/dist/tools/loop/loopShared.js.map +1 -0
- package/dist/tools/loop/parallelExecute.d.ts +1 -1
- package/dist/tools/loop/parallelExecute.js +2 -1
- package/dist/tools/loop/parallelExecute.js.map +1 -1
- package/dist/tools/loop/singleToolExecute.js +8 -4
- package/dist/tools/loop/singleToolExecute.js.map +1 -1
- package/dist/tools/loop/turnSetup.js +9 -6
- package/dist/tools/loop/turnSetup.js.map +1 -1
- package/dist/tools/ocr.d.ts.map +1 -1
- package/dist/tools/ocr.js +7 -5
- package/dist/tools/ocr.js.map +1 -1
- package/dist/tools/post-edit-checks.js +25 -13
- package/dist/tools/post-edit-checks.js.map +1 -1
- package/dist/tools/skill-loader.d.ts +1 -1
- package/dist/tools/skill-loader.d.ts.map +1 -1
- package/dist/tools/skill-loader.js +14 -7
- package/dist/tools/skill-loader.js.map +1 -1
- package/dist/tools/skill-registry.js +2 -1
- package/dist/tools/skill-registry.js.map +1 -1
- package/dist/tools/skills/mail-search-skill.js +16 -9
- package/dist/tools/skills/mail-search-skill.js.map +1 -1
- package/dist/tools/skills/plan-skill.js +4 -2
- package/dist/tools/skills/plan-skill.js.map +1 -1
- package/dist/tools/skills/semantic-search-skill.js +12 -6
- package/dist/tools/skills/semantic-search-skill.js.map +1 -1
- package/dist/tools/skills/test-gen-skill.js +8 -4
- package/dist/tools/skills/test-gen-skill.js.map +1 -1
- package/dist/tools/tool-registry.d.ts +17 -0
- package/dist/tools/tool-registry.d.ts.map +1 -1
- package/dist/tools/tool-registry.js +110 -30
- package/dist/tools/tool-registry.js.map +1 -1
- package/dist/tools/tool-use-loop.d.ts +16 -8
- package/dist/tools/tool-use-loop.d.ts.map +1 -1
- package/dist/tools/tool-use-loop.js +144 -160
- package/dist/tools/tool-use-loop.js.map +1 -1
- package/dist/tools/tool-use-parser.d.ts +33 -0
- package/dist/tools/tool-use-parser.d.ts.map +1 -1
- package/dist/tools/tool-use-parser.js +105 -28
- package/dist/tools/tool-use-parser.js.map +1 -1
- package/dist/tools/toolAvailabilityDetector.d.ts +0 -24
- package/dist/tools/toolAvailabilityDetector.d.ts.map +1 -1
- package/dist/tools/toolAvailabilityDetector.js +26 -12
- package/dist/tools/toolAvailabilityDetector.js.map +1 -1
- package/dist/tools/unified-patch.js +16 -8
- package/dist/tools/unified-patch.js.map +1 -1
- package/dist/utils/event-emitter.d.ts +1 -1
- package/dist/utils/event-emitter.d.ts.map +1 -1
- package/package.json +20 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language-adapters.js","sourceRoot":"","sources":["../../src/tools/language-adapters.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"language-adapters.js","sourceRoot":"","sources":["../../src/tools/language-adapters.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,15 +37,17 @@ const ANNOUNCE_INTENT_NUDGE_BODY = 'Your response announces an action ("Let me X
|
|
|
37
37
|
'If you have nothing more to investigate, write a complete final answer instead — do not announce future work without doing it.';
|
|
38
38
|
function tryAnnounceIntentNudge(args) {
|
|
39
39
|
const { finalResponse, iteration, emit } = args;
|
|
40
|
-
if (!finalResponse)
|
|
40
|
+
if (!finalResponse) {
|
|
41
41
|
return { fired: false };
|
|
42
|
+
}
|
|
42
43
|
const visible = stripReasoningFences(finalResponse);
|
|
43
44
|
// Cap visible length so legitimate wrap-ups (a model writing a
|
|
44
45
|
// multi-paragraph summary that happens to start with "Let me
|
|
45
46
|
// explain …") aren't caught. The failure mode is a SHORT
|
|
46
47
|
// announcement followed by silence, not a long answer.
|
|
47
|
-
if (!visible || visible.length > 600)
|
|
48
|
+
if (!visible || visible.length > 600) {
|
|
48
49
|
return { fired: false };
|
|
50
|
+
}
|
|
49
51
|
const opener = visible.slice(0, 240).toLowerCase();
|
|
50
52
|
if (!ANNOUNCE_RE.test(opener) && !NARRATE_PROGRESS_RE.test(opener)) {
|
|
51
53
|
return { fired: false };
|
|
@@ -65,16 +67,20 @@ const ASK_USER_NUDGE_BODY = 'You asked the user to choose or approve, but you di
|
|
|
65
67
|
'Do not ask for a decision in plain prose when ask_user is available.';
|
|
66
68
|
function tryAskUserNudge(args) {
|
|
67
69
|
const { finalResponse, iteration, emit, askUserAvailable } = args;
|
|
68
|
-
if (!askUserAvailable || !finalResponse)
|
|
70
|
+
if (!askUserAvailable || !finalResponse) {
|
|
69
71
|
return { fired: false };
|
|
72
|
+
}
|
|
70
73
|
const visibleQ = stripReasoningFences(finalResponse);
|
|
71
|
-
if (!visibleQ)
|
|
74
|
+
if (!visibleQ) {
|
|
72
75
|
return { fired: false };
|
|
73
|
-
|
|
76
|
+
}
|
|
77
|
+
if (!/\?\s*$/.test(visibleQ)) {
|
|
74
78
|
return { fired: false };
|
|
79
|
+
}
|
|
75
80
|
const tail = visibleQ.slice(-320).toLowerCase();
|
|
76
|
-
if (!DECISION_RE.test(tail))
|
|
81
|
+
if (!DECISION_RE.test(tail)) {
|
|
77
82
|
return { fired: false };
|
|
83
|
+
}
|
|
78
84
|
emit('tool_loop:ask_user_nudge', {
|
|
79
85
|
iteration,
|
|
80
86
|
responsePreview: visibleQ.slice(-240)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finalAnswerNudges.js","sourceRoot":"","sources":["../../../src/tools/loop/finalAnswerNudges.ts"],"names":[],"mappings":";;AAwGA,wDAwBC;AAiBD,0CAmBC;AArGD,MAAM,WAAW,GACf,iQAAiQ,CAAC;AAEpQ,kEAAkE;AAClE,mEAAmE;AACnE,sEAAsE;AACtE,+DAA+D;AAC/D,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,gEAAgE;AAChE,uDAAuD;AACvD,kEAAkE;AAClE,iEAAiE;AACjE,kEAAkE;AAClE,sEAAsE;AACtE,kEAAkE;AAClE,qEAAqE;AACrE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CACpC,0CAA0C;IACxC,uBAAuB;IACvB,4IAA4I;IAC5I,iEAAiE;IACjE,wCAAwC;IAC1C,GAAG,CACJ,CAAC;AAEF,SAAS,oBAAoB,CAAC,IAAY;IACxC,OAAO,IAAI;SACR,OAAO,CAAC,oCAAoC,EAAE,EAAE,CAAC;SACjD,OAAO,CAAC,gCAAgC,EAAE,EAAE,CAAC;SAC7C,OAAO,CAAC,gCAAgC,EAAE,EAAE,CAAC;SAC7C,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC;SAChC,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,0BAA0B,GAC9B,0KAA0K;IAC1K,gIAAgI;IAChI,gIAAgI,CAAC;AAEnI,SAAgB,sBAAsB,CAAC,IAA6B;IAClE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IAChD,IAAI,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"finalAnswerNudges.js","sourceRoot":"","sources":["../../../src/tools/loop/finalAnswerNudges.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"goalAnchor.d.ts","sourceRoot":"","sources":["../../../src/tools/loop/goalAnchor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"goalAnchor.d.ts","sourceRoot":"","sources":["../../../src/tools/loop/goalAnchor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;AAEnE,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,MAAM,WAAW,mBAAmB;IAClC,0EAA0E;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB;;6BAEyB;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gEAAgE;IAChE,QAAQ,EAAE,OAAO,CAAC;IAClB,iCAAiC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,8DAA8D;IAC9D,uBAAuB,EAAE,MAAM,CAAC;IAChC;qEACiE;IACjE,iCAAiC,EAAE,OAAO,CAAC;IAC3C,kEAAkE;IAClE,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B;qBACiB;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,8CAA8C;IAC9C,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC;iDAC6C;IAC7C,uBAAuB,EAAE,MAAM,CAAC;IAChC,iDAAiD;IACjD,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,mBAAmB,GAAG,qBAAqB,CAyFxF"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GOAL_ANCHOR_REFIRE_GAP = void 0;
|
|
4
4
|
exports.applyGoalAnchorIfNeeded = applyGoalAnchorIfNeeded;
|
|
5
|
+
const tool_use_parser_1 = require("../tool-use-parser");
|
|
5
6
|
exports.GOAL_ANCHOR_REFIRE_GAP = 4;
|
|
6
7
|
function applyGoalAnchorIfNeeded(args) {
|
|
7
8
|
const { originalGoal, priorUserPromptCount, hitLimit, iteration, lastGoalAnchorIteration, aggressiveCompactionThisIteration, messages, registry, emit } = args;
|
|
@@ -69,7 +70,7 @@ function applyGoalAnchorIfNeeded(args) {
|
|
|
69
70
|
: '';
|
|
70
71
|
messages.push({
|
|
71
72
|
role: 'user',
|
|
72
|
-
content: `${compactionPreamble}## CURRENT GOAL — answer THIS, nothing else:\n\n "${originalGoal.trim()}"\n\nRules:\n - Use what you have gathered to answer the goal above.\n - Do not pivot to a related topic that happens to be salient in recent tool results.${ignoreEarlier}\n - If the available tools cannot finish the goal, own that honestly in your final answer — do NOT redirect to an easier question.`
|
|
73
|
+
content: tool_use_parser_1.AUTOMATED_NUDGE_PREFIX + `${compactionPreamble}## CURRENT GOAL — answer THIS, nothing else:\n\n "${originalGoal.trim()}"\n\nRules:\n - Use what you have gathered to answer the goal above.\n - Do not pivot to a related topic that happens to be salient in recent tool results.${ignoreEarlier}\n - If the available tools cannot finish the goal, own that honestly in your final answer — do NOT redirect to an easier question.`
|
|
73
74
|
});
|
|
74
75
|
return { lastGoalAnchorIteration: iteration, anchored: true };
|
|
75
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"goalAnchor.js","sourceRoot":"","sources":["../../../src/tools/loop/goalAnchor.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"goalAnchor.js","sourceRoot":"","sources":["../../../src/tools/loop/goalAnchor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.streamAndAggregate = streamAndAggregate;
|
|
4
|
-
const
|
|
4
|
+
const loopShared_1 = require("./loopShared");
|
|
5
5
|
/**
|
|
6
6
|
* Stream from the chat function and return the fully aggregated response
|
|
7
7
|
* string. Aborts early if we detect the model is trapped in a self-
|
|
@@ -102,8 +102,9 @@ async function streamAndAggregate(args) {
|
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
104
|
lastEmittedLineLength = lastNewline + 1;
|
|
105
|
-
if (aborted)
|
|
105
|
+
if (aborted) {
|
|
106
106
|
break;
|
|
107
|
+
}
|
|
107
108
|
}
|
|
108
109
|
if (text.length >= nextCheckAt) {
|
|
109
110
|
nextCheckAt = text.length + CHECK_EVERY;
|
|
@@ -116,8 +117,9 @@ async function streamAndAggregate(args) {
|
|
|
116
117
|
.replace(/\d+/g, '#')
|
|
117
118
|
.trim();
|
|
118
119
|
recentFingerprints.push(fingerprint);
|
|
119
|
-
if (recentFingerprints.length > THRESHOLD)
|
|
120
|
+
if (recentFingerprints.length > THRESHOLD) {
|
|
120
121
|
recentFingerprints.shift();
|
|
122
|
+
}
|
|
121
123
|
if (recentFingerprints.length === THRESHOLD &&
|
|
122
124
|
recentFingerprints.every(f => f === fingerprint)) {
|
|
123
125
|
aborted = true;
|
|
@@ -134,7 +136,7 @@ async function streamAndAggregate(args) {
|
|
|
134
136
|
break;
|
|
135
137
|
}
|
|
136
138
|
catch (error) {
|
|
137
|
-
const retryable = (0,
|
|
139
|
+
const retryable = (0, loopShared_1.isRetryableLlmError)(error);
|
|
138
140
|
const safeToReplay = text.length === 0;
|
|
139
141
|
// Original gate was `!tools || tools.length === 0` — i.e. only
|
|
140
142
|
// text-tools turns got the same-channel backoff ladder. Native-tools
|
|
@@ -156,13 +158,14 @@ async function streamAndAggregate(args) {
|
|
|
156
158
|
attempt: transientRetries + 1,
|
|
157
159
|
maxAttempts: MAX_TRANSIENT_RETRIES + 1,
|
|
158
160
|
delayMs,
|
|
159
|
-
reason: (0,
|
|
161
|
+
reason: (0, loopShared_1.summarizeLlmError)(error)
|
|
160
162
|
});
|
|
161
|
-
await (0,
|
|
163
|
+
await (0, loopShared_1.sleep)(delayMs);
|
|
162
164
|
continue;
|
|
163
165
|
}
|
|
164
|
-
if (retryable)
|
|
165
|
-
(0,
|
|
166
|
+
if (retryable) {
|
|
167
|
+
(0, loopShared_1.tagRetryableLlmError)(error);
|
|
168
|
+
}
|
|
166
169
|
throw error;
|
|
167
170
|
}
|
|
168
171
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llmStream.js","sourceRoot":"","sources":["../../../src/tools/loop/llmStream.ts"],"names":[],"mappings":";;AAwEA,gDAmKC;AAjMD,
|
|
1
|
+
{"version":3,"file":"llmStream.js","sourceRoot":"","sources":["../../../src/tools/loop/llmStream.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared, dependency-free primitives used by the tool-use loop and its
|
|
3
|
+
* sub-steps (llmStream, turnSetup, …).
|
|
4
|
+
*
|
|
5
|
+
* These live in a leaf module on purpose. They used to sit in tool-use-loop.ts,
|
|
6
|
+
* but the sub-steps import them while tool-use-loop.ts imports the sub-steps —
|
|
7
|
+
* that back-edge formed an import cycle. esbuild resolves a cycle by wrapping
|
|
8
|
+
* the module in a lazy initializer and exposing its exports through a namespace
|
|
9
|
+
* object, and `bun build --compile` (notably when cross-compiling) could then
|
|
10
|
+
* tree-shake the lazily-initialized `createToolUseLoop` body away, leaving a
|
|
11
|
+
* dangling `(0, ns.createToolUseLoop)` reference that crashed at runtime.
|
|
12
|
+
* Keeping these helpers in a leaf module breaks the cycle. See the regression
|
|
13
|
+
* test in loopShared.test.ts.
|
|
14
|
+
*/
|
|
15
|
+
export declare function sleep(ms: number): Promise<void>;
|
|
16
|
+
export declare function isRetryableLlmError(error: unknown): boolean;
|
|
17
|
+
export declare function tagRetryableLlmError(error: unknown): void;
|
|
18
|
+
export declare function summarizeLlmError(error: unknown): string;
|
|
19
|
+
export declare function isContinuationPrompt(text: string): boolean;
|
|
20
|
+
//# sourceMappingURL=loopShared.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loopShared.d.ts","sourceRoot":"","sources":["../../../src/tools/loop/loopShared.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAYD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAa3D;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAKzD;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAGxD;AA2BD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAe1D"}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Shared, dependency-free primitives used by the tool-use loop and its
|
|
4
|
+
* sub-steps (llmStream, turnSetup, …).
|
|
5
|
+
*
|
|
6
|
+
* These live in a leaf module on purpose. They used to sit in tool-use-loop.ts,
|
|
7
|
+
* but the sub-steps import them while tool-use-loop.ts imports the sub-steps —
|
|
8
|
+
* that back-edge formed an import cycle. esbuild resolves a cycle by wrapping
|
|
9
|
+
* the module in a lazy initializer and exposing its exports through a namespace
|
|
10
|
+
* object, and `bun build --compile` (notably when cross-compiling) could then
|
|
11
|
+
* tree-shake the lazily-initialized `createToolUseLoop` body away, leaving a
|
|
12
|
+
* dangling `(0, ns.createToolUseLoop)` reference that crashed at runtime.
|
|
13
|
+
* Keeping these helpers in a leaf module breaks the cycle. See the regression
|
|
14
|
+
* test in loopShared.test.ts.
|
|
15
|
+
*/
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
exports.sleep = sleep;
|
|
18
|
+
exports.isRetryableLlmError = isRetryableLlmError;
|
|
19
|
+
exports.tagRetryableLlmError = tagRetryableLlmError;
|
|
20
|
+
exports.summarizeLlmError = summarizeLlmError;
|
|
21
|
+
exports.isContinuationPrompt = isContinuationPrompt;
|
|
22
|
+
function sleep(ms) {
|
|
23
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
24
|
+
}
|
|
25
|
+
function getErrorCode(error) {
|
|
26
|
+
return typeof error === 'object' && error !== null && 'code' in error
|
|
27
|
+
? String(error.code ?? '')
|
|
28
|
+
: undefined;
|
|
29
|
+
}
|
|
30
|
+
function getErrorMessage(error) {
|
|
31
|
+
return error instanceof Error ? error.message : String(error);
|
|
32
|
+
}
|
|
33
|
+
function isRetryableLlmError(error) {
|
|
34
|
+
const code = getErrorCode(error);
|
|
35
|
+
if (code === 'USER_ABORT') {
|
|
36
|
+
return false;
|
|
37
|
+
}
|
|
38
|
+
const message = getErrorMessage(error);
|
|
39
|
+
if (/\b429\b|rate limit/i.test(message)) {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
return (code === 'WATCHDOG' ||
|
|
43
|
+
/\b5\d\d\b/.test(message) ||
|
|
44
|
+
/Upstream model request failed/i.test(message) ||
|
|
45
|
+
/ECONNREFUSED|ECONNRESET|ETIMEDOUT|EAI_AGAIN|socket hang up|fetch failed|network error|terminated|UND_ERR/i.test(message));
|
|
46
|
+
}
|
|
47
|
+
function tagRetryableLlmError(error) {
|
|
48
|
+
if (error instanceof Error) {
|
|
49
|
+
const tagged = error;
|
|
50
|
+
if (!tagged.code) {
|
|
51
|
+
tagged.code = 'UPSTREAM_MODEL';
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
function summarizeLlmError(error) {
|
|
56
|
+
const message = getErrorMessage(error).replace(/\s+/g, ' ').trim();
|
|
57
|
+
return message.length > 180 ? `${message.slice(0, 177)}...` : message;
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* Detects "keep going" / "continue" / "yes" style prompts that
|
|
61
|
+
* carry no real goal content. The goal-anchor block uses the most recent
|
|
62
|
+
* user message as the recall text; when that text is "good lets keep
|
|
63
|
+
* going" the anchor degenerates into "remind yourself to keep going",
|
|
64
|
+
* which gives the model nothing to anchor on after 20 iterations of
|
|
65
|
+
* drift. Real on a 60-iteration linter-fix
|
|
66
|
+
* turn: every anchor injection cited "good lets keep going" as the
|
|
67
|
+
* goal. Detector lets callers walk back to a prior substantive prompt
|
|
68
|
+
* instead.
|
|
69
|
+
*
|
|
70
|
+
* Length cap (60 chars) + normalized-phrase match keeps false positives
|
|
71
|
+
* down — a sentence like "keep going on the auth refactor for the
|
|
72
|
+
* user-service" is longer than 60 chars and reads as a real goal, so it
|
|
73
|
+
* stays a goal.
|
|
74
|
+
*/
|
|
75
|
+
const CONTINUATION_PROMPT_PHRASES = new Set([
|
|
76
|
+
'continue', 'keep going', 'go on', 'proceed', 'next', 'more',
|
|
77
|
+
'please continue', 'carry on', 'finish', 'finish it', 'finish up', 'wrap up', 'wrap it up',
|
|
78
|
+
'good', 'great', 'nice', 'cool', 'sweet', 'perfect', 'ok', 'okay', 'k', 'yes', 'y', 'yep', 'yeah', 'ack', 'done',
|
|
79
|
+
"let's continue", 'lets continue', "let's keep going", 'lets keep going',
|
|
80
|
+
'good keep going', 'good lets keep going', "good let's keep going",
|
|
81
|
+
'good continue', 'ok continue', 'okay continue'
|
|
82
|
+
]);
|
|
83
|
+
function isContinuationPrompt(text) {
|
|
84
|
+
const trimmed = text.trim();
|
|
85
|
+
if (trimmed.length === 0 || trimmed.length > 60) {
|
|
86
|
+
return false;
|
|
87
|
+
}
|
|
88
|
+
// Normalize: lowercase, drop non-word/space punctuation, collapse whitespace.
|
|
89
|
+
const norm = trimmed
|
|
90
|
+
.toLowerCase()
|
|
91
|
+
.replace(/[^\w\s']/g, ' ')
|
|
92
|
+
.replace(/\s+/g, ' ')
|
|
93
|
+
.trim();
|
|
94
|
+
if (CONTINUATION_PROMPT_PHRASES.has(norm)) {
|
|
95
|
+
return true;
|
|
96
|
+
}
|
|
97
|
+
// Permit "please <phrase>" and "<phrase> please" wrappings.
|
|
98
|
+
for (const phrase of CONTINUATION_PROMPT_PHRASES) {
|
|
99
|
+
if (norm === `please ${phrase}` || norm === `${phrase} please`) {
|
|
100
|
+
return true;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
return false;
|
|
104
|
+
}
|
|
105
|
+
//# sourceMappingURL=loopShared.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loopShared.js","sourceRoot":"","sources":["../../../src/tools/loop/loopShared.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* Why the serial mode exists: smaller models (4B–12B) generate
|
|
15
15
|
* malformed JSON in the tail of a multi-file emission once their
|
|
16
16
|
* effective output budget is exhausted. on a
|
|
17
|
-
*
|
|
17
|
+
* React/TS build — even a strong model produced a malformed
|
|
18
18
|
* `todo_write` after writing four files of ~7 KB each in one
|
|
19
19
|
* assistant turn. Serialising lets the model react to each result
|
|
20
20
|
* before committing further output, and gives the user one approval
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parallelExecute.js","sourceRoot":"","sources":["../../../src/tools/loop/parallelExecute.ts"],"names":[],"mappings":";;AAsDA,oEAMC;AAED,oDAmCC;AAnDD;;;;;;;GAOG;AACH,SAAgB,4BAA4B,CAAC,EAAoD;IAC/F,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;SACrE,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SACjE,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;AAC9B,CAAC;AAEM,KAAK,UAAU,oBAAoB,CAAC,IAA8B;IACvE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAExG,+DAA+D;IAC/D,8DAA8D;IAC9D,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChE,IAAI,0BAA0B,GAAG,CAAC,CAAC;QACnC,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC3B,0BAA0B,IAAI,4BAA4B,CAAC,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,SAAS,GAAG,kBAAkB,GAAG,iBAAiB,CAAC;QACzD,IAAI,0BAA0B,GAAG,SAAS,EAAE,CAAC;YAC3C,cAAc,GAAG,IAAI,CAAC;YACtB,IAAI,CAAC,4BAA4B,EAAE;gBACjC,SAAS;gBACT,SAAS,EAAE,SAAS,CAAC,MAAM;gBAC3B,eAAe,EAAE,0BAA0B;gBAC3C,YAAY,EAAE,kBAAkB;gBAChC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;gBAChC,MAAM,EAAE,wBAAwB;aACjC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,OAAO,GAAyB,EAAE,CAAC;QACzC,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC3B,IAAI,MAAM,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"parallelExecute.js","sourceRoot":"","sources":["../../../src/tools/loop/parallelExecute.ts"],"names":[],"mappings":";;AAsDA,oEAMC;AAED,oDAmCC;AAnDD;;;;;;;GAOG;AACH,SAAgB,4BAA4B,CAAC,EAAoD;IAC/F,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;SACrE,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SACjE,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;AAC9B,CAAC;AAEM,KAAK,UAAU,oBAAoB,CAAC,IAA8B;IACvE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAExG,+DAA+D;IAC/D,8DAA8D;IAC9D,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChE,IAAI,0BAA0B,GAAG,CAAC,CAAC;QACnC,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC3B,0BAA0B,IAAI,4BAA4B,CAAC,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,SAAS,GAAG,kBAAkB,GAAG,iBAAiB,CAAC;QACzD,IAAI,0BAA0B,GAAG,SAAS,EAAE,CAAC;YAC3C,cAAc,GAAG,IAAI,CAAC;YACtB,IAAI,CAAC,4BAA4B,EAAE;gBACjC,SAAS;gBACT,SAAS,EAAE,SAAS,CAAC,MAAM;gBAC3B,eAAe,EAAE,0BAA0B;gBAC3C,YAAY,EAAE,kBAAkB;gBAChC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;gBAChC,MAAM,EAAE,wBAAwB;aACjC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,OAAO,GAAyB,EAAE,CAAC;QACzC,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC3B,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;gBAAA,MAAM;YAAA,CAAC;YAC7B,OAAO,CAAC,IAAI,CAAC,MAAM,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;AACjD,CAAC"}
|
|
@@ -34,8 +34,9 @@ function createToolDispatcher(deps) {
|
|
|
34
34
|
callKey = `${tc.name}::${JSON.stringify(tc.params).slice(0, 160)}`;
|
|
35
35
|
}
|
|
36
36
|
recentCallKeys.push(callKey);
|
|
37
|
-
if (recentCallKeys.length > repeatLimit)
|
|
37
|
+
if (recentCallKeys.length > repeatLimit) {
|
|
38
38
|
recentCallKeys.shift();
|
|
39
|
+
}
|
|
39
40
|
if (recentCallKeys.length === repeatLimit &&
|
|
40
41
|
recentCallKeys.every((k) => k === callKey)) {
|
|
41
42
|
emit('tool_loop:repeat_breaker', { name: tc.name, key: callKey });
|
|
@@ -86,8 +87,9 @@ function createToolDispatcher(deps) {
|
|
|
86
87
|
// completion detector wave through "I have fixed the bug"
|
|
87
88
|
// claims that are false.
|
|
88
89
|
const normalizeFilePath = (raw) => {
|
|
89
|
-
if (typeof raw !== 'string' || !raw)
|
|
90
|
+
if (typeof raw !== 'string' || !raw) {
|
|
90
91
|
return null;
|
|
92
|
+
}
|
|
91
93
|
// Use basename so `src/App.jsx` and `~/proj/src/App.jsx`
|
|
92
94
|
// collide — the user's goal text typically uses the bare
|
|
93
95
|
// filename so a basename comparison is the most forgiving
|
|
@@ -99,14 +101,16 @@ function createToolDispatcher(deps) {
|
|
|
99
101
|
onEditToolSucceeded();
|
|
100
102
|
const p = tc.params?.path;
|
|
101
103
|
const norm = normalizeFilePath(p);
|
|
102
|
-
if (norm)
|
|
104
|
+
if (norm) {
|
|
103
105
|
filesWrittenThisTurn.add(norm);
|
|
106
|
+
}
|
|
104
107
|
}
|
|
105
108
|
if (tc.name === 'read_file' && !result.isError) {
|
|
106
109
|
const p = tc.params?.path;
|
|
107
110
|
const norm = normalizeFilePath(p);
|
|
108
|
-
if (norm)
|
|
111
|
+
if (norm) {
|
|
109
112
|
filesReadThisTurn.add(norm);
|
|
113
|
+
}
|
|
110
114
|
}
|
|
111
115
|
// Include a short output snippet in the event — critical for
|
|
112
116
|
// downstream observers (eval runner, turn log) to know WHY
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleToolExecute.js","sourceRoot":"","sources":["../../../src/tools/loop/singleToolExecute.ts"],"names":[],"mappings":";;AA+DA,oDA4IC;AA1KD,wDAAmE;AA8BnE,SAAgB,oBAAoB,CAAC,IAAsB;IACzD,MAAM,EACJ,QAAQ,EACR,GAAG,EACH,iBAAiB,EACjB,IAAI,EACJ,cAAc,EACd,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,cAAc,EACd,mBAAmB,EACpB,GAAG,IAAI,CAAC;IAET,OAAO,KAAK,UAAU,WAAW,CAAC,EAAkB;QAClD,kEAAkE;QAClE,iFAAiF;QACjF,+DAA+D;QAC/D,+DAA+D;QAC/D,6DAA6D;QAC7D,4GAA4G;QAC5G,iEAAiE;QACjE,oCAAoC;QACpC,MAAM,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;QACvE,MAAM,UAAU,GAAG,EAAE,CAAC,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC,IAAI,KAAK,eAAe,IAAI,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC;QACvG,IAAI,OAAe,CAAC;QACpB,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;YAC1B,sDAAsD;YACtD,sDAAsD;YACtD,4DAA4D;YAC5D,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;YAC9J,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACxC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC3C,CAAC;YACD,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QACxD,CAAC;aAAM,IAAI,OAAO,EAAE,CAAC;YACnB,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;QACrE,CAAC;QACD,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,cAAc,CAAC,MAAM,GAAG,WAAW;
|
|
1
|
+
{"version":3,"file":"singleToolExecute.js","sourceRoot":"","sources":["../../../src/tools/loop/singleToolExecute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resolveTurnGoal = resolveTurnGoal;
|
|
4
|
-
const
|
|
4
|
+
const loopShared_1 = require("./loopShared");
|
|
5
5
|
/**
|
|
6
6
|
* Resolve the per-turn goal anchor from the seed message history.
|
|
7
7
|
*
|
|
@@ -24,20 +24,23 @@ function resolveTurnGoal(args) {
|
|
|
24
24
|
let priorUserPromptCount = 0;
|
|
25
25
|
for (const msg of seedMessages) {
|
|
26
26
|
if (msg.role === 'user' && typeof msg.content === 'string' && msg.content.trim()) {
|
|
27
|
-
if (originalGoal)
|
|
27
|
+
if (originalGoal) {
|
|
28
28
|
priorUserPromptCount++;
|
|
29
|
+
}
|
|
29
30
|
originalGoal = msg.content;
|
|
30
31
|
}
|
|
31
32
|
}
|
|
32
|
-
if (originalGoal && (0,
|
|
33
|
+
if (originalGoal && (0, loopShared_1.isContinuationPrompt)(originalGoal)) {
|
|
33
34
|
for (let i = seedMessages.length - 1; i >= 0; i--) {
|
|
34
35
|
const m = seedMessages[i];
|
|
35
|
-
if (m.role !== 'user' || typeof m.content !== 'string')
|
|
36
|
+
if (m.role !== 'user' || typeof m.content !== 'string') {
|
|
36
37
|
continue;
|
|
38
|
+
}
|
|
37
39
|
const c = m.content.trim();
|
|
38
|
-
if (!c)
|
|
40
|
+
if (!c) {
|
|
39
41
|
continue;
|
|
40
|
-
|
|
42
|
+
}
|
|
43
|
+
if (!(0, loopShared_1.isContinuationPrompt)(c)) {
|
|
41
44
|
originalGoal = m.content;
|
|
42
45
|
break;
|
|
43
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turnSetup.js","sourceRoot":"","sources":["../../../src/tools/loop/turnSetup.ts"],"names":[],"mappings":";;AA6CA,0CAuBC;AA1DD,
|
|
1
|
+
{"version":3,"file":"turnSetup.js","sourceRoot":"","sources":["../../../src/tools/loop/turnSetup.ts"],"names":[],"mappings":";;AA6CA,0CAuBC;AA1DD,6CAAoD;AAmBpD;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,eAAe,CAAC,IAAyB;IACvD,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAC9B,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,oBAAoB,GAAG,CAAC,CAAC;IAC7B,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YACjF,IAAI,YAAY,EAAE,CAAC;gBAAA,oBAAoB,EAAE,CAAC;YAAA,CAAC;YAC3C,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC;QAC7B,CAAC;IACH,CAAC;IACD,IAAI,YAAY,IAAI,IAAA,iCAAoB,EAAC,YAAY,CAAC,EAAE,CAAC;QACvD,KAAK,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAClD,MAAM,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAAA,SAAS;YAAA,CAAC;YACnE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAC3B,IAAI,CAAC,CAAC,EAAE,CAAC;gBAAA,SAAS;YAAA,CAAC;YACnB,IAAI,CAAC,IAAA,iCAAoB,EAAC,CAAC,CAAC,EAAE,CAAC;gBAC7B,YAAY,GAAG,CAAC,CAAC,OAAO,CAAC;gBACzB,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC;AAChD,CAAC"}
|
package/dist/tools/ocr.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ocr.d.ts","sourceRoot":"","sources":["../../src/tools/ocr.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAOH,MAAM,WAAW,SAAS;IACxB,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,2DAA2D;IAC3D,MAAM,EAAE,cAAc,GAAG,WAAW,GAAG,aAAa,GAAG,MAAM,CAAC;IAC9D,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB;4EACwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AASD,wBAAgB,qBAAqB,IAAI;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAM9E;AAWD;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAyBlG;
|
|
1
|
+
{"version":3,"file":"ocr.d.ts","sourceRoot":"","sources":["../../src/tools/ocr.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAOH,MAAM,WAAW,SAAS;IACxB,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,2DAA2D;IAC3D,MAAM,EAAE,cAAc,GAAG,WAAW,GAAG,aAAa,GAAG,MAAM,CAAC;IAC9D,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB;4EACwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AASD,wBAAgB,qBAAqB,IAAI;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAM9E;AAWD;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAyBlG;AAuGD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAS1D"}
|
package/dist/tools/ocr.js
CHANGED
|
@@ -69,8 +69,9 @@ const path = __importStar(require("path"));
|
|
|
69
69
|
*/
|
|
70
70
|
let cachedAvailability = null;
|
|
71
71
|
function detectOcrAvailability() {
|
|
72
|
-
if (cachedAvailability)
|
|
72
|
+
if (cachedAvailability) {
|
|
73
73
|
return cachedAvailability;
|
|
74
|
+
}
|
|
74
75
|
const apple = process.platform === 'darwin' && hasBinary('swift');
|
|
75
76
|
const tesseract = hasBinary('tesseract');
|
|
76
77
|
cachedAvailability = { apple, tesseract };
|
|
@@ -171,13 +172,12 @@ function runAppleVision(imagePath, timeoutMs) {
|
|
|
171
172
|
}
|
|
172
173
|
const child = cp.spawn('swift', [cachedScriptPath, imagePath], { stdio: ['ignore', 'pipe', 'pipe'] });
|
|
173
174
|
let stdout = '';
|
|
174
|
-
let stderr = '';
|
|
175
175
|
const timer = setTimeout(() => { try {
|
|
176
176
|
child.kill('SIGTERM');
|
|
177
177
|
}
|
|
178
178
|
catch { /* already gone */ } }, timeoutMs);
|
|
179
179
|
child.stdout.on('data', (d) => { stdout += d.toString(); });
|
|
180
|
-
child.stderr.on('data', (
|
|
180
|
+
child.stderr.on('data', () => { });
|
|
181
181
|
child.on('close', (code) => {
|
|
182
182
|
clearTimeout(timer);
|
|
183
183
|
if (code !== 0) {
|
|
@@ -224,11 +224,13 @@ function runTesseract(imagePath, timeoutMs) {
|
|
|
224
224
|
* runs once per image.
|
|
225
225
|
*/
|
|
226
226
|
function ocrYieldedUsefulText(text) {
|
|
227
|
-
if (!text)
|
|
227
|
+
if (!text) {
|
|
228
228
|
return false;
|
|
229
|
+
}
|
|
229
230
|
const trimmed = text.trim();
|
|
230
|
-
if (trimmed.length < 30)
|
|
231
|
+
if (trimmed.length < 30) {
|
|
231
232
|
return false;
|
|
233
|
+
}
|
|
232
234
|
// Printable-ratio sanity check — if the "text" is mostly gibberish
|
|
233
235
|
// tokens (photo, diagram, blurry UI) the ratio of word chars to
|
|
234
236
|
// length drops below ~50%. Cheap and effective.
|
package/dist/tools/ocr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ocr.js","sourceRoot":"","sources":["../../src/tools/ocr.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BH,sDAMC;AAgBD,4CAyBC;
|
|
1
|
+
{"version":3,"file":"ocr.js","sourceRoot":"","sources":["../../src/tools/ocr.ts"],"names":[],"mappings":"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"}
|