@botiverse/oar 0.95.1 → 0.97.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/README.md +64 -44
- package/dist/contracts/context-usage.d.ts +7 -0
- package/dist/contracts/context-usage.d.ts.map +1 -0
- package/dist/contracts/context-usage.js +2 -0
- package/dist/contracts/context-usage.js.map +1 -0
- package/dist/contracts/control.d.ts +4 -1
- package/dist/contracts/control.d.ts.map +1 -1
- package/dist/contracts/deliver.d.ts +3 -1
- package/dist/contracts/deliver.d.ts.map +1 -1
- package/dist/contracts/index.d.ts +1 -1
- package/dist/contracts/index.d.ts.map +1 -1
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/records.d.ts +8 -9
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/contracts/runtime-failure-error.d.ts +9 -3
- package/dist/contracts/runtime-failure-error.d.ts.map +1 -1
- package/dist/contracts/runtime-failure-error.js +0 -9
- package/dist/contracts/runtime-failure-error.js.map +1 -1
- package/dist/contracts/session.d.ts +3 -1
- package/dist/contracts/session.d.ts.map +1 -1
- package/dist/runtimes/antigravity/auth.d.ts +11 -0
- package/dist/runtimes/antigravity/auth.d.ts.map +1 -0
- package/dist/runtimes/antigravity/auth.js +207 -0
- package/dist/runtimes/antigravity/auth.js.map +1 -0
- package/dist/runtimes/antigravity/index.d.ts +3 -0
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/antigravity/index.js +4 -0
- package/dist/runtimes/antigravity/index.js.map +1 -1
- package/dist/runtimes/antigravity/login-browser.d.ts +14 -0
- package/dist/runtimes/antigravity/login-browser.d.ts.map +1 -0
- package/dist/runtimes/antigravity/login-browser.js +30 -0
- package/dist/runtimes/antigravity/login-browser.js.map +1 -0
- package/dist/runtimes/codex/installation.d.ts +8 -0
- package/dist/runtimes/codex/installation.d.ts.map +1 -1
- package/dist/runtimes/codex/installation.js +22 -1
- package/dist/runtimes/codex/installation.js.map +1 -1
- package/dist/runtimes/codex/refusal.d.ts +33 -0
- package/dist/runtimes/codex/refusal.d.ts.map +1 -0
- package/dist/runtimes/codex/refusal.js +90 -0
- package/dist/runtimes/codex/refusal.js.map +1 -0
- package/dist/runtimes/codex/rpc-control.d.ts +13 -1
- package/dist/runtimes/codex/rpc-control.d.ts.map +1 -1
- package/dist/runtimes/codex/rpc-control.js +23 -2
- package/dist/runtimes/codex/rpc-control.js.map +1 -1
- package/dist/runtimes/codex/session.d.ts.map +1 -1
- package/dist/runtimes/codex/session.js +19 -13
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/cursor/auth-status.d.ts +1 -1
- package/dist/runtimes/cursor/auth-status.js +2 -2
- package/dist/runtimes/cursor/index.d.ts +1 -1
- package/dist/runtimes/cursor/login.js +1 -1
- package/dist/runtimes/cursor/logout.js +1 -1
- package/dist/runtimes/grok/failure.d.ts.map +1 -1
- package/dist/runtimes/grok/failure.js +35 -6
- package/dist/runtimes/grok/failure.js.map +1 -1
- package/dist/runtimes/grok/native-turns.d.ts +13 -0
- package/dist/runtimes/grok/native-turns.d.ts.map +1 -0
- package/dist/runtimes/grok/native-turns.js +49 -0
- package/dist/runtimes/grok/native-turns.js.map +1 -0
- package/dist/runtimes/grok/session.d.ts.map +1 -1
- package/dist/runtimes/grok/session.js +12 -6
- package/dist/runtimes/grok/session.js.map +1 -1
- package/dist/runtimes/grok/spontaneous-usage.d.ts +6 -5
- package/dist/runtimes/grok/spontaneous-usage.d.ts.map +1 -1
- package/dist/runtimes/grok/spontaneous-usage.js +7 -6
- package/dist/runtimes/grok/spontaneous-usage.js.map +1 -1
- package/dist/runtimes/opencode/failure.d.ts +3 -0
- package/dist/runtimes/opencode/failure.d.ts.map +1 -0
- package/dist/runtimes/opencode/failure.js +29 -0
- package/dist/runtimes/opencode/failure.js.map +1 -0
- package/dist/runtimes/opencode/session.d.ts.map +1 -1
- package/dist/runtimes/opencode/session.js +2 -0
- package/dist/runtimes/opencode/session.js.map +1 -1
- package/dist/shared/acp/native-turns.d.ts +37 -0
- package/dist/shared/acp/native-turns.d.ts.map +1 -0
- package/dist/shared/acp/native-turns.js +107 -0
- package/dist/shared/acp/native-turns.js.map +1 -0
- package/dist/shared/acp/profile.d.ts +44 -2
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/records.d.ts +4 -1
- package/dist/shared/acp/records.d.ts.map +1 -1
- package/dist/shared/acp/records.js +2 -2
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/session-state.d.ts +22 -0
- package/dist/shared/acp/session-state.d.ts.map +1 -0
- package/dist/shared/acp/session-state.js +39 -0
- package/dist/shared/acp/session-state.js.map +1 -0
- package/dist/shared/acp/session.d.ts +3 -17
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +25 -43
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/steer-request.d.ts +12 -0
- package/dist/shared/acp/steer-request.d.ts.map +1 -0
- package/dist/shared/acp/steer-request.js +56 -0
- package/dist/shared/acp/steer-request.js.map +1 -0
- package/dist/shared/acp/token-usage.d.ts +1 -1
- package/dist/shared/acp/token-usage.d.ts.map +1 -1
- package/dist/shared/acp/token-usage.js +2 -2
- package/dist/shared/acp/token-usage.js.map +1 -1
- package/dist/shared/acp/turns.d.ts +6 -2
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +4 -3
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/deliver-interrupt.d.ts.map +1 -1
- package/dist/shared/deliver-interrupt.js +2 -1
- package/dist/shared/deliver-interrupt.js.map +1 -1
- package/dist/shared/deliver.d.ts +5 -1
- package/dist/shared/deliver.d.ts.map +1 -1
- package/dist/shared/deliver.js +5 -1
- package/dist/shared/deliver.js.map +1 -1
- package/dist/shared/record-retention.d.ts.map +1 -1
- package/dist/shared/record-retention.js +3 -1
- package/dist/shared/record-retention.js.map +1 -1
- package/dist/shared/seal-session.d.ts.map +1 -1
- package/dist/shared/seal-session.js +3 -2
- package/dist/shared/seal-session.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-control.js","sources":["../../../src/runtimes/codex/rpc-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAiC,MAAM,8CAA8C,CAAC;AACtH,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQlE,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"rpc-control.js","sources":["../../../src/runtimes/codex/rpc-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAiC,MAAM,8CAA8C,CAAC;AACtH,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQlE,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAGjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAgBhD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAqB,EACrB,MAAuB,EACvB,IAAoB;IAEpB,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9E,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACrB,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC;IACpE,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,EAAkB,CAAC;IACrE,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,MAAM,GAAG,CAAC,OAAqB,EAAQ,EAAE;QAC7C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,GAAG,IAAI,CAAC;YAChB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC;IACF,2EAA2E;IAC3E,yEAAyE;IACzE,MAAM,IAAI,GAAG,KAAK,IAAmB,EAAE;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACtE,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAAC,OAAO;QAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC3D,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBACpH,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;wBAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;oBAAC,CAAC;gBACxF,CAAC;qBAAM,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACrC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBACtF,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;gBACzH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAC,CAAC;QAClG,CAAC;IACH,CAAC,CAAC;IACF,KAAK,IAAI,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,EAAE,CAAC;AAC9C,CAAC;AAED;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,OAAe;IACxC,IAAI,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,OAAO,4CAA4C,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;AACtF,CAAC;AAED;;;;;;GAMG;AACH,SAAS,WAAW,CAAC,MAAc,EAAE,QAA4B,EAAE,KAAwB,EAAE,OAAe;IAC1G,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACvC,IAAI,MAAM,KAAK,eAAe,IAAI,QAAQ,KAAK,SAAS,IAAI,KAAK,EAAE,MAAM,KAAK,MAAM,IAAI,MAAM,EAAE,IAAI,KAAK,CAAC,MAAM,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACvJ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,SAAS,MAAM,YAAY,OAAO,EAAE,CAAC;IAClD,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,gCAAgC,CAAC,EAAE,CAAC;QAChE,OAAO,IAAI,oBAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACjD,OAAO,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,uBAAuB,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;AAC1G,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAwC,EACxC,IAA+B,EAC/B,OAA+H;IAE/H,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC1C,IAAI,CAAC;QACH,OAAO,MAAM,IAAI,EAAE,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3J,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,MAAM,KAAK,CAAC;QACd,CAAC;QACD,MAAM,MAAM,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,WAAW,gDAAgD,OAAO,EAAE,CAAC;QACzI,sIAAsI;QACtI,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,YAAY,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IACzH,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAAuB,EAAE,QAAgB,EAAE,MAAc,EAAE,OAAsB;IACxH,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,QAAQ,GAAG,gBAAgB,CAAC,wBAAwB,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QACvJ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YAAC,MAAM,QAAQ,CAAC;QAAC,CAAC;QAC1C,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IAC3E,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,MAAuB,EAAE,QAAgB,EAAE,IAAmB,EAAE,SAAuC;IACtI,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO;IACT,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5F,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,sIAAsI;YACtI,MAAM,IAAI,KAAK,CAAC,iCAAiC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAChI,CAAC;QACD,SAAS,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAED,iGAAiG;AACjG,MAAM,UAAU,qBAAqB,CAAC,KAAc,EAAE,GAAW;IAC/D,OAAO,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QACnF,CAAC,CAAC,IAAI,KAAK,CAAC,2CAA2C,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAC/E,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/codex/session.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAuD,YAAY,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/codex/session.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAuD,YAAY,EAAE,MAAM,4BAA4B,CAAC;AA6BpH,eAAO,MAAM,YAAY,EAAE,YAqQzB,CAAC"}
|
|
@@ -15,7 +15,8 @@ import { startAppServerClient } from "./app-server-client.js";
|
|
|
15
15
|
import { CODEX_SETTINGS_REPORT_MS, codexOpenReadback, codexResumeEffortRefusal, codexThreadName, codexThreadOpen } from "./open.js";
|
|
16
16
|
import { foldCodexNotification, initialCodexProjection } from "./projection.js";
|
|
17
17
|
import { prepareCodexToolDenials } from "./tool-denials.js";
|
|
18
|
-
import { missingDirectoryError, nameThread, openThread, rpcControl } from "./rpc-control.js";
|
|
18
|
+
import { missingDirectoryError, nameThread, openThread, rpcControl, updateThreadEffort } from "./rpc-control.js";
|
|
19
|
+
import { codexControlRefusal, codexVersion } from "./refusal.js";
|
|
19
20
|
import { codexServerRequests } from "./runtime-requests.js";
|
|
20
21
|
import { codexTurnProcesses, refuseSharedTurnProcesses } from "./turn-processes.js";
|
|
21
22
|
export const codexSession = withSessionCredentials(async (installation, options, credentials, context) => {
|
|
@@ -38,10 +39,11 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
38
39
|
cleanup.reason = reason;
|
|
39
40
|
} });
|
|
40
41
|
try {
|
|
41
|
-
|
|
42
|
+
// The running binary's own version; the probed one when codex names none.
|
|
43
|
+
const version = codexVersion(await client.request("initialize", {
|
|
42
44
|
clientInfo: { name: "oar", version: "0.0.0" },
|
|
43
45
|
capabilities: { experimentalApi: true },
|
|
44
|
-
});
|
|
46
|
+
})) ?? installation.version ?? null;
|
|
45
47
|
client.notify("initialized", {});
|
|
46
48
|
if (options.goals === true) {
|
|
47
49
|
await confirmCodexGoals(client);
|
|
@@ -61,7 +63,7 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
61
63
|
const started = await openThread(openMethod, async () => {
|
|
62
64
|
const reply = await client.request(openMethod, filteredOpenParams, markOpen);
|
|
63
65
|
return reply;
|
|
64
|
-
}, options.serviceTier, options.resume);
|
|
66
|
+
}, { version, serviceTier: options.serviceTier, resumeId: options.resume });
|
|
65
67
|
const threadId = asRecord(started.thread)?.id;
|
|
66
68
|
if (typeof threadId !== "string") {
|
|
67
69
|
throw new TypeError("codex thread start/resume returned no thread id");
|
|
@@ -162,11 +164,15 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
162
164
|
const timer = setTimeout(() => {
|
|
163
165
|
resolve(null);
|
|
164
166
|
}, CODEX_SETTINGS_REPORT_MS);
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
167
|
+
let refusal = null;
|
|
168
|
+
try {
|
|
169
|
+
const update = await updateThreadEffort(client, threadId, requested, version);
|
|
170
|
+
refusal = codexResumeEffortRefusal(requested, update, update === null ? await reported : null);
|
|
171
|
+
}
|
|
172
|
+
finally {
|
|
173
|
+
clearTimeout(timer);
|
|
174
|
+
settingsWaiter = null;
|
|
175
|
+
}
|
|
170
176
|
if (refusal !== null) {
|
|
171
177
|
throw new Error(refusal);
|
|
172
178
|
}
|
|
@@ -197,9 +203,9 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
197
203
|
state.codexTurnId = turnId;
|
|
198
204
|
return { kind: "accepted", native: reply };
|
|
199
205
|
},
|
|
200
|
-
onError: (message) => {
|
|
206
|
+
onError: (message, native) => {
|
|
201
207
|
state.active = null;
|
|
202
|
-
return
|
|
208
|
+
return codexControlRefusal(message, native);
|
|
203
209
|
},
|
|
204
210
|
});
|
|
205
211
|
const steerPlan = (input, inputOptions) => {
|
|
@@ -215,7 +221,7 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
215
221
|
}
|
|
216
222
|
return { kind: "accepted", native: reply };
|
|
217
223
|
},
|
|
218
|
-
onError: (message) => (
|
|
224
|
+
onError: (message, native) => codexControlRefusal(`not_steerable: ${message}`, native),
|
|
219
225
|
};
|
|
220
226
|
};
|
|
221
227
|
const queuePlan = (input, inputOptions) => ({
|
|
@@ -225,7 +231,7 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
225
231
|
method: "thread/queue/add",
|
|
226
232
|
params: () => ({ threadId, input: codexUserInput(input, inputOptions?.images), clientUserMessageId: inputOptions?.inputId ?? randomUUID() }),
|
|
227
233
|
onReply: (reply) => ({ kind: "accepted", native: reply }),
|
|
228
|
-
onError: (message) => (
|
|
234
|
+
onError: (message, native) => codexControlRefusal(message, native),
|
|
229
235
|
});
|
|
230
236
|
// An early or late interrupt can be refused; turn/completed is the outcome.
|
|
231
237
|
const abortPlan = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/codex/session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/codex/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AuthStatus, AuthStatusReader } from "../../contracts/login.js";
|
|
2
2
|
import { type CursorAuth, type CursorSdk } from "./sdk.js";
|
|
3
3
|
/**
|
|
4
|
-
* `Cursor.auth.status()` (SDK 1.
|
|
4
|
+
* `Cursor.auth.status()` (SDK 1.3.1) reads the stored login
|
|
5
5
|
* (`~/.cursor/sdk/auth.json`) and answers `{ status: "logged-out" }`, also
|
|
6
6
|
* for a key past its expiry, or `{ status: "logged-in", backendUrl, email?,
|
|
7
7
|
* apiKeyExpiresAtMs? }`; it never returns the key. `CURSOR_API_KEY` is not
|
|
@@ -10,7 +10,7 @@ function text(value) {
|
|
|
10
10
|
return typeof value === "string" && value.trim() !== "" ? value.trim() : undefined;
|
|
11
11
|
}
|
|
12
12
|
/**
|
|
13
|
-
* `Cursor.auth.status()` (SDK 1.
|
|
13
|
+
* `Cursor.auth.status()` (SDK 1.3.1) reads the stored login
|
|
14
14
|
* (`~/.cursor/sdk/auth.json`) and answers `{ status: "logged-out" }`, also
|
|
15
15
|
* for a key past its expiry, or `{ status: "logged-in", backendUrl, email?,
|
|
16
16
|
* apiKeyExpiresAtMs? }`; it never returns the key. `CURSOR_API_KEY` is not
|
|
@@ -74,7 +74,7 @@ export function cursorAuthStatusWith(load) {
|
|
|
74
74
|
}
|
|
75
75
|
const { auth } = sdk.Cursor;
|
|
76
76
|
if (auth === undefined) {
|
|
77
|
-
return { kind: "unknown", detail: "this @cursor/sdk has no Cursor.auth; OAR needs 1.
|
|
77
|
+
return { kind: "unknown", detail: "this @cursor/sdk has no Cursor.auth; OAR needs 1.3.1" };
|
|
78
78
|
}
|
|
79
79
|
const status = await readCursorAuthStatus(auth, options.timeoutMs);
|
|
80
80
|
return status;
|
|
@@ -2,7 +2,7 @@ import { type Runtime } from "../../contracts/runtime.js";
|
|
|
2
2
|
import { type CursorSdk } from "./sdk.js";
|
|
3
3
|
export interface CursorRuntimeOptions {
|
|
4
4
|
/**
|
|
5
|
-
* Loads `@cursor/sdk` 1.
|
|
5
|
+
* Loads `@cursor/sdk` 1.3.1, which the host installs (an optional peer
|
|
6
6
|
* dependency of OAR): `() => import("@cursor/sdk")`. Written in the host's
|
|
7
7
|
* own code, the import fails the host's compile when the package is
|
|
8
8
|
* missing, checks the SDK's types against `CursorSdk`, and is visible to
|
|
@@ -154,7 +154,7 @@ export function cursorLoginWith(load) {
|
|
|
154
154
|
const { auth } = sdk.Cursor;
|
|
155
155
|
const Store = sdk.FileCredentialStore;
|
|
156
156
|
if (auth === undefined || Store === undefined) {
|
|
157
|
-
return { kind: "unsupported", reason: "version_unsupported", detail: "@cursor/sdk 1.
|
|
157
|
+
return { kind: "unsupported", reason: "version_unsupported", detail: "@cursor/sdk 1.3.1 is required; this one has no Cursor.auth" };
|
|
158
158
|
}
|
|
159
159
|
// The caller may have aborted while the SDK loaded.
|
|
160
160
|
if (aborted()) {
|
|
@@ -51,7 +51,7 @@ export function cursorLogoutWith(load) {
|
|
|
51
51
|
}
|
|
52
52
|
const { auth } = sdk.Cursor;
|
|
53
53
|
if (auth?.logout === undefined) {
|
|
54
|
-
return { kind: "unsupported", reason: "version_unsupported", detail: "@cursor/sdk 1.
|
|
54
|
+
return { kind: "unsupported", reason: "version_unsupported", detail: "@cursor/sdk 1.3.1 is required; this one has no Cursor.auth.logout" };
|
|
55
55
|
}
|
|
56
56
|
// With no store: the SDK's own default, the file `status()` reads.
|
|
57
57
|
const native = await sdkLogout(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failure.d.ts","sources":["../../../src/runtimes/grok/failure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA2B,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAgC,KAAK,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"failure.d.ts","sources":["../../../src/runtimes/grok/failure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA2B,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAgC,KAAK,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAElG,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAsDjE,eAAO,MAAM,kBAAkB,EAAE,gBAYhC,CAAC;AAEF,uGAAuG;AACvG,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,UAAU,GAAG,WAAW,CAQnE"}
|
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
import { acpErrorReason, rpcErrorCode } from "../../shared/acp/failure.js";
|
|
2
|
+
import { failureFromErrorCode, failureFromStatus } from "../../shared/failure-class.js";
|
|
2
3
|
import { asRecord } from "../../shared/json.js";
|
|
3
4
|
/*
|
|
4
5
|
* A prompt grok answered with an error (docs/spec/runtime-matrix.md#opencode-kimi-grok-antigravity-acp),
|
|
5
|
-
* observed on 1.0.46 against a scripted provider: -32003 "Rate
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
* is the `error_type` of the `retry_state`
|
|
6
|
+
* observed on 1.0.46 and 1.0.77 against a scripted provider: -32003 "Rate
|
|
7
|
+
* limited" for every HTTP 429, its `data` the provider's words as
|
|
8
|
+
* `API error (status 429 …): <error type>: <message>`; otherwise -32603
|
|
9
|
+
* "Internal error", whose cause is the `error_type` of the `retry_state`
|
|
10
|
+
* update that ended grok's retries, and whose `data.http_status` is the
|
|
11
|
+
* provider's status for an API error (sampling/error.rs
|
|
12
|
+
* `map_sampling_err_to_acp`, `error_data_with_status`).
|
|
9
13
|
*/
|
|
10
14
|
const RATE_LIMITED = -32_003;
|
|
15
|
+
/** Grok's own code for an exhausted free allowance on a 429 (sampling/error.rs `FREE_USAGE_EXHAUSTED_ERROR_CODE`). */
|
|
16
|
+
const FREE_USAGE_EXHAUSTED = "subscription:free-usage-exhausted";
|
|
11
17
|
const ERROR_TYPES = {
|
|
12
18
|
auth: "auth",
|
|
13
19
|
rate_limited: "rate_limited",
|
|
@@ -24,14 +30,37 @@ function finalRetryState(frames) {
|
|
|
24
30
|
}
|
|
25
31
|
return null;
|
|
26
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* A 429 is throttling unless the provider named a spending limit: Grok's
|
|
35
|
+
* free-usage code, or an error type the shared table calls `quota` or
|
|
36
|
+
* `billing` (`insufficient_quota`, 1.0.77). The type is the word after
|
|
37
|
+
* Grok's `API error (status …): ` prefix.
|
|
38
|
+
*/
|
|
39
|
+
function limitFailure(detail) {
|
|
40
|
+
if (detail.includes(FREE_USAGE_EXHAUSTED)) {
|
|
41
|
+
return "quota";
|
|
42
|
+
}
|
|
43
|
+
const type = /API error \(status [^)]*\): ([\w.-]+):/u.exec(detail)?.[1];
|
|
44
|
+
const named = type === undefined ? null : failureFromErrorCode(type);
|
|
45
|
+
return named === "quota" || named === "billing" ? named : "rate_limited";
|
|
46
|
+
}
|
|
47
|
+
/** The provider's HTTP status Grok put on an API error's `data` (-32603 only). */
|
|
48
|
+
function httpStatus(error) {
|
|
49
|
+
const status = asRecord(error instanceof Error && "data" in error ? error.data : undefined)?.http_status;
|
|
50
|
+
return typeof status === "number" && Number.isInteger(status) ? status : null;
|
|
51
|
+
}
|
|
27
52
|
export const grokFailureOutcome = (error, frames) => {
|
|
28
53
|
const reason = acpErrorReason(error);
|
|
29
54
|
if (rpcErrorCode(error) === RATE_LIMITED) {
|
|
30
|
-
return { kind: "failed", reason, failure:
|
|
55
|
+
return { kind: "failed", reason, failure: limitFailure(reason), status: 429 };
|
|
31
56
|
}
|
|
32
57
|
const update = finalRetryState(frames);
|
|
33
58
|
const named = typeof update?.error_type === "string" ? ERROR_TYPES[update.error_type] : undefined;
|
|
34
|
-
|
|
59
|
+
// Grok's `api` is any API error; the status it kept says which (402: billing).
|
|
60
|
+
const status = httpStatus(error);
|
|
61
|
+
const byStatus = status === null ? "unknown" : failureFromStatus(status);
|
|
62
|
+
const failure = (named === undefined || named === "provider") && byStatus !== "unknown" ? byStatus : named;
|
|
63
|
+
return failure === undefined ? null : { kind: "failed", reason, failure, ...(status === null ? {} : { status }) };
|
|
35
64
|
};
|
|
36
65
|
/** Grok validates its schema and reports either a value or a typed error field, even with end_turn. */
|
|
37
66
|
export function grokPromptOutcome(response) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failure.js","sources":["../../../src/runtimes/grok/failure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAyB,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAEjE
|
|
1
|
+
{"version":3,"file":"failure.js","sources":["../../../src/runtimes/grok/failure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAyB,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAEjE;;;;;;;;;GASG;AAEH,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC;AAC7B,sHAAsH;AACtH,MAAM,oBAAoB,GAAG,mCAAmC,CAAC;AAEjE,MAAM,WAAW,GAAoD;IACnE,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,cAAc;IAC5B,cAAc,EAAE,iBAAiB;IACjC,GAAG,EAAE,UAAU;CAChB,CAAC;AAEF,yFAAyF;AACzF,SAAS,eAAe,CAAC,MAA4B;IACnD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,KAAK,4BAA4B,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7G,IAAI,MAAM,EAAE,aAAa,KAAK,aAAa,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;YACzG,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,YAAY,CAAC,MAAc;IAClC,IAAI,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAAC,OAAO,OAAO,CAAC;IAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,yCAAyC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACzE,MAAM,KAAK,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACrE,OAAO,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC;AAC3E,CAAC;AAED,kFAAkF;AAClF,SAAS,UAAU,CAAC,KAAc;IAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC;IACzG,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAChF,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;IACpE,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACrC,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,YAAY,EAAE,CAAC;QACzC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAChF,CAAC;IACD,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,OAAO,MAAM,EAAE,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClG,+EAA+E;IAC/E,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,UAAU,CAAC,IAAI,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3G,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;AACpH,CAAC,CAAC;AAEF,uGAAuG;AACvG,MAAM,UAAU,iBAAiB,CAAC,QAAoB;IACpD,IAAI,QAAQ,CAAC,UAAU,KAAK,WAAW,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAAC,CAAC;IACxE,wGAAwG;IACxG,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,OAAO,IAAI,EAAE,qBAAqB,KAAK,QAAQ,EAAE,CAAC;QACpD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC1F,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AACjJ,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { AcpNativeTurns } from "../../shared/acp/profile.js";
|
|
2
|
+
/**
|
|
3
|
+
* Grok runs turns OAR never prompted: a finished sub-agent wakes its parent
|
|
4
|
+
* (`subagent-completed-*`), an interjection that missed its turn runs on its
|
|
5
|
+
* own (`interject-fallback-*`), and more (grok-build 2bdd1d6: `bash-completed-*`,
|
|
6
|
+
* `goal-summary-*`, ...). Grok takes the client's `_meta.promptId` verbatim
|
|
7
|
+
* (acp_agent.rs `prompt`), so OAR names its own prompts and every other name is
|
|
8
|
+
* Grok's. Its `_x.ai/queue/changed` lists held prompt ids and the running one
|
|
9
|
+
* (`runningPromptId`); its `turn_completed` closes a turn by `prompt_id`
|
|
10
|
+
* (live 1.0.77: experiments/grok-interject/README.md).
|
|
11
|
+
*/
|
|
12
|
+
export declare const grokNativeTurns: AcpNativeTurns;
|
|
13
|
+
//# sourceMappingURL=native-turns.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-turns.d.ts","sources":["../../../src/runtimes/grok/native-turns.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAIlE;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,EAAE,cAoB7B,CAAC"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { classifyFailure } from "../../shared/failure-class.js";
|
|
2
|
+
import { asRecord } from "../../shared/json.js";
|
|
3
|
+
/**
|
|
4
|
+
* Grok runs turns OAR never prompted: a finished sub-agent wakes its parent
|
|
5
|
+
* (`subagent-completed-*`), an interjection that missed its turn runs on its
|
|
6
|
+
* own (`interject-fallback-*`), and more (grok-build 2bdd1d6: `bash-completed-*`,
|
|
7
|
+
* `goal-summary-*`, ...). Grok takes the client's `_meta.promptId` verbatim
|
|
8
|
+
* (acp_agent.rs `prompt`), so OAR names its own prompts and every other name is
|
|
9
|
+
* Grok's. Its `_x.ai/queue/changed` lists held prompt ids and the running one
|
|
10
|
+
* (`runningPromptId`); its `turn_completed` closes a turn by `prompt_id`
|
|
11
|
+
* (live 1.0.77: experiments/grok-interject/README.md).
|
|
12
|
+
*/
|
|
13
|
+
export const grokNativeTurns = {
|
|
14
|
+
promptMeta: (promptId) => ({ promptId }),
|
|
15
|
+
read(method, params) {
|
|
16
|
+
if (method === "_x.ai/queue/changed") {
|
|
17
|
+
const entries = Array.isArray(params.entries) ? params.entries : [];
|
|
18
|
+
const queued = entries.flatMap((entry) => {
|
|
19
|
+
const id = asRecord(entry)?.id;
|
|
20
|
+
return typeof id === "string" && id !== "" ? [id] : [];
|
|
21
|
+
});
|
|
22
|
+
const running = typeof params.runningPromptId === "string" && params.runningPromptId !== "" ? params.runningPromptId : null;
|
|
23
|
+
return { kind: "queue", running, queued };
|
|
24
|
+
}
|
|
25
|
+
if (method !== "_x.ai/session_notification") {
|
|
26
|
+
return null;
|
|
27
|
+
}
|
|
28
|
+
const update = asRecord(params.update);
|
|
29
|
+
if (update?.sessionUpdate !== "turn_completed" || typeof update.prompt_id !== "string" || update.prompt_id === "") {
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
// A later wake of the same child reuses its prompt id; the native event id tells the reports apart.
|
|
33
|
+
// oxlint-disable-next-line eslint/no-underscore-dangle -- Native ACP extension envelope.
|
|
34
|
+
const key = asRecord(params._meta)?.eventId;
|
|
35
|
+
return { kind: "ended", promptId: update.prompt_id, outcome: grokTurnOutcome(update), ...(typeof key === "string" && key !== "" ? { key } : {}) };
|
|
36
|
+
},
|
|
37
|
+
};
|
|
38
|
+
/** `stop_reason`: the model's (`end_turn`, ...), `cancelled`, or `error` with the message in `agent_result` (turn_completion.rs). */
|
|
39
|
+
function grokTurnOutcome(update) {
|
|
40
|
+
if (update.stop_reason === "cancelled") {
|
|
41
|
+
return { kind: "aborted" };
|
|
42
|
+
}
|
|
43
|
+
if (update.stop_reason === "error") {
|
|
44
|
+
const reason = typeof update.agent_result === "string" && update.agent_result !== "" ? update.agent_result : "Grok reported an error";
|
|
45
|
+
return { kind: "failed", reason, failure: classifyFailure(reason) };
|
|
46
|
+
}
|
|
47
|
+
return { kind: "completed" };
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=native-turns.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-turns.js","sources":["../../../src/runtimes/grok/native-turns.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAEjE;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,eAAe,GAAmB;IAC7C,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,MAAM;QACjB,IAAI,MAAM,KAAK,qBAAqB,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACpE,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,KAAc,EAAE,EAAE;gBAChD,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;gBAC/B,OAAO,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ,IAAI,MAAM,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5H,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC5C,CAAC;QACD,IAAI,MAAM,KAAK,4BAA4B,EAAE,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,MAAM,EAAE,aAAa,KAAK,gBAAgB,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;QACnI,oGAAoG;QACpG,yFAAyF;QACzF,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;QAC5C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IACpJ,CAAC;CACF,CAAC;AAEF,qIAAqI;AACrI,SAAS,eAAe,CAAC,MAAkB;IACzC,IAAI,MAAM,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAAC,CAAC;IACvE,IAAI,MAAM,CAAC,WAAW,KAAK,OAAO,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,IAAI,MAAM,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,wBAAwB,CAAC;QACtI,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;IACtE,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AAC/B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/grok/session.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE5F,OAAO,EAAc,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/grok/session.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE5F,OAAO,EAAc,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAc3E,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS,CAQhF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,CAYtE;AAYD,8EAA8E;AAC9E,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,UAAU,GAAG,YAAY,GAAG,IAAI,CAc1E;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,CAUzE;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,4BAA4B,EAAE,SAAS,MAAM,EAoBzD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,iBA6C5B,CAAC;AAEF,eAAO,MAAM,WAAW,mDAA6B,CAAC"}
|
|
@@ -9,6 +9,7 @@ import { asNumber, asRecord } from "../../shared/json.js";
|
|
|
9
9
|
import { cacheParts, reasoningPart } from "../../shared/token-totals.js";
|
|
10
10
|
import { grokFailureOutcome, grokPromptOutcome } from "./failure.js";
|
|
11
11
|
import { grokSpontaneousTokens } from "./spontaneous-usage.js";
|
|
12
|
+
import { grokNativeTurns } from "./native-turns.js";
|
|
12
13
|
import { redactGrokNotification } from "../../shared/credential-redaction.js";
|
|
13
14
|
function authMethodIds(initialized) {
|
|
14
15
|
return (Array.isArray(initialized.authMethods) ? initialized.authMethods : [])
|
|
@@ -128,6 +129,8 @@ export const GROK_EXTENSION_NOTIFICATIONS = [
|
|
|
128
129
|
"_x.ai/mcp/init_progress",
|
|
129
130
|
"_x.ai/mcp/server_status",
|
|
130
131
|
"_x.ai/mcp_initialized",
|
|
132
|
+
// live 1.0.77: the echo of an accepted `_x.ai/interject` (experiments/grok-interject)
|
|
133
|
+
"_x.ai/session/interjection",
|
|
131
134
|
// [sym] only
|
|
132
135
|
"_x.ai/session/update",
|
|
133
136
|
"_x.ai/task_backgrounded",
|
|
@@ -165,12 +168,15 @@ export const grokAcpProfile = {
|
|
|
165
168
|
},
|
|
166
169
|
sessionMeta: () => ({ yoloMode: true }),
|
|
167
170
|
selectAuthMethod: selectGrokAuthMethod,
|
|
168
|
-
// `
|
|
169
|
-
// `
|
|
170
|
-
//
|
|
171
|
-
//
|
|
172
|
-
|
|
173
|
-
|
|
171
|
+
// `_x.ai/interject` adds the input to the running turn without cancelling
|
|
172
|
+
// it: Grok answers `queued` at once and the turn takes it at its next safe
|
|
173
|
+
// point; one that misses the turn runs as Grok's own (live 1.0.77,
|
|
174
|
+
// experiments/grok-interject). `_meta.sendNow` would cancel the turn instead.
|
|
175
|
+
steerRequest: ({ sessionId, input, prompt, inputId }) => ({
|
|
176
|
+
method: "_x.ai/interject",
|
|
177
|
+
params: { sessionId, text: input, interjectionId: inputId, ...(prompt.some((block) => block.type === "image") ? { content: prompt } : {}) },
|
|
178
|
+
}),
|
|
179
|
+
nativeTurns: grokNativeTurns,
|
|
174
180
|
promptMeta: (options) => options.outputSchema === undefined ? undefined : { outputSchema: options.outputSchema },
|
|
175
181
|
promptOutcome: grokPromptOutcome,
|
|
176
182
|
promptContextUsage: grokContextUsage,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/grok/session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/grok/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import type { TokenTotals } from "../../contracts/session.js";
|
|
2
2
|
import { type JsonRecord } from "../../shared/json.js";
|
|
3
3
|
/**
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* The ledger of a turn Grok ran on its own: a prompt OAR did not send (a
|
|
5
|
+
* sub-agent's completion wake, spawn.rs::inject_subagent_completed_prompt; a
|
|
6
|
+
* late interjection; native-turns.ts). Its terminal ledger is independent of
|
|
7
|
+
* RPC prompt ledgers, which carry OAR's own prompts. The ACP recorder enforces
|
|
8
|
+
* root attribution; child frames never reach this.
|
|
8
9
|
*/
|
|
9
|
-
export declare function grokSpontaneousTokens(method: string, params: JsonRecord): {
|
|
10
|
+
export declare function grokSpontaneousTokens(method: string, params: JsonRecord, sentByOar?: (promptId: string) => boolean): {
|
|
10
11
|
readonly key: string;
|
|
11
12
|
readonly tokens: TokenTotals;
|
|
12
13
|
readonly replayed?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spontaneous-usage.d.ts","sources":["../../../src/runtimes/grok/spontaneous-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAG3E
|
|
1
|
+
{"version":3,"file":"spontaneous-usage.d.ts","sources":["../../../src/runtimes/grok/spontaneous-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAG3E;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,GAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAqB,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAe5N"}
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
import { asNumber, asRecord } from "../../shared/json.js";
|
|
2
2
|
import { cacheParts, reasoningPart } from "../../shared/token-totals.js";
|
|
3
3
|
/**
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* The ledger of a turn Grok ran on its own: a prompt OAR did not send (a
|
|
5
|
+
* sub-agent's completion wake, spawn.rs::inject_subagent_completed_prompt; a
|
|
6
|
+
* late interjection; native-turns.ts). Its terminal ledger is independent of
|
|
7
|
+
* RPC prompt ledgers, which carry OAR's own prompts. The ACP recorder enforces
|
|
8
|
+
* root attribution; child frames never reach this.
|
|
8
9
|
*/
|
|
9
|
-
export function grokSpontaneousTokens(method, params) {
|
|
10
|
+
export function grokSpontaneousTokens(method, params, sentByOar = () => false) {
|
|
10
11
|
if (method !== "_x.ai/session_notification") {
|
|
11
12
|
return null;
|
|
12
13
|
}
|
|
13
14
|
const update = asRecord(params.update);
|
|
14
15
|
if (update?.sessionUpdate !== "turn_completed" || typeof update.prompt_id !== "string"
|
|
15
|
-
||
|
|
16
|
+
|| update.prompt_id === "" || sentByOar(update.prompt_id)) {
|
|
16
17
|
return null;
|
|
17
18
|
}
|
|
18
19
|
// eventId is stable across duplicate delivery. A later wake of the same
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spontaneous-usage.js","sources":["../../../src/runtimes/grok/spontaneous-usage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAEzE
|
|
1
|
+
{"version":3,"file":"spontaneous-usage.js","sources":["../../../src/runtimes/grok/spontaneous-usage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAEzE;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAc,EAAE,MAAkB,EAAE,SAAS,GAAkC,GAAG,EAAE,CAAC,KAAK;IAC9H,IAAI,MAAM,KAAK,4BAA4B,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,MAAM,EAAE,aAAa,KAAK,gBAAgB,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;WACjF,MAAM,CAAC,SAAS,KAAK,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC7E,wEAAwE;IACxE,6EAA6E;IAC7E,yFAAyF;IACzF,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,GAAG,GAAG,IAAI,EAAE,OAAO,CAAC;IAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,EAAE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAClH,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AAClO,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"failure.d.ts","sources":["../../../src/runtimes/opencode/failure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAyBlG,eAAO,MAAM,sBAAsB,EAAE,gBAKpC,CAAC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { acpErrorReason, rpcErrorCode } from "../../shared/acp/failure.js";
|
|
2
|
+
import { asRecord } from "../../shared/json.js";
|
|
3
|
+
/*
|
|
4
|
+
* OpenCode's JSON-RPC -32603 prompt errors can carry `data`
|
|
5
|
+
* `{ service, errorName }`; `errorName` is opencode's own `SessionError`
|
|
6
|
+
* type (read on v2.2.6: packages/cli/src/acp/error.ts, packages/core/src/session/to-session-error.ts).
|
|
7
|
+
* Only that field is read, and only a name in the table decides: any other
|
|
8
|
+
* answer (no name, or one like `APIError`) is left to the generic rules, which
|
|
9
|
+
* read its words. The status, retry delay and body do not reach ACP, and
|
|
10
|
+
* nothing says whose quota a limit is, so no scope is reported.
|
|
11
|
+
*/
|
|
12
|
+
const INTERNAL_ERROR = -32_603;
|
|
13
|
+
const ERROR_NAMES = {
|
|
14
|
+
"provider.free-limit": "quota",
|
|
15
|
+
"provider.go-limit": "quota",
|
|
16
|
+
"provider.budget-limit": "quota",
|
|
17
|
+
"provider.model-budget-limit": "quota",
|
|
18
|
+
"provider.quota": "quota",
|
|
19
|
+
"provider.rate-limit": "rate_limited",
|
|
20
|
+
};
|
|
21
|
+
export const opencodeFailureOutcome = (error) => {
|
|
22
|
+
if (rpcErrorCode(error) !== INTERNAL_ERROR) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
const errorName = asRecord(error instanceof Error && "data" in error ? error.data : undefined)?.errorName;
|
|
26
|
+
const failure = typeof errorName === "string" && Object.hasOwn(ERROR_NAMES, errorName) ? ERROR_NAMES[errorName] : undefined;
|
|
27
|
+
return failure === undefined ? null : { kind: "failed", reason: acpErrorReason(error), failure };
|
|
28
|
+
};
|
|
29
|
+
//# sourceMappingURL=failure.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"failure.js","sources":["../../../src/runtimes/opencode/failure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAyB,MAAM,6BAA6B,CAAC;AAElG,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD;;;;;;;;GAQG;AAEH,MAAM,cAAc,GAAG,CAAC,MAAM,CAAC;AAE/B,MAAM,WAAW,GAAoD;IACnE,qBAAqB,EAAE,OAAO;IAC9B,mBAAmB,EAAE,OAAO;IAC5B,uBAAuB,EAAE,OAAO;IAChC,6BAA6B,EAAE,OAAO;IACtC,gBAAgB,EAAE,OAAO;IACzB,qBAAqB,EAAE,cAAc;CACtC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAqB,CAAC,KAAK,EAAE,EAAE;IAChE,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,cAAc,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;IAC1G,MAAM,OAAO,GAAG,OAAO,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5H,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;AACnG,CAAC,CAAC"}
|