npm - @vedangiitb/qwintly-core - Versions diffs - 1.4.12 → 1.4.13 - Mend

@vedangiitb/qwintly-core 1.4.12 → 1.4.13

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 (142) hide show

package/dist/ai/toolLoop/toolLoopContext.js CHANGED Viewed

@@ -1,25 +1,10 @@
-import crypto from "node:crypto";
+import { extractPatchFiles, sha256Hex } from "./helpers/fsHelpers.js";
 export const DEFAULT_CONTEXT_POLICY = {
     readFileDefaultMaxLines: 200,
     tailMessages: 8,
     maxModelChars: 120000,
     logApproxModelChars: false,
 };
-const sha256Hex = (value) => crypto.createHash("sha256").update(value, "utf8").digest("hex");
-const extractPatchFiles = (patchString) => {
-    const lines = patchString.replace(/\r\n/g, "\n").split("\n");
-    const files = new Set();
-    for (const line of lines) {
-        const match = /^\*\*\* (Update File|Add File|Delete File):\s+(.+)$/.exec(line) ??
-            /^\*\*\* Move to:\s+(.+)$/.exec(line);
-        if (!match)
-            continue;
-        const filePath = (match[2] ?? match[1] ?? "").trim();
-        if (filePath)
-            files.add(filePath);
-    }
-    return [...files];
-};
 export const redactFunctionCallArgs = (name, args) => {
     if (name !== "apply_patch")
         return args;
@@ -27,7 +12,12 @@ export const redactFunctionCallArgs = (name, args) => {
     if (!patch) {
         return {
             ...args,
-            patch_string: { omitted: true, chars: 0, sha256: sha256Hex(""), files: [] },
+            patch_string: {
+                omitted: true,
+                chars: 0,
+                sha256: sha256Hex(""),
+                files: [],
+            },
         };
     }
     return {
@@ -76,37 +66,4 @@ export const compactForModel = (input) => {
     }
     return compacted;
 };
-export const normalizeReadFileArgs = (args, maxLines) => {
-    const requestedStart = args.start_line === undefined || args.start_line === null
-        ? 1
-        : Number(args.start_line);
-    const requestedEnd = args.end_line === undefined || args.end_line === null
-        ? undefined
-        : Number(args.end_line);
-    const start = Number.isFinite(requestedStart) && requestedStart > 0 ? requestedStart : 1;
-    const cap = Math.max(1, Math.floor(maxLines));
-    const desiredEnd = requestedEnd === undefined ||
-        !Number.isFinite(requestedEnd) ||
-        requestedEnd < start
-        ? start + cap - 1
-        : requestedEnd;
-    const cappedEnd = Math.min(desiredEnd, start + cap - 1);
-    const wasCapped = requestedEnd === undefined ||
-        desiredEnd !== requestedEnd ||
-        cappedEnd !== desiredEnd;
-    return {
-        effectiveArgs: { ...args, start_line: start, end_line: cappedEnd },
-        start,
-        end: cappedEnd,
-        wasCapped,
-    };
-};
-export const getApplyPatchEventMeta = (args) => {
-    const patch = typeof args.patch_string === "string" ? args.patch_string : "";
-    return {
-        chars: patch.length,
-        sha256: sha256Hex(patch),
-        files: extractPatchFiles(patch),
-    };
-};
 //# sourceMappingURL=toolLoopContext.js.map

package/dist/ai/toolLoop/toolLoopContext.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"toolLoopContext.js","sourceRoot":"","sources":["../../../src/ai/toolLoop/toolLoopContext.ts"],"names":[],"mappings":"AAAA,OAAO,~~MAAM~~,MAAM,~~aAAa~~,CAAC;~~AAcjC~~,MAAM,CAAC,MAAM,sBAAsB,GAAoC;IACrE,uBAAuB,EAAE,GAAG;IAC5B,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,MAAO;IACtB,mBAAmB,EAAE,KAAK;CAC3B,CAAC;AAEF,MAAM,~~SAAS,GAAG,~~CAAC,~~KAAa,EAAE,EAAE,CAClC,~~MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAElE,MAAM,iBAAiB,GAAG,CAAC,WAAmB,EAAY,EAAE;IAC1D,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAEhC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GACT,qDAAqD,CAAC,IAAI,CAAC,IAAI,CAAC;YAChE,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExC,IAAI,CAAC,KAAK;YAAE,SAAS;QAErB,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACrD,IAAI,QAAQ;YAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAY,EACZ,IAA6B,EAC7B,EAAE;IACF,IAAI,IAAI,KAAK,aAAa;QAAE,OAAO,IAAI,CAAC;IAExC,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7E,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO;YACL,GAAG,IAAI;YACP,YAAY,EAAE,~~EAAE,~~OAAO,EAAE,IAAI,~~EAAE,~~KAAK,EAAE,CAAC,~~EAAE,~~MAAM,EAAE,SAAS,CAAC,EAAE,CAAC,~~EAAE,~~KAAK,EAAE,EAAE~~,EAAE~~;~~SAC5E~~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","sourcesContent":["import ~~crypto~~ from \"~~node:crypto~~\";\n\nexport type ToolEvent = {\n name: string;\n summary: string;\n};\n\nexport type ToolLoopContextPolicy = {\n readFileDefaultMaxLines?: number;\n tailMessages?: number;\n maxModelChars?: number;\n logApproxModelChars?: boolean;\n};\n\nexport const DEFAULT_CONTEXT_POLICY: Required<ToolLoopContextPolicy> = {\n readFileDefaultMaxLines: 200,\n tailMessages: 8,\n maxModelChars: 120_000,\n logApproxModelChars: false,\n};\n\nconst sha256Hex = (value: string) =>\n crypto.createHash(\"sha256\").update(value, \"utf8\").digest(\"hex\");\n\nconst extractPatchFiles = (patchString: string): string[] => {\n const lines = patchString.replace(/\\r\\n/g, \"\\n\").split(\"\\n\");\n const files = new Set<string>();\n\n for (const line of lines) {\n const match =\n /^\\\\\\* (Update File\|Add File\|Delete File):\\s+(.+)$/.exec(line) ??\n /^\\\\\\* Move to:\\s+(.+)$/.exec(line);\n\n if (!match) continue;\n\n const filePath = (match[2] ?? match[1] ?? \"\").trim();\n if (filePath) files.add(filePath);\n }\n\n return [...files];\n};\n\nexport const redactFunctionCallArgs = (\n name: string,\n args: Record<string, unknown>,\n) => {\n if (name !== \"apply_patch\") return args;\n\n const patch = typeof args.patch_string === \"string\" ? args.patch_string : \"\";\n if (!patch) {\n return {\n ...args,\n patch_string: { omitted: true, chars: 0, sha256: sha256Hex(\"\"), files: [] },\n };\n }\n\n return {\n ...args,\n patch_string: {\n omitted: true,\n chars: patch.length,\n sha256: sha256Hex(patch),\n files: extractPatchFiles(patch),\n },\n };\n};\n\nconst isMemoryMessage = (item: any) => {\n const text = item?.parts?.[0]?.text;\n return (\n item?.role === \"model\" &&\n typeof text === \"string\" &&\n text.startsWith(\"MEMORY (tool trace summary):\")\n );\n};\n\nconst buildMemoryText = (events: ToolEvent[]) => {\n if (events.length === 0) return \"\";\n const lines = events.map((e) => `- ${e.summary}`);\n return `MEMORY (tool trace summary):\\n${lines.join(\"\\n\")}`;\n};\n\nexport const compactForModel = (input: {\n initialCount: number;\n modelContents: any[];\n toolEvents: ToolEvent[];\n policy: Required<ToolLoopContextPolicy>;\n}) => {\n const { initialCount, modelContents, toolEvents, policy } = input;\n\n const withoutOldMemory = modelContents.filter((c) => !isMemoryMessage(c));\n const tailStart = Math.max(\n initialCount,\n withoutOldMemory.length - policy.tailMessages,\n );\n\n const initial = withoutOldMemory.slice(0, initialCount);\n const tail = withoutOldMemory.slice(tailStart);\n const memoryText = buildMemoryText(toolEvents);\n const memory = memoryText\n ? [{ role: \"model\", parts: [{ text: memoryText }] }]\n : [];\n\n let compacted = [...initial, ...memory, ...tail];\n\n const maxChars = Math.max(10_000, policy.maxModelChars);\n while (JSON.stringify(compacted).length > maxChars) {\n const minLen = initial.length + memory.length + 1;\n if (compacted.length <= minLen) break;\n compacted = [\n ...initial,\n ...memory,\n ...compacted.slice(initial.length + memory.length + 1),\n ];\n }\n\n return compacted;\n};\n\nexport const normalizeReadFileArgs = (\n args: Record<string, unknown>,\n maxLines: number,\n) => {\n const requestedStart =\n args.start_line === undefined \|\| args.start_line === null\n ? 1\n : Number(args.start_line);\n\n const requestedEnd =\n args.end_line === undefined \|\| args.end_line === null\n ? undefined\n : Number(args.end_line);\n\n const start =\n Number.isFinite(requestedStart) && requestedStart > 0 ? requestedStart : 1;\n const cap = Math.max(1, Math.floor(maxLines));\n\n const desiredEnd =\n requestedEnd === undefined \|\|\n !Number.isFinite(requestedEnd) \|\|\n requestedEnd < start\n ? start + cap - 1\n : requestedEnd;\n\n const cappedEnd = Math.min(desiredEnd, start + cap - 1);\n const wasCapped =\n requestedEnd === undefined \|\|\n desiredEnd !== requestedEnd \|\|\n cappedEnd !== desiredEnd;\n\n return {\n effectiveArgs: { ...args, start_line: start, end_line: cappedEnd },\n start,\n end: cappedEnd,\n wasCapped,\n };\n};\n\nexport const getApplyPatchEventMeta = (args: Record<string, unknown>) => {\n const patch = typeof args.patch_string === \"~~string\" ? args.patch_string : \"\";\n return {\n chars: patch.length,\n sha256: sha256Hex(patch),\n files: extractPatchFiles(patch),\n };\n};\n\n"~~]}
1	+ {"version":3,"file":"toolLoopContext.js","sourceRoot":"","sources":["../../../src/ai/toolLoop/toolLoopContext.ts"],"names":[],"mappings":"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","sourcesContent":["import { extractPatchFiles, sha256Hex } from \"./helpers/fsHelpers.js\";\n\nexport type ToolEvent = {\n name: string;\n summary: string;\n};\n\nexport type ToolLoopContextPolicy = {\n readFileDefaultMaxLines?: number;\n tailMessages?: number;\n maxModelChars?: number;\n logApproxModelChars?: boolean;\n};\n\nexport const DEFAULT_CONTEXT_POLICY: Required<ToolLoopContextPolicy> = {\n readFileDefaultMaxLines: 200,\n tailMessages: 8,\n maxModelChars: 120_000,\n logApproxModelChars: false,\n};\n\nexport const redactFunctionCallArgs = (\n name: string,\n args: Record<string, unknown>,\n) => {\n if (name !== \"apply_patch\") return args;\n\n const patch = typeof args.patch_string === \"string\" ? args.patch_string : \"\";\n if (!patch) {\n return {\n ...args,\n patch_string: {\n omitted: true,\n chars: 0,\n sha256: sha256Hex(\"\"),\n files: [],\n },\n };\n }\n\n return {\n ...args,\n patch_string: {\n omitted: true,\n chars: patch.length,\n sha256: sha256Hex(patch),\n files: extractPatchFiles(patch),\n },\n };\n};\n\nconst isMemoryMessage = (item: any) => {\n const text = item?.parts?.[0]?.text;\n return (\n item?.role === \"model\" &&\n typeof text === \"string\" &&\n text.startsWith(\"MEMORY (tool trace summary):\")\n );\n};\n\nconst buildMemoryText = (events: ToolEvent[]) => {\n if (events.length === 0) return \"\";\n const lines = events.map((e) => `- ${e.summary}`);\n return `MEMORY (tool trace summary):\\n${lines.join(\"\\n\")}`;\n};\n\nexport const compactForModel = (input: {\n initialCount: number;\n modelContents: any[];\n toolEvents: ToolEvent[];\n policy: Required<ToolLoopContextPolicy>;\n}) => {\n const { initialCount, modelContents, toolEvents, policy } = input;\n\n const withoutOldMemory = modelContents.filter((c) => !isMemoryMessage(c));\n const tailStart = Math.max(\n initialCount,\n withoutOldMemory.length - policy.tailMessages,\n );\n\n const initial = withoutOldMemory.slice(0, initialCount);\n const tail = withoutOldMemory.slice(tailStart);\n const memoryText = buildMemoryText(toolEvents);\n const memory = memoryText\n ? [{ role: \"model\", parts: [{ text: memoryText }] }]\n : [];\n\n let compacted = [...initial, ...memory, ...tail];\n\n const maxChars = Math.max(10_000, policy.maxModelChars);\n while (JSON.stringify(compacted).length > maxChars) {\n const minLen = initial.length + memory.length + 1;\n if (compacted.length <= minLen) break;\n compacted = [\n ...initial,\n ...memory,\n ...compacted.slice(initial.length + memory.length + 1),\n ];\n }\n\n return compacted;\n};\n"]}

package/dist/ai/toolLoop/toolLoopRunner.d.ts CHANGED Viewed

@@ -23,6 +23,11 @@ export type AiCallFn = (request: unknown, options: {
     model?: string;
     toolCallingMode?: FunctionCallingConfigMode;
 }) => Promise<AiCallResponse>;
+export type TokenPersistence = {
+    repository: Pick<GenTokensRepository, "persistGenTokens">;
+    sessionId: string;
+    model: string;
+};
 export type RunToolLoopOptions = {
     initialContents: any[];
     tools: Tool[];
@@ -39,11 +44,7 @@ export type RunToolLoopOptions = {
     aiCallAutoRetryBaseMs?: number;
     aiCallAutoRetryMaxMs?: number;
     persistResponse?: (modelInput: any, modelOutput: any) => Promise<void>;
-    tokenPersistence?: {
-        repository: Pick<GenTokensRepository, "persistGenTokens">;
-        sessionId: string;
-        model: string;
-    };
+    tokenPersistence?: TokenPersistence;
 };
 export declare function runToolLoop(options: RunToolLoopOptions): Promise<ToolLoopResult>;
 //# sourceMappingURL=toolLoopRunner.d.ts.map

package/dist/ai/toolLoop/toolLoopRunner.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"toolLoopRunner.d.ts","sourceRoot":"","sources":["../../../src/ai/toolLoop/toolLoopRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;~~AAEhE~~,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,OAAO,EAAe,SAAS,EAAE,MAAM,uBAAuB,CAAC;~~AAM~~/D,OAAO,~~EAML~~,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;~~AAQ9B~~,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,aAAa,EAAE,GAAG,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC9B,QAAQ,EAAE,OAAO,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,CACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,SAAS,EACpB,gBAAgB,CAAC,EAAE,OAAO,KACvB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,CACrB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IACP,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,yBAAyB,CAAC;CAC7C,KACE,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7B,MAAM,MAAM,kBAAkB,GAAG;IAC/B,eAAe,EAAE,GAAG,EAAE,CAAC;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,gBAAgB,CAAC,EAAE~~;QACjB~~,~~UAAU~~,~~EAAE,IAAI,~~CAAC~~,mBAAmB,EAAE,kBAAkB,CAAC,CAAC~~;~~QAC1D~~,~~SAAS,EAAE,MAAM,~~CAAC;~~QAClB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;~~AAEF,wBAAsB,WAAW,CAC/B,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,cAAc,CAAC,~~CA8nBzB~~"}
1	+ {"version":3,"file":"toolLoopRunner.d.ts","sourceRoot":"","sources":["../../../src/ai/toolLoop/toolLoopRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,OAAO,EAAe,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAmB/D,OAAO,EAKL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAG9B,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,aAAa,EAAE,GAAG,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC9B,QAAQ,EAAE,OAAO,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,CACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,SAAS,EACpB,gBAAgB,CAAC,EAAE,OAAO,KACvB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,CACrB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IACP,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,yBAAyB,CAAC;CAC7C,KACE,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7B,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,IAAI,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,eAAe,EAAE,GAAG,EAAE,CAAC;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAEF,wBAAsB,WAAW,CAC/B,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,cAAc,CAAC,CAsXzB"}

package/dist/ai/toolLoop/toolLoopRunner.js CHANGED Viewed

@@ -1,139 +1,35 @@
 import { FunctionCallingConfigMode } from "@google/genai";
-import fs from "node:fs/promises";
 import { persistToolCall } from "../../services/toolcallPersist.service.js";
 import { EVENT_TYPES } from "../../types/events.js";
 import { STYLE_TOKEN_KEYS } from "../../types/styleConfig.js";
-import { getAvailableRoutes } from "../tools/helpers/pageConfigJson.helpers.js";
 import { createWorkspaceToolImpls } from "../tools/implementations/factories.js";
-import { parsePlannerTasksUnknown } from "./plannerTaskParser.js";
-import { compactForModel, DEFAULT_CONTEXT_POLICY, normalizeReadFileArgs, redactFunctionCallArgs, } from "./toolLoopContext.js";
-import { aiCallWithRetry, buildToolStatusMessage, recordToolEvent, serializeError, } from "./toolLoopRunnerUtils.js";
+import { aiCallWithRetry } from "./helpers/aiCall.helper.js";
+import { serializeError } from "./helpers/errors.helper.js";
+import { nodeFs } from "./helpers/fsHelpers.js";
+import { handleApplyPatchFailure } from "./helpers/patchRetry.helper.js";
+import { extractUsageTokenCounts, persistTokensOnce, } from "./helpers/persistTokens.helpers.js";
+import { extractThoughtSignatures } from "./helpers/signatures.helper.js";
+import { normalizeToolArgs } from "./helpers/toolArgs.helper.js";
+import { executeToolHandler, postProcessToolResult, } from "./helpers/toolExecution.helper.js";
+import { createToolHandlers } from "./helpers/toolHandlers.helper.js";
+import { recordToolEvent } from "./toolEventSummary.js";
+import { compactForModel, DEFAULT_CONTEXT_POLICY, redactFunctionCallArgs, } from "./toolLoopContext.js";
+import { buildToolStatusMessage } from "./toolStatusMessage.js";
 export async function runToolLoop(options) {
-    const isPlainObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
     const styleTokenKeySet = new Set(STYLE_TOKEN_KEYS);
     const { initialContents, tools, workspaceRoot, maxSteps = 30, toolCallingMode = FunctionCallingConfigMode.ANY, terminalToolNames = [], keepFullTrace = true, contextPolicy, aiCall, logger, applyPatchAutoRetryMax = 2, aiCallAutoRetryMax = 3, // must have it to try 3 times as gemini errors a lot due to high demand sometimes
     aiCallAutoRetryBaseMs = 400, aiCallAutoRetryMaxMs = 10000, persistResponse, tokenPersistence, } = options;
-    const extractUsageTokenCounts = (rawResponse) => {
-        const usage = rawResponse?.usageMetadata;
-        const promptTokenCount = usage?.promptTokenCount;
-        const candidatesTokenCount = usage?.candidatesTokenCount;
-        const inputTokens = Number(promptTokenCount);
-        const outputTokens = Number(candidatesTokenCount);
-        if (!Number.isFinite(inputTokens) || inputTokens < 0)
-            return null;
-        if (!Number.isFinite(outputTokens) || outputTokens < 0)
-            return null;
-        return { inputTokens, outputTokens };
-    };
     let totalInputTokens = 0;
     let totalOutputTokens = 0;
     let sawAnyTokenUsage = false;
-    const persistTokensOnce = async () => {
-        if (!tokenPersistence)
-            return;
-        if (!sawAnyTokenUsage)
-            return;
-        try {
-            await tokenPersistence.repository.persistGenTokens(tokenPersistence.sessionId, totalInputTokens, totalOutputTokens, tokenPersistence.model);
-        }
-        catch (err) {
-            console.error("Tool loop: failed to persist gen tokens", err);
-        }
-    };
-    const nodeFs = {
-        readFile: async (absolutePath) => fs.readFile(absolutePath, "utf-8"),
-        writeFile: async (absolutePath, content) => fs.writeFile(absolutePath, content ?? "", "utf-8"),
-        mkdirp: async (absoluteDir) => {
-            await fs.mkdir(absoluteDir, { recursive: true });
-        },
-        rmFile: async (absolutePath) => fs.rm(absolutePath, { force: true }),
-        stat: async (absolutePath) => fs.stat(absolutePath),
-        safeReadDir: async (absoluteDir) => fs.readdir(absoluteDir, { withFileTypes: true }),
-    };
     const impls = createWorkspaceToolImpls({
         workspaceRoot,
         fs: nodeFs,
     });
-    const toolHandlers = {
-        read_file: async (args) => {
-            const path = String(args.path ?? "");
-            const startLine = args.start_line === undefined ? undefined : Number(args.start_line);
-            const endLine = args.end_line === undefined ? undefined : Number(args.end_line);
-            const content = await impls.readFileImpl(path, startLine, endLine);
-            return { path, content };
-        },
-        write_file: (args) => impls.writeFileImpl(String(args.path ?? ""), String(args.content ?? "")),
-        list_dir: async (args) => {
-            const content = await impls.listDirImpl(String(args.path ?? ""), Number(args.depth ?? 1));
-            return { content };
-        },
-        search: async (args) => {
-            const results = await impls.searchImpl(String(args.search_query ?? ""));
-            return { results };
-        },
-        apply_patch: (args) => impls.applyPatchImpl(String(args.patch_string ?? "")),
-        update_global_styles: async (args) => {
-            const result = await impls.updateGlobalStylesImpl(args);
-            return result;
-        },
-        create_new_route: async (args) => {
-            const parentRoute = String(args.parent_route ?? "");
-            const routeName = String(args.route_name ?? "");
-            const result = await impls.createNewRouteImpl(parentRoute, routeName);
-            return result;
-        },
-        delete_element: async (args) => {
-            const route = String(args.route ?? "");
-            const element_id = String(args.element_id ?? "");
-            const result = await impls.deleteElementImpl(route, element_id);
-            return result;
-        },
-        insert_element: async (args) => {
-            const result = await impls.insertElementImpl(args);
-            if (!result.success) {
-                const available = await getAvailableRoutes({
-                    workspaceRoot,
-                    fs: nodeFs,
-                });
-                return {
-                    success: false,
-                    error: `insert_element failed: ${result.error}. Available routes are: ${JSON.stringify(available)}. If you intend to create a new route, create it using the 'create_new_route' tool.`,
-                    available_routes: available,
-                };
-            }
-            return result;
-        },
-        update_props: async (args) => {
-            const route = String(args.route ?? "");
-            const element_id = String(args.element_id ?? "");
-            const props = args.props;
-            const result = await impls.updatePropsImpl({
-                route,
-                element_id,
-                ...props,
-            });
-            return result;
-        },
-        update_classname: async (args) => {
-            const route = String(args.route ?? "");
-            const element_id = String(args.element_id ?? "");
-            const class_name = String(args.class_name ?? "");
-            const result = await impls.updateClassNameImpl(route, element_id, class_name);
-            return result;
-        },
-        get_available_routes: async (args) => {
-            const routes = await getAvailableRoutes({ workspaceRoot, fs: nodeFs });
-            return { success: true, routes };
-        },
-        submit_codegen_done: async (args) => ({
-            success: true,
-            summary: String(args.summary ?? "").trim(),
-        }),
-        submit_planner_tasks: async (args) => {
-            const tasks = parsePlannerTasksUnknown(args.planner_tasks);
-            return { success: true, count: tasks.length };
-        },
-    };
+    const toolHandlers = createToolHandlers({
+        impls,
+        workspaceRoot,
+    });
     if (typeof aiCall !== "function") {
         throw new Error("Tool loop: aiCall is required.");
     }
@@ -236,7 +132,7 @@ export async function runToolLoop(options) {
         }
         const functionCalls = response.functionCalls ?? [];
         if (functionCalls.length === 0) {
-            await persistTokensOnce();
+            await persistTokensOnce(tokenPersistence, sawAnyTokenUsage, totalInputTokens, totalOutputTokens);
             return {
                 contents: keepFullTrace ? fullTraceContents : modelContents,
                 modelContents,
@@ -244,28 +140,7 @@ export async function runToolLoop(options) {
                 steps: step + 1,
             };
         }
-        const signatureById = (() => {
-            try {
-                const candidates = Array.isArray(response?.candidates)
-                    ? response.candidates
-                    : [];
-                const parts = candidates?.[0]?.content?.parts;
-                const arr = Array.isArray(parts) ? parts : [];
-                const map = new Map();
-                for (const p of arr) {
-                    const fc = p?.functionCall;
-                    const id = fc?.id;
-                    const sig = p?.thoughtSignature ?? p?.thought_signature;
-                    if (typeof id === "string" && typeof sig === "string" && sig) {
-                        map.set(id, sig);
-                    }
-                }
-                return map;
-            }
-            catch {
-                return new Map();
-            }
-        })();
+        const signatureById = extractThoughtSignatures(response);
         for (let callIndex = 0; callIndex < functionCalls.length; callIndex++) {
             const call = functionCalls[callIndex];
             const name = call.name?.toString() ?? "";
@@ -298,48 +173,10 @@ export async function runToolLoop(options) {
                 continue;
             }
             const handler = toolHandlers[name];
-            const handlerMissingResult = !handler
-                ? {
-                    success: false,
-                    error: `No handler registered for "${name}".`,
-                    error_detail: {
-                        name: "MissingToolHandlerError",
-                        message: `No handler registered for "${name}".`,
-                    },
-                }
-                : null;
-            let effectiveArgs = args;
-            let readFileMeta = null;
-            if (name === "read_file") {
-                const normalized = normalizeReadFileArgs(effectiveArgs, policy.readFileDefaultMaxLines);
-                effectiveArgs = normalized.effectiveArgs;
-                readFileMeta = {
-                    start: normalized.start,
-                    end: normalized.end,
-                    wasCapped: normalized.wasCapped,
-                };
-            }
-            if (name === "update_global_styles") {
-                const tokensMaybe = effectiveArgs?.tokens;
-                const normalized = {};
-                if (isPlainObject(tokensMaybe)) {
-                    for (const [k, v] of Object.entries(tokensMaybe)) {
-                        if (!styleTokenKeySet.has(k))
-                            continue;
-                        if (typeof v !== "string")
-                            continue;
-                        normalized[k] = v;
-                    }
-                }
-                for (const [k, v] of Object.entries(effectiveArgs ?? {})) {
-                    if (!styleTokenKeySet.has(k))
-                        continue;
-                    if (typeof v !== "string")
-                        continue;
-                    normalized[k] = v;
-                }
-                effectiveArgs = normalized;
-            }
+            const { effectiveArgs, readFileMeta } = normalizeToolArgs(name, args, {
+                readFileDefaultMaxLines: policy.readFileDefaultMaxLines,
+                styleTokenKeySet,
+            });
             logger(buildToolStatusMessage(name, effectiveArgs, readFileMeta), EVENT_TYPES.STEP_STARTED, true);
             const modelArgs = redactFunctionCallArgs(name, effectiveArgs);
             const functionCallPart = {
@@ -388,75 +225,21 @@ export async function runToolLoop(options) {
             else {
                 pushModelOnly(assistantModel);
             }
-            let toolResultRaw;
-            if (handlerMissingResult) {
-                toolResultRaw = handlerMissingResult;
-            }
-            else {
-                try {
-                    if (name === "update_global_styles") {
-                        const flatKeys = Object.keys(effectiveArgs ?? {}).filter((k) => styleTokenKeySet.has(k));
-                        if (flatKeys.length === 0) {
-                            toolResultRaw = {
-                                success: false,
-                                error: "must include at least one token key/value",
-                                error_detail: {
-                                    name: "InvalidToolArgumentsError",
-                                    message: 'update_global_styles requires at least one token key/value (e.g. { radius: "0.75rem" }).',
-                                },
-                                note: "Resend update_global_styles with at least one token key/value, or skip this tool call.",
-                            };
-                        }
-                        else {
-                            toolResultRaw = await handler(effectiveArgs);
-                        }
-                    }
-                    else {
-                        toolResultRaw = await handler(effectiveArgs);
-                    }
-                }
-                catch (err) {
-                    logger(`AI tool: ${name} failed`, EVENT_TYPES.STEP_ERROR, true);
-                    console.error("Tool loop: handler threw", err, {
-                        tool: name,
-                        step: step + 1,
-                    });
-                    toolResultRaw = {
-                        success: false,
-                        error: err instanceof Error ? err.message : String(err),
-                        error_detail: serializeError(err),
-                        note: "Tool handler threw. Inspect error_detail and retry with corrected args or a different approach.",
-                    };
-                }
-            }
-            let toolResult = toolResultRaw;
-            if (name === "read_file" && readFileMeta) {
-                const path = String(effectiveArgs.path ?? "");
-                const jsonPayload = toolResultRaw?.kind === "json"
-                    ? toolResultRaw?.json
-                    : undefined;
-                if (jsonPayload !== undefined) {
-                    // Token-efficient: return JSON as structured data (no double-stringifying).
-                    toolResult = { path, json: jsonPayload };
-                }
-                else {
-                    const rawContent = typeof toolResultRaw?.content === "string"
-                        ? String(toolResultRaw.content)
-                        : typeof toolResultRaw === "string"
-                            ? toolResultRaw
-                            : JSON.stringify(toolResultRaw ?? null);
-                    toolResult = {
-                        path,
-                        start_line: readFileMeta.start,
-                        end_line: readFileMeta.end,
-                        truncated: readFileMeta.wasCapped,
-                        content: rawContent,
-                        note: readFileMeta.wasCapped
-                            ? `Capped to ${policy.readFileDefaultMaxLines} lines. Request more with start_line/end_line.`
-                            : undefined,
-                    };
-                }
-            }
+            const toolResultRaw = await executeToolHandler({
+                name,
+                handler,
+                effectiveArgs,
+                styleTokenKeySet,
+                step: step + 1,
+                logger,
+            });
+            const toolResult = postProcessToolResult({
+                name,
+                toolResultRaw,
+                effectiveArgs,
+                readFileMeta,
+                readFileDefaultMaxLines: policy.readFileDefaultMaxLines,
+            });
             try {
                 await persistToolCall(name, modelArgs, toolResult);
             }
@@ -485,31 +268,15 @@ export async function runToolLoop(options) {
                 toolResult?.success === false &&
                 applyPatchAutoRetryMax > 0 &&
                 applyPatchRetryCount < applyPatchAutoRetryMax) {
-                applyPatchRetryCount += 1;
-                const error = String(toolResult?.error ?? "unknown error");
-                const debugFiles = Array.isArray(toolResult?.debug?.files)
-                    ? toolResult.debug.files
-                    : [];
-                const debugText = debugFiles.length > 0
-                    ? `\n\nFILE SNAPSHOTS (for regenerating the patch):\n${debugFiles
-                        .slice(0, 3)
-                        .map((f) => `--- ${String(f.path ?? "")} ---\n${String(f.head ?? "")}\n--- end ---`)
-                        .join("\n\n")}`
-                    : "";
-                const retryInstruction = {
-                    role: "user",
-                    parts: [
-                        {
-                            text: `apply_patch failed (attempt ${applyPatchRetryCount}/${applyPatchAutoRetryMax}): ${error}\n` +
-                                `Regenerate a patch that matches the current file contents. ` +
-                                `For large rewrites, prefer write_file(path, content) or Delete+Add instead of Update.` +
-                                debugText,
-                        },
-                    ],
-                };
-                if (keepFullTrace)
-                    fullTraceContents.push(retryInstruction);
-                modelContents.push(retryInstruction);
+                const failureResult = handleApplyPatchFailure({
+                    toolResult,
+                    applyPatchAutoRetryMax,
+                    applyPatchRetryCount,
+                    keepFullTrace,
+                    fullTraceContents,
+                    modelContents,
+                });
+                applyPatchRetryCount = failureResult.applyPatchRetryCount;
             }
             recordToolEvent({
                 toolEvents,
@@ -521,7 +288,7 @@ export async function runToolLoop(options) {
                 toolResultRaw,
             });
             if (terminalToolNames.includes(name)) {
-                await persistTokensOnce();
+                await persistTokensOnce(tokenPersistence, sawAnyTokenUsage, totalInputTokens, totalOutputTokens);
                 return {
                     contents: keepFullTrace ? fullTraceContents : modelContents,
                     modelContents,
@@ -532,7 +299,7 @@ export async function runToolLoop(options) {
             }
         }
     }
-    await persistTokensOnce();
+    await persistTokensOnce(tokenPersistence, sawAnyTokenUsage, totalInputTokens, totalOutputTokens);
     return {
         contents: keepFullTrace ? fullTraceContents : modelContents,
         modelContents,