codecane 1.0.310 → 1.0.312

package/dist/common/util/file.d.ts

@@ -30,6 +30,7 @@ export declare const ProjectFileContextSchema: z.ZodObject<{
     currentWorkingDirectory: z.ZodString;
     fileTree: z.ZodArray<z.ZodType<FileTreeNode, z.ZodTypeDef, FileTreeNode>, "many">;
     fileTokenScores: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
+    tokenCallers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>>;
     knowledgeFiles: z.ZodRecord<z.ZodString, z.ZodString>;
     userKnowledgeFiles: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     gitChanges: z.ZodObject<{
@@ -103,6 +104,7 @@ export declare const ProjectFileContextSchema: z.ZodObject<{
         homedir: string;
         cpus: number;
     };
+    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
     userKnowledgeFiles?: Record<string, string> | undefined;
     fileVersions?: {
         path: string;
@@ -129,6 +131,7 @@ export declare const ProjectFileContextSchema: z.ZodObject<{
         homedir: string;
         cpus: number;
     };
+    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
     userKnowledgeFiles?: Record<string, string> | undefined;
     fileVersions?: {
         path: string;

package/dist/common/util/file.js

@@ -43,6 +43,9 @@ exports.ProjectFileContextSchema = zod_1.z.object({
     currentWorkingDirectory: zod_1.z.string(),
     fileTree: zod_1.z.array(zod_1.z.custom()),
     fileTokenScores: zod_1.z.record(zod_1.z.string(), zod_1.z.record(zod_1.z.string(), zod_1.z.number())),
+    tokenCallers: zod_1.z
+        .record(zod_1.z.string(), zod_1.z.record(zod_1.z.string(), zod_1.z.array(zod_1.z.string())))
+        .optional(),
     knowledgeFiles: zod_1.z.record(zod_1.z.string(), zod_1.z.string()),
     userKnowledgeFiles: zod_1.z.record(zod_1.z.string(), zod_1.z.string()).optional(),
     gitChanges: zod_1.z.object({
@@ -65,13 +68,10 @@ exports.ProjectFileContextSchema = zod_1.z.object({
 });
 const createWriteFileBlock = (filePath, content) => {
     const tagName = 'write_file';
-    return ('<' +
-        `${tagName}>
+    return `<${tagName}>
 <path>${filePath}</path>
-<content>
-${content}
-</content>
-</${tagName}>`);
+<content>${content}</content>
+</${tagName}>`;
 };
 exports.createWriteFileBlock = createWriteFileBlock;
 exports.fileRegex = /<write_file>\s*<path>([^<]+)<\/path>\s*<content>([\s\S]*?)<\/content>\s*<\/write_file>/g;

package/dist/common/util/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}

package/dist/common/util/process-stream.d.ts

@@ -0,0 +1,7 @@
+export declare function processStreamWithTags<T extends string>(stream: AsyncGenerator<T>, tags: {
+    [tagName: string]: {
+        attributeNames: string[];
+        onTagStart: (attributes: Record<string, string>) => void;
+        onTagEnd: (content: string, attributes: Record<string, string>) => boolean;
+    };
+}): AsyncGenerator<string, void, unknown>;

package/dist/common/util/process-stream.js

@@ -0,0 +1,162 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processStreamWithTags = processStreamWithTags;
+const saxy_1 = require("./saxy");
+async function* processStreamWithTags(stream, tags) {
+    const saxyParser = new saxy_1.Saxy();
+    let currentTagName = null;
+    let currentTagAttributes = {};
+    let currentTagContentBuffer = '';
+    let shouldStopProcessing = false;
+    const outputQueue = [];
+    const enqueueOutput = (str) => {
+        if (str) {
+            // Only enqueue non-empty strings
+            outputQueue.push(str);
+        }
+    };
+    saxyParser.on('tagopen', (node) => {
+        if (shouldStopProcessing)
+            return;
+        if (currentTagName === null) {
+            // Not currently inside a tracked tag
+            if (tags[node.name]) {
+                // This is a tag we want to track
+                currentTagName = node.name;
+                try {
+                    currentTagAttributes = saxy_1.Saxy.parseAttrs(node.attrs);
+                }
+                catch (e) {
+                    // If attributes are malformed, default to empty or handle as error
+                    // console.error(`Error parsing attributes for tag ${node.name}: "${node.attrs}"`, e);
+                    currentTagAttributes = {}; // Default to empty attributes on parsing error
+                }
+                tags[currentTagName].onTagStart(currentTagAttributes);
+                currentTagContentBuffer = '';
+                if (node.isSelfClosing) {
+                    const stop = tags[currentTagName].onTagEnd(currentTagContentBuffer, currentTagAttributes);
+                    currentTagName = null;
+                    currentTagAttributes = {};
+                    if (stop) {
+                        shouldStopProcessing = true;
+                    }
+                }
+            }
+            else {
+                // A non-tracked tag, pass it through
+                enqueueOutput(`<${node.name}${node.attrs ? ' ' + node.attrs : ''}${node.isSelfClosing ? ' /' : ''}>`);
+            }
+        }
+        else {
+            // Inside a tracked tag, so this is nested content
+            currentTagContentBuffer += `<${node.name}${node.attrs ? ' ' + node.attrs : ''}${node.isSelfClosing ? ' /' : ''}>`;
+        }
+    });
+    saxyParser.on('text', (node) => {
+        if (shouldStopProcessing)
+            return;
+        if (currentTagName !== null) {
+            currentTagContentBuffer += node.contents;
+        }
+        else {
+            enqueueOutput(node.contents);
+        }
+    });
+    saxyParser.on('tagclose', (node) => {
+        if (shouldStopProcessing)
+            return;
+        if (currentTagName === node.name) {
+            const stop = tags[currentTagName].onTagEnd(currentTagContentBuffer, currentTagAttributes);
+            currentTagName = null;
+            currentTagAttributes = {};
+            currentTagContentBuffer = '';
+            if (stop) {
+                shouldStopProcessing = true;
+            }
+        }
+        else if (currentTagName !== null) {
+            // Closing a nested tag inside a tracked tag
+            currentTagContentBuffer += `</${node.name}>`;
+        }
+        else {
+            // Closing a non-tracked tag, pass it through
+            enqueueOutput(`</${node.name}>`);
+        }
+    });
+    saxyParser.on('cdata', (node) => {
+        if (shouldStopProcessing)
+            return;
+        const cdataStr = `<![CDATA[${node.contents}]]>`;
+        if (currentTagName !== null) {
+            currentTagContentBuffer += cdataStr;
+        }
+        else {
+            enqueueOutput(cdataStr);
+        }
+    });
+    saxyParser.on('comment', (node) => {
+        if (shouldStopProcessing)
+            return;
+        const commentStr = `<!--${node.contents}-->`;
+        if (currentTagName !== null) {
+            currentTagContentBuffer += commentStr;
+        }
+        else {
+            enqueueOutput(commentStr);
+        }
+    });
+    saxyParser.on('processinginstruction', (node) => {
+        if (shouldStopProcessing)
+            return;
+        const piStr = `<?${node.contents}?>`;
+        if (currentTagName !== null) {
+            currentTagContentBuffer += piStr;
+        }
+        else {
+            enqueueOutput(piStr);
+        }
+    });
+    saxyParser.on('error', (err) => {
+        // Saxy might emit 'error' for issues not causing write/end to throw.
+        // This flag helps stop processing in such cases.
+        // console.error("Saxy parser emitted an error:", err);
+        shouldStopProcessing = true;
+        // The error might need to be explicitly thrown here if it's critical
+        // and not otherwise surfaced to the generator's caller.
+        // For now, this ensures processing stops.
+    });
+    try {
+        for await (const chunk of stream) {
+            if (shouldStopProcessing)
+                break;
+            saxyParser.write(chunk); // Saxy events fill outputQueue
+            while (outputQueue.length > 0) {
+                // If stopping and not inside a tracked tag, clear queue to prevent further passthrough.
+                if (shouldStopProcessing && currentTagName === null) {
+                    outputQueue.length = 0;
+                    break;
+                }
+                yield outputQueue.shift();
+            }
+            // Re-check stop condition after yielding, as an event during write might have set it.
+            if (shouldStopProcessing)
+                break;
+        }
+        if (!shouldStopProcessing) {
+            saxyParser.end(); // Finalize parsing
+            while (outputQueue.length > 0) {
+                if (shouldStopProcessing && currentTagName === null) {
+                    outputQueue.length = 0;
+                    break;
+                }
+                yield outputQueue.shift();
+            }
+        }
+    }
+    catch (error) {
+        // Catches errors from saxyParser.write() or saxyParser.end()
+        // console.error("Error during Saxy stream processing in generator:", error);
+        throw error; // Propagate error to the caller
+    }
+}
+//# sourceMappingURL=process-stream.js.map

package/dist/common/util/process-stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"process-stream.js","sourceRoot":"","sources":["../../src/util/process-stream.ts"],"names":[],"mappings":"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"}

package/dist/common/util/promise.js

@@ -62,7 +62,7 @@ exports.sleep = sleep;
  * @param timeoutMessage Optional message for the timeout error
  * @returns A promise that resolves with the result of the original promise or rejects with a timeout error
  */
-async function withTimeout(promise, timeoutMs, timeoutMessage = 'Operation timed out') {
+async function withTimeout(promise, timeoutMs, timeoutMessage = `Operation timed out after ${timeoutMs}ms`) {
     let timeoutId;
     const timeoutPromise = new Promise((_, reject) => {
         timeoutId = setTimeout(() => {

package/dist/common/util/promise.js.map

@@ -1 +1 @@
-{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../src/util/promise.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../src/util/promise.ts"],"names":[],"mappings":"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"}

package/dist/common/util/saxy.d.ts

@@ -25,15 +25,23 @@ export type TagOpenNode = {
      */
     attrs: string;
     /**
-     * Whether the tag self-closes (tags of the form `<tag />`).
+     * Whether the tag self-closes (tags of the form ``).
      * Such tags will not be followed by a closing tag.
      */
     isSelfClosing: boolean;
+    /**
+     * The original text of the tag, including angle brackets and attributes.
+     */
+    rawTag: string;
 };
 /** Information about a closed tag */
 export type TagCloseNode = {
     /** Name of the tag that was closed. */
     name: string;
+    /**
+     * The original text of the tag, including angle brackets.
+     */
+    rawTag: string;
 };
 export type NextFunction = (err?: Error) => void;
 export interface SaxyEvents {
@@ -66,7 +74,10 @@ export type TagSchema = {
  * @throws If the string is malformed
  * @return A map of attribute names to their values
  */
-export declare const parseAttrs: (input: string) => Record<string, unknown>;
+export declare const parseAttrs: (input: string) => {
+    attrs: Record<string, string>;
+    errors: string[];
+};
 /**
  * Parse an XML stream and emit events corresponding
  * to the different tokens encountered.
@@ -76,7 +87,8 @@ export declare class Saxy extends Transform {
     private _tagStack;
     private _waiting;
     private _schema;
-    private _pendingEntity;
+    private _entityBuffer;
+    private _textBuffer;
     /**
      * Parse a string of XML attributes to a map of attribute names
      * to their values
@@ -85,7 +97,10 @@ export declare class Saxy extends Transform {
      * @throws If the string is malformed
      * @return A map of attribute names to their values
      */
-    static parseAttrs: (input: string) => Record<string, unknown>;
+    static parseAttrs: (input: string) => {
+        attrs: Record<string, string>;
+        errors: string[];
+    };
     /**
      * Expand a piece of XML text by replacing all XML entities
      * by their canonical value. Ignore invalid and unknown
@@ -142,7 +157,6 @@ export declare class Saxy extends Transform {
      * corresponding event on the event emitter.
      *
      * @param node Information about the opened tag.
-     * @param rawTag The raw tag text including angle brackets
      */
     private _handleTagOpening;
     /**

package/dist/common/util/saxy.js

@@ -27,7 +27,8 @@ const Node = {
  * @return The input string, expanded
  */
 const parseEntities = (input) => {
-    let position = 0, next = 0;
+    let position = 0;
+    let next = 0;
     const parts = [];
     while ((next = input.indexOf('&', position)) !== -1) {
         // remember anything there was before the entity
@@ -38,6 +39,7 @@ const parseEntities = (input) => {
         // ignore unterminated entities
         if (end === -1) {
             parts.push(input.slice(next));
+            position = input.length; // NEW: Set position to end to avoid double-adding
             break;
         }
         const entity = input.slice(next + 1, end);
@@ -104,40 +106,54 @@ const parseAttrs = (input) => {
     const attrs = {};
     const end = input.length;
     let position = 0;
-    while (position < end) {
+    const errors = [];
+    const seekNextWhitespace = (pos) => {
+        pos += 1;
+        while (pos < end && !(0, string_1.isWhitespace)(input[pos])) {
+            pos += 1;
+        }
+        return pos;
+    };
+    attrLoop: while (position < end) {
         // Skip all whitespace
         if ((0, string_1.isWhitespace)(input[position])) {
             position += 1;
             continue;
         }
         // Check that the attribute name contains valid chars
-        const startName = position;
+        let startName = position;
         while (input[position] !== '=' && position < end) {
             if ((0, string_1.isWhitespace)(input[position])) {
-                throw new Error('Attribute names may not contain whitespace');
+                errors.push(`Attribute names may not contain whitespace: ${input.slice(startName, position)}`);
+                continue attrLoop;
             }
             position += 1;
         }
         // This is XML, so we need a value for the attribute
         if (position === end) {
-            throw new Error('Expected a value for the attribute');
+            errors.push(`Expected a value for the attribute: ${input.slice(startName, position)}`);
+            break;
         }
         const attrName = input.slice(startName, position);
         position += 1;
         const startQuote = input[position];
         position += 1;
         if (startQuote !== '"' && startQuote !== "'") {
-            throw new Error('Attribute values should be quoted');
+            position = seekNextWhitespace(position);
+            errors.push(`Attribute values should be quoted: ${input.slice(startName, position)}`);
+            continue;
         }
         const endQuote = input.indexOf(startQuote, position);
         if (endQuote === -1) {
-            throw new Error('Unclosed attribute value');
+            position = seekNextWhitespace(position);
+            errors.push(`Unclosed attribute value: ${input.slice(startName, position)}`);
+            continue;
         }
         const attrValue = input.slice(position, endQuote);
         attrs[attrName] = attrValue;
         position = endQuote + 1;
     }
-    return attrs;
+    return { attrs, errors };
 };
 exports.parseAttrs = parseAttrs;
 /**
@@ -172,7 +188,8 @@ class Saxy extends readable_stream_1.Transform {
     _tagStack;
     _waiting;
     _schema;
-    _pendingEntity;
+    _entityBuffer;
+    _textBuffer; // NEW: Text buffer as class member
     /**
      * Parse a string of XML attributes to a map of attribute names
      * to their values
@@ -207,7 +224,9 @@ class Saxy extends readable_stream_1.Transform {
         // Store schema if provided
         this._schema = schema || null;
         // Pending entity for incomplete entities
-        this._pendingEntity = null;
+        this._entityBuffer = null;
+        // Initialize text buffer
+        this._textBuffer = '';
     }
     /**
      * Handle a chunk of data written into the stream.
@@ -235,9 +254,15 @@ class Saxy extends readable_stream_1.Transform {
                 callback(err);
                 return;
             }
+            // Handle any remaining text buffer
+            if (this._textBuffer.length > 0) {
+                const parsedText = parseEntities(this._textBuffer);
+                this.emit(Node.text, { contents: parsedText });
+                this._textBuffer = '';
+            }
             // Handle any remaining pending entity
-            if (this._pendingEntity) {
-                this.emit(Node.text, { contents: this._pendingEntity });
+            if (this._entityBuffer) {
+                this.emit(Node.text, { contents: this._entityBuffer });
             }
             // Handle unclosed nodes
             if (this._waiting !== null) {
@@ -311,9 +336,8 @@ class Saxy extends readable_stream_1.Transform {
      * corresponding event on the event emitter.
      *
      * @param node Information about the opened tag.
-     * @param rawTag The raw tag text including angle brackets
      */
-    _handleTagOpening(node, rawTag) {
+    _handleTagOpening(node) {
         const { name } = node;
         // If we have a schema, validate against it
         if (this._schema) {
@@ -321,7 +345,7 @@ class Saxy extends readable_stream_1.Transform {
             if (this._tagStack.length === 0) {
                 // Convert to text if not in schema
                 if (!this._schema[name]) {
-                    this.emit(Node.text, { contents: rawTag });
+                    this.emit(Node.text, { contents: node.rawTag });
                     return;
                 }
             }
@@ -331,7 +355,7 @@ class Saxy extends readable_stream_1.Transform {
                 // Convert to text if parent not in schema or this tag not allowed as child
                 if (!this._schema[parentTag] ||
                     !this._schema[parentTag].includes(name)) {
-                    this.emit(Node.text, { contents: rawTag });
+                    this.emit(Node.text, { contents: node.rawTag });
                     return;
                 }
             }
@@ -340,6 +364,12 @@ class Saxy extends readable_stream_1.Transform {
             this._tagStack.push(node.name);
         }
         this.emit(Node.tagOpen, node);
+        if (node.isSelfClosing) {
+            this.emit(Node.tagClose, {
+                name: node.name,
+                rawTag: '',
+            });
+        }
     }
     /**
      * Parse a XML chunk.
@@ -351,9 +381,9 @@ class Saxy extends readable_stream_1.Transform {
      */
     _parseChunk(input, callback) {
         // Handle pending entity if exists
-        if (this._pendingEntity) {
-            input = this._pendingEntity + input;
-            this._pendingEntity = null;
+        if (this._entityBuffer) {
+            input = this._entityBuffer + input;
+            this._entityBuffer = null;
         }
         // Use pending data if applicable and get out of waiting mode
         const waitingData = this._unwait();
@@ -374,19 +404,24 @@ class Saxy extends readable_stream_1.Transform {
                 // more text data left, so we wait
                 if (nextTag === -1) {
                     let chunk = input.slice(chunkPos);
-                    if (this._tagStack.length === 1 && chunk === '\n') {
+                    if (this._tagStack.length === 1 && !chunk.trim()) {
                         chunk = '';
                     }
                     // Check for incomplete entity at end
                     const lastAmp = chunk.lastIndexOf('&');
                     if (lastAmp !== -1 && chunk.indexOf(';', lastAmp) === -1) {
-                        // Store incomplete entity for next chunk
-                        this._pendingEntity = chunk.slice(lastAmp);
-                        chunk = chunk.slice(0, lastAmp);
+                        // Only consider it a pending entity if it looks like the start of one
+                        const nextChar = chunk[lastAmp + 1];
+                        const isPotentialEntity = nextChar === '#' || // Numeric entity
+                            /[a-zA-Z]/.test(nextChar); // Named entity
+                        if (isPotentialEntity) {
+                            // Store incomplete entity for next chunk
+                            this._entityBuffer = chunk.slice(lastAmp);
+                            chunk = chunk.slice(0, lastAmp);
+                        }
                     }
                     if (chunk.length > 0) {
-                        chunk = parseEntities(chunk);
-                        this.emit(Node.text, { contents: chunk });
+                        this._textBuffer += chunk;
                     }
                     chunkPos = end;
                     break;
@@ -394,20 +429,31 @@ class Saxy extends readable_stream_1.Transform {
                 // A tag follows, so we can be confident that
                 // we have all the data needed for the TEXT node
                 let chunk = input.slice(chunkPos, nextTag);
-                if (this._tagStack.length === 1 && chunk === '\n') {
+                if (this._tagStack.length === 1 && !chunk.trim()) {
                     chunk = '';
                 }
                 // Check for incomplete entity at end
                 const lastAmp = chunk.lastIndexOf('&');
                 if (lastAmp !== -1 && chunk.indexOf(';', lastAmp) === -1) {
-                    // Store incomplete entity for next chunk
-                    this._pendingEntity = chunk.slice(lastAmp);
-                    chunk = chunk.slice(0, lastAmp);
+                    // Only consider it a pending entity if it looks like the start of one
+                    const nextChar = chunk[lastAmp + 1];
+                    const isPotentialEntity = nextChar === '#' || // Numeric entity
+                        /[a-zA-Z]/.test(nextChar); // Named entity
+                    if (isPotentialEntity) {
+                        // Store incomplete entity for next chunk
+                        this._entityBuffer = chunk.slice(lastAmp);
+                        chunk = chunk.slice(0, lastAmp);
+                    }
                 }
                 // Only emit non-whitespace text or text within a single tag (not between tags)
                 if (chunk.length > 0) {
-                    chunk = parseEntities(chunk);
-                    this.emit(Node.text, { contents: chunk });
+                    this._textBuffer += chunk;
+                }
+                // We've reached a tag boundary, emit any buffered text
+                if (this._textBuffer.length > 0) {
+                    const parsedText = parseEntities(this._textBuffer);
+                    this.emit(Node.text, { contents: parsedText });
+                    this._textBuffer = '';
                 }
                 chunkPos = nextTag;
             }
@@ -447,10 +493,20 @@ class Saxy extends readable_stream_1.Transform {
                         }
                     }
                 }
-                this._tagStack.pop();
-                // Only emit if the tag matches what we expect
-                if (stackedTagName === tagName) {
-                    this.emit(Node.tagClose, { name: tagName });
+                if (tagName === stackedTagName) {
+                    this._tagStack.pop();
+                }
+                // Only emit if the tag matches what we expect (or if there is no schema)
+                if (!this._schema || stackedTagName === tagName) {
+                    this.emit(Node.tagClose, {
+                        name: tagName,
+                        rawTag: input.slice(chunkPos - 1, tagClose + 1),
+                    });
+                }
+                else {
+                    // Emit as text if the tag doesn't match
+                    const rawTag = input.slice(chunkPos - 1, tagClose + 1);
+                    this.emit(Node.text, { contents: rawTag });
                 }
                 chunkPos = tagClose + 1;
                 continue;
@@ -468,7 +524,8 @@ class Saxy extends readable_stream_1.Transform {
                     name: input.slice(chunkPos, realTagClose),
                     attrs: '',
                     isSelfClosing,
-                }, rawTag);
+                    rawTag,
+                });
             }
             else if (whitespace === 0) {
                 // Invalid tag starting with whitespace - emit as text
@@ -480,10 +537,17 @@ class Saxy extends readable_stream_1.Transform {
                     name: input.slice(chunkPos, chunkPos + whitespace),
                     attrs: input.slice(chunkPos + whitespace, realTagClose),
                     isSelfClosing,
-                }, rawTag);
+                    rawTag,
+                });
             }
             chunkPos = tagClose + 1;
         }
+        // Emit any buffered text at the end of the chunk if there's no pending entity
+        if (this._textBuffer.length > 0) {
+            const parsedText = parseEntities(this._textBuffer);
+            this.emit(Node.text, { contents: parsedText });
+            this._textBuffer = '';
+        }
         callback();
     }
     /**