@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
|
@@ -50,6 +50,8 @@ import { ClaudeBackgroundKeepalive } from "./claude-background-keepalive";
|
|
|
50
50
|
import {
|
|
51
51
|
type ClaudeFlagSettings,
|
|
52
52
|
claudeFlagSettings,
|
|
53
|
+
claudeThinkingDisplayArgs,
|
|
54
|
+
MIN_CLAUDE_THINKING_DISPLAY_VERSION,
|
|
53
55
|
mergeClaudeSettingsArgs,
|
|
54
56
|
} from "./claude-flag-settings";
|
|
55
57
|
import { normalizeClaudeMessage } from "./claude-session-events";
|
|
@@ -186,21 +188,29 @@ export function resolveClaudeQueueSteeringOverride(
|
|
|
186
188
|
return undefined;
|
|
187
189
|
}
|
|
188
190
|
|
|
189
|
-
|
|
191
|
+
/** True when `claude --version` output reports at least `minimum`; unknown output is false. */
|
|
192
|
+
export function claudeVersionAtLeast(
|
|
193
|
+
versionOutput: string | undefined,
|
|
194
|
+
minimum: readonly number[],
|
|
195
|
+
): boolean {
|
|
190
196
|
const match =
|
|
191
197
|
versionOutput?.match(/claude(?: code)? version:\s*(\d+)\.(\d+)\.(\d+)/i) ??
|
|
192
198
|
versionOutput?.match(/(\d+)\.(\d+)\.(\d+)\s*\(Claude Code\)/i);
|
|
193
199
|
if (!match) return false;
|
|
194
200
|
|
|
195
201
|
const detected = match.slice(1, 4).map(Number);
|
|
196
|
-
for (let index = 0; index <
|
|
202
|
+
for (let index = 0; index < minimum.length; index++) {
|
|
197
203
|
const actual = detected[index] ?? 0;
|
|
198
|
-
const
|
|
199
|
-
if (actual !==
|
|
204
|
+
const floor = minimum[index] ?? 0;
|
|
205
|
+
if (actual !== floor) return actual > floor;
|
|
200
206
|
}
|
|
201
207
|
return true;
|
|
202
208
|
}
|
|
203
209
|
|
|
210
|
+
function supportsClaudeQueueSteering(versionOutput: string | undefined): boolean {
|
|
211
|
+
return claudeVersionAtLeast(versionOutput, MIN_CLAUDE_QUEUE_STEERING_VERSION);
|
|
212
|
+
}
|
|
213
|
+
|
|
204
214
|
function claudeUserMessage(text: string): string {
|
|
205
215
|
return `${JSON.stringify({
|
|
206
216
|
type: "user",
|
|
@@ -1527,6 +1537,19 @@ export class ClaudeAdapter implements ProviderAdapter {
|
|
|
1527
1537
|
queueSteeringOverride ??
|
|
1528
1538
|
(transport === "sdk" ||
|
|
1529
1539
|
(!isInteractiveTmuxClaude && supportsClaudeQueueSteering(harnessVersion)));
|
|
1540
|
+
// Print and SDK sessions ignore the showThinkingSummaries setting, so ask
|
|
1541
|
+
// for summaries with the flag. Skipped for bridge/tmux wrappers (they are
|
|
1542
|
+
// interactive and read the setting) and for CLIs too old or unknown to
|
|
1543
|
+
// accept it, which would refuse to start on an unknown option.
|
|
1544
|
+
if (
|
|
1545
|
+
!isInteractiveTmuxClaude &&
|
|
1546
|
+
claudeVersionAtLeast(harnessVersion, MIN_CLAUDE_THINKING_DISPLAY_VERSION)
|
|
1547
|
+
) {
|
|
1548
|
+
sessionConfig.additionalArgs = [
|
|
1549
|
+
...additionalArgs,
|
|
1550
|
+
...claudeThinkingDisplayArgs(flagSettings, [...prefixArgs, ...additionalArgs]),
|
|
1551
|
+
];
|
|
1552
|
+
}
|
|
1530
1553
|
if (!queueSteeringSupported && queueSteeringOverride === undefined) {
|
|
1531
1554
|
console.warn(
|
|
1532
1555
|
`\x1b[33m[claude]\x1b[0m Queued steering requires Claude Code >= ${MIN_CLAUDE_QUEUE_STEERING_VERSION.join(".")}; detected ${harnessVersion ?? "an unknown version"}. Steering messages will be promoted to follow-up tasks.`,
|
|
@@ -38,6 +38,7 @@ export const LEGACY_CONTEXT_MODE_CLAUDE_PLUGIN = "context-mode@context-mode";
|
|
|
38
38
|
export type ClaudeFlagSettings = Record<string, unknown> & {
|
|
39
39
|
claudeMdExcludes: string[];
|
|
40
40
|
enabledPlugins?: Record<string, boolean>;
|
|
41
|
+
showThinkingSummaries?: boolean;
|
|
41
42
|
};
|
|
42
43
|
|
|
43
44
|
/**
|
|
@@ -47,14 +48,46 @@ export type ClaudeFlagSettings = Record<string, unknown> & {
|
|
|
47
48
|
* otherwise keep its hooks running: the SessionStart block and tool tips
|
|
48
49
|
* point at `ctx_*` tools the session does not have, and the PreToolUse hook
|
|
49
50
|
* denies WebFetch. Disabling a plugin that is not installed is a no-op.
|
|
51
|
+
*
|
|
52
|
+
* Asks for thinking summaries. The API default is `display: "omitted"`, which
|
|
53
|
+
* returns thinking blocks with empty text, so we kept almost no reasoning.
|
|
54
|
+
* Summaries are not billed: the charge is the full thinking tokens either way.
|
|
55
|
+
* Claude Code reads this setting only in interactive sessions (claude-bridge);
|
|
56
|
+
* print and SDK sessions need `--thinking-display`, see claudeThinkingDisplayArgs.
|
|
50
57
|
*/
|
|
51
58
|
export function claudeFlagSettings(): ClaudeFlagSettings {
|
|
52
59
|
return {
|
|
53
60
|
claudeMdExcludes: [WORKSPACE_CLAUDE_MD_EXCLUDE, userClaudeMdExclude()],
|
|
54
61
|
enabledPlugins: { [LEGACY_CONTEXT_MODE_CLAUDE_PLUGIN]: false },
|
|
62
|
+
showThinkingSummaries: true,
|
|
55
63
|
};
|
|
56
64
|
}
|
|
57
65
|
|
|
66
|
+
/** First Claude Code release verified to accept `--thinking-display` (2.1.80 does not). */
|
|
67
|
+
export const MIN_CLAUDE_THINKING_DISPLAY_VERSION = [2, 1, 112] as const;
|
|
68
|
+
|
|
69
|
+
const THINKING_DISPLAY_FLAG = "--thinking-display";
|
|
70
|
+
|
|
71
|
+
/**
|
|
72
|
+
* `--thinking-display` for print and SDK sessions, which ignore the
|
|
73
|
+
* `showThinkingSummaries` setting. The merged setting picks the value, so a
|
|
74
|
+
* caller `--settings` with `showThinkingSummaries: false` still turns summaries
|
|
75
|
+
* off. Returns nothing when the caller args already pass the flag.
|
|
76
|
+
*/
|
|
77
|
+
export function claudeThinkingDisplayArgs(
|
|
78
|
+
settings: ClaudeFlagSettings,
|
|
79
|
+
callerArgs: readonly string[],
|
|
80
|
+
): string[] {
|
|
81
|
+
const callerSetsFlag = callerArgs.some(
|
|
82
|
+
(arg) => arg === THINKING_DISPLAY_FLAG || arg.startsWith(`${THINKING_DISPLAY_FLAG}=`),
|
|
83
|
+
);
|
|
84
|
+
if (callerSetsFlag) return [];
|
|
85
|
+
return [
|
|
86
|
+
THINKING_DISPLAY_FLAG,
|
|
87
|
+
settings.showThinkingSummaries === false ? "omitted" : "summarized",
|
|
88
|
+
];
|
|
89
|
+
}
|
|
90
|
+
|
|
58
91
|
const SETTINGS_FLAG = "--settings";
|
|
59
92
|
|
|
60
93
|
/**
|
|
@@ -152,7 +185,12 @@ export function mergeClaudeSettingsArgs(
|
|
|
152
185
|
|
|
153
186
|
const own = claudeFlagSettings();
|
|
154
187
|
for (const entry of own.claudeMdExcludes) excludes.add(entry);
|
|
155
|
-
|
|
188
|
+
// Own defaults first, so a caller value (such as showThinkingSummaries: false) wins.
|
|
189
|
+
const settings: ClaudeFlagSettings = {
|
|
190
|
+
showThinkingSummaries: own.showThinkingSummaries,
|
|
191
|
+
...merged,
|
|
192
|
+
claudeMdExcludes: [...excludes],
|
|
193
|
+
};
|
|
156
194
|
if (own.enabledPlugins) {
|
|
157
195
|
const callerPlugins = isPlainObject(merged.enabledPlugins) ? merged.enabledPlugins : {};
|
|
158
196
|
settings.enabledPlugins = { ...callerPlugins, ...own.enabledPlugins } as Record<
|
|
@@ -55,7 +55,6 @@ import type {
|
|
|
55
55
|
BetaManagedAgentsSession as Session,
|
|
56
56
|
BetaManagedAgentsSessionEvent as SessionEvent,
|
|
57
57
|
} from "@anthropic-ai/sdk/resources/beta/sessions";
|
|
58
|
-
|
|
59
58
|
import { contextBoundNoteThreshold, createContextBoundNote } from "../hooks/context-bound-note";
|
|
60
59
|
import { checkToolLoop } from "../hooks/tool-loop-detection";
|
|
61
60
|
import {
|
|
@@ -65,6 +64,7 @@ import {
|
|
|
65
64
|
getContextWindowSize,
|
|
66
65
|
} from "../utils/context-window";
|
|
67
66
|
import { selectCredential } from "../utils/credentials";
|
|
67
|
+
import { isGitHubEnterprise } from "../utils/github-host";
|
|
68
68
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
69
69
|
import { computeClaudeManagedCostUsd } from "./claude-managed-models";
|
|
70
70
|
import { getRuntimeFeePerHour } from "./claude-managed-pricing";
|
|
@@ -164,6 +164,10 @@ export function composeManagedUserMessage(
|
|
|
164
164
|
* field expects. Pass-through if already a URL.
|
|
165
165
|
*/
|
|
166
166
|
export function normalizeRepoUrl(vcsRepo: string): string {
|
|
167
|
+
// Anthropic's managed GitHub resource only knows github.com.
|
|
168
|
+
if (isGitHubEnterprise()) {
|
|
169
|
+
throw new Error("claude-managed does not support GitHub Enterprise Server (GITHUB_URL is set)");
|
|
170
|
+
}
|
|
167
171
|
if (vcsRepo.startsWith("http://") || vcsRepo.startsWith("https://")) {
|
|
168
172
|
return vcsRepo;
|
|
169
173
|
}
|
|
@@ -41,6 +41,10 @@ import { buildRatingsFromLlm, fetchRetrievalsForTask, postRatings } from "../be/
|
|
|
41
41
|
import { contextBoundNoteThreshold, createContextBoundNote } from "../hooks/context-bound-note";
|
|
42
42
|
import { getApiKey } from "../utils/api-key";
|
|
43
43
|
import { isCodexRejectedAccessError } from "../utils/codex-auth-failure";
|
|
44
|
+
import {
|
|
45
|
+
normalizeCodexRateLimits,
|
|
46
|
+
normalizeCodexRateLimitsResponse,
|
|
47
|
+
} from "../utils/codex-rate-limits";
|
|
44
48
|
import {
|
|
45
49
|
CONTEXT_FORMULA,
|
|
46
50
|
clampContextPercent,
|
|
@@ -48,6 +52,7 @@ import {
|
|
|
48
52
|
} from "../utils/context-window";
|
|
49
53
|
import { selectCredential } from "../utils/credentials";
|
|
50
54
|
import { isSessionSummarySkipped } from "../utils/env-flag";
|
|
55
|
+
import type { RateLimitWindowTelemetry } from "../utils/error-tracker";
|
|
51
56
|
import { SessionErrorTracker } from "../utils/error-tracker";
|
|
52
57
|
import { summarizeSession as runSummarize } from "../utils/internal-ai";
|
|
53
58
|
import { getMemoryRaterNames } from "../utils/memory-raters";
|
|
@@ -57,6 +62,13 @@ import {
|
|
|
57
62
|
registerProcessGroup,
|
|
58
63
|
terminateProcessGroup,
|
|
59
64
|
} from "../utils/process-group";
|
|
65
|
+
import {
|
|
66
|
+
applyProviderQuotaReport,
|
|
67
|
+
type ProviderAccountTelemetry,
|
|
68
|
+
type ProviderQuotaReport,
|
|
69
|
+
type RateLimitReplacement,
|
|
70
|
+
scrubProviderQuotaReport,
|
|
71
|
+
} from "../utils/provider-account-telemetry";
|
|
60
72
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
61
73
|
import { recoverLegacyCodexAgentsMd } from "./codex-agents-md";
|
|
62
74
|
import {
|
|
@@ -178,6 +190,9 @@ type ErrorItem = Extract<ThreadItem, { type: "error" }>;
|
|
|
178
190
|
type FileChangeItem = Extract<ThreadItem, { type: "file_change" }>;
|
|
179
191
|
type McpToolCallItem = Extract<ThreadItem, { type: "mcp_tool_call" }>;
|
|
180
192
|
type ReasoningItem = Extract<ThreadItem, { type: "reasoning" }>;
|
|
193
|
+
|
|
194
|
+
/** `turn/start` reasoning summary: OpenAI returns summaries only, never raw reasoning. */
|
|
195
|
+
export const CODEX_REASONING_SUMMARY = "detailed";
|
|
181
196
|
type TodoListItem = Extract<ThreadItem, { type: "todo_list" }>;
|
|
182
197
|
type WebSearchItem = Extract<ThreadItem, { type: "web_search" }>;
|
|
183
198
|
|
|
@@ -200,6 +215,10 @@ export type ThreadEvent =
|
|
|
200
215
|
interface CodexThread {
|
|
201
216
|
readonly id: string | null;
|
|
202
217
|
readonly version?: string;
|
|
218
|
+
getQuotaTelemetry?(): Pick<
|
|
219
|
+
ProviderResult,
|
|
220
|
+
"rateLimitWindows" | "providerAccount" | "rateLimitReplacements"
|
|
221
|
+
>;
|
|
203
222
|
runStreamed(input: string): Promise<{ events: AsyncGenerator<ThreadEvent> }>;
|
|
204
223
|
steer(input: string): Promise<void>;
|
|
205
224
|
interrupt(): Promise<void>;
|
|
@@ -208,7 +227,7 @@ interface CodexThread {
|
|
|
208
227
|
|
|
209
228
|
interface CodexAppServerClient {
|
|
210
229
|
readonly version?: string;
|
|
211
|
-
request<T>(method: string, params?: unknown): Promise<T>;
|
|
230
|
+
request<T>(method: string, params?: unknown, options?: { timeoutMs: number }): Promise<T>;
|
|
212
231
|
onNotification(listener: (notification: CodexAppServerNotification) => void): () => void;
|
|
213
232
|
onClose(listener: (error: Error) => void): () => void;
|
|
214
233
|
close(): Promise<void>;
|
|
@@ -713,6 +732,55 @@ class AppServerCodexThread implements CodexThread {
|
|
|
713
732
|
get version(): string | undefined {
|
|
714
733
|
return this.client.version;
|
|
715
734
|
}
|
|
735
|
+
private quotaWindows: RateLimitWindowTelemetry = {};
|
|
736
|
+
private quotaAccount: ProviderAccountTelemetry | null = null;
|
|
737
|
+
getQuotaTelemetry(): Pick<
|
|
738
|
+
ProviderResult,
|
|
739
|
+
"rateLimitWindows" | "providerAccount" | "rateLimitReplacements"
|
|
740
|
+
> {
|
|
741
|
+
const replace: RateLimitReplacement[] = [];
|
|
742
|
+
for (const [limitId, limit] of Object.entries(this.quotaAccount?.limits ?? {})) {
|
|
743
|
+
for (const slot of ["primary", "secondary"] as const) {
|
|
744
|
+
const observedAt = limit.windowRemovedAt?.[slot];
|
|
745
|
+
if (observedAt) replace.push({ source: "codex", limitId, observedAt, slots: [slot] });
|
|
746
|
+
}
|
|
747
|
+
}
|
|
748
|
+
return this.quotaAccount
|
|
749
|
+
? {
|
|
750
|
+
rateLimitWindows: { ...this.quotaWindows },
|
|
751
|
+
providerAccount: this.quotaAccount,
|
|
752
|
+
rateLimitReplacements: replace,
|
|
753
|
+
}
|
|
754
|
+
: {};
|
|
755
|
+
}
|
|
756
|
+
|
|
757
|
+
private applyQuota(quota: ProviderQuotaReport, initialRead = false): void {
|
|
758
|
+
const merged = applyProviderQuotaReport(
|
|
759
|
+
{ windows: this.quotaWindows, account: this.quotaAccount },
|
|
760
|
+
scrubProviderQuotaReport(quota),
|
|
761
|
+
initialRead,
|
|
762
|
+
);
|
|
763
|
+
this.quotaWindows = merged.windows;
|
|
764
|
+
this.quotaAccount = merged.account;
|
|
765
|
+
}
|
|
766
|
+
|
|
767
|
+
async readInitialQuota(): Promise<void> {
|
|
768
|
+
// The request time precedes notifications received during the read. On equal
|
|
769
|
+
// millisecond timestamps, those notifications retain priority per field.
|
|
770
|
+
const observedAt = new Date().toISOString();
|
|
771
|
+
try {
|
|
772
|
+
const response = await this.client.request<unknown>(
|
|
773
|
+
"account/rateLimits/read",
|
|
774
|
+
{ excludeResetCreditDetails: true },
|
|
775
|
+
{ timeoutMs: 5000 },
|
|
776
|
+
);
|
|
777
|
+
const quota = normalizeCodexRateLimitsResponse(response, observedAt);
|
|
778
|
+
if (quota) this.applyQuota(quota, true);
|
|
779
|
+
} catch {
|
|
780
|
+
// Quota collection is best-effort. Task execution uses its own error path.
|
|
781
|
+
}
|
|
782
|
+
}
|
|
783
|
+
|
|
716
784
|
private activeTurnId: string | null = null;
|
|
717
785
|
private activePush: ((event: ThreadEvent) => void) | null = null;
|
|
718
786
|
private activeFinish: (() => void) | null = null;
|
|
@@ -771,6 +839,9 @@ class AppServerCodexThread implements CodexThread {
|
|
|
771
839
|
const response = await this.client.request<{ turn: { id: string } }>("turn/start", {
|
|
772
840
|
threadId: this.id,
|
|
773
841
|
input: textInput(input),
|
|
842
|
+
// The bundled model catalog defaults the reasoning summary to `none`,
|
|
843
|
+
// so reasoning items arrived with empty `summary` and `content`.
|
|
844
|
+
summary: CODEX_REASONING_SUMMARY,
|
|
774
845
|
});
|
|
775
846
|
if (!finished) this.setActiveTurn(response.turn.id);
|
|
776
847
|
} catch (error) {
|
|
@@ -829,6 +900,11 @@ class AppServerCodexThread implements CodexThread {
|
|
|
829
900
|
notification.params && typeof notification.params === "object"
|
|
830
901
|
? (notification.params as Record<string, unknown>)
|
|
831
902
|
: {};
|
|
903
|
+
if (notification.method === "account/rateLimits/updated") {
|
|
904
|
+
const quota = normalizeCodexRateLimits(params.rateLimits, new Date().toISOString(), true);
|
|
905
|
+
if (quota) this.applyQuota(quota);
|
|
906
|
+
return;
|
|
907
|
+
}
|
|
832
908
|
if (params.threadId !== undefined && params.threadId !== this.id) return;
|
|
833
909
|
const push = this.activePush;
|
|
834
910
|
if (!push) return;
|
|
@@ -1169,7 +1245,11 @@ export class CodexSession implements ProviderSession {
|
|
|
1169
1245
|
// Resolution deferred until `runSession`'s finally-block fully cleans up
|
|
1170
1246
|
// (see `pendingResult` rationale on the field above). Caller-visible
|
|
1171
1247
|
// ordering: cleanup → resolve waitForCompletion.
|
|
1172
|
-
this.pendingResult = {
|
|
1248
|
+
this.pendingResult = {
|
|
1249
|
+
...result,
|
|
1250
|
+
...this.thread.getQuotaTelemetry?.(),
|
|
1251
|
+
appliedReasoningEffort: this.appliedReasoningEffort,
|
|
1252
|
+
};
|
|
1173
1253
|
}
|
|
1174
1254
|
|
|
1175
1255
|
/** Build CostData from the usage accumulated across completed turns. */
|
|
@@ -2023,7 +2103,7 @@ export async function createInProcessCodexSession(
|
|
|
2023
2103
|
env.OPENAI_API_KEY = selectCredential(env.OPENAI_API_KEY, undefined, "OPENAI_API_KEY").selected;
|
|
2024
2104
|
}
|
|
2025
2105
|
|
|
2026
|
-
const codexPathOverride = process.env.CODEX_PATH_OVERRIDE;
|
|
2106
|
+
const codexPathOverride = config.env?.CODEX_PATH_OVERRIDE ?? process.env.CODEX_PATH_OVERRIDE;
|
|
2027
2107
|
|
|
2028
2108
|
// Native resume is deprecated. Follow-up continuity is delivered via the
|
|
2029
2109
|
// context preamble (see src/commands/context-preamble.ts). Any stray
|
|
@@ -2067,7 +2147,9 @@ export async function createInProcessCodexSession(
|
|
|
2067
2147
|
ephemeral: false,
|
|
2068
2148
|
});
|
|
2069
2149
|
void pruneCodexRollouts(env).catch(() => {});
|
|
2070
|
-
|
|
2150
|
+
const appThread = new AppServerCodexThread(client, response.thread.id);
|
|
2151
|
+
await appThread.readInitialQuota();
|
|
2152
|
+
thread = appThread;
|
|
2071
2153
|
} catch (error) {
|
|
2072
2154
|
await client.close();
|
|
2073
2155
|
throw error;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import pkg from "../../package.json";
|
|
2
2
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
3
|
+
import { resolveCodexCommand } from "./runtime-dependencies";
|
|
3
4
|
|
|
4
5
|
const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;
|
|
5
6
|
const CLOSE_GRACE_MS = 250;
|
|
@@ -98,7 +99,7 @@ export class CodexAppServer {
|
|
|
98
99
|
}
|
|
99
100
|
this.onStderr = options.onStderr;
|
|
100
101
|
|
|
101
|
-
const codexPath = options.codexPath ??
|
|
102
|
+
const codexPath = options.codexPath ?? resolveCodexCommand(options.env);
|
|
102
103
|
const command = [
|
|
103
104
|
codexPath,
|
|
104
105
|
...configOverrideArgs(options.configOverrides),
|
|
@@ -136,9 +137,9 @@ export class CodexAppServer {
|
|
|
136
137
|
void this.ready.catch(() => {});
|
|
137
138
|
}
|
|
138
139
|
|
|
139
|
-
async request<T>(method: string, params?: unknown): Promise<T> {
|
|
140
|
+
async request<T>(method: string, params?: unknown, options?: { timeoutMs: number }): Promise<T> {
|
|
140
141
|
await this.ready;
|
|
141
|
-
return this.requestRaw<T>(method, params);
|
|
142
|
+
return this.requestRaw<T>(method, params, options?.timeoutMs);
|
|
142
143
|
}
|
|
143
144
|
|
|
144
145
|
get version(): string | undefined {
|
|
@@ -184,7 +185,11 @@ export class CodexAppServer {
|
|
|
184
185
|
this.write({ method: "initialized" });
|
|
185
186
|
}
|
|
186
187
|
|
|
187
|
-
private requestRaw<T>(
|
|
188
|
+
private requestRaw<T>(
|
|
189
|
+
method: string,
|
|
190
|
+
params?: unknown,
|
|
191
|
+
timeoutMs = this.requestTimeoutMs,
|
|
192
|
+
): Promise<T> {
|
|
188
193
|
if (this.terminalError) return Promise.reject(this.terminalError);
|
|
189
194
|
if (this.closePromise) return Promise.reject(new Error("Codex app-server closed"));
|
|
190
195
|
|
|
@@ -192,8 +197,8 @@ export class CodexAppServer {
|
|
|
192
197
|
return new Promise<T>((resolve, reject) => {
|
|
193
198
|
const timer = setTimeout(() => {
|
|
194
199
|
this.pending.delete(id);
|
|
195
|
-
reject(new Error(`Codex app-server ${method} timed out after ${
|
|
196
|
-
},
|
|
200
|
+
reject(new Error(`Codex app-server ${method} timed out after ${timeoutMs}ms`));
|
|
201
|
+
}, timeoutMs);
|
|
197
202
|
this.pending.set(id, {
|
|
198
203
|
method,
|
|
199
204
|
resolve: resolve as (value: unknown) => void,
|
|
@@ -409,16 +414,6 @@ async function readLines(
|
|
|
409
414
|
}
|
|
410
415
|
}
|
|
411
416
|
|
|
412
|
-
function resolveCodexPath(path: string | undefined): string {
|
|
413
|
-
const fromPath = Bun.which("codex", { PATH: path ?? process.env.PATH });
|
|
414
|
-
if (fromPath) return fromPath;
|
|
415
|
-
try {
|
|
416
|
-
return Bun.resolveSync("@openai/codex/bin/codex.js", import.meta.dir);
|
|
417
|
-
} catch {
|
|
418
|
-
return "codex";
|
|
419
|
-
}
|
|
420
|
-
}
|
|
421
|
-
|
|
422
417
|
function parseVersion(userAgent: string): string | undefined {
|
|
423
418
|
return userAgent.match(/\b\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?\b/)?.[0];
|
|
424
419
|
}
|
|
@@ -57,6 +57,7 @@ export function authJsonToCredentialSelection(auth: CodexAuthJson, slot = 0, tot
|
|
|
57
57
|
keyType: "CODEX_OAUTH",
|
|
58
58
|
isRateLimitFallback: false,
|
|
59
59
|
// The ChatGPT plan rides in the token itself (`chatgpt_plan_type`).
|
|
60
|
+
planRaw: extractChatgptPlanType(auth.tokens.access_token),
|
|
60
61
|
plan: codexPlanFromClaim(extractChatgptPlanType(auth.tokens.access_token)),
|
|
61
62
|
};
|
|
62
63
|
}
|
|
@@ -54,6 +54,7 @@ import {
|
|
|
54
54
|
syncIdentityFilesToServer,
|
|
55
55
|
} from "./pi-mono-extension";
|
|
56
56
|
import { applyReasoningEffort, type ReasoningEffort } from "./reasoning-effort";
|
|
57
|
+
import { resolveOpencodeSdkSpecifier } from "./runtime-dependencies";
|
|
57
58
|
import type {
|
|
58
59
|
CostData,
|
|
59
60
|
CredCheckOptions,
|
|
@@ -192,22 +193,7 @@ function defaultOpencodeSkillsDir(): string {
|
|
|
192
193
|
// The worker image installs `@opencode/sdk` with `npm install -g`. It stays on
|
|
193
194
|
// disk instead of being bundled into the compiled binary because it carries
|
|
194
195
|
// native modules (pty, file watcher, tree-sitter).
|
|
195
|
-
|
|
196
|
-
const OPENCODE_SDK_SUBPATH = "@opencode/sdk/dist/index.js";
|
|
197
|
-
|
|
198
|
-
/**
|
|
199
|
-
* `OPENCODE_SDK_PATH` wins, then the global npm roots, then the bare package
|
|
200
|
-
* name (resolved from the repo's node_modules when running from source).
|
|
201
|
-
*/
|
|
202
|
-
export function resolveOpencodeSdkSpecifier(): string {
|
|
203
|
-
const override = process.env.OPENCODE_SDK_PATH;
|
|
204
|
-
if (override) return override;
|
|
205
|
-
for (const root of OPENCODE_SDK_GLOBAL_ROOTS) {
|
|
206
|
-
const candidate = join(root, OPENCODE_SDK_SUBPATH);
|
|
207
|
-
if (existsSync(candidate)) return candidate;
|
|
208
|
-
}
|
|
209
|
-
return "@opencode/sdk";
|
|
210
|
-
}
|
|
196
|
+
export { resolveOpencodeSdkSpecifier } from "./runtime-dependencies";
|
|
211
197
|
|
|
212
198
|
type OpencodeSdk = typeof import("@opencode/sdk");
|
|
213
199
|
type LoadedOpencodeSdk = { sdk: OpencodeSdk; version?: string };
|
|
@@ -223,8 +209,10 @@ function readOpencodeSdkVersion(entry: string): string | undefined {
|
|
|
223
209
|
}
|
|
224
210
|
|
|
225
211
|
// A variable specifier keeps `bun build --compile` from bundling the SDK.
|
|
226
|
-
async function loadOpencodeSdk(
|
|
227
|
-
|
|
212
|
+
async function loadOpencodeSdk(
|
|
213
|
+
env: Record<string, string | undefined> = process.env,
|
|
214
|
+
): Promise<LoadedOpencodeSdk> {
|
|
215
|
+
const specifier = resolveOpencodeSdkSpecifier(env);
|
|
228
216
|
const sdk = (await import(specifier)) as OpencodeSdk;
|
|
229
217
|
const entry = specifier.startsWith("/") ? specifier : Bun.resolveSync(specifier, import.meta.dir);
|
|
230
218
|
return { sdk, version: readOpencodeSdkVersion(entry) };
|
|
@@ -1024,7 +1012,7 @@ export class OpencodeAdapter implements ProviderAdapter {
|
|
|
1024
1012
|
isLead: config.role === "lead",
|
|
1025
1013
|
env: config.env,
|
|
1026
1014
|
};
|
|
1027
|
-
const { sdk, version: opencodeVersion } = await loadOpencodeSdkImpl();
|
|
1015
|
+
const { sdk, version: opencodeVersion } = await loadOpencodeSdkImpl(env);
|
|
1028
1016
|
let listTools: OpencodeToolLister | undefined;
|
|
1029
1017
|
const billing = config.model.startsWith("openrouter/") ? new OpenRouterBilling() : undefined;
|
|
1030
1018
|
// The config string carries the spliced provider key and the swarm MCP
|
|
@@ -957,6 +957,25 @@ function extractTextContent(content: unknown): string {
|
|
|
957
957
|
.trim();
|
|
958
958
|
}
|
|
959
959
|
|
|
960
|
+
/**
|
|
961
|
+
* pi-ai thinking blocks with text, in the Claude `{type:"thinking"}` shape, so
|
|
962
|
+
* the session-log row renders through the same path as Claude's. Redacted or
|
|
963
|
+
* empty blocks are dropped.
|
|
964
|
+
*/
|
|
965
|
+
export function extractPiThinkingBlocks(
|
|
966
|
+
message: unknown,
|
|
967
|
+
): Array<{ type: "thinking"; thinking: string }> {
|
|
968
|
+
if (!message || typeof message !== "object") return [];
|
|
969
|
+
const msg = message as { role?: string; content?: unknown };
|
|
970
|
+
if (msg.role !== "assistant" || !Array.isArray(msg.content)) return [];
|
|
971
|
+
return msg.content.flatMap((block) => {
|
|
972
|
+
const b = block as { type?: unknown; thinking?: unknown; redacted?: unknown };
|
|
973
|
+
if (b?.type !== "thinking" || b.redacted === true || typeof b.thinking !== "string") return [];
|
|
974
|
+
const thinking = b.thinking.trim();
|
|
975
|
+
return thinking ? [{ type: "thinking" as const, thinking }] : [];
|
|
976
|
+
});
|
|
977
|
+
}
|
|
978
|
+
|
|
960
979
|
export function extractPiAssistantText(message: unknown): string {
|
|
961
980
|
if (!message || typeof message !== "object") return "";
|
|
962
981
|
const msg = message as { role?: string; content?: unknown };
|
|
@@ -1067,6 +1086,7 @@ export class PiMonoSession implements ProviderSession {
|
|
|
1067
1086
|
private logFileHandle: ReturnType<ReturnType<typeof Bun.file>["writer"]>;
|
|
1068
1087
|
/** Track last emitted message text to avoid duplicates across turns */
|
|
1069
1088
|
private lastEmittedMessage = "";
|
|
1089
|
+
private lastEmittedThinking = "";
|
|
1070
1090
|
/** Last assistant text surfaced by pi-mono; used as runner fallback output. */
|
|
1071
1091
|
private lastAssistantText = "";
|
|
1072
1092
|
/** Phase 7: wallclock start so we can populate `durationMs` on the cost row. */
|
|
@@ -1251,7 +1271,14 @@ export class PiMonoSession implements ProviderSession {
|
|
|
1251
1271
|
if (text) {
|
|
1252
1272
|
this.lastAssistantText = text;
|
|
1253
1273
|
}
|
|
1254
|
-
|
|
1274
|
+
// The session-log row keeps thinking blocks (first, as pi-ai orders
|
|
1275
|
+
// them) and is written for thinking-only turns too, such as the one
|
|
1276
|
+
// before a tool call. The `message` event stays text-only.
|
|
1277
|
+
const thinkingBlocks = extractPiThinkingBlocks(event.message);
|
|
1278
|
+
const thinkingKey = thinkingBlocks.map((b) => b.thinking).join("\n");
|
|
1279
|
+
const isNewThinking = thinkingKey !== "" && thinkingKey !== this.lastEmittedThinking;
|
|
1280
|
+
const isNewText = text !== "" && text !== this.lastEmittedMessage;
|
|
1281
|
+
if (isNewThinking || isNewText) {
|
|
1255
1282
|
const model = this.reportedModel();
|
|
1256
1283
|
this.emit({
|
|
1257
1284
|
type: "raw_log",
|
|
@@ -1259,11 +1286,17 @@ export class PiMonoSession implements ProviderSession {
|
|
|
1259
1286
|
type: "assistant",
|
|
1260
1287
|
message: {
|
|
1261
1288
|
role: "assistant",
|
|
1262
|
-
content: [
|
|
1289
|
+
content: [
|
|
1290
|
+
...(isNewThinking ? thinkingBlocks : []),
|
|
1291
|
+
...(isNewText ? [{ type: "text", text }] : []),
|
|
1292
|
+
],
|
|
1263
1293
|
model,
|
|
1264
1294
|
},
|
|
1265
1295
|
}),
|
|
1266
1296
|
});
|
|
1297
|
+
if (isNewThinking) this.lastEmittedThinking = thinkingKey;
|
|
1298
|
+
}
|
|
1299
|
+
if (isNewText) {
|
|
1267
1300
|
this.emit({ type: "message", role: "assistant", content: text });
|
|
1268
1301
|
this.lastEmittedMessage = text;
|
|
1269
1302
|
}
|
|
@@ -274,3 +274,35 @@ To fix: first check whether the runtime refresh is failing. If the model must
|
|
|
274
274
|
also appear in the UI picker or cold-start fallback, add it to
|
|
275
275
|
`src/be/modelsdev-cache.json`; otherwise add a manual override row via the
|
|
276
276
|
existing admin route `POST /api/pricing`.
|
|
277
|
+
|
|
278
|
+
## Session attribution and cache counters
|
|
279
|
+
|
|
280
|
+
Workers capture credential type, credential suffix, and harness at execution start.
|
|
281
|
+
Each resume uses a new runner session and captures its own credential.
|
|
282
|
+
The cost API accepts attribution only from operator keys and matching worker tokens, including runtime tokens.
|
|
283
|
+
Task tokens, script tokens, and user tokens cannot assert attribution.
|
|
284
|
+
The API rejects conflicting session identities and preserves the first stored report on repost.
|
|
285
|
+
Legacy reports remain accepted with null attribution.
|
|
286
|
+
Historical rows remain null because the task's latest credential cannot prove which credential executed an earlier session.
|
|
287
|
+
|
|
288
|
+
Session counters retain their harness semantics.
|
|
289
|
+
Codex input includes cache reads. Claude and Pi input exclude cache reads, including Pi sessions that use a Codex credential.
|
|
290
|
+
Do not add cache reads to Codex input when calculating combined usage.
|
|
291
|
+
Missing cache measurements remain null, while measured zeroes remain zero.
|
|
292
|
+
Historical cache zeroes retain their original values because their measurement provenance is unknown.
|
|
293
|
+
The existing summary counters remain separate. They do not normalize mixed harness input.
|
|
294
|
+
|
|
295
|
+
## Provider-window observations
|
|
296
|
+
|
|
297
|
+
`GET /api/keys/window-usage` uses immutable session credentials and server receipt time for tokens.
|
|
298
|
+
This approximates completion accounting. Delayed reports belong to their receipt window.
|
|
299
|
+
Completed tasks use task completion time and distinct task IDs per credential and window.
|
|
300
|
+
Retries cannot multiply a completed task. A task that used two credentials can appear under both.
|
|
301
|
+
|
|
302
|
+
Window counters normalize Codex input by subtracting cache reads.
|
|
303
|
+
Claude, Claude Managed, Pi, and OpenCode already report uncached input separately.
|
|
304
|
+
Other harnesses retain unavailable normalized input until their semantics are verified.
|
|
305
|
+
Every counter reports measurement coverage. Missing cache data and unproven reasoning zeroes remain unavailable.
|
|
306
|
+
Model windows use matching model breakdowns. Session-level reasoning cannot be assigned to individual models.
|
|
307
|
+
Overlapping windows must never be added together or interpreted as provider quota consumption.
|
|
308
|
+
See the cost computation guide for the full response contract and historical coverage limitations.
|