@openai/agents-core 0.3.0 → 0.3.2

package/dist/utils/applyDiff.mjs

@@ -0,0 +1,272 @@
+/**
+ * Applies a headerless V4A diff to the provided file content.
+ * - mode "default": patch an existing file using V4A sections ("@@" + +/-/space lines).
+ * - mode "create": create-file syntax that requires every line to start with "+".
+ *
+ * The function preserves trailing newlines from the original file and throws when
+ * the diff cannot be applied cleanly.
+ */
+export function applyDiff(input, diff, mode = 'default') {
+    const diffLines = normalizeDiffLines(diff);
+    if (mode === 'create') {
+        return parseCreateDiff(diffLines);
+    }
+    const { chunks } = parseUpdateDiff(diffLines, input);
+    return applyChunks(input, chunks);
+}
+const END_PATCH = '*** End Patch';
+const END_FILE = '*** End of File';
+const END_SECTION_MARKERS = [
+    END_PATCH,
+    '*** Update File:',
+    '*** Delete File:',
+    '*** Add File:',
+    END_FILE,
+];
+const SECTION_TERMINATORS = [
+    END_PATCH,
+    '*** Update File:',
+    '*** Delete File:',
+    '*** Add File:',
+];
+function normalizeDiffLines(diff) {
+    return diff
+        .split(/\r?\n/)
+        .map((line) => line.replace(/\r$/, ''))
+        .filter((line, idx, arr) => !(idx === arr.length - 1 && line === ''));
+}
+function isDone(state, prefixes) {
+    if (state.index >= state.lines.length)
+        return true;
+    if (prefixes.some((p) => state.lines[state.index]?.startsWith(p)))
+        return true;
+    return false;
+}
+function readStr(state, prefix) {
+    const current = state.lines[state.index];
+    if (typeof current === 'string' && current.startsWith(prefix)) {
+        state.index += 1;
+        return current.slice(prefix.length);
+    }
+    return '';
+}
+function parseCreateDiff(lines) {
+    const parser = {
+        lines: [...lines, END_PATCH],
+        index: 0,
+        fuzz: 0,
+    };
+    const output = [];
+    while (!isDone(parser, SECTION_TERMINATORS)) {
+        const line = parser.lines[parser.index];
+        parser.index += 1;
+        if (!line.startsWith('+')) {
+            throw new Error(`Invalid Add File Line: ${line}`);
+        }
+        output.push(line.slice(1));
+    }
+    return output.join('\n');
+}
+function parseUpdateDiff(lines, input) {
+    const parser = {
+        lines: [...lines, END_PATCH],
+        index: 0,
+        fuzz: 0,
+    };
+    const inputLines = input.split('\n');
+    const chunks = [];
+    let cursor = 0;
+    while (!isDone(parser, END_SECTION_MARKERS)) {
+        const anchor = readStr(parser, '@@ ');
+        const hasBareAnchor = !anchor && parser.lines[parser.index] === '@@';
+        if (hasBareAnchor)
+            parser.index += 1;
+        if (!(anchor || hasBareAnchor || cursor === 0)) {
+            throw new Error(`Invalid Line:\n${parser.lines[parser.index]}`);
+        }
+        if (anchor.trim()) {
+            cursor = advanceCursorToAnchor(anchor, inputLines, cursor, parser);
+        }
+        const { nextContext, sectionChunks, endIndex, eof } = readSection(parser.lines, parser.index);
+        const nextContextText = nextContext.join('\n');
+        const { newIndex, fuzz } = findContext(inputLines, nextContext, cursor, eof);
+        if (newIndex === -1) {
+            if (eof) {
+                throw new Error(`Invalid EOF Context ${cursor}:\n${nextContextText}`);
+            }
+            throw new Error(`Invalid Context ${cursor}:\n${nextContextText}`);
+        }
+        parser.fuzz += fuzz;
+        for (const ch of sectionChunks) {
+            chunks.push({ ...ch, origIndex: ch.origIndex + newIndex });
+        }
+        cursor = newIndex + nextContext.length;
+        parser.index = endIndex;
+    }
+    return { chunks, fuzz: parser.fuzz };
+}
+function advanceCursorToAnchor(anchor, inputLines, cursor, parser) {
+    let found = false;
+    if (!inputLines.slice(0, cursor).some((s) => s === anchor)) {
+        for (let i = cursor; i < inputLines.length; i += 1) {
+            if (inputLines[i] === anchor) {
+                cursor = i + 1;
+                found = true;
+                break;
+            }
+        }
+    }
+    if (!found &&
+        !inputLines.slice(0, cursor).some((s) => s.trim() === anchor.trim())) {
+        for (let i = cursor; i < inputLines.length; i += 1) {
+            if (inputLines[i].trim() === anchor.trim()) {
+                cursor = i + 1;
+                parser.fuzz += 1;
+                found = true;
+                break;
+            }
+        }
+    }
+    return cursor;
+}
+function readSection(lines, startIndex) {
+    const context = [];
+    let delLines = [];
+    let insLines = [];
+    const sectionChunks = [];
+    let mode = 'keep';
+    let index = startIndex;
+    const origIndex = index;
+    while (index < lines.length) {
+        const raw = lines[index];
+        if (raw.startsWith('@@') ||
+            raw.startsWith(END_PATCH) ||
+            raw.startsWith('*** Update File:') ||
+            raw.startsWith('*** Delete File:') ||
+            raw.startsWith('*** Add File:') ||
+            raw.startsWith(END_FILE)) {
+            break;
+        }
+        if (raw === '***')
+            break;
+        if (raw.startsWith('***')) {
+            throw new Error(`Invalid Line: ${raw}`);
+        }
+        index += 1;
+        const lastMode = mode;
+        let line = raw;
+        if (line === '')
+            line = ' ';
+        if (line[0] === '+') {
+            mode = 'add';
+        }
+        else if (line[0] === '-') {
+            mode = 'delete';
+        }
+        else if (line[0] === ' ') {
+            mode = 'keep';
+        }
+        else {
+            throw new Error(`Invalid Line: ${line}`);
+        }
+        line = line.slice(1);
+        const switchingToContext = mode === 'keep' && lastMode !== mode;
+        if (switchingToContext && (insLines.length || delLines.length)) {
+            sectionChunks.push({
+                origIndex: context.length - delLines.length,
+                delLines,
+                insLines,
+            });
+            delLines = [];
+            insLines = [];
+        }
+        if (mode === 'delete') {
+            delLines.push(line);
+            context.push(line);
+        }
+        else if (mode === 'add') {
+            insLines.push(line);
+        }
+        else {
+            context.push(line);
+        }
+    }
+    if (insLines.length || delLines.length) {
+        sectionChunks.push({
+            origIndex: context.length - delLines.length,
+            delLines,
+            insLines,
+        });
+        delLines = [];
+        insLines = [];
+    }
+    if (index < lines.length && lines[index] === END_FILE) {
+        index += 1;
+        return { nextContext: context, sectionChunks, endIndex: index, eof: true };
+    }
+    if (index === origIndex) {
+        throw new Error(`Nothing in this section - index=${index} ${lines[index]}`);
+    }
+    return { nextContext: context, sectionChunks, endIndex: index, eof: false };
+}
+function findContext(lines, context, start, eof) {
+    if (eof) {
+        const endStart = Math.max(0, lines.length - context.length);
+        const endMatch = findContextCore(lines, context, endStart);
+        if (endMatch.newIndex !== -1)
+            return endMatch;
+        const fallback = findContextCore(lines, context, start);
+        return { newIndex: fallback.newIndex, fuzz: fallback.fuzz + 10000 };
+    }
+    return findContextCore(lines, context, start);
+}
+function findContextCore(lines, context, start) {
+    if (!context.length) {
+        return { newIndex: start, fuzz: 0 };
+    }
+    for (let i = start; i < lines.length; i += 1) {
+        if (equalsSlice(lines, context, i, (s) => s))
+            return { newIndex: i, fuzz: 0 };
+    }
+    for (let i = start; i < lines.length; i += 1) {
+        if (equalsSlice(lines, context, i, (s) => s.trimEnd()))
+            return { newIndex: i, fuzz: 1 };
+    }
+    for (let i = start; i < lines.length; i += 1) {
+        if (equalsSlice(lines, context, i, (s) => s.trim()))
+            return { newIndex: i, fuzz: 100 };
+    }
+    return { newIndex: -1, fuzz: 0 };
+}
+function equalsSlice(source, target, start, mapFn) {
+    if (start + target.length > source.length)
+        return false;
+    for (let i = 0; i < target.length; i += 1) {
+        if (mapFn(source[start + i]) !== mapFn(target[i]))
+            return false;
+    }
+    return true;
+}
+function applyChunks(input, chunks) {
+    const origLines = input.split('\n');
+    const destLines = [];
+    let origIndex = 0;
+    for (const chunk of chunks) {
+        if (chunk.origIndex > origLines.length) {
+            throw new Error(`applyDiff: chunk.origIndex ${chunk.origIndex} > input length ${origLines.length}`);
+        }
+        if (origIndex > chunk.origIndex) {
+            throw new Error(`applyDiff: overlapping chunk at ${chunk.origIndex} (cursor ${origIndex})`);
+        }
+        destLines.push(...origLines.slice(origIndex, chunk.origIndex));
+        origIndex = chunk.origIndex;
+        if (chunk.insLines.length) {
+            destLines.push(...chunk.insLines);
+        }
+        origIndex += chunk.delLines.length;
+    }
+    destLines.push(...origLines.slice(origIndex));
+    const result = destLines.join('\n');
+    return result;
+}
+//# sourceMappingURL=applyDiff.mjs.map

