@desplega.ai/agent-swarm 2.9.0 → 2.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp-adapter-g909b5hw.js +16 -0
- package/dist/{acp-targets-swxq55dr.js → acp-targets-ny75x1qy.js} +7 -7
- package/dist/{actions-pb678g3e.js → actions-b9qgrmeq.js} +81 -21
- package/dist/{agent-fs-provision-dmhnc38q.js → agent-fs-provision-b5dhdsbd.js} +4 -4
- package/dist/{amp-adapter-3pa66q27.js → amp-adapter-vtax2c9s.js} +2 -2
- package/dist/{anthropic-messages-x2cp5fvf.js → anthropic-messages-r5xf5hqw.js} +10 -10
- package/dist/{app-17d12ev4.js → app-g2z15hax.js} +6 -3
- package/dist/{approval-notifications-h7vd9pmg.js → approval-notifications-yt13wp8r.js} +8 -5
- package/dist/{assistant-t7k39ree.js → assistant-2cgfxsgk.js} +23 -21
- package/dist/{boot-args-schema-0gqmkfbe.js → boot-args-schema-3gwy0f60.js} +1 -1
- package/dist/{boot-reembed-n6anc01d.js → boot-reembed-92g7s5zp.js} +1 -1
- package/dist/{boot-reembed-f064w382.js → boot-reembed-mywmyp4s.js} +1 -1
- package/dist/{boot-scrub-sweep-ejd5dnrz.js → boot-scrub-sweep-7dkdzqxx.js} +3 -3
- package/dist/{boot-seeds-f99fjs5q.js → boot-seeds-ce7rvgq1.js} +4 -4
- package/dist/{claude-adapter-gvznwxgc.js → claude-adapter-3m4q7735.js} +7 -7
- package/dist/{claude-managed-adapter-pbrbvc64.js → claude-managed-adapter-t8nfgcgz.js} +2 -2
- package/dist/{claude-managed-setup-kdxttvc3.js → claude-managed-setup-c217draw.js} +3 -3
- package/dist/{claude-sdk-session-0t2teq6n.js → claude-sdk-session-7fbqm51z.js} +7 -7
- package/dist/{cli-9a2rtd77.js → cli-1jykg0py.js} +6 -4
- package/dist/{cli-5ntc4we6.js → cli-2czxfnvj.js} +235 -2003
- package/dist/{cli-dd37e0cm.js → cli-2dq9yv8p.js} +1 -1
- package/dist/{cli-c07v0qfa.js → cli-2xs8tsf7.js} +69 -66
- package/dist/{cli-7fx9jyfs.js → cli-2yjj3e31.js} +64 -10
- package/dist/{cli-4ghh072d.js → cli-32djehja.js} +36 -36
- package/dist/{cli-cw7mc1je.js → cli-3j873zxq.js} +3 -3
- package/dist/cli-43ms35q9.js +270 -0
- package/dist/cli-47hz21se.js +25584 -0
- package/dist/{cli-n515ex5z.js → cli-4ymxrwg5.js} +16 -16
- package/dist/{cli-5gygrr67.js → cli-67mwzr35.js} +1 -1
- package/dist/{cli-5kcmxwxv.js → cli-6945ywhr.js} +1 -1
- package/dist/{cli-812paz57.js → cli-6ehs4mta.js} +18 -2
- package/dist/{cli-95930z69.js → cli-6ym4jhzp.js} +2 -2
- package/dist/{cli-zg3z63x3.js → cli-7mv4h3sn.js} +1 -1
- package/dist/{cli-eg437b5p.js → cli-7sf9sb0w.js} +2 -1
- package/dist/{cli-nr46j5pw.js → cli-8zh9nrew.js} +1 -1
- package/dist/{cli-wr1h0k28.js → cli-9w8712tq.js} +617 -278
- package/dist/{cli-ssvdrk4y.js → cli-b6px1k1q.js} +1 -1
- package/dist/{cli-7831nhaw.js → cli-b91nz213.js} +3 -3
- package/dist/{cli-7cgf614g.js → cli-bg63qmsx.js} +2 -2
- package/dist/{cli-me4maa4j.js → cli-bkjdknnp.js} +9 -5
- package/dist/{cli-rts1qvb4.js → cli-bnqncekd.js} +2 -2
- package/dist/{cli-25nstr34.js → cli-br0924pw.js} +1 -1
- package/dist/{cli-ymct0ycy.js → cli-ctx0b85j.js} +5222 -4978
- package/dist/{cli-kqh27v2y.js → cli-dgs10ttj.js} +1 -1
- package/dist/{cli-kmvcm34h.js → cli-f3jyzq4g.js} +2 -2
- package/dist/cli-f8x9drqr.js +84 -0
- package/dist/{cli-8axx8vnw.js → cli-f9gz2vyj.js} +5 -5
- package/dist/{cli-vvgaz8t6.js → cli-fh97xn30.js} +2 -2
- package/dist/{cli-8x8y70av.js → cli-fkef327x.js} +2 -2
- package/dist/{cli-js8zrfyg.js → cli-gfy38pvt.js} +2 -2
- package/dist/{cli-kaa4bd7x.js → cli-h9yqfzx9.js} +7 -6
- package/dist/{cli-svc803vq.js → cli-j7svy295.js} +11 -11
- package/dist/{cli-nhq5js1b.js → cli-jaw5v1sy.js} +3 -3
- package/dist/{cli-w7dxb2fj.js → cli-jkw6ptfw.js} +6 -6
- package/dist/{cli-1tvdx9t5.js → cli-jm0hvmz2.js} +1 -1
- package/dist/{cli-e9973bf0.js → cli-jwampxxq.js} +2 -2
- package/dist/{cli-dx439zpg.js → cli-kpgcm7xy.js} +13 -1
- package/dist/{cli-pz1c00aa.js → cli-kxx4k2jw.js} +2 -2
- package/dist/{cli-aa8s22gn.js → cli-m7c2380k.js} +191 -182
- package/dist/{cli-2kg31ted.js → cli-m7zvgt57.js} +11 -11
- package/dist/{cli-57pvhnyt.js → cli-mhapr559.js} +1 -1
- package/dist/{cli-gddgcnav.js → cli-mjw0yf82.js} +1 -1
- package/dist/{cli-h474mvp5.js → cli-mkwkwq81.js} +7 -4
- package/dist/{cli-jd3kxppb.js → cli-mw620q3n.js} +1 -1
- package/dist/{cli-spzkdgtg.js → cli-n3qe7tyr.js} +172 -168
- package/dist/{cli-3zxdz9r7.js → cli-nafvvsp8.js} +3 -3
- package/dist/{cli-fnh4b12r.js → cli-nbt14he0.js} +6 -6
- package/dist/{cli-7akn6ze9.js → cli-nh7x3133.js} +7 -28
- package/dist/{cli-faf46gdq.js → cli-p4kckx1z.js} +10 -10
- package/dist/{cli-k7pt28ad.js → cli-pb2ay3sh.js} +2 -2
- package/dist/{cli-pn1v1pb0.js → cli-psffsanb.js} +3 -2
- package/dist/{cli-2tnbc3gw.js → cli-pyjn0qhk.js} +2257 -61
- package/dist/{cli-fgphc007.js → cli-rq5rpv6k.js} +1 -1
- package/dist/{cli-vw5x18yj.js → cli-sn650d7x.js} +9 -9
- package/dist/{cli-mc1fx4xd.js → cli-td9tb872.js} +10 -10
- package/dist/{cli-6dp0jkfj.js → cli-tvc4jag9.js} +3 -3
- package/dist/{cli-a9hfzg2r.js → cli-ty3gha1p.js} +6 -6
- package/dist/{cli-pwsax0vp.js → cli-v57d7fmm.js} +1 -1
- package/dist/{cli-nmcpzbty.js → cli-vt89089n.js} +4 -4
- package/dist/{cli-sn4pc4qx.js → cli-vyff45ve.js} +2 -2
- package/dist/{cli-m1fbz2wj.js → cli-w4n323t3.js} +175 -16
- package/dist/{cli-g3zzby8t.js → cli-wn13hhdt.js} +5 -5
- package/dist/{cli-q8cfh1t9.js → cli-xag7btpe.js} +1 -1
- package/dist/{cli-c5cspahx.js → cli-y2ewxhth.js} +38 -13
- package/dist/{cli-k09cxm6m.js → cli-ysvspf5e.js} +2 -2
- package/dist/{cli-eepnpee7.js → cli-zh0e5x7p.js} +4 -4
- package/dist/{cli-bk9v1xrv.js → cli-zr6qy15y.js} +11 -11
- package/dist/cli.js +21 -20
- package/dist/{codex-adapter-44yq2fkn.js → codex-adapter-n656pvb8.js} +6 -6
- package/dist/{codex-hook-h1zb7cfk.js → codex-hook-59atdwd8.js} +1 -1
- package/dist/{codex-login-cdyrr5y1.js → codex-login-a239g1ah.js} +1 -1
- package/dist/{codex-session-runner-zbh26gbw.js → codex-session-runner-p0fbv5y9.js} +6 -6
- package/dist/{commands-54f02v5b.js → commands-gwea8z5p.js} +3 -3
- package/dist/{controller-9gpwcdek.js → controller-t67c3grh.js} +6 -3
- package/dist/{controllers-connect-61re6k1n.js → controllers-connect-ks155r0h.js} +22 -20
- package/dist/{cursor-adapter-7e4g81vd.js → cursor-adapter-ygwrtmkv.js} +1 -1
- package/dist/{db-dg2gc7fd.js → db-kpmx06s9.js} +8 -2
- package/dist/{db-wnh0qjy1.js → db-rb2xqdb1.js} +3 -3
- package/dist/{dispatcher-jrm24r43.js → dispatcher-31sm0ej2.js} +20 -18
- package/dist/{docker-9aq30pp2.js → docker-09tkkg0n.js} +42 -3
- package/dist/{dsh-adapter-1yqk267c.js → dsh-adapter-qyxh0w31.js} +1 -1
- package/dist/{easter-egg-3d-r4h9cs9m.js → easter-egg-3d-00wjscn6.js} +1 -1
- package/dist/{embedding-space-bafjr5f7.js → embedding-space-qhw4g68n.js} +6 -6
- package/dist/{embeddings-7xmgqe0e.js → embeddings-zdv9ke6x.js} +1 -1
- package/dist/{execute-d6jg5ns0.js → execute-zna8wwr7.js} +1 -1
- package/dist/{external-channel-frq1xvq2.js → external-channel-1ac6t56s.js} +2 -2
- package/dist/fx-adapter-sk7n0fzc.js +19 -0
- package/dist/{google-generative-ai-hh7strj3.js → google-generative-ai-maq6c9bf.js} +1 -1
- package/dist/{google-vertex-fy5bw2pm.js → google-vertex-2jgsw2nb.js} +1 -1
- package/dist/grok-adapter-sjbcm5ew.js +19 -0
- package/dist/handlers-yzy0c87x.js +35 -0
- package/dist/{heartbeat-6bpa611t.js → heartbeat-2f6z4kdx.js} +23 -21
- package/dist/{hook-w12k146y.js → hook-8y0gvtp1.js} +6 -6
- package/dist/{hook-hvm5nf46.js → hook-w1skzaqc.js} +5 -5
- package/dist/{http-43tthdvs.js → http-wghxvpef.js} +714 -145
- package/dist/{index-1f0vypbg.js → index-0h6qd4p1.js} +34 -24
- package/dist/index-25pvya7q.js +40 -0
- package/dist/index-2t4859r5.js +35 -0
- package/dist/{index-4b1q8kan.js → index-4k7m5dgj.js} +629 -354
- package/dist/index-620y7jzq.js +15 -0
- package/dist/{index-cret47a5.js → index-8p0j4h4j.js} +506 -43
- package/dist/{index-mhq4sh5w.js → index-8zn8nxn5.js} +1 -1
- package/dist/{index-m5gx1xd6.js → index-9myfj74s.js} +40 -40
- package/dist/{index-ftywhyr0.js → index-9zkchs9t.js} +221 -65
- package/dist/{index-bs7gw5fd.js → index-b5wgnm78.js} +44 -44
- package/dist/index-cxca2t8y.js +36 -0
- package/dist/{index-585gyczt.js → index-pe3d8jfy.js} +3 -3
- package/dist/{index-tx9mc2ap.js → index-rv89fvzf.js} +24 -22
- package/dist/{index-fn054vsf.js → index-s71ez27v.js} +1 -1
- package/dist/{keepalive-rk0j0jvh.js → keepalive-sh02349h.js} +3 -3
- package/dist/lead-gk4h5eg7.js +74 -0
- package/dist/{maintenance-g6z6kaxw.js → maintenance-yj0dcjja.js} +1 -1
- package/dist/{node-jftbyawr.js → node-dqm4xgxw.js} +1 -1
- package/dist/{oauth-refresh-sweep-2k3g2q4w.js → oauth-refresh-sweep-d9xedk66.js} +2 -2
- package/dist/{onboard-6fdbvh3v.js → onboard-dpgjn03r.js} +2 -2
- package/dist/{opencode-adapter-fdbsvts7.js → opencode-adapter-2d31cpjc.js} +6 -6
- package/dist/{otel-impl-rvwtc09q.js → otel-impl-1skarpfq.js} +1 -1
- package/dist/{pending-sqkrb836.js → pending-bfmxtx0g.js} +21 -19
- package/dist/{pi-mono-adapter-asqayqcg.js → pi-mono-adapter-gvppnasy.js} +40 -13
- package/dist/{pricing-refresh-f5tkgmw2.js → pricing-refresh-c6b325mk.js} +2 -2
- package/dist/{rbac-roles-06s555fa.js → rbac-roles-h80qbdbs.js} +3 -3
- package/dist/{rbac-roles-szxsg8t1.js → rbac-roles-zfcx68tx.js} +2 -2
- package/dist/{render-v2-103p266q.js → render-v2-nx20t3rb.js} +6 -3
- package/dist/{resume-v7kjewt9.js → resume-5ep8agan.js} +10 -7
- package/dist/{runtime-f1gmk0b7.js → runtime-r3pj4mce.js} +1 -1
- package/dist/{session-access-6shev8ts.js → session-access-n7p3m15b.js} +4 -4
- package/dist/{session-source-backfill-bd7spzjd.js → session-source-backfill-v8mt0zwn.js} +3 -3
- package/dist/{setup-kmxmztdb.js → setup-z1psaqhe.js} +1 -1
- package/dist/thread-buffer-a1re2r9r.js +38 -0
- package/dist/{virtual-modules-57eje5wy.js → virtual-modules-rrbjdpxn.js} +3 -3
- package/dist/{work-objects-zr47ygmf.js → work-objects-4aghh73z.js} +29 -23
- package/dist/worker-3dyyb8ev.js +74 -0
- package/dist/{worker-follow-up-grrr3fda.js → worker-follow-up-166zmex1.js} +20 -18
- package/openapi.json +1387 -13
- package/package.json +7 -6
- package/src/apps/catalog.generated.json +43 -3
- package/src/apps/page-validator.ts +27 -0
- package/src/be/db/model-profiles.ts +4 -1
- package/src/be/db/session-costs.ts +219 -0
- package/src/be/db/session-log-reasoning.ts +36 -0
- package/src/be/db/tasks/read.ts +7 -3
- package/src/be/db/tasks/write.ts +33 -1
- package/src/be/db.ts +200 -304
- package/src/be/key-window-usage.ts +385 -0
- package/src/be/migrations/303_task_ui_specs.sql +28 -0
- package/src/be/migrations/306_provider_account_telemetry.sql +1 -0
- package/src/be/migrations/307_session_cost_credential_attribution.sql +23 -0
- package/src/be/migrations/310_session_logs_reasoning.sql +12 -0
- package/src/be/runtime-pools/db.ts +3 -0
- package/src/be/seed-scripts/catalog/boot-triage.inline.ts +1 -0
- package/src/be/seed-scripts/catalog/boot-triage.ts +1 -0
- package/src/be/seed-scripts/catalog/wait-for-task.ts +5 -1
- package/src/be/seed-skills/index.ts +3 -0
- package/src/be/swarm-config-guard.ts +24 -1
- package/src/be/task-ui-spec.ts +158 -0
- package/src/commands/controller.ts +3 -0
- package/src/commands/credential-outcome-report.ts +13 -3
- package/src/commands/rate-limit-outcome.ts +6 -0
- package/src/commands/runner.ts +34 -53
- package/src/extensions/catalog.generated.json +3 -3
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/http/api-keys.ts +258 -30
- package/src/http/session-data.ts +74 -23
- package/src/http/sessions.ts +6 -2
- package/src/http/tasks.ts +105 -5
- package/src/integrations/chat-sdk/relay.ts +87 -0
- package/src/jira/outbound.ts +5 -3
- package/src/linear/outbound.ts +5 -1
- package/src/prompts/base-prompt.ts +8 -0
- package/src/prompts/session-templates.ts +19 -2
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +27 -4
- package/src/providers/claude-flag-settings.ts +39 -1
- package/src/providers/codex-adapter.ts +85 -3
- package/src/providers/codex-app-server.ts +9 -5
- package/src/providers/codex-oauth/auth-json.ts +1 -0
- package/src/providers/pi-mono-adapter.ts +35 -2
- package/src/providers/pricing-sources.md +32 -0
- package/src/providers/types.ts +11 -0
- package/src/runtime-providers/docker.ts +65 -1
- package/src/scheduler/deferred-task-waits.ts +18 -5
- package/src/scripts-runtime/types/swarm-extension.d.ts +8 -8
- package/src/slack/actions.ts +56 -0
- package/src/slack/app.ts +22 -15
- package/src/slack/inbound-files.ts +2 -0
- package/src/slack/render-v2.ts +107 -23
- package/src/slack/responses.ts +3 -2
- package/src/slack/work-objects.ts +4 -1
- package/src/tasks/errors.ts +5 -0
- package/src/tests/acp-adapter.test.ts +4 -6
- package/src/tests/api-key-tracking.test.ts +0 -72
- package/src/tests/api-keys-status-model-limits.test.ts +93 -1
- package/src/tests/api-keys-validation.test.ts +42 -0
- package/src/tests/approval-card-resolution.test.ts +7 -1
- package/src/tests/approval-requests-notifications.test.ts +11 -1
- package/src/tests/apps-catalog-page-frame.test.ts +49 -0
- package/src/tests/apps-session-thread.test.ts +79 -0
- package/src/tests/base-prompt.test.ts +111 -5
- package/src/tests/chat-sdk-relay.test.ts +149 -1
- package/src/tests/claude-adapter-binary.test.ts +67 -6
- package/src/tests/claude-flag-settings.test.ts +29 -0
- package/src/tests/claude-sdk-lifecycle.test.ts +5 -0
- package/src/tests/codex-adapter.test.ts +340 -2
- package/src/tests/codex-app-server.test.ts +16 -0
- package/src/tests/codex-oauth.test.ts +3 -1
- package/src/tests/codex-rate-limits.test.ts +384 -0
- package/src/tests/credential-outcome-report.test.ts +20 -0
- package/src/tests/db-task-read-contract.test.ts +3 -0
- package/src/tests/db-task-write-contract.test.ts +4 -0
- package/src/tests/deferred-task-wake.test.ts +63 -1
- package/src/tests/docker-isolation-config-guard.test.ts +29 -0
- package/src/tests/docs-index-footprint.test.js +11 -3
- package/src/tests/e2e-visuals-comment.test.ts +82 -0
- package/src/tests/e2e-visuals-verify-pr.test.ts +138 -0
- package/src/tests/extensions-example-sql-admin-only.test.ts +7 -4
- package/src/tests/fixtures/ui-spec-slack/deploys.json +121 -0
- package/src/tests/fixtures/ui-spec-slack/incident.json +183 -0
- package/src/tests/fixtures/ui-spec-slack/three-charts-stale.json +196 -0
- package/src/tests/fixtures/ui-spec-slack/video-rejected-by-slack.json +183 -0
- package/src/tests/fixtures/ui-spec-slack/video.json +446 -0
- package/src/tests/gitleaks-download-retry.test.ts +85 -0
- package/src/tests/human-thread-routing.test.ts +187 -0
- package/src/tests/jira-outbound-sync.test.ts +33 -1
- package/src/tests/key-window-usage.test.ts +831 -0
- package/src/tests/linear-outbound-sync.test.ts +30 -1
- package/src/tests/pi-mono-adapter.test.ts +79 -0
- package/src/tests/preload-env.test.ts +2 -0
- package/src/tests/preload.ts +3 -1
- package/src/tests/prompt-template-session.test.ts +4 -3
- package/src/tests/provider-quota-persistence.test.ts +362 -0
- package/src/tests/rate-limit-event.test.ts +22 -0
- package/src/tests/reasoning-events.test.ts +164 -0
- package/src/tests/routing-affinity-inventory.test.ts +22 -0
- package/src/tests/runtime-providers-docker.test.ts +91 -0
- package/src/tests/script-connections.test.ts +5 -0
- package/src/tests/secret-canary-sweep.test.ts +41 -5
- package/src/tests/seed-scripts.test.ts +23 -0
- package/src/tests/session-cost-attribution.test.ts +748 -0
- package/src/tests/session-costs.test.ts +14 -15
- package/src/tests/session-logs.test.ts +83 -0
- package/src/tests/sessions-detail-batch.test.ts +7 -0
- package/src/tests/slack-render-v2.test.ts +357 -0
- package/src/tests/slack-start-reload-race.test.ts +67 -0
- package/src/tests/subscription-plans.test.ts +20 -1
- package/src/tests/task-ui-action-route.test.ts +191 -0
- package/src/tests/task-ui-actions.test.ts +195 -0
- package/src/tests/task-ui-spec-fallback.test.ts +65 -0
- package/src/tests/task-ui-spec.test.ts +368 -0
- package/src/tests/workflow-agent-task-retry.test.ts +34 -1
- package/src/tools/defer-task.ts +1 -1
- package/src/tools/store-progress.ts +69 -3
- package/src/types.ts +7 -2
- package/src/ui-spec/actions.ts +86 -0
- package/src/ui-spec/fallback.ts +19 -0
- package/src/ui-spec/slack.ts +17 -0
- package/src/ui-spec/validate.ts +169 -0
- package/src/utils/codex-rate-limits.ts +159 -0
- package/src/utils/credentials.ts +2 -0
- package/src/utils/error-tracker.ts +19 -0
- package/src/utils/provider-account-telemetry.ts +331 -0
- package/src/utils/reasoning-events.ts +107 -0
- package/src/utils/subscription-plans.ts +11 -59
- package/src/utils/task-ui-spec.ts +67 -0
- package/src/workflows/task-step-routing.ts +8 -3
- package/templates/extensions/sql-admin-only/README.md +2 -1
- package/templates/extensions/sql-admin-only/hooks.ts +7 -3
- package/templates/extensions/sql-admin-only/manifest.json +1 -1
- package/templates/skills/apps/SKILL.md +32 -5
- package/templates/skills/apps/content.md +32 -5
- package/templates/skills/ui-spec/config.json +14 -0
- package/templates/skills/ui-spec/content.md +127 -0
- package/dist/acp-adapter-jqn86aam.js +0 -16
- package/dist/cli-srtkr1h2.js +0 -12078
- package/dist/fx-adapter-0zrkfbkd.js +0 -19
- package/dist/grok-adapter-3db1c538.js +0 -19
- package/dist/handlers-k22n8mnn.js +0 -33
- package/dist/index-8xcyd3mc.js +0 -33
- package/dist/index-9sy2bh6n.js +0 -38
- package/dist/index-b24j7t2m.js +0 -12797
- package/dist/index-wjd56k1v.js +0 -34
- package/dist/lead-atxf3q6e.js +0 -72
- package/dist/thread-buffer-4yz236d0.js +0 -36
- package/dist/worker-p4hbtcy3.js +0 -72
- package/dist/{cli-j49yqpvh.js → cli-7evph51z.js} +3 -3
|
@@ -0,0 +1,368 @@
|
|
|
1
|
+
import { afterAll, beforeAll, describe, expect, spyOn, test } from "bun:test";
|
|
2
|
+
import { rm } from "node:fs/promises";
|
|
3
|
+
import { standardComponentDefinitions } from "@json-render/chat";
|
|
4
|
+
import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
5
|
+
import {
|
|
6
|
+
closeDb,
|
|
7
|
+
createAgent,
|
|
8
|
+
createTaskExtended,
|
|
9
|
+
getDbClient,
|
|
10
|
+
getTaskById,
|
|
11
|
+
initDb,
|
|
12
|
+
startTask,
|
|
13
|
+
} from "../be/db";
|
|
14
|
+
import {
|
|
15
|
+
getTaskUiSpec,
|
|
16
|
+
getTaskUiSpecsForTasks,
|
|
17
|
+
reserveTaskUiActionRun,
|
|
18
|
+
setTaskUiActionResult,
|
|
19
|
+
upsertTaskUiSpec,
|
|
20
|
+
} from "../be/task-ui-spec";
|
|
21
|
+
import { registerStoreProgressTool } from "../tools/store-progress";
|
|
22
|
+
import { taskUiSpecSlackBlocks } from "../ui-spec/slack";
|
|
23
|
+
import { validateTaskUiSpec } from "../ui-spec/validate";
|
|
24
|
+
import {
|
|
25
|
+
type TaskUiSpecInput,
|
|
26
|
+
UI_SPEC_ACTION_PREFIX,
|
|
27
|
+
UI_SPEC_COMPONENTS,
|
|
28
|
+
UI_SPEC_MAX_BLOCKS,
|
|
29
|
+
} from "../utils/task-ui-spec";
|
|
30
|
+
|
|
31
|
+
const TASK_ID = "11111111-2222-4333-8444-555555555555";
|
|
32
|
+
|
|
33
|
+
// The example from the plan's uiSpec contract (shared with the E2E scenario and the skill).
|
|
34
|
+
const example = (): TaskUiSpecInput => ({
|
|
35
|
+
spec: {
|
|
36
|
+
root: "c",
|
|
37
|
+
elements: {
|
|
38
|
+
c: { type: "Card", props: { title: "Weekly deploys" }, children: ["f", "t", "a"] },
|
|
39
|
+
f: { type: "Fields", props: {}, children: ["k"] },
|
|
40
|
+
k: { type: "Field", props: { label: "Deploys", value: "1,284" }, children: [] },
|
|
41
|
+
t: {
|
|
42
|
+
type: "Table",
|
|
43
|
+
props: {
|
|
44
|
+
headers: ["Service", "Deploys"],
|
|
45
|
+
rows: [
|
|
46
|
+
["api", 812],
|
|
47
|
+
["ui", 472],
|
|
48
|
+
],
|
|
49
|
+
},
|
|
50
|
+
children: [],
|
|
51
|
+
},
|
|
52
|
+
a: { type: "Actions", props: {}, children: ["l"] },
|
|
53
|
+
l: {
|
|
54
|
+
type: "LinkButton",
|
|
55
|
+
props: { label: "Open dashboard", url: "https://example.com/deploys" },
|
|
56
|
+
children: [],
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
const off = { taskId: TASK_ID, actionsEnabled: false };
|
|
63
|
+
const on = { taskId: TASK_ID, actionsEnabled: true };
|
|
64
|
+
|
|
65
|
+
function withButton(input: TaskUiSpecInput, id: string): TaskUiSpecInput {
|
|
66
|
+
const a = input.spec.elements.a as { children: string[] };
|
|
67
|
+
a.children.push("b");
|
|
68
|
+
input.spec.elements.b = { type: "Button", props: { id, label: "Rerun" }, children: [] };
|
|
69
|
+
return input;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
function issuesOf(result: ReturnType<typeof validateTaskUiSpec>): string[] {
|
|
73
|
+
if (result.ok) throw new Error("expected ok: false");
|
|
74
|
+
return result.issues;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
describe("validateTaskUiSpec", () => {
|
|
78
|
+
test("the contract example converts to Slack blocks and fallback text", () => {
|
|
79
|
+
const result = validateTaskUiSpec(example(), off);
|
|
80
|
+
expect(result.ok).toBe(true);
|
|
81
|
+
if (!result.ok) return;
|
|
82
|
+
expect(result.blocks.length).toBeGreaterThanOrEqual(1);
|
|
83
|
+
expect(result.blocks.length).toBeLessThanOrEqual(UI_SPEC_MAX_BLOCKS);
|
|
84
|
+
expect(result.fallbackText).toContain("Weekly deploys");
|
|
85
|
+
expect(result.spec).toEqual(example().spec);
|
|
86
|
+
});
|
|
87
|
+
|
|
88
|
+
test("a LinkButton with a javascript: URL is refused", () => {
|
|
89
|
+
const input = example();
|
|
90
|
+
(input.spec.elements.l as { props: { url: string } }).props.url = "javascript:alert(1)";
|
|
91
|
+
expect(issuesOf(validateTaskUiSpec(input, off))).toContain("l.url must be an https: URL.");
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
test("an Image and a Card imageUrl need https: too", () => {
|
|
95
|
+
const input = example();
|
|
96
|
+
(input.spec.elements.c as { props: Record<string, unknown> }).props.imageUrl =
|
|
97
|
+
"http://example.com/a.png";
|
|
98
|
+
expect(issuesOf(validateTaskUiSpec(input, off))).toContain("c.imageUrl must be an https: URL.");
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
test("a spec over 32 KB is refused", () => {
|
|
102
|
+
const input = example();
|
|
103
|
+
(input.spec.elements.k as { props: { value: string } }).props.value = "x".repeat(33 * 1024);
|
|
104
|
+
const issues = issuesOf(validateTaskUiSpec(input, off));
|
|
105
|
+
expect(issues[0]).toStartWith("uiSpec is ");
|
|
106
|
+
expect(issues[0]).toEndWith("bytes; the limit is 32768.");
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
test("2 Tables are refused by the toCard table limit", () => {
|
|
110
|
+
const input = example();
|
|
111
|
+
input.spec.elements.t2 = structuredClone(input.spec.elements.t);
|
|
112
|
+
(input.spec.elements.c as { children: string[] }).children.push("t2");
|
|
113
|
+
expect(issuesOf(validateTaskUiSpec(input, off))).toEqual(["at most 1 Table per message"]);
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
test("a root that is not a Card is refused", () => {
|
|
117
|
+
const input: TaskUiSpecInput = {
|
|
118
|
+
spec: {
|
|
119
|
+
root: "x",
|
|
120
|
+
elements: { x: { type: "Text", props: { content: "hi" }, children: [] } },
|
|
121
|
+
},
|
|
122
|
+
};
|
|
123
|
+
expect(issuesOf(validateTaskUiSpec(input, off))).toEqual(["root must be a Card"]);
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
test("a Button needs the action flag", () => {
|
|
127
|
+
const input = withButton(example(), "rerun");
|
|
128
|
+
input.actions = { rerun: { kind: "follow_up", prompt: "Run it again" } };
|
|
129
|
+
expect(issuesOf(validateTaskUiSpec(input, off))).toEqual([
|
|
130
|
+
"Button b needs UI_SPEC_ACTIONS_ENABLED=true; use LinkButton.",
|
|
131
|
+
]);
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
test("a Button that names an undeclared action is refused", () => {
|
|
135
|
+
const input = withButton(example(), "rerun");
|
|
136
|
+
input.actions = { other: { kind: "follow_up", prompt: "Something else" } };
|
|
137
|
+
expect(issuesOf(validateTaskUiSpec(input, on))).toEqual([
|
|
138
|
+
'Button b names action "rerun", which uiSpec.actions does not declare.',
|
|
139
|
+
]);
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
test("a Button cannot name an inherited object key", () => {
|
|
143
|
+
const input = withButton(example(), "constructor");
|
|
144
|
+
input.actions = {};
|
|
145
|
+
expect(issuesOf(validateTaskUiSpec(input, on))).toEqual([
|
|
146
|
+
'Button b names action "constructor", which uiSpec.actions does not declare.',
|
|
147
|
+
]);
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
test("a declared Button renders with the swarm_ui: prefix and the task id; the stored spec keeps its id", () => {
|
|
151
|
+
const input = withButton(example(), "rerun");
|
|
152
|
+
input.actions = { rerun: { kind: "follow_up", prompt: "Run it again" } };
|
|
153
|
+
const result = validateTaskUiSpec(input, on);
|
|
154
|
+
expect(result.ok).toBe(true);
|
|
155
|
+
if (!result.ok) return;
|
|
156
|
+
const json = JSON.stringify(result.blocks);
|
|
157
|
+
expect(json).toContain(`"action_id":"${UI_SPEC_ACTION_PREFIX}rerun"`);
|
|
158
|
+
expect(json).toContain(`"value":"${TASK_ID}"`);
|
|
159
|
+
expect((result.spec.elements.b as { props: { id: string } }).props.id).toBe("rerun");
|
|
160
|
+
expect(result.actions).toEqual({ rerun: { kind: "follow_up", prompt: "Run it again" } });
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
|
|
164
|
+
describe("taskUiSpecSlackBlocks", () => {
|
|
165
|
+
test("renders a stored spec", () => {
|
|
166
|
+
const blocks = taskUiSpecSlackBlocks({ ...example(), fallbackText: "Weekly deploys" }, TASK_ID);
|
|
167
|
+
expect(blocks.length).toBeGreaterThanOrEqual(1);
|
|
168
|
+
});
|
|
169
|
+
|
|
170
|
+
test("returns [] and logs issues, not the body, when a stored spec no longer converts", () => {
|
|
171
|
+
const warn = spyOn(console, "warn").mockImplementation(() => {});
|
|
172
|
+
try {
|
|
173
|
+
const stored = {
|
|
174
|
+
spec: {
|
|
175
|
+
root: "x",
|
|
176
|
+
elements: { x: { type: "Text", props: { content: "secret body" }, children: [] } },
|
|
177
|
+
},
|
|
178
|
+
fallbackText: "secret body",
|
|
179
|
+
};
|
|
180
|
+
expect(taskUiSpecSlackBlocks(stored, TASK_ID)).toEqual([]);
|
|
181
|
+
expect(warn).toHaveBeenCalledTimes(1);
|
|
182
|
+
const logged = String(warn.mock.calls[0]?.[0]);
|
|
183
|
+
expect(logged).toContain("root must be a Card");
|
|
184
|
+
expect(logged).not.toContain("secret body");
|
|
185
|
+
} finally {
|
|
186
|
+
warn.mockRestore();
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
});
|
|
190
|
+
|
|
191
|
+
describe("chat catalog drift", () => {
|
|
192
|
+
test("UI_SPEC_COMPONENTS equals the @json-render/chat standard components", () => {
|
|
193
|
+
expect([...UI_SPEC_COMPONENTS]).toEqual(Object.keys(standardComponentDefinitions));
|
|
194
|
+
});
|
|
195
|
+
});
|
|
196
|
+
|
|
197
|
+
describe("task UI spec storage", () => {
|
|
198
|
+
const dbPath = `/tmp/test-task-ui-spec-${crypto.randomUUID()}.sqlite`;
|
|
199
|
+
let agentId: string;
|
|
200
|
+
beforeAll(async () => {
|
|
201
|
+
initDb(dbPath);
|
|
202
|
+
agentId = (
|
|
203
|
+
await createAgent({
|
|
204
|
+
name: "UI spec test",
|
|
205
|
+
role: "worker",
|
|
206
|
+
isLead: false,
|
|
207
|
+
status: "busy",
|
|
208
|
+
capabilities: [],
|
|
209
|
+
})
|
|
210
|
+
).id;
|
|
211
|
+
});
|
|
212
|
+
afterAll(async () => {
|
|
213
|
+
closeDb();
|
|
214
|
+
await Promise.all(["", "-wal", "-shm"].map((suffix) => rm(dbPath + suffix, { force: true })));
|
|
215
|
+
});
|
|
216
|
+
|
|
217
|
+
test("upsert twice keeps one row with the latest spec", async () => {
|
|
218
|
+
const task = await createTaskExtended("UI spec upsert", { agentId, source: "system" });
|
|
219
|
+
const first = { ...example(), fallbackText: "first" };
|
|
220
|
+
await upsertTaskUiSpec(task.id, first);
|
|
221
|
+
const second = {
|
|
222
|
+
...example(),
|
|
223
|
+
actions: { rerun: { kind: "follow_up" as const, prompt: "Run it again" } },
|
|
224
|
+
fallbackText: "second",
|
|
225
|
+
};
|
|
226
|
+
await upsertTaskUiSpec(task.id, second);
|
|
227
|
+
const rows = await getDbClient().query<{ n: number }>(
|
|
228
|
+
"SELECT COUNT(*) AS n FROM task_ui_specs WHERE task_id = ?",
|
|
229
|
+
[task.id],
|
|
230
|
+
);
|
|
231
|
+
expect(rows[0]!.n).toBe(1);
|
|
232
|
+
expect(await getTaskUiSpec(task.id)).toEqual(second);
|
|
233
|
+
});
|
|
234
|
+
|
|
235
|
+
test("batch read maps every id, null when a task has no spec", async () => {
|
|
236
|
+
const withSpec = await createTaskExtended("UI spec batch", { agentId, source: "system" });
|
|
237
|
+
const without = await createTaskExtended("UI spec none", { agentId, source: "system" });
|
|
238
|
+
await upsertTaskUiSpec(withSpec.id, { ...example(), fallbackText: "batch" });
|
|
239
|
+
const byTask = await getTaskUiSpecsForTasks([withSpec.id, without.id, withSpec.id]);
|
|
240
|
+
expect(byTask.size).toBe(2);
|
|
241
|
+
expect(byTask.get(withSpec.id)?.fallbackText).toBe("batch");
|
|
242
|
+
expect(byTask.get(without.id)).toBeNull();
|
|
243
|
+
expect(await getTaskUiSpec(without.id)).toBeNull();
|
|
244
|
+
});
|
|
245
|
+
|
|
246
|
+
test("an action run is reserved once, then exists", async () => {
|
|
247
|
+
const task = await createTaskExtended("UI action run", { agentId, source: "system" });
|
|
248
|
+
const result = await createTaskExtended("UI action result", { agentId, source: "system" });
|
|
249
|
+
const run = {
|
|
250
|
+
taskId: task.id,
|
|
251
|
+
actionId: "rerun",
|
|
252
|
+
surface: "slack" as const,
|
|
253
|
+
slackUserId: "U1",
|
|
254
|
+
};
|
|
255
|
+
expect(await reserveTaskUiActionRun({ ...run, userId: null })).toBe("reserved");
|
|
256
|
+
expect(await reserveTaskUiActionRun({ ...run, userId: null })).toBe("exists");
|
|
257
|
+
await setTaskUiActionResult(task.id, "rerun", result.id);
|
|
258
|
+
const row = await getDbClient().get<{ resultTaskId: string }>(
|
|
259
|
+
"SELECT result_task_id AS resultTaskId FROM task_ui_action_runs WHERE task_id = ? AND action_id = ?",
|
|
260
|
+
[task.id, "rerun"],
|
|
261
|
+
);
|
|
262
|
+
expect(row?.resultTaskId).toBe(result.id);
|
|
263
|
+
});
|
|
264
|
+
|
|
265
|
+
describe("store-progress uiSpec", () => {
|
|
266
|
+
type Result = { structuredContent: { success: boolean; message: string } };
|
|
267
|
+
const handler = () => {
|
|
268
|
+
const server = new McpServer({ name: "ui-spec-test", version: "1" });
|
|
269
|
+
registerStoreProgressTool(server);
|
|
270
|
+
return (
|
|
271
|
+
server as unknown as {
|
|
272
|
+
_registeredTools: Record<
|
|
273
|
+
string,
|
|
274
|
+
{ handler: (args: unknown, meta: unknown) => Promise<Result> }
|
|
275
|
+
>;
|
|
276
|
+
}
|
|
277
|
+
)._registeredTools["store-progress"]!.handler;
|
|
278
|
+
};
|
|
279
|
+
const meta = () => ({ requestInfo: { headers: { "x-agent-id": agentId } } });
|
|
280
|
+
const startedTask = async (title: string) => {
|
|
281
|
+
const task = await createTaskExtended(title, { agentId, source: "system" });
|
|
282
|
+
await startTask(task.id);
|
|
283
|
+
return task;
|
|
284
|
+
};
|
|
285
|
+
const withFlag = async (value: string | undefined, fn: () => Promise<void>) => {
|
|
286
|
+
const previous = process.env.UI_SPEC_ENABLED;
|
|
287
|
+
if (value === undefined) delete process.env.UI_SPEC_ENABLED;
|
|
288
|
+
else process.env.UI_SPEC_ENABLED = value;
|
|
289
|
+
try {
|
|
290
|
+
await fn();
|
|
291
|
+
} finally {
|
|
292
|
+
if (previous === undefined) delete process.env.UI_SPEC_ENABLED;
|
|
293
|
+
else process.env.UI_SPEC_ENABLED = previous;
|
|
294
|
+
}
|
|
295
|
+
};
|
|
296
|
+
const invalid = (): TaskUiSpecInput => {
|
|
297
|
+
const spec = example();
|
|
298
|
+
(spec.spec.elements.l as { props: { url: string } }).props.url = "javascript:alert(1)";
|
|
299
|
+
return spec;
|
|
300
|
+
};
|
|
301
|
+
|
|
302
|
+
test("flag off: the task completes, no row, and the message says the spec was ignored", async () => {
|
|
303
|
+
await withFlag(undefined, async () => {
|
|
304
|
+
const task = await startedTask("UI spec flag off");
|
|
305
|
+
const result = await handler()(
|
|
306
|
+
{ taskId: task.id, status: "completed", output: "Done", uiSpec: example() },
|
|
307
|
+
meta(),
|
|
308
|
+
);
|
|
309
|
+
expect(result.structuredContent.success).toBe(true);
|
|
310
|
+
expect(result.structuredContent.message).toContain("UI_SPEC_ENABLED is off");
|
|
311
|
+
expect((await getTaskById(task.id))?.status).toBe("completed");
|
|
312
|
+
expect(await getTaskUiSpec(task.id)).toBeNull();
|
|
313
|
+
});
|
|
314
|
+
});
|
|
315
|
+
|
|
316
|
+
test("flag on and a valid spec: the row exists", async () => {
|
|
317
|
+
await withFlag("true", async () => {
|
|
318
|
+
const task = await startedTask("UI spec valid");
|
|
319
|
+
const result = await handler()(
|
|
320
|
+
{ taskId: task.id, status: "completed", output: "Done", uiSpec: example() },
|
|
321
|
+
meta(),
|
|
322
|
+
);
|
|
323
|
+
expect(result.structuredContent.success).toBe(true);
|
|
324
|
+
expect((await getTaskById(task.id))?.status).toBe("completed");
|
|
325
|
+
const stored = await getTaskUiSpec(task.id);
|
|
326
|
+
expect(stored?.spec).toEqual(example().spec);
|
|
327
|
+
expect(stored?.fallbackText).toContain("Weekly deploys");
|
|
328
|
+
});
|
|
329
|
+
});
|
|
330
|
+
|
|
331
|
+
test("flag on and an invalid spec: refused once, then completed without the spec", async () => {
|
|
332
|
+
await withFlag("true", async () => {
|
|
333
|
+
const task = await startedTask("UI spec invalid");
|
|
334
|
+
const args = { taskId: task.id, status: "completed", output: "Done", uiSpec: invalid() };
|
|
335
|
+
const refused = await handler()(args, meta());
|
|
336
|
+
expect(refused.structuredContent.success).toBe(false);
|
|
337
|
+
expect(refused.structuredContent.message).toContain(
|
|
338
|
+
"Completion refused: uiSpec is not valid. The task stays in_progress.",
|
|
339
|
+
);
|
|
340
|
+
expect(refused.structuredContent.message).toContain("l.url must be an https: URL.");
|
|
341
|
+
expect((await getTaskById(task.id))?.status).toBe("in_progress");
|
|
342
|
+
|
|
343
|
+
const accepted = await handler()(args, meta());
|
|
344
|
+
expect(accepted.structuredContent.success).toBe(true);
|
|
345
|
+
expect(accepted.structuredContent.message).toContain(
|
|
346
|
+
"uiSpec dropped: l.url must be an https: URL.",
|
|
347
|
+
);
|
|
348
|
+
expect((await getTaskById(task.id))?.status).toBe("completed");
|
|
349
|
+
expect(await getTaskUiSpec(task.id)).toBeNull();
|
|
350
|
+
});
|
|
351
|
+
});
|
|
352
|
+
|
|
353
|
+
test("a uiSpec on a progress call is ignored", async () => {
|
|
354
|
+
await withFlag("true", async () => {
|
|
355
|
+
const task = await startedTask("UI spec progress");
|
|
356
|
+
const result = await handler()(
|
|
357
|
+
{ taskId: task.id, progress: "Halfway", uiSpec: example() },
|
|
358
|
+
meta(),
|
|
359
|
+
);
|
|
360
|
+
expect(result.structuredContent.success).toBe(true);
|
|
361
|
+
expect(result.structuredContent.message).toContain(
|
|
362
|
+
'uiSpec is stored only with status "completed".',
|
|
363
|
+
);
|
|
364
|
+
expect(await getTaskUiSpec(task.id)).toBeNull();
|
|
365
|
+
});
|
|
366
|
+
});
|
|
367
|
+
});
|
|
368
|
+
});
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
completeTask,
|
|
9
9
|
createWorkflow,
|
|
10
10
|
failTask,
|
|
11
|
+
getSupersededTasksWithoutResume,
|
|
11
12
|
getTaskById,
|
|
12
13
|
getTaskByWorkflowRunStepId,
|
|
13
14
|
getWorkflowRun,
|
|
@@ -162,6 +163,7 @@ describe("agent-task node.retry on task failure", () => {
|
|
|
162
163
|
expect(queued.error).toBe("superseded_workflow_task");
|
|
163
164
|
expect((await getWorkflowRun(runId))!.status).toBe("waiting");
|
|
164
165
|
expect((await getTaskById(first.id))!.workflowRunStepId).toBeFalsy();
|
|
166
|
+
expect((await getTaskById(first.id))!.status).toBe("superseded");
|
|
165
167
|
|
|
166
168
|
startRetryPoller(registry, 10);
|
|
167
169
|
const second = await waitForRedrive(step.id, first);
|
|
@@ -184,6 +186,21 @@ describe("agent-task node.retry on task failure", () => {
|
|
|
184
186
|
expect(steps.find((s) => s.nodeId === "done")?.status).toBe("completed");
|
|
185
187
|
});
|
|
186
188
|
|
|
189
|
+
test("a real failure with a queued retry keeps its task failed", async () => {
|
|
190
|
+
const runId = await startRun({ retry: RETRY_ONCE });
|
|
191
|
+
const step = await synthesizeStep(runId);
|
|
192
|
+
const first = (await getTaskByWorkflowRunStepId(step.id))!;
|
|
193
|
+
|
|
194
|
+
await failTask(first.id, "boom");
|
|
195
|
+
await waitFor(async () => {
|
|
196
|
+
const s = await synthesizeStep(runId);
|
|
197
|
+
return s.status === "failed" && s.nextRetryAt != null ? s : null;
|
|
198
|
+
}, "step queued for retry");
|
|
199
|
+
const failed = (await getTaskById(first.id))!;
|
|
200
|
+
expect(failed.workflowRunStepId).toBeFalsy();
|
|
201
|
+
expect(failed.status).toBe("failed");
|
|
202
|
+
});
|
|
203
|
+
|
|
187
204
|
test("a second failure exhausts retries and falls through to onNodeFailure", async () => {
|
|
188
205
|
const runId = await startRun({ retry: RETRY_ONCE, onNodeFailure: "continue" });
|
|
189
206
|
const step = await synthesizeStep(runId);
|
|
@@ -241,6 +258,7 @@ describe("agent-task node.retry on task failure", () => {
|
|
|
241
258
|
expect(failedStep.retryCount).toBe(0);
|
|
242
259
|
expect(failedStep.nextRetryAt).toBeFalsy();
|
|
243
260
|
expect((await getTaskByWorkflowRunStepId(step.id))!.id).toBe(first.id);
|
|
261
|
+
expect((await getTaskById(first.id))!.status).toBe("failed");
|
|
244
262
|
});
|
|
245
263
|
|
|
246
264
|
test("a cancelled task never retries, even with retry set", async () => {
|
|
@@ -318,7 +336,17 @@ describe("implicit retry for a superseded task on a node without retry", () => {
|
|
|
318
336
|
expect(delayMs).toBeGreaterThanOrEqual(SUPERSEDE_RETRY_POLICY.baseDelayMs - 1000);
|
|
319
337
|
expect(delayMs).toBeLessThanOrEqual(SUPERSEDE_RETRY_POLICY.baseDelayMs + 5000);
|
|
320
338
|
expect((await getWorkflowRun(runId))!.status).toBe("waiting");
|
|
321
|
-
|
|
339
|
+
const cut = (await getTaskById(first.id))!;
|
|
340
|
+
expect(cut.workflowRunStepId).toBeFalsy();
|
|
341
|
+
// A cut with a queued retry is not a real failure.
|
|
342
|
+
expect(cut.status).toBe("superseded");
|
|
343
|
+
expect(cut.failureReason).toBe(SUPERSEDED_WORKFLOW_TASK_REASON);
|
|
344
|
+
// It never gets a resume: the heartbeat orphan repair must not see it.
|
|
345
|
+
const orphans = await getSupersededTasksWithoutResume(
|
|
346
|
+
new Date(Date.now() + 60_000).toISOString(),
|
|
347
|
+
new Date(0).toISOString(),
|
|
348
|
+
);
|
|
349
|
+
expect(orphans.map((t) => t.id)).not.toContain(first.id);
|
|
322
350
|
|
|
323
351
|
await waitForQueuedRetry(runId);
|
|
324
352
|
startRetryPoller(registry, 10);
|
|
@@ -340,6 +368,8 @@ describe("implicit retry for a superseded task on a node without retry", () => {
|
|
|
340
368
|
expect(finalStep.retryCount).toBe(1);
|
|
341
369
|
expect(finalStep.nextRetryAt).toBeFalsy();
|
|
342
370
|
expect((await getTaskByWorkflowRunStepId(step.id))!.id).toBe(second.id);
|
|
371
|
+
// Retries exhausted: the step really failed, so its task stays failed.
|
|
372
|
+
expect((await getTaskById(second.id))!.status).toBe("failed");
|
|
343
373
|
});
|
|
344
374
|
|
|
345
375
|
test("the redriven task completing continues the run", async () => {
|
|
@@ -383,6 +413,8 @@ describe("implicit retry for a superseded task on a node without retry", () => {
|
|
|
383
413
|
expect(failedStep.retryCount).toBe(0);
|
|
384
414
|
expect(failedStep.nextRetryAt).toBeFalsy();
|
|
385
415
|
expect((await getTaskByWorkflowRunStepId(step.id))!.id).toBe(first.id);
|
|
416
|
+
// No retry: the step really failed, so the cut stays failed.
|
|
417
|
+
expect((await getTaskById(first.id))!.status).toBe("failed");
|
|
386
418
|
});
|
|
387
419
|
|
|
388
420
|
test("the recovery sweep reads the cut from the task row", async () => {
|
|
@@ -404,6 +436,7 @@ describe("implicit retry for a superseded task on a node without retry", () => {
|
|
|
404
436
|
expect(queued.nextRetryAt).toBeTruthy();
|
|
405
437
|
expect(queued.retryCount).toBe(1);
|
|
406
438
|
expect((await getWorkflowRun(runId))!.status).toBe("waiting");
|
|
439
|
+
expect((await getTaskById(first.id))!.status).toBe("superseded");
|
|
407
440
|
});
|
|
408
441
|
});
|
|
409
442
|
|
package/src/tools/defer-task.ts
CHANGED
|
@@ -191,7 +191,7 @@ export const registerDeferTaskTool = (server: McpServer) => {
|
|
|
191
191
|
})
|
|
192
192
|
.optional()
|
|
193
193
|
.describe(
|
|
194
|
-
"Wake early on a task event. Provide taskId or nonempty, unique taskIds. mode defaults to all (every member must match); any wakes on the first match. settled covers completed, failed, cancelled, or skipped. Deferred and superseded members follow their continuations; a superseded member without a resume child holds to the ceiling. Any already-terminal member rejects the request; one delayMs/runAt ceiling is still required for the whole set. The member whose settlement wakes you creates no separate lead follow-up for your agent unless its followUpConfig sets onCompleted/onFailed; an all-mode member that settles while others are pending still does.",
|
|
194
|
+
"Wake early on a task event. Provide taskId or nonempty, unique taskIds. mode defaults to all (every member must match); any wakes on the first match. settled covers completed, failed, cancelled, or skipped. Deferred and superseded members follow their continuations; a superseded member without a resume child holds to the ceiling, except a workflow step superseded by its queued retry, which counts as failed. Any already-terminal member rejects the request; one delayMs/runAt ceiling is still required for the whole set. The member whose settlement wakes you creates no separate lead follow-up for your agent unless its followUpConfig sets onCompleted/onFailed; an all-mode member that settles while others are pending still does.",
|
|
195
195
|
),
|
|
196
196
|
summary: z
|
|
197
197
|
.string()
|
|
@@ -28,6 +28,7 @@ import {
|
|
|
28
28
|
MAX_TASK_CITATIONS,
|
|
29
29
|
upsertTaskCitations,
|
|
30
30
|
} from "@/be/task-citations";
|
|
31
|
+
import { hasTaskUiSpecCheckRefusal, upsertTaskUiSpec } from "@/be/task-ui-spec";
|
|
31
32
|
import { AgentFsProvider } from "@/fs/agent-fs-provider";
|
|
32
33
|
import { can } from "@/rbac";
|
|
33
34
|
import { finalizeSkippedTaskReaction, skipReasonFrom } from "@/tasks/task-skip";
|
|
@@ -38,8 +39,11 @@ import {
|
|
|
38
39
|
} from "@/tasks/terminal-result-guard";
|
|
39
40
|
import { createToolRegistrar, swarmToolOutputSchema, toolErr, toolOk } from "@/tools/utils";
|
|
40
41
|
import { AgentTaskStatusSchema, AttachmentInputSchema, isTerminalTaskStatus } from "@/types";
|
|
42
|
+
import { validateTaskUiSpec } from "@/ui-spec/validate";
|
|
43
|
+
import { isEnvFlagEnabled } from "@/utils/env-flag";
|
|
41
44
|
import { scrubSecrets } from "@/utils/secret-scrubber";
|
|
42
45
|
import { taskCitationIssues, taskCitationWarnings } from "@/utils/task-citations";
|
|
46
|
+
import { UI_SPEC_ACTION_ID } from "@/utils/task-ui-spec";
|
|
43
47
|
import { ensure } from "../utils/business-use";
|
|
44
48
|
|
|
45
49
|
// Phase 11: the `cost` / `costData` field was removed from this tool's input
|
|
@@ -199,6 +203,27 @@ export const registerStoreProgressTool = (server: McpServer) => {
|
|
|
199
203
|
.describe(
|
|
200
204
|
'Claim sources, upserted by index across calls. Use only for factual claims the reader cannot already see in the thread or task tree, 1-2 sources; none on delegation, routing, acks, or status replies. Reference each one in output with [citation:N], or set general: true for a source that backs the whole answer (it renders under "General sources"). ref per kind: task = task UUID; memory = memory UUID (optional quote must appear verbatim in it); github = owner/repo#N, owner/repo@<sha>, or a github.com pull, issues, or commit URL; slack = permalink or channel/ts; agent-fs = file path; page = page id; script-run = script run id; url = http(s) URL. The first completing call is refused, and the task stays in progress, if a marker has no entry, a citation fails validation, or a non-general citation is unreferenced; the response lists each problem. After one refusal, completion proceeds and those markers and sources are dropped from rendered output. At most 50 citations per call/task, refs up to 2048 characters, labels up to 200. Invalid or oversized batches are ignored; existing indices can still be updated at capacity.',
|
|
201
205
|
),
|
|
206
|
+
uiSpec: z
|
|
207
|
+
.object({
|
|
208
|
+
spec: z
|
|
209
|
+
.object({
|
|
210
|
+
root: z.string().min(1),
|
|
211
|
+
elements: z.record(z.string(), z.unknown()),
|
|
212
|
+
state: z.record(z.string(), z.unknown()).optional(),
|
|
213
|
+
})
|
|
214
|
+
.describe("A json-render spec for the chat catalog. Root must be a Card."),
|
|
215
|
+
actions: z
|
|
216
|
+
.record(
|
|
217
|
+
z.string().regex(UI_SPEC_ACTION_ID),
|
|
218
|
+
z.object({ kind: z.literal("follow_up"), prompt: z.string().min(1).max(4000) }),
|
|
219
|
+
)
|
|
220
|
+
.optional()
|
|
221
|
+
.describe("Actions that Button ids name. Needs UI_SPEC_ACTIONS_ENABLED=true."),
|
|
222
|
+
})
|
|
223
|
+
.optional()
|
|
224
|
+
.describe(
|
|
225
|
+
"Optional rich card for this result, rendered in the Slack outcome card, the session view and Chat SDK channels. `output` stays the prose answer. A Slack card shows only the spec of its own task. See the ui-spec skill.",
|
|
226
|
+
),
|
|
202
227
|
learning: z
|
|
203
228
|
.union([
|
|
204
229
|
z.string(),
|
|
@@ -246,6 +271,7 @@ export const registerStoreProgressTool = (server: McpServer) => {
|
|
|
246
271
|
failureReason,
|
|
247
272
|
attachments,
|
|
248
273
|
citations,
|
|
274
|
+
uiSpec,
|
|
249
275
|
learning,
|
|
250
276
|
persistMemory,
|
|
251
277
|
chainedTaskId,
|
|
@@ -398,6 +424,8 @@ export const registerStoreProgressTool = (server: McpServer) => {
|
|
|
398
424
|
}
|
|
399
425
|
|
|
400
426
|
let learningWrite: Promise<TaskLearningResult> | undefined;
|
|
427
|
+
// A sentence about the uiSpec, appended to a successful result message.
|
|
428
|
+
let uiSpecNote: string | undefined;
|
|
401
429
|
const result = await getDbClient().transaction(async () => {
|
|
402
430
|
const agent = await getAgentById(requestInfo.agentId ?? "");
|
|
403
431
|
|
|
@@ -606,9 +634,45 @@ export const registerStoreProgressTool = (server: McpServer) => {
|
|
|
606
634
|
}
|
|
607
635
|
}
|
|
608
636
|
|
|
637
|
+
// uiSpec: stored only with a completion, and only when the flag is on.
|
|
638
|
+
// An invalid spec refuses the first completion, like citations above.
|
|
639
|
+
let uiSpecToStore: Parameters<typeof upsertTaskUiSpec>[1] | undefined;
|
|
640
|
+
if (uiSpec && !isEnvFlagEnabled("UI_SPEC_ENABLED", false)) {
|
|
641
|
+
uiSpecNote = "uiSpec ignored: UI_SPEC_ENABLED is off.";
|
|
642
|
+
} else if (uiSpec && status !== "completed") {
|
|
643
|
+
uiSpecNote = 'uiSpec is stored only with status "completed".';
|
|
644
|
+
} else if (uiSpec) {
|
|
645
|
+
const validation = validateTaskUiSpec(uiSpec, {
|
|
646
|
+
taskId,
|
|
647
|
+
actionsEnabled: isEnvFlagEnabled("UI_SPEC_ACTIONS_ENABLED", false),
|
|
648
|
+
});
|
|
649
|
+
if (validation.ok) {
|
|
650
|
+
uiSpecToStore = {
|
|
651
|
+
spec: validation.spec,
|
|
652
|
+
...(validation.actions ? { actions: validation.actions } : {}),
|
|
653
|
+
fallbackText: validation.fallbackText,
|
|
654
|
+
};
|
|
655
|
+
} else if (!(await hasTaskUiSpecCheckRefusal(taskId))) {
|
|
656
|
+
await createLogEntry({
|
|
657
|
+
eventType: "task_ui_spec_check_refused",
|
|
658
|
+
agentId: agent.id,
|
|
659
|
+
taskId,
|
|
660
|
+
newValue: validation.issues.join("\n"),
|
|
661
|
+
});
|
|
662
|
+
return {
|
|
663
|
+
success: false,
|
|
664
|
+
task: existingTask,
|
|
665
|
+
message: `Completion refused: uiSpec is not valid. The task stays ${existingTask.status}. Fix these, then call store-progress again:\n- ${validation.issues.join("\n- ")}\nThis check refuses once per task; the next completion is accepted without the spec.`,
|
|
666
|
+
};
|
|
667
|
+
} else {
|
|
668
|
+
uiSpecNote = `uiSpec dropped: ${validation.issues[0]}`;
|
|
669
|
+
}
|
|
670
|
+
}
|
|
671
|
+
|
|
609
672
|
// Handle status change
|
|
610
673
|
if (status === "completed") {
|
|
611
674
|
const result = await completeTask(taskId, output);
|
|
675
|
+
if (result && uiSpecToStore) await upsertTaskUiSpec(taskId, uiSpecToStore);
|
|
612
676
|
if (result) {
|
|
613
677
|
updatedTask = result;
|
|
614
678
|
|
|
@@ -737,9 +801,11 @@ export const registerStoreProgressTool = (server: McpServer) => {
|
|
|
737
801
|
|
|
738
802
|
const learningResult = await learningWrite;
|
|
739
803
|
const { success } = result;
|
|
740
|
-
const message =
|
|
741
|
-
|
|
742
|
-
:
|
|
804
|
+
const message = [
|
|
805
|
+
result.message,
|
|
806
|
+
...(learningResult ? [learningSentence(learningResult)] : []),
|
|
807
|
+
...(success && uiSpecNote ? [uiSpecNote] : []),
|
|
808
|
+
].join(" ");
|
|
743
809
|
const task = result.task
|
|
744
810
|
? {
|
|
745
811
|
id: result.task.id,
|
package/src/types.ts
CHANGED
|
@@ -1916,6 +1916,8 @@ export const AgentLogEventTypeSchema = z.enum([
|
|
|
1916
1916
|
"task_follow_up_gate_shadow",
|
|
1917
1917
|
// store-progress refused a completion once because its citations were inaccurate
|
|
1918
1918
|
"task_citation_check_refused",
|
|
1919
|
+
// store-progress refused a completion once because its uiSpec was invalid
|
|
1920
|
+
"task_ui_spec_check_refused",
|
|
1919
1921
|
"channel_message",
|
|
1920
1922
|
// Service registry events
|
|
1921
1923
|
"service_registered",
|
|
@@ -2007,11 +2009,14 @@ export const SessionCostSchema = z
|
|
|
2007
2009
|
sessionId: z.string(),
|
|
2008
2010
|
taskId: z.uuid().optional(),
|
|
2009
2011
|
agentId: z.string(),
|
|
2012
|
+
credentialKeyType: z.string().nullable().optional(),
|
|
2013
|
+
credentialKeySuffix: z.string().nullable().optional(),
|
|
2014
|
+
harness: ProviderNameSchema.nullable().optional(),
|
|
2010
2015
|
totalCostUsd: z.number().min(0),
|
|
2011
2016
|
inputTokens: z.number().int().min(0).default(0),
|
|
2012
2017
|
outputTokens: z.number().int().min(0).default(0),
|
|
2013
|
-
cacheReadTokens: z.number().int().min(0).default(
|
|
2014
|
-
cacheWriteTokens: z.number().int().min(0).default(
|
|
2018
|
+
cacheReadTokens: z.number().int().min(0).nullable().default(null),
|
|
2019
|
+
cacheWriteTokens: z.number().int().min(0).nullable().default(null),
|
|
2015
2020
|
// Migration 063: reasoning_output_tokens from codex turn.completed events.
|
|
2016
2021
|
reasoningOutputTokens: z.number().int().min(0).default(0),
|
|
2017
2022
|
// Migration 063: thinking_input_tokens from claude extended-thinking flows.
|