@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
|
@@ -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. */
|
|
@@ -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;
|
|
@@ -137,9 +137,9 @@ export class CodexAppServer {
|
|
|
137
137
|
void this.ready.catch(() => {});
|
|
138
138
|
}
|
|
139
139
|
|
|
140
|
-
async request<T>(method: string, params?: unknown): Promise<T> {
|
|
140
|
+
async request<T>(method: string, params?: unknown, options?: { timeoutMs: number }): Promise<T> {
|
|
141
141
|
await this.ready;
|
|
142
|
-
return this.requestRaw<T>(method, params);
|
|
142
|
+
return this.requestRaw<T>(method, params, options?.timeoutMs);
|
|
143
143
|
}
|
|
144
144
|
|
|
145
145
|
get version(): string | undefined {
|
|
@@ -185,7 +185,11 @@ export class CodexAppServer {
|
|
|
185
185
|
this.write({ method: "initialized" });
|
|
186
186
|
}
|
|
187
187
|
|
|
188
|
-
private requestRaw<T>(
|
|
188
|
+
private requestRaw<T>(
|
|
189
|
+
method: string,
|
|
190
|
+
params?: unknown,
|
|
191
|
+
timeoutMs = this.requestTimeoutMs,
|
|
192
|
+
): Promise<T> {
|
|
189
193
|
if (this.terminalError) return Promise.reject(this.terminalError);
|
|
190
194
|
if (this.closePromise) return Promise.reject(new Error("Codex app-server closed"));
|
|
191
195
|
|
|
@@ -193,8 +197,8 @@ export class CodexAppServer {
|
|
|
193
197
|
return new Promise<T>((resolve, reject) => {
|
|
194
198
|
const timer = setTimeout(() => {
|
|
195
199
|
this.pending.delete(id);
|
|
196
|
-
reject(new Error(`Codex app-server ${method} timed out after ${
|
|
197
|
-
},
|
|
200
|
+
reject(new Error(`Codex app-server ${method} timed out after ${timeoutMs}ms`));
|
|
201
|
+
}, timeoutMs);
|
|
198
202
|
this.pending.set(id, {
|
|
199
203
|
method,
|
|
200
204
|
resolve: resolve as (value: unknown) => void,
|
|
@@ -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
|
}
|
|
@@ -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.
|
package/src/providers/types.ts
CHANGED
|
@@ -11,6 +11,11 @@ export type CostModelUsage = {
|
|
|
11
11
|
|
|
12
12
|
/** Data for session cost tracking. Shared across all provider adapters. */
|
|
13
13
|
export interface CostData {
|
|
14
|
+
/** Stable report identity and attribution captured by the worker at execution start. */
|
|
15
|
+
id?: string;
|
|
16
|
+
credentialKeyType?: string | null;
|
|
17
|
+
credentialKeySuffix?: string | null;
|
|
18
|
+
harness?: ProviderName | null;
|
|
14
19
|
sessionId: string;
|
|
15
20
|
taskId?: string;
|
|
16
21
|
agentId: string;
|
|
@@ -73,6 +78,10 @@ export interface CostData {
|
|
|
73
78
|
import type { ProviderName, SteerMode } from "../types";
|
|
74
79
|
import type { RateLimitWindowTelemetry } from "../utils/error-tracker";
|
|
75
80
|
import type { ModelFamily } from "../utils/model-rate-limit-windows";
|
|
81
|
+
import type {
|
|
82
|
+
ProviderAccountTelemetry,
|
|
83
|
+
RateLimitReplacement,
|
|
84
|
+
} from "../utils/provider-account-telemetry";
|
|
76
85
|
import type { ReasoningEffort } from "./reasoning-effort";
|
|
77
86
|
|
|
78
87
|
/** Normalized event emitted by any provider adapter. */
|
|
@@ -237,6 +246,8 @@ export interface ProviderResult {
|
|
|
237
246
|
* Best-effort and informational; consumers must tolerate it being absent.
|
|
238
247
|
*/
|
|
239
248
|
rateLimitWindows?: RateLimitWindowTelemetry;
|
|
249
|
+
providerAccount?: ProviderAccountTelemetry;
|
|
250
|
+
rateLimitReplacements?: RateLimitReplacement[];
|
|
240
251
|
/**
|
|
241
252
|
* A rejected model-scoped weekly window (`seven_day_opus`, `seven_day_sonnet`,
|
|
242
253
|
* `seven_day_overage_included` — the Fable window) observed in this session.
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { redactWithEnv } from "../e2b/env";
|
|
2
|
+
import { parseEnvFlag } from "../utils/env-flag";
|
|
2
3
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
3
4
|
import {
|
|
4
5
|
type ConfigStatus,
|
|
@@ -19,8 +20,55 @@ import {
|
|
|
19
20
|
* - DOCKER_HOST: `unix:///path/to/docker.sock` (default /var/run/docker.sock)
|
|
20
21
|
* - DOCKER_NETWORK: optional network to attach runtimes to
|
|
21
22
|
* - DOCKER_EXTRA_HOSTS: comma-separated host:address entries
|
|
23
|
+
* - DOCKER_RUNTIME: optional OCI runtime name (`runsc`, `kata`) -> HostConfig.Runtime
|
|
24
|
+
* - DOCKER_HARDENED: `true` or `1` (parseEnvFlag) drops all capabilities except the
|
|
25
|
+
* entrypoint set, forbids privilege escalation, and disables swap when memory is limited
|
|
26
|
+
* - DOCKER_PIDS_LIMIT: optional positive integer -> HostConfig.PidsLimit
|
|
22
27
|
*/
|
|
23
28
|
const MAX_API_VERSION = 47;
|
|
29
|
+
const OCI_RUNTIME_NAME = /^[A-Za-z0-9._-]+$/;
|
|
30
|
+
const PIDS_LIMIT = /^[1-9]\d*$/;
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Capabilities the worker entrypoint still needs after `CapDrop: ["ALL"]`, verified against
|
|
34
|
+
* `agent-swarm-worker:slim` with `--security-opt no-new-privileges`:
|
|
35
|
+
* - CHOWN + DAC_OVERRIDE: root chowns and writes into the 750 `/home/worker` tree.
|
|
36
|
+
* - FOWNER: `chmod` after `chown` on the codex `auth.json`.
|
|
37
|
+
* - SETUID + SETGID: the entrypoint drops from root to the `worker` user.
|
|
38
|
+
* - KILL: tini forwards signals to the worker process.
|
|
39
|
+
*/
|
|
40
|
+
const HARDENED_CAP_ADD = ["CHOWN", "DAC_OVERRIDE", "FOWNER", "SETUID", "SETGID", "KILL"];
|
|
41
|
+
|
|
42
|
+
class DockerConfigError extends Error {
|
|
43
|
+
constructor(
|
|
44
|
+
readonly key: string,
|
|
45
|
+
message: string,
|
|
46
|
+
) {
|
|
47
|
+
super(scrubSecrets(message));
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
type IsolationOptions = { runtime?: string; pidsLimit?: number; hardened: boolean };
|
|
52
|
+
|
|
53
|
+
function isolationOptions(target: RuntimeTargetConfig): IsolationOptions {
|
|
54
|
+
const runtime = target.DOCKER_RUNTIME?.trim();
|
|
55
|
+
if (runtime && !OCI_RUNTIME_NAME.test(runtime))
|
|
56
|
+
throw new DockerConfigError(
|
|
57
|
+
"DOCKER_RUNTIME",
|
|
58
|
+
`DOCKER_RUNTIME must be an OCI runtime name (letters, digits, ".", "-", "_"), got ${runtime}`,
|
|
59
|
+
);
|
|
60
|
+
const pids = target.DOCKER_PIDS_LIMIT?.trim();
|
|
61
|
+
if (pids && (!PIDS_LIMIT.test(pids) || !Number.isSafeInteger(Number(pids))))
|
|
62
|
+
throw new DockerConfigError(
|
|
63
|
+
"DOCKER_PIDS_LIMIT",
|
|
64
|
+
`DOCKER_PIDS_LIMIT must be a positive integer, got ${pids}`,
|
|
65
|
+
);
|
|
66
|
+
return {
|
|
67
|
+
runtime: runtime || undefined,
|
|
68
|
+
pidsLimit: pids ? Number(pids) : undefined,
|
|
69
|
+
hardened: parseEnvFlag(target.DOCKER_HARDENED, false),
|
|
70
|
+
};
|
|
71
|
+
}
|
|
24
72
|
const apiVersions = new Map<string, Promise<string>>();
|
|
25
73
|
|
|
26
74
|
async function apiVersion(socket: string): Promise<string> {
|
|
@@ -146,14 +194,17 @@ export class DockerRuntimeProvider implements RuntimeProvider {
|
|
|
146
194
|
checkConfig(target: RuntimeTargetConfig): ConfigStatus {
|
|
147
195
|
try {
|
|
148
196
|
socketPath(target);
|
|
197
|
+
isolationOptions(target);
|
|
149
198
|
return { ready: true, missing: [] };
|
|
150
199
|
} catch (err) {
|
|
151
|
-
|
|
200
|
+
const key = err instanceof DockerConfigError ? err.key : "DOCKER_HOST";
|
|
201
|
+
return { ready: false, missing: [key], hint: (err as Error).message };
|
|
152
202
|
}
|
|
153
203
|
}
|
|
154
204
|
|
|
155
205
|
async provision(target: RuntimeTargetConfig, req: ProvisionRequest): Promise<RuntimeHandle> {
|
|
156
206
|
try {
|
|
207
|
+
const isolation = isolationOptions(target);
|
|
157
208
|
let cacheWarning: string | undefined;
|
|
158
209
|
let cacheMount: { Type: "volume"; Source: string; Target: string } | undefined;
|
|
159
210
|
if (req.cache) {
|
|
@@ -200,6 +251,19 @@ export class DockerRuntimeProvider implements RuntimeProvider {
|
|
|
200
251
|
Memory: req.resources?.memoryMb ? req.resources.memoryMb * 1024 * 1024 : undefined,
|
|
201
252
|
NanoCpus: req.resources?.cpu ? Math.round(req.resources.cpu * 1e9) : undefined,
|
|
202
253
|
...(cacheMount ? { Mounts: [cacheMount] } : {}),
|
|
254
|
+
...(isolation.runtime ? { Runtime: isolation.runtime } : {}),
|
|
255
|
+
...(isolation.pidsLimit ? { PidsLimit: isolation.pidsLimit } : {}),
|
|
256
|
+
...(isolation.hardened
|
|
257
|
+
? {
|
|
258
|
+
CapDrop: ["ALL"],
|
|
259
|
+
CapAdd: HARDENED_CAP_ADD,
|
|
260
|
+
SecurityOpt: ["no-new-privileges:true"],
|
|
261
|
+
// MemorySwap == Memory means no swap on top of the memory limit.
|
|
262
|
+
...(req.resources?.memoryMb
|
|
263
|
+
? { MemorySwap: req.resources.memoryMb * 1024 * 1024 }
|
|
264
|
+
: {}),
|
|
265
|
+
}
|
|
266
|
+
: {}),
|
|
203
267
|
},
|
|
204
268
|
};
|
|
205
269
|
const createAndStart = async (): Promise<string> => {
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
updateScheduledTask,
|
|
7
7
|
} from "@/be/db";
|
|
8
8
|
import type { PreparedTaskCreate } from "@/tasks/sibling-awareness";
|
|
9
|
-
import type
|
|
9
|
+
import { type AgentTask, type ScheduledTask, SUPERSEDED_WORKFLOW_TASK_REASON } from "@/types";
|
|
10
10
|
import { workflowEventBus } from "@/workflows/event-bus";
|
|
11
11
|
import { createStandaloneScheduleTask, prepareStandaloneScheduleTask } from "./schedule-task";
|
|
12
12
|
|
|
@@ -23,6 +23,18 @@ type WaitMember = { taskId: string; taskStatus: string | null; deferred: number
|
|
|
23
23
|
|
|
24
24
|
type WakeReason = "ceiling" | "task.completed" | "task.failed" | "task.cancelled" | "task.skipped";
|
|
25
25
|
|
|
26
|
+
/**
|
|
27
|
+
* A member's status as waits see it. A workflow step cut by a supersede is
|
|
28
|
+
* `failed` first and moves to `superseded` once its retry is queued. It has no
|
|
29
|
+
* resume child (the retry is a fresh task the wait never named), so it keeps
|
|
30
|
+
* reading as the failure it settled as. Reading it from the row, not the
|
|
31
|
+
* event, keeps restart reconciliation and either commit order of the retry
|
|
32
|
+
* move and the wait's reconcile on the same answer.
|
|
33
|
+
*/
|
|
34
|
+
const WAIT_MEMBER_STATUS_SQL = `CASE
|
|
35
|
+
WHEN t.status = 'superseded' AND t.failureReason = '${SUPERSEDED_WORKFLOW_TASK_REASON}' THEN 'failed'
|
|
36
|
+
ELSE t.status END`;
|
|
37
|
+
|
|
26
38
|
/**
|
|
27
39
|
* Read the wait row and its member set and decide whether the wait is ready.
|
|
28
40
|
* Returns the wake-up cause text, or undefined when the wait is absent, already
|
|
@@ -46,7 +58,7 @@ async function resolveWaitCause(
|
|
|
46
58
|
return undefined;
|
|
47
59
|
if (reason === "ceiling") return { wait, cause: "ceiling expired", matchedTaskIds: [] };
|
|
48
60
|
const members = await client.query<WaitMember>(
|
|
49
|
-
`SELECT m.taskId,
|
|
61
|
+
`SELECT m.taskId, ${WAIT_MEMBER_STATUS_SQL} AS taskStatus, EXISTS (
|
|
50
62
|
SELECT 1 FROM scheduled_tasks d
|
|
51
63
|
WHERE d.parentTaskId = t.id AND d.taskType = 'deferred' AND d.enabled = 1
|
|
52
64
|
) AS deferred
|
|
@@ -228,16 +240,17 @@ export async function reconcileDeferredTaskWaits(taskId?: string): Promise<void>
|
|
|
228
240
|
const rows = await client.query<
|
|
229
241
|
TaskWait & { taskStatus: "completed" | "failed" | "cancelled" | "skipped" }
|
|
230
242
|
>(
|
|
231
|
-
`SELECT DISTINCT w.*,
|
|
243
|
+
`SELECT DISTINCT w.*, ${WAIT_MEMBER_STATUS_SQL} AS taskStatus FROM deferred_task_waits w
|
|
232
244
|
JOIN deferred_task_wait_members m ON m.scheduleId = w.scheduleId
|
|
233
245
|
JOIN agent_tasks t ON t.id = m.taskId
|
|
234
246
|
JOIN scheduled_tasks s ON s.id = w.scheduleId
|
|
235
|
-
WHERE w.status = 'pending' AND s.enabled = 1
|
|
247
|
+
WHERE w.status = 'pending' AND s.enabled = 1
|
|
248
|
+
AND ${WAIT_MEMBER_STATUS_SQL} IN ('completed', 'failed', 'cancelled', 'skipped')
|
|
236
249
|
AND NOT EXISTS (
|
|
237
250
|
SELECT 1 FROM scheduled_tasks d
|
|
238
251
|
WHERE d.parentTaskId = t.id AND d.taskType = 'deferred' AND d.enabled = 1
|
|
239
252
|
)
|
|
240
|
-
AND (w.eventName = 'settled' OR w.eventName = 'task.' ||
|
|
253
|
+
AND (w.eventName = 'settled' OR w.eventName = 'task.' || ${WAIT_MEMBER_STATUS_SQL})
|
|
241
254
|
${taskId ? "AND m.taskId = ?" : ""}`,
|
|
242
255
|
taskId ? [taskId] : [],
|
|
243
256
|
);
|
|
@@ -10,16 +10,16 @@ declare module "swarm-extension" {
|
|
|
10
10
|
| "schedule"
|
|
11
11
|
| "slack"
|
|
12
12
|
| "agentmail"
|
|
13
|
+
| "mcp"
|
|
14
|
+
| "api"
|
|
15
|
+
| "ui"
|
|
13
16
|
| "github"
|
|
14
17
|
| "gitlab"
|
|
15
18
|
| "azure-devops"
|
|
16
19
|
| "bitbucket"
|
|
20
|
+
| "system"
|
|
17
21
|
| "linear"
|
|
18
22
|
| "jira"
|
|
19
|
-
| "mcp"
|
|
20
|
-
| "api"
|
|
21
|
-
| "ui"
|
|
22
|
-
| "system"
|
|
23
23
|
| "comb"
|
|
24
24
|
| undefined;
|
|
25
25
|
routingReason?:
|
|
@@ -161,16 +161,16 @@ declare module "swarm-extension" {
|
|
|
161
161
|
| "schedule"
|
|
162
162
|
| "slack"
|
|
163
163
|
| "agentmail"
|
|
164
|
+
| "mcp"
|
|
165
|
+
| "api"
|
|
166
|
+
| "ui"
|
|
164
167
|
| "github"
|
|
165
168
|
| "gitlab"
|
|
166
169
|
| "azure-devops"
|
|
167
170
|
| "bitbucket"
|
|
171
|
+
| "system"
|
|
168
172
|
| "linear"
|
|
169
173
|
| "jira"
|
|
170
|
-
| "mcp"
|
|
171
|
-
| "api"
|
|
172
|
-
| "ui"
|
|
173
|
-
| "system"
|
|
174
174
|
| "comb";
|
|
175
175
|
tags: string[];
|
|
176
176
|
priority: number;
|
package/src/slack/actions.ts
CHANGED
|
@@ -3,6 +3,8 @@ import type { ChatUpdateArguments, WebClient } from "@slack/web-api";
|
|
|
3
3
|
import { cancelTask, getAgentById, getLeadAgent, getTaskById } from "../be/db";
|
|
4
4
|
import { slackContextKey } from "../tasks/context-key";
|
|
5
5
|
import { createTaskWithSiblingAwareness } from "../tasks/sibling-awareness";
|
|
6
|
+
import { runTaskUiAction } from "../ui-spec/actions";
|
|
7
|
+
import { UI_SPEC_ACTION_PREFIX } from "../utils/task-ui-spec";
|
|
6
8
|
import { buildCancelledBlocks, getTaskLink } from "./blocks";
|
|
7
9
|
import { resolveSlackUserId } from "./enrich";
|
|
8
10
|
import { EXTERNAL_CHANNEL_BLOCKED_REPLY, shouldBlockChannel } from "./external-channel";
|
|
@@ -10,6 +12,14 @@ import { ignoreSlackInbound, noteSlackInboundSideEffect } from "./inbound-dispat
|
|
|
10
12
|
import { ensureSlackThreadTree, isSlackRenderV2Enabled } from "./render-v2";
|
|
11
13
|
import { getAgentDisplayName, getAgentSlackIcon } from "./responses";
|
|
12
14
|
|
|
15
|
+
/** The ephemeral reply to a card Button click that did not start its action. */
|
|
16
|
+
const UI_ACTION_REPLIES = {
|
|
17
|
+
forbidden: "Only the person who asked for this task can use its buttons.",
|
|
18
|
+
already_done: "This button already ran.",
|
|
19
|
+
disabled: "Card buttons are turned off on this swarm.",
|
|
20
|
+
unknown_action: "This button has no action.",
|
|
21
|
+
} as const;
|
|
22
|
+
|
|
13
23
|
type ChatUpdatePayload = ChatUpdateArguments & {
|
|
14
24
|
unfurl_links: false;
|
|
15
25
|
unfurl_media: false;
|
|
@@ -161,6 +171,52 @@ export function registerActionHandlers(app: App): void {
|
|
|
161
171
|
}
|
|
162
172
|
});
|
|
163
173
|
|
|
174
|
+
// A task card Button: run its declared action once, for the task requester.
|
|
175
|
+
app.action(new RegExp(`^${UI_SPEC_ACTION_PREFIX}`), async ({ ack, action, body, client }) => {
|
|
176
|
+
await ack();
|
|
177
|
+
|
|
178
|
+
// Block Kit buttons only; a legacy attachment ButtonClick has no action_id.
|
|
179
|
+
if (action.type !== "button" || !("action_id" in action)) return;
|
|
180
|
+
const taskId = action.value;
|
|
181
|
+
const actionId = action.action_id.slice(UI_SPEC_ACTION_PREFIX.length);
|
|
182
|
+
if (!taskId || !actionId) return ignoreSlackInbound("ui_action_malformed");
|
|
183
|
+
|
|
184
|
+
const channelId = "channel" in body ? body.channel?.id : undefined;
|
|
185
|
+
if (channelId && (await shouldBlockChannel(client, channelId))) {
|
|
186
|
+
await postExternalChannelNotice(client, channelId, body.user.id);
|
|
187
|
+
return ignoreSlackInbound("external_channel");
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
const actorUserId = await resolveSlackUserId(client, body.user.id, {
|
|
191
|
+
sampleEventType: "block_actions",
|
|
192
|
+
sampleContext: action.action_id,
|
|
193
|
+
userTeam: body.user.team_id,
|
|
194
|
+
});
|
|
195
|
+
noteSlackInboundSideEffect("ui_action");
|
|
196
|
+
const result = await runTaskUiAction({
|
|
197
|
+
taskId,
|
|
198
|
+
actionId,
|
|
199
|
+
surface: "slack",
|
|
200
|
+
actorUserId,
|
|
201
|
+
slackUserId: body.user.id,
|
|
202
|
+
});
|
|
203
|
+
|
|
204
|
+
if (result.status === "started") {
|
|
205
|
+
if (isSlackRenderV2Enabled()) await ensureSlackThreadTree([result.taskId]);
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
if (!channelId) return;
|
|
209
|
+
try {
|
|
210
|
+
await client.chat.postEphemeral({
|
|
211
|
+
channel: channelId,
|
|
212
|
+
user: body.user.id,
|
|
213
|
+
text: UI_ACTION_REPLIES[result.status],
|
|
214
|
+
});
|
|
215
|
+
} catch (error) {
|
|
216
|
+
console.error("[Slack] Failed to post card button reply:", error);
|
|
217
|
+
}
|
|
218
|
+
});
|
|
219
|
+
|
|
164
220
|
// "Cancel" — cancel the task and update the message
|
|
165
221
|
app.action("cancel_task", async ({ ack, action, client, body }) => {
|
|
166
222
|
await ack();
|