@desplega.ai/agent-swarm 2.9.0 → 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-swxq55dr.js → acp-targets-ny75x1qy.js} +7 -7
- package/dist/{actions-pb678g3e.js → actions-b9qgrmeq.js} +81 -21
- package/dist/{agent-fs-provision-dmhnc38q.js → agent-fs-provision-b5dhdsbd.js} +4 -4
- package/dist/{amp-adapter-3pa66q27.js → amp-adapter-vtax2c9s.js} +2 -2
- package/dist/{anthropic-messages-x2cp5fvf.js → anthropic-messages-r5xf5hqw.js} +10 -10
- package/dist/{app-17d12ev4.js → app-g2z15hax.js} +6 -3
- package/dist/{approval-notifications-h7vd9pmg.js → approval-notifications-yt13wp8r.js} +8 -5
- package/dist/{assistant-t7k39ree.js → assistant-2cgfxsgk.js} +23 -21
- package/dist/{boot-args-schema-0gqmkfbe.js → boot-args-schema-3gwy0f60.js} +1 -1
- package/dist/{boot-reembed-n6anc01d.js → boot-reembed-92g7s5zp.js} +1 -1
- package/dist/{boot-reembed-f064w382.js → boot-reembed-mywmyp4s.js} +1 -1
- package/dist/{boot-scrub-sweep-ejd5dnrz.js → boot-scrub-sweep-7dkdzqxx.js} +3 -3
- package/dist/{boot-seeds-f99fjs5q.js → boot-seeds-ce7rvgq1.js} +4 -4
- package/dist/{claude-adapter-gvznwxgc.js → claude-adapter-3m4q7735.js} +7 -7
- package/dist/{claude-managed-adapter-pbrbvc64.js → claude-managed-adapter-t8nfgcgz.js} +2 -2
- package/dist/{claude-managed-setup-kdxttvc3.js → claude-managed-setup-c217draw.js} +3 -3
- package/dist/{claude-sdk-session-0t2teq6n.js → claude-sdk-session-7fbqm51z.js} +7 -7
- package/dist/{cli-9a2rtd77.js → cli-1jykg0py.js} +6 -4
- package/dist/{cli-5ntc4we6.js → cli-2czxfnvj.js} +235 -2003
- package/dist/{cli-dd37e0cm.js → cli-2dq9yv8p.js} +1 -1
- package/dist/{cli-c07v0qfa.js → cli-2xs8tsf7.js} +69 -66
- package/dist/{cli-7fx9jyfs.js → cli-2yjj3e31.js} +64 -10
- package/dist/{cli-4ghh072d.js → cli-32djehja.js} +36 -36
- package/dist/{cli-cw7mc1je.js → cli-3j873zxq.js} +3 -3
- 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-5gygrr67.js → cli-67mwzr35.js} +1 -1
- package/dist/{cli-5kcmxwxv.js → cli-6945ywhr.js} +1 -1
- package/dist/{cli-812paz57.js → cli-6ehs4mta.js} +18 -2
- package/dist/{cli-95930z69.js → cli-6ym4jhzp.js} +2 -2
- package/dist/{cli-zg3z63x3.js → cli-7mv4h3sn.js} +1 -1
- package/dist/{cli-eg437b5p.js → cli-7sf9sb0w.js} +2 -1
- package/dist/{cli-nr46j5pw.js → cli-8zh9nrew.js} +1 -1
- package/dist/{cli-wr1h0k28.js → cli-9w8712tq.js} +617 -278
- package/dist/{cli-ssvdrk4y.js → cli-b6px1k1q.js} +1 -1
- package/dist/{cli-7831nhaw.js → cli-b91nz213.js} +3 -3
- package/dist/{cli-7cgf614g.js → cli-bg63qmsx.js} +2 -2
- package/dist/{cli-me4maa4j.js → cli-bkjdknnp.js} +9 -5
- package/dist/{cli-rts1qvb4.js → cli-bnqncekd.js} +2 -2
- package/dist/{cli-25nstr34.js → cli-br0924pw.js} +1 -1
- package/dist/{cli-ymct0ycy.js → cli-ctx0b85j.js} +5222 -4978
- package/dist/{cli-kqh27v2y.js → cli-dgs10ttj.js} +1 -1
- package/dist/{cli-kmvcm34h.js → cli-f3jyzq4g.js} +2 -2
- package/dist/cli-f8x9drqr.js +84 -0
- package/dist/{cli-8axx8vnw.js → cli-f9gz2vyj.js} +5 -5
- package/dist/{cli-vvgaz8t6.js → cli-fh97xn30.js} +2 -2
- package/dist/{cli-8x8y70av.js → cli-fkef327x.js} +2 -2
- package/dist/{cli-js8zrfyg.js → cli-gfy38pvt.js} +2 -2
- package/dist/{cli-kaa4bd7x.js → cli-h9yqfzx9.js} +7 -6
- package/dist/{cli-svc803vq.js → cli-j7svy295.js} +11 -11
- package/dist/{cli-nhq5js1b.js → cli-jaw5v1sy.js} +3 -3
- package/dist/{cli-w7dxb2fj.js → cli-jkw6ptfw.js} +6 -6
- package/dist/{cli-1tvdx9t5.js → cli-jm0hvmz2.js} +1 -1
- package/dist/{cli-e9973bf0.js → cli-jwampxxq.js} +2 -2
- package/dist/{cli-dx439zpg.js → cli-kpgcm7xy.js} +13 -1
- package/dist/{cli-pz1c00aa.js → cli-kxx4k2jw.js} +2 -2
- package/dist/{cli-aa8s22gn.js → cli-m7c2380k.js} +191 -182
- package/dist/{cli-2kg31ted.js → cli-m7zvgt57.js} +11 -11
- package/dist/{cli-57pvhnyt.js → cli-mhapr559.js} +1 -1
- package/dist/{cli-gddgcnav.js → cli-mjw0yf82.js} +1 -1
- package/dist/{cli-h474mvp5.js → cli-mkwkwq81.js} +7 -4
- package/dist/{cli-jd3kxppb.js → cli-mw620q3n.js} +1 -1
- package/dist/{cli-spzkdgtg.js → cli-n3qe7tyr.js} +172 -168
- package/dist/{cli-3zxdz9r7.js → cli-nafvvsp8.js} +3 -3
- package/dist/{cli-fnh4b12r.js → cli-nbt14he0.js} +6 -6
- package/dist/{cli-7akn6ze9.js → cli-nh7x3133.js} +7 -28
- package/dist/{cli-faf46gdq.js → cli-p4kckx1z.js} +10 -10
- package/dist/{cli-k7pt28ad.js → cli-pb2ay3sh.js} +2 -2
- package/dist/{cli-pn1v1pb0.js → cli-psffsanb.js} +3 -2
- package/dist/{cli-2tnbc3gw.js → cli-pyjn0qhk.js} +2257 -61
- package/dist/{cli-fgphc007.js → cli-rq5rpv6k.js} +1 -1
- package/dist/{cli-vw5x18yj.js → cli-sn650d7x.js} +9 -9
- package/dist/{cli-mc1fx4xd.js → cli-td9tb872.js} +10 -10
- package/dist/{cli-6dp0jkfj.js → cli-tvc4jag9.js} +3 -3
- package/dist/{cli-a9hfzg2r.js → cli-ty3gha1p.js} +6 -6
- package/dist/{cli-pwsax0vp.js → cli-v57d7fmm.js} +1 -1
- package/dist/{cli-nmcpzbty.js → cli-vt89089n.js} +4 -4
- package/dist/{cli-sn4pc4qx.js → cli-vyff45ve.js} +2 -2
- package/dist/{cli-m1fbz2wj.js → cli-w4n323t3.js} +175 -16
- package/dist/{cli-g3zzby8t.js → cli-wn13hhdt.js} +5 -5
- package/dist/{cli-q8cfh1t9.js → cli-xag7btpe.js} +1 -1
- package/dist/{cli-c5cspahx.js → cli-y2ewxhth.js} +38 -13
- package/dist/{cli-k09cxm6m.js → cli-ysvspf5e.js} +2 -2
- package/dist/{cli-eepnpee7.js → cli-zh0e5x7p.js} +4 -4
- package/dist/{cli-bk9v1xrv.js → cli-zr6qy15y.js} +11 -11
- package/dist/cli.js +21 -20
- package/dist/{codex-adapter-44yq2fkn.js → codex-adapter-n656pvb8.js} +6 -6
- package/dist/{codex-hook-h1zb7cfk.js → codex-hook-59atdwd8.js} +1 -1
- package/dist/{codex-login-cdyrr5y1.js → codex-login-a239g1ah.js} +1 -1
- package/dist/{codex-session-runner-zbh26gbw.js → codex-session-runner-p0fbv5y9.js} +6 -6
- package/dist/{commands-54f02v5b.js → commands-gwea8z5p.js} +3 -3
- package/dist/{controller-9gpwcdek.js → controller-t67c3grh.js} +6 -3
- package/dist/{controllers-connect-61re6k1n.js → controllers-connect-ks155r0h.js} +22 -20
- package/dist/{cursor-adapter-7e4g81vd.js → cursor-adapter-ygwrtmkv.js} +1 -1
- package/dist/{db-dg2gc7fd.js → db-kpmx06s9.js} +8 -2
- package/dist/{db-wnh0qjy1.js → db-rb2xqdb1.js} +3 -3
- package/dist/{dispatcher-jrm24r43.js → dispatcher-31sm0ej2.js} +20 -18
- package/dist/{docker-9aq30pp2.js → docker-09tkkg0n.js} +42 -3
- package/dist/{dsh-adapter-1yqk267c.js → dsh-adapter-qyxh0w31.js} +1 -1
- package/dist/{easter-egg-3d-r4h9cs9m.js → easter-egg-3d-00wjscn6.js} +1 -1
- package/dist/{embedding-space-bafjr5f7.js → embedding-space-qhw4g68n.js} +6 -6
- package/dist/{embeddings-7xmgqe0e.js → embeddings-zdv9ke6x.js} +1 -1
- package/dist/{execute-d6jg5ns0.js → execute-zna8wwr7.js} +1 -1
- package/dist/{external-channel-frq1xvq2.js → external-channel-1ac6t56s.js} +2 -2
- package/dist/fx-adapter-sk7n0fzc.js +19 -0
- package/dist/{google-generative-ai-hh7strj3.js → google-generative-ai-maq6c9bf.js} +1 -1
- package/dist/{google-vertex-fy5bw2pm.js → google-vertex-2jgsw2nb.js} +1 -1
- package/dist/grok-adapter-sjbcm5ew.js +19 -0
- package/dist/handlers-yzy0c87x.js +35 -0
- package/dist/{heartbeat-6bpa611t.js → heartbeat-2f6z4kdx.js} +23 -21
- package/dist/{hook-w12k146y.js → hook-8y0gvtp1.js} +6 -6
- package/dist/{hook-hvm5nf46.js → hook-w1skzaqc.js} +5 -5
- package/dist/{http-43tthdvs.js → http-wghxvpef.js} +714 -145
- package/dist/{index-1f0vypbg.js → index-0h6qd4p1.js} +34 -24
- package/dist/index-25pvya7q.js +40 -0
- package/dist/index-2t4859r5.js +35 -0
- package/dist/{index-4b1q8kan.js → index-4k7m5dgj.js} +629 -354
- package/dist/index-620y7jzq.js +15 -0
- package/dist/{index-cret47a5.js → index-8p0j4h4j.js} +506 -43
- package/dist/{index-mhq4sh5w.js → index-8zn8nxn5.js} +1 -1
- package/dist/{index-m5gx1xd6.js → index-9myfj74s.js} +40 -40
- package/dist/{index-ftywhyr0.js → index-9zkchs9t.js} +221 -65
- package/dist/{index-bs7gw5fd.js → index-b5wgnm78.js} +44 -44
- package/dist/index-cxca2t8y.js +36 -0
- package/dist/{index-585gyczt.js → index-pe3d8jfy.js} +3 -3
- package/dist/{index-tx9mc2ap.js → index-rv89fvzf.js} +24 -22
- package/dist/{index-fn054vsf.js → index-s71ez27v.js} +1 -1
- package/dist/{keepalive-rk0j0jvh.js → keepalive-sh02349h.js} +3 -3
- package/dist/lead-gk4h5eg7.js +74 -0
- package/dist/{maintenance-g6z6kaxw.js → maintenance-yj0dcjja.js} +1 -1
- package/dist/{node-jftbyawr.js → node-dqm4xgxw.js} +1 -1
- package/dist/{oauth-refresh-sweep-2k3g2q4w.js → oauth-refresh-sweep-d9xedk66.js} +2 -2
- package/dist/{onboard-6fdbvh3v.js → onboard-dpgjn03r.js} +2 -2
- package/dist/{opencode-adapter-fdbsvts7.js → opencode-adapter-2d31cpjc.js} +6 -6
- package/dist/{otel-impl-rvwtc09q.js → otel-impl-1skarpfq.js} +1 -1
- package/dist/{pending-sqkrb836.js → pending-bfmxtx0g.js} +21 -19
- package/dist/{pi-mono-adapter-asqayqcg.js → pi-mono-adapter-gvppnasy.js} +40 -13
- package/dist/{pricing-refresh-f5tkgmw2.js → pricing-refresh-c6b325mk.js} +2 -2
- package/dist/{rbac-roles-06s555fa.js → rbac-roles-h80qbdbs.js} +3 -3
- package/dist/{rbac-roles-szxsg8t1.js → rbac-roles-zfcx68tx.js} +2 -2
- package/dist/{render-v2-103p266q.js → render-v2-nx20t3rb.js} +6 -3
- package/dist/{resume-v7kjewt9.js → resume-5ep8agan.js} +10 -7
- package/dist/{runtime-f1gmk0b7.js → runtime-r3pj4mce.js} +1 -1
- package/dist/{session-access-6shev8ts.js → session-access-n7p3m15b.js} +4 -4
- package/dist/{session-source-backfill-bd7spzjd.js → session-source-backfill-v8mt0zwn.js} +3 -3
- package/dist/{setup-kmxmztdb.js → setup-z1psaqhe.js} +1 -1
- package/dist/thread-buffer-a1re2r9r.js +38 -0
- package/dist/{virtual-modules-57eje5wy.js → virtual-modules-rrbjdpxn.js} +3 -3
- package/dist/{work-objects-zr47ygmf.js → work-objects-4aghh73z.js} +29 -23
- package/dist/worker-3dyyb8ev.js +74 -0
- package/dist/{worker-follow-up-grrr3fda.js → worker-follow-up-166zmex1.js} +20 -18
- package/openapi.json +1387 -13
- package/package.json +7 -6
- package/src/apps/catalog.generated.json +43 -3
- package/src/apps/page-validator.ts +27 -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/tasks/read.ts +7 -3
- package/src/be/db/tasks/write.ts +33 -1
- package/src/be/db.ts +200 -304
- package/src/be/key-window-usage.ts +385 -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/runtime-pools/db.ts +3 -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/wait-for-task.ts +5 -1
- package/src/be/seed-skills/index.ts +3 -0
- package/src/be/swarm-config-guard.ts +24 -1
- 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/rate-limit-outcome.ts +6 -0
- package/src/commands/runner.ts +34 -53
- package/src/extensions/catalog.generated.json +3 -3
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/http/api-keys.ts +258 -30
- package/src/http/session-data.ts +74 -23
- package/src/http/sessions.ts +6 -2
- package/src/http/tasks.ts +105 -5
- package/src/integrations/chat-sdk/relay.ts +87 -0
- package/src/jira/outbound.ts +5 -3
- package/src/linear/outbound.ts +5 -1
- package/src/prompts/base-prompt.ts +8 -0
- package/src/prompts/session-templates.ts +19 -2
- 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/codex-adapter.ts +85 -3
- package/src/providers/codex-app-server.ts +9 -5
- package/src/providers/codex-oauth/auth-json.ts +1 -0
- package/src/providers/pi-mono-adapter.ts +35 -2
- package/src/providers/pricing-sources.md +32 -0
- package/src/providers/types.ts +11 -0
- package/src/runtime-providers/docker.ts +65 -1
- package/src/scheduler/deferred-task-waits.ts +18 -5
- package/src/scripts-runtime/types/swarm-extension.d.ts +8 -8
- package/src/slack/actions.ts +56 -0
- package/src/slack/app.ts +22 -15
- package/src/slack/inbound-files.ts +2 -0
- package/src/slack/render-v2.ts +107 -23
- package/src/slack/responses.ts +3 -2
- package/src/slack/work-objects.ts +4 -1
- package/src/tasks/errors.ts +5 -0
- package/src/tests/acp-adapter.test.ts +4 -6
- 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 +7 -1
- package/src/tests/approval-requests-notifications.test.ts +11 -1
- package/src/tests/apps-catalog-page-frame.test.ts +49 -0
- package/src/tests/apps-session-thread.test.ts +79 -0
- package/src/tests/base-prompt.test.ts +111 -5
- package/src/tests/chat-sdk-relay.test.ts +149 -1
- 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 +16 -0
- package/src/tests/codex-oauth.test.ts +3 -1
- package/src/tests/codex-rate-limits.test.ts +384 -0
- package/src/tests/credential-outcome-report.test.ts +20 -0
- package/src/tests/db-task-read-contract.test.ts +3 -0
- package/src/tests/db-task-write-contract.test.ts +4 -0
- 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/extensions-example-sql-admin-only.test.ts +7 -4
- 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/gitleaks-download-retry.test.ts +85 -0
- package/src/tests/human-thread-routing.test.ts +187 -0
- package/src/tests/jira-outbound-sync.test.ts +33 -1
- package/src/tests/key-window-usage.test.ts +831 -0
- package/src/tests/linear-outbound-sync.test.ts +30 -1
- package/src/tests/pi-mono-adapter.test.ts +79 -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 +4 -3
- package/src/tests/provider-quota-persistence.test.ts +362 -0
- package/src/tests/rate-limit-event.test.ts +22 -0
- package/src/tests/reasoning-events.test.ts +164 -0
- package/src/tests/routing-affinity-inventory.test.ts +22 -0
- package/src/tests/runtime-providers-docker.test.ts +91 -0
- package/src/tests/script-connections.test.ts +5 -0
- package/src/tests/secret-canary-sweep.test.ts +41 -5
- 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/sessions-detail-batch.test.ts +7 -0
- package/src/tests/slack-render-v2.test.ts +357 -0
- package/src/tests/slack-start-reload-race.test.ts +67 -0
- package/src/tests/subscription-plans.test.ts +20 -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/tools/defer-task.ts +1 -1
- package/src/tools/store-progress.ts +69 -3
- package/src/types.ts +7 -2
- 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/credentials.ts +2 -0
- package/src/utils/error-tracker.ts +19 -0
- package/src/utils/provider-account-telemetry.ts +331 -0
- package/src/utils/reasoning-events.ts +107 -0
- package/src/utils/subscription-plans.ts +11 -59
- package/src/utils/task-ui-spec.ts +67 -0
- package/src/workflows/task-step-routing.ts +8 -3
- package/templates/extensions/sql-admin-only/README.md +2 -1
- package/templates/extensions/sql-admin-only/hooks.ts +7 -3
- package/templates/extensions/sql-admin-only/manifest.json +1 -1
- package/templates/skills/apps/SKILL.md +32 -5
- package/templates/skills/apps/content.md +32 -5
- package/templates/skills/ui-spec/config.json +14 -0
- package/templates/skills/ui-spec/content.md +127 -0
- package/dist/acp-adapter-jqn86aam.js +0 -16
- package/dist/cli-srtkr1h2.js +0 -12078
- package/dist/fx-adapter-0zrkfbkd.js +0 -19
- package/dist/grok-adapter-3db1c538.js +0 -19
- package/dist/handlers-k22n8mnn.js +0 -33
- package/dist/index-8xcyd3mc.js +0 -33
- package/dist/index-9sy2bh6n.js +0 -38
- package/dist/index-b24j7t2m.js +0 -12797
- package/dist/index-wjd56k1v.js +0 -34
- package/dist/lead-atxf3q6e.js +0 -72
- package/dist/thread-buffer-4yz236d0.js +0 -36
- package/dist/worker-p4hbtcy3.js +0 -72
- package/dist/{cli-j49yqpvh.js → cli-7evph51z.js} +3 -3
|
@@ -0,0 +1,331 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
import type { RateLimitWindowTelemetry } from "./error-tracker";
|
|
3
|
+
import { scrubSecrets } from "./secret-scrubber";
|
|
4
|
+
|
|
5
|
+
export const MAX_PROVIDER_QUOTA_ENTRIES = 64;
|
|
6
|
+
|
|
7
|
+
export class ProviderQuotaCapacityError extends Error {
|
|
8
|
+
constructor() {
|
|
9
|
+
super(
|
|
10
|
+
`A credential can store at most ${MAX_PROVIDER_QUOTA_ENTRIES} windows and account limits.`,
|
|
11
|
+
);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/** Reject cumulative growth without evicting routing facts or removal timestamps. */
|
|
16
|
+
export function assertProviderQuotaCapacity(report: ProviderQuotaReport): void {
|
|
17
|
+
if (
|
|
18
|
+
Object.keys(report.windows).length > MAX_PROVIDER_QUOTA_ENTRIES ||
|
|
19
|
+
Object.keys(report.account?.limits ?? {}).length > MAX_PROVIDER_QUOTA_ENTRIES
|
|
20
|
+
)
|
|
21
|
+
throw new ProviderQuotaCapacityError();
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
const accountFields = ["ordinaryUsageAllowed", "resetCreditsAvailable"] as const;
|
|
25
|
+
const limitFields = [
|
|
26
|
+
"planRaw",
|
|
27
|
+
"label",
|
|
28
|
+
"normalModelSlug",
|
|
29
|
+
"credits",
|
|
30
|
+
"spend",
|
|
31
|
+
"spendControlReached",
|
|
32
|
+
"reachedType",
|
|
33
|
+
] as const;
|
|
34
|
+
export const windowMetadataFields = [
|
|
35
|
+
"durationMins",
|
|
36
|
+
"resetsAt",
|
|
37
|
+
"label",
|
|
38
|
+
"normalModelSlug",
|
|
39
|
+
] as const;
|
|
40
|
+
export const windowFieldObservedAtSchema = z.partialRecord(
|
|
41
|
+
z.enum(windowMetadataFields),
|
|
42
|
+
z.string().datetime(),
|
|
43
|
+
);
|
|
44
|
+
const slotTimesSchema = z.strictObject({
|
|
45
|
+
primary: z.string().datetime().optional(),
|
|
46
|
+
secondary: z.string().datetime().optional(),
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
export function codexWindowKey(limitId: string, slot: "primary" | "secondary"): string {
|
|
50
|
+
return `codex:${limitId}:${slot}`;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
const text = z.string().max(256);
|
|
54
|
+
export const providerLimitTelemetrySchema = z.strictObject({
|
|
55
|
+
observedAt: z.string().datetime(),
|
|
56
|
+
fieldObservedAt: z.partialRecord(z.enum(limitFields), z.string().datetime()).optional(),
|
|
57
|
+
windowRemovedAt: slotTimesSchema.optional(),
|
|
58
|
+
planRaw: text.nullable().optional(),
|
|
59
|
+
label: text.nullable().optional(),
|
|
60
|
+
normalModelSlug: text.nullable().optional(),
|
|
61
|
+
credits: z
|
|
62
|
+
.strictObject({
|
|
63
|
+
hasCredits: z.boolean(),
|
|
64
|
+
unlimited: z.boolean(),
|
|
65
|
+
balance: text.nullable().optional(),
|
|
66
|
+
})
|
|
67
|
+
.nullable()
|
|
68
|
+
.optional(),
|
|
69
|
+
spend: z
|
|
70
|
+
.strictObject({
|
|
71
|
+
limit: text,
|
|
72
|
+
used: text,
|
|
73
|
+
remainingPercent: z.number().int().min(-2147483648).max(2147483647),
|
|
74
|
+
resetsAt: z.number().int().nonnegative().max(8_640_000_000_000),
|
|
75
|
+
})
|
|
76
|
+
.nullable()
|
|
77
|
+
.optional(),
|
|
78
|
+
spendControlReached: z.boolean().nullable().optional(),
|
|
79
|
+
reachedType: text.nullable().optional(),
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
export const providerAccountTelemetrySchema = z.strictObject({
|
|
83
|
+
source: z.enum(["codex", "claude"]),
|
|
84
|
+
observedAt: z.string().datetime(),
|
|
85
|
+
fieldObservedAt: z.partialRecord(z.enum(accountFields), z.string().datetime()).optional(),
|
|
86
|
+
ordinaryUsageAllowed: z.boolean().nullable().optional(),
|
|
87
|
+
resetCreditsAvailable: z.number().int().nonnegative().nullable().optional(),
|
|
88
|
+
limits: z.record(z.string().min(1).max(128), providerLimitTelemetrySchema).optional(),
|
|
89
|
+
});
|
|
90
|
+
export type ProviderAccountTelemetry = z.infer<typeof providerAccountTelemetrySchema>;
|
|
91
|
+
|
|
92
|
+
export function parseProviderAccount(
|
|
93
|
+
value: string | null | undefined,
|
|
94
|
+
): ProviderAccountTelemetry | null {
|
|
95
|
+
try {
|
|
96
|
+
const parsed = providerAccountTelemetrySchema.safeParse(value ? JSON.parse(value) : null);
|
|
97
|
+
return parsed.success ? parsed.data : null;
|
|
98
|
+
} catch {
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
// Slot timestamps persist removal watermarks, including snapshots with no windows.
|
|
104
|
+
export const rateLimitReplacementSchema = z.strictObject({
|
|
105
|
+
source: z.literal("codex"),
|
|
106
|
+
limitId: z.string().min(1).max(128),
|
|
107
|
+
observedAt: z.string().datetime(),
|
|
108
|
+
slots: z
|
|
109
|
+
.array(z.enum(["primary", "secondary"]))
|
|
110
|
+
.min(1)
|
|
111
|
+
.max(2),
|
|
112
|
+
});
|
|
113
|
+
export type RateLimitReplacement = z.infer<typeof rateLimitReplacementSchema>;
|
|
114
|
+
|
|
115
|
+
/** Missing fields retain their value and observation time. Aggregate times are not fact ages. */
|
|
116
|
+
function mergeFacts<
|
|
117
|
+
T extends { observedAt: string; fieldObservedAt?: Partial<Record<K, string>> },
|
|
118
|
+
K extends keyof T & string,
|
|
119
|
+
>(stored: T | undefined, reported: T, fields: readonly K[], preferStoredOnTie: boolean): T {
|
|
120
|
+
const merged = {
|
|
121
|
+
...reported,
|
|
122
|
+
...stored,
|
|
123
|
+
observedAt:
|
|
124
|
+
stored && Date.parse(stored.observedAt) > Date.parse(reported.observedAt)
|
|
125
|
+
? stored.observedAt
|
|
126
|
+
: reported.observedAt,
|
|
127
|
+
} as T;
|
|
128
|
+
const times: Partial<Record<K, string>> = {};
|
|
129
|
+
for (const field of fields) {
|
|
130
|
+
const oldAt = stored?.fieldObservedAt?.[field] ?? stored?.observedAt;
|
|
131
|
+
if (stored?.[field] !== undefined && oldAt) times[field] = oldAt;
|
|
132
|
+
if (reported[field] === undefined) continue;
|
|
133
|
+
const at = reported.fieldObservedAt?.[field] ?? reported.observedAt;
|
|
134
|
+
if (
|
|
135
|
+
times[field] &&
|
|
136
|
+
(Date.parse(times[field]) > Date.parse(at) || (preferStoredOnTie && times[field] === at))
|
|
137
|
+
)
|
|
138
|
+
continue;
|
|
139
|
+
merged[field] = reported[field];
|
|
140
|
+
times[field] = at;
|
|
141
|
+
}
|
|
142
|
+
merged.fieldObservedAt = times;
|
|
143
|
+
return merged;
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
export function mergeProviderAccountTelemetry(
|
|
147
|
+
stored: ProviderAccountTelemetry | null,
|
|
148
|
+
reported?: ProviderAccountTelemetry,
|
|
149
|
+
preferStoredOnTie = false,
|
|
150
|
+
): ProviderAccountTelemetry | null {
|
|
151
|
+
if (!reported) return stored;
|
|
152
|
+
if (stored?.source !== reported.source) stored = null;
|
|
153
|
+
const root = mergeFacts(stored ?? undefined, reported, accountFields, preferStoredOnTie);
|
|
154
|
+
const limits = { ...stored?.limits };
|
|
155
|
+
for (const [id, limit] of Object.entries(reported.limits ?? {})) {
|
|
156
|
+
const merged = mergeFacts(limits[id], limit, limitFields, preferStoredOnTie);
|
|
157
|
+
const removals = { ...limits[id]?.windowRemovedAt };
|
|
158
|
+
for (const slot of ["primary", "secondary"] as const) {
|
|
159
|
+
const at = limit.windowRemovedAt?.[slot];
|
|
160
|
+
if (at && Date.parse(at) >= Date.parse(removals[slot] ?? "1970-01-01")) removals[slot] = at;
|
|
161
|
+
}
|
|
162
|
+
if (Object.keys(removals).length) merged.windowRemovedAt = removals;
|
|
163
|
+
limits[id] = merged;
|
|
164
|
+
}
|
|
165
|
+
return { ...root, ...(Object.keys(limits).length ? { limits } : {}) };
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
export interface ProviderQuotaReport {
|
|
169
|
+
windows: RateLimitWindowTelemetry;
|
|
170
|
+
account?: ProviderAccountTelemetry | null;
|
|
171
|
+
replace?: RateLimitReplacement[];
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
/** Apply reports without I/O. A slot removal blocks older facts only for that slot. */
|
|
175
|
+
export function applyProviderQuotaReport(
|
|
176
|
+
stored: ProviderQuotaReport,
|
|
177
|
+
reported: ProviderQuotaReport,
|
|
178
|
+
preferStoredOnTie = false,
|
|
179
|
+
): { windows: RateLimitWindowTelemetry; account: ProviderAccountTelemetry | null } {
|
|
180
|
+
let account = mergeProviderAccountTelemetry(
|
|
181
|
+
stored.account ?? null,
|
|
182
|
+
reported.account ?? undefined,
|
|
183
|
+
preferStoredOnTie,
|
|
184
|
+
);
|
|
185
|
+
const windows = { ...stored.windows };
|
|
186
|
+
for (const replacement of reported.replace ?? []) {
|
|
187
|
+
for (const slot of replacement.slots) {
|
|
188
|
+
const key = codexWindowKey(replacement.limitId, slot);
|
|
189
|
+
// An included window is an update, not an explicit null slot.
|
|
190
|
+
if (Object.hasOwn(reported.windows, key)) continue;
|
|
191
|
+
const current = windows[key];
|
|
192
|
+
if (
|
|
193
|
+
current &&
|
|
194
|
+
(Date.parse(current.lastSeenAt) > Date.parse(replacement.observedAt) ||
|
|
195
|
+
(preferStoredOnTie && current.lastSeenAt === replacement.observedAt))
|
|
196
|
+
) {
|
|
197
|
+
// A delayed removal cannot delete a recovery, but older metadata belongs
|
|
198
|
+
// to the removed window. Keep its tombstone for subsequent delayed reads.
|
|
199
|
+
const retained = { ...current, fieldObservedAt: { ...current.fieldObservedAt } };
|
|
200
|
+
for (const field of windowMetadataFields) {
|
|
201
|
+
if (
|
|
202
|
+
Date.parse(current.fieldObservedAt?.[field] ?? current.lastSeenAt) <
|
|
203
|
+
Date.parse(replacement.observedAt)
|
|
204
|
+
) {
|
|
205
|
+
delete retained[field];
|
|
206
|
+
delete retained.fieldObservedAt[field];
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
windows[key] = retained;
|
|
210
|
+
} else delete windows[key];
|
|
211
|
+
account = mergeProviderAccountTelemetry(account, {
|
|
212
|
+
source: "codex",
|
|
213
|
+
observedAt: replacement.observedAt,
|
|
214
|
+
limits: {
|
|
215
|
+
[replacement.limitId]: {
|
|
216
|
+
observedAt: replacement.observedAt,
|
|
217
|
+
windowRemovedAt: { [slot]: replacement.observedAt },
|
|
218
|
+
},
|
|
219
|
+
},
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
for (const [key, entry] of Object.entries(reported.windows)) {
|
|
224
|
+
const current = windows[key];
|
|
225
|
+
if (entry.source !== "codex" || !entry.limitId) {
|
|
226
|
+
if (!current || !(Date.parse(current.lastSeenAt) > Date.parse(entry.lastSeenAt)))
|
|
227
|
+
windows[key] = entry;
|
|
228
|
+
continue;
|
|
229
|
+
}
|
|
230
|
+
const slot = key === codexWindowKey(entry.limitId, "primary") ? "primary" : "secondary";
|
|
231
|
+
const removedAt =
|
|
232
|
+
account?.source === "codex"
|
|
233
|
+
? account.limits?.[entry.limitId]?.windowRemovedAt?.[slot]
|
|
234
|
+
: undefined;
|
|
235
|
+
if (
|
|
236
|
+
removedAt &&
|
|
237
|
+
(Date.parse(removedAt) > Date.parse(entry.lastSeenAt) ||
|
|
238
|
+
(preferStoredOnTie && removedAt === entry.lastSeenAt))
|
|
239
|
+
)
|
|
240
|
+
continue;
|
|
241
|
+
const newer =
|
|
242
|
+
!current ||
|
|
243
|
+
Date.parse(entry.lastSeenAt) > Date.parse(current.lastSeenAt) ||
|
|
244
|
+
(!preferStoredOnTie && entry.lastSeenAt === current.lastSeenAt);
|
|
245
|
+
const merged = { ...(newer ? { ...current, ...entry } : current!) };
|
|
246
|
+
const times = { ...current?.fieldObservedAt };
|
|
247
|
+
for (const field of windowMetadataFields) {
|
|
248
|
+
if (current?.[field] !== undefined) times[field] ??= current.lastSeenAt;
|
|
249
|
+
if (entry[field] === undefined) continue;
|
|
250
|
+
const at = entry.fieldObservedAt?.[field] ?? entry.lastSeenAt;
|
|
251
|
+
const oldAt = times[field];
|
|
252
|
+
if (
|
|
253
|
+
(removedAt && Date.parse(at) < Date.parse(removedAt)) ||
|
|
254
|
+
(oldAt && (Date.parse(oldAt) > Date.parse(at) || (preferStoredOnTie && oldAt === at)))
|
|
255
|
+
) {
|
|
256
|
+
if (current?.[field] === undefined) delete merged[field];
|
|
257
|
+
else Object.assign(merged, { [field]: current[field] });
|
|
258
|
+
continue;
|
|
259
|
+
}
|
|
260
|
+
Object.assign(merged, { [field]: entry[field] });
|
|
261
|
+
times[field] = at;
|
|
262
|
+
}
|
|
263
|
+
merged.fieldObservedAt = times;
|
|
264
|
+
windows[key] = merged;
|
|
265
|
+
}
|
|
266
|
+
return { windows, account };
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
/** Scrub individual strings before JSON serialization. Keep typed fields and identity links intact. */
|
|
270
|
+
export function scrubProviderQuotaReport(report: ProviderQuotaReport): ProviderQuotaReport {
|
|
271
|
+
const id = (value: string): string => {
|
|
272
|
+
const scrubbed = scrubSecrets(value);
|
|
273
|
+
return scrubbed === value
|
|
274
|
+
? value
|
|
275
|
+
: `redacted-${new Bun.CryptoHasher("sha256").update(value).digest("hex")}`;
|
|
276
|
+
};
|
|
277
|
+
const text = (value: string) => scrubSecrets(value).slice(0, 256);
|
|
278
|
+
const windows: RateLimitWindowTelemetry = {};
|
|
279
|
+
for (const [key, window] of Object.entries(report.windows)) {
|
|
280
|
+
const clean = { ...window };
|
|
281
|
+
for (const field of [
|
|
282
|
+
"status",
|
|
283
|
+
"label",
|
|
284
|
+
"normalModelSlug",
|
|
285
|
+
"overageStatus",
|
|
286
|
+
"overageDisabledReason",
|
|
287
|
+
] as const) {
|
|
288
|
+
if (clean[field] !== undefined) clean[field] = text(clean[field]);
|
|
289
|
+
}
|
|
290
|
+
if (clean.limitId) clean.limitId = id(clean.limitId);
|
|
291
|
+
windows[
|
|
292
|
+
window.source === "codex" && window.limitId
|
|
293
|
+
? codexWindowKey(
|
|
294
|
+
clean.limitId!,
|
|
295
|
+
key === codexWindowKey(window.limitId, "primary") ? "primary" : "secondary",
|
|
296
|
+
)
|
|
297
|
+
: id(key)
|
|
298
|
+
] = clean;
|
|
299
|
+
}
|
|
300
|
+
const account = report.account
|
|
301
|
+
? { ...report.account, limits: { ...report.account.limits } }
|
|
302
|
+
: report.account;
|
|
303
|
+
if (account) {
|
|
304
|
+
account.limits = {};
|
|
305
|
+
for (const [key, limit] of Object.entries(report.account?.limits ?? {})) {
|
|
306
|
+
const clean = { ...limit };
|
|
307
|
+
for (const field of ["planRaw", "label", "normalModelSlug", "reachedType"] as const) {
|
|
308
|
+
if (typeof clean[field] === "string") clean[field] = text(clean[field]);
|
|
309
|
+
}
|
|
310
|
+
if (clean.credits)
|
|
311
|
+
clean.credits = {
|
|
312
|
+
...clean.credits,
|
|
313
|
+
...(typeof clean.credits.balance === "string"
|
|
314
|
+
? { balance: text(clean.credits.balance) }
|
|
315
|
+
: {}),
|
|
316
|
+
};
|
|
317
|
+
if (clean.spend)
|
|
318
|
+
clean.spend = {
|
|
319
|
+
...clean.spend,
|
|
320
|
+
limit: text(clean.spend.limit),
|
|
321
|
+
used: text(clean.spend.used),
|
|
322
|
+
};
|
|
323
|
+
account.limits[id(key)] = clean;
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
return {
|
|
327
|
+
windows,
|
|
328
|
+
account,
|
|
329
|
+
replace: report.replace?.map((r) => ({ ...r, limitId: id(r.limitId) })),
|
|
330
|
+
};
|
|
331
|
+
}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
// Pure per-line reasoning extractor for `session_logs`. No DB import: the API
|
|
2
|
+
// write path and the UI logs-parser share it. Text lengths match the reasoning
|
|
3
|
+
// items the UI parser (apps/ui/src/logs-parser) builds from the same line.
|
|
4
|
+
|
|
5
|
+
export type ReasoningKind = "reasoning" | "update";
|
|
6
|
+
|
|
7
|
+
export interface LineReasoning {
|
|
8
|
+
/** `null` when the line has no reasoning block (both columns stay NULL). */
|
|
9
|
+
reasoning: { chars: number; blocks: number; messageId?: string } | null;
|
|
10
|
+
/** Set when a Claude line carries a `tool_use` block. */
|
|
11
|
+
toolUseMessageId?: string;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
// Claude Code stream-json shape: pi and amp logs reuse it.
|
|
15
|
+
const ANTHROPIC_CLIS = new Set(["claude", "pi", "amp"]);
|
|
16
|
+
|
|
17
|
+
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
18
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
function str(value: unknown): string {
|
|
22
|
+
return typeof value === "string" ? value : "";
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
function joinStrings(value: unknown): string {
|
|
26
|
+
return Array.isArray(value)
|
|
27
|
+
? value.filter((v): v is string => typeof v === "string").join("\n")
|
|
28
|
+
: str(value);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export function extractReasoning(cli: string, line: string): LineReasoning {
|
|
32
|
+
let ev: unknown;
|
|
33
|
+
try {
|
|
34
|
+
ev = JSON.parse(line);
|
|
35
|
+
} catch {
|
|
36
|
+
// Some stored lines are not JSON (stderr, truncated writes).
|
|
37
|
+
return { reasoning: null };
|
|
38
|
+
}
|
|
39
|
+
if (!isRecord(ev)) return { reasoning: null };
|
|
40
|
+
|
|
41
|
+
if (ANTHROPIC_CLIS.has(cli)) {
|
|
42
|
+
const message = isRecord(ev.message) ? ev.message : undefined;
|
|
43
|
+
if (!message || !Array.isArray(message.content)) return { reasoning: null };
|
|
44
|
+
const messageId = typeof message.id === "string" ? message.id : undefined;
|
|
45
|
+
let chars = 0;
|
|
46
|
+
let blocks = 0;
|
|
47
|
+
let hasToolUse = false;
|
|
48
|
+
for (const block of message.content) {
|
|
49
|
+
if (!isRecord(block)) continue;
|
|
50
|
+
if (block.type === "thinking") {
|
|
51
|
+
blocks++;
|
|
52
|
+
chars += String(block.thinking ?? block.text ?? "").length;
|
|
53
|
+
} else if (block.type === "tool_use") {
|
|
54
|
+
hasToolUse = true;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
return {
|
|
58
|
+
reasoning: blocks > 0 ? { chars, blocks, messageId } : null,
|
|
59
|
+
...(cli === "claude" && hasToolUse && messageId ? { toolUseMessageId: messageId } : {}),
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
switch (cli) {
|
|
64
|
+
case "codex": {
|
|
65
|
+
const item = isRecord(ev.item) ? ev.item : undefined;
|
|
66
|
+
if (ev.type !== "item.completed" || item?.type !== "reasoning") break;
|
|
67
|
+
const text = str(item.text) || joinStrings(item.summary) || joinStrings(item.content);
|
|
68
|
+
return { reasoning: { chars: text.length, blocks: 1 } };
|
|
69
|
+
}
|
|
70
|
+
case "opencode": {
|
|
71
|
+
// shortcut: v2 `session.reasoning.ended` only. v1 reasoning arrives as
|
|
72
|
+
// deltas spread over lines, which a per-line read cannot sum; add it if
|
|
73
|
+
// v1 sessions come back.
|
|
74
|
+
if (ev.type !== "session.reasoning.ended") break;
|
|
75
|
+
const data = isRecord(ev.data) ? ev.data : {};
|
|
76
|
+
return { reasoning: { chars: str(data.text).length, blocks: 1 } };
|
|
77
|
+
}
|
|
78
|
+
case "cursor":
|
|
79
|
+
case "dsh": {
|
|
80
|
+
if (ev.type !== "thinking") break;
|
|
81
|
+
return { reasoning: { chars: str(ev.text).length, blocks: 1 } };
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
// acp and every other cli: untracked.
|
|
85
|
+
return { reasoning: null };
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
/**
|
|
89
|
+
* Classifies one Claude `message.id`'s ordered blocks. Returns one kind per
|
|
90
|
+
* thinking block, in order. Rule (t3code): when two or more consecutive
|
|
91
|
+
* thinking blocks directly precede a `tool_use`, the last one is a pre-tool
|
|
92
|
+
* `update`; every other thinking block is `reasoning`.
|
|
93
|
+
*/
|
|
94
|
+
export function classifyClaudeThinking(blocks: Array<{ type: string }>): ReasoningKind[] {
|
|
95
|
+
const kinds: ReasoningKind[] = [];
|
|
96
|
+
let run = 0;
|
|
97
|
+
for (const block of blocks) {
|
|
98
|
+
if (block.type === "thinking") {
|
|
99
|
+
kinds.push("reasoning");
|
|
100
|
+
run++;
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
if (block.type === "tool_use" && run >= 2) kinds[kinds.length - 1] = "update";
|
|
104
|
+
run = 0;
|
|
105
|
+
}
|
|
106
|
+
return kinds;
|
|
107
|
+
}
|
|
@@ -7,8 +7,7 @@
|
|
|
7
7
|
* (`chatgpt_plan_type`), see `codexPlanFromClaim`. A Claude token from
|
|
8
8
|
* `claude setup-token` has only the `user:inference` scope, so Anthropic's
|
|
9
9
|
* `/api/oauth/profile` answers 403 (checked 2026-09-25). The Claude plan is
|
|
10
|
-
*
|
|
11
|
-
* the operator can always pick it on the dashboard.
|
|
10
|
+
* unknown unless the operator selects it. Historical estimates remain uncertain.
|
|
12
11
|
*/
|
|
13
12
|
|
|
14
13
|
import type { ModelFamily } from "./model-rate-limit-windows";
|
|
@@ -24,20 +23,20 @@ export interface SubscriptionPlan {
|
|
|
24
23
|
excludedModelFamilies?: readonly ModelFamily[];
|
|
25
24
|
}
|
|
26
25
|
|
|
27
|
-
/** List prices from claude.com/pricing and chatgpt.com/pricing, checked 2026-
|
|
28
|
-
export const SUBSCRIPTION_PLANS_CHECKED_AT = "2026-
|
|
26
|
+
/** List prices from claude.com/pricing and chatgpt.com/pricing, checked 2026-11-08. */
|
|
27
|
+
export const SUBSCRIPTION_PLANS_CHECKED_AT = "2026-11-08";
|
|
29
28
|
|
|
30
29
|
export const SUBSCRIPTION_PLANS: readonly SubscriptionPlan[] = [
|
|
31
30
|
{ id: "claude_pro", label: "Claude Pro", keyType: "CLAUDE_CODE_OAUTH_TOKEN", monthlyUsd: 20 },
|
|
32
31
|
{
|
|
33
32
|
id: "claude_max_5x",
|
|
34
|
-
label: "Claude Max
|
|
33
|
+
label: "Claude Max",
|
|
35
34
|
keyType: "CLAUDE_CODE_OAUTH_TOKEN",
|
|
36
35
|
monthlyUsd: 100,
|
|
37
36
|
},
|
|
38
37
|
{
|
|
39
38
|
id: "claude_max_20x",
|
|
40
|
-
label: "Claude
|
|
39
|
+
label: "Claude Ultra",
|
|
41
40
|
keyType: "CLAUDE_CODE_OAUTH_TOKEN",
|
|
42
41
|
monthlyUsd: 200,
|
|
43
42
|
},
|
|
@@ -46,8 +45,8 @@ export const SUBSCRIPTION_PLANS: readonly SubscriptionPlan[] = [
|
|
|
46
45
|
label: "Claude Team, standard seat",
|
|
47
46
|
keyType: "CLAUDE_CODE_OAUTH_TOKEN",
|
|
48
47
|
monthlyUsd: 25,
|
|
49
|
-
//
|
|
50
|
-
//
|
|
48
|
+
// Preserve the existing routing policy. This label update does not
|
|
49
|
+
// establish whether paid usage credits permit a model.
|
|
51
50
|
excludedModelFamilies: ["fable"],
|
|
52
51
|
},
|
|
53
52
|
{
|
|
@@ -58,8 +57,9 @@ export const SUBSCRIPTION_PLANS: readonly SubscriptionPlan[] = [
|
|
|
58
57
|
},
|
|
59
58
|
{ id: "chatgpt_go", label: "ChatGPT Go", keyType: "CODEX_OAUTH", monthlyUsd: 8 },
|
|
60
59
|
{ id: "chatgpt_plus", label: "ChatGPT Plus", keyType: "CODEX_OAUTH", monthlyUsd: 20 },
|
|
61
|
-
{ id: "chatgpt_pro_5x", label: "ChatGPT Pro
|
|
62
|
-
{ id: "chatgpt_pro", label: "ChatGPT Pro
|
|
60
|
+
{ id: "chatgpt_pro_5x", label: "ChatGPT Pro 100", keyType: "CODEX_OAUTH", monthlyUsd: 100 },
|
|
61
|
+
{ id: "chatgpt_pro", label: "ChatGPT Pro 200", keyType: "CODEX_OAUTH", monthlyUsd: 200 },
|
|
62
|
+
{ id: "chatgpt_pro_500", label: "ChatGPT Pro 500", keyType: "CODEX_OAUTH", monthlyUsd: 500 },
|
|
63
63
|
{
|
|
64
64
|
id: "chatgpt_business",
|
|
65
65
|
label: "ChatGPT Business, standard seat",
|
|
@@ -96,20 +96,13 @@ export function planAllowsModelFamily(
|
|
|
96
96
|
return !record.excludedModelFamilies.includes(family);
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
/**
|
|
100
|
-
* Map the `chatgpt_plan_type` JWT claim to a plan id. The claim says `pro`
|
|
101
|
-
* for both Pro tiers, so `pro` maps to the 20x plan (the operator can change
|
|
102
|
-
* it). `free`, `enterprise`, `edu` and unknown values have no list price and
|
|
103
|
-
* return null.
|
|
104
|
-
*/
|
|
99
|
+
/** Map only unambiguous claims to priced plans. Preserve raw Pro identities separately. */
|
|
105
100
|
export function codexPlanFromClaim(claim: string | null | undefined): string | null {
|
|
106
101
|
switch (claim?.toLowerCase()) {
|
|
107
102
|
case "go":
|
|
108
103
|
return "chatgpt_go";
|
|
109
104
|
case "plus":
|
|
110
105
|
return "chatgpt_plus";
|
|
111
|
-
case "pro":
|
|
112
|
-
return "chatgpt_pro";
|
|
113
106
|
case "team":
|
|
114
107
|
case "business":
|
|
115
108
|
return "chatgpt_business";
|
|
@@ -117,44 +110,3 @@ export function codexPlanFromClaim(claim: string | null | undefined): string | n
|
|
|
117
110
|
return null;
|
|
118
111
|
}
|
|
119
112
|
}
|
|
120
|
-
|
|
121
|
-
/**
|
|
122
|
-
* A Claude token cannot tell its plan, but the provider reports how much of
|
|
123
|
-
* each rate-limit window the credential used. The API-priced spend it ran in
|
|
124
|
-
* the 7-day window, divided by that share, is the window's capacity in USD.
|
|
125
|
-
* Measured on production on 2026-09-25, 3 Max 20x credentials held about
|
|
126
|
-
* $2,000 per 7-day window (8 of 8 windows classified right). Max 5x has 1/4 of
|
|
127
|
-
* the Max 20x capacity and Pro 1/20. The 5-hour window was too noisy (15% of
|
|
128
|
-
* windows looked like Max 5x), so it is not used.
|
|
129
|
-
*/
|
|
130
|
-
const MAX_20X_WEEKLY_CAPACITY_USD = 2000;
|
|
131
|
-
/** Below this share of the week the spend is too small to classify. */
|
|
132
|
-
export const MIN_ESTIMATE_UTILIZATION = 0.25;
|
|
133
|
-
const CLAUDE_TIERS: readonly (readonly [plan: string, shareOfMax20x: number])[] = [
|
|
134
|
-
["claude_pro", 1 / 20],
|
|
135
|
-
["claude_max_5x", 1 / 4],
|
|
136
|
-
["claude_max_20x", 1],
|
|
137
|
-
];
|
|
138
|
-
|
|
139
|
-
/**
|
|
140
|
-
* Estimate a Claude plan from the 7-day window: the nearest tier on a log
|
|
141
|
-
* scale. Returns null when the window is too little used. Usage outside the
|
|
142
|
-
* swarm on the same account raises the utilization, so it can read a tier low.
|
|
143
|
-
*/
|
|
144
|
-
export function estimateClaudePlan(
|
|
145
|
-
weeklyUtilization: number,
|
|
146
|
-
weeklySpendUsd: number,
|
|
147
|
-
): string | null {
|
|
148
|
-
if (weeklyUtilization < MIN_ESTIMATE_UTILIZATION || weeklySpendUsd <= 0) return null;
|
|
149
|
-
const share = weeklySpendUsd / weeklyUtilization / MAX_20X_WEEKLY_CAPACITY_USD;
|
|
150
|
-
let best: string | null = null;
|
|
151
|
-
let bestDistance = Number.POSITIVE_INFINITY;
|
|
152
|
-
for (const [plan, tierShare] of CLAUDE_TIERS) {
|
|
153
|
-
const distance = Math.abs(Math.log(share / tierShare));
|
|
154
|
-
if (distance < bestDistance) {
|
|
155
|
-
best = plan;
|
|
156
|
-
bestDistance = distance;
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
return best;
|
|
160
|
-
}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Browser-safe constants and types for task UI specs (json-render chat catalog).
|
|
3
|
+
* No package imports: the dashboard imports this file directly.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/** Max UTF-8 bytes of `JSON.stringify(spec)`. */
|
|
7
|
+
export const UI_SPEC_MAX_BYTES = 32_768;
|
|
8
|
+
|
|
9
|
+
/** Max Slack blocks one spec may render as. */
|
|
10
|
+
export const UI_SPEC_MAX_BLOCKS = 45;
|
|
11
|
+
|
|
12
|
+
/** Max elements in one Slack `actions` block. */
|
|
13
|
+
export const UI_SPEC_MAX_ACTIONS_ROW_ELEMENTS = 25;
|
|
14
|
+
|
|
15
|
+
/** Prefix on the Slack `action_id` of every spec Button. */
|
|
16
|
+
export const UI_SPEC_ACTION_PREFIX = "swarm_ui:";
|
|
17
|
+
|
|
18
|
+
/** Allowed id of a declared action, and of the Button that names it. */
|
|
19
|
+
export const UI_SPEC_ACTION_ID = /^[a-z][a-z0-9_]{0,39}$/;
|
|
20
|
+
|
|
21
|
+
/** Limits passed to `toCard` from `@json-render/chat`. */
|
|
22
|
+
export const UI_SPEC_CARD_LIMITS = {
|
|
23
|
+
tables: 1,
|
|
24
|
+
charts: 2,
|
|
25
|
+
chartLabel: 20,
|
|
26
|
+
chartTitle: 50,
|
|
27
|
+
tableRows: 100,
|
|
28
|
+
tableColumns: 20,
|
|
29
|
+
} as const;
|
|
30
|
+
|
|
31
|
+
/** The chat catalog components. Kept equal to `@json-render/chat` by a drift test. */
|
|
32
|
+
export const UI_SPEC_COMPONENTS = [
|
|
33
|
+
"Card",
|
|
34
|
+
"Section",
|
|
35
|
+
"Text",
|
|
36
|
+
"Fields",
|
|
37
|
+
"Field",
|
|
38
|
+
"Table",
|
|
39
|
+
"Chart",
|
|
40
|
+
"Divider",
|
|
41
|
+
"Image",
|
|
42
|
+
"Actions",
|
|
43
|
+
"Button",
|
|
44
|
+
"LinkButton",
|
|
45
|
+
] as const;
|
|
46
|
+
|
|
47
|
+
export type UiSpecComponent = (typeof UI_SPEC_COMPONENTS)[number];
|
|
48
|
+
|
|
49
|
+
export interface TaskUiSpecDocument {
|
|
50
|
+
root: string;
|
|
51
|
+
elements: Record<string, unknown>;
|
|
52
|
+
state?: Record<string, unknown>;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export interface TaskUiSpecAction {
|
|
56
|
+
kind: "follow_up";
|
|
57
|
+
prompt: string;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export interface TaskUiSpec {
|
|
61
|
+
spec: TaskUiSpecDocument;
|
|
62
|
+
actions?: Record<string, TaskUiSpecAction>;
|
|
63
|
+
fallbackText: string;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/** What an agent sends on `store-progress`: the spec without the derived fallback text. */
|
|
67
|
+
export type TaskUiSpecInput = Omit<TaskUiSpec, "fallbackText">;
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
getTaskById,
|
|
5
5
|
getWorkflowRun,
|
|
6
6
|
getWorkflowRunStep,
|
|
7
|
+
markWorkflowStepTaskSuperseded,
|
|
7
8
|
updateWorkflowRun,
|
|
8
9
|
updateWorkflowRunStep,
|
|
9
10
|
} from "../be/db";
|
|
@@ -216,9 +217,10 @@ export const SUPERSEDE_RETRY_POLICY: RetryPolicy = {
|
|
|
216
217
|
* bound to the failed task, detach that task (the executor reuses any task
|
|
217
218
|
* bound to the step, so a bound failed task would park the retry forever), and
|
|
218
219
|
* record the failure with `nextRetryAt` so the retry poller re-dispatches a new
|
|
219
|
-
* task.
|
|
220
|
-
*
|
|
221
|
-
*
|
|
220
|
+
* task. A detached task failed by a supersede cut moves to `superseded`.
|
|
221
|
+
* Bounded by `maxRetries` via the step's persisted `retryCount`, read only
|
|
222
|
+
* after ownership is confirmed: a stale caller's step snapshot may carry the
|
|
223
|
+
* counter of a newer attempt.
|
|
222
224
|
*
|
|
223
225
|
* A foreach child (`<foreachId>#<key>`) with an `agent-task` body takes the
|
|
224
226
|
* parent foreach node's `retry`, else the same supersede default. While queued
|
|
@@ -266,6 +268,9 @@ export async function scheduleTaskStepRetry(
|
|
|
266
268
|
if (current.retryCount >= policy.maxRetries) return "not-eligible";
|
|
267
269
|
await detachTaskFromWorkflowRunStep(taskId);
|
|
268
270
|
await checkpointStepFailure(runId, step.id, reason, current.retryCount, policy);
|
|
271
|
+
// A supersede cut that gets a retry is not a real failure: the step goes
|
|
272
|
+
// on in a fresh task. A cut with no retry stays `failed`.
|
|
273
|
+
await markWorkflowStepTaskSuperseded(taskId);
|
|
269
274
|
return "scheduled";
|
|
270
275
|
});
|
|
271
276
|
}
|
|
@@ -5,9 +5,10 @@ Blocks `db-query` tool calls made on a task whose creator (`requestedByUserId`)
|
|
|
5
5
|
| Task creator | `db-query` |
|
|
6
6
|
|---|---|
|
|
7
7
|
| Not set, or the call has no task | Allowed |
|
|
8
|
+
| The header's id has no task row (a session with no task) | Allowed |
|
|
8
9
|
| Set, holds an admin role | Allowed |
|
|
9
10
|
| Set, no admin role | Blocked |
|
|
10
|
-
| Set, but the lookup fails
|
|
11
|
+
| Set, but the lookup fails or times out | Blocked |
|
|
11
12
|
|
|
12
13
|
No config. "Admin" means the creator's `users.role` is `admin` (case-insensitive), the role the swarm shows next to a requester's name. Only Lead (`manage-user`) and REST callers with `user.role.manage` can set it. RBAC roles are not used, because every user is created with the RBAC `admin` role. A creator whose user row is gone counts as non-admin.
|
|
13
14
|
|