package/dist/utils/applyDiff.mjs.map

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

package/dist/utils/index.d.ts

@@ -2,3 +2,4 @@ export { isZodObject } from './typeGuards';
 export { toSmartString } from './smartString';
 export { EventEmitterDelegate } from '../lifecycle';
 export { encodeUint8ArrayToBase64 } from './base64';
+export { applyDiff } from './applyDiff';

package/dist/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeUint8ArrayToBase64 = exports.EventEmitterDelegate = exports.toSmartString = exports.isZodObject = void 0;
+exports.applyDiff = exports.encodeUint8ArrayToBase64 = exports.EventEmitterDelegate = exports.toSmartString = exports.isZodObject = void 0;
 var typeGuards_1 = require("./typeGuards.js");
 Object.defineProperty(exports, "isZodObject", { enumerable: true, get: function () { return typeGuards_1.isZodObject; } });
 var smartString_1 = require("./smartString.js");
@@ -9,4 +9,6 @@ var lifecycle_1 = require("../lifecycle.js");
 Object.defineProperty(exports, "EventEmitterDelegate", { enumerable: true, get: function () { return lifecycle_1.EventEmitterDelegate; } });
 var base64_1 = require("./base64.js");
 Object.defineProperty(exports, "encodeUint8ArrayToBase64", { enumerable: true, get: function () { return base64_1.encodeUint8ArrayToBase64; } });
