@desplega.ai/agent-swarm 2.7.8 → 2.7.9
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/dist/acp-adapter-dn4gdsgr.js +16 -0
- package/dist/{actions-4m1ct4nh.js → actions-g563mbn2.js} +19 -19
- package/dist/{amp-adapter-txqh7eqj.js → amp-adapter-q61w05eb.js} +3 -3
- package/dist/{anthropic-messages-xey2skwx.js → anthropic-messages-jkva0zps.js} +68 -78
- package/dist/{app-e00m45gn.js → app-a66ssc4k.js} +3 -3
- package/dist/{assistant-gd08kr9e.js → assistant-p477rjwj.js} +21 -21
- package/dist/{azure-openai-responses-26t7j9ra.js → azure-openai-responses-wgtqkbr3.js} +5 -10
- package/dist/{boot-args-schema-tjrkpbvm.js → boot-args-schema-h4qj462e.js} +1 -1
- package/dist/{boot-reembed-21hbck22.js → boot-reembed-n1ehfbsw.js} +1 -1
- package/dist/{boot-reembed-mdxd3wgp.js → boot-reembed-qw4mc0pt.js} +1 -1
- package/dist/{boot-scrub-sweep-qy0zr9t2.js → boot-scrub-sweep-9w9jp4sm.js} +4 -4
- package/dist/{boot-seeds-n46eaxdv.js → boot-seeds-qdaf3sdy.js} +5 -4
- package/dist/{boxd-nv507va8.js → boxd-qbkxy6ap.js} +1 -1
- package/dist/{claude-adapter-j37w2eds.js → claude-adapter-348p5hx9.js} +8 -8
- package/dist/{claude-managed-adapter-8jvcma9a.js → claude-managed-adapter-h74d06yz.js} +4 -4
- package/dist/{claude-managed-setup-rzkjmgc1.js → claude-managed-setup-7787fxtp.js} +4 -4
- package/dist/{claude-sdk-session-4k7w73t0.js → claude-sdk-session-hbszbt8a.js} +7901 -7718
- package/dist/{cli-sq4n7af4.js → cli-09kmfkmq.js} +4 -6
- package/dist/{cli-p3vsj0d3.js → cli-0whpms1z.js} +15 -10
- package/dist/{cli-4t50yq3j.js → cli-12xyjhws.js} +29 -12
- package/dist/{cli-snpj5zbj.js → cli-1z4qggfe.js} +9 -36
- package/dist/{cli-bb0mmdk8.js → cli-21159vea.js} +35 -12
- package/dist/{cli-s0qnd4wv.js → cli-28fq781p.js} +1 -1
- package/dist/{cli-rjknb2ae.js → cli-2a8py3sx.js} +6 -6
- package/dist/{cli-tpksw2nr.js → cli-2ccpqyyf.js} +397 -105
- package/dist/{cli-1p89xny0.js → cli-2r0jcc3k.js} +1 -1
- package/dist/{cli-rvtm68yy.js → cli-2xv18ywz.js} +2 -2
- package/dist/{cli-5xaqj21p.js → cli-3kd08rej.js} +1 -1
- package/dist/{cli-bbw9wj9m.js → cli-3tqcamp6.js} +12 -12
- package/dist/{cli-ae7mrdf9.js → cli-3vjhs18n.js} +4 -6
- package/dist/{cli-ssnjfg5p.js → cli-3xcwp3z8.js} +8 -10
- package/dist/{cli-az48n0nr.js → cli-4caa1x7d.js} +67 -64
- package/dist/{cli-269q28a1.js → cli-4t0fmf3z.js} +27 -6
- package/dist/{cli-1cxrbkk6.js → cli-530hkwdy.js} +7 -9
- package/dist/{cli-pz4rk021.js → cli-54vrpgm0.js} +1 -1
- package/dist/{cli-eyg1pa00.js → cli-587857ys.js} +7 -7
- package/dist/{cli-r9jqcehk.js → cli-5mpy301f.js} +38 -2
- package/dist/{cli-xq9r2wtt.js → cli-605nn699.js} +47 -34
- package/dist/{cli-msg9m2ny.js → cli-650zv9q9.js} +8 -10
- package/dist/cli-6pzk82fd.js +778 -0
- package/dist/{cli-84rj785g.js → cli-715t1gx6.js} +9 -9
- package/dist/{cli-btfsp3mv.js → cli-9aezs55w.js} +9 -11
- package/dist/{cli-dq8x79v8.js → cli-9r5gtwjr.js} +2 -2
- package/dist/{cli-jdv6ypxs.js → cli-a0657jmf.js} +2 -2
- package/dist/{cli-bshb7jas.js → cli-agyaeef4.js} +3 -3
- package/dist/cli-b932gexn.js +5266 -0
- package/dist/{cli-gvx71kqv.js → cli-bc779n4v.js} +3 -3
- package/dist/{cli-z1srzaf6.js → cli-btc9cb4c.js} +70 -5
- package/dist/{cli-s4ss5g59.js → cli-btf6fw39.js} +5 -5
- package/dist/{cli-fzachfnf.js → cli-cseh6f8w.js} +5 -5
- package/dist/{cli-5j0m12ns.js → cli-cvs2r2vq.js} +13 -11
- package/dist/{cli-njwac61j.js → cli-cyn9v8zr.js} +12 -2
- package/dist/{cli-a22h291q.js → cli-d6521kb5.js} +1 -1
- package/dist/{cli-1b7btd38.js → cli-d84byzn8.js} +869 -5
- package/dist/{cli-wx3rhnm0.js → cli-eddnyg3t.js} +1 -1
- package/dist/{cli-7axf41jq.js → cli-ejkvvqbe.js} +40 -42
- package/dist/{cli-mthwvjre.js → cli-f2zenhja.js} +1 -1
- package/dist/{cli-8sdejs1f.js → cli-fayav105.js} +538 -205
- package/dist/{cli-ferkkrg9.js → cli-fjggej24.js} +2 -2
- package/dist/{cli-g7s47cc5.js → cli-fsgttth8.js} +123 -102
- package/dist/{cli-9m8hdawy.js → cli-gce09r66.js} +4 -4
- package/dist/{cli-mkk9rnzz.js → cli-gxy8y1dt.js} +51 -4
- package/dist/{cli-85gzce7b.js → cli-hae9j8sv.js} +287 -75
- package/dist/{cli-agfm16v9.js → cli-hg42n3hx.js} +12 -12
- package/dist/{cli-8rpcng8j.js → cli-hwprv9e4.js} +8 -10
- package/dist/{cli-yndmfxb3.js → cli-hxpyc9sn.js} +3 -3
- package/dist/{cli-ppjxh6ah.js → cli-jfx48xrj.js} +10 -12
- package/dist/{cli-5ja3b75e.js → cli-jrp1dt73.js} +1 -1
- package/dist/{cli-98rw5dt5.js → cli-jrzkw01m.js} +2 -2
- package/dist/{cli-ga786dzg.js → cli-k70e3x9e.js} +18 -17
- package/dist/{cli-583frbyr.js → cli-kchjb7qy.js} +1 -1
- package/dist/{cli-fmjd0t1y.js → cli-m0cy2vyf.js} +2 -2
- package/dist/{cli-c0kqky8y.js → cli-m5akxq8q.js} +1 -1
- package/dist/{cli-ycscb2ar.js → cli-m88rpzkh.js} +2 -2
- package/dist/{cli-m0hmeqma.js → cli-mnrkgg60.js} +4 -4
- package/dist/{cli-yqefz277.js → cli-ms5m5r1y.js} +1 -1
- package/dist/{cli-fy6x31ps.js → cli-n5yexkdg.js} +1 -0
- package/dist/{cli-w4xnbm46.js → cli-neyag5p6.js} +53 -39
- package/dist/cli-p0m0p34z.js +9321 -0
- package/dist/{cli-gazw7kpa.js → cli-p17970qv.js} +8 -10
- package/dist/{cli-6vcp76qk.js → cli-p74md7t8.js} +42 -23
- package/dist/{cli-rjcbm574.js → cli-pr0eze3x.js} +2 -2
- package/dist/{cli-3e4snnzf.js → cli-qkdmz8c8.js} +1 -1
- package/dist/{cli-0ykgn1h5.js → cli-qmd3mse0.js} +2 -2
- package/dist/{cli-t60ajbbp.js → cli-qzt90yze.js} +20 -20
- package/dist/cli-rkc97c6a.js +39 -0
- package/dist/{cli-qd57hhhh.js → cli-rvhdmjvt.js} +6 -10
- package/dist/{cli-kyr67fgx.js → cli-rwymrnaz.js} +18608 -9089
- package/dist/{cli-8h0ayw8c.js → cli-serm8zrx.js} +6 -6
- package/dist/{cli-66ww7fer.js → cli-sgs5k6yd.js} +1 -1
- package/dist/{cli-nbsf8yvn.js → cli-sya22y84.js} +9 -9
- package/dist/{cli-318r69gq.js → cli-t73cas91.js} +440 -9
- package/dist/{cli-zkky4t5g.js → cli-tqq0hspb.js} +2 -2
- package/dist/{cli-z75yxkjh.js → cli-v3cf1ts9.js} +3 -3
- package/dist/{cli-xr8908my.js → cli-varqt4d1.js} +26 -14
- package/dist/{cli-q4ebh7h7.js → cli-vxh6acp7.js} +6 -6
- package/dist/{cli-g83s9ewh.js → cli-xfjrc279.js} +1 -1
- package/dist/{cli-32m9eda8.js → cli-xk879m3k.js} +111 -109
- package/dist/{cli-7cx2m6t2.js → cli-y5rbvxhc.js} +2 -2
- package/dist/{cli-fyhr5h4s.js → cli-y8nbefpb.js} +13 -13
- package/dist/{cli-81p9jd57.js → cli-yab6sh8p.js} +9 -3
- package/dist/{cli-srye3vdt.js → cli-ybjdc978.js} +1 -1
- package/dist/{cli-k5671be5.js → cli-zcfpsfzf.js} +5 -5
- package/dist/{cli-vf078p3e.js → cli-zfqg6fzn.js} +1 -1
- package/dist/{cli-wemma3jd.js → cli-zgv8gxgs.js} +7 -7
- package/dist/cli.js +31 -51
- package/dist/{cloudflare-workers-ai-system-one-ef2a980q.js → cloudflare-workers-ai-system-one-9y1zx3pt.js} +2 -2
- package/dist/{codex-adapter-88z6psm4.js → codex-adapter-ysq6bzha.js} +7 -7
- package/dist/{codex-login-74wa4hmq.js → codex-login-bcda78ge.js} +2 -2
- package/dist/{codex-session-runner-zwbcwzvx.js → codex-session-runner-qakzfx93.js} +8 -8
- package/dist/{commands-7amxs716.js → commands-rs7hkv9r.js} +3 -3
- package/dist/{controller-5rkkc37m.js → controller-r5x9bg6e.js} +4 -4
- package/dist/{controllers-connect-m7d4vxxb.js → controllers-connect-498hrxvk.js} +24 -24
- package/dist/{cursor-adapter-x1q18693.js → cursor-adapter-d46qszer.js} +2 -2
- package/dist/{db-athc68zt.js → db-pm96nhdb.js} +4 -2
- package/dist/{db-h2fsfve3.js → db-s13dqhr6.js} +3 -3
- package/dist/{devin-adapter-r9phbnc9.js → devin-adapter-z46ep5ph.js} +1 -1
- package/dist/{dispatcher-b1yz2bnn.js → dispatcher-j3h81t7m.js} +18 -18
- package/dist/{docker-c1a3gqmf.js → docker-866qpzt9.js} +2 -2
- package/dist/{dsh-adapter-e33bkxq9.js → dsh-adapter-rw0d5rc4.js} +2 -2
- package/dist/{e2b-fr12yccx.js → e2b-jkwfhbcv.js} +2 -2
- package/dist/{e2b-x6ywzak3.js → e2b-s16txnpx.js} +2 -3
- package/dist/{easter-egg-3d-pv5qnzc8.js → easter-egg-3d-qtgfxgze.js} +1 -1
- package/dist/{embedding-space-b4txbwrk.js → embedding-space-xh8p4q4x.js} +6 -6
- package/dist/{embeddings-m6zn6tad.js → embeddings-wp745m91.js} +1 -1
- package/dist/{event-bus-g0ka3pbw.js → event-bus-e66gh7cc.js} +1 -1
- package/dist/{execute-68nwny8m.js → execute-2fzb9z74.js} +1 -1
- package/dist/{external-channel-gkckmhzh.js → external-channel-ys21h3sy.js} +2 -2
- package/dist/fx-adapter-vz0b9z3g.js +19 -0
- package/dist/{google-generative-ai-v94hr7h0.js → google-generative-ai-ytpgncx9.js} +7 -12
- package/dist/{google-vertex-g7vr6cf8.js → google-vertex-tqhze5j7.js} +7 -12
- package/dist/grok-adapter-spea7zkj.js +19 -0
- package/dist/handlers-crckt5dq.js +32 -0
- package/dist/{heartbeat-6c2y3267.js → heartbeat-8phn1kdq.js} +21 -21
- package/dist/{hook-q5fv0jy2.js → hook-amcj4s10.js} +16 -11
- package/dist/{hook-w0q2wcrv.js → hook-bc6n49qn.js} +5 -5
- package/dist/{http-bxat8dg3.js → http-7374brv5.js} +642 -260
- package/dist/index-4x08sjtk.js +30 -0
- package/dist/{index-6cxzwfen.js → index-5a9jtqde.js} +26 -26
- package/dist/index-8ybffts4.js +37 -0
- package/dist/{index-bxrexmfy.js → index-c9y31ytf.js} +13 -13
- package/dist/{index-h39zbx67.js → index-hsad2t3r.js} +31 -31
- package/dist/index-nfy4kkg5.js +33 -0
- package/dist/{index-cqhqpgrv.js → index-p4hjwbvw.js} +1 -1
- package/dist/{index-k7fj52d3.js → index-q5cmtbz5.js} +6 -6
- package/dist/{index-fm0czesf.js → index-w4m9z29z.js} +1 -1
- package/dist/{keepalive-qnt21cv0.js → keepalive-wy29kbrg.js} +4 -4
- package/dist/lead-zdqxsvjn.js +71 -0
- package/dist/{llama-cpp-classify-s5c47rwh.js → llama-cpp-classify-nfgswa1m.js} +2 -2
- package/dist/{maintenance-btdr68y4.js → maintenance-h2ds9w6c.js} +1 -1
- package/dist/{mistral-conversations-3gjpdb4b.js → mistral-conversations-a45tx39a.js} +29 -51
- package/dist/{oauth-refresh-sweep-vczabeh4.js → oauth-refresh-sweep-q7mtbyp3.js} +3 -3
- package/dist/{onboard-k33ezyq8.js → onboard-vw8r2fdw.js} +68 -16
- package/dist/{openai-codex-responses-8pbxq9h5.js → openai-codex-responses-k9gapdze.js} +7 -11
- package/dist/{openai-completions-rm00s912.js → openai-completions-xd579js7.js} +50 -58
- package/dist/{openai-decisions-8v957r2r.js → openai-decisions-q3hh60wr.js} +2 -2
- package/dist/{openai-responses-agxpf96k.js → openai-responses-4d5dx3c7.js} +5 -10
- package/dist/{opencode-adapter-3dst2ka7.js → opencode-adapter-mtb0953j.js} +6 -6
- package/dist/{openrouter-images-3ecegv0d.js → openrouter-images-xr9gme9x.js} +4 -3
- package/dist/{otel-impl-13am7a65.js → otel-impl-j42czw3r.js} +2 -2
- package/dist/{pi-messages-pchtw4he.js → pi-messages-hjbv8v10.js} +28 -12
- package/dist/{pi-mono-adapter-c53de1gd.js → pi-mono-adapter-zk8pg9jr.js} +23 -26
- package/dist/{pricing-refresh-9fcbnq3f.js → pricing-refresh-x7nhv23d.js} +3 -3
- package/dist/{rbac-roles-gw0p9h3j.js → rbac-roles-9044425x.js} +16 -2
- package/dist/{rbac-roles-66j5h4y5.js → rbac-roles-bzvee6cf.js} +12 -3
- package/dist/{render-v2-fg8bmdn4.js → render-v2-t7bn4skz.js} +3 -3
- package/dist/{resume-1c8kr3nh.js → resume-x94gemep.js} +7 -7
- package/dist/{runtime-tzf9j7tc.js → runtime-breq6fmv.js} +1 -1
- package/dist/{session-access-d0atq10j.js → session-access-q7dmqjvt.js} +4 -4
- package/dist/{session-source-backfill-0vscqmsa.js → session-source-backfill-440ysamr.js} +3 -3
- package/dist/{setup-tvfa7rwe.js → setup-07n4727s.js} +1 -1
- package/dist/{typesafe-system-one-0bmqcxfg.js → typesafe-system-one-f2en2knd.js} +2 -2
- package/dist/virtual-modules-z5h6mcyf.js +362 -0
- package/dist/{work-objects-ks71xqeb.js → work-objects-pnq5y534.js} +21 -21
- package/dist/{worker-follow-up-bfx0h9hg.js → worker-follow-up-7z1gfkr8.js} +18 -18
- package/dist/worker-y62rvvq3.js +71 -0
- package/dist/{x-vmmye1kb.js → x-2fyrt5pp.js} +2 -2
- package/openapi.json +1169 -257
- package/package.json +8 -10
- package/src/apps/catalog.generated.json +299 -82
- package/src/apps/page-validator.ts +115 -2
- package/src/be/connector-codes.ts +21 -6
- package/src/be/db/tasks/read.ts +22 -0
- package/src/be/db.ts +4 -2
- package/src/be/improvements.ts +416 -0
- package/src/be/migrations/274_improvements.sql +27 -0
- package/src/be/migrations/275_task_dispatched_by.sql +8 -0
- package/src/be/rbac-roles.ts +123 -1
- package/src/be/swarm-config-guard.ts +1 -0
- package/src/be/users.ts +58 -1
- package/src/cli.tsx +5 -25
- package/src/commands/codex-login.ts +1 -1
- package/src/commands/e2b.ts +0 -1
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/onboard/compose-generator.ts +0 -1
- package/src/commands/onboard/dashboard-url.ts +31 -0
- package/src/commands/onboard/steps/generate.tsx +17 -1
- package/src/commands/onboard/steps/post-dashboard.tsx +9 -3
- package/src/commands/onboard.tsx +19 -6
- package/src/commands/runner.ts +117 -96
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/hooks/hook.ts +13 -5
- package/src/http/all-routes.ts +1 -0
- package/src/http/approval-requests.ts +2 -44
- package/src/http/auth.ts +5 -4
- package/src/http/codex-oauth-accounts.ts +31 -23
- package/src/http/codex-oauth-device.ts +1 -1
- package/src/http/codex-oauth-keep-warm.ts +1 -1
- package/src/http/improvements.ts +317 -0
- package/src/http/index.ts +2 -0
- package/src/http/operator-actor.ts +2 -1
- package/src/http/person-responder.ts +66 -0
- package/src/http/sessions.ts +49 -7
- package/src/http/tasks.ts +1 -1
- package/src/http/user-roles.ts +11 -2
- package/src/http/users.ts +194 -104
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/codex-adapter.ts +8 -1
- package/src/providers/codex-models.ts +4 -3
- package/src/providers/codex-oauth/auth-json.ts +14 -18
- package/src/providers/codex-oauth/storage.ts +2 -2
- package/src/rbac/legacy-policy.ts +2 -0
- package/src/rbac/permissions.ts +10 -0
- package/src/scripts-runtime/types/swarm-extension.d.ts +2 -0
- package/src/server.ts +2 -0
- package/src/slack/ack.ts +20 -14
- package/src/slack/render-v2.ts +42 -17
- package/src/tests/api-drain-worker-e2e.test.ts +69 -2
- package/src/tests/apps-catalog-drift.test.ts +35 -0
- package/src/tests/apps-catalog-table.test.ts +203 -0
- package/src/tests/apps-element-assembly.test.ts +28 -0
- package/src/tests/apps-smart-links.test.ts +151 -0
- package/src/tests/apps-table-filters-migration.test.ts +96 -0
- package/src/tests/apps-table-selection-migration.test.ts +95 -0
- package/src/tests/chatgpt-subscription-session-bench.test.ts +2 -2
- package/src/tests/claude-worker-parity.test.ts +2 -2
- package/src/tests/codex-adapter.test.ts +30 -0
- package/src/tests/codex-login.test.ts +2 -2
- package/src/tests/codex-oauth-accounts.test.ts +48 -12
- package/src/tests/codex-oauth-credential-info.test.ts +77 -1
- package/src/tests/codex-oauth-device.test.ts +1 -1
- package/src/tests/codex-oauth-keep-warm.test.ts +2 -2
- package/src/tests/codex-oauth.test.ts +25 -4
- package/src/tests/codex-pool.test.ts +2 -2
- package/src/tests/db-task-read-contract.test.ts +2 -0
- package/src/tests/db-task-write-contract.test.ts +1 -0
- package/src/tests/deploy-one-box.test.ts +39 -1
- package/src/tests/docs-index-footprint.test.js +3 -3
- package/src/tests/fixtures/onboard/content.compose.yml.txt +0 -4
- package/src/tests/fixtures/onboard/dev.compose.yml.txt +0 -3
- package/src/tests/fixtures/onboard/full-all.compose.yml.txt +0 -11
- package/src/tests/fixtures/onboard/full.compose.yml.txt +0 -11
- package/src/tests/fixtures/onboard/research.compose.yml.txt +0 -3
- package/src/tests/fixtures/onboard/solo.compose.yml.txt +0 -1
- package/src/tests/fixtures/prs-app-definition.json.txt +784 -0
- package/src/tests/fixtures/prs-filters-migration.patch.json.txt +318 -0
- package/src/tests/fixtures/prs-selection-migration.patch.json.txt +373 -0
- package/src/tests/fixtures/runner-identity-refresh.ts +3 -0
- package/src/tests/fixtures/runner-legacy-resume-prompt.ts +3 -0
- package/src/tests/fixtures/runner-task-start-reads.ts +140 -0
- package/src/tests/hook-ping-me-order.test.ts +85 -0
- package/src/tests/improvements-payload.test.ts +200 -0
- package/src/tests/improvements-route.test.ts +419 -0
- package/src/tests/install-sh-setup-url.test.ts +190 -0
- package/src/tests/onboard-dashboard-output.test.ts +109 -0
- package/src/tests/onboard-dashboard-url.test.ts +83 -0
- package/src/tests/operator-granted-credentials.test.ts +561 -0
- package/src/tests/operator-granted-role-wire.test.ts +222 -0
- package/src/tests/rbac-engine.test.ts +2 -0
- package/src/tests/runner-context-usage.test.ts +0 -1
- package/src/tests/runner-legacy-options.test.ts +55 -0
- package/src/tests/runner-slot-reconcile.test.ts +38 -0
- package/src/tests/runner-task-start-reads.test.ts +58 -0
- package/src/tests/send-task-dispatched-by.test.ts +129 -0
- package/src/tests/session-dispatched-tasks.test.ts +115 -0
- package/src/tests/session-sharing.test.ts +198 -9
- package/src/tests/slack-file-tools-attachments.test.ts +95 -3
- package/src/tests/slack-reaction-config.test.ts +39 -0
- package/src/tests/slack-render-v2.test.ts +47 -0
- package/src/tests/submit-improvement-tool.test.ts +82 -0
- package/src/tests/tool-annotations.test.ts +1 -1
- package/src/tools/manage-user.ts +88 -58
- package/src/tools/send-task.ts +3 -0
- package/src/tools/slack-read.ts +61 -33
- package/src/tools/submit-improvement.ts +68 -0
- package/src/tools/tool-config.ts +3 -0
- package/src/types.ts +5 -0
- package/src/utils/request-auth-context.ts +6 -1
- package/templates/skills/apps/SKILL.md +22 -11
- package/templates/skills/apps/content.md +22 -11
- package/templates/skills/swarm-scripts/SKILL.md +1 -1
- package/templates/skills/swarm-scripts/content.md +1 -1
- package/templates/skills/work-on-task/SKILL.md +1 -1
- package/templates/skills/work-on-task/content.md +1 -1
- package/dist/acp-adapter-vg5hqkvj.js +0 -16
- package/dist/cli-5c4hjzne.js +0 -873
- package/dist/cli-ae0dnfee.js +0 -20222
- package/dist/cli-nn3ysbqk.js +0 -428
- package/dist/cli-pc5znp64.js +0 -364
- package/dist/fx-adapter-m5jbgd5q.js +0 -19
- package/dist/grok-adapter-csvv7sac.js +0 -19
- package/dist/handlers-8x5gfbzx.js +0 -32
- package/dist/index-hpfte8jd.js +0 -33
- package/dist/index-ncf7yb5s.js +0 -30
- package/dist/index-vte6dyeh.js +0 -37
- package/dist/lead-4bvftzm6.js +0 -71
- package/dist/virtual-modules-efxcp740.js +0 -59
- package/dist/worker-e7v2bvm9.js +0 -71
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
createDefaultSettingsLocal,
|
|
17
17
|
createDefaultMcpJson,
|
|
18
18
|
createHooksConfig
|
|
19
|
-
} from "./cli-
|
|
19
|
+
} from "./cli-ms5m5r1y.js";
|
|
20
20
|
import {
|
|
21
21
|
getSlackConfiguration,
|
|
22
22
|
isSlackConfigured,
|
|
@@ -25,7 +25,7 @@ import {
|
|
|
25
25
|
import {
|
|
26
26
|
init_package,
|
|
27
27
|
package_default
|
|
28
|
-
} from "./cli-
|
|
28
|
+
} from "./cli-650zv9q9.js";
|
|
29
29
|
import {
|
|
30
30
|
getApiKey,
|
|
31
31
|
init_api_key
|
|
@@ -33,8 +33,10 @@ import {
|
|
|
33
33
|
import {
|
|
34
34
|
openAICompatibleProviders,
|
|
35
35
|
providerKeyVars,
|
|
36
|
-
init_src2
|
|
37
|
-
|
|
36
|
+
init_src2,
|
|
37
|
+
scrubSecrets,
|
|
38
|
+
init_secret_scrubber
|
|
39
|
+
} from "./cli-d84byzn8.js";
|
|
38
40
|
import {
|
|
39
41
|
__toESM
|
|
40
42
|
} from "./cli-242037k3.js";
|
|
@@ -45,6 +47,7 @@ import os from "node:os";
|
|
|
45
47
|
init_package();
|
|
46
48
|
init_config4();
|
|
47
49
|
init_api_key();
|
|
50
|
+
init_secret_scrubber();
|
|
48
51
|
var import_react15 = __toESM(require_react(), 1);
|
|
49
52
|
|
|
50
53
|
// src/commands/onboard/container-engine.ts
|
|
@@ -190,7 +193,10 @@ async function resolveContainerEngine(preference, run = defaultCommandRunner) {
|
|
|
190
193
|
}
|
|
191
194
|
|
|
192
195
|
// src/commands/onboard/dashboard-url.ts
|
|
196
|
+
import { mkdir, open, rename } from "node:fs/promises";
|
|
197
|
+
import { dirname, join } from "node:path";
|
|
193
198
|
var DEFAULT_DASHBOARD_BASE = "https://app.agent-swarm.dev";
|
|
199
|
+
var SETUP_URL_PATH = ".agent-swarm/setup-url";
|
|
194
200
|
function buildOnboardDashboardUrl(parts) {
|
|
195
201
|
const params = new URLSearchParams;
|
|
196
202
|
params.set("apiUrl", parts.apiUrl);
|
|
@@ -201,6 +207,26 @@ function buildOnboardDashboardUrl(parts) {
|
|
|
201
207
|
const base = (parts.base ?? DEFAULT_DASHBOARD_BASE).replace(/\/+$/, "");
|
|
202
208
|
return `${base}?${params.toString()}`;
|
|
203
209
|
}
|
|
210
|
+
function maskDashboardUrlApiKey(url) {
|
|
211
|
+
return url.replace(/([?&]apiKey=)[^&#]*/g, "$1[REDACTED:apiKey]");
|
|
212
|
+
}
|
|
213
|
+
async function writeDashboardSetupUrl(outputDir, url) {
|
|
214
|
+
const path = join(outputDir, SETUP_URL_PATH);
|
|
215
|
+
const tmp = `${path}.${crypto.randomUUID()}.tmp`;
|
|
216
|
+
await mkdir(dirname(path), { recursive: true });
|
|
217
|
+
try {
|
|
218
|
+
const file = await open(tmp, "wx", 384);
|
|
219
|
+
try {
|
|
220
|
+
await Bun.write(Bun.file(file.fd), `${url}
|
|
221
|
+
`);
|
|
222
|
+
} finally {
|
|
223
|
+
await file.close();
|
|
224
|
+
}
|
|
225
|
+
await rename(tmp, path);
|
|
226
|
+
} finally {
|
|
227
|
+
await Bun.file(tmp).delete().catch(() => {});
|
|
228
|
+
}
|
|
229
|
+
}
|
|
204
230
|
|
|
205
231
|
// src/commands/onboard/non-interactive.ts
|
|
206
232
|
init_src2();
|
|
@@ -988,10 +1014,11 @@ function CustomTemplatesStep({
|
|
|
988
1014
|
}
|
|
989
1015
|
|
|
990
1016
|
// src/commands/onboard/steps/generate.tsx
|
|
1017
|
+
init_secret_scrubber();
|
|
991
1018
|
var import_react3 = __toESM(require_react(), 1);
|
|
992
1019
|
|
|
993
1020
|
// src/commands/onboard/agent-fs-version.ts
|
|
994
|
-
var AGENT_FS_VERSION = "0.18.
|
|
1021
|
+
var AGENT_FS_VERSION = "0.18.15";
|
|
995
1022
|
|
|
996
1023
|
// src/commands/onboard/service-names.ts
|
|
997
1024
|
function expandServices(services, agentIds) {
|
|
@@ -1249,7 +1276,6 @@ function generateCompose(state) {
|
|
|
1249
1276
|
lines.push(` - AGENT_ROLE=${agentRole}`);
|
|
1250
1277
|
lines.push(` - TEMPLATE_ID=${svc.entry.template}`);
|
|
1251
1278
|
lines.push(" - MCP_BASE_URL=http://swarm-api:3013");
|
|
1252
|
-
lines.push(" - YOLO=true");
|
|
1253
1279
|
lines.push(" - SWARM_URL=http://swarm-api:3013");
|
|
1254
1280
|
const maxConcurrentTasks = state.maxConcurrentTasks ?? (svc.entry.isLead ? DEFAULT_LEAD_MAX_CONCURRENT_TASKS : DEFAULT_WORKER_MAX_CONCURRENT_TASKS);
|
|
1255
1281
|
lines.push(` - MAX_CONCURRENT_TASKS=${maxConcurrentTasks}`);
|
|
@@ -1481,10 +1507,11 @@ function GenerateStep({ state, dryRun, addLog, goToNext, goToStep, goToError })
|
|
|
1481
1507
|
`).slice(0, 20).join(`
|
|
1482
1508
|
`);
|
|
1483
1509
|
setComposePreview(composeLines);
|
|
1484
|
-
setEnvPreview(envLines);
|
|
1510
|
+
setEnvPreview(scrubSecrets(envLines));
|
|
1485
1511
|
addLog("Write docker-compose.yml", true);
|
|
1486
1512
|
addLog("Write .env", true);
|
|
1487
1513
|
addLog("Write .agent-swarm/config.json", true);
|
|
1514
|
+
addLog(`Write ${SETUP_URL_PATH} (mode 600)`, true);
|
|
1488
1515
|
goToStep("done");
|
|
1489
1516
|
return;
|
|
1490
1517
|
}
|
|
@@ -1498,6 +1525,11 @@ function GenerateStep({ state, dryRun, addLog, goToNext, goToStep, goToError })
|
|
|
1498
1525
|
const manifestPath = `${state.outputDir}/.agent-swarm/config.json`;
|
|
1499
1526
|
await Bun.write(manifestPath, JSON.stringify(manifest, null, 2));
|
|
1500
1527
|
addLog(`Wrote ${manifestPath}`);
|
|
1528
|
+
await writeDashboardSetupUrl(state.outputDir, buildOnboardDashboardUrl({
|
|
1529
|
+
apiUrl: `http://localhost:${state.apiPort || 3013}`,
|
|
1530
|
+
apiKey: state.apiKey
|
|
1531
|
+
}));
|
|
1532
|
+
addLog(`Wrote ${SETUP_URL_PATH} (mode 600)`);
|
|
1501
1533
|
try {
|
|
1502
1534
|
const result = await Bun.$`git -C ${state.outputDir} rev-parse --show-toplevel`.quiet();
|
|
1503
1535
|
if (result.exitCode === 0) {
|
|
@@ -3050,6 +3082,7 @@ function PostConnectStep({ state, dryRun, addLog, goToNext, goToStep }) {
|
|
|
3050
3082
|
}
|
|
3051
3083
|
|
|
3052
3084
|
// src/commands/onboard/steps/post-dashboard.tsx
|
|
3085
|
+
init_secret_scrubber();
|
|
3053
3086
|
var jsx_dev_runtime13 = __toESM(require_jsx_dev_runtime(), 1);
|
|
3054
3087
|
function PostDashboardStep({ state, addLog, goToNext }) {
|
|
3055
3088
|
const apiUrl = `http://localhost:${state.apiPort || 3013}`;
|
|
@@ -3064,8 +3097,15 @@ function PostDashboardStep({ state, addLog, goToNext }) {
|
|
|
3064
3097
|
}, undefined, false, undefined, this),
|
|
3065
3098
|
/* @__PURE__ */ jsx_dev_runtime13.jsxDEV(Text, {
|
|
3066
3099
|
dimColor: true,
|
|
3067
|
-
children: dashboardUrl
|
|
3100
|
+
children: scrubSecrets(maskDashboardUrlApiKey(dashboardUrl))
|
|
3068
3101
|
}, undefined, false, undefined, this),
|
|
3102
|
+
/* @__PURE__ */ jsx_dev_runtime13.jsxDEV(Text, {
|
|
3103
|
+
dimColor: true,
|
|
3104
|
+
children: [
|
|
3105
|
+
"Full link (contains API key): cat ",
|
|
3106
|
+
SETUP_URL_PATH
|
|
3107
|
+
]
|
|
3108
|
+
}, undefined, true, undefined, this),
|
|
3069
3109
|
/* @__PURE__ */ jsx_dev_runtime13.jsxDEV(Box_default, {
|
|
3070
3110
|
marginTop: 1,
|
|
3071
3111
|
children: /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(Select, {
|
|
@@ -3079,7 +3119,7 @@ function PostDashboardStep({ state, addLog, goToNext }) {
|
|
|
3079
3119
|
await Bun.$`open ${dashboardUrl}`.quiet();
|
|
3080
3120
|
addLog("Opened dashboard in browser");
|
|
3081
3121
|
} catch {
|
|
3082
|
-
addLog(`Open manually: ${
|
|
3122
|
+
addLog(`Open manually using the full link: cat ${SETUP_URL_PATH}`);
|
|
3083
3123
|
}
|
|
3084
3124
|
}
|
|
3085
3125
|
goToNext();
|
|
@@ -3767,7 +3807,7 @@ function Onboard({
|
|
|
3767
3807
|
const addLog = import_react15.useCallback((log, isDryRunAction = false) => {
|
|
3768
3808
|
const prefix = isDryRunAction && dryRun ? "[DRY-RUN] Would: " : "";
|
|
3769
3809
|
const id = nextLogId.current++;
|
|
3770
|
-
setState((s) => ({ ...s, logs: [...s.logs, { id, text: `${prefix}${log}` }] }));
|
|
3810
|
+
setState((s) => ({ ...s, logs: [...s.logs, { id, text: scrubSecrets(`${prefix}${log}`) }] }));
|
|
3771
3811
|
}, [dryRun]);
|
|
3772
3812
|
const goToStep = import_react15.useCallback((step, partial) => {
|
|
3773
3813
|
setState((s) => ({ ...s, ...partial, step }));
|
|
@@ -3898,7 +3938,7 @@ function Onboard({
|
|
|
3898
3938
|
color: "red",
|
|
3899
3939
|
children: [
|
|
3900
3940
|
"Onboard failed: ",
|
|
3901
|
-
state.error
|
|
3941
|
+
scrubSecrets(state.error)
|
|
3902
3942
|
]
|
|
3903
3943
|
}, undefined, true, undefined, this)
|
|
3904
3944
|
}, undefined, false, undefined, this);
|
|
@@ -3963,13 +4003,25 @@ function Onboard({
|
|
|
3963
4003
|
}, undefined, false, undefined, this)
|
|
3964
4004
|
]
|
|
3965
4005
|
}, undefined, true, undefined, this),
|
|
3966
|
-
/* @__PURE__ */ jsx_dev_runtime18.jsxDEV(
|
|
4006
|
+
process.env.AGENT_SWARM_INSTALLER !== "1" && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(jsx_dev_runtime18.Fragment, {
|
|
3967
4007
|
children: [
|
|
3968
|
-
"Dashboard: ",
|
|
3969
4008
|
/* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
|
|
3970
|
-
|
|
3971
|
-
|
|
3972
|
-
|
|
4009
|
+
children: [
|
|
4010
|
+
"Dashboard:",
|
|
4011
|
+
" ",
|
|
4012
|
+
/* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
|
|
4013
|
+
color: "cyan",
|
|
4014
|
+
children: scrubSecrets(maskDashboardUrlApiKey(dashUrl))
|
|
4015
|
+
}, undefined, false, undefined, this)
|
|
4016
|
+
]
|
|
4017
|
+
}, undefined, true, undefined, this),
|
|
4018
|
+
!dryRun && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
|
|
4019
|
+
dimColor: true,
|
|
4020
|
+
children: [
|
|
4021
|
+
"Full link (contains API key): cat ",
|
|
4022
|
+
SETUP_URL_PATH
|
|
4023
|
+
]
|
|
4024
|
+
}, undefined, true, undefined, this)
|
|
3973
4025
|
]
|
|
3974
4026
|
}, undefined, true, undefined, this),
|
|
3975
4027
|
agentCount > 0 && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
|
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
convertResponsesTools,
|
|
9
9
|
processResponsesStream,
|
|
10
10
|
init_openai_responses_shared
|
|
11
|
-
} from "./cli-
|
|
11
|
+
} from "./cli-4caa1x7d.js";
|
|
12
12
|
import {
|
|
13
13
|
clampOpenAIPromptCacheKey,
|
|
14
14
|
init_openai_prompt_cache
|
|
@@ -27,20 +27,18 @@ import {
|
|
|
27
27
|
normalizeProviderError,
|
|
28
28
|
formatProviderError,
|
|
29
29
|
init_error_body
|
|
30
|
-
} from "./cli-
|
|
30
|
+
} from "./cli-yab6sh8p.js";
|
|
31
31
|
import {
|
|
32
32
|
createGrammarToolInputProperties,
|
|
33
33
|
init_constrained_sampling,
|
|
34
34
|
buildBaseOptions,
|
|
35
35
|
init_simple_options
|
|
36
|
-
} from "./cli-
|
|
36
|
+
} from "./cli-p74md7t8.js";
|
|
37
37
|
import {
|
|
38
38
|
headersToRecord,
|
|
39
39
|
init_headers
|
|
40
40
|
} from "./cli-6ecv5wm5.js";
|
|
41
41
|
import {
|
|
42
|
-
getSystemMessageText,
|
|
43
|
-
init_text,
|
|
44
42
|
normalizeContext,
|
|
45
43
|
getInitialSystemMessage,
|
|
46
44
|
resolveTranscript,
|
|
@@ -49,7 +47,7 @@ import {
|
|
|
49
47
|
init_transcript,
|
|
50
48
|
clampThinkingLevel,
|
|
51
49
|
init_models
|
|
52
|
-
} from "./cli-
|
|
50
|
+
} from "./cli-1z4qggfe.js";
|
|
53
51
|
import {
|
|
54
52
|
AssistantMessageEventStream,
|
|
55
53
|
init_event_stream,
|
|
@@ -59,9 +57,11 @@ import {
|
|
|
59
57
|
init_diagnostics
|
|
60
58
|
} from "./cli-qzm2fm67.js";
|
|
61
59
|
import {
|
|
60
|
+
getSystemMessageText,
|
|
61
|
+
init_text,
|
|
62
62
|
getIdentityHeaders,
|
|
63
63
|
init_identity2
|
|
64
|
-
} from "./cli-
|
|
64
|
+
} from "./cli-5mpy301f.js";
|
|
65
65
|
import {
|
|
66
66
|
__esm
|
|
67
67
|
} from "./cli-242037k3.js";
|
|
@@ -1195,10 +1195,6 @@ var DEFAULT_CODEX_BASE_URL = "https://chatgpt.com/backend-api", JWT_CLAIM_PATH =
|
|
|
1195
1195
|
stream.push({ type: "done", reason: output.stopReason, message: output });
|
|
1196
1196
|
stream.end();
|
|
1197
1197
|
} catch (error) {
|
|
1198
|
-
for (const block of output.content) {
|
|
1199
|
-
delete block.partialJson;
|
|
1200
|
-
delete block.customInput;
|
|
1201
|
-
}
|
|
1202
1198
|
output.stopReason = options?.signal?.aborted ? "aborted" : "error";
|
|
1203
1199
|
output.errorMessage = formatProviderError(normalizeProviderError(error));
|
|
1204
1200
|
stream.push({ type: "error", reason: output.stopReason, error: output });
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
import {
|
|
2
|
+
isOpenRouterModel,
|
|
3
|
+
applyOpenRouterReportedCost,
|
|
4
|
+
init_openrouter_cost
|
|
5
|
+
} from "./cli-rkc97c6a.js";
|
|
1
6
|
import {
|
|
2
7
|
hasCopilotVisionInput,
|
|
3
8
|
buildCopilotDynamicHeaders,
|
|
@@ -23,11 +28,12 @@ import {
|
|
|
23
28
|
normalizeProviderError,
|
|
24
29
|
formatProviderError,
|
|
25
30
|
init_error_body
|
|
26
|
-
} from "./cli-
|
|
31
|
+
} from "./cli-yab6sh8p.js";
|
|
27
32
|
import {
|
|
28
33
|
getJsonSchemaToolParameters,
|
|
29
34
|
getGrammarToolInput,
|
|
30
35
|
appendGrammarToolInputJsonDelta,
|
|
36
|
+
closeGrammarToolInputJson,
|
|
31
37
|
resolveJsonSchemaStrictSampling,
|
|
32
38
|
resolveGrammarConstrainedSampling,
|
|
33
39
|
createGrammarToolInputProperties,
|
|
@@ -39,7 +45,7 @@ import {
|
|
|
39
45
|
init_simple_options,
|
|
40
46
|
transformMessages,
|
|
41
47
|
init_transform_messages
|
|
42
|
-
} from "./cli-
|
|
48
|
+
} from "./cli-p74md7t8.js";
|
|
43
49
|
import {
|
|
44
50
|
sanitizeSurrogates,
|
|
45
51
|
init_sanitize_unicode
|
|
@@ -53,14 +59,10 @@ import {
|
|
|
53
59
|
init_provider_env
|
|
54
60
|
} from "./cli-dc4m8cpv.js";
|
|
55
61
|
import {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
} from "./cli-pc5znp64.js";
|
|
62
|
+
ToolCallArgumentsStream,
|
|
63
|
+
init_streaming_json
|
|
64
|
+
} from "./cli-6pzk82fd.js";
|
|
60
65
|
import {
|
|
61
|
-
getSystemMessageText,
|
|
62
|
-
renderSystemMessageUpdate,
|
|
63
|
-
init_text,
|
|
64
66
|
resolveTranscript,
|
|
65
67
|
getDeclaredTools,
|
|
66
68
|
resolveTranscriptTools,
|
|
@@ -68,15 +70,18 @@ import {
|
|
|
68
70
|
calculateCost,
|
|
69
71
|
clampThinkingLevel,
|
|
70
72
|
init_models
|
|
71
|
-
} from "./cli-
|
|
73
|
+
} from "./cli-1z4qggfe.js";
|
|
72
74
|
import {
|
|
73
75
|
AssistantMessageEventStream,
|
|
74
76
|
init_event_stream
|
|
75
77
|
} from "./cli-qzm2fm67.js";
|
|
76
78
|
import {
|
|
79
|
+
getSystemMessageText,
|
|
80
|
+
renderSystemMessageUpdate,
|
|
81
|
+
init_text,
|
|
77
82
|
getIdentityHeaders,
|
|
78
83
|
init_identity2
|
|
79
|
-
} from "./cli-
|
|
84
|
+
} from "./cli-5mpy301f.js";
|
|
80
85
|
import {
|
|
81
86
|
__esm
|
|
82
87
|
} from "./cli-242037k3.js";
|
|
@@ -758,6 +763,9 @@ function parseChunkUsage(rawUsage, model) {
|
|
|
758
763
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
|
|
759
764
|
};
|
|
760
765
|
calculateCost(model, usage);
|
|
766
|
+
if (isOpenRouterModel(model)) {
|
|
767
|
+
applyOpenRouterReportedCost(usage, rawUsage);
|
|
768
|
+
}
|
|
761
769
|
return usage;
|
|
762
770
|
}
|
|
763
771
|
function mapStopReason(reason) {
|
|
@@ -920,23 +928,14 @@ var OPENAI_COMPLETIONS_REASONING_FIELDS, stream = (model, context, options) => {
|
|
|
920
928
|
let hasFinishReason = false;
|
|
921
929
|
const toolCallBlocksByIndex = new Map;
|
|
922
930
|
const toolCallBlocksById = new Map;
|
|
931
|
+
const toolCallStates = new Map;
|
|
923
932
|
const blocks = output.content;
|
|
924
933
|
const getContentIndex = (block) => blocks.indexOf(block);
|
|
925
|
-
const
|
|
926
|
-
|
|
927
|
-
|
|
928
|
-
|
|
929
|
-
|
|
930
|
-
return typeof value === "string" ? value : "";
|
|
931
|
-
};
|
|
932
|
-
const appendCustomToolCallInput = (block, nextInput, close) => {
|
|
933
|
-
const customInput = block.customInput;
|
|
934
|
-
if (!customInput)
|
|
935
|
-
return;
|
|
936
|
-
const delta = appendGrammarToolInputJsonDelta(customInput.jsonBuffer, customInput.property, nextInput, close);
|
|
937
|
-
block.arguments = { [customInput.property]: nextInput };
|
|
938
|
-
return delta;
|
|
939
|
-
};
|
|
934
|
+
const customInput = (property) => ({
|
|
935
|
+
kind: "custom",
|
|
936
|
+
property,
|
|
937
|
+
buffer: { input: "", started: false, closed: false }
|
|
938
|
+
});
|
|
940
939
|
const finishBlock = (block) => {
|
|
941
940
|
const contentIndex = getContentIndex(block);
|
|
942
941
|
if (contentIndex === -1) {
|
|
@@ -958,8 +957,10 @@ var OPENAI_COMPLETIONS_REASONING_FIELDS, stream = (model, context, options) => {
|
|
|
958
957
|
partial: output
|
|
959
958
|
});
|
|
960
959
|
} else if (block.type === "toolCall") {
|
|
961
|
-
|
|
962
|
-
|
|
960
|
+
const input = toolCallStates.get(block).input;
|
|
961
|
+
toolCallStates.delete(block);
|
|
962
|
+
if (input.kind === "custom") {
|
|
963
|
+
const delta = closeGrammarToolInputJson(input.buffer, input.property, undefined);
|
|
963
964
|
if (delta !== undefined) {
|
|
964
965
|
stream.push({
|
|
965
966
|
type: "toolcall_delta",
|
|
@@ -969,11 +970,8 @@ var OPENAI_COMPLETIONS_REASONING_FIELDS, stream = (model, context, options) => {
|
|
|
969
970
|
});
|
|
970
971
|
}
|
|
971
972
|
} else {
|
|
972
|
-
Object.assign(block,
|
|
973
|
+
Object.assign(block, input.arguments.finish());
|
|
973
974
|
}
|
|
974
|
-
delete block.partialArgs;
|
|
975
|
-
delete block.customInput;
|
|
976
|
-
delete block.streamIndex;
|
|
977
975
|
stream.push({
|
|
978
976
|
type: "toolcall_end",
|
|
979
977
|
contentIndex,
|
|
@@ -1011,16 +1009,16 @@ var OPENAI_COMPLETIONS_REASONING_FIELDS, stream = (model, context, options) => {
|
|
|
1011
1009
|
}
|
|
1012
1010
|
if (!block) {
|
|
1013
1011
|
const customInputProperty = toolCall.custom && !toolCall.function ? grammarToolInputProperties.get(name) ?? "input" : undefined;
|
|
1014
|
-
const hasCustomInput = customInputProperty !== undefined;
|
|
1015
1012
|
block = {
|
|
1016
1013
|
type: "toolCall",
|
|
1017
1014
|
id: toolCall.id || "",
|
|
1018
1015
|
name,
|
|
1019
|
-
arguments:
|
|
1020
|
-
partialArgs: hasCustomInput ? undefined : "",
|
|
1021
|
-
customInput: hasCustomInput ? { property: customInputProperty, jsonBuffer: { input: "", started: false, closed: false } } : undefined,
|
|
1022
|
-
streamIndex
|
|
1016
|
+
arguments: customInputProperty !== undefined ? { [customInputProperty]: "" } : {}
|
|
1023
1017
|
};
|
|
1018
|
+
toolCallStates.set(block, {
|
|
1019
|
+
streamIndex,
|
|
1020
|
+
input: customInputProperty !== undefined ? customInput(customInputProperty) : { kind: "json", arguments: new ToolCallArgumentsStream }
|
|
1021
|
+
});
|
|
1024
1022
|
if (streamIndex !== undefined) {
|
|
1025
1023
|
toolCallBlocksByIndex.set(streamIndex, block);
|
|
1026
1024
|
}
|
|
@@ -1034,8 +1032,9 @@ var OPENAI_COMPLETIONS_REASONING_FIELDS, stream = (model, context, options) => {
|
|
|
1034
1032
|
partial: output
|
|
1035
1033
|
});
|
|
1036
1034
|
}
|
|
1037
|
-
|
|
1038
|
-
|
|
1035
|
+
const state = toolCallStates.get(block);
|
|
1036
|
+
if (streamIndex !== undefined && state.streamIndex === undefined) {
|
|
1037
|
+
state.streamIndex = streamIndex;
|
|
1039
1038
|
toolCallBlocksByIndex.set(streamIndex, block);
|
|
1040
1039
|
}
|
|
1041
1040
|
if (toolCall.id) {
|
|
@@ -1044,16 +1043,12 @@ var OPENAI_COMPLETIONS_REASONING_FIELDS, stream = (model, context, options) => {
|
|
|
1044
1043
|
if (!block.name && name) {
|
|
1045
1044
|
block.name = name;
|
|
1046
1045
|
}
|
|
1047
|
-
if (toolCall.custom && !toolCall.function &&
|
|
1046
|
+
if (toolCall.custom && !toolCall.function && state.input.kind !== "custom") {
|
|
1048
1047
|
const customInputProperty = grammarToolInputProperties.get(block.name) ?? "input";
|
|
1049
1048
|
block.arguments = { [customInputProperty]: "" };
|
|
1050
|
-
|
|
1051
|
-
property: customInputProperty,
|
|
1052
|
-
jsonBuffer: { input: "", started: false, closed: false }
|
|
1053
|
-
};
|
|
1054
|
-
delete block.partialArgs;
|
|
1049
|
+
state.input = customInput(customInputProperty);
|
|
1055
1050
|
}
|
|
1056
|
-
return block;
|
|
1051
|
+
return { block, state };
|
|
1057
1052
|
};
|
|
1058
1053
|
for await (const chunk of openaiStream) {
|
|
1059
1054
|
await options?.onProviderStreamEvent?.(chunk, model);
|
|
@@ -1128,7 +1123,7 @@ var OPENAI_COMPLETIONS_REASONING_FIELDS, stream = (model, context, options) => {
|
|
|
1128
1123
|
}
|
|
1129
1124
|
if (choice?.delta?.tool_calls) {
|
|
1130
1125
|
for (const toolCall of choice.delta.tool_calls) {
|
|
1131
|
-
const block = ensureToolCallBlock(toolCall);
|
|
1126
|
+
const { block, state } = ensureToolCallBlock(toolCall);
|
|
1132
1127
|
if (!block.id && toolCall.id) {
|
|
1133
1128
|
block.id = toolCall.id;
|
|
1134
1129
|
toolCallBlocksById.set(toolCall.id, block);
|
|
@@ -1138,13 +1133,13 @@ var OPENAI_COMPLETIONS_REASONING_FIELDS, stream = (model, context, options) => {
|
|
|
1138
1133
|
block.name = name;
|
|
1139
1134
|
}
|
|
1140
1135
|
let delta = "";
|
|
1141
|
-
|
|
1136
|
+
const input = state.input;
|
|
1137
|
+
if (toolCall.function?.arguments && input.kind === "json") {
|
|
1142
1138
|
delta = toolCall.function.arguments;
|
|
1143
|
-
block.
|
|
1144
|
-
|
|
1145
|
-
|
|
1146
|
-
|
|
1147
|
-
delta = appendCustomToolCallInput(block, nextInput, false) ?? "";
|
|
1139
|
+
block.arguments = input.arguments.append(delta);
|
|
1140
|
+
} else if (toolCall.custom?.input && input.kind === "custom") {
|
|
1141
|
+
delta = appendGrammarToolInputJsonDelta(input.buffer, input.property, toolCall.custom.input) ?? "";
|
|
1142
|
+
block.arguments = { [input.property]: input.buffer.input };
|
|
1148
1143
|
}
|
|
1149
1144
|
stream.push({
|
|
1150
1145
|
type: "toolcall_delta",
|
|
@@ -1181,10 +1176,6 @@ var OPENAI_COMPLETIONS_REASONING_FIELDS, stream = (model, context, options) => {
|
|
|
1181
1176
|
if (block.type === "thinking") {
|
|
1182
1177
|
applyStreamedReasoningDetails(block);
|
|
1183
1178
|
}
|
|
1184
|
-
delete block.index;
|
|
1185
|
-
delete block.partialArgs;
|
|
1186
|
-
delete block.customInput;
|
|
1187
|
-
delete block.streamIndex;
|
|
1188
1179
|
}
|
|
1189
1180
|
output.stopReason = options?.signal?.aborted ? "aborted" : "error";
|
|
1190
1181
|
output.errorMessage = formatProviderError(normalizeProviderError(error));
|
|
@@ -1220,10 +1211,11 @@ var init_openai_completions = __esm(() => {
|
|
|
1220
1211
|
init_hash();
|
|
1221
1212
|
init_headers();
|
|
1222
1213
|
init_identity2();
|
|
1223
|
-
|
|
1214
|
+
init_openrouter_cost();
|
|
1224
1215
|
init_provider_env();
|
|
1225
1216
|
init_provider_retry();
|
|
1226
1217
|
init_sanitize_unicode();
|
|
1218
|
+
init_streaming_json();
|
|
1227
1219
|
init_text();
|
|
1228
1220
|
init_transcript();
|
|
1229
1221
|
init_constrained_sampling();
|
|
@@ -4,12 +4,12 @@ import {
|
|
|
4
4
|
postClassifierRequest,
|
|
5
5
|
parseClassifierUsage,
|
|
6
6
|
init_classifier_shared
|
|
7
|
-
} from "./cli-
|
|
7
|
+
} from "./cli-m0cy2vyf.js";
|
|
8
8
|
import {
|
|
9
9
|
normalizeProviderError,
|
|
10
10
|
formatProviderError,
|
|
11
11
|
init_error_body
|
|
12
|
-
} from "./cli-
|
|
12
|
+
} from "./cli-yab6sh8p.js";
|
|
13
13
|
import {
|
|
14
14
|
__esm
|
|
15
15
|
} from "./cli-242037k3.js";
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
convertResponsesTools,
|
|
10
10
|
processResponsesStream,
|
|
11
11
|
init_openai_responses_shared
|
|
12
|
-
} from "./cli-
|
|
12
|
+
} from "./cli-4caa1x7d.js";
|
|
13
13
|
import {
|
|
14
14
|
OpenAI,
|
|
15
15
|
init_openai
|
|
@@ -26,14 +26,14 @@ import {
|
|
|
26
26
|
normalizeProviderError,
|
|
27
27
|
formatProviderError,
|
|
28
28
|
init_error_body
|
|
29
|
-
} from "./cli-
|
|
29
|
+
} from "./cli-yab6sh8p.js";
|
|
30
30
|
import {
|
|
31
31
|
createGrammarToolInputProperties,
|
|
32
32
|
init_constrained_sampling,
|
|
33
33
|
resolveSamplingParams,
|
|
34
34
|
buildBaseOptions,
|
|
35
35
|
init_simple_options
|
|
36
|
-
} from "./cli-
|
|
36
|
+
} from "./cli-p74md7t8.js";
|
|
37
37
|
import {
|
|
38
38
|
headersToRecord,
|
|
39
39
|
init_headers
|
|
@@ -49,7 +49,7 @@ import {
|
|
|
49
49
|
init_transcript,
|
|
50
50
|
clampThinkingLevel,
|
|
51
51
|
init_models
|
|
52
|
-
} from "./cli-
|
|
52
|
+
} from "./cli-1z4qggfe.js";
|
|
53
53
|
import {
|
|
54
54
|
AssistantMessageEventStream,
|
|
55
55
|
init_event_stream
|
|
@@ -57,7 +57,7 @@ import {
|
|
|
57
57
|
import {
|
|
58
58
|
getIdentityHeaders,
|
|
59
59
|
init_identity2
|
|
60
|
-
} from "./cli-
|
|
60
|
+
} from "./cli-5mpy301f.js";
|
|
61
61
|
import {
|
|
62
62
|
__esm
|
|
63
63
|
} from "./cli-242037k3.js";
|
|
@@ -312,11 +312,6 @@ var OPENAI_TOOL_CALL_PROVIDERS, OPENAI_RESPONSES_MIN_OUTPUT_TOKENS = 16, CHATGPT
|
|
|
312
312
|
stream.push({ type: "done", reason: output.stopReason, message: output });
|
|
313
313
|
stream.end();
|
|
314
314
|
} catch (error) {
|
|
315
|
-
for (const block of output.content) {
|
|
316
|
-
delete block.index;
|
|
317
|
-
delete block.partialJson;
|
|
318
|
-
delete block.customInput;
|
|
319
|
-
}
|
|
320
315
|
output.stopReason = options?.signal?.aborted ? "aborted" : "error";
|
|
321
316
|
const errorMessage = formatProviderError(normalizeProviderError(error), `${model.provider === "openai" ? "OpenAI" : model.provider} API error`);
|
|
322
317
|
if (errorMessage.includes("subscription_sharing_usage_limit_exceeded")) {
|
|
@@ -3,15 +3,15 @@ import {
|
|
|
3
3
|
applyOpenRouterBaseUrlOverride2,
|
|
4
4
|
buildOpenAICompatibleProviderBlock2,
|
|
5
5
|
OpencodeAdapter2
|
|
6
|
-
} from "./cli-
|
|
7
|
-
import"./cli-
|
|
6
|
+
} from "./cli-jfx48xrj.js";
|
|
7
|
+
import"./cli-gce09r66.js";
|
|
8
8
|
import"./cli-4bd1rck6.js";
|
|
9
9
|
import"./cli-jc1g9ndz.js";
|
|
10
|
-
import"./cli-
|
|
10
|
+
import"./cli-hwprv9e4.js";
|
|
11
11
|
import"./cli-0726awxw.js";
|
|
12
|
-
import"./cli-
|
|
13
|
-
import"./cli-
|
|
14
|
-
import"./cli-
|
|
12
|
+
import"./cli-jrp1dt73.js";
|
|
13
|
+
import"./cli-b932gexn.js";
|
|
14
|
+
import"./cli-jrzkw01m.js";
|
|
15
15
|
export {
|
|
16
16
|
OpencodeAdapter2 as OpencodeAdapter,
|
|
17
17
|
applyOpenRouterBaseUrlOverride2 as applyOpenRouterBaseUrlOverride,
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
normalizeProviderError,
|
|
11
11
|
formatProviderError,
|
|
12
12
|
init_error_body
|
|
13
|
-
} from "./cli-
|
|
13
|
+
} from "./cli-yab6sh8p.js";
|
|
14
14
|
import {
|
|
15
15
|
sanitizeSurrogates,
|
|
16
16
|
init_sanitize_unicode
|
|
@@ -23,7 +23,7 @@ import {
|
|
|
23
23
|
import {
|
|
24
24
|
getIdentityHeaders,
|
|
25
25
|
init_identity2
|
|
26
|
-
} from "./cli-
|
|
26
|
+
} from "./cli-5mpy301f.js";
|
|
27
27
|
import {
|
|
28
28
|
__esm
|
|
29
29
|
} from "./cli-242037k3.js";
|
|
@@ -83,7 +83,8 @@ function parseUsage(rawUsage, model) {
|
|
|
83
83
|
output: model.cost.output / 1e6 * output,
|
|
84
84
|
cacheRead: model.cost.cacheRead / 1e6 * cacheReadTokens,
|
|
85
85
|
cacheWrite: model.cost.cacheWrite / 1e6 * cacheWriteTokens,
|
|
86
|
-
total: 0
|
|
86
|
+
total: 0,
|
|
87
|
+
totalFromProvider: false
|
|
87
88
|
}
|
|
88
89
|
};
|
|
89
90
|
usage.cost.total = usage.cost.input + usage.cost.output + usage.cost.cacheRead + usage.cost.cacheWrite;
|
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
import {
|
|
14
14
|
init_package,
|
|
15
15
|
package_default
|
|
16
|
-
} from "./cli-
|
|
16
|
+
} from "./cli-650zv9q9.js";
|
|
17
17
|
import {
|
|
18
18
|
getNodeEnv,
|
|
19
19
|
init_node_env
|
|
@@ -21,7 +21,7 @@ import {
|
|
|
21
21
|
import {
|
|
22
22
|
scrubSecrets,
|
|
23
23
|
init_secret_scrubber
|
|
24
|
-
} from "./cli-
|
|
24
|
+
} from "./cli-d84byzn8.js";
|
|
25
25
|
import {
|
|
26
26
|
__toESM,
|
|
27
27
|
__commonJS,
|