@namzu/sdk 1.3.0 → 2.0.0
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/CHANGELOG.md +106 -0
- package/dist/compaction/__tests__/verifier-empty-reply.test.d.ts +12 -0
- package/dist/compaction/__tests__/verifier-empty-reply.test.d.ts.map +1 -0
- package/dist/compaction/__tests__/verifier-empty-reply.test.js +73 -0
- package/dist/compaction/__tests__/verifier-empty-reply.test.js.map +1 -0
- package/dist/compaction/verifier.d.ts.map +1 -1
- package/dist/compaction/verifier.js +10 -1
- package/dist/compaction/verifier.js.map +1 -1
- package/dist/config/__tests__/compaction-budget-schema.test.d.ts +18 -0
- package/dist/config/__tests__/compaction-budget-schema.test.d.ts.map +1 -0
- package/dist/config/__tests__/compaction-budget-schema.test.js +96 -0
- package/dist/config/__tests__/compaction-budget-schema.test.js.map +1 -0
- package/dist/config/runtime.d.ts.map +1 -1
- package/dist/config/runtime.js +20 -11
- package/dist/config/runtime.js.map +1 -1
- package/dist/manager/run/persistence.d.ts +2 -1
- package/dist/manager/run/persistence.d.ts.map +1 -1
- package/dist/manager/run/persistence.js +3 -1
- package/dist/manager/run/persistence.js.map +1 -1
- package/dist/provider/__tests__/errors.test.d.ts +2 -0
- package/dist/provider/__tests__/errors.test.d.ts.map +1 -0
- package/dist/provider/__tests__/errors.test.js +61 -0
- package/dist/provider/__tests__/errors.test.js.map +1 -0
- package/dist/provider/errors.d.ts +108 -0
- package/dist/provider/errors.d.ts.map +1 -0
- package/dist/provider/errors.js +311 -0
- package/dist/provider/errors.js.map +1 -0
- package/dist/provider/index.d.ts +2 -0
- package/dist/provider/index.d.ts.map +1 -1
- package/dist/provider/index.js +1 -0
- package/dist/provider/index.js.map +1 -1
- package/dist/public-runtime.d.ts +11 -11
- package/dist/public-runtime.d.ts.map +1 -1
- package/dist/public-runtime.js +11 -11
- package/dist/public-runtime.js.map +1 -1
- package/dist/registry/tool/execute.d.ts.map +1 -1
- package/dist/registry/tool/execute.js +45 -12
- package/dist/registry/tool/execute.js.map +1 -1
- package/dist/registry/tool/execute.test.js +104 -7
- package/dist/registry/tool/execute.test.js.map +1 -1
- package/dist/registry/toolset/catalog.d.ts.map +1 -1
- package/dist/registry/toolset/catalog.js +17 -4
- package/dist/registry/toolset/catalog.js.map +1 -1
- package/dist/registry/toolset/catalog.test.js +101 -0
- package/dist/registry/toolset/catalog.test.js.map +1 -1
- package/dist/runtime/query/__tests__/capability-negotiation.test.js +79 -0
- package/dist/runtime/query/__tests__/capability-negotiation.test.js.map +1 -1
- package/dist/runtime/query/__tests__/deferred-tools.test.js +100 -0
- package/dist/runtime/query/__tests__/deferred-tools.test.js.map +1 -1
- package/dist/runtime/query/__tests__/long-document-flow.test.js +12 -12
- package/dist/runtime/query/__tests__/long-document-flow.test.js.map +1 -1
- package/dist/runtime/query/__tests__/stream-recovery.test.js +55 -2
- package/dist/runtime/query/__tests__/stream-recovery.test.js.map +1 -1
- package/dist/runtime/query/executor.js +2 -2
- package/dist/runtime/query/executor.js.map +1 -1
- package/dist/runtime/query/iteration/index.d.ts.map +1 -1
- package/dist/runtime/query/iteration/index.js +10 -0
- package/dist/runtime/query/iteration/index.js.map +1 -1
- package/dist/runtime/query/iteration/phases/compaction-safe-cut.test.d.ts +32 -0
- package/dist/runtime/query/iteration/phases/compaction-safe-cut.test.d.ts.map +1 -0
- package/dist/runtime/query/iteration/phases/compaction-safe-cut.test.js +152 -0
- package/dist/runtime/query/iteration/phases/compaction-safe-cut.test.js.map +1 -0
- package/dist/runtime/query/iteration/phases/compaction.d.ts.map +1 -1
- package/dist/runtime/query/iteration/phases/compaction.js +52 -12
- package/dist/runtime/query/iteration/phases/compaction.js.map +1 -1
- package/dist/runtime/query/iteration/stream-turn.d.ts.map +1 -1
- package/dist/runtime/query/iteration/stream-turn.js +11 -5
- package/dist/runtime/query/iteration/stream-turn.js.map +1 -1
- package/dist/runtime/query/result.d.ts.map +1 -1
- package/dist/runtime/query/result.js +11 -1
- package/dist/runtime/query/result.js.map +1 -1
- package/dist/tools/builtins/__tests__/edit.test.js +216 -10
- package/dist/tools/builtins/__tests__/edit.test.js.map +1 -1
- package/dist/tools/builtins/__tests__/payload-budget.test.js +30 -16
- package/dist/tools/builtins/__tests__/payload-budget.test.js.map +1 -1
- package/dist/tools/builtins/__tests__/write-file.test.js +37 -13
- package/dist/tools/builtins/__tests__/write-file.test.js.map +1 -1
- package/dist/tools/builtins/atomic-write-file.d.ts +13 -0
- package/dist/tools/builtins/atomic-write-file.d.ts.map +1 -0
- package/dist/tools/builtins/atomic-write-file.js +46 -0
- package/dist/tools/builtins/atomic-write-file.js.map +1 -0
- package/dist/tools/builtins/bash.js +2 -2
- package/dist/tools/builtins/bash.js.map +1 -1
- package/dist/tools/builtins/edit.d.ts +2 -5
- package/dist/tools/builtins/edit.d.ts.map +1 -1
- package/dist/tools/builtins/edit.js +105 -125
- package/dist/tools/builtins/edit.js.map +1 -1
- package/dist/tools/builtins/file-mutation-lock.d.ts +7 -0
- package/dist/tools/builtins/file-mutation-lock.d.ts.map +1 -0
- package/dist/tools/builtins/file-mutation-lock.js +25 -0
- package/dist/tools/builtins/file-mutation-lock.js.map +1 -0
- package/dist/tools/builtins/index.js +2 -2
- package/dist/tools/builtins/index.js.map +1 -1
- package/dist/tools/builtins/write-file.d.ts +1 -2
- package/dist/tools/builtins/write-file.d.ts.map +1 -1
- package/dist/tools/builtins/write-file.js +66 -40
- package/dist/tools/builtins/write-file.js.map +1 -1
- package/dist/tools/coordinator/__tests__/task-list.test.js +14 -0
- package/dist/tools/coordinator/__tests__/task-list.test.js.map +1 -1
- package/dist/tools/coordinator/agent.d.ts +6 -8
- package/dist/tools/coordinator/agent.d.ts.map +1 -1
- package/dist/tools/coordinator/agent.js.map +1 -1
- package/dist/tools/coordinator/index.d.ts.map +1 -1
- package/dist/tools/coordinator/index.js +11 -32
- package/dist/tools/coordinator/index.js.map +1 -1
- package/dist/tools/defineTool.d.ts +3 -0
- package/dist/tools/defineTool.d.ts.map +1 -1
- package/dist/tools/defineTool.js +3 -0
- package/dist/tools/defineTool.js.map +1 -1
- package/dist/types/provider/chat.d.ts +9 -0
- package/dist/types/provider/chat.d.ts.map +1 -1
- package/dist/types/provider/error.d.ts +22 -0
- package/dist/types/provider/error.d.ts.map +1 -0
- package/dist/types/provider/error.js +2 -0
- package/dist/types/provider/error.js.map +1 -0
- package/dist/types/provider/index.d.ts +1 -0
- package/dist/types/provider/index.d.ts.map +1 -1
- package/dist/types/run/entity.d.ts +2 -0
- package/dist/types/run/entity.d.ts.map +1 -1
- package/dist/types/run/events.d.ts +2 -0
- package/dist/types/run/events.d.ts.map +1 -1
- package/dist/types/run/events.js.map +1 -1
- package/dist/types/sandbox/index.d.ts +4 -0
- package/dist/types/sandbox/index.d.ts.map +1 -1
- package/dist/types/sandbox/index.js.map +1 -1
- package/dist/types/tool/index.d.ts +20 -0
- package/dist/types/tool/index.d.ts.map +1 -1
- package/package.json +2 -1
- package/src/compaction/__tests__/verifier-empty-reply.test.ts +96 -0
- package/src/compaction/verifier.ts +10 -1
- package/src/config/__tests__/compaction-budget-schema.test.ts +114 -0
- package/src/config/runtime.ts +20 -11
- package/src/manager/run/persistence.ts +3 -1
- package/src/provider/__tests__/errors.test.ts +85 -0
- package/src/provider/errors.ts +344 -0
- package/src/provider/index.ts +15 -0
- package/src/public-runtime.ts +53 -10
- package/src/registry/tool/execute.test.ts +121 -7
- package/src/registry/tool/execute.ts +50 -12
- package/src/registry/toolset/catalog.test.ts +118 -0
- package/src/registry/toolset/catalog.ts +26 -4
- package/src/runtime/query/__tests__/capability-negotiation.test.ts +88 -0
- package/src/runtime/query/__tests__/deferred-tools.test.ts +111 -0
- package/src/runtime/query/__tests__/long-document-flow.test.ts +12 -12
- package/src/runtime/query/__tests__/stream-recovery.test.ts +65 -2
- package/src/runtime/query/executor.ts +2 -2
- package/src/runtime/query/iteration/index.ts +15 -0
- package/src/runtime/query/iteration/phases/compaction-safe-cut.test.ts +186 -0
- package/src/runtime/query/iteration/phases/compaction.ts +54 -12
- package/src/runtime/query/iteration/stream-turn.ts +11 -6
- package/src/runtime/query/result.ts +11 -1
- package/src/tools/builtins/__tests__/edit.test.ts +270 -10
- package/src/tools/builtins/__tests__/payload-budget.test.ts +40 -20
- package/src/tools/builtins/__tests__/write-file.test.ts +52 -13
- package/src/tools/builtins/atomic-write-file.ts +58 -0
- package/src/tools/builtins/bash.ts +2 -2
- package/src/tools/builtins/edit.ts +116 -162
- package/src/tools/builtins/file-mutation-lock.ts +27 -0
- package/src/tools/builtins/index.ts +2 -2
- package/src/tools/builtins/write-file.ts +68 -44
- package/src/tools/coordinator/__tests__/task-list.test.ts +16 -0
- package/src/tools/coordinator/agent.ts +6 -8
- package/src/tools/coordinator/index.ts +11 -34
- package/src/tools/defineTool.ts +6 -0
- package/src/types/provider/chat.ts +14 -1
- package/src/types/provider/error.ts +29 -0
- package/src/types/provider/index.ts +5 -0
- package/src/types/run/entity.ts +2 -0
- package/src/types/run/events.ts +7 -1
- package/src/types/sandbox/index.ts +4 -0
- package/src/types/tool/index.ts +20 -0
|
@@ -47,7 +47,7 @@ export class ToolExecutor {
|
|
|
47
47
|
const baseContext = this.buildToolContext();
|
|
48
48
|
// Respect each tool's `concurrencySafe` flag. Read-only tools
|
|
49
49
|
// (ls/grep/glob/…) run in parallel; tools that mutate shared state
|
|
50
|
-
// (edit/write/
|
|
50
|
+
// (edit/write/bash — `concurrencySafe: false`) are serialized in
|
|
51
51
|
// a single chain, so e.g. several `edit` calls to the SAME file in one
|
|
52
52
|
// turn apply one-after-another instead of racing read→modify→write
|
|
53
53
|
// (which let the last writer clobber the rest). Results are written by
|
|
@@ -390,6 +390,6 @@ function formatFailedToolOutput(output, error) {
|
|
|
390
390
|
return `${output}\n\n${errorText}`;
|
|
391
391
|
}
|
|
392
392
|
function truncatedToolInputMessage(toolName) {
|
|
393
|
-
return `Error: Tool "${toolName}" call was cut off while the model was streaming JSON arguments. The tool was NOT executed. Retry with a much shorter input. Self-budget
|
|
393
|
+
return `Error: Tool "${toolName}" call was cut off while the model was streaming JSON arguments. The tool was NOT executed. Retry with a much shorter input. Self-budget content/new_string under 12000 characters before calling file tools. For long files, create a short opening with write and a deterministic marker, then advance that marker with bounded exact edit calls; for delegated work, pass a shared workspace filename/reference instead of embedding the content in the tool call.`;
|
|
394
394
|
}
|
|
395
395
|
//# sourceMappingURL=executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/runtime/query/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAG1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAsB,KAAK,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAI3F,OAAO,EAA+B,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAa7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AA2BnE,MAAM,OAAO,YAAY;IAChB,MAAM,CAAoB;IAC1B,aAAa,CAAe;IAC5B,SAAS,CAAW;IACpB,GAAG,CAAQ;IACX,mBAAmB,CAAsB;IACzC,MAAM,CAAe;IACZ,SAAS,GAAgB,IAAI,GAAG,EAAE,CAAA;IAClC,eAAe,GAAoB;QACnD,UAAU,EAAE,CAAC,GAAW,EAAE,EAAE;YAC3B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;KACjD,CAAA;IAED,YACC,MAA0B,EAC1B,aAA4B,EAC5B,SAAoB,EACpB,GAAW,EACX,SAAwB,oBAAoB;QAE5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACrB,CAAC;IAED,sBAAsB,CAAC,OAA4B;QAClD,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAA;IACnC,CAAC;IAED,UAAU,CAAC,OAAgB;QAC1B,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAA;IAC1C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAAgC;QAClD,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAA;QAC5C,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAA;QACrC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE;YACtC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,SAAS,EAAE,SAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;SAC9C,CAAC,CAAA;QAEF,yDAAyD;QACzD,+DAA+D;QAC/D,sCAAsC;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAE3C,8DAA8D;QAC9D,mEAAmE;QACnE,wEAAwE;QACxE,uEAAuE;QACvE,mEAAmE;QACnE,uEAAuE;QACvE,kDAAkD;QAClD,MAAM,OAAO,GAAkD,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAC1F,MAAM,QAAQ,GAAoB,EAAE,CAAA;QACpC,IAAI,MAAM,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAA;QAC7C,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;YACjC,MAAM,GAAG,GAAG,EAAE,GAAG,WAAW,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAA;YACtD,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;gBACtB,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;YACrD,CAAC,CAAA;YACD,IAAI,KAAK,GAAY,EAAE,CAAA;YACvB,IAAI,CAAC;gBACJ,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,CAAA;YACxD,CAAC;YAAC,MAAM,CAAC;gBACR,qEAAqE;YACtE,CAAC;YACD,MAAM,IAAI,GACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,iBAAiB,EAAE,CAAC,KAAK,CAAC,KAAK,IAAI,CAAA;YACnF,IAAI,IAAI;gBAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;;gBACzB,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC,CAAC,CAAA;QACF,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;QAExC,MAAM,QAAQ,GAAc,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;QAEzF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;IAC7B,CAAC;IAEO,gBAAgB;QACvB,OAAO;YACN,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;YAC9C,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;YACpB,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;YACjD,iBAAiB,EAAE;gBAClB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;gBAChC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;aAC9C;YACD,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YAC5C,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YAC/B,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;YACtC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,eAAe,EAAE,IAAI,CAAC,eAAe;SACrC,CAAA;IACF,CAAC;IAEO,KAAK,CAAC,aAAa,CAC1B,QAAkB,EAClB,WAAwB;QAExB,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAA;QAEvC,IAAI,QAAQ,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,EAAE,CAAC;YAChD,MAAM,OAAO,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAA;YACnD,MAAM,IAAI,CAAC,SAAS,CAAC;gBACpB,IAAI,EAAE,gBAAgB;gBACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,QAAQ,CAAC,EAAE;gBACtB,QAAQ;gBACR,KAAK,EAAE,EAAE;aACT,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,SAAS,CAAC;gBACpB,IAAI,EAAE,gBAAgB;gBACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,QAAQ,CAAC,EAAE;gBACtB,QAAQ;gBACR,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,IAAI;aACb,CAAC,CAAA;YACF,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;QACpD,CAAC;QAED,IAAI,KAAc,CAAA;QAElB,IAAI,CAAC;YACJ,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QAChD,CAAC;QAAC,MAAM,CAAC;YACR,4DAA4D;YAC5D,8DAA8D;YAC9D,8DAA8D;YAC9D,8CAA8C;YAC9C,MAAM,OAAO,GAAG,8CAA8C,QAAQ,GAAG,CAAA;YACzE,MAAM,IAAI,CAAC,SAAS,CAAC;gBACpB,IAAI,EAAE,gBAAgB;gBACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,QAAQ,CAAC,EAAE;gBACtB,QAAQ;gBACR,KAAK,EAAE,EAAE;aACT,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,SAAS,CAAC;gBACpB,IAAI,EAAE,gBAAgB;gBACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,QAAQ,CAAC,EAAE;gBACtB,QAAQ;gBACR,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,IAAI;aACb,CAAC,CAAA;YACF,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;QACpD,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QAC7D,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC/D,OAAO,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;QAC5F,CAAC;QACD,KAAK,GAAG,UAAU,CAAC,KAAK,CAAA;QAExB,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YAC1C,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,QAAQ;YACrB,KAAK;YACL,QAAQ;YACR,UAAU,EAAE,QAAQ,CAAC,EAAE;SACvB,CAAC,CAAA;QACF,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QACtC,CAAC;QAED,MAAM,IAAI,CAAC,SAAS,CAAC;YACpB,IAAI,EAAE,gBAAgB;YACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,SAAS,EAAE,QAAQ,CAAC,EAAE;YACtB,QAAQ;YACR,KAAK;SACL,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CACxC;YACC,IAAI,EAAE,gBAAgB;YACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,SAAS,EAAE,QAAQ,CAAC,EAAE;YACtB,QAAQ;YACR,KAAK;SACL,EACD,iBAAiB,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAC/C,CAAA;QACD,IAAI,WAAW,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YACnC,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,IAAI,SAAS,CAAA;YACpD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,IAAI,oBAAoB,CAAA;YACzD,MAAM,IAAI,GAAG,IAAI,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAA;YACpE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,EAAE;gBAC1C,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,IAAI,EAAE,QAAQ;gBACd,SAAS;gBACT,MAAM;aACN,CAAC,CAAA;YACF,IAAI,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;YACnD,CAAC;YACD,6DAA6D;YAC7D,6DAA6D;YAC7D,MAAM,IAAI,CAAC,SAAS,CAAC;gBACpB,IAAI,EAAE,gBAAgB;gBACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,QAAQ,CAAC,EAAE;gBACtB,QAAQ;gBACR,MAAM,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE;gBAChC,OAAO,EAAE,IAAI;aACb,CAAC,CAAA;YACF,OAAO;gBACN,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACvB,MAAM,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE;aAChC,CAAA;QACF,CAAC;QAED,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9B,mBAAmB,CAAC,IAAI,CAAC,mBAAmB,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;QAC/E,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC1B,iEAAiE;QACjE,iEAAiE;QACjE,oEAAoE;QACpE,qDAAqD;QACrD,IAAI,MAA4D,CAAA;QAChE,IAAI,CAAC;YACJ,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,CAAA;QACvE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAChE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE;gBACrC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,OAAO;aACd,CAAC,CAAA;YACF,MAAM,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;QACxD,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAA;QAEvC,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO;YAC/B,CAAC,CAAC,MAAM,CAAC,MAAM;YACf,CAAC,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;QAEtD,IAAI,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAEjF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;QACxE,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC3B,MAAM,GAAG,YAAY,CAAA;QACtB,CAAC;QAED,MAAM,gBAAgB,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,YAAY,KAAK,IAAI,CAAA;QAEjE,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9B,qBAAqB,CAAC,IAAI,CAAC,mBAAmB,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAA;QACpF,CAAC;QAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE;gBAC5C,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,IAAI,EAAE,QAAQ;gBACd,UAAU;gBACV,YAAY,EAAE,MAAM,CAAC,MAAM;aAC3B,CAAC,CAAA;QACH,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE;gBACtC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,IAAI,EAAE,QAAQ;gBACd,UAAU;gBACV,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS;aAChC,CAAC,CAAA;QACH,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,gBAAgB,EAAE,CAAC;gBACtB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;YAC7C,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;YACjD,CAAC;QACF,CAAC;QAED,MAAM,IAAI,CAAC,SAAS,CAAC;YACpB,IAAI,EAAE,gBAAgB;YACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,SAAS,EAAE,QAAQ,CAAC,EAAE;YACtB,QAAQ;YACR,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,gBAAgB;SACzB,CAAC,CAAA;QAEF,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,CAAA;IAC3C,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,KAAc;QAC5D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAA;QAClE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAC3D,cAAc,EACd,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,EACxD,IAAI,CAAC,SAAS,CACd,CAAA;QACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IAC9D,CAAC;IAEO,uBAAuB,CAC9B,QAAgB,EAChB,YAAqB,EACrB,OAAoC;QAEpC,IAAI,YAAY,GAAG,YAAY,CAAA;QAC/B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;gBACvB,KAAK,UAAU;oBACd,SAAQ;gBACT,KAAK,QAAQ;oBACZ,YAAY,GAAG,MAAM,CAAC,KAAK,CAAA;oBAC3B,SAAQ;gBACT,KAAK,MAAM;oBACV,OAAO;wBACN,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,YAAY;wBACnB,MAAM,EAAE,QAAQ,QAAQ,uBAAuB,MAAM,CAAC,MAAM,EAAE;qBAC9D,CAAA;gBACF,KAAK,OAAO;oBACX,OAAO;wBACN,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE,YAAY;wBACnB,MAAM,EAAE,UAAU,MAAM,CAAC,OAAO,EAAE;qBAClC,CAAA;gBACF,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ;oBACZ,MAAM,IAAI,KAAK,CACd,yDAAyD,MAAM,CAAC,MAAM,cAAc,QAAQ,EAAE,CAC9F,CAAA;gBACF,OAAO,CAAC,CAAC,CAAC;oBACT,MAAM,WAAW,GAAU,MAAM,CAAA;oBACjC,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;gBAC5E,CAAC;YACF,CAAC;QACF,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,YAAY,EAAE,CAAA;IACjD,CAAC;IAEO,KAAK,CAAC,eAAe,CAC5B,QAAgB,EAChB,KAAc,EACd,UAAsB;QAEtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAO,IAAI,CAAA;QAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAC3D,eAAe,EACf,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EACpE,IAAI,CAAC,SAAS,CACd,CAAA;QACD,IAAI,QAAQ,GAAkB,IAAI,CAAA;QAClC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;gBACvB,KAAK,UAAU;oBACd,SAAQ;gBACT,KAAK,OAAO;oBACX,QAAQ,GAAG,UAAU,MAAM,CAAC,OAAO,EAAE,CAAA;oBACrC,SAAQ;gBACT,KAAK,MAAM,CAAC;gBACZ,KAAK,QAAQ,CAAC;gBACd,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ;oBACZ,MAAM,IAAI,KAAK,CACd,0DAA0D,MAAM,CAAC,MAAM,cAAc,QAAQ,EAAE,CAC/F,CAAA;gBACF,OAAO,CAAC,CAAC,CAAC;oBACT,MAAM,WAAW,GAAU,MAAM,CAAA;oBACjC,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;gBAC5E,CAAC;YACF,CAAC;QACF,CAAC;QACD,OAAO,QAAQ,CAAA;IAChB,CAAC;IAEO,KAAK,CAAC,0BAA0B,CACvC,UAAkB,EAClB,QAAgB,EAChB,KAAc,EACd,OAAmD;QAEnD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YAC1C,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,QAAQ;YACrB,KAAK;YACL,QAAQ;YACR,UAAU;SACV,CAAC,CAAA;QACF,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;YACrC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC7B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;YACzD,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;YACrD,CAAC;QACF,CAAC;QACD,MAAM,IAAI,CAAC,SAAS,CAAC;YACpB,IAAI,EAAE,gBAAgB;YACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,SAAS,EAAE,UAAU;YACrB,QAAQ;YACR,KAAK;SACL,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,CAAC;YACpB,IAAI,EAAE,gBAAgB;YACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,SAAS,EAAE,UAAU;YACrB,QAAQ;YACR,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,IAAI,KAAK,OAAO;SACjC,CAAC,CAAA;QACF,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAA;IAC9C,CAAC;IAEO,aAAa,CAAC,QAAgB,EAAE,MAAc;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC5C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACxC,OAAO,MAAM,CAAA;QACd,CAAC;QAED,MAAM,UAAU,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAA;QAC9C,IAAI,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;YACvC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE;gBACzC,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,MAAM,CAAC,MAAM;gBAC7B,gBAAgB,EAAE,UAAU,CAAC,MAAM;gBACnC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC;aAC3E,CAAC,CAAA;QACH,CAAC;QACD,OAAO,UAAU,CAAA;IAClB,CAAC;CACD;AAED,SAAS,sBAAsB,CAAC,MAA0B,EAAE,KAAyB;IACpF,MAAM,SAAS,GAAG,UAAU,KAAK,IAAI,uBAAuB,EAAE,CAAA;IAC9D,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAA;IAC3D,OAAO,GAAG,MAAM,OAAO,SAAS,EAAE,CAAA;AACnC,CAAC;AAED,SAAS,yBAAyB,CAAC,QAAgB;IAClD,OAAO,gBAAgB,QAAQ,wcAAwc,CAAA;AACxe,CAAC"}
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/runtime/query/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,6BAA6B,CAAA;AAQvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAMzD,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,qBAAa,qBAAqB;IACjC,OAAO,CAAC,GAAG,CAAkB;gBAEjB,GAAG,EAAE,gBAAgB;IAI1B,OAAO,IAAI,cAAc,CAAC,QAAQ,CAAC;IA8W1C,OAAO,CAAC,oBAAoB;YAOd,oBAAoB;CAwElC"}
|
|
@@ -95,6 +95,7 @@ export class IterationOrchestrator {
|
|
|
95
95
|
// risks a 400 because the history still carries
|
|
96
96
|
// tool_use/tool_result blocks.
|
|
97
97
|
const openAITools = this.ctx.tools.toLLMTools(this.ctx.allowedTools);
|
|
98
|
+
const enforceToolInputSchema = enforcedModelInputToolNames(this.ctx.tools, openAITools);
|
|
98
99
|
const messages = forceFinalize
|
|
99
100
|
? [
|
|
100
101
|
...runMgr.messages,
|
|
@@ -118,6 +119,7 @@ export class IterationOrchestrator {
|
|
|
118
119
|
model,
|
|
119
120
|
messages,
|
|
120
121
|
tools: openAITools.length > 0 ? openAITools : undefined,
|
|
122
|
+
enforceToolInputSchema,
|
|
121
123
|
toolChoice: forceFinalize && openAITools.length > 0 ? 'none' : undefined,
|
|
122
124
|
temperature: runConfig.temperature,
|
|
123
125
|
maxTokens: runConfig.maxResponseTokens,
|
|
@@ -336,10 +338,12 @@ export class IterationOrchestrator {
|
|
|
336
338
|
// tools param identical to prior iterations (cache prefix intact,
|
|
337
339
|
// no 400 on tool blocks in history) and forbid use via tool_choice.
|
|
338
340
|
const finalTools = this.ctx.tools.toLLMTools(this.ctx.allowedTools);
|
|
341
|
+
const enforceToolInputSchema = enforcedModelInputToolNames(this.ctx.tools, finalTools);
|
|
339
342
|
const response = await collect(this.ctx.provider.chatStream({
|
|
340
343
|
model,
|
|
341
344
|
messages: finalMessages,
|
|
342
345
|
tools: finalTools.length > 0 ? finalTools : undefined,
|
|
346
|
+
enforceToolInputSchema,
|
|
343
347
|
toolChoice: finalTools.length > 0 ? 'none' : undefined,
|
|
344
348
|
temperature: this.ctx.runConfig.temperature,
|
|
345
349
|
maxTokens: this.ctx.runConfig.maxResponseTokens,
|
|
@@ -375,4 +379,10 @@ export class IterationOrchestrator {
|
|
|
375
379
|
}
|
|
376
380
|
}
|
|
377
381
|
}
|
|
382
|
+
function enforcedModelInputToolNames(registry, tools) {
|
|
383
|
+
const names = tools
|
|
384
|
+
.map((tool) => tool.function.name)
|
|
385
|
+
.filter((name) => registry.get(name)?.enforceModelInput === true);
|
|
386
|
+
return names.length > 0 ? names : undefined;
|
|
387
|
+
}
|
|
378
388
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The UNBOUNDED CUT.
|
|
3
|
+
*
|
|
4
|
+
* `runCompactionCheck` snaps the naive recent-window boundary
|
|
5
|
+
* (`messages.length - keepRecentMessages`) FORWARD via `findSafeTrimIndex` so a
|
|
6
|
+
* tool pair is never split. But `findSafeTrimIndex` only ever walks forward, and
|
|
7
|
+
* its leading-`tool`-message skip has no stop short of `messages.length` — so
|
|
8
|
+
* whenever the whole suffix from the naive index to the end is `tool` messages,
|
|
9
|
+
* the cut lands ON `messages.length`, `recentMessages` comes back EMPTY, and
|
|
10
|
+
* `[...preservedSystem, compactionMessage]` replaces the ENTIRE recent window.
|
|
11
|
+
* What is left is a transcript with no non-system message at all.
|
|
12
|
+
*
|
|
13
|
+
* The shape that produces it: ONE assistant turn that fans out
|
|
14
|
+
* `>= keepRecentMessages` parallel tool calls, measured at the START of the next
|
|
15
|
+
* iteration — which is exactly where `runCompactionCheck` runs (iteration/index.ts,
|
|
16
|
+
* after `refreshWorkingMemory`, before the model call), i.e. immediately after
|
|
17
|
+
* those results were appended.
|
|
18
|
+
*
|
|
19
|
+
* The `olderMessages.length < 1` guard at :117 cannot fire: `olderMessages` is
|
|
20
|
+
* the whole transcript in exactly this situation.
|
|
21
|
+
*
|
|
22
|
+
* Symmetrically, when the naive index lands BELOW `systemMessages.length` the
|
|
23
|
+
* cut sits inside the system prefix and the leading prompts are duplicated into
|
|
24
|
+
* `recentMessages`.
|
|
25
|
+
*
|
|
26
|
+
* The invariant these tests pin is the one a cut taken AT OR BELOW naive gives
|
|
27
|
+
* for free: a pass never removes more than the naive cut would, so at least
|
|
28
|
+
* `keepRecentMessages` original messages survive verbatim — or, when no safe cut
|
|
29
|
+
* exists at all, the pass is skipped and the transcript is untouched.
|
|
30
|
+
*/
|
|
31
|
+
export {};
|
|
32
|
+
//# sourceMappingURL=compaction-safe-cut.test.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compaction-safe-cut.test.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/query/iteration/phases/compaction-safe-cut.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG"}
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The UNBOUNDED CUT.
|
|
3
|
+
*
|
|
4
|
+
* `runCompactionCheck` snaps the naive recent-window boundary
|
|
5
|
+
* (`messages.length - keepRecentMessages`) FORWARD via `findSafeTrimIndex` so a
|
|
6
|
+
* tool pair is never split. But `findSafeTrimIndex` only ever walks forward, and
|
|
7
|
+
* its leading-`tool`-message skip has no stop short of `messages.length` — so
|
|
8
|
+
* whenever the whole suffix from the naive index to the end is `tool` messages,
|
|
9
|
+
* the cut lands ON `messages.length`, `recentMessages` comes back EMPTY, and
|
|
10
|
+
* `[...preservedSystem, compactionMessage]` replaces the ENTIRE recent window.
|
|
11
|
+
* What is left is a transcript with no non-system message at all.
|
|
12
|
+
*
|
|
13
|
+
* The shape that produces it: ONE assistant turn that fans out
|
|
14
|
+
* `>= keepRecentMessages` parallel tool calls, measured at the START of the next
|
|
15
|
+
* iteration — which is exactly where `runCompactionCheck` runs (iteration/index.ts,
|
|
16
|
+
* after `refreshWorkingMemory`, before the model call), i.e. immediately after
|
|
17
|
+
* those results were appended.
|
|
18
|
+
*
|
|
19
|
+
* The `olderMessages.length < 1` guard at :117 cannot fire: `olderMessages` is
|
|
20
|
+
* the whole transcript in exactly this situation.
|
|
21
|
+
*
|
|
22
|
+
* Symmetrically, when the naive index lands BELOW `systemMessages.length` the
|
|
23
|
+
* cut sits inside the system prefix and the leading prompts are duplicated into
|
|
24
|
+
* `recentMessages`.
|
|
25
|
+
*
|
|
26
|
+
* The invariant these tests pin is the one a cut taken AT OR BELOW naive gives
|
|
27
|
+
* for free: a pass never removes more than the naive cut would, so at least
|
|
28
|
+
* `keepRecentMessages` original messages survive verbatim — or, when no safe cut
|
|
29
|
+
* exists at all, the pass is skipped and the transcript is untouched.
|
|
30
|
+
*/
|
|
31
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
32
|
+
import { WorkingStateManager } from '../../../../compaction/manager.js';
|
|
33
|
+
import { CompactionConfigSchema } from '../../../../config/runtime.js';
|
|
34
|
+
import { createAssistantMessage, createSystemMessage, createToolMessage, createUserMessage, } from '../../../../types/message/index.js';
|
|
35
|
+
import { runCompactionCheck } from './compaction.js';
|
|
36
|
+
function makeLogger() {
|
|
37
|
+
const self = {
|
|
38
|
+
info: vi.fn(),
|
|
39
|
+
warn: vi.fn(),
|
|
40
|
+
error: vi.fn(),
|
|
41
|
+
debug: vi.fn(),
|
|
42
|
+
child: vi.fn(),
|
|
43
|
+
};
|
|
44
|
+
self.child = vi.fn(() => self);
|
|
45
|
+
return self;
|
|
46
|
+
}
|
|
47
|
+
/** Long enough that a handful of messages overflow a tiny budget. */
|
|
48
|
+
const FILLER = 'x'.repeat(200);
|
|
49
|
+
const KEEP_RECENT = 4;
|
|
50
|
+
function makeCtx(opts) {
|
|
51
|
+
const config = CompactionConfigSchema.parse({
|
|
52
|
+
strategy: 'structured',
|
|
53
|
+
llmVerification: false,
|
|
54
|
+
keepRecentMessages: KEEP_RECENT,
|
|
55
|
+
...(opts.contextWindowTokens !== undefined
|
|
56
|
+
? { contextWindowTokens: opts.contextWindowTokens }
|
|
57
|
+
: {}),
|
|
58
|
+
});
|
|
59
|
+
const manager = new WorkingStateManager(config);
|
|
60
|
+
manager.addDecision('built the report as .docx');
|
|
61
|
+
return {
|
|
62
|
+
runConfig: { tokenBudget: opts.tokenBudget ?? 0 },
|
|
63
|
+
compactionConfig: config,
|
|
64
|
+
workingStateManager: manager,
|
|
65
|
+
log: makeLogger(),
|
|
66
|
+
runMgr: {
|
|
67
|
+
id: 'run_1',
|
|
68
|
+
currentIteration: 3,
|
|
69
|
+
messages: opts.messages,
|
|
70
|
+
},
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
function toolCall(id) {
|
|
74
|
+
return { id, type: 'function', function: { name: 'read', arguments: '{}' } };
|
|
75
|
+
}
|
|
76
|
+
/** How many of the ORIGINAL messages survived the pass, by identity. */
|
|
77
|
+
function survivorCount(before, after) {
|
|
78
|
+
const kept = new Set(after);
|
|
79
|
+
return before.filter((m) => kept.has(m)).length;
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* The exact shape the iteration loop holds when `runCompactionCheck` runs: the
|
|
83
|
+
* user's turn, one assistant that fanned out four parallel tool calls, and the
|
|
84
|
+
* four results that just landed. The next thing that happens is the model call —
|
|
85
|
+
* with whatever this function leaves behind.
|
|
86
|
+
*/
|
|
87
|
+
function buildParallelFanOutTail() {
|
|
88
|
+
return [
|
|
89
|
+
createSystemMessage(`STATIC SYSTEM PROMPT ${FILLER}`, 'cache'),
|
|
90
|
+
createUserMessage(`please rename the heading to Q3 ${FILLER}`),
|
|
91
|
+
createAssistantMessage(`reading the sources ${FILLER}`, [
|
|
92
|
+
toolCall('a'),
|
|
93
|
+
toolCall('b'),
|
|
94
|
+
toolCall('c'),
|
|
95
|
+
toolCall('d'),
|
|
96
|
+
]),
|
|
97
|
+
createToolMessage(`result a ${FILLER}`, 'a'),
|
|
98
|
+
createToolMessage(`result b ${FILLER}`, 'b'),
|
|
99
|
+
createToolMessage(`result c ${FILLER}`, 'c'),
|
|
100
|
+
createToolMessage(`result d ${FILLER}`, 'd'),
|
|
101
|
+
];
|
|
102
|
+
}
|
|
103
|
+
describe('compaction — the unbounded cut', () => {
|
|
104
|
+
it('keeps at least keepRecentMessages messages verbatim when the tail is a parallel tool fan-out', async () => {
|
|
105
|
+
const messages = buildParallelFanOutTail();
|
|
106
|
+
const before = [...messages];
|
|
107
|
+
const ctx = makeCtx({ messages, contextWindowTokens: 100 });
|
|
108
|
+
await runCompactionCheck(ctx);
|
|
109
|
+
expect(survivorCount(before, messages)).toBeGreaterThanOrEqual(KEEP_RECENT);
|
|
110
|
+
});
|
|
111
|
+
it('never leaves a system-only transcript (nothing for the next turn to answer)', async () => {
|
|
112
|
+
const messages = buildParallelFanOutTail();
|
|
113
|
+
const ctx = makeCtx({ messages, contextWindowTokens: 100 });
|
|
114
|
+
await runCompactionCheck(ctx);
|
|
115
|
+
const nonSystem = messages.filter((m) => m.role !== 'system');
|
|
116
|
+
expect(nonSystem.length).toBeGreaterThan(0);
|
|
117
|
+
});
|
|
118
|
+
it('skips the pass, leaving the transcript intact, when no safe cut exists at or below naive', async () => {
|
|
119
|
+
// System prefix, then a single assistant fanning out six parallel calls.
|
|
120
|
+
// Every candidate boundary at or below naive splits that one pair-set, so
|
|
121
|
+
// there is nothing safe to cut to — skipping beats deleting the turn.
|
|
122
|
+
const ids = ['a', 'b', 'c', 'd', 'e', 'f'];
|
|
123
|
+
const messages = [
|
|
124
|
+
createSystemMessage(`STATIC SYSTEM PROMPT ${FILLER}`, 'cache'),
|
|
125
|
+
createAssistantMessage(`fanning out ${FILLER}`, ids.map(toolCall)),
|
|
126
|
+
...ids.map((id) => createToolMessage(`result ${id} ${FILLER}`, id)),
|
|
127
|
+
];
|
|
128
|
+
const before = [...messages];
|
|
129
|
+
const ctx = makeCtx({ messages, contextWindowTokens: 100 });
|
|
130
|
+
await runCompactionCheck(ctx);
|
|
131
|
+
expect(messages).toEqual(before);
|
|
132
|
+
});
|
|
133
|
+
it('does not duplicate the leading system prompts when the naive cut lands inside them', async () => {
|
|
134
|
+
// Legacy (tokenBudget) path: five leading system messages and only three
|
|
135
|
+
// conversational ones, so naive = 8 - 4 = 4 < systemMessages.length = 5.
|
|
136
|
+
const messages = [
|
|
137
|
+
createSystemMessage(`SYS-1 ${FILLER}`, 'cache'),
|
|
138
|
+
createSystemMessage(`SYS-2 ${FILLER}`),
|
|
139
|
+
createSystemMessage(`SYS-3 ${FILLER}`),
|
|
140
|
+
createSystemMessage(`SYS-4 ${FILLER}`),
|
|
141
|
+
createSystemMessage(`SYS-5 UNIQUE-MARKER ${FILLER}`),
|
|
142
|
+
createUserMessage(`user 0 ${FILLER}`),
|
|
143
|
+
createAssistantMessage(`assistant 0 ${FILLER}`),
|
|
144
|
+
createUserMessage(`user 1 ${FILLER}`),
|
|
145
|
+
];
|
|
146
|
+
const ctx = makeCtx({ messages, tokenBudget: 100 });
|
|
147
|
+
await runCompactionCheck(ctx);
|
|
148
|
+
const marker = messages.filter((m) => m.content?.includes('UNIQUE-MARKER'));
|
|
149
|
+
expect(marker).toHaveLength(1);
|
|
150
|
+
});
|
|
151
|
+
});
|
|
152
|
+
//# sourceMappingURL=compaction-safe-cut.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compaction-safe-cut.test.js","sourceRoot":"","sources":["../../../../../src/runtime/query/iteration/phases/compaction-safe-cut.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/query/iteration/phases/compaction.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAMpD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAE/E;AA6BD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/query/iteration/phases/compaction.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAMpD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAE/E;AA6BD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkL7E"}
|
|
@@ -86,18 +86,58 @@ export async function runCompactionCheck(ctx) {
|
|
|
86
86
|
}
|
|
87
87
|
if (systemMessages.length === 0)
|
|
88
88
|
return;
|
|
89
|
-
// Tool-pair atomicity guard
|
|
90
|
-
//
|
|
91
|
-
//
|
|
92
|
-
//
|
|
93
|
-
//
|
|
94
|
-
//
|
|
95
|
-
//
|
|
96
|
-
//
|
|
97
|
-
//
|
|
98
|
-
//
|
|
99
|
-
//
|
|
100
|
-
|
|
89
|
+
// Tool-pair atomicity guard, taken DOWNWARD.
|
|
90
|
+
//
|
|
91
|
+
// A naive cut at `length - keepRecentMessages` can land BETWEEN an
|
|
92
|
+
// assistant-with-toolCalls (dropped into `olderMessages`) and its `tool`
|
|
93
|
+
// results (kept in `recentMessages`), leaving orphaned `tool_result` blocks at
|
|
94
|
+
// the head of the recent window. The Anthropic provider then emits a
|
|
95
|
+
// `tool_result` with no matching `tool_use` and the API rejects the next turn
|
|
96
|
+
// with a 400 — so compaction, whose whole job is to keep a long run alive,
|
|
97
|
+
// instead kills it.
|
|
98
|
+
//
|
|
99
|
+
// Snapping FORWARD via `findSafeTrimIndex` fixes the orphan and introduces a
|
|
100
|
+
// worse failure. That walk skips leading `tool` messages with no stop short of
|
|
101
|
+
// `messages.length`, so whenever the entire suffix from the naive index is
|
|
102
|
+
// `tool` messages, the boundary lands ON `messages.length`: `recentMessages`
|
|
103
|
+
// comes back EMPTY and `[...preservedSystem, compactionMessage]` replaces the
|
|
104
|
+
// whole recent window. The model is then asked to answer a conversation whose
|
|
105
|
+
// last turn — including the user's own message — was deleted, and it answers a
|
|
106
|
+
// question nobody asked. The shape is routine, not exotic: one assistant turn
|
|
107
|
+
// fanning out `>= keepRecentMessages` parallel tool calls, measured at the
|
|
108
|
+
// start of the very next iteration, which is exactly where this runs. The
|
|
109
|
+
// `olderMessages` floor guard below cannot catch it either — in that shape
|
|
110
|
+
// `olderMessages` is the whole transcript.
|
|
111
|
+
//
|
|
112
|
+
// So take the LARGEST safe boundary AT OR BELOW naive instead. A cut that low
|
|
113
|
+
// removes no more than the naive cut would, so at least `keepRecentMessages`
|
|
114
|
+
// original messages always survive verbatim, and the transcript can never be
|
|
115
|
+
// reduced to system messages alone. `findSafeTrimIndex(m, k) === k` is the
|
|
116
|
+
// safety predicate — reused rather than reimplemented, so the function itself
|
|
117
|
+
// (public API, other callers) is untouched.
|
|
118
|
+
const naiveKeepStart = messages.length - config.keepRecentMessages;
|
|
119
|
+
let keepStart = -1;
|
|
120
|
+
for (let candidate = naiveKeepStart; candidate > systemMessages.length; candidate--) {
|
|
121
|
+
if (findSafeTrimIndex(messages, candidate) === candidate) {
|
|
122
|
+
keepStart = candidate;
|
|
123
|
+
break;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
// No safe boundary at or below naive. Either every candidate splits a pair-set
|
|
127
|
+
// (one assistant fanning out more calls than the recent window holds), or naive
|
|
128
|
+
// itself sits inside the leading system prefix — which would otherwise
|
|
129
|
+
// duplicate those prompts into `recentMessages`. Skipping costs one iteration's
|
|
130
|
+
// worth of context headroom; cutting anyway costs the live turn. The condition
|
|
131
|
+
// is self-clearing: the next assistant message moves naive past the tool block.
|
|
132
|
+
if (keepStart < 0) {
|
|
133
|
+
ctx.log.debug('Skipping compaction — no safe cut at or below the naive boundary', {
|
|
134
|
+
runId: ctx.runMgr.id,
|
|
135
|
+
naiveKeepStart,
|
|
136
|
+
systemMessages: systemMessages.length,
|
|
137
|
+
messageCount: messages.length,
|
|
138
|
+
});
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
101
141
|
const recentMessages = messages.slice(keepStart);
|
|
102
142
|
const olderMessages = messages.slice(systemMessages.length, keepStart);
|
|
103
143
|
// D7: nothing meaningful to compact — skip instead of thrashing the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../../../src/runtime/query/iteration/phases/compaction.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../../../src/runtime/query/iteration/phases/compaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-turn.d.ts","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/stream-turn.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stream-turn.d.ts","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/stream-turn.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACX,sBAAsB,EACtB,WAAW,EAEX,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAG3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAwB7C,MAAM,WAAW,mBAAmB;IACnC,QAAQ,EAAE,sBAAsB,CAAA;IAChC,SAAS,EAAE,OAAO,6BAA6B,EAAE,SAAS,CAAA;CAC1D;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAuB,kBAAkB,CACxC,QAAQ,EAAE,WAAW,EACrB,MAAM,EAAE,OAAO,kCAAkC,EAAE,oBAAoB,EACvE,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,MAAM,SAAS,CAAC,QAAQ,CAAC,EACvC,KAAK,EAAE,OAAO,6BAA6B,EAAE,KAAK,EAClD,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,OAAO,EACtB,GAAG,EAAE,MAAM,GACT,cAAc,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAqU/C"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isProviderRequestError } from '../../../provider/errors.js';
|
|
1
2
|
import { mergeTokenUsage } from '../../../types/common/index.js';
|
|
2
3
|
import { generateMessageId } from '../../../utils/id.js';
|
|
3
4
|
/**
|
|
@@ -61,7 +62,10 @@ export async function* streamProviderTurn(provider, params, emitEvent, drainPend
|
|
|
61
62
|
};
|
|
62
63
|
const toolBuckets = new Map();
|
|
63
64
|
let streamError;
|
|
64
|
-
const stream = provider.chatStream({
|
|
65
|
+
const stream = provider.chatStream({
|
|
66
|
+
...params,
|
|
67
|
+
stream: true,
|
|
68
|
+
});
|
|
65
69
|
// Drive the stream manually so each `.next()` can be RACED against the run
|
|
66
70
|
// abort: a Stop tears the in-flight model request down (the provider got
|
|
67
71
|
// `params.signal`), and we ALSO stop pulling within a tick even if a
|
|
@@ -93,7 +97,7 @@ export async function* streamProviderTurn(provider, params, emitEvent, drainPend
|
|
|
93
97
|
break;
|
|
94
98
|
const chunk = res.value;
|
|
95
99
|
if (chunk.error) {
|
|
96
|
-
streamError = chunk.error;
|
|
100
|
+
streamError = new Error(`Provider stream error: ${chunk.error}`);
|
|
97
101
|
break;
|
|
98
102
|
}
|
|
99
103
|
if (!id && chunk.id)
|
|
@@ -203,7 +207,7 @@ export async function* streamProviderTurn(provider, params, emitEvent, drainPend
|
|
|
203
207
|
// other stream error is captured into the synthesized response as before.
|
|
204
208
|
if (signal?.aborted)
|
|
205
209
|
throw err;
|
|
206
|
-
streamError = err instanceof Error ? err
|
|
210
|
+
streamError = err instanceof Error ? err : new Error(String(err));
|
|
207
211
|
}
|
|
208
212
|
finally {
|
|
209
213
|
if (onAbort)
|
|
@@ -303,7 +307,7 @@ export async function* streamProviderTurn(provider, params, emitEvent, drainPend
|
|
|
303
307
|
log.warn('provider stream failed after tool input; surfacing tool call to executor', {
|
|
304
308
|
runId,
|
|
305
309
|
iteration,
|
|
306
|
-
error: streamError,
|
|
310
|
+
error: streamError?.message ?? 'provider stream failed',
|
|
307
311
|
toolCallCount: toolCalls.length,
|
|
308
312
|
});
|
|
309
313
|
}
|
|
@@ -323,7 +327,9 @@ export async function* streamProviderTurn(provider, params, emitEvent, drainPend
|
|
|
323
327
|
});
|
|
324
328
|
yield* drainPending();
|
|
325
329
|
if (streamError && !recoveredToolInputFromStreamError) {
|
|
326
|
-
|
|
330
|
+
if (isProviderRequestError(streamError))
|
|
331
|
+
throw streamError;
|
|
332
|
+
throw new Error(`Provider stream error: ${streamError.message}`);
|
|
327
333
|
}
|
|
328
334
|
const response = {
|
|
329
335
|
id: id || messageId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-turn.js","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/stream-turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAShE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAIxD;;;;GAIG;AACH,SAAS,2BAA2B,CACnC,YAAiE,EACjE,aAAsB;IAEtB,IAAI,aAAa;QAAE,OAAO,iBAAiB,CAAA;IAC3C,QAAQ,YAAY,EAAE,CAAC;QACtB,KAAK,YAAY;YAChB,OAAO,UAAU,CAAA;QAClB,KAAK,QAAQ;YACZ,OAAO,YAAY,CAAA;QACpB,KAAK,gBAAgB;YACpB,OAAO,SAAS,CAAA;QACjB;YACC,OAAO,UAAU,CAAA;IACnB,CAAC;AACF,CAAC;AAOD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,kBAAkB,CACxC,QAAqB,EACrB,MAAuE,EACvE,SAAoB,EACpB,YAAuC,EACvC,KAAkD,EAClD,SAAiB,EACjB,aAAsB,EACtB,GAAW;IAEX,MAAM,SAAS,GAAG,iBAAiB,EAAE,CAAA;IACrC,MAAM,SAAS,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAA;IACzE,KAAK,CAAC,CAAC,YAAY,EAAE,CAAA;IAErB,IAAI,EAAE,GAAG,EAAE,CAAA;IACX,MAAM,KAAK,GAAG,EAAE,CAAA;IAChB,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,IAAI,YAAY,GAA2C,MAAM,CAAA;IACjE,IAAI,KAAK,GAAoC;QAC5C,YAAY,EAAE,CAAC;QACf,gBAAgB,EAAE,CAAC;QACnB,WAAW,EAAE,CAAC;QACd,YAAY,EAAE,CAAC;QACf,gBAAgB,EAAE,CAAC;KACnB,CAAA;IACD,MAAM,WAAW,GAAG,IAAI,GAAG,EAsBxB,CAAA;IACH,IAAI,
|
|
1
|
+
{"version":3,"file":"stream-turn.js","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/stream-turn.ts"],"names":[],"mappings":"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"}
|