@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
package/src/slack/app.ts
CHANGED
|
@@ -49,8 +49,12 @@ const DEFAULT_START_RETRY_DELAYS_MS = [5_000, 15_000, 30_000, 60_000, 120_000, 3
|
|
|
49
49
|
let startRetryDelaysMs = DEFAULT_START_RETRY_DELAYS_MS;
|
|
50
50
|
let startRetryTimer: ReturnType<typeof setTimeout> | null = null;
|
|
51
51
|
let startRetryAttempt = 0;
|
|
52
|
-
/**
|
|
53
|
-
|
|
52
|
+
/**
|
|
53
|
+
* The app whose deferred Bolt init (its own auth.test) succeeded. Keyed by
|
|
54
|
+
* instance, not a flag: a start that a reload overtook can finish init on the
|
|
55
|
+
* detached app, and must not mark the reload's new app as initialized.
|
|
56
|
+
*/
|
|
57
|
+
let boltInitializedApp: App | null = null;
|
|
54
58
|
|
|
55
59
|
const SOCKET_EVENT_STATES: Record<string, SlackConnectionState> = {
|
|
56
60
|
connecting: "connecting",
|
|
@@ -403,7 +407,10 @@ export async function initSlackApp(): Promise<App | null> {
|
|
|
403
407
|
// This swarm's installation. Installed last, the gate runs before the ack
|
|
404
408
|
// recovery wrapper and Bolt: a delivery for any other installation sharing
|
|
405
409
|
// this Slack app is never acked, stored or dispatched, so Slack redelivers it.
|
|
406
|
-
|
|
410
|
+
// Every await below can let a reload detach this app and build a new one.
|
|
411
|
+
// Finish wiring the app this call built, never whatever `app` points at then.
|
|
412
|
+
const created = app;
|
|
413
|
+
const authClient = created.client;
|
|
407
414
|
const enterpriseInstall = isSlackEnterpriseInstall();
|
|
408
415
|
setSlackWorkspaceIdentitySource(() => resolveSlackIdentity(authClient, enterpriseInstall));
|
|
409
416
|
// HTTP mode gates in the route instead, before the ack.
|
|
@@ -414,8 +421,8 @@ export async function initSlackApp(): Promise<App | null> {
|
|
|
414
421
|
|
|
415
422
|
// First global middleware: every handler below runs inside it, so each
|
|
416
423
|
// delivery resolves to an explicit processed/ignored/failed/uncertain outcome.
|
|
417
|
-
|
|
418
|
-
if (config.mode === "http")
|
|
424
|
+
created.use(slackInboundOutcomeMiddleware(config.mode === "http" ? "http" : "socket"));
|
|
425
|
+
if (config.mode === "http") created.use(ignoreSelfAsIgnored);
|
|
419
426
|
|
|
420
427
|
// Register handlers
|
|
421
428
|
const { registerMessageHandler } = await import("./handlers");
|
|
@@ -423,24 +430,24 @@ export async function initSlackApp(): Promise<App | null> {
|
|
|
423
430
|
const { registerActionHandlers } = await import("./actions");
|
|
424
431
|
const { registerWorkObjectHandlers } = await import("./work-objects");
|
|
425
432
|
|
|
426
|
-
registerMessageHandler(
|
|
427
|
-
registerCommandHandler(
|
|
428
|
-
registerActionHandlers(
|
|
429
|
-
registerWorkObjectHandlers(
|
|
433
|
+
registerMessageHandler(created);
|
|
434
|
+
registerCommandHandler(created);
|
|
435
|
+
registerActionHandlers(created);
|
|
436
|
+
registerWorkObjectHandlers(created);
|
|
430
437
|
|
|
431
438
|
// Register assistant thread handler (safe even if "Agents & AI Apps" isn't enabled)
|
|
432
439
|
const { createAssistant } = await import("./assistant");
|
|
433
|
-
|
|
440
|
+
created.assistant(createAssistant());
|
|
434
441
|
|
|
435
442
|
// Report-only scan for external (Slack Connect) channels the bot is already in.
|
|
436
443
|
const { isBlockExternalEnabled, scanExternalChannelsOnBoot } = await import("./external-channel");
|
|
437
444
|
if (isBlockExternalEnabled()) {
|
|
438
|
-
scanExternalChannelsOnBoot(
|
|
445
|
+
scanExternalChannelsOnBoot(created.client).catch((error) => {
|
|
439
446
|
console.error("[Slack] External channel boot scan failed:", error);
|
|
440
447
|
});
|
|
441
448
|
}
|
|
442
449
|
|
|
443
|
-
return
|
|
450
|
+
return created;
|
|
444
451
|
}
|
|
445
452
|
|
|
446
453
|
export async function startSlackApp(): Promise<boolean> {
|
|
@@ -510,7 +517,7 @@ export async function startSlackApp(): Promise<boolean> {
|
|
|
510
517
|
/** Resolve this swarm's identity, then Bolt's own authorization. False on any failure. */
|
|
511
518
|
async function verifySlackIdentity(current: App): Promise<boolean> {
|
|
512
519
|
if (!(await getSlackWorkspaceIdentity())) return false;
|
|
513
|
-
if (
|
|
520
|
+
if (boltInitializedApp === current) return true;
|
|
514
521
|
try {
|
|
515
522
|
await current.init();
|
|
516
523
|
} catch (error) {
|
|
@@ -518,7 +525,7 @@ async function verifySlackIdentity(current: App): Promise<boolean> {
|
|
|
518
525
|
console.error(`[Slack] Bolt initialization failed: ${message}`);
|
|
519
526
|
return false;
|
|
520
527
|
}
|
|
521
|
-
|
|
528
|
+
boltInitializedApp = current;
|
|
522
529
|
return true;
|
|
523
530
|
}
|
|
524
531
|
|
|
@@ -620,7 +627,7 @@ function detachSlackApp(): App | null {
|
|
|
620
627
|
lifecycleGeneration += 1;
|
|
621
628
|
clearStartRetry();
|
|
622
629
|
startRetryAttempt = 0;
|
|
623
|
-
|
|
630
|
+
boltInitializedApp = null;
|
|
624
631
|
stopTaskWatcher();
|
|
625
632
|
inboundDrain?.stop();
|
|
626
633
|
inboundDrain = null;
|
|
@@ -329,6 +329,8 @@ export async function createSlackTaskWithFiles(
|
|
|
329
329
|
slack?: TaskCreateEvent["slack"],
|
|
330
330
|
carriedMessageTs: readonly string[] = [],
|
|
331
331
|
): Promise<{ task: AgentTask; unattached: SlackFileFailure[] }> {
|
|
332
|
+
// Todos los callers son ingresos humanos: el hilo no impone el oficio del worker anterior.
|
|
333
|
+
options = { ...options, routingAffinity: options.routingAffinity ?? { capabilities: [] } };
|
|
332
334
|
noteSlackInboundSideEffect("task_created");
|
|
333
335
|
const context = { origin: "slack" as const, slack };
|
|
334
336
|
const create = async (createOptions: CreateTaskOptions) =>
|
package/src/slack/render-v2.ts
CHANGED
|
@@ -33,8 +33,10 @@ import {
|
|
|
33
33
|
slackThreadHasOutcomeWork,
|
|
34
34
|
} from "../be/db/slack-trees";
|
|
35
35
|
import { getTaskCitations } from "../be/task-citations";
|
|
36
|
+
import { getTaskUiSpec } from "../be/task-ui-spec";
|
|
36
37
|
import { slackContextKey } from "../tasks/context-key";
|
|
37
38
|
import type { AgentTask, TaskAttachment } from "../types";
|
|
39
|
+
import { taskUiSpecSlackBlocks } from "../ui-spec/slack";
|
|
38
40
|
import { ensure } from "../utils/business-use";
|
|
39
41
|
import { isEnvFlagEnabled } from "../utils/env-flag";
|
|
40
42
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
@@ -1200,6 +1202,59 @@ function attachmentCaption(attachments: TaskAttachment[]): string | undefined {
|
|
|
1200
1202
|
return `📎 <${destination}|${label}>`;
|
|
1201
1203
|
}
|
|
1202
1204
|
|
|
1205
|
+
/** The task's own card: its Slack blocks and the text that stands in for them. */
|
|
1206
|
+
type OutcomeUiSpec = { blocks: unknown[]; fallbackText: string };
|
|
1207
|
+
|
|
1208
|
+
/**
|
|
1209
|
+
* The card of the task that this outcome card renders, never a parent's or a
|
|
1210
|
+
* child's. `null` when `UI_SPEC_ENABLED` is off or the task has no spec.
|
|
1211
|
+
* `blocks` is empty when the stored spec no longer converts.
|
|
1212
|
+
*/
|
|
1213
|
+
async function outcomeUiSpec(task: AgentTask): Promise<OutcomeUiSpec | null> {
|
|
1214
|
+
if (!isEnvFlagEnabled("UI_SPEC_ENABLED", false)) return null;
|
|
1215
|
+
const stored = await getTaskUiSpec(task.id);
|
|
1216
|
+
if (!stored) return null;
|
|
1217
|
+
return { blocks: taskUiSpecSlackBlocks(stored, task.id), fallbackText: stored.fallbackText };
|
|
1218
|
+
}
|
|
1219
|
+
|
|
1220
|
+
/** Slack verdicts on the blocks of a message, as opposed to its text or address. */
|
|
1221
|
+
const UI_SPEC_BLOCK_REJECTION_CODES = new Set([
|
|
1222
|
+
"invalid_blocks",
|
|
1223
|
+
"invalid_blocks_format",
|
|
1224
|
+
"msg_blocks_too_long",
|
|
1225
|
+
]);
|
|
1226
|
+
|
|
1227
|
+
/**
|
|
1228
|
+
* Sends a call with the card blocks, and when Slack refuses those blocks,
|
|
1229
|
+
* once more without them, with the card's fallback text under the answer.
|
|
1230
|
+
* `send(false)` is the only call when there are no card blocks to send.
|
|
1231
|
+
*/
|
|
1232
|
+
async function withUiSpecBlockFallback<T>(
|
|
1233
|
+
uiSpec: OutcomeUiSpec | null,
|
|
1234
|
+
taskId: string,
|
|
1235
|
+
send: (withCard: boolean) => Promise<T>,
|
|
1236
|
+
): Promise<T> {
|
|
1237
|
+
if (!uiSpec?.blocks.length) return await send(false);
|
|
1238
|
+
try {
|
|
1239
|
+
return await send(true);
|
|
1240
|
+
} catch (error) {
|
|
1241
|
+
const code = slackErrorCode(error);
|
|
1242
|
+
if (!code || !UI_SPEC_BLOCK_REJECTION_CODES.has(code)) throw error;
|
|
1243
|
+
console.warn(`[Slack] ${code} for the card of task ${taskId}; retrying with its fallback text`);
|
|
1244
|
+
return await send(false);
|
|
1245
|
+
}
|
|
1246
|
+
}
|
|
1247
|
+
|
|
1248
|
+
/** The answer, with the card's fallback text under it when the card blocks are not sent. */
|
|
1249
|
+
function withUiSpecFallbackText(
|
|
1250
|
+
presentation: string,
|
|
1251
|
+
uiSpec: OutcomeUiSpec | null,
|
|
1252
|
+
withCard: boolean,
|
|
1253
|
+
): string {
|
|
1254
|
+
if (!uiSpec || withCard || !uiSpec.fallbackText) return presentation;
|
|
1255
|
+
return `${presentation}\n\n${uiSpec.fallbackText}`;
|
|
1256
|
+
}
|
|
1257
|
+
|
|
1203
1258
|
/**
|
|
1204
1259
|
* Secondary metadata for an outcome card, as captions (`context` blocks)
|
|
1205
1260
|
* under the answer: cited sources, general sources, then the primary
|
|
@@ -1357,6 +1412,11 @@ export async function streamOutcomeCard(
|
|
|
1357
1412
|
...(await outcomeCaptionBlocks(task, content)),
|
|
1358
1413
|
...(await outcomeFooter(task, tasks, duration)),
|
|
1359
1414
|
];
|
|
1415
|
+
// The task's own card goes first in the blocks, under the answer. The
|
|
1416
|
+
// streamed text stays the answer alone.
|
|
1417
|
+
const uiSpec = await outcomeUiSpec(task);
|
|
1418
|
+
const blocksFor = (withCard: boolean) =>
|
|
1419
|
+
withCard && uiSpec ? [...uiSpec.blocks, ...captions] : captions;
|
|
1360
1420
|
|
|
1361
1421
|
const startPayload: Record<string, unknown> = {
|
|
1362
1422
|
channel: task.slackChannelId,
|
|
@@ -1426,12 +1486,15 @@ export async function streamOutcomeCard(
|
|
|
1426
1486
|
`[Slack] chat.startStream failed for task ${task.id}; falling back to chat.postMessage:`,
|
|
1427
1487
|
error,
|
|
1428
1488
|
);
|
|
1429
|
-
started = await
|
|
1430
|
-
|
|
1431
|
-
|
|
1432
|
-
|
|
1433
|
-
|
|
1434
|
-
|
|
1489
|
+
started = await withUiSpecBlockFallback(uiSpec, task.id, (withCard) => {
|
|
1490
|
+
const text = withUiSpecFallbackText(presentation, uiSpec, withCard);
|
|
1491
|
+
return callSlackWithRetry(app.client, "chat.postMessage", {
|
|
1492
|
+
channel: task.slackChannelId,
|
|
1493
|
+
thread_ts: task.slackThreadTs,
|
|
1494
|
+
text,
|
|
1495
|
+
blocks: [{ type: "markdown", text }, ...blocksFor(withCard)],
|
|
1496
|
+
...persona,
|
|
1497
|
+
});
|
|
1435
1498
|
});
|
|
1436
1499
|
deliveredViaFallback = true;
|
|
1437
1500
|
}
|
|
@@ -1447,11 +1510,17 @@ export async function streamOutcomeCard(
|
|
|
1447
1510
|
}
|
|
1448
1511
|
if (!deliveredViaFallback) {
|
|
1449
1512
|
try {
|
|
1450
|
-
await
|
|
1451
|
-
|
|
1452
|
-
|
|
1453
|
-
|
|
1454
|
-
|
|
1513
|
+
await withUiSpecBlockFallback(uiSpec, task.id, (withCard) =>
|
|
1514
|
+
callSlackWithRetry(app.client, "chat.stopStream", {
|
|
1515
|
+
channel: task.slackChannelId,
|
|
1516
|
+
ts: outcome.ts,
|
|
1517
|
+
// chat.stopStream appends markdown_text to the streamed answer.
|
|
1518
|
+
...(uiSpec?.fallbackText && !withCard
|
|
1519
|
+
? { markdown_text: `\n\n${uiSpec.fallbackText}` }
|
|
1520
|
+
: {}),
|
|
1521
|
+
blocks: blocksFor(withCard),
|
|
1522
|
+
}),
|
|
1523
|
+
);
|
|
1455
1524
|
} catch (error) {
|
|
1456
1525
|
// A process may have stopped the stream before it persisted the final
|
|
1457
1526
|
// permalink. The message is then a plain message and chat.update below
|
|
@@ -1463,11 +1532,14 @@ export async function streamOutcomeCard(
|
|
|
1463
1532
|
// slackReplySent snapshot may have since changed. The stream is closed
|
|
1464
1533
|
// now, so chat.update is allowed: overwrite the text and the caption
|
|
1465
1534
|
// blocks with the freshly computed presentation.
|
|
1466
|
-
await
|
|
1467
|
-
|
|
1468
|
-
|
|
1469
|
-
|
|
1470
|
-
|
|
1535
|
+
await withUiSpecBlockFallback(uiSpec, task.id, (withCard) => {
|
|
1536
|
+
const text = withUiSpecFallbackText(presentation, uiSpec, withCard);
|
|
1537
|
+
return callSlackWithRetry(app.client, "chat.update", {
|
|
1538
|
+
channel: task.slackChannelId,
|
|
1539
|
+
ts: outcome.ts,
|
|
1540
|
+
text,
|
|
1541
|
+
blocks: [{ type: "markdown", text }, ...blocksFor(withCard)],
|
|
1542
|
+
});
|
|
1471
1543
|
});
|
|
1472
1544
|
}
|
|
1473
1545
|
}
|
|
@@ -1499,13 +1571,23 @@ export async function streamOutcomeCard(
|
|
|
1499
1571
|
/** Render the latest wait or final result into the chain's original card. */
|
|
1500
1572
|
async function resolvedDeferralContent(
|
|
1501
1573
|
wake: AgentTask,
|
|
1502
|
-
): Promise<{
|
|
1574
|
+
): Promise<{ uiSpec: OutcomeUiSpec | null; build: (withCard: boolean) => DeferralContent }> {
|
|
1503
1575
|
const content = await outcomeContent(wake, wake.slackReplySent);
|
|
1504
1576
|
const presentation = await outcomePresentation(wake, content);
|
|
1505
1577
|
const captions = await outcomeCaptionBlocks(wake, content);
|
|
1506
|
-
|
|
1578
|
+
const uiSpec = await outcomeUiSpec(wake);
|
|
1579
|
+
return {
|
|
1580
|
+
uiSpec,
|
|
1581
|
+
build: (withCard) => {
|
|
1582
|
+
const text = withUiSpecFallbackText(presentation, uiSpec, withCard);
|
|
1583
|
+
const card = withCard && uiSpec ? uiSpec.blocks : [];
|
|
1584
|
+
return { text, blocks: [{ type: "markdown", text }, ...card, ...captions] };
|
|
1585
|
+
},
|
|
1586
|
+
};
|
|
1507
1587
|
}
|
|
1508
1588
|
|
|
1589
|
+
type DeferralContent = { text: string; blocks: unknown[] };
|
|
1590
|
+
|
|
1509
1591
|
/** A continuation uses the first retained, usable deferral card in its chain. */
|
|
1510
1592
|
async function isAnsweredByDeferralCard(
|
|
1511
1593
|
task: AgentTask,
|
|
@@ -1609,11 +1691,13 @@ export async function refreshResolvedDeferralCards(): Promise<void> {
|
|
|
1609
1691
|
const wake = await getTaskById(wakeTaskId);
|
|
1610
1692
|
if (!wake) continue;
|
|
1611
1693
|
const content = await resolvedDeferralContent(wake);
|
|
1612
|
-
await
|
|
1613
|
-
|
|
1614
|
-
|
|
1615
|
-
|
|
1616
|
-
|
|
1694
|
+
await withUiSpecBlockFallback(content.uiSpec, wake.id, (withCard) =>
|
|
1695
|
+
callSlackWithRetry(app.client, "chat.update", {
|
|
1696
|
+
channel: card.channelId,
|
|
1697
|
+
ts: card.ts,
|
|
1698
|
+
...content.build(withCard),
|
|
1699
|
+
}),
|
|
1700
|
+
);
|
|
1617
1701
|
if (isDeferredTask(wake)) {
|
|
1618
1702
|
await updateSlackMessageRecord(card.id, {});
|
|
1619
1703
|
} else {
|
package/src/slack/responses.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ChatUpdateArguments, WebClient } from "@slack/web-api";
|
|
2
2
|
import { getAgentById, markTaskSlackReplySent } from "../be/db";
|
|
3
3
|
import type { Agent, AgentTask } from "../types";
|
|
4
|
+
import { withUiSpecFallback } from "../ui-spec/fallback";
|
|
4
5
|
import { getSlackApp } from "./app";
|
|
5
6
|
import {
|
|
6
7
|
buildCancelledBlocks,
|
|
@@ -88,7 +89,7 @@ export async function sendInlineTaskOutput(task: AgentTask): Promise<boolean> {
|
|
|
88
89
|
const chunks = formatInlineCompletionOutputChunks({
|
|
89
90
|
agentName: agent.name,
|
|
90
91
|
taskId: task.id,
|
|
91
|
-
output: slackTaskOutput(task) ?? "",
|
|
92
|
+
output: await withUiSpecFallback(task.id, slackTaskOutput(task) ?? ""),
|
|
92
93
|
});
|
|
93
94
|
|
|
94
95
|
try {
|
|
@@ -139,7 +140,7 @@ export async function sendTaskResponse(task: AgentTask): Promise<boolean> {
|
|
|
139
140
|
|
|
140
141
|
try {
|
|
141
142
|
if (task.status === "completed") {
|
|
142
|
-
const output = slackTaskOutput(task) || "Task completed.";
|
|
143
|
+
const output = await withUiSpecFallback(task.id, slackTaskOutput(task) || "Task completed.");
|
|
143
144
|
const slackOutput = markdownToSlack(output);
|
|
144
145
|
const attachmentsBlock = formatAttachmentsBlockForSlack(
|
|
145
146
|
await getSlackOutputAttachments(task.id),
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { App, SlackEventMiddlewareArgs } from "@slack/bolt";
|
|
2
2
|
import type { EntityPresentDetailsArguments, WebClient } from "@slack/web-api";
|
|
3
3
|
import { getAgentById, getTaskById } from "../be/db";
|
|
4
|
+
import { withUiSpecFallback } from "../ui-spec/fallback";
|
|
4
5
|
import { isEnvFlagEnabled } from "../utils/env-flag";
|
|
5
6
|
import { getTaskUrl } from "./blocks";
|
|
6
7
|
import { wasEventSeen } from "./event-dedup";
|
|
@@ -44,7 +45,9 @@ async function getDetails(event: DetailsEvent, client: WebClient): Promise<Detai
|
|
|
44
45
|
if (task.slackChannelId !== event.channel) return { error: { status: "restricted" } };
|
|
45
46
|
|
|
46
47
|
const agent = task.agentId ? await getAgentById(task.agentId) : null;
|
|
47
|
-
const
|
|
48
|
+
const prose = slackTaskOutput(task) || task.failureReason || task.progress;
|
|
49
|
+
// The card text joins the prose before truncate(), so the 2800 cap still holds.
|
|
50
|
+
const result = prose ? await withUiSpecFallback(task.id, prose) : prose;
|
|
48
51
|
return {
|
|
49
52
|
metadata: {
|
|
50
53
|
entity_type: "slack#/entities/task",
|
package/src/tasks/errors.ts
CHANGED
|
@@ -7,3 +7,8 @@ export class TaskCreationBlockedError extends Error {
|
|
|
7
7
|
this.name = "TaskCreationBlockedError";
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
+
|
|
11
|
+
/** Routing requirements deny the requested task assignment. */
|
|
12
|
+
export class TaskRoutingAuthorizationError extends Error {
|
|
13
|
+
override name = "TaskRoutingAuthorizationError";
|
|
14
|
+
}
|
|
@@ -144,9 +144,7 @@ describe("ACPAdapter", () => {
|
|
|
144
144
|
cachedWriteTokens: 15,
|
|
145
145
|
},
|
|
146
146
|
},
|
|
147
|
-
])("persists $name ACP usage
|
|
148
|
-
usage,
|
|
149
|
-
}) => {
|
|
147
|
+
])("persists $name ACP usage while preserving missing cache measurements", async ({ usage }) => {
|
|
150
148
|
const cwd = makeTempDir();
|
|
151
149
|
const agentPath = join(cwd, "fake-acp-agent.ts");
|
|
152
150
|
await Bun.write(
|
|
@@ -404,7 +402,7 @@ ${serveFakeAcpAgent("FakeAgent")}
|
|
|
404
402
|
expect(persisted.map((entry) => entry.content)).toEqual(rawLogs);
|
|
405
403
|
expect(persisted.every((entry) => entry.cli === "acp")).toBe(true);
|
|
406
404
|
// Match saveCostData's JSON transport: undefined counters disappear on the wire.
|
|
407
|
-
//
|
|
405
|
+
// Input and output retain legacy zeros. Missing cache measurements stay null.
|
|
408
406
|
const agent = await createAgent({ name: "ACP cost test", isLead: false, status: "idle" });
|
|
409
407
|
const server = createServer(async (req, res) => {
|
|
410
408
|
const handled = await handleSessionData(
|
|
@@ -443,8 +441,8 @@ ${serveFakeAcpAgent("FakeAgent")}
|
|
|
443
441
|
expect(cost).toMatchObject({
|
|
444
442
|
inputTokens: usage?.inputTokens ?? 0,
|
|
445
443
|
outputTokens: usage?.outputTokens ?? 0,
|
|
446
|
-
cacheReadTokens: usage?.cachedReadTokens ??
|
|
447
|
-
cacheWriteTokens: usage?.cachedWriteTokens ??
|
|
444
|
+
cacheReadTokens: usage?.cachedReadTokens ?? null,
|
|
445
|
+
cacheWriteTokens: usage?.cachedWriteTokens ?? null,
|
|
448
446
|
costSource: "unpriced",
|
|
449
447
|
});
|
|
450
448
|
const readback = await fetch(`${endpoint}?taskId=${task.id}`);
|
|
@@ -18,7 +18,6 @@ import {
|
|
|
18
18
|
recordKeyUsage,
|
|
19
19
|
setApiKeyPlan,
|
|
20
20
|
} from "../be/db";
|
|
21
|
-
import type { CredentialSelection } from "../utils/credentials";
|
|
22
21
|
import {
|
|
23
22
|
ModelWindowExhaustedError,
|
|
24
23
|
resolveCredentialPools,
|
|
@@ -843,74 +842,3 @@ describe("API key tracking DB queries", () => {
|
|
|
843
842
|
});
|
|
844
843
|
});
|
|
845
844
|
});
|
|
846
|
-
|
|
847
|
-
// ─── Cross-keyType Failover Logic Tests ──────────────────────────────────────
|
|
848
|
-
|
|
849
|
-
describe("cross-keyType failover", () => {
|
|
850
|
-
test("prefers non-rate-limited credential when both keyTypes available", () => {
|
|
851
|
-
const rateLimited: CredentialSelection = {
|
|
852
|
-
selected: "sk-xxx",
|
|
853
|
-
index: 0,
|
|
854
|
-
total: 1,
|
|
855
|
-
keySuffix: "k-xxx",
|
|
856
|
-
keyType: "OPENAI_API_KEY",
|
|
857
|
-
isRateLimitFallback: true,
|
|
858
|
-
};
|
|
859
|
-
const healthy: CredentialSelection = {
|
|
860
|
-
selected: "oauth-yyy",
|
|
861
|
-
index: 0,
|
|
862
|
-
total: 2,
|
|
863
|
-
keySuffix: "h-yyy",
|
|
864
|
-
keyType: "CODEX_OAUTH",
|
|
865
|
-
isRateLimitFallback: false,
|
|
866
|
-
};
|
|
867
|
-
|
|
868
|
-
// Simulate the runner's primary selection logic
|
|
869
|
-
let primarySelection: CredentialSelection | undefined;
|
|
870
|
-
if (rateLimited && healthy) {
|
|
871
|
-
if (rateLimited.isRateLimitFallback && !healthy.isRateLimitFallback) {
|
|
872
|
-
primarySelection = healthy;
|
|
873
|
-
} else {
|
|
874
|
-
primarySelection = rateLimited;
|
|
875
|
-
}
|
|
876
|
-
} else {
|
|
877
|
-
primarySelection = rateLimited ?? healthy;
|
|
878
|
-
}
|
|
879
|
-
|
|
880
|
-
expect(primarySelection).toBe(healthy);
|
|
881
|
-
expect(primarySelection!.keyType).toBe("CODEX_OAUTH");
|
|
882
|
-
});
|
|
883
|
-
|
|
884
|
-
test("uses first credential when neither is rate-limited", () => {
|
|
885
|
-
const first: CredentialSelection = {
|
|
886
|
-
selected: "sk-aaa",
|
|
887
|
-
index: 0,
|
|
888
|
-
total: 1,
|
|
889
|
-
keySuffix: "k-aaa",
|
|
890
|
-
keyType: "OPENAI_API_KEY",
|
|
891
|
-
isRateLimitFallback: false,
|
|
892
|
-
};
|
|
893
|
-
const second: CredentialSelection = {
|
|
894
|
-
selected: "oauth-bbb",
|
|
895
|
-
index: 0,
|
|
896
|
-
total: 1,
|
|
897
|
-
keySuffix: "h-bbb",
|
|
898
|
-
keyType: "CODEX_OAUTH",
|
|
899
|
-
isRateLimitFallback: false,
|
|
900
|
-
};
|
|
901
|
-
|
|
902
|
-
let primarySelection: CredentialSelection | undefined;
|
|
903
|
-
if (first && second) {
|
|
904
|
-
if (first.isRateLimitFallback && !second.isRateLimitFallback) {
|
|
905
|
-
primarySelection = second;
|
|
906
|
-
} else {
|
|
907
|
-
primarySelection = first;
|
|
908
|
-
}
|
|
909
|
-
} else {
|
|
910
|
-
primarySelection = first ?? second;
|
|
911
|
-
}
|
|
912
|
-
|
|
913
|
-
expect(primarySelection).toBe(first);
|
|
914
|
-
expect(primarySelection!.keyType).toBe("OPENAI_API_KEY");
|
|
915
|
-
});
|
|
916
|
-
});
|
|
@@ -2,6 +2,7 @@ import { describe, expect, test } from "bun:test";
|
|
|
2
2
|
import {
|
|
3
3
|
computeModelLimits,
|
|
4
4
|
rateLimitWindowSchema,
|
|
5
|
+
sanitizeReportedQuotaObservations,
|
|
5
6
|
sanitizeReportedWindowResets,
|
|
6
7
|
} from "../http/api-keys";
|
|
7
8
|
import { MAX_RATE_LIMIT_RESET_MS } from "../utils/error-tracker";
|
|
@@ -145,7 +146,7 @@ describe("sanitizeReportedWindowResets", () => {
|
|
|
145
146
|
expect(resetsAt).toBeLessThanOrEqual(Math.floor((Date.now() + MAX_RATE_LIMIT_RESET_MS) / 1000));
|
|
146
147
|
});
|
|
147
148
|
|
|
148
|
-
test("clamps a
|
|
149
|
+
test("clamps a far-future model reset to the fixed routing ceiling", () => {
|
|
149
150
|
const farFutureSec = Math.floor(new Date("3000-01-01T00:00:00Z").getTime() / 1000);
|
|
150
151
|
const windows = {
|
|
151
152
|
seven_day_opus: {
|
|
@@ -204,3 +205,94 @@ describe("sanitizeReportedWindowResets", () => {
|
|
|
204
205
|
);
|
|
205
206
|
});
|
|
206
207
|
});
|
|
208
|
+
|
|
209
|
+
test("monthly provider display resets survive without changing the routing ceiling", () => {
|
|
210
|
+
const resetsAt = Math.floor(Date.now() / 1000) + 30 * 86400;
|
|
211
|
+
const windows = {
|
|
212
|
+
"codex:monthly:primary": {
|
|
213
|
+
status: "allowed",
|
|
214
|
+
durationMins: 43200,
|
|
215
|
+
resetsAt,
|
|
216
|
+
lastSeenAt: new Date().toISOString(),
|
|
217
|
+
},
|
|
218
|
+
};
|
|
219
|
+
expect(sanitizeReportedWindowResets(windows)).toEqual(windows);
|
|
220
|
+
expect(MAX_RATE_LIMIT_RESET_MS).toBe(7 * 86400000);
|
|
221
|
+
});
|
|
222
|
+
|
|
223
|
+
test.each([
|
|
224
|
+
"overage",
|
|
225
|
+
"codex:codex:primary",
|
|
226
|
+
])("unknown-duration monthly %s resets survive validation", (key) => {
|
|
227
|
+
const resetsAt = Math.floor(Date.now() / 1000) + 31 * 86400;
|
|
228
|
+
const window = { status: "allowed", resetsAt, lastSeenAt: new Date().toISOString() };
|
|
229
|
+
expect(sanitizeReportedWindowResets({ [key]: window })[key]?.resetsAt).toBe(resetsAt);
|
|
230
|
+
expect(
|
|
231
|
+
sanitizeReportedWindowResets({ [key]: { ...window, resetsAt: 1e20 } })[key]!.resetsAt!,
|
|
232
|
+
).toBeLessThanOrEqual(Math.floor(Date.now() / 1000) + 400 * 86400);
|
|
233
|
+
expect(MAX_RATE_LIMIT_RESET_MS).toBe(7 * 86400000);
|
|
234
|
+
});
|
|
235
|
+
|
|
236
|
+
test("future observation times are bounded for window facts, account facts, and removals", () => {
|
|
237
|
+
const future = "3000-01-01T00:00:00.000Z";
|
|
238
|
+
const past = "2026-11-01T01:00:00.000Z";
|
|
239
|
+
const now = "2026-11-08T01:00:00.000Z";
|
|
240
|
+
const report = sanitizeReportedQuotaObservations(
|
|
241
|
+
{
|
|
242
|
+
windows: {
|
|
243
|
+
"codex:codex:primary": {
|
|
244
|
+
status: "allowed",
|
|
245
|
+
lastSeenAt: future,
|
|
246
|
+
fieldObservedAt: { resetsAt: future, durationMins: past },
|
|
247
|
+
},
|
|
248
|
+
},
|
|
249
|
+
account: {
|
|
250
|
+
source: "codex",
|
|
251
|
+
observedAt: future,
|
|
252
|
+
ordinaryUsageAllowed: false,
|
|
253
|
+
fieldObservedAt: { ordinaryUsageAllowed: future },
|
|
254
|
+
limits: {
|
|
255
|
+
codex: {
|
|
256
|
+
observedAt: future,
|
|
257
|
+
planRaw: "pro",
|
|
258
|
+
fieldObservedAt: { planRaw: future, credits: past },
|
|
259
|
+
windowRemovedAt: { secondary: future },
|
|
260
|
+
},
|
|
261
|
+
},
|
|
262
|
+
},
|
|
263
|
+
replace: [{ source: "codex", limitId: "codex", observedAt: future, slots: ["secondary"] }],
|
|
264
|
+
},
|
|
265
|
+
Date.parse(now),
|
|
266
|
+
);
|
|
267
|
+
expect(report.windows["codex:codex:primary"]).toMatchObject({
|
|
268
|
+
lastSeenAt: now,
|
|
269
|
+
fieldObservedAt: { resetsAt: now, durationMins: past },
|
|
270
|
+
});
|
|
271
|
+
expect(report.account).toMatchObject({
|
|
272
|
+
observedAt: now,
|
|
273
|
+
fieldObservedAt: { ordinaryUsageAllowed: now },
|
|
274
|
+
limits: {
|
|
275
|
+
codex: {
|
|
276
|
+
observedAt: now,
|
|
277
|
+
fieldObservedAt: { planRaw: now, credits: past },
|
|
278
|
+
windowRemovedAt: { secondary: now },
|
|
279
|
+
},
|
|
280
|
+
},
|
|
281
|
+
});
|
|
282
|
+
expect(report.replace?.[0]?.observedAt).toBe(now);
|
|
283
|
+
});
|
|
284
|
+
|
|
285
|
+
test("a valid expired reset remains expired after a sparse recovery", () => {
|
|
286
|
+
const expired = Math.floor(Date.now() / 1000) - 7 * 86400;
|
|
287
|
+
const window = {
|
|
288
|
+
status: "allowed",
|
|
289
|
+
utilization: 0.1,
|
|
290
|
+
resetsAt: expired,
|
|
291
|
+
durationMins: 10080,
|
|
292
|
+
lastSeenAt: new Date().toISOString(),
|
|
293
|
+
};
|
|
294
|
+
expect(
|
|
295
|
+
sanitizeReportedWindowResets({ "codex:codex:primary": window })["codex:codex:primary"]
|
|
296
|
+
?.resetsAt,
|
|
297
|
+
).toBe(expired);
|
|
298
|
+
});
|
|
@@ -10,6 +10,8 @@ import {
|
|
|
10
10
|
} from "../be/db";
|
|
11
11
|
import { handleApiKeys } from "../http/api-keys";
|
|
12
12
|
import { getPathSegments, parseQueryParams } from "../http/utils";
|
|
13
|
+
import { MAX_RATE_LIMIT_RESET_MS } from "../utils/error-tracker";
|
|
14
|
+
import { activeModelBlock } from "../utils/model-rate-limit-windows";
|
|
13
15
|
|
|
14
16
|
const TEST_DB = "./test-api-keys-validation.sqlite";
|
|
15
17
|
const keyType = "ANTHROPIC_API_KEY";
|
|
@@ -167,4 +169,44 @@ describe("pooled key validation", () => {
|
|
|
167
169
|
).toBe(400);
|
|
168
170
|
expect(await getKeyStatuses(keyType)).toEqual([]);
|
|
169
171
|
});
|
|
172
|
+
|
|
173
|
+
test.each([
|
|
174
|
+
{ model: "opus", window: "seven_day_opus" },
|
|
175
|
+
{ model: "sonnet", window: "seven_day_sonnet" },
|
|
176
|
+
{ model: "fable", window: "seven_day_overage_included" },
|
|
177
|
+
] as const)("reported $model blocks cannot exceed the routing ceiling", async ({
|
|
178
|
+
model,
|
|
179
|
+
window,
|
|
180
|
+
}) => {
|
|
181
|
+
const nowMs = Date.now();
|
|
182
|
+
const claudeKeyType = "CLAUDE_CODE_OAUTH_TOKEN";
|
|
183
|
+
const response = await call("POST", "/api/keys/report-rate-limit-windows", {
|
|
184
|
+
keyType: claudeKeyType,
|
|
185
|
+
keySuffix: "longblock",
|
|
186
|
+
keyIndex: 0,
|
|
187
|
+
windows: {
|
|
188
|
+
[window]: {
|
|
189
|
+
status: "rejected",
|
|
190
|
+
durationMins: 576000,
|
|
191
|
+
resetsAt: Math.floor(nowMs / 1000) + 400 * 86400,
|
|
192
|
+
lastSeenAt: new Date(nowMs).toISOString(),
|
|
193
|
+
},
|
|
194
|
+
},
|
|
195
|
+
});
|
|
196
|
+
expect(response.statusCode).toBe(200);
|
|
197
|
+
const [stored] = await getKeyStatuses(claudeKeyType);
|
|
198
|
+
const reset = stored!.rateLimitWindows[window]!.resetsAt!;
|
|
199
|
+
expect(reset).toBeGreaterThanOrEqual(Math.floor((nowMs + MAX_RATE_LIMIT_RESET_MS) / 1000));
|
|
200
|
+
expect(reset).toBeLessThanOrEqual(Math.floor((Date.now() + MAX_RATE_LIMIT_RESET_MS) / 1000));
|
|
201
|
+
expect(
|
|
202
|
+
(await getAvailableKeyIndices(claudeKeyType, 1, "global", null, model)).modelBlockedIndices,
|
|
203
|
+
).toEqual([0]);
|
|
204
|
+
expect(
|
|
205
|
+
activeModelBlock(
|
|
206
|
+
stored!.rateLimitWindows,
|
|
207
|
+
model,
|
|
208
|
+
Date.now() + MAX_RATE_LIMIT_RESET_MS + 1000,
|
|
209
|
+
),
|
|
210
|
+
).toBeUndefined();
|
|
211
|
+
});
|
|
170
212
|
});
|
|
@@ -44,7 +44,13 @@ const conversationsOpen = mock(async ({ users }: { users: string }) => ({
|
|
|
44
44
|
}));
|
|
45
45
|
mock.module("../slack/app", () => ({
|
|
46
46
|
getSlackApp: () => ({
|
|
47
|
-
client: {
|
|
47
|
+
client: {
|
|
48
|
+
chat: { update, postMessage },
|
|
49
|
+
conversations: {
|
|
50
|
+
open: conversationsOpen,
|
|
51
|
+
info: async () => ({ ok: true, channel: { is_ext_shared: false } }),
|
|
52
|
+
},
|
|
53
|
+
},
|
|
48
54
|
}),
|
|
49
55
|
}));
|
|
50
56
|
|