@desplega.ai/agent-swarm 2.8.3 → 2.9.1
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-g909b5hw.js +16 -0
- package/dist/acp-targets-ny75x1qy.js +23 -0
- package/dist/{actions-ewz7bp4g.js → actions-b9qgrmeq.js} +82 -21
- package/dist/agent-fs-provision-b5dhdsbd.js +27 -0
- package/dist/{amp-adapter-f25tqhnf.js → amp-adapter-vtax2c9s.js} +3 -3
- package/dist/{anthropic-messages-jkva0zps.js → anthropic-messages-r5xf5hqw.js} +37 -37
- package/dist/{app-mkptw0k7.js → app-g2z15hax.js} +9 -4
- package/dist/approval-notifications-yt13wp8r.js +23 -0
- package/dist/{assistant-c47rfe77.js → assistant-2cgfxsgk.js} +56 -33
- package/dist/{azure-openai-responses-wgtqkbr3.js → azure-openai-responses-590s1eea.js} +10 -10
- package/dist/{boot-args-schema-4vb0xsat.js → boot-args-schema-3gwy0f60.js} +1 -1
- package/dist/{boot-reembed-htr73hbs.js → boot-reembed-92g7s5zp.js} +1 -1
- package/dist/{boot-reembed-1ghy2sab.js → boot-reembed-mywmyp4s.js} +1 -1
- package/dist/{boot-scrub-sweep-yrytg42z.js → boot-scrub-sweep-7dkdzqxx.js} +84 -13
- package/dist/{boot-seeds-n2b3dx4e.js → boot-seeds-ce7rvgq1.js} +4 -4
- package/dist/{boxd-jmfqgkqa.js → boxd-wn235q80.js} +7 -7
- package/dist/claude-adapter-3m4q7735.js +28 -0
- package/dist/{claude-managed-adapter-hddmxjyj.js → claude-managed-adapter-t8nfgcgz.js} +4 -4
- package/dist/{claude-managed-setup-hfvry1bd.js → claude-managed-setup-c217draw.js} +10 -10
- package/dist/{claude-sdk-session-0hamqzc7.js → claude-sdk-session-7fbqm51z.js} +9386 -9196
- package/dist/{cli-yjdgea32.js → cli-1jx0srjt.js} +17 -17
- package/dist/{cli-sdvcrq5x.js → cli-1jykg0py.js} +18 -14
- package/dist/{cli-k96cecs7.js → cli-2czxfnvj.js} +1221 -357
- package/dist/{cli-qmqt520k.js → cli-2dq9yv8p.js} +2 -2
- package/dist/{cli-e2w34h6z.js → cli-2xs8tsf7.js} +132 -85
- package/dist/{cli-z8cvws4c.js → cli-2yjj3e31.js} +907 -56
- package/dist/{cli-mdpbjnzq.js → cli-32djehja.js} +42 -42
- package/dist/{cli-gpz1d0t2.js → cli-3j873zxq.js} +4 -4
- package/dist/cli-43ms35q9.js +270 -0
- package/dist/cli-47hz21se.js +25584 -0
- package/dist/{cli-n515ex5z.js → cli-4ymxrwg5.js} +16 -16
- package/dist/{cli-f1kwb5fc.js → cli-5a6pqy45.js} +333 -21
- package/dist/{cli-93t5s4zq.js → cli-5gpqgs8b.js} +2 -2
- package/dist/{cli-15204js0.js → cli-6237rnyr.js} +1 -1
- package/dist/{cli-4ax9mvvg.js → cli-67mwzr35.js} +9 -9
- package/dist/{cli-t5ys4ebm.js → cli-6945ywhr.js} +3 -3
- package/dist/{cli-0bcgyj5b.js → cli-6ehs4mta.js} +87 -8
- package/dist/{cli-6yygkr0w.js → cli-6ym4jhzp.js} +15 -7
- package/dist/{cli-8bpgbr8k.js → cli-7evph51z.js} +5 -5
- package/dist/{cli-dtdht77h.js → cli-7mv4h3sn.js} +2 -2
- package/dist/{cli-nx2n3z6p.js → cli-7sf9sb0w.js} +3 -2
- package/dist/{cli-pe4d96rb.js → cli-7zm3b3f5.js} +1 -1
- package/dist/cli-8zh9nrew.js +78 -0
- package/dist/cli-9ttx00s3.js +137 -0
- package/dist/{cli-x6t50dmw.js → cli-9w8712tq.js} +620 -281
- package/dist/{cli-8476gtwf.js → cli-b6px1k1q.js} +1 -1
- package/dist/{cli-k2rw11py.js → cli-b91nz213.js} +5 -5
- package/dist/{cli-7c5tgqhf.js → cli-bg63qmsx.js} +10 -10
- package/dist/{cli-qps8je6j.js → cli-bkjdknnp.js} +54 -10
- package/dist/{cli-gn9y6fn7.js → cli-bnqncekd.js} +2 -2
- package/dist/{cli-s7zz734a.js → cli-br0924pw.js} +1 -1
- package/dist/{cli-h9yy18gy.js → cli-ctx0b85j.js} +5484 -5078
- package/dist/{cli-0vksaxvr.js → cli-dgs10ttj.js} +2 -2
- package/dist/cli-dqgnbnxs.js +132 -0
- package/dist/{cli-q6mfk1ej.js → cli-dzzh58sy.js} +2 -2
- package/dist/{cli-2znm3dzj.js → cli-eds5xnsz.js} +2 -2
- package/dist/{cli-c0xjnr8z.js → cli-f3jyzq4g.js} +2 -2
- package/dist/cli-f8x9drqr.js +84 -0
- package/dist/{cli-ztq5z4e1.js → cli-f9gz2vyj.js} +6 -6
- package/dist/{cli-bhsfbmk8.js → cli-fh97xn30.js} +93 -44
- package/dist/cli-fkef327x.js +103 -0
- package/dist/{cli-fsgttth8.js → cli-g0vv9dg4.js} +13 -13
- package/dist/{cli-kd56bmk4.js → cli-gabsjg8x.js} +3 -1
- package/dist/{cli-1m96dc36.js → cli-gfy38pvt.js} +3 -3
- package/dist/{cli-922z7gwm.js → cli-h9yqfzx9.js} +15 -11
- package/dist/{cli-5a7szzfh.js → cli-hnamkvnc.js} +2 -2
- package/dist/{cli-c3ng0mb4.js → cli-j7svy295.js} +71 -818
- package/dist/{cli-yss07azk.js → cli-jaw5v1sy.js} +3 -3
- package/dist/cli-jkw6ptfw.js +921 -0
- package/dist/{cli-s8p8hhty.js → cli-jm0hvmz2.js} +2 -2
- package/dist/{cli-knva3nmx.js → cli-jwampxxq.js} +8 -6
- package/dist/cli-kj0hyr43.js +51 -0
- package/dist/{cli-tnzebztn.js → cli-kpgcm7xy.js} +13 -1
- package/dist/{cli-9zmb7ptc.js → cli-kxx4k2jw.js} +8 -753
- package/dist/{cli-am1ptset.js → cli-m7c2380k.js} +208 -194
- package/dist/{cli-kw44j53p.js → cli-m7zvgt57.js} +45 -38
- package/dist/{cli-504akrp9.js → cli-meydjstb.js} +3 -3
- package/dist/{cli-54qr8mcd.js → cli-mhapr559.js} +4 -4
- package/dist/{cli-tf79ryyy.js → cli-mjw0yf82.js} +3 -3
- package/dist/{cli-rjvsf9qa.js → cli-mkwkwq81.js} +14 -11
- package/dist/{cli-n30e0hcp.js → cli-mna6pmfx.js} +2 -2
- package/dist/{cli-awwptga4.js → cli-mw620q3n.js} +1 -1
- package/dist/{cli-6wj7p986.js → cli-n3qe7tyr.js} +172 -168
- package/dist/{cli-4dpkjc2e.js → cli-nafvvsp8.js} +9 -9
- package/dist/{cli-sg27rk2t.js → cli-nbt14he0.js} +25 -19
- package/dist/{cli-7akn6ze9.js → cli-nh7x3133.js} +7 -28
- package/dist/{cli-zdaypkq9.js → cli-p4kckx1z.js} +285 -97
- package/dist/{cli-n5t077me.js → cli-pb2ay3sh.js} +10 -3
- package/dist/{cli-t4dv07kr.js → cli-psffsanb.js} +4 -3
- package/dist/{cli-mwwmka77.js → cli-pyjn0qhk.js} +2712 -268
- package/dist/{cli-emekyyhr.js → cli-q2d3e1k1.js} +1 -1
- package/dist/{cli-vqva1teb.js → cli-qe909n63.js} +2 -2
- package/dist/{cli-2d0cghfn.js → cli-qj39vrc6.js} +1 -1
- package/dist/{cli-tas6ckky.js → cli-rq5rpv6k.js} +2 -2
- package/dist/{cli-0agcv1v5.js → cli-rqx70rcz.js} +2 -2
- package/dist/{cli-kmemts3w.js → cli-sn650d7x.js} +39 -69
- package/dist/{cli-98rwmcyc.js → cli-snxhtehz.js} +3 -3
- package/dist/{cli-d829z3xc.js → cli-spfz393q.js} +6 -6
- package/dist/{cli-500c09j9.js → cli-t9ga4qmb.js} +14 -14
- package/dist/{cli-me0r8gzr.js → cli-td9tb872.js} +27 -25
- package/dist/cli-tvc4jag9.js +754 -0
- package/dist/{cli-6ek0hff4.js → cli-ty3gha1p.js} +4 -4
- package/dist/{cli-c71n3bxq.js → cli-v57d7fmm.js} +2 -2
- package/dist/{cli-j8cjdzan.js → cli-vs9vdpy0.js} +1 -1
- package/dist/cli-vt89089n.js +296 -0
- package/dist/{cli-pxwtcgcp.js → cli-vyff45ve.js} +2 -2
- package/dist/{cli-x3ex5bqf.js → cli-w16kwbzw.js} +1 -1
- package/dist/{cli-bj6qhgte.js → cli-w4n323t3.js} +197 -45
- package/dist/{cli-rqfvkx5t.js → cli-wn13hhdt.js} +13 -13
- package/dist/{cli-skmhsnqh.js → cli-x40a0w9j.js} +1 -1
- package/dist/{cli-zeaehgyd.js → cli-xag7btpe.js} +2 -2
- package/dist/{cli-k28wkapa.js → cli-xf1wn5ns.js} +2 -2
- package/dist/{cli-rh15cakt.js → cli-xwsm6xkr.js} +1 -1
- package/dist/{cli-dpsfwh7n.js → cli-y2ewxhth.js} +56 -31
- package/dist/{cli-vx421edw.js → cli-ysvspf5e.js} +9 -7
- package/dist/{cli-crpf163n.js → cli-zh0e5x7p.js} +16 -26
- package/dist/{cli-4e1hfbpq.js → cli-zr6qy15y.js} +24 -24
- package/dist/cli.js +33 -29
- package/dist/{codex-adapter-2brxx5ta.js → codex-adapter-n656pvb8.js} +9 -8
- package/dist/{codex-hook-c930c3ea.js → codex-hook-59atdwd8.js} +6 -6
- package/dist/{codex-login-cbrs1h5w.js → codex-login-a239g1ah.js} +1 -1
- package/dist/{codex-session-runner-y9anfj0r.js → codex-session-runner-p0fbv5y9.js} +10 -9
- package/dist/{commands-wn9q06qr.js → commands-gwea8z5p.js} +3 -3
- package/dist/{controller-fw608czd.js → controller-t67c3grh.js} +9 -6
- package/dist/{controllers-connect-63j5rdcm.js → controllers-connect-ks155r0h.js} +28 -25
- package/dist/{cursor-adapter-6mb9jme8.js → cursor-adapter-ygwrtmkv.js} +2 -2
- package/dist/{db-y4wfrzbm.js → db-kpmx06s9.js} +21 -13
- package/dist/{db-0m6v5tq4.js → db-rb2xqdb1.js} +3 -3
- package/dist/{devin-adapter-r0yx3gv8.js → devin-adapter-zp4tqq53.js} +1 -1
- package/dist/{dispatcher-9tq2zzdj.js → dispatcher-31sm0ej2.js} +21 -18
- package/dist/{docker-j75atvpt.js → docker-09tkkg0n.js} +47 -8
- package/dist/{dsh-adapter-t09sv4tq.js → dsh-adapter-qyxh0w31.js} +2 -2
- package/dist/{e2b-a7vzs2vj.js → e2b-3v1e745x.js} +6 -6
- package/dist/{e2b-7s9dscap.js → e2b-sm28k0k3.js} +6 -6
- package/dist/{easter-egg-3d-fbwvmwhe.js → easter-egg-3d-00wjscn6.js} +1 -1
- package/dist/{embedding-space-wh8de1t9.js → embedding-space-qhw4g68n.js} +6 -6
- package/dist/{embeddings-3hpbdtjr.js → embeddings-zdv9ke6x.js} +1 -1
- package/dist/{event-bus-tr6h3gv8.js → event-bus-xr83x566.js} +1 -1
- package/dist/{execute-4bdf8sdy.js → execute-zna8wwr7.js} +1 -1
- package/dist/{external-channel-ts2fwqh0.js → external-channel-1ac6t56s.js} +2 -2
- package/dist/fx-adapter-sk7n0fzc.js +19 -0
- package/dist/{getMachineId-bsd-nfgrzarv.js → getMachineId-bsd-637a7rbk.js} +3 -3
- package/dist/{getMachineId-darwin-wz886dsk.js → getMachineId-darwin-9vytrcnn.js} +3 -3
- package/dist/{getMachineId-linux-1nng3p1p.js → getMachineId-linux-mkzsvyyz.js} +3 -3
- package/dist/{getMachineId-unsupported-a0428vw9.js → getMachineId-unsupported-4cfs2n11.js} +3 -3
- package/dist/{getMachineId-win-h45922nq.js → getMachineId-win-154s3qma.js} +3 -3
- package/dist/{google-generative-ai-h7s3e9kk.js → google-generative-ai-maq6c9bf.js} +1 -1
- package/dist/{google-vertex-fhxaafzw.js → google-vertex-2jgsw2nb.js} +5 -5
- package/dist/grok-adapter-sjbcm5ew.js +19 -0
- package/dist/handlers-yzy0c87x.js +35 -0
- package/dist/{heartbeat-2ze5fzpc.js → heartbeat-2f6z4kdx.js} +24 -21
- package/dist/{hook-gaehe2w5.js → hook-8y0gvtp1.js} +14 -14
- package/dist/{hook-ca54yd4s.js → hook-w1skzaqc.js} +5 -5
- package/dist/{http-jfg8t2yk.js → http-wghxvpef.js} +2333 -589
- package/dist/{index-d6wkh8ar.js → index-0h6qd4p1.js} +34 -24
- package/dist/index-25pvya7q.js +40 -0
- package/dist/index-2t4859r5.js +35 -0
- package/dist/{index-enn321kd.js → index-42jq9yy3.js} +3 -3
- package/dist/{index-khe3gp0k.js → index-4k7m5dgj.js} +645 -370
- package/dist/index-620y7jzq.js +15 -0
- package/dist/{index-gjwaqaq8.js → index-8p0j4h4j.js} +506 -43
- package/dist/{index-3gv6sc4z.js → index-8zn8nxn5.js} +1 -1
- package/dist/{index-m5gx1xd6.js → index-9myfj74s.js} +40 -40
- package/dist/{index-3yvzbhxd.js → index-9zkchs9t.js} +336 -193
- package/dist/{index-0rvk3vd4.js → index-b5wgnm78.js} +47 -47
- package/dist/index-cxca2t8y.js +36 -0
- package/dist/{index-qwj6ntem.js → index-e3krvkh2.js} +4 -4
- package/dist/{index-hjhfk3ra.js → index-pe3d8jfy.js} +3 -3
- package/dist/index-rv89fvzf.js +572 -0
- package/dist/{index-csgrxedz.js → index-s71ez27v.js} +1 -1
- package/dist/{keepalive-k2a3qe73.js → keepalive-sh02349h.js} +4 -4
- package/dist/lead-gk4h5eg7.js +74 -0
- package/dist/{maintenance-gb5sd5nc.js → maintenance-yj0dcjja.js} +1 -1
- package/dist/{node-252anz2h.js → node-dqm4xgxw.js} +4 -4
- package/dist/{node-ray25snp.js → node-zd6shky9.js} +3 -3
- package/dist/{oauth-refresh-sweep-y7rm6bkb.js → oauth-refresh-sweep-d9xedk66.js} +3 -3
- package/dist/{onboard-jmc5qerv.js → onboard-dpgjn03r.js} +8 -8
- package/dist/{openai-codex-responses-k9gapdze.js → openai-codex-responses-bkcd8pjj.js} +9 -9
- package/dist/{openai-responses-4d5dx3c7.js → openai-responses-gbh0wfqe.js} +13 -13
- package/dist/{opencode-adapter-7eade9ev.js → opencode-adapter-2d31cpjc.js} +7 -6
- package/dist/{otel-impl-8j1xhxqd.js → otel-impl-1skarpfq.js} +110 -110
- package/dist/pending-bfmxtx0g.js +82 -0
- package/dist/{pi-mono-adapter-yqmaf32x.js → pi-mono-adapter-gvppnasy.js} +43 -16
- package/dist/{pricing-refresh-1nj722h6.js → pricing-refresh-c6b325mk.js} +2 -2
- package/dist/{rbac-roles-b1mtr6dr.js → rbac-roles-h80qbdbs.js} +3 -3
- package/dist/{rbac-roles-n1f3frk1.js → rbac-roles-zfcx68tx.js} +10 -3
- package/dist/{render-v2-1gfpd8rj.js → render-v2-nx20t3rb.js} +7 -4
- package/dist/{resume-w1s1eh5v.js → resume-5ep8agan.js} +11 -7
- package/dist/{runtime-84g5egsc.js → runtime-r3pj4mce.js} +1 -1
- package/dist/{session-access-y6z1txk4.js → session-access-n7p3m15b.js} +4 -4
- package/dist/{session-source-backfill-gxxwfh12.js → session-source-backfill-v8mt0zwn.js} +4 -4
- package/dist/{setup-r91gstyk.js → setup-z1psaqhe.js} +1 -1
- package/dist/thread-buffer-a1re2r9r.js +38 -0
- package/dist/{virtual-modules-cgnj6kme.js → virtual-modules-rrbjdpxn.js} +5 -5
- package/dist/{work-objects-qcxzg61c.js → work-objects-4aghh73z.js} +31 -23
- package/dist/worker-3dyyb8ev.js +74 -0
- package/dist/{worker-follow-up-y2d2h7km.js → worker-follow-up-166zmex1.js} +21 -18
- package/dist/{x-qhxq2ama.js → x-wg164ss9.js} +2 -2
- package/openapi.json +2561 -131
- package/package.json +15 -11
- package/plugin/commands/create-pr.md +1 -1
- package/plugin/pi-skills/create-pr/SKILL.md +1 -1
- package/src/apps/action-runner.ts +21 -1
- package/src/apps/catalog.generated.json +667 -18
- package/src/apps/page-validator.ts +341 -8
- package/src/assets/key.ts +6 -0
- package/src/be/agent-fs-user-keys.ts +186 -0
- package/src/be/audit-user.ts +27 -13
- package/src/be/automation-preflight.test.ts +14 -14
- package/src/be/automation-preflight.ts +24 -16
- package/src/be/boot-scrub-sweep.ts +143 -14
- package/src/be/caller-session-group.ts +86 -0
- package/src/be/checklist.ts +375 -0
- package/src/be/db/agents.ts +12 -1
- package/src/be/db/approvals.ts +26 -0
- package/src/be/db/model-profiles.ts +4 -1
- package/src/be/db/session-costs.ts +219 -0
- package/src/be/db/session-log-reasoning.ts +36 -0
- package/src/be/db/session-moves.ts +23 -0
- package/src/be/db/session-tree.ts +78 -19
- package/src/be/db/tasks/eligibility-scan.ts +14 -0
- package/src/be/db/tasks/read.ts +7 -3
- package/src/be/db/tasks/slack-fold.ts +116 -0
- package/src/be/db/tasks/write.ts +67 -1
- package/src/be/db-queries/mcp-servers.ts +13 -0
- package/src/be/db-queries/oauth.ts +6 -0
- package/src/be/db-queries/task-artifacts.ts +10 -8
- package/src/be/db.ts +242 -319
- package/src/be/extensions/assets.ts +17 -13
- package/src/be/import/config.ts +54 -0
- package/src/be/import/dir-source.ts +372 -0
- package/src/be/import/index.ts +149 -0
- package/src/be/import/pending.ts +71 -0
- package/src/be/import/schema.ts +137 -0
- package/src/be/import/seeders.ts +462 -0
- package/src/be/key-window-usage.ts +385 -0
- package/src/be/migrations/297_import_ownership.sql +34 -0
- package/src/be/migrations/301_favorites_key_type.sql +36 -0
- package/src/be/migrations/302_checklist_items.sql +23 -0
- package/src/be/migrations/303_task_ui_specs.sql +28 -0
- package/src/be/migrations/306_provider_account_telemetry.sql +1 -0
- package/src/be/migrations/307_session_cost_credential_attribution.sql +23 -0
- package/src/be/migrations/310_session_logs_reasoning.sql +12 -0
- package/src/be/multi-runtime.ts +8 -1
- package/src/be/rbac-roles.ts +8 -1
- package/src/be/runtime-pools/db.ts +3 -0
- package/src/be/runtime-pools/demand.ts +20 -2
- package/src/be/runtime-pools/reachability.ts +31 -0
- package/src/be/runtime-pools/routing.ts +8 -1
- package/src/be/runtime-pools/supervisor.ts +6 -7
- package/src/be/savings/read.ts +8 -6
- package/src/be/script-credential-broker.ts +2 -2
- package/src/be/scripts/typecheck.ts +4 -4
- package/src/be/seed/agent-fs-provision.ts +104 -19
- package/src/be/seed/index.ts +1 -1
- package/src/be/seed/registry.ts +27 -8
- package/src/be/seed/runner.ts +1 -1
- package/src/be/seed/schedules-seeder.ts +24 -6
- package/src/be/seed/seed-toggle.ts +32 -0
- package/src/be/seed/types.ts +6 -0
- package/src/be/seed-scripts/catalog/boot-triage.inline.ts +1 -0
- package/src/be/seed-scripts/catalog/boot-triage.ts +1 -0
- package/src/be/seed-scripts/catalog/dreaming-gather.ts +2 -2
- package/src/be/seed-scripts/catalog/wait-for-task.ts +5 -1
- package/src/be/seed-skills/index.ts +3 -0
- package/src/be/steering.ts +27 -4
- package/src/be/swarm-config-guard.ts +54 -1
- package/src/be/task-citations.ts +8 -5
- package/src/be/task-ui-spec.ts +158 -0
- package/src/commands/controller.ts +3 -0
- package/src/commands/credential-outcome-report.ts +13 -3
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/rate-limit-outcome.ts +6 -0
- package/src/commands/runner.ts +95 -55
- package/src/e2b/env.ts +2 -0
- package/src/extensions/catalog.generated.json +17 -0
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/github/app.ts +10 -1
- package/src/github/handlers.ts +6 -3
- package/src/github/reactions.ts +12 -14
- package/src/heartbeat/heartbeat.ts +14 -4
- package/src/http/agents.ts +19 -10
- package/src/http/all-routes.ts +2 -0
- package/src/http/api-keys.ts +258 -30
- package/src/http/approval-requests.ts +24 -4
- package/src/http/apps.ts +69 -5
- package/src/http/checklist.ts +176 -0
- package/src/http/db-query-bounded.ts +256 -11
- package/src/http/db-query-shared.ts +9 -0
- package/src/http/favorites.ts +14 -2
- package/src/http/fs.ts +346 -1
- package/src/http/index.ts +29 -1
- package/src/http/kv.ts +13 -0
- package/src/http/mcp-oauth.ts +1 -1
- package/src/http/mcp-servers.ts +15 -2
- package/src/http/onboarding.ts +2 -9
- package/src/http/poll.ts +45 -0
- package/src/http/script-connections.ts +1 -0
- package/src/http/session-data.ts +74 -23
- package/src/http/sessions.ts +23 -2
- package/src/http/slack-events.ts +101 -0
- package/src/http/status.ts +25 -7
- package/src/http/task-requester.ts +46 -0
- package/src/http/tasks.ts +169 -42
- package/src/http/users.ts +14 -0
- package/src/http/webhooks.ts +15 -0
- package/src/integrations/cards/index.ts +151 -0
- package/src/integrations/chat-sdk/outbound.ts +39 -13
- package/src/integrations/chat-sdk/relay.ts +87 -0
- package/src/integrations/chat-sdk/runtime.ts +7 -1
- package/src/integrations/chat-sdk/status.ts +17 -0
- package/src/integrations/chat-sdk/telegram-api.ts +6 -1
- package/src/jira/outbound.ts +5 -3
- package/src/kv-reserved-namespaces.ts +17 -2
- package/src/linear/outbound.ts +5 -1
- package/src/oauth/presets.ts +29 -2
- package/src/prompts/base-prompt.ts +25 -4
- package/src/prompts/session-templates.ts +102 -8
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +27 -4
- package/src/providers/claude-flag-settings.ts +39 -1
- package/src/providers/claude-managed-adapter.ts +5 -1
- package/src/providers/codex-adapter.ts +86 -4
- package/src/providers/codex-app-server.ts +11 -16
- package/src/providers/codex-oauth/auth-json.ts +1 -0
- package/src/providers/opencode-adapter.ts +7 -19
- package/src/providers/pi-mono-adapter.ts +35 -2
- package/src/providers/pricing-sources.md +32 -0
- package/src/providers/runtime-dependencies.ts +158 -0
- package/src/providers/types.ts +11 -0
- package/src/rbac/legacy-policy.ts +2 -0
- package/src/rbac/permissions.ts +10 -1
- package/src/runtime-providers/docker.ts +65 -1
- package/src/scheduler/deferred-task-waits.ts +18 -5
- package/src/scripts-runtime/credential-broker/default-bindings.ts +19 -11
- package/src/scripts-runtime/credential-broker/index.ts +1 -1
- package/src/scripts-runtime/egress-secrets.ts +2 -2
- package/src/scripts-runtime/swarm-sdk.ts +3 -2
- package/src/scripts-runtime/types/stdlib.d.ts +11 -4
- package/src/scripts-runtime/types/swarm-extension.d.ts +9 -9
- package/src/scripts-runtime/types/swarm-sdk.d.ts +11 -4
- package/src/server.ts +4 -4
- package/src/slack/actions.ts +56 -0
- package/src/slack/app.ts +107 -59
- package/src/slack/assistant.ts +33 -7
- package/src/slack/handlers.ts +6 -4
- package/src/slack/http-receiver.ts +284 -0
- package/src/slack/inbound-dispatch.ts +43 -7
- package/src/slack/inbound-files.ts +35 -14
- package/src/slack/message-text.ts +47 -4
- package/src/slack/render-v2.ts +109 -24
- package/src/slack/responses.ts +3 -2
- package/src/slack/socket-ack.ts +17 -10
- package/src/slack/steering.ts +5 -0
- package/src/slack/thread-buffer-store.ts +58 -0
- package/src/slack/thread-buffer.ts +341 -57
- package/src/slack/work-objects.ts +4 -1
- package/src/tasks/context-key.ts +24 -0
- package/src/tasks/errors.ts +5 -0
- package/src/tasks/sibling-awareness.ts +13 -1
- package/src/tests/acp-adapter.test.ts +4 -6
- package/src/tests/agent-fs-live-url.test.ts +15 -0
- package/src/tests/agent-fs-provision-seeder.test.ts +140 -0
- package/src/tests/agent-fs-user-keys.test.ts +483 -0
- package/src/tests/agentfs-proxy.test.ts +8 -8
- package/src/tests/api-key-tracking.test.ts +0 -72
- package/src/tests/api-keys-status-model-limits.test.ts +93 -1
- package/src/tests/api-keys-validation.test.ts +42 -0
- package/src/tests/approval-card-resolution.test.ts +402 -0
- package/src/tests/approval-requests-notifications.test.ts +12 -2
- package/src/tests/approval-respond-auth.test.ts +28 -0
- package/src/tests/apps-action-parent-task.test.ts +140 -0
- package/src/tests/apps-catalog-additions.test.ts +315 -0
- package/src/tests/apps-catalog-files.test.ts +114 -0
- package/src/tests/apps-catalog-hitl.test.ts +117 -0
- package/src/tests/apps-catalog-inputs.test.ts +86 -0
- package/src/tests/apps-catalog-page-frame.test.ts +49 -0
- package/src/tests/apps-catalog-table.test.ts +47 -0
- package/src/tests/apps-chart-shell.test.ts +1 -1
- package/src/tests/apps-element-assembly.test.ts +52 -3
- package/src/tests/apps-session-thread.test.ts +261 -0
- package/src/tests/asset-key-invariants.test.ts +14 -0
- package/src/tests/base-prompt.test.ts +213 -23
- package/src/tests/boot-scrub-sweep.test.ts +172 -0
- package/src/tests/caller-session-group.test.ts +199 -0
- package/src/tests/cards.test.ts +169 -0
- package/src/tests/chat-sdk-relay.test.ts +149 -1
- package/src/tests/chat-sdk-status-route.test.ts +16 -3
- package/src/tests/chat-sdk-telegram-token.test.ts +76 -0
- package/src/tests/chat-sdk-tools.test.ts +147 -0
- package/src/tests/checklist-nudge.test.ts +208 -0
- package/src/tests/checklist.test.ts +686 -0
- package/src/tests/claude-adapter-binary.test.ts +67 -6
- package/src/tests/claude-flag-settings.test.ts +29 -0
- package/src/tests/claude-sdk-lifecycle.test.ts +5 -0
- package/src/tests/codex-adapter.test.ts +340 -2
- package/src/tests/codex-app-server.test.ts +32 -0
- package/src/tests/codex-oauth.test.ts +3 -1
- package/src/tests/codex-rate-limits.test.ts +384 -0
- package/src/tests/comb-config-guard.test.ts +21 -0
- package/src/tests/comb-default.test.ts +59 -97
- package/src/tests/comb-links.test.ts +86 -16
- package/src/tests/comb-status.test.ts +24 -27
- package/src/tests/create-page-tool.test.ts +101 -1
- package/src/tests/create-schedule-key.test.ts +105 -0
- package/src/tests/credential-broker.test.ts +2 -2
- package/src/tests/credential-outcome-report.test.ts +20 -0
- package/src/tests/db-query.test.ts +87 -1
- package/src/tests/db-task-read-contract.test.ts +4 -0
- package/src/tests/db-task-write-contract.test.ts +6 -1
- package/src/tests/deferred-task-wake.test.ts +63 -1
- package/src/tests/docker-isolation-config-guard.test.ts +29 -0
- package/src/tests/docs-index-footprint.test.js +11 -3
- package/src/tests/e2e-visuals-comment.test.ts +82 -0
- package/src/tests/e2e-visuals-verify-pr.test.ts +138 -0
- package/src/tests/entrypoint-github-enterprise.test.ts +158 -0
- package/src/tests/extensions-assets.test.ts +7 -3
- package/src/tests/extensions-catalog.test.ts +1 -0
- package/src/tests/extensions-example-sql-admin-only.test.ts +201 -0
- package/src/tests/extensions-pre-task.test.ts +3 -3
- package/src/tests/extensions-steering.test.ts +14 -2
- package/src/tests/favorites-agent-fs-path.test.ts +124 -0
- package/src/tests/fetch-resolved-env.test.ts +68 -0
- package/src/tests/fixtures/import-package.ts +32 -0
- package/src/tests/fixtures/runner-missing-dependency.ts +129 -0
- package/src/tests/fixtures/ui-spec-slack/deploys.json +121 -0
- package/src/tests/fixtures/ui-spec-slack/incident.json +183 -0
- package/src/tests/fixtures/ui-spec-slack/three-charts-stale.json +196 -0
- package/src/tests/fixtures/ui-spec-slack/video-rejected-by-slack.json +183 -0
- package/src/tests/fixtures/ui-spec-slack/video.json +446 -0
- package/src/tests/fs-routes.test.ts +505 -2
- package/src/tests/github-ghes-mock.test.ts +196 -0
- package/src/tests/github-host.test.ts +285 -0
- package/src/tests/gitleaks-download-retry.test.ts +85 -0
- package/src/tests/heartbeat-supersede-resume.test.ts +73 -0
- package/src/tests/heartbeat.test.ts +56 -0
- package/src/tests/human-thread-routing.test.ts +187 -0
- package/src/tests/import-config.test.ts +209 -0
- package/src/tests/import.test.ts +464 -0
- package/src/tests/invites-http.test.ts +144 -1
- package/src/tests/jira-outbound-sync.test.ts +33 -1
- package/src/tests/key-window-usage.test.ts +831 -0
- package/src/tests/kv-http.test.ts +11 -0
- package/src/tests/linear-outbound-sync.test.ts +30 -1
- package/src/tests/literal-matcher.test.ts +58 -0
- package/src/tests/mcp-oauth-manual-client.test.ts +1 -1
- package/src/tests/oauth-presets.test.ts +12 -0
- package/src/tests/pi-mono-adapter.test.ts +79 -0
- package/src/tests/pool-affinity.test.ts +50 -0
- package/src/tests/preload-env.test.ts +2 -0
- package/src/tests/preload.ts +3 -1
- package/src/tests/prompt-template-session.test.ts +53 -5
- package/src/tests/provider-quota-persistence.test.ts +362 -0
- package/src/tests/provider-registration.test.ts +2 -55
- package/src/tests/provider-runtime-dependencies.test.ts +212 -0
- package/src/tests/rate-limit-event.test.ts +22 -0
- package/src/tests/rbac-admission.test.ts +19 -0
- package/src/tests/rbac-charact-misc-tools.test.ts +31 -0
- package/src/tests/rbac-engine.test.ts +2 -0
- package/src/tests/rbac-roles.test.ts +2 -0
- package/src/tests/reasoning-events.test.ts +164 -0
- package/src/tests/routing-affinity-inventory.test.ts +22 -0
- package/src/tests/runner-missing-dependency.test.ts +61 -0
- package/src/tests/runtime-pool-reachability.test.ts +135 -1
- package/src/tests/runtime-pool-routing.test.ts +52 -0
- package/src/tests/runtime-providers-docker.test.ts +91 -0
- package/src/tests/runtime-stale-threshold.test.ts +40 -0
- package/src/tests/savings-fleet-slices.test.ts +122 -0
- package/src/tests/savings-read.test.ts +41 -0
- package/src/tests/savings-scripts.test.ts +9 -3
- package/src/tests/script-connections.test.ts +7 -0
- package/src/tests/script-executor-conformance.test.ts +41 -4
- package/src/tests/secret-canary-sweep.test.ts +41 -5
- package/src/tests/secret-scrub-gate.test.ts +257 -0
- package/src/tests/seed-registry.test.ts +142 -9
- package/src/tests/seed-scripts.test.ts +23 -0
- package/src/tests/session-cost-attribution.test.ts +748 -0
- package/src/tests/session-costs.test.ts +14 -15
- package/src/tests/session-logs.test.ts +83 -0
- package/src/tests/session-source-keys.test.ts +42 -1
- package/src/tests/sessions-detail-batch.test.ts +7 -0
- package/src/tests/sessions-move.test.ts +70 -0
- package/src/tests/sessions-tree.test.ts +98 -0
- package/src/tests/sessions.test.ts +69 -0
- package/src/tests/slack-config.test.ts +4 -18
- package/src/tests/slack-http-receiver.test.ts +472 -0
- package/src/tests/slack-inbound-logging.test.ts +64 -0
- package/src/tests/slack-leave-thread.test.ts +1 -1
- package/src/tests/slack-message-text.test.ts +104 -0
- package/src/tests/slack-mode-lifecycle.test.ts +6 -4
- package/src/tests/slack-render-v2.test.ts +405 -0
- package/src/tests/slack-skip-reaction.test.ts +2 -2
- package/src/tests/slack-start-reload-race.test.ts +67 -0
- package/src/tests/slack-steering.test.ts +22 -10
- package/src/tests/slack-thread-buffer-context.test.ts +1 -1
- package/src/tests/slack-thread-buffer-fold.test.ts +417 -0
- package/src/tests/slack-thread-buffer-restore.test.ts +198 -0
- package/src/tests/slack-thread-buffer-startup-restore.test.ts +86 -0
- package/src/tests/slack-thread-buffer.test.ts +34 -34
- package/src/tests/slack-thread-participants.test.ts +23 -5
- package/src/tests/slack-tool-blocks.test.ts +167 -0
- package/src/tests/status.test.ts +32 -6
- package/src/tests/steering-core.test.ts +13 -0
- package/src/tests/steering-enabled.test.ts +7 -1
- package/src/tests/steering-promotion.test.ts +24 -0
- package/src/tests/subscription-plans.test.ts +20 -1
- package/src/tests/swarm-config-reserved-keys.test.ts +17 -0
- package/src/tests/system-one-hosts-ui-mirror.test.ts +67 -0
- package/src/tests/task-artifacts.test.ts +50 -0
- package/src/tests/task-session-prompts.test.ts +95 -1
- package/src/tests/task-ui-action-route.test.ts +191 -0
- package/src/tests/task-ui-actions.test.ts +195 -0
- package/src/tests/task-ui-spec-fallback.test.ts +65 -0
- package/src/tests/task-ui-spec.test.ts +368 -0
- package/src/tests/workflow-agent-task-retry.test.ts +34 -1
- package/src/tests/workflow-system-one-extraction.test.ts +149 -1
- package/src/tools/chat-post.ts +19 -4
- package/src/tools/chat-reply.ts +20 -4
- package/src/tools/create-page.ts +21 -4
- package/src/tools/defer-task.ts +1 -1
- package/src/tools/get-swarm.ts +18 -2
- package/src/tools/join-swarm.ts +2 -1
- package/src/tools/kv/kv-write-auth.ts +17 -1
- package/src/tools/schedules/create-schedule.ts +22 -4
- package/src/tools/slack-post.ts +40 -7
- package/src/tools/slack-reply.ts +50 -14
- package/src/tools/store-progress.ts +69 -3
- package/src/types.ts +50 -4
- package/src/ui-spec/actions.ts +86 -0
- package/src/ui-spec/fallback.ts +19 -0
- package/src/ui-spec/slack.ts +17 -0
- package/src/ui-spec/validate.ts +169 -0
- package/src/utils/codex-rate-limits.ts +159 -0
- package/src/utils/constants.ts +60 -138
- package/src/utils/credentials.ts +2 -0
- package/src/utils/error-tracker.ts +19 -0
- package/src/utils/github-host.ts +217 -0
- package/src/utils/github-pull-request.ts +8 -5
- package/src/utils/literal-matcher.ts +118 -0
- package/src/utils/provider-account-telemetry.ts +331 -0
- package/src/utils/reasoning-events.ts +107 -0
- package/src/utils/secret-scrubber.ts +331 -25
- package/src/utils/subscription-plans.ts +11 -59
- package/src/utils/task-attachment-links.ts +9 -12
- package/src/utils/task-ui-spec.ts +67 -0
- package/src/vcs/index.ts +3 -0
- package/src/workflows/approval-notifications.ts +188 -12
- package/src/workflows/executors/system-one-extraction.ts +14 -7
- package/src/workflows/executors/system-one-providers.ts +22 -1
- package/src/workflows/task-step-routing.ts +8 -3
- package/templates/community/open-prompt-showreel/PLAYBOOK.md +1 -1
- package/templates/community/open-prompt-showreel/skills/open-prompt-showreel/SKILL.md +1 -1
- package/templates/extensions/README.md +1 -0
- package/templates/extensions/sql-admin-only/README.md +20 -0
- package/templates/extensions/sql-admin-only/hooks.ts +100 -0
- package/templates/extensions/sql-admin-only/manifest.json +8 -0
- package/templates/import/manifest.schema.json +136 -0
- package/templates/import/sources.schema.json +44 -0
- package/templates/skills/agent-browser/SKILL.md +1 -1
- package/templates/skills/agent-browser/content.md +1 -1
- package/templates/skills/apps/SKILL.md +151 -14
- package/templates/skills/apps/content.md +151 -14
- package/templates/skills/asset-namespaces/content.md +2 -1
- package/templates/skills/chat-sdk/content.md +17 -0
- package/templates/skills/db-query-guidance/content.md +2 -1
- package/templates/skills/scheduling/content.md +27 -0
- package/templates/skills/slack-interaction/content.md +12 -2
- package/templates/skills/swarm-docs/content.md +1 -0
- package/templates/skills/swarm-extensions/config.json +1 -1
- package/templates/skills/swarm-extensions/content.md +33 -23
- package/templates/skills/swarm-scripts/SKILL.md +13 -0
- package/templates/skills/swarm-scripts/content.md +13 -0
- package/templates/skills/ui-spec/config.json +14 -0
- package/templates/skills/ui-spec/content.md +127 -0
- package/templates/skills/work-on-task/SKILL.md +1 -1
- package/templates/skills/work-on-task/content.md +1 -1
- package/templates/skills/workflow-iterate/content.md +4 -7
- package/templates/workflows/dreaming/content.md +2 -2
- package/dist/acp-adapter-xq6s2z6t.js +0 -14
- package/dist/claude-adapter-r33pqnzx.js +0 -24
- package/dist/cli-dns0y538.js +0 -194
- package/dist/cli-m2z8jagn.js +0 -12078
- package/dist/fx-adapter-1rnxnf56.js +0 -17
- package/dist/grok-adapter-efhmf1r8.js +0 -17
- package/dist/handlers-anrr3py9.js +0 -32
- package/dist/index-2skqtd76.js +0 -12795
- package/dist/index-8w2aznds.js +0 -33
- package/dist/index-qnjvr362.js +0 -37
- package/dist/index-yzxd3sn9.js +0 -32
- package/dist/lead-zhxqbfdv.js +0 -69
- package/dist/worker-7j2907g6.js +0 -69
- package/src/tests/entrypoint-acp-target-binary.test.ts +0 -439
- package/dist/{cli-4caa1x7d.js → cli-tsa40663.js} +4 -4
- package/dist/{mistral-conversations-a45tx39a.js → mistral-conversations-0c30em7t.js} +4 -4
- package/dist/{openai-completions-xd579js7.js → openai-completions-f3n69rep.js} +18 -18
- package/dist/{pi-messages-hjbv8v10.js → pi-messages-zebyt7gb.js} +5 -5
|
@@ -0,0 +1,748 @@
|
|
|
1
|
+
import { Database } from "bun:sqlite";
|
|
2
|
+
import { afterAll, beforeAll, expect, test } from "bun:test";
|
|
3
|
+
import { createServer, type Server } from "node:http";
|
|
4
|
+
import {
|
|
5
|
+
closeDb,
|
|
6
|
+
createAgent,
|
|
7
|
+
createSessionCost,
|
|
8
|
+
createTaskExtended,
|
|
9
|
+
getDbClient,
|
|
10
|
+
getKeyCostSummary,
|
|
11
|
+
getSessionCostSummary,
|
|
12
|
+
initDb,
|
|
13
|
+
insertActiveSession,
|
|
14
|
+
recordKeyUsage,
|
|
15
|
+
setApiKeyPlan,
|
|
16
|
+
} from "../be/db";
|
|
17
|
+
import { runMigrations } from "../be/migrations/runner";
|
|
18
|
+
import {
|
|
19
|
+
mintAgentToken,
|
|
20
|
+
mintRuntimeToken,
|
|
21
|
+
mintScriptRunToken,
|
|
22
|
+
mintSessionToken,
|
|
23
|
+
} from "../be/users";
|
|
24
|
+
import { spawnProviderProcess } from "../commands/runner";
|
|
25
|
+
import { handleApiKeys } from "../http/api-keys";
|
|
26
|
+
import { handleCore } from "../http/core";
|
|
27
|
+
import { handleSessionData } from "../http/session-data";
|
|
28
|
+
import { resolveCodexAuthMode } from "../providers/codex-adapter";
|
|
29
|
+
import type { CostData, ProviderEvent, ProviderSessionConfig } from "../providers/types";
|
|
30
|
+
import { getServerSessionsProcessed } from "../server-runtime-counters";
|
|
31
|
+
import { listenOnFreePort } from "./test-net";
|
|
32
|
+
|
|
33
|
+
const key = "example-phase2-session-attribution";
|
|
34
|
+
const agentId = crypto.randomUUID();
|
|
35
|
+
const otherAgentId = crypto.randomUUID();
|
|
36
|
+
let taskId: string;
|
|
37
|
+
let runtimeToken: string;
|
|
38
|
+
let taskToken: string;
|
|
39
|
+
let poolSlot: number | null = 1;
|
|
40
|
+
let server: Server;
|
|
41
|
+
let base: string;
|
|
42
|
+
beforeAll(async () => {
|
|
43
|
+
initDb(":memory:");
|
|
44
|
+
await createAgent({ id: agentId, name: "Attribution worker", isLead: false, status: "idle" });
|
|
45
|
+
await createAgent({ id: otherAgentId, name: "Other worker", isLead: false, status: "idle" });
|
|
46
|
+
taskId = (await createTaskExtended("Attribution retry", { agentId, source: "system" })).id;
|
|
47
|
+
runtimeToken = (await mintRuntimeToken(agentId, crypto.randomUUID())).plaintext;
|
|
48
|
+
taskToken = (await mintSessionToken(agentId, taskId, 60_000)).plaintext;
|
|
49
|
+
server = createServer(async (req, res) => {
|
|
50
|
+
const agent = req.headers["x-agent-id"] as string | undefined;
|
|
51
|
+
if (await handleCore(req, res, agent, key)) return;
|
|
52
|
+
if (req.url?.startsWith("/api/config/resolved")) {
|
|
53
|
+
res.writeHead(200, { "Content-Type": "application/json" }).end(
|
|
54
|
+
JSON.stringify({
|
|
55
|
+
configs:
|
|
56
|
+
poolSlot === null
|
|
57
|
+
? []
|
|
58
|
+
: [
|
|
59
|
+
{
|
|
60
|
+
key: `codex_oauth_${poolSlot}`,
|
|
61
|
+
value: JSON.stringify({
|
|
62
|
+
access: `fixture-access-${poolSlot}`,
|
|
63
|
+
refresh: "fixture-refresh",
|
|
64
|
+
expires: Date.now() + 86400000,
|
|
65
|
+
accountId: `fixture-account-${poolSlot}`,
|
|
66
|
+
}),
|
|
67
|
+
},
|
|
68
|
+
],
|
|
69
|
+
}),
|
|
70
|
+
);
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
if (
|
|
74
|
+
await handleApiKeys(
|
|
75
|
+
req,
|
|
76
|
+
res,
|
|
77
|
+
(req.url ?? "").split("?")[0]!.split("/").filter(Boolean),
|
|
78
|
+
new URLSearchParams((req.url ?? "").split("?")[1]),
|
|
79
|
+
)
|
|
80
|
+
)
|
|
81
|
+
return;
|
|
82
|
+
if (
|
|
83
|
+
await handleSessionData(
|
|
84
|
+
req,
|
|
85
|
+
res,
|
|
86
|
+
(req.url ?? "").split("?")[0]!.split("/").filter(Boolean),
|
|
87
|
+
new URLSearchParams(),
|
|
88
|
+
agent,
|
|
89
|
+
)
|
|
90
|
+
)
|
|
91
|
+
return;
|
|
92
|
+
res.writeHead(404).end();
|
|
93
|
+
});
|
|
94
|
+
base = `http://127.0.0.1:${await listenOnFreePort(server)}`;
|
|
95
|
+
});
|
|
96
|
+
afterAll(async () => {
|
|
97
|
+
server.closeAllConnections();
|
|
98
|
+
await new Promise<void>((resolve) => server.close(() => resolve()));
|
|
99
|
+
closeDb();
|
|
100
|
+
});
|
|
101
|
+
function body(extra: Record<string, unknown> = {}) {
|
|
102
|
+
return {
|
|
103
|
+
id: crypto.randomUUID(),
|
|
104
|
+
sessionId: crypto.randomUUID(),
|
|
105
|
+
taskId,
|
|
106
|
+
agentId,
|
|
107
|
+
totalCostUsd: 1,
|
|
108
|
+
inputTokens: 100,
|
|
109
|
+
outputTokens: 20,
|
|
110
|
+
model: "gpt-5",
|
|
111
|
+
provider: "codex",
|
|
112
|
+
...extra,
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
async function post(value: Record<string, unknown>, bearer = runtimeToken) {
|
|
116
|
+
const response = await fetch(`${base}/api/session-costs`, {
|
|
117
|
+
method: "POST",
|
|
118
|
+
headers: {
|
|
119
|
+
Authorization: `Bearer ${bearer}`,
|
|
120
|
+
"Content-Type": "application/json",
|
|
121
|
+
"X-Agent-ID": agentId,
|
|
122
|
+
},
|
|
123
|
+
body: JSON.stringify(value),
|
|
124
|
+
});
|
|
125
|
+
return {
|
|
126
|
+
status: response.status,
|
|
127
|
+
data: (await response.json()) as { cost: Record<string, unknown> },
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
test("delayed reports, retries and resumes retain execution credentials and harness semantics", async () => {
|
|
132
|
+
await recordKeyUsage("CODEX_OAUTH", "cred-A", 0, taskId);
|
|
133
|
+
const a = body({
|
|
134
|
+
credentialKeyType: "CODEX_OAUTH",
|
|
135
|
+
credentialKeySuffix: "cred-A",
|
|
136
|
+
harness: "codex",
|
|
137
|
+
cacheReadTokens: 40,
|
|
138
|
+
});
|
|
139
|
+
await recordKeyUsage("CODEX_OAUTH", "cred-B", 1, taskId);
|
|
140
|
+
const b = body({
|
|
141
|
+
credentialKeyType: "CODEX_OAUTH",
|
|
142
|
+
credentialKeySuffix: "cred-B",
|
|
143
|
+
harness: "pi",
|
|
144
|
+
provider: "pi",
|
|
145
|
+
cacheReadTokens: 40,
|
|
146
|
+
isError: true,
|
|
147
|
+
});
|
|
148
|
+
const savedB = await post(b);
|
|
149
|
+
const savedA = await post(a);
|
|
150
|
+
expect(savedB.status).toBe(201);
|
|
151
|
+
expect(savedA.status).toBe(201);
|
|
152
|
+
expect(savedA.data.cost).toMatchObject({
|
|
153
|
+
credentialKeySuffix: "cred-A",
|
|
154
|
+
harness: "codex",
|
|
155
|
+
inputTokens: 100,
|
|
156
|
+
cacheReadTokens: 40,
|
|
157
|
+
cacheWriteTokens: null,
|
|
158
|
+
});
|
|
159
|
+
expect(savedB.data.cost).toMatchObject({
|
|
160
|
+
credentialKeySuffix: "cred-B",
|
|
161
|
+
harness: "pi",
|
|
162
|
+
inputTokens: 100,
|
|
163
|
+
cacheReadTokens: 40,
|
|
164
|
+
});
|
|
165
|
+
const resumed = await post(
|
|
166
|
+
body({ credentialKeyType: "CODEX_OAUTH", credentialKeySuffix: "cred-B", harness: "codex" }),
|
|
167
|
+
);
|
|
168
|
+
expect(resumed.status).toBe(201);
|
|
169
|
+
expect(resumed.data.cost).toMatchObject({
|
|
170
|
+
credentialKeySuffix: "cred-B",
|
|
171
|
+
cacheReadTokens: null,
|
|
172
|
+
cacheWriteTokens: null,
|
|
173
|
+
});
|
|
174
|
+
const summary = await getSessionCostSummary({ agentId, groupBy: "both" });
|
|
175
|
+
expect(summary.byCredential.find((row) => row.keySuffix === "cred-A")?.sessions).toBe(1);
|
|
176
|
+
expect(summary.byCredential.find((row) => row.keySuffix === "cred-B")?.sessions).toBe(2);
|
|
177
|
+
expect(
|
|
178
|
+
(await getKeyCostSummary("CODEX_OAUTH")).find((row) => row.keySuffix === "cred-A")
|
|
179
|
+
?.totalInputTokens,
|
|
180
|
+
).toBe(100);
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
test("concurrent reposts do not duplicate counters or rewrite attribution", async () => {
|
|
184
|
+
const value = body({
|
|
185
|
+
credentialKeyType: "CODEX_OAUTH",
|
|
186
|
+
credentialKeySuffix: "first",
|
|
187
|
+
harness: "codex",
|
|
188
|
+
});
|
|
189
|
+
const before = getServerSessionsProcessed();
|
|
190
|
+
const first = await post(value);
|
|
191
|
+
const repeats = await Promise.all(
|
|
192
|
+
Array.from({ length: 4 }, () =>
|
|
193
|
+
post({
|
|
194
|
+
...value,
|
|
195
|
+
id: crypto.randomUUID(),
|
|
196
|
+
inputTokens: 999,
|
|
197
|
+
credentialKeySuffix: "other",
|
|
198
|
+
harness: "pi",
|
|
199
|
+
}),
|
|
200
|
+
),
|
|
201
|
+
);
|
|
202
|
+
for (const repeat of repeats) {
|
|
203
|
+
expect(repeat.status).toBe(201);
|
|
204
|
+
expect(repeat.data.cost).toEqual(first.data.cost);
|
|
205
|
+
}
|
|
206
|
+
expect(getServerSessionsProcessed() - before).toBe(1);
|
|
207
|
+
expect(
|
|
208
|
+
await getDbClient().get("SELECT COUNT(*) AS n FROM session_costs WHERE sessionId = ?", [
|
|
209
|
+
String(value.sessionId),
|
|
210
|
+
]),
|
|
211
|
+
).toEqual({ n: 1 });
|
|
212
|
+
});
|
|
213
|
+
|
|
214
|
+
test("record and session identities cannot be reassigned", async () => {
|
|
215
|
+
const value = body();
|
|
216
|
+
expect((await post(value)).status).toBe(201);
|
|
217
|
+
expect((await post({ ...value, sessionId: crypto.randomUUID() })).status).toBe(409);
|
|
218
|
+
expect((await post({ ...value, taskId: undefined })).status).toBe(409);
|
|
219
|
+
expect((await post({ ...value, agentId: otherAgentId }, key)).status).toBe(409);
|
|
220
|
+
});
|
|
221
|
+
|
|
222
|
+
test("legacy reports stay unattributed, including a later attempted upgrade", async () => {
|
|
223
|
+
const value = body();
|
|
224
|
+
const first = await post(value, taskToken);
|
|
225
|
+
expect(first.status).toBe(201);
|
|
226
|
+
expect(first.data.cost).toMatchObject({
|
|
227
|
+
credentialKeyType: null,
|
|
228
|
+
credentialKeySuffix: null,
|
|
229
|
+
harness: null,
|
|
230
|
+
});
|
|
231
|
+
expect(
|
|
232
|
+
(
|
|
233
|
+
await post({
|
|
234
|
+
...value,
|
|
235
|
+
credentialKeyType: "CODEX_OAUTH",
|
|
236
|
+
credentialKeySuffix: "later",
|
|
237
|
+
harness: "codex",
|
|
238
|
+
})
|
|
239
|
+
).data.cost,
|
|
240
|
+
).toEqual(first.data.cost);
|
|
241
|
+
});
|
|
242
|
+
|
|
243
|
+
test("task tokens cannot assert session attribution or a different agent", async () => {
|
|
244
|
+
expect(
|
|
245
|
+
(
|
|
246
|
+
await post(
|
|
247
|
+
body({ credentialKeyType: "CODEX_OAUTH", credentialKeySuffix: "forged", harness: "codex" }),
|
|
248
|
+
taskToken,
|
|
249
|
+
)
|
|
250
|
+
).status,
|
|
251
|
+
).toBe(403);
|
|
252
|
+
expect((await post(body({ agentId: otherAgentId }))).status).toBe(403);
|
|
253
|
+
expect((await post(body({ credentialKeyType: "CODEX_OAUTH" }))).status).toBe(400);
|
|
254
|
+
});
|
|
255
|
+
|
|
256
|
+
test("estimated plan records remain uncertain in savings summaries", async () => {
|
|
257
|
+
await recordKeyUsage("CLAUDE_CODE_OAUTH_TOKEN", "estimate", 0, taskId);
|
|
258
|
+
await getDbClient().run(
|
|
259
|
+
"UPDATE api_key_status SET plan = 'claude_max_5x', planSource = 'estimated' WHERE keySuffix = 'estimate'",
|
|
260
|
+
);
|
|
261
|
+
await createSessionCost({
|
|
262
|
+
sessionId: crypto.randomUUID(),
|
|
263
|
+
agentId,
|
|
264
|
+
taskId,
|
|
265
|
+
totalCostUsd: 1,
|
|
266
|
+
durationMs: 1,
|
|
267
|
+
numTurns: 1,
|
|
268
|
+
model: "opus",
|
|
269
|
+
credentialKeyType: "CLAUDE_CODE_OAUTH_TOKEN",
|
|
270
|
+
credentialKeySuffix: "estimate",
|
|
271
|
+
harness: "claude",
|
|
272
|
+
});
|
|
273
|
+
const summary = await getSessionCostSummary({ agentId, groupBy: "both" });
|
|
274
|
+
expect(summary.byCredential.find((row) => row.keySuffix === "estimate")).toMatchObject({
|
|
275
|
+
plan: null,
|
|
276
|
+
planSource: "estimated",
|
|
277
|
+
});
|
|
278
|
+
expect(
|
|
279
|
+
await getDbClient().get("SELECT plan FROM api_key_status WHERE keySuffix = 'estimate'"),
|
|
280
|
+
).toEqual({ plan: "claude_max_5x" });
|
|
281
|
+
});
|
|
282
|
+
|
|
283
|
+
test("ambiguous raw Pro detection preserves manual selection and invalidates stale savings", async () => {
|
|
284
|
+
await recordKeyUsage("CODEX_OAUTH", "rawpro", 0, null, "global", null, "chatgpt_plus");
|
|
285
|
+
await recordKeyUsage("CODEX_OAUTH", "rawpro", 0, null, "global", null, null, "promax");
|
|
286
|
+
expect(
|
|
287
|
+
await getDbClient().get(
|
|
288
|
+
"SELECT plan, detectedPlanRaw FROM api_key_status WHERE keySuffix = 'rawpro'",
|
|
289
|
+
),
|
|
290
|
+
).toEqual({ plan: null, detectedPlanRaw: "promax" });
|
|
291
|
+
await setApiKeyPlan("CODEX_OAUTH", "rawpro", "chatgpt_pro_500");
|
|
292
|
+
await recordKeyUsage("CODEX_OAUTH", "rawpro", 0, null, "global", null, "chatgpt_pro", "prolite");
|
|
293
|
+
expect(
|
|
294
|
+
await getDbClient().get(
|
|
295
|
+
"SELECT plan, planSource, detectedPlanRaw FROM api_key_status WHERE keySuffix = 'rawpro'",
|
|
296
|
+
),
|
|
297
|
+
).toEqual({ plan: "chatgpt_pro_500", planSource: "manual", detectedPlanRaw: "prolite" });
|
|
298
|
+
});
|
|
299
|
+
|
|
300
|
+
test("migration 307 preserves existing rows, manual plans, and null historical attribution", async () => {
|
|
301
|
+
const db = new Database(":memory:");
|
|
302
|
+
try {
|
|
303
|
+
runMigrations(db);
|
|
304
|
+
expect(
|
|
305
|
+
db.query("SELECT credentialKeyType, harness, cacheReadTokens FROM session_costs").all(),
|
|
306
|
+
).toEqual([]);
|
|
307
|
+
// Restore the pre-307 column shape, then migrate an existing database.
|
|
308
|
+
db.run("DROP INDEX idx_session_costs_credential_createdAt");
|
|
309
|
+
db.run("DROP INDEX idx_session_costs_sessionId");
|
|
310
|
+
for (const column of ["credentialKeyType", "credentialKeySuffix", "harness"])
|
|
311
|
+
db.run(`ALTER TABLE session_costs DROP COLUMN ${column}`);
|
|
312
|
+
db.run("ALTER TABLE api_key_status DROP COLUMN detectedPlanRaw");
|
|
313
|
+
db.run("ALTER TABLE session_costs RENAME COLUMN cacheReadTokens TO priorCacheReadTokens");
|
|
314
|
+
db.run("ALTER TABLE session_costs ADD COLUMN cacheReadTokens INTEGER NOT NULL DEFAULT 0");
|
|
315
|
+
db.run("ALTER TABLE session_costs DROP COLUMN priorCacheReadTokens");
|
|
316
|
+
db.run("DELETE FROM _migrations WHERE version = 307");
|
|
317
|
+
db.run("PRAGMA foreign_keys = OFF");
|
|
318
|
+
db.run(
|
|
319
|
+
"INSERT INTO session_costs(id, sessionId, agentId, totalCostUsd, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens, durationMs, numTurns, model, createdAt) VALUES ('old', 'old-session', 'old-agent', 7, 123, 12, 40, NULL, 100, 1, 'gpt-5', '2026-11-01T00:00:00.000Z')",
|
|
320
|
+
);
|
|
321
|
+
for (const source of ["manual", "detected", "estimated"])
|
|
322
|
+
db.run(
|
|
323
|
+
"INSERT INTO api_key_status(keyType, keySuffix, keyIndex, scope, scopeId, plan, planSource, updatedAt) VALUES ('CODEX_OAUTH', ?, 0, 'global', '', 'chatgpt_pro', ?, '2026-11-01T00:00:00.000Z')",
|
|
324
|
+
[source, source],
|
|
325
|
+
);
|
|
326
|
+
for (const plan of ["chatgpt_pro_5x", "chatgpt_pro_500", "chatgpt_plus"])
|
|
327
|
+
db.run(
|
|
328
|
+
"INSERT INTO api_key_status(keyType, keySuffix, keyIndex, scope, scopeId, plan, planSource, updatedAt) VALUES ('CODEX_OAUTH', ?, 0, 'global', '', ?, 'detected', '2026-11-01T00:00:00.000Z')",
|
|
329
|
+
[plan, plan],
|
|
330
|
+
);
|
|
331
|
+
runMigrations(db);
|
|
332
|
+
runMigrations(db);
|
|
333
|
+
expect(
|
|
334
|
+
db
|
|
335
|
+
.query(
|
|
336
|
+
"SELECT totalCostUsd, inputTokens, cacheReadTokens, cacheWriteTokens, credentialKeyType, credentialKeySuffix, harness FROM session_costs",
|
|
337
|
+
)
|
|
338
|
+
.get(),
|
|
339
|
+
).toEqual({
|
|
340
|
+
totalCostUsd: 7,
|
|
341
|
+
inputTokens: 123,
|
|
342
|
+
cacheReadTokens: 40,
|
|
343
|
+
cacheWriteTokens: null,
|
|
344
|
+
credentialKeyType: null,
|
|
345
|
+
credentialKeySuffix: null,
|
|
346
|
+
harness: null,
|
|
347
|
+
});
|
|
348
|
+
expect(db.query("SELECT plan FROM api_key_status WHERE keySuffix = 'manual'").get()).toEqual({
|
|
349
|
+
plan: "chatgpt_pro",
|
|
350
|
+
});
|
|
351
|
+
expect(
|
|
352
|
+
db
|
|
353
|
+
.query("SELECT plan, detectedPlanRaw FROM api_key_status WHERE keySuffix = 'detected'")
|
|
354
|
+
.get(),
|
|
355
|
+
).toEqual({ plan: null, detectedPlanRaw: "pro" });
|
|
356
|
+
for (const plan of ["chatgpt_pro_5x", "chatgpt_pro_500", "chatgpt_plus"])
|
|
357
|
+
expect(
|
|
358
|
+
db
|
|
359
|
+
.query("SELECT plan, planSource, detectedPlanRaw FROM api_key_status WHERE keySuffix = ?")
|
|
360
|
+
.get(plan),
|
|
361
|
+
).toEqual({ plan, planSource: "detected", detectedPlanRaw: null });
|
|
362
|
+
expect(
|
|
363
|
+
db
|
|
364
|
+
.query(
|
|
365
|
+
"SELECT name FROM pragma_index_list('session_costs') WHERE name = 'idx_session_costs_credential_createdAt'",
|
|
366
|
+
)
|
|
367
|
+
.get(),
|
|
368
|
+
).not.toBeNull();
|
|
369
|
+
expect(
|
|
370
|
+
db
|
|
371
|
+
.query(
|
|
372
|
+
"SELECT [notnull] FROM pragma_table_info('session_costs') WHERE name = 'cacheReadTokens'",
|
|
373
|
+
)
|
|
374
|
+
.get(),
|
|
375
|
+
).toEqual({ notnull: 0 });
|
|
376
|
+
} finally {
|
|
377
|
+
db.close();
|
|
378
|
+
}
|
|
379
|
+
});
|
|
380
|
+
|
|
381
|
+
test("the worker captures each Pi credential before delayed completion and resume", async () => {
|
|
382
|
+
const directory = `/tmp/provider-usage-phase2-worker-${crypto.randomUUID()}`;
|
|
383
|
+
await Bun.$`mkdir -p ${directory}`.quiet();
|
|
384
|
+
const completions: Array<() => void> = [];
|
|
385
|
+
const slots: Array<number | undefined> = [];
|
|
386
|
+
const adapter = {
|
|
387
|
+
name: "pi",
|
|
388
|
+
traits: {},
|
|
389
|
+
async createSession(config: ProviderSessionConfig) {
|
|
390
|
+
slots.push(config.codexSlot);
|
|
391
|
+
let complete!: () => void;
|
|
392
|
+
const completion = new Promise<void>((resolve) => {
|
|
393
|
+
complete = resolve;
|
|
394
|
+
});
|
|
395
|
+
completions.push(complete);
|
|
396
|
+
const cost: CostData = {
|
|
397
|
+
sessionId: "native-history",
|
|
398
|
+
agentId,
|
|
399
|
+
totalCostUsd: 0,
|
|
400
|
+
inputTokens: 100,
|
|
401
|
+
cacheReadTokens: 40,
|
|
402
|
+
outputTokens: 20,
|
|
403
|
+
durationMs: 1,
|
|
404
|
+
numTurns: 1,
|
|
405
|
+
model: "gpt-5.6-sol",
|
|
406
|
+
isError: false,
|
|
407
|
+
provider: "pi",
|
|
408
|
+
};
|
|
409
|
+
return {
|
|
410
|
+
sessionId: "native-history",
|
|
411
|
+
onEvent(listener: (event: ProviderEvent) => void) {
|
|
412
|
+
listener({ type: "result", cost, isError: false });
|
|
413
|
+
},
|
|
414
|
+
async waitForCompletion() {
|
|
415
|
+
await completion;
|
|
416
|
+
return { exitCode: 0, isError: false, cost };
|
|
417
|
+
},
|
|
418
|
+
async abort() {
|
|
419
|
+
complete();
|
|
420
|
+
},
|
|
421
|
+
};
|
|
422
|
+
},
|
|
423
|
+
} as unknown as Parameters<typeof spawnProviderProcess>[0];
|
|
424
|
+
const options = {
|
|
425
|
+
prompt: "fixture",
|
|
426
|
+
systemPrompt: "fixture",
|
|
427
|
+
logFile: `${directory}/session.jsonl`,
|
|
428
|
+
role: "worker",
|
|
429
|
+
apiUrl: base,
|
|
430
|
+
apiKey: runtimeToken,
|
|
431
|
+
agentId,
|
|
432
|
+
iteration: 1,
|
|
433
|
+
taskId,
|
|
434
|
+
model: "openai-codex/gpt-5.6-sol",
|
|
435
|
+
harnessProvider: "pi" as const,
|
|
436
|
+
cwd: directory,
|
|
437
|
+
};
|
|
438
|
+
try {
|
|
439
|
+
poolSlot = 1;
|
|
440
|
+
const first = await spawnProviderProcess(
|
|
441
|
+
adapter,
|
|
442
|
+
{ ...options, runnerSessionId: crypto.randomUUID() },
|
|
443
|
+
directory,
|
|
444
|
+
);
|
|
445
|
+
const captured = { ...first.lastCost?.value };
|
|
446
|
+
poolSlot = 2;
|
|
447
|
+
const resumed = await spawnProviderProcess(
|
|
448
|
+
adapter,
|
|
449
|
+
{ ...options, runnerSessionId: crypto.randomUUID(), resumeSessionId: "native-history" },
|
|
450
|
+
directory,
|
|
451
|
+
);
|
|
452
|
+
completions[1]!();
|
|
453
|
+
await resumed.promise;
|
|
454
|
+
completions[0]!();
|
|
455
|
+
await first.promise;
|
|
456
|
+
expect(slots).toEqual([1, 2]);
|
|
457
|
+
expect(first.result?.cost).toMatchObject({
|
|
458
|
+
...captured,
|
|
459
|
+
credentialKeyType: "CODEX_OAUTH",
|
|
460
|
+
harness: "pi",
|
|
461
|
+
inputTokens: 100,
|
|
462
|
+
cacheReadTokens: 40,
|
|
463
|
+
});
|
|
464
|
+
expect(first.result?.cost?.credentialKeySuffix).not.toBe(
|
|
465
|
+
resumed.result?.cost?.credentialKeySuffix,
|
|
466
|
+
);
|
|
467
|
+
expect(first.result?.cost?.sessionId).not.toBe(resumed.result?.cost?.sessionId);
|
|
468
|
+
for (const running of [resumed, first]) {
|
|
469
|
+
const saved = await post(running.result!.cost! as unknown as Record<string, unknown>);
|
|
470
|
+
expect(saved.status).toBe(201);
|
|
471
|
+
expect(saved.data.cost.credentialKeySuffix).toBe(running.result?.cost?.credentialKeySuffix);
|
|
472
|
+
expect(saved.data.cost.harness).toBe("pi");
|
|
473
|
+
}
|
|
474
|
+
} finally {
|
|
475
|
+
for (const complete of completions) complete();
|
|
476
|
+
await Bun.$`rm -rf ${directory}`.quiet();
|
|
477
|
+
}
|
|
478
|
+
});
|
|
479
|
+
|
|
480
|
+
test.each([
|
|
481
|
+
"chatgpt",
|
|
482
|
+
"apikey",
|
|
483
|
+
] as const)("Codex %s authentication determines cost attribution with an OpenAI API key", async (authMode) => {
|
|
484
|
+
const directory = `/tmp/provider-usage-standalone-${crypto.randomUUID()}`;
|
|
485
|
+
const envKeys = [
|
|
486
|
+
"HOME",
|
|
487
|
+
"CODEX_HOME",
|
|
488
|
+
"OPENAI_API_KEY",
|
|
489
|
+
"CODEX_PATH_OVERRIDE",
|
|
490
|
+
"CODEX_GATEWAY_BASE_URL",
|
|
491
|
+
"CODEX_GATEWAY_API_KEY",
|
|
492
|
+
] as const;
|
|
493
|
+
const previousEnv = Object.fromEntries(envKeys.map((key) => [key, process.env[key]]));
|
|
494
|
+
const previousSlot = poolSlot;
|
|
495
|
+
await Bun.write(
|
|
496
|
+
`${directory}/.codex/auth.json`,
|
|
497
|
+
JSON.stringify({
|
|
498
|
+
auth_mode: authMode,
|
|
499
|
+
tokens: {
|
|
500
|
+
account_id: "acct-standalone",
|
|
501
|
+
access_token: "fixture-access-standalone",
|
|
502
|
+
refresh_token: "fixture-refresh-standalone",
|
|
503
|
+
id_token: "fixture-id-standalone",
|
|
504
|
+
},
|
|
505
|
+
}),
|
|
506
|
+
);
|
|
507
|
+
const cost: CostData = {
|
|
508
|
+
sessionId: "standalone-native",
|
|
509
|
+
agentId,
|
|
510
|
+
totalCostUsd: 1,
|
|
511
|
+
inputTokens: 100,
|
|
512
|
+
outputTokens: 20,
|
|
513
|
+
durationMs: 1,
|
|
514
|
+
numTurns: 1,
|
|
515
|
+
model: "gpt-5.6-sol",
|
|
516
|
+
isError: false,
|
|
517
|
+
provider: "codex",
|
|
518
|
+
};
|
|
519
|
+
const adapter = {
|
|
520
|
+
name: "codex",
|
|
521
|
+
traits: {},
|
|
522
|
+
async createSession(config: ProviderSessionConfig) {
|
|
523
|
+
expect(config.env?.OPENAI_API_KEY).toBe("fixture-openai-key");
|
|
524
|
+
expect(config.codexSlot).toBeUndefined();
|
|
525
|
+
expect(await resolveCodexAuthMode(config, () => {})).toBe(authMode);
|
|
526
|
+
return {
|
|
527
|
+
sessionId: cost.sessionId,
|
|
528
|
+
onEvent(listener: (event: ProviderEvent) => void) {
|
|
529
|
+
listener({ type: "result", cost, isError: false });
|
|
530
|
+
},
|
|
531
|
+
async waitForCompletion() {
|
|
532
|
+
return { exitCode: 0, isError: false, cost };
|
|
533
|
+
},
|
|
534
|
+
async abort() {},
|
|
535
|
+
};
|
|
536
|
+
},
|
|
537
|
+
} as unknown as Parameters<typeof spawnProviderProcess>[0];
|
|
538
|
+
try {
|
|
539
|
+
poolSlot = null;
|
|
540
|
+
process.env.HOME = directory;
|
|
541
|
+
process.env.CODEX_HOME = `${directory}/.codex`;
|
|
542
|
+
process.env.OPENAI_API_KEY = "fixture-openai-key";
|
|
543
|
+
process.env.CODEX_PATH_OVERRIDE = process.execPath;
|
|
544
|
+
delete process.env.CODEX_GATEWAY_BASE_URL;
|
|
545
|
+
delete process.env.CODEX_GATEWAY_API_KEY;
|
|
546
|
+
const running = await spawnProviderProcess(
|
|
547
|
+
adapter,
|
|
548
|
+
{
|
|
549
|
+
prompt: "fixture",
|
|
550
|
+
systemPrompt: "fixture",
|
|
551
|
+
logFile: `${directory}/session.jsonl`,
|
|
552
|
+
role: "worker",
|
|
553
|
+
apiUrl: base,
|
|
554
|
+
apiKey: runtimeToken,
|
|
555
|
+
agentId,
|
|
556
|
+
runnerSessionId: crypto.randomUUID(),
|
|
557
|
+
iteration: 1,
|
|
558
|
+
taskId,
|
|
559
|
+
model: cost.model,
|
|
560
|
+
harnessProvider: "codex",
|
|
561
|
+
cwd: directory,
|
|
562
|
+
},
|
|
563
|
+
directory,
|
|
564
|
+
);
|
|
565
|
+
await running.promise;
|
|
566
|
+
const expected =
|
|
567
|
+
authMode === "chatgpt"
|
|
568
|
+
? { credentialKeyType: "CODEX_OAUTH", credentialKeySuffix: "alone-0" }
|
|
569
|
+
: { credentialKeyType: "OPENAI_API_KEY", credentialKeySuffix: "i-key" };
|
|
570
|
+
expect(running.lastCost?.value).toMatchObject(expected);
|
|
571
|
+
expect(running.result?.cost).toMatchObject(expected);
|
|
572
|
+
const saved = await post(running.result!.cost! as unknown as Record<string, unknown>);
|
|
573
|
+
expect(saved.status).toBe(201);
|
|
574
|
+
expect(saved.data.cost).toMatchObject(expected);
|
|
575
|
+
} finally {
|
|
576
|
+
poolSlot = previousSlot;
|
|
577
|
+
for (const key of envKeys) {
|
|
578
|
+
const value = previousEnv[key];
|
|
579
|
+
if (value === undefined) delete process.env[key];
|
|
580
|
+
else process.env[key] = value;
|
|
581
|
+
}
|
|
582
|
+
await Bun.$`rm -r ${directory}`.quiet();
|
|
583
|
+
}
|
|
584
|
+
});
|
|
585
|
+
|
|
586
|
+
test("agent-bound worker tokens can report attribution, but script tokens cannot", async () => {
|
|
587
|
+
const worker = await mintAgentToken(agentId);
|
|
588
|
+
const script = await mintScriptRunToken(agentId, 60_000);
|
|
589
|
+
const value = body({
|
|
590
|
+
credentialKeyType: "CODEX_OAUTH",
|
|
591
|
+
credentialKeySuffix: "worker",
|
|
592
|
+
harness: "pi",
|
|
593
|
+
});
|
|
594
|
+
expect((await post(value, script.plaintext)).status).toBe(403);
|
|
595
|
+
const saved = await post(value, worker.plaintext);
|
|
596
|
+
expect(saved.status).toBe(201);
|
|
597
|
+
expect(saved.data.cost).toMatchObject({ credentialKeySuffix: "worker", harness: "pi" });
|
|
598
|
+
});
|
|
599
|
+
|
|
600
|
+
test("a caller cannot claim another active execution before its first cost report", async () => {
|
|
601
|
+
const sessionId = crypto.randomUUID();
|
|
602
|
+
await insertActiveSession({
|
|
603
|
+
agentId: otherAgentId,
|
|
604
|
+
triggerType: "task_assigned",
|
|
605
|
+
runnerSessionId: sessionId,
|
|
606
|
+
});
|
|
607
|
+
expect((await post(body({ sessionId }))).status).toBe(409);
|
|
608
|
+
});
|
|
609
|
+
|
|
610
|
+
test("taskless lead sessions retain costs while their synthetic task ID is active", async () => {
|
|
611
|
+
for (const triggerType of ["channel_activity", "unread_mentions"] as const) {
|
|
612
|
+
const sessionId = crypto.randomUUID();
|
|
613
|
+
await insertActiveSession({
|
|
614
|
+
agentId,
|
|
615
|
+
taskId: crypto.randomUUID(),
|
|
616
|
+
triggerType,
|
|
617
|
+
runnerSessionId: sessionId,
|
|
618
|
+
});
|
|
619
|
+
const result = await post(body({ sessionId, taskId: undefined }));
|
|
620
|
+
expect(result.status).toBe(201);
|
|
621
|
+
expect(result.data.cost.taskId).toBeUndefined();
|
|
622
|
+
expect(
|
|
623
|
+
await getDbClient().get("SELECT taskId FROM session_costs WHERE sessionId = ?", [sessionId]),
|
|
624
|
+
).toEqual({ taskId: null });
|
|
625
|
+
}
|
|
626
|
+
});
|
|
627
|
+
|
|
628
|
+
test("an active execution with a real task cannot omit or change that task", async () => {
|
|
629
|
+
const sessionId = crypto.randomUUID();
|
|
630
|
+
await insertActiveSession({
|
|
631
|
+
agentId,
|
|
632
|
+
taskId,
|
|
633
|
+
triggerType: "task_assigned",
|
|
634
|
+
runnerSessionId: sessionId,
|
|
635
|
+
});
|
|
636
|
+
expect((await post(body({ sessionId, taskId: undefined }))).status).toBe(409);
|
|
637
|
+
expect((await post(body({ sessionId, taskId: crypto.randomUUID() }))).status).toBe(409);
|
|
638
|
+
expect((await post(body({ sessionId }))).status).toBe(201);
|
|
639
|
+
});
|
|
640
|
+
|
|
641
|
+
test("legacy plan reports clear stale raw detection without changing manual choices", async () => {
|
|
642
|
+
const suffix = "legacyplus";
|
|
643
|
+
await recordKeyUsage("CODEX_OAUTH", suffix, 1, null, "global", null, null, "pro");
|
|
644
|
+
await setApiKeyPlan("CODEX_OAUTH", suffix, "chatgpt_pro_500");
|
|
645
|
+
await recordKeyUsage("CODEX_OAUTH", suffix, 1, null, "global", null, "chatgpt_plus");
|
|
646
|
+
expect(
|
|
647
|
+
await getDbClient().get(
|
|
648
|
+
"SELECT plan, planSource, detectedPlanRaw FROM api_key_status WHERE keySuffix = ?",
|
|
649
|
+
[suffix],
|
|
650
|
+
),
|
|
651
|
+
).toEqual({ plan: "chatgpt_pro_500", planSource: "manual", detectedPlanRaw: null });
|
|
652
|
+
});
|
|
653
|
+
|
|
654
|
+
test("historical credential coverage separates unknown spend from known billing types", async () => {
|
|
655
|
+
const coverageAgentId = crypto.randomUUID();
|
|
656
|
+
await createAgent({
|
|
657
|
+
id: coverageAgentId,
|
|
658
|
+
name: "Coverage worker",
|
|
659
|
+
isLead: false,
|
|
660
|
+
status: "idle",
|
|
661
|
+
});
|
|
662
|
+
for (const [credentialKeyType, totalCostUsd] of [
|
|
663
|
+
[null, 7],
|
|
664
|
+
["CODEX_OAUTH", 3],
|
|
665
|
+
["OPENAI_API_KEY", 2],
|
|
666
|
+
] as const) {
|
|
667
|
+
await createSessionCost({
|
|
668
|
+
sessionId: crypto.randomUUID(),
|
|
669
|
+
agentId: coverageAgentId,
|
|
670
|
+
credentialKeyType,
|
|
671
|
+
credentialKeySuffix: credentialKeyType ? "coverage" : null,
|
|
672
|
+
totalCostUsd,
|
|
673
|
+
durationMs: 1,
|
|
674
|
+
numTurns: 1,
|
|
675
|
+
model: "gpt-5",
|
|
676
|
+
});
|
|
677
|
+
}
|
|
678
|
+
const summary = await getSessionCostSummary({ agentId: coverageAgentId, groupBy: "both" });
|
|
679
|
+
expect(summary.totals).toMatchObject({
|
|
680
|
+
totalCostUsd: 12,
|
|
681
|
+
subscriptionCostUsd: 3,
|
|
682
|
+
credentialUnattributedCostUsd: 7,
|
|
683
|
+
credentialUnattributedSessions: 1,
|
|
684
|
+
});
|
|
685
|
+
expect(summary.daily).toHaveLength(1);
|
|
686
|
+
expect(summary.daily[0]).toMatchObject({
|
|
687
|
+
costUsd: 12,
|
|
688
|
+
subscriptionCostUsd: 3,
|
|
689
|
+
credentialUnattributedCostUsd: 7,
|
|
690
|
+
credentialUnattributedSessions: 1,
|
|
691
|
+
});
|
|
692
|
+
expect(summary.byCredential.find((row) => row.keyType === null)?.costUsd).toBe(7);
|
|
693
|
+
});
|
|
694
|
+
|
|
695
|
+
test("sessions recorded before migration 307 read their task's credential", async () => {
|
|
696
|
+
const legacyAgentId = crypto.randomUUID();
|
|
697
|
+
await createAgent({ id: legacyAgentId, name: "Legacy worker", isLead: false, status: "idle" });
|
|
698
|
+
const task = await createTaskExtended("Legacy attribution", {
|
|
699
|
+
agentId: legacyAgentId,
|
|
700
|
+
source: "system",
|
|
701
|
+
});
|
|
702
|
+
// The task's credential moved on to another key after the legacy run.
|
|
703
|
+
await getDbClient().run(
|
|
704
|
+
"UPDATE agent_tasks SET credentialKeyType = 'CLAUDE_CODE_OAUTH_TOKEN', credentialKeySuffix = 'legcy' WHERE id = ?",
|
|
705
|
+
[task.id],
|
|
706
|
+
);
|
|
707
|
+
const session = async (
|
|
708
|
+
totalCostUsd: number,
|
|
709
|
+
credential: { credentialKeyType: string; credentialKeySuffix: string } | null,
|
|
710
|
+
) => {
|
|
711
|
+
const cost = await createSessionCost({
|
|
712
|
+
sessionId: crypto.randomUUID(),
|
|
713
|
+
taskId: task.id,
|
|
714
|
+
agentId: legacyAgentId,
|
|
715
|
+
...credential,
|
|
716
|
+
totalCostUsd,
|
|
717
|
+
durationMs: 1,
|
|
718
|
+
numTurns: 1,
|
|
719
|
+
model: "claude-sonnet",
|
|
720
|
+
});
|
|
721
|
+
return cost.id;
|
|
722
|
+
};
|
|
723
|
+
const legacy = await session(5, null);
|
|
724
|
+
await getDbClient().run("UPDATE session_costs SET createdAt = ? WHERE id = ?", [
|
|
725
|
+
"2020-01-01T00:00:00.000Z",
|
|
726
|
+
legacy,
|
|
727
|
+
]);
|
|
728
|
+
await session(3, { credentialKeyType: "OPENAI_API_KEY", credentialKeySuffix: "own01" });
|
|
729
|
+
await session(2, null);
|
|
730
|
+
|
|
731
|
+
const summary = await getSessionCostSummary({ agentId: legacyAgentId, groupBy: "both" });
|
|
732
|
+
expect(summary.totals).toMatchObject({
|
|
733
|
+
totalCostUsd: 10,
|
|
734
|
+
subscriptionCostUsd: 5,
|
|
735
|
+
credentialUnattributedCostUsd: 2,
|
|
736
|
+
credentialUnattributedSessions: 1,
|
|
737
|
+
});
|
|
738
|
+
expect(
|
|
739
|
+
summary.byCredential.map(({ keyType, keySuffix, costUsd }) => [keyType, keySuffix, costUsd]),
|
|
740
|
+
).toEqual([
|
|
741
|
+
["CLAUDE_CODE_OAUTH_TOKEN", "legcy", 5],
|
|
742
|
+
["OPENAI_API_KEY", "own01", 3],
|
|
743
|
+
[null, null, 2],
|
|
744
|
+
]);
|
|
745
|
+
expect(
|
|
746
|
+
(await getKeyCostSummary("CLAUDE_CODE_OAUTH_TOKEN")).find((row) => row.keySuffix === "legcy"),
|
|
747
|
+
).toMatchObject({ totalCost: 5, taskCount: 1 });
|
|
748
|
+
});
|