+var applyDiff_1 = require("./applyDiff.js");
+Object.defineProperty(exports, "applyDiff", { enumerable: true, get: function () { return applyDiff_1.applyDiff; } });
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,8CAA2C;AAAlC,yGAAA,WAAW,OAAA;AACpB,gDAA8C;AAArC,4GAAA,aAAa,OAAA;AACtB,6CAAoD;AAA3C,iHAAA,oBAAoB,OAAA;AAC7B,sCAAoD;AAA3C,kHAAA,wBAAwB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,8CAA2C;AAAlC,yGAAA,WAAW,OAAA;AACpB,gDAA8C;AAArC,4GAAA,aAAa,OAAA;AACtB,6CAAoD;AAA3C,iHAAA,oBAAoB,OAAA;AAC7B,sCAAoD;AAA3C,kHAAA,wBAAwB,OAAA;AACjC,4CAAwC;AAA/B,sGAAA,SAAS,OAAA"}

package/dist/utils/index.mjs

@@ -2,4 +2,5 @@ export { isZodObject } from "./typeGuards.mjs";
 export { toSmartString } from "./smartString.mjs";
 export { EventEmitterDelegate } from "../lifecycle.mjs";
 export { encodeUint8ArrayToBase64 } from "./base64.mjs";
+export { applyDiff } from "./applyDiff.mjs";
 //# sourceMappingURL=index.mjs.map

package/dist/utils/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"OAAO,EAAE,WAAW,EAAE;OACf,EAAE,aAAa,EAAE;OACjB,EAAE,oBAAoB,EAAE;OACxB,EAAE,wBAAwB,EAAE"}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"OAAO,EAAE,WAAW,EAAE;OACf,EAAE,aAAa,EAAE;OACjB,EAAE,oBAAoB,EAAE;OACxB,EAAE,wBAAwB,EAAE;OAC5B,EAAE,SAAS,EAAE"}

package/dist/utils/serialize.js

@@ -20,6 +20,18 @@ function serializeTool(tool) {
             dimensions: tool.computer.dimensions,
         };
     }
+    if (tool.type === 'shell') {
+        return {
+            type: 'shell',
+            name: tool.name,
+        };
+    }
+    if (tool.type === 'apply_patch') {
+        return {
+            type: 'apply_patch',
+            name: tool.name,
+        };
+    }
     return {
         type: 'hosted_tool',
         name: tool.name,

package/dist/utils/serialize.js.map

@@ -1 +1 @@
-{"version":3,"file":"serialize.js","sourceRoot":"","sources":["../../src/utils/serialize.ts"],"names":[],"mappings":";;AAMA,sCAuBC;AAED,4CASC;AAlCD,SAAgB,aAAa,CAAC,IAAe;IAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,UAAmC;YACpD,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW;YACtC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;SACrC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,YAAY,EAAE,IAAI,CAAC,YAAY;KAChC,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAC9B,CAA6B;IAE7B,OAAO;QACL,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,eAAe,EAAE,CAAC,CAAC,eAAe;QAClC,eAAe,EAAE,CAAC,CAAC,eAAwC;QAC3D,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;KACrC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"serialize.js","sourceRoot":"","sources":["../../src/utils/serialize.ts"],"names":[],"mappings":";;AAMA,sCAmCC;AAED,4CASC;AA9CD,SAAgB,aAAa,CAAC,IAAe;IAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,UAAmC;YACpD,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW;YACtC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;SACrC,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO;YACL,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAChC,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,YAAY,EAAE,IAAI,CAAC,YAAY;KAChC,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAC9B,CAA6B;IAE7B,OAAO;QACL,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,eAAe,EAAE,CAAC,CAAC,eAAe;QAClC,eAAe,EAAE,CAAC,CAAC,eAAwC;QAC3D,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;KACrC,CAAC;AACJ,CAAC"}

package/dist/utils/serialize.mjs

@@ -16,6 +16,18 @@ export function serializeTool(tool) {
             dimensions: tool.computer.dimensions,
         };
     }
+    if (tool.type === 'shell') {
+        return {
+            type: 'shell',
+            name: tool.name,
+        };
+    }
+    if (tool.type === 'apply_patch') {
+        return {
+            type: 'apply_patch',
+            name: tool.name,
+        };
+    }
     return {
         type: 'hosted_tool',
         name: tool.name,

package/dist/utils/serialize.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"serialize.mjs","sourceRoot":"","sources":["../../src/utils/serialize.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,aAAa,CAAC,IAAe;IAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,UAAmC;YACpD,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW;YACtC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;SACrC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,YAAY,EAAE,IAAI,CAAC,YAAY;KAChC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,CAA6B;IAE7B,OAAO;QACL,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,eAAe,EAAE,CAAC,CAAC,eAAe;QAClC,eAAe,EAAE,CAAC,CAAC,eAAwC;QAC3D,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;KACrC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"serialize.mjs","sourceRoot":"","sources":["../../src/utils/serialize.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,aAAa,CAAC,IAAe;IAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,UAAmC;YACpD,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW;YACtC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;SACrC,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO;YACL,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAChC,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,YAAY,EAAE,IAAI,CAAC,YAAY;KAChC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,CAA6B;IAE7B,OAAO;QACL,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,eAAe,EAAE,CAAC,CAAC,eAAe;QAClC,eAAe,EAAE,CAAC,CAAC,eAAwC;QAC3D,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;KACrC,CAAC;AACJ,CAAC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@openai/agents-core",
   "repository": "https://github.com/openai/openai-agents-js",
   "homepage": "https://openai.github.io/openai-agents-js/",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "The OpenAI Agents SDK is a lightweight yet powerful framework for building multi-agent workflows.",
   "author": "OpenAI <support@openai.com>",
   "main": "dist/index.js",
@@ -65,8 +65,8 @@
     "@modelcontextprotocol/sdk": "^1.17.2"
   },
   "dependencies": {
-    "openai": "^6",
-    "debug": "^4.4.0"
+    "debug": "^4.4.0",
+    "openai": "^6"
   },
   "peerDependencies": {
     "zod": "^3.25.40 || ^4.0"