@desplega.ai/agent-swarm 2.8.1 → 2.8.3
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-xq6s2z6t.js +14 -0
- package/dist/{actions-pwjpn0j6.js → actions-ewz7bp4g.js} +20 -19
- package/dist/{amp-adapter-cq9jgj6x.js → amp-adapter-f25tqhnf.js} +3 -3
- package/dist/{app-cnfffgwg.js → app-mkptw0k7.js} +4 -4
- package/dist/{assistant-kpn317y1.js → assistant-c47rfe77.js} +23 -22
- package/dist/{boot-args-schema-pbbnhmc3.js → boot-args-schema-4vb0xsat.js} +1 -1
- package/dist/{boot-reembed-9m0ysxma.js → boot-reembed-1ghy2sab.js} +1 -1
- package/dist/{boot-reembed-majbn53m.js → boot-reembed-htr73hbs.js} +1 -1
- package/dist/{boot-scrub-sweep-app8g8ym.js → boot-scrub-sweep-yrytg42z.js} +4 -4
- package/dist/{boot-seeds-pbtmvcjm.js → boot-seeds-n2b3dx4e.js} +4 -4
- package/dist/{boxd-qbkxy6ap.js → boxd-jmfqgkqa.js} +2 -2
- package/dist/{claude-adapter-wn1g3qp5.js → claude-adapter-r33pqnzx.js} +8 -9
- package/dist/{claude-managed-adapter-jh6c523j.js → claude-managed-adapter-hddmxjyj.js} +4 -4
- package/dist/{claude-managed-setup-pd47nzch.js → claude-managed-setup-hfvry1bd.js} +5 -5
- package/dist/{claude-sdk-session-3a2a6589.js → claude-sdk-session-0hamqzc7.js} +10 -11
- package/dist/{cli-v1dv1r37.js → cli-0bcgyj5b.js} +74 -3
- package/dist/{cli-a3b239vq.js → cli-0vksaxvr.js} +2 -2
- package/dist/{cli-mrt48bx7.js → cli-15204js0.js} +1 -1
- package/dist/{cli-8aes17e4.js → cli-1m96dc36.js} +3 -3
- package/dist/{cli-2r0jcc3k.js → cli-2d0cghfn.js} +1 -1
- package/dist/{cli-wk18cm92.js → cli-4ax9mvvg.js} +4 -4
- package/dist/{cli-9wngrawf.js → cli-4dpkjc2e.js} +6 -6
- package/dist/{cli-x1wa213s.js → cli-4e1hfbpq.js} +5 -5
- package/dist/{cli-7349va39.js → cli-500c09j9.js} +921 -431
- package/dist/{cli-m4dqmnbp.js → cli-54qr8mcd.js} +2 -2
- package/dist/{cli-m88rpzkh.js → cli-5a7szzfh.js} +2 -2
- package/dist/{cli-bst1vp7e.js → cli-5y2fvw4z.js} +13 -5
- package/dist/{cli-vj75tyaw.js → cli-6yygkr0w.js} +7 -7
- package/dist/{cli-7b8sbmag.js → cli-7c5tgqhf.js} +5 -5
- package/dist/{cli-2gxeg5gr.js → cli-8476gtwf.js} +1 -1
- package/dist/{cli-yncmerje.js → cli-922z7gwm.js} +4 -4
- package/dist/{cli-jrzkw01m.js → cli-93t5s4zq.js} +2 -2
- package/dist/{cli-sn7rtnj4.js → cli-9zmb7ptc.js} +9 -9
- package/dist/{cli-tk7cjj8h.js → cli-am1ptset.js} +3 -3
- package/dist/{cli-cyhbbd1z.js → cli-awwptga4.js} +1 -1
- package/dist/{cli-89cqnasv.js → cli-bhsfbmk8.js} +19 -7
- package/dist/{cli-9vhebtjz.js → cli-bj6qhgte.js} +15 -32
- package/dist/{cli-g70vxtjh.js → cli-c0xjnr8z.js} +2 -2
- package/dist/{cli-vqptjbr7.js → cli-c3ng0mb4.js} +14 -14
- package/dist/{cli-re4raaj0.js → cli-c71n3bxq.js} +11 -6
- package/dist/{cli-7p1kvkck.js → cli-crpf163n.js} +25 -18
- package/dist/{cli-k0wwfqbg.js → cli-dns0y538.js} +4 -0
- package/dist/{cli-d3p5vwbk.js → cli-dpsfwh7n.js} +13 -21
- package/dist/{cli-xzm9vcfg.js → cli-dtdht77h.js} +2 -2
- package/dist/{cli-bb431xey.js → cli-e2w34h6z.js} +231 -68
- package/dist/{cli-eddnyg3t.js → cli-emekyyhr.js} +1 -1
- package/dist/{cli-d84byzn8.js → cli-f1kwb5fc.js} +109 -33
- package/dist/{cli-0jzra9ad.js → cli-gn9y6fn7.js} +2 -2
- package/dist/{cli-tqegb8eq.js → cli-gpz1d0t2.js} +4 -4
- package/dist/{cli-7w69ne2f.js → cli-h9yy18gy.js} +239 -67
- package/dist/{cli-m5akxq8q.js → cli-j8cjdzan.js} +1 -1
- package/dist/{cli-m9s2qff2.js → cli-jg5txpm6.js} +187 -93
- package/dist/{cli-k26bkr9t.js → cli-k2rw11py.js} +3 -3
- package/dist/{cli-93k32c37.js → cli-k96cecs7.js} +377 -61
- package/dist/{cli-3vjhs18n.js → cli-kd56bmk4.js} +1 -1
- package/dist/{cli-k0615eh8.js → cli-kmemts3w.js} +13 -13
- package/dist/{cli-pcad4cb1.js → cli-knva3nmx.js} +2 -2
- package/dist/{cli-b085njxz.js → cli-kw44j53p.js} +15 -14
- package/dist/{cli-bsywb58a.js → cli-mdpbjnzq.js} +10 -10
- package/dist/{cli-syybb0p1.js → cli-me0r8gzr.js} +35 -76
- package/dist/{cli-4r05hnqa.js → cli-mwwmka77.js} +15 -15
- package/dist/{cli-1xh9a7hn.js → cli-n5t077me.js} +2 -2
- package/dist/{cli-rvhdmjvt.js → cli-nx2n3z6p.js} +1 -1
- package/dist/{cli-28fq781p.js → cli-pe4d96rb.js} +1 -1
- package/dist/{cli-3rkdne1h.js → cli-pxwtcgcp.js} +2 -2
- package/dist/{cli-zcsw143p.js → cli-qmqt520k.js} +2 -2
- package/dist/{cli-2zp0et3v.js → cli-qps8je6j.js} +70 -19
- package/dist/{cli-xae4g51r.js → cli-rh15cakt.js} +1 -1
- package/dist/{cli-k93bq1wq.js → cli-rjvsf9qa.js} +5 -5
- package/dist/{cli-6mma83xa.js → cli-rqfvkx5t.js} +7 -7
- package/dist/{cli-dy32zecz.js → cli-s7zz734a.js} +1 -1
- package/dist/{cli-yn2bbre9.js → cli-s8p8hhty.js} +2 -2
- package/dist/{cli-vbh10fqa.js → cli-sdvcrq5x.js} +5 -5
- package/dist/{cli-b5rs97a6.js → cli-sg27rk2t.js} +5 -5
- package/dist/{cli-d6521kb5.js → cli-skmhsnqh.js} +1 -1
- package/dist/{cli-5mrq3ake.js → cli-t4dv07kr.js} +1 -1
- package/dist/{cli-hxpyc9sn.js → cli-t5ys4ebm.js} +3 -3
- package/dist/{cli-qmqk2yc2.js → cli-tas6ckky.js} +2 -2
- package/dist/{cli-p1w18yhx.js → cli-tf79ryyy.js} +1 -1
- package/dist/{cli-kc7v1nfv.js → cli-tnzebztn.js} +1 -1
- package/dist/{cli-gax7fk3t.js → cli-vx421edw.js} +3 -3
- package/dist/{cli-kchjb7qy.js → cli-x3ex5bqf.js} +1 -1
- package/dist/cli-yss07azk.js +142 -0
- package/dist/{cli-0ntbxyaa.js → cli-z8cvws4c.js} +363 -47
- package/dist/{cli-tacge1w0.js → cli-zdaypkq9.js} +146 -52
- package/dist/{cli-b8e9nb04.js → cli-zeaehgyd.js} +2 -2
- package/dist/{cli-jcpr5smb.js → cli-ztq5z4e1.js} +4 -4
- package/dist/cli.js +21 -21
- package/dist/{codex-adapter-nha71q3n.js → codex-adapter-2brxx5ta.js} +7 -8
- package/dist/{codex-hook-h3vk6xzr.js → codex-hook-c930c3ea.js} +2 -2
- package/dist/{codex-login-bcda78ge.js → codex-login-cbrs1h5w.js} +1 -1
- package/dist/{codex-session-runner-ak9x1k1h.js → codex-session-runner-y9anfj0r.js} +8 -9
- package/dist/{commands-f587qpq8.js → commands-wn9q06qr.js} +3 -3
- package/dist/{controller-hxx8wwy1.js → controller-fw608czd.js} +4 -4
- package/dist/{controllers-connect-k5sg9m9h.js → controllers-connect-63j5rdcm.js} +20 -20
- package/dist/{cursor-adapter-n5nc3mfe.js → cursor-adapter-6mb9jme8.js} +2 -2
- package/dist/{db-nzf8zb5z.js → db-0m6v5tq4.js} +3 -3
- package/dist/{db-amm8w15a.js → db-y4wfrzbm.js} +4 -2
- package/dist/{devin-adapter-xedz98zv.js → devin-adapter-r0yx3gv8.js} +1 -1
- package/dist/{dispatcher-89zrts8f.js → dispatcher-9tq2zzdj.js} +17 -17
- package/dist/{docker-866qpzt9.js → docker-j75atvpt.js} +2 -2
- package/dist/{dsh-adapter-nrhbrjz8.js → dsh-adapter-t09sv4tq.js} +2 -2
- package/dist/{e2b-s16txnpx.js → e2b-7s9dscap.js} +3 -3
- package/dist/{e2b-jkwfhbcv.js → e2b-a7vzs2vj.js} +3 -3
- package/dist/{easter-egg-3d-533knw22.js → easter-egg-3d-fbwvmwhe.js} +1 -1
- package/dist/{embedding-space-ezwenjmj.js → embedding-space-wh8de1t9.js} +6 -6
- package/dist/{embeddings-np74ht6g.js → embeddings-3hpbdtjr.js} +1 -1
- package/dist/{event-bus-e66gh7cc.js → event-bus-tr6h3gv8.js} +1 -1
- package/dist/{execute-b3mrb1mv.js → execute-4bdf8sdy.js} +1 -1
- package/dist/{external-channel-z46yx9d7.js → external-channel-ts2fwqh0.js} +2 -2
- package/dist/fx-adapter-1rnxnf56.js +17 -0
- package/dist/grok-adapter-efhmf1r8.js +17 -0
- package/dist/handlers-anrr3py9.js +32 -0
- package/dist/{heartbeat-dt9qw9c8.js → heartbeat-2ze5fzpc.js} +20 -20
- package/dist/{hook-8k6fbz9b.js → hook-ca54yd4s.js} +5 -5
- package/dist/{hook-jgcgygex.js → hook-gaehe2w5.js} +8 -8
- package/dist/{http-haw4r8ne.js → http-jfg8t2yk.js} +3839 -122
- package/dist/{index-tvfafeyy.js → index-3gv6sc4z.js} +1 -1
- package/dist/{index-tez78qj3.js → index-3yvzbhxd.js} +100 -23
- package/dist/index-8w2aznds.js +33 -0
- package/dist/{index-5gk12my8.js → index-csgrxedz.js} +1 -1
- package/dist/index-qnjvr362.js +37 -0
- package/dist/index-yzxd3sn9.js +32 -0
- package/dist/{keepalive-xn6s7rmg.js → keepalive-k2a3qe73.js} +4 -4
- package/dist/lead-zhxqbfdv.js +69 -0
- package/dist/{maintenance-vdts800b.js → maintenance-gb5sd5nc.js} +1 -1
- package/dist/{node-4c5jqxr3.js → node-7qsx5kvm.js} +1 -1
- package/dist/{oauth-refresh-sweep-094c8wfk.js → oauth-refresh-sweep-y7rm6bkb.js} +3 -3
- package/dist/{onboard-v99eh56m.js → onboard-jmc5qerv.js} +4 -4
- package/dist/{opencode-adapter-dsagkhtw.js → opencode-adapter-7eade9ev.js} +6 -7
- package/dist/{otel-impl-q7yr9yp0.js → otel-impl-8j1xhxqd.js} +2 -2
- package/dist/{pi-mono-adapter-546cd1cc.js → pi-mono-adapter-yqmaf32x.js} +14 -13
- package/dist/{pricing-refresh-7dh2yase.js → pricing-refresh-1nj722h6.js} +2 -2
- package/dist/{rbac-roles-mdmc96p4.js → rbac-roles-b1mtr6dr.js} +3 -3
- package/dist/{rbac-roles-npbmdh77.js → rbac-roles-n1f3frk1.js} +2 -2
- package/dist/{render-v2-twhhwmms.js → render-v2-1gfpd8rj.js} +4 -4
- package/dist/{resume-5gsrjd5e.js → resume-w1s1eh5v.js} +7 -7
- package/dist/{runtime-1hv06jsn.js → runtime-84g5egsc.js} +1 -1
- package/dist/{session-access-m191x30x.js → session-access-y6z1txk4.js} +4 -4
- package/dist/{session-source-backfill-nt923ask.js → session-source-backfill-gxxwfh12.js} +3 -3
- package/dist/{setup-wv467afy.js → setup-r91gstyk.js} +1 -1
- package/dist/{virtual-modules-gazyapte.js → virtual-modules-cgnj6kme.js} +3 -3
- package/dist/{work-objects-8zkrpy13.js → work-objects-qcxzg61c.js} +20 -20
- package/dist/worker-7j2907g6.js +69 -0
- package/dist/{worker-follow-up-cecqszem.js → worker-follow-up-y2d2h7km.js} +19 -17
- package/dist/{x-2fyrt5pp.js → x-qhxq2ama.js} +2 -2
- package/openapi.json +2908 -351
- package/package.json +4 -4
- package/src/apps/catalog.generated.json +120 -1
- package/src/apps/definition.ts +38 -11
- package/src/apps/page-validator.ts +88 -0
- package/src/be/db/model-profiles.ts +110 -11
- package/src/be/db/tasks/read.ts +53 -0
- package/src/be/db/workflow-run-definitions.ts +19 -8
- package/src/be/db-client.ts +43 -5
- package/src/be/db.ts +40 -9
- package/src/be/migrations/284_model_profile_fallbacks.sql +9 -0
- package/src/be/migrations/289_automation_savings_daily.sql +47 -0
- package/src/be/migrations/291_task_slack_participants.sql +4 -0
- package/src/be/migrations/293_savings_component_links.sql +58 -0
- package/src/be/migrations/296_automation_savings_daily_read_index.sql +6 -0
- package/src/be/model-profile-check.ts +53 -20
- package/src/be/runtime-pools/routing.ts +1 -0
- package/src/be/savings/calibrate.ts +468 -0
- package/src/be/savings/compute.ts +677 -0
- package/src/be/savings/model.ts +674 -0
- package/src/be/savings/read.ts +1500 -0
- package/src/be/savings/rollup.ts +571 -0
- package/src/be/scripts/run-credential.ts +15 -3
- package/src/be/scripts/typecheck.ts +91 -4
- package/src/be/seed/agent-fs-provision.ts +48 -11
- package/src/be/seed/workflows-seeder.ts +67 -23
- package/src/be/seed-scripts/catalog/dreaming-learnings.ts +10 -2
- package/src/be/seed-scripts/catalog/dreaming-memtax-create.ts +70 -4
- package/src/be/skill-parser.ts +19 -7
- package/src/be/swarm-config-guard.ts +8 -0
- package/src/be/users.ts +29 -2
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/provider-error-class.ts +97 -0
- package/src/commands/runner.ts +258 -58
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/http/all-routes.ts +2 -0
- package/src/http/fs.ts +8 -2
- package/src/http/index.ts +11 -0
- package/src/http/model-profiles.ts +43 -10
- package/src/http/poll.ts +15 -1
- package/src/http/requested-by.ts +97 -1
- package/src/http/savings-calibration.ts +277 -0
- package/src/http/savings.ts +849 -0
- package/src/http/scripts.ts +26 -15
- package/src/http/tasks.ts +89 -9
- package/src/http/trackers/authorize-gate.ts +41 -0
- package/src/http/trackers/jira.ts +26 -4
- package/src/http/trackers/linear.ts +26 -4
- package/src/integrations/chat-sdk/limits.ts +6 -1
- package/src/jira/oauth.ts +7 -1
- package/src/linear/README.md +2 -1
- package/src/linear/oauth.ts +7 -1
- package/src/prompts/session-templates.ts +80 -3
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +0 -20
- package/src/providers/claude-flag-settings.ts +12 -10
- package/src/providers/codex-adapter.ts +12 -34
- package/src/providers/opencode-adapter.ts +34 -12
- package/src/providers/pi-mono-adapter.ts +6 -5
- package/src/providers/types.ts +7 -0
- package/src/scheduler/scheduler.ts +20 -14
- package/src/scripts-runtime/ctx.ts +1 -1
- package/src/scripts-runtime/executors/quickjs-bundle.ts +1 -0
- package/src/scripts-runtime/executors/quickjs-prelude.ts +162 -2
- package/src/scripts-runtime/executors/quickjs-runner.ts +4 -1
- package/src/scripts-runtime/sdk-allowlist.ts +11 -1
- package/src/scripts-runtime/stdlib/fetch.ts +113 -15
- package/src/scripts-runtime/stdlib/index.ts +3 -1
- package/src/scripts-runtime/stdlib/retry.ts +174 -0
- package/src/scripts-runtime/swarm-sdk.ts +192 -17
- package/src/scripts-runtime/types/stdlib.d.ts +95 -4
- package/src/scripts-runtime/types/swarm-extension.d.ts +60 -0
- package/src/scripts-runtime/types/swarm-sdk.d.ts +69 -2
- package/src/slack/actions.ts +1 -0
- package/src/slack/assistant.ts +2 -0
- package/src/slack/enrich.ts +144 -50
- package/src/slack/handlers.ts +37 -95
- package/src/slack/templates.ts +9 -0
- package/src/slack/thread-buffer.ts +45 -71
- package/src/slack/thread-participants.ts +187 -0
- package/src/tasks/worker-follow-up.ts +142 -3
- package/src/tests/agent-fs-provision-seeder.test.ts +81 -0
- package/src/tests/apps-chart-shell.test.ts +170 -0
- package/src/tests/apps-icon.test.ts +156 -2
- package/src/tests/base-prompt.test.ts +5 -4
- package/src/tests/chat-sdk-relay.test.ts +12 -0
- package/src/tests/claude-adapter-binary.test.ts +7 -1
- package/src/tests/claude-adapter.test.ts +10 -64
- package/src/tests/claude-flag-settings.test.ts +15 -11
- package/src/tests/claude-hook-credentials.test.ts +0 -1
- package/src/tests/claude-sdk-lifecycle.test.ts +5 -1
- package/src/tests/codex-adapter.test.ts +28 -78
- package/src/tests/comb-default.test.ts +6 -0
- package/src/tests/core-auth.test.ts +7 -6
- package/src/tests/create-task-vcs-repo.test.ts +136 -0
- package/src/tests/db-client-busy-retry.test.ts +58 -6
- package/src/tests/db-task-read-contract.test.ts +2 -0
- package/src/tests/db-task-write-contract.test.ts +1 -0
- package/src/tests/deploy-guard.test.ts +154 -0
- package/src/tests/docs-index-footprint.test.js +3 -3
- package/src/tests/dreaming-learnings.test.ts +104 -0
- package/src/tests/extensions-pre-task.test.ts +4 -2
- package/src/tests/fetch-resolved-env.test.ts +47 -1
- package/src/tests/fixtures/app-shell-charts-definition.json.txt +180 -0
- package/src/tests/model-profile-fallbacks.test.ts +482 -0
- package/src/tests/model-profiles-api.test.ts +1 -0
- package/src/tests/opencode-adapter.test.ts +53 -6
- package/src/tests/pi-mono-session-cost-on-abort.test.ts +115 -0
- package/src/tests/prompt-template-session.test.ts +17 -1
- package/src/tests/provider-error-class.test.ts +174 -0
- package/src/tests/runner-provider-fallback.test.ts +197 -0
- package/src/tests/runner-requester-profile.test.ts +139 -1
- package/src/tests/savings-calibration-api.test.ts +264 -0
- package/src/tests/savings-calibration.test.ts +201 -0
- package/src/tests/savings-compound.test.ts +774 -0
- package/src/tests/savings-compute.test.ts +215 -0
- package/src/tests/savings-fleet-latency.test.ts +143 -0
- package/src/tests/savings-fleet-read.test.ts +195 -0
- package/src/tests/savings-fleet-scale.test.ts +222 -0
- package/src/tests/savings-model.test.ts +499 -0
- package/src/tests/savings-read.test.ts +367 -0
- package/src/tests/savings-rollup.test.ts +766 -0
- package/src/tests/savings-scripts.test.ts +611 -0
- package/src/tests/script-connections.test.ts +4 -0
- package/src/tests/script-executor-conformance.test.ts +444 -0
- package/src/tests/scripts-http.test.ts +55 -0
- package/src/tests/scripts-runtime-fetch.test.ts +2 -2
- package/src/tests/sdk-allowlist.test.ts +40 -0
- package/src/tests/secret-rules.test.ts +124 -1
- package/src/tests/secret-scrubber.test.ts +1 -1
- package/src/tests/seed-workflows.test.ts +167 -11
- package/src/tests/skill-parser.test.ts +45 -0
- package/src/tests/slack-dm-implicit-mention.test.ts +20 -1
- package/src/tests/slack-identity-resolution.test.ts +23 -0
- package/src/tests/slack-inbound-files.test.ts +2 -1
- package/src/tests/slack-thread-participants.test.ts +429 -0
- package/src/tests/tool-annotations.test.ts +30 -0
- package/src/tests/tracker-oauth-authorize-auth.test.ts +262 -0
- package/src/tests/workflow-definition-pinning.test.ts +128 -3
- package/src/tests/workflow-script-principal.test.ts +94 -4
- package/src/tools/app-upsert.ts +1 -1
- package/src/tools/model-profiles/list-model-profiles.ts +4 -2
- package/src/tools/update-profile.ts +1 -1
- package/src/types.ts +146 -33
- package/src/utils/constants.ts +2 -0
- package/src/utils/mcp-server-fetcher.test.ts +89 -0
- package/src/utils/mcp-server-fetcher.ts +13 -5
- package/src/utils/request-auth-context.ts +24 -0
- package/src/utils/secret-rules.generated.ts +1 -1
- package/src/utils/secret-scrubber.ts +154 -29
- package/src/workflows/executors/swarm-script.ts +23 -19
- package/templates/skills/apps/SKILL.md +62 -3
- package/templates/skills/apps/content.md +62 -3
- package/templates/skills/swarm-docs/content.md +2 -0
- package/templates/skills/swarm-scripts/SKILL.md +5 -4
- package/templates/skills/swarm-scripts/content.md +5 -4
- package/templates/skills/work-on-task/SKILL.md +1 -1
- package/templates/skills/work-on-task/content.md +1 -1
- package/templates/workflows/dreaming/content.md +1 -1
- package/dist/acp-adapter-pdy3qsvg.js +0 -15
- package/dist/cli-4bd1rck6.js +0 -4
- package/dist/cli-jywyhqws.js +0 -104
- package/dist/fx-adapter-3q12snn6.js +0 -18
- package/dist/grok-adapter-ahb1w033.js +0 -18
- package/dist/handlers-vbww69re.js +0 -32
- package/dist/index-4xwaf5th.js +0 -32
- package/dist/index-f0hcrs8e.js +0 -33
- package/dist/index-s4ewdma4.js +0 -37
- package/dist/lead-6ygbfhbh.js +0 -70
- package/dist/worker-mz5z7kj0.js +0 -70
- package/src/providers/ctx-mode-env.ts +0 -10
|
@@ -228,6 +228,11 @@ export interface SwarmSdk {
|
|
|
228
228
|
// --- scripts ---
|
|
229
229
|
script_search(args: { query?: string; scope?: ScriptScope; limit?: number }): Promise<unknown>;
|
|
230
230
|
script_run(args: { name?: string; source?: string; args?: unknown; intent?: string; scope?: ScriptScope; fsMode?: ScriptFsMode; executor?: ScriptExecutorName | null; idempotencyKey?: string }): Promise<unknown>;
|
|
231
|
+
// --- savings calibration (REST only) ---
|
|
232
|
+
/** The savings curve in use (shipped or derived from this deployment) and the stored row's metadata. */
|
|
233
|
+
savings_calibrationGet(): Promise<unknown>;
|
|
234
|
+
/** Derive the curve from the last \`days\` of sessions. Read-only unless \`apply\` is true (needs config write access). One run at a time; takes up to 120 s, so call it from a script with a long enough timeout. */
|
|
235
|
+
savings_calibrationRun(args?: { days?: number; end?: string; apply?: boolean }): Promise<unknown>;
|
|
231
236
|
// --- swarm / agent ---
|
|
232
237
|
swarm_get(args?: { includeFull?: boolean }): Promise<unknown>;
|
|
233
238
|
agent_info(args?: Record<string, unknown>): Promise<unknown>;
|
|
@@ -478,12 +483,70 @@ export interface SwarmSdk {
|
|
|
478
483
|
}): Promise<unknown>;
|
|
479
484
|
}
|
|
480
485
|
|
|
486
|
+
export interface RetryOptions {
|
|
487
|
+
/** Retries after the first call. Default 3, so at most 4 calls. */
|
|
488
|
+
retries?: number;
|
|
489
|
+
/** First backoff delay in ms. Doubles on each retry, with jitter. Default 200. */
|
|
490
|
+
minDelayMs?: number;
|
|
491
|
+
/** Cap on a single wait, including a Retry-After wait. Default 5000. */
|
|
492
|
+
maxDelayMs?: number;
|
|
493
|
+
/** Total time across all calls and waits, in ms. Default 30000. */
|
|
494
|
+
budgetMs?: number;
|
|
495
|
+
/**
|
|
496
|
+
* Decides whether to retry: gets the thrown error or the returned value and
|
|
497
|
+
* the 1-based attempt. Default: retry any throw, plus a failed fetch Response,
|
|
498
|
+
* ctx.api raw result or ctx.swarm envelope with status 429, 502, 503 or 504.
|
|
499
|
+
*/
|
|
500
|
+
retryOn?: (errorOrResult: unknown, attempt: number) => boolean | Promise<boolean>;
|
|
501
|
+
/** Stops the retries: once it aborts, the wait ends and retry rejects with its reason. */
|
|
502
|
+
signal?: AbortSignal;
|
|
503
|
+
}
|
|
504
|
+
|
|
505
|
+
export interface FetchRetryOptions extends RetryOptions {
|
|
506
|
+
/**
|
|
507
|
+
* Sends an Idempotency-Key header, the same value on every attempt: true
|
|
508
|
+
* generates a UUID per call, a string is used as is. A POST or PATCH with
|
|
509
|
+
* the header also retries 502/503/504 and network errors. It only prevents
|
|
510
|
+
* a duplicate when the server dedupes by the key.
|
|
511
|
+
*/
|
|
512
|
+
idempotencyKey?: boolean | string;
|
|
513
|
+
}
|
|
514
|
+
|
|
515
|
+
/**
|
|
516
|
+
* ctx.stdlib.fetch options. Default retries: 429 on every method (Retry-After
|
|
517
|
+
* honoured); 502/503/504 and network errors on GET, HEAD, OPTIONS, PUT, DELETE,
|
|
518
|
+
* or any request with an Idempotency-Key. A stream body gets one attempt.
|
|
519
|
+
*/
|
|
520
|
+
export type FetchOptions = RequestInit & {
|
|
521
|
+
/** false: one attempt. true or omitted: the defaults above. An object tunes them. */
|
|
522
|
+
retry?: boolean | FetchRetryOptions;
|
|
523
|
+
/** @deprecated Use retry: { retries }. Total attempts, so retries: 1 is one attempt. */
|
|
524
|
+
retries?: number;
|
|
525
|
+
/** Per-attempt timeout in ms. Default 30000. */
|
|
526
|
+
timeoutMs?: number;
|
|
527
|
+
};
|
|
528
|
+
|
|
529
|
+
export interface Retry {
|
|
530
|
+
/**
|
|
531
|
+
* Calls fn(attempt) (sync or async) until it succeeds or a retry is not
|
|
532
|
+
* warranted. Out of attempts or budget: rethrows the last error or returns
|
|
533
|
+
* the last result. Honours Retry-After on a 429, capped by maxDelayMs.
|
|
534
|
+
*/
|
|
535
|
+
<T>(fn: (attempt: number) => T | Promise<T>, options?: RetryOptions): Promise<Awaited<T>>;
|
|
536
|
+
/** Returns a reusable function with fn's arguments that retries each call. */
|
|
537
|
+
wrap<A extends unknown[], T>(
|
|
538
|
+
fn: (...args: A) => T | Promise<T>,
|
|
539
|
+
options?: RetryOptions,
|
|
540
|
+
): (...args: A) => Promise<Awaited<T>>;
|
|
541
|
+
}
|
|
542
|
+
|
|
481
543
|
export interface ScriptStdlib {
|
|
482
|
-
fetch(input: string | URL | Request, init?:
|
|
483
|
-
fetchJson(input: string | URL | Request, init?:
|
|
544
|
+
fetch(input: string | URL | Request, init?: FetchOptions): Promise<Response>;
|
|
545
|
+
fetchJson(input: string | URL | Request, init?: FetchOptions): Promise<unknown>;
|
|
484
546
|
grep(pattern: string, files?: string | string[]): Promise<string>;
|
|
485
547
|
glob(pattern: string): Promise<string[]>;
|
|
486
548
|
table(rows: Array<Record<string, unknown>>): string;
|
|
549
|
+
retry: Retry;
|
|
487
550
|
Redacted: RedactedStatic;
|
|
488
551
|
}
|
|
489
552
|
|
|
@@ -634,11 +697,35 @@ declare module "stdlib" {
|
|
|
634
697
|
meta<T>(self: Redacted<T>): { type: "system" | "user"; isSecret: boolean };
|
|
635
698
|
isSecret<T>(self: Redacted<T>): boolean;
|
|
636
699
|
};
|
|
637
|
-
export function fetch(input: string | URL | Request, init?:
|
|
638
|
-
export function fetchJson(input: string | URL | Request, init?:
|
|
700
|
+
export function fetch(input: string | URL | Request, init?: FetchOptions): Promise<Response>;
|
|
701
|
+
export function fetchJson(input: string | URL | Request, init?: FetchOptions): Promise<unknown>;
|
|
639
702
|
export function grep(pattern: string, files?: string | string[]): Promise<string>;
|
|
640
703
|
export function glob(pattern: string): Promise<string[]>;
|
|
641
704
|
export function table(rows: Array<Record<string, unknown>>): string;
|
|
705
|
+
export interface RetryOptions {
|
|
706
|
+
retries?: number;
|
|
707
|
+
minDelayMs?: number;
|
|
708
|
+
maxDelayMs?: number;
|
|
709
|
+
budgetMs?: number;
|
|
710
|
+
retryOn?: (errorOrResult: unknown, attempt: number) => boolean | Promise<boolean>;
|
|
711
|
+
signal?: AbortSignal;
|
|
712
|
+
}
|
|
713
|
+
export interface FetchRetryOptions extends RetryOptions {
|
|
714
|
+
idempotencyKey?: boolean | string;
|
|
715
|
+
}
|
|
716
|
+
export type FetchOptions = RequestInit & {
|
|
717
|
+
retry?: boolean | FetchRetryOptions;
|
|
718
|
+
/** @deprecated Use retry: { retries }. Total attempts. */
|
|
719
|
+
retries?: number;
|
|
720
|
+
timeoutMs?: number;
|
|
721
|
+
};
|
|
722
|
+
export const retry: {
|
|
723
|
+
<T>(fn: (attempt: number) => T | Promise<T>, options?: RetryOptions): Promise<Awaited<T>>;
|
|
724
|
+
wrap<A extends unknown[], T>(
|
|
725
|
+
fn: (...args: A) => T | Promise<T>,
|
|
726
|
+
options?: RetryOptions,
|
|
727
|
+
): (...args: A) => Promise<Awaited<T>>;
|
|
728
|
+
};
|
|
642
729
|
}
|
|
643
730
|
`;
|
|
644
731
|
|
|
@@ -233,6 +233,7 @@ export type SharedOrgInviteResult = {
|
|
|
233
233
|
inviteId?: string;
|
|
234
234
|
expiresAt?: string;
|
|
235
235
|
acceptUrl?: string;
|
|
236
|
+
token?: string;
|
|
236
237
|
};
|
|
237
238
|
|
|
238
239
|
/**
|
|
@@ -242,10 +243,12 @@ export type SharedOrgInviteResult = {
|
|
|
242
243
|
* Connect-to-Drive flow) never need the bootstrap key itself — it is
|
|
243
244
|
* API-only and never served over HTTP.
|
|
244
245
|
*
|
|
245
|
-
* agent-fs (>= 0.18.
|
|
246
|
-
* (`status: "added"`) and answers
|
|
247
|
-
* (`status: "pending"`,
|
|
248
|
-
* agent-fs sends no email, so the
|
|
246
|
+
* agent-fs (>= 0.18.19) adds an email that is already in the org directly
|
|
247
|
+
* (`status: "added"`) and answers any other email, with or without an account,
|
|
248
|
+
* with a pending invite (`status: "pending"`, the accept `token`, plus
|
|
249
|
+
* `acceptUrl` when its app URL is configured). agent-fs sends no email, so the
|
|
250
|
+
* token and link are passed back to the caller. Only the invited account can
|
|
251
|
+
* accept, with its own key (`POST /invites/{token}/accept`).
|
|
249
252
|
*/
|
|
250
253
|
export async function inviteEmailToSharedOrg(
|
|
251
254
|
email: string,
|
|
@@ -266,6 +269,7 @@ export async function inviteEmailToSharedOrg(
|
|
|
266
269
|
inviteId?: unknown;
|
|
267
270
|
expiresAt?: unknown;
|
|
268
271
|
acceptUrl?: unknown;
|
|
272
|
+
token?: unknown;
|
|
269
273
|
}>(shared.apiUrl, `/orgs/${encodeURIComponent(shared.orgId)}/members/invite`, {
|
|
270
274
|
method: "POST",
|
|
271
275
|
headers: shared.authHeaders,
|
|
@@ -283,6 +287,7 @@ export async function inviteEmailToSharedOrg(
|
|
|
283
287
|
...(typeof response.inviteId === "string" ? { inviteId: response.inviteId } : {}),
|
|
284
288
|
...(typeof response.expiresAt === "string" ? { expiresAt: response.expiresAt } : {}),
|
|
285
289
|
...(typeof response.acceptUrl === "string" ? { acceptUrl: response.acceptUrl } : {}),
|
|
290
|
+
...(typeof response.token === "string" ? { token: response.token } : {}),
|
|
286
291
|
};
|
|
287
292
|
}
|
|
288
293
|
|
|
@@ -347,7 +352,13 @@ export async function ensureAgentFsCredentialsForAgent(agentId: string): Promise
|
|
|
347
352
|
const currentRoles = await getCurrentOrgMemberRoles(apiUrl, shared.authHeaders, shared.orgId);
|
|
348
353
|
const currentRole = currentRoles.get(email.toLowerCase());
|
|
349
354
|
if (!currentRole || roleRank(currentRole) < roleRank("editor")) {
|
|
350
|
-
await inviteToSharedOrg(
|
|
355
|
+
await inviteToSharedOrg(
|
|
356
|
+
apiUrl,
|
|
357
|
+
shared.authHeaders,
|
|
358
|
+
shared.orgId,
|
|
359
|
+
{ email, role: "editor" },
|
|
360
|
+
{ acceptWithApiKey: apiKey },
|
|
361
|
+
);
|
|
351
362
|
}
|
|
352
363
|
|
|
353
364
|
await upsertSwarmConfig({
|
|
@@ -449,14 +460,40 @@ async function inviteToSharedOrg(
|
|
|
449
460
|
headers: Record<string, string>,
|
|
450
461
|
orgId: string,
|
|
451
462
|
invite: InviteTarget,
|
|
463
|
+
options: { acceptWithApiKey?: string } = {},
|
|
452
464
|
): Promise<"invited" | "no-account" | "transient-failure"> {
|
|
453
465
|
try {
|
|
454
|
-
await agentFsRequest
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
466
|
+
const response = await agentFsRequest<{ status?: unknown; token?: unknown }>(
|
|
467
|
+
apiUrl,
|
|
468
|
+
`/orgs/${encodeURIComponent(orgId)}/members/invite`,
|
|
469
|
+
{
|
|
470
|
+
method: "POST",
|
|
471
|
+
headers,
|
|
472
|
+
body: invite,
|
|
473
|
+
allowConflict: true,
|
|
474
|
+
},
|
|
475
|
+
);
|
|
476
|
+
// agent-fs >= 0.18.19 answers an account that is not yet in the org with a
|
|
477
|
+
// pending invite, even when the account exists. An agent account is ours,
|
|
478
|
+
// so accept it with the agent's own key; without that the agent never joins.
|
|
479
|
+
if (
|
|
480
|
+
options.acceptWithApiKey &&
|
|
481
|
+
response?.status === "pending" &&
|
|
482
|
+
typeof response.token === "string"
|
|
483
|
+
) {
|
|
484
|
+
try {
|
|
485
|
+
await agentFsRequest(apiUrl, `/invites/${encodeURIComponent(response.token)}/accept`, {
|
|
486
|
+
method: "POST",
|
|
487
|
+
headers: { authorization: `Bearer ${options.acceptWithApiKey}` },
|
|
488
|
+
allowConflict: true,
|
|
489
|
+
});
|
|
490
|
+
} catch (error) {
|
|
491
|
+
// The request path carries the invite token: rethrow without it.
|
|
492
|
+
throw new Error(
|
|
493
|
+
`agent-fs invite accept failed${error instanceof AgentFsRequestError ? `: HTTP ${error.status}` : ""}`,
|
|
494
|
+
);
|
|
495
|
+
}
|
|
496
|
+
}
|
|
460
497
|
return "invited";
|
|
461
498
|
} catch (error) {
|
|
462
499
|
console.warn(
|
|
@@ -204,10 +204,6 @@ export function loadSeedWorkflows(
|
|
|
204
204
|
.sort((left, right) => left.name.localeCompare(right.name));
|
|
205
205
|
}
|
|
206
206
|
|
|
207
|
-
function workflowSeedHash(workflow: SeedWorkflow): string {
|
|
208
|
-
return computeContentHash(canonicalJson(workflow));
|
|
209
|
-
}
|
|
210
|
-
|
|
211
207
|
async function findWorkflowByName(name: string): Promise<Workflow | null> {
|
|
212
208
|
return (await listWorkflows()).find((workflow) => workflow.name === name) ?? null;
|
|
213
209
|
}
|
|
@@ -261,27 +257,55 @@ function executableSurface(workflow: SeedWorkflow): string {
|
|
|
261
257
|
return canonicalJson(surface);
|
|
262
258
|
}
|
|
263
259
|
|
|
260
|
+
/**
|
|
261
|
+
* The seed hash covers the executable surface only, so an operator setting
|
|
262
|
+
* (an `input` value, on/off, cooldown, description, event triggers) neither
|
|
263
|
+
* reads as a user edit nor blocks a later template update.
|
|
264
|
+
*/
|
|
265
|
+
function workflowSeedHash(workflow: SeedWorkflow): string {
|
|
266
|
+
return computeContentHash(executableSurface(workflow));
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
/**
|
|
270
|
+
* The hash older releases recorded in `seed_state`: the whole workflow,
|
|
271
|
+
* operator settings included. Only used to recognise those rows; the next
|
|
272
|
+
* update or in-sync check rewrites them with {@link workflowSeedHash}.
|
|
273
|
+
*/
|
|
274
|
+
function legacyWorkflowSeedHash(workflow: SeedWorkflow): string {
|
|
275
|
+
return computeContentHash(canonicalJson(workflow));
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
/**
|
|
279
|
+
* Whether the live workflow still executes what the seeder last wrote, whose
|
|
280
|
+
* hash is `seededHash`. A legacy whole-workflow hash matches the live row
|
|
281
|
+
* itself, or the version snapshot taken before the first edit when that
|
|
282
|
+
* snapshot has the same executable surface as the live row. A legacy edit
|
|
283
|
+
* with no such snapshot counts as edited.
|
|
284
|
+
*/
|
|
285
|
+
async function executesSeededSurface(workflow: Workflow, seededHash: string): Promise<boolean> {
|
|
286
|
+
const live = workflowFromRow(workflow);
|
|
287
|
+
if (workflowSeedHash(live) === seededHash) return true;
|
|
288
|
+
if (legacyWorkflowSeedHash(live) === seededHash) return true;
|
|
289
|
+
for (const version of await getWorkflowVersions(workflow.id)) {
|
|
290
|
+
const seeded = workflowFromSnapshot(version.snapshot);
|
|
291
|
+
if (legacyWorkflowSeedHash(seeded) !== seededHash) continue;
|
|
292
|
+
return executableSurface(seeded) === executableSurface(live);
|
|
293
|
+
}
|
|
294
|
+
return false;
|
|
295
|
+
}
|
|
296
|
+
|
|
264
297
|
/**
|
|
265
298
|
* Whether a live workflow still runs seed source: `pristine` while what it
|
|
266
299
|
* executes matches what the seeder last wrote for its name, `edited` once
|
|
267
300
|
* anyone changed that, `unseeded` for a workflow the seeder never wrote.
|
|
268
|
-
* Operator settings (see `executableSurface`) keep it `pristine`.
|
|
269
|
-
* state is the live row itself or, once edited, the version snapshot taken
|
|
270
|
-
* before the first edit; an edit with no such snapshot counts as `edited`.
|
|
301
|
+
* Operator settings (see `executableSurface`) keep it `pristine`.
|
|
271
302
|
*/
|
|
272
303
|
export async function seededWorkflowState(
|
|
273
304
|
workflow: Workflow,
|
|
274
305
|
): Promise<"pristine" | "edited" | "unseeded"> {
|
|
275
306
|
const state = await getSeedState("workflow", workflow.name);
|
|
276
307
|
if (!state) return "unseeded";
|
|
277
|
-
|
|
278
|
-
if (workflowSeedHash(live) === state.seededHash) return "pristine";
|
|
279
|
-
for (const version of await getWorkflowVersions(workflow.id)) {
|
|
280
|
-
const seeded = workflowFromSnapshot(version.snapshot);
|
|
281
|
-
if (workflowSeedHash(seeded) !== state.seededHash) continue;
|
|
282
|
-
return executableSurface(seeded) === executableSurface(live) ? "pristine" : "edited";
|
|
283
|
-
}
|
|
284
|
-
return "edited";
|
|
308
|
+
return (await executesSeededSurface(workflow, state.seededHash)) ? "pristine" : "edited";
|
|
285
309
|
}
|
|
286
310
|
|
|
287
311
|
export function createWorkflowsSeeder(
|
|
@@ -301,7 +325,17 @@ export function createWorkflowsSeeder(
|
|
|
301
325
|
|
|
302
326
|
async upstreamHash(item): Promise<string | null> {
|
|
303
327
|
const existing = await findWorkflowByName(item.key);
|
|
304
|
-
|
|
328
|
+
if (!existing) return null;
|
|
329
|
+
const liveHash = workflowSeedHash(workflowFromRow(existing));
|
|
330
|
+
if (liveHash === item.contentHash) return liveHash;
|
|
331
|
+
// The runner calls a workflow pristine when this equals the recorded
|
|
332
|
+
// hash. A legacy row records a whole-workflow hash, so report the
|
|
333
|
+
// recorded hash itself while the workflow still executes that seed.
|
|
334
|
+
const state = await getSeedState("workflow", item.key);
|
|
335
|
+
if (state && (await executesSeededSurface(existing, state.seededHash))) {
|
|
336
|
+
return state.seededHash;
|
|
337
|
+
}
|
|
338
|
+
return liveHash;
|
|
305
339
|
},
|
|
306
340
|
|
|
307
341
|
async apply(item): Promise<void> {
|
|
@@ -311,12 +345,8 @@ export function createWorkflowsSeeder(
|
|
|
311
345
|
throw new Error(`Invalid workflow definition: ${validation.errors.join("; ")}`);
|
|
312
346
|
}
|
|
313
347
|
|
|
314
|
-
const
|
|
315
|
-
description: workflow.description,
|
|
348
|
+
const executable = {
|
|
316
349
|
definition: workflow.definition,
|
|
317
|
-
triggers: workflow.triggers,
|
|
318
|
-
cooldown: workflow.cooldown,
|
|
319
|
-
input: workflow.input,
|
|
320
350
|
triggerSchema: workflow.triggerSchema,
|
|
321
351
|
params: workflow.params,
|
|
322
352
|
requiredParams: workflow.requiredParams,
|
|
@@ -324,12 +354,26 @@ export function createWorkflowsSeeder(
|
|
|
324
354
|
};
|
|
325
355
|
const existing = await findWorkflowByName(workflow.name);
|
|
326
356
|
if (!existing) {
|
|
327
|
-
const created = await createWorkflow({
|
|
357
|
+
const created = await createWorkflow({
|
|
358
|
+
name: workflow.name,
|
|
359
|
+
...executable,
|
|
360
|
+
description: workflow.description,
|
|
361
|
+
triggers: workflow.triggers,
|
|
362
|
+
cooldown: workflow.cooldown,
|
|
363
|
+
input: workflow.input,
|
|
364
|
+
});
|
|
328
365
|
if (!workflow.enabled) await updateWorkflow(created.id, { enabled: false });
|
|
329
366
|
return;
|
|
330
367
|
}
|
|
331
368
|
|
|
332
|
-
|
|
369
|
+
// The seed hash leaves operator settings out, so an update must not
|
|
370
|
+
// overwrite them: the live description, on/off, cooldown and event
|
|
371
|
+
// triggers stay as they are, and so do live input values. Input keys the
|
|
372
|
+
// template added are filled from the template, so new nodes that read
|
|
373
|
+
// them still resolve.
|
|
374
|
+
const input =
|
|
375
|
+
workflow.input || existing.input ? { ...workflow.input, ...existing.input } : undefined;
|
|
376
|
+
await updateWorkflow(existing.id, { ...executable, input });
|
|
333
377
|
},
|
|
334
378
|
};
|
|
335
379
|
}
|
|
@@ -211,6 +211,13 @@ export function reuseWatermark(o: { from: Cursor; at: string; reuseRan: boolean;
|
|
|
211
211
|
|
|
212
212
|
const esc = (s: string, n: number) => String(s ?? "").replace(/\s+/g, " ").replace(/\|/g, "\\|").slice(0, n);
|
|
213
213
|
|
|
214
|
+
/** Measured triage cost: "this run" only when every triage task has a session_costs row; rows land late, so a short count is "partial". */
|
|
215
|
+
export function measuredCost(row: { tasks?: unknown; usd?: unknown } | undefined, taskCount: number): { usd: number; basis: string } | null {
|
|
216
|
+
const tasks = Number(row?.tasks ?? 0);
|
|
217
|
+
if (!row || row.usd === null || row.usd === undefined || tasks === 0) return null;
|
|
218
|
+
return { usd: Number(row.usd), basis: tasks >= taskCount ? "this run" : `partial: ${tasks} of ${taskCount} tasks` };
|
|
219
|
+
}
|
|
220
|
+
|
|
214
221
|
export function renderSection(r: { skipReason?: string | null; read: number; planned: number; newRead: number; reuseRead: number; batches: number; okBatches: number; failedBatches: Array<{ batchId: string; status: string }>; promoted: number; kept: number; keptHowto: number; dropped: number; dropWhy: Record<string, number>; guards: Record<string, number>; invalid: Record<string, number>; missing: number; left: number | null; cursor: { from: string; to: string } | null; cost: { usd: number | null; basis: string }; samples: TriageRow[]; names: Record<string, string> }): string {
|
|
215
222
|
const L: string[] = [HEADING];
|
|
216
223
|
if (r.skipReason) {
|
|
@@ -439,8 +446,9 @@ export default async function (args: unknown, ctx: ScriptContext) {
|
|
|
439
446
|
const taskIds = parsed.map((x) => x.taskId).filter(Boolean) as string[];
|
|
440
447
|
let cost: { usd: number | null; basis: string } = { usd: null, basis: "no tasks" };
|
|
441
448
|
if (taskIds.length) {
|
|
442
|
-
const c = (await q("cost", `SELECT SUM(totalCostUsd) usd FROM session_costs WHERE taskId IN (${taskIds.map(() => "?").join(",")})`, taskIds))[0];
|
|
443
|
-
|
|
449
|
+
const c = (await q("cost", `SELECT COUNT(DISTINCT taskId) tasks, SUM(totalCostUsd) usd FROM session_costs WHERE taskId IN (${taskIds.map(() => "?").join(",")})`, taskIds))[0];
|
|
450
|
+
const measured = measuredCost(c, new Set(taskIds).size);
|
|
451
|
+
if (measured) cost = measured;
|
|
444
452
|
else {
|
|
445
453
|
const prior = (await q("cost-prior", `SELECT COUNT(*) tasks, AVG(s.usd) usd FROM (SELECT sc.taskId, SUM(sc.totalCostUsd) usd FROM session_costs sc JOIN agent_tasks t ON t.id = sc.taskId WHERE t.tags LIKE '%dreaming-v2-learnings%' AND t.status = 'completed' AND sc.createdAt >= datetime('now','-7 days') GROUP BY sc.taskId) s`))[0];
|
|
446
454
|
cost = prior && Number(prior.tasks) > 0 && prior.usd !== null ? { usd: Number(prior.usd) * taskIds.length, basis: `estimate: mean of ${prior.tasks} triage tasks in 7 days` } : { usd: null, basis: "session_costs lands after the triage tasks finish" };
|
|
@@ -707,6 +707,45 @@ export function handoffRow(path: string, r: Route, texts: string[], scripts: Ski
|
|
|
707
707
|
memberIds,
|
|
708
708
|
};
|
|
709
709
|
}
|
|
710
|
+
// Synthesize turns only a few routes into actions a night (shared skill caps), so :latest carries every route it did
|
|
711
|
+
// not act on. A route is consumed when an approved synthesize action cites the handoff KV and one of its members.
|
|
712
|
+
export const ROUTES_KV_REF = "memtax-create:skill-routes";
|
|
713
|
+
export function consumedMembers(synth: unknown): Set<string> {
|
|
714
|
+
const s: any = parse(synth);
|
|
715
|
+
const out = new Set<string>();
|
|
716
|
+
for (const x of Array.isArray(s?.actions) ? s.actions : []) {
|
|
717
|
+
const ev: string[] = Array.isArray(x?.evidence) ? x.evidence.map(String) : [];
|
|
718
|
+
if (!ev.some((e) => e.includes(ROUTES_KV_REF))) continue;
|
|
719
|
+
for (const e of ev) if (e.startsWith("memory:")) out.add(e.slice("memory:".length));
|
|
720
|
+
}
|
|
721
|
+
return out;
|
|
722
|
+
}
|
|
723
|
+
/** Stored routes minus consumed ones, merged by slug with tonight's (union memberIds, tonight's fields win), members
|
|
724
|
+
* whose rows are gone dropped (`live` null = unknown, keep all), largest first. */
|
|
725
|
+
export function carryRoutes(tonight: any[], stored: any[], consumed: Set<string>, live: Set<string> | null) {
|
|
726
|
+
const slugOf = (r: any) => String(r?.slug || String(r?.path ?? "").split("/").pop() || "");
|
|
727
|
+
const namesOf = (r: any) => Object.fromEntries((r?.memberIds ?? []).map((id: string, i: number) => [id, String(r?.memberNames?.[i] ?? "")]));
|
|
728
|
+
const kept = stored.filter((r) => slugOf(r) && !(r.memberIds ?? []).some((id: string) => consumed.has(id)));
|
|
729
|
+
const tonightSlugs = new Set(tonight.map(slugOf));
|
|
730
|
+
const bySlug = new Map<string, any>();
|
|
731
|
+
const names: Record<string, string> = {};
|
|
732
|
+
for (const r of [...kept, ...tonight]) {
|
|
733
|
+
const slug = slugOf(r);
|
|
734
|
+
if (!slug) continue;
|
|
735
|
+
Object.assign(names, Object.fromEntries(Object.entries(namesOf(r)).filter(([, n]) => n)));
|
|
736
|
+
const prev = bySlug.get(slug);
|
|
737
|
+
bySlug.set(slug, { ...prev, ...r, slug, memberIds: [...new Set([...(prev?.memberIds ?? []), ...(r.memberIds ?? []).map(String)])] });
|
|
738
|
+
}
|
|
739
|
+
const routes: any[] = [];
|
|
740
|
+
let gone = 0;
|
|
741
|
+
for (const r of bySlug.values()) {
|
|
742
|
+
const memberIds = live ? r.memberIds.filter((id: string) => live.has(id)) : r.memberIds;
|
|
743
|
+
if (!memberIds.length) gone++;
|
|
744
|
+
else routes.push({ ...r, memberIds, memberNames: memberIds.map((id: string) => names[id] ?? "") });
|
|
745
|
+
}
|
|
746
|
+
routes.sort((x, y) => y.memberIds.length - x.memberIds.length);
|
|
747
|
+
return { routes, carried: routes.filter((r) => !tonightSlugs.has(r.slug)).length, consumed: stored.length - kept.length, gone };
|
|
748
|
+
}
|
|
710
749
|
export const scriptHint = (texts: string[]) => texts.some((t) => /\b(GET|POST|PUT|PATCH|DELETE) \/|\bcurl\b|\bendpoint\b|https?:\/\/[^\s]*\/(v\d|api)\b|x-api-key|Bearer\b/i.test(String(t ?? "")));
|
|
711
750
|
|
|
712
751
|
const KIND_OF_ROOT = (root: string) =>
|
|
@@ -1445,10 +1484,33 @@ async function runScript(args: unknown, ctx: ScriptContext) {
|
|
|
1445
1484
|
let handoff = runDry ? "dry run, not written" : "none";
|
|
1446
1485
|
if (!runDry) {
|
|
1447
1486
|
try {
|
|
1448
|
-
const
|
|
1449
|
-
await ctx.swarm.kv_set({ namespace: NS, key: `memtax-create:skill-routes:${runId}`, value:
|
|
1450
|
-
|
|
1451
|
-
|
|
1487
|
+
const tonight = skillRoutes.map((r) => ({ ...r, memberNames: (r.memberIds ?? []).map((id: string) => memberNames[id] ?? "") }));
|
|
1488
|
+
await ctx.swarm.kv_set({ namespace: NS, key: `memtax-create:skill-routes:${runId}`, value: { runId, at: new Date().toISOString(), routes: tonight } as any });
|
|
1489
|
+
// Tonight's synthesize already read the stored set: drop what it acted on, carry the rest forward.
|
|
1490
|
+
const stored: any = (await ctx.swarm.kv_getOrNull({ namespace: NS, key: "memtax-create:skill-routes:latest" }))?.value;
|
|
1491
|
+
const prior: any[] = Array.isArray(stored?.routes) ? stored.routes : [];
|
|
1492
|
+
let consumed = new Set<string>();
|
|
1493
|
+
try {
|
|
1494
|
+
for (const r of await qStrict(`SELECT json_extract(output, '$.taskOutput') v FROM workflow_run_steps WHERE runId = ? AND nodeId = 'synthesize'`, [runId])) for (const id of consumedMembers(r.v)) consumed.add(id);
|
|
1495
|
+
} catch (e: any) {
|
|
1496
|
+
consumed = new Set();
|
|
1497
|
+
errors.push(`handoff: synthesize step unreadable, nothing marked consumed: ${String(e?.message ?? e).slice(0, 200)}`);
|
|
1498
|
+
}
|
|
1499
|
+
const ids = [...new Set([...prior, ...tonight].flatMap((r: any) => (r?.memberIds ?? []).map(String)))];
|
|
1500
|
+
let live: Set<string> | null = null;
|
|
1501
|
+
try {
|
|
1502
|
+
live = new Set<string>();
|
|
1503
|
+
for (let i = 0; i < ids.length; i += 500) {
|
|
1504
|
+
const part = ids.slice(i, i + 500);
|
|
1505
|
+
for (const r of await qStrict(`SELECT DISTINCT id FROM agent_memory WHERE id IN (${part.map(() => "?").join(",")}) AND (expiresAt IS NULL OR expiresAt > ?)`, [...part, new Date().toISOString()])) live.add(String(r.id));
|
|
1506
|
+
}
|
|
1507
|
+
} catch (e: any) {
|
|
1508
|
+
live = null;
|
|
1509
|
+
errors.push(`handoff: member check failed, kept every member: ${String(e?.message ?? e).slice(0, 200)}`);
|
|
1510
|
+
}
|
|
1511
|
+
const carry = carryRoutes(tonight, prior, consumed, live);
|
|
1512
|
+
await ctx.swarm.kv_set({ namespace: NS, key: "memtax-create:skill-routes:latest", value: { runId, at: new Date().toISOString(), routes: carry.routes } as any });
|
|
1513
|
+
handoff = `KV memtax-create:skill-routes:latest (${carry.routes.length} routes: ${tonight.length} tonight, ${carry.carried} carried, ${carry.consumed} consumed, ${carry.gone} with no live members)`;
|
|
1452
1514
|
} catch (e: any) {
|
|
1453
1515
|
errors.push(`handoff: ${String(e?.message ?? e).slice(0, 200)}`);
|
|
1454
1516
|
handoff = "failed";
|
|
@@ -1799,6 +1861,10 @@ async function runScript(args: unknown, ctx: ScriptContext) {
|
|
|
1799
1861
|
t("handoff: covered how-to -> skill-refactor skill-update, no script", h2.lane === "skill-refactor" && h2.op === "skill-update" && h2.skill === "agentmail-sending" && h2.scriptLane === null, h2);
|
|
1800
1862
|
const h3 = handoffRow("/howto/bluesky", routeCluster("/howto/bluesky", sk), ["POST /xrpc/com.atproto.repo.createRecord with Bearer token"], scr, ["d4", "d5"]);
|
|
1801
1863
|
t("handoff: API how-to with no script -> script candidate", h3.scriptExisting === null && h3.script === true && h3.scriptLane === "scriptify", h3);
|
|
1864
|
+
const cm = consumedMembers(JSON.stringify({ actions: [{ evidence: ["memory:m1", "kv:dreaming-v2/memtax-create:skill-routes:latest"] }, { evidence: ["memory:m9"] }] }));
|
|
1865
|
+
t("carry: only an action citing the handoff KV consumes its members", cm.has("m1") && !cm.has("m9"), [...cm]);
|
|
1866
|
+
const cr = carryRoutes([{ slug: "b", memberIds: ["m4"], memberNames: ["n4"], route: "skill-new" }], [{ slug: "a", memberIds: ["m1"] }, { slug: "b", memberIds: ["m2", "m3"], memberNames: ["n2", "n3"], route: "skill-update" }, { slug: "c", memberIds: ["m5"] }], cm, new Set(["m1", "m2", "m4"]));
|
|
1867
|
+
t("carry: consumed dropped, merged by slug (union), dead members and empty routes dropped, largest first", cr.routes.length === 1 && cr.routes[0].slug === "b" && cr.routes[0].route === "skill-new" && cr.routes[0].memberIds.join() === "m2,m4" && cr.routes[0].memberNames.join() === "n2,n4" && cr.consumed === 1 && cr.gone === 1, cr);
|
|
1802
1868
|
// Near-duplicate guard. Vectors with a known cosine: [1, 0] vs [c, sqrt(1 - c^2)].
|
|
1803
1869
|
const at = (c: number) => [c, Math.sqrt(1 - c * c)];
|
|
1804
1870
|
const o = { nearDupCos: 0.8, twinCos: 0.95 };
|
package/src/be/skill-parser.ts
CHANGED
|
@@ -31,20 +31,32 @@ export function parseSkillContent(content: string): ParsedSkill {
|
|
|
31
31
|
throw new Error("Skill content has unterminated frontmatter. Missing closing ---.");
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
const frontmatterRaw = trimmed.slice(3, secondDelimiter)
|
|
34
|
+
const frontmatterRaw = trimmed.slice(3, secondDelimiter);
|
|
35
35
|
const body = trimmed.slice(secondDelimiter + 3).trim();
|
|
36
36
|
|
|
37
|
-
//
|
|
37
|
+
// Keep permissive single-line values; delegate block scalar semantics to YAML.
|
|
38
38
|
const metadata: Record<string, string> = {};
|
|
39
|
-
|
|
39
|
+
const lines = frontmatterRaw.split("\n");
|
|
40
|
+
for (let i = 0; i < lines.length; i++) {
|
|
41
|
+
const line = lines[i] as string;
|
|
40
42
|
const colonIdx = line.indexOf(":");
|
|
41
43
|
if (colonIdx === -1) continue;
|
|
42
44
|
const key = line.slice(0, colonIdx).trim();
|
|
43
45
|
let value = line.slice(colonIdx + 1).trim();
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
if (/^[>|][-+]?$/.test(value)) {
|
|
47
|
+
const start = i;
|
|
48
|
+
const indentation = line.length - line.trimStart().length;
|
|
49
|
+
while (i + 1 < lines.length) {
|
|
50
|
+
const next = lines[i + 1] as string;
|
|
51
|
+
if (next.trim() && next.length - next.trimStart().length <= indentation) break;
|
|
52
|
+
i++;
|
|
53
|
+
}
|
|
54
|
+
// The final split entry already represents the frontmatter's terminating newline.
|
|
55
|
+
const scalar = lines.slice(start, i + 1).join("\n") + (i < lines.length - 1 ? "\n" : "");
|
|
56
|
+
const block = Bun.YAML.parse(scalar) as Record<string, string>;
|
|
57
|
+
value = block[key] ?? "";
|
|
58
|
+
} else if (value.length >= 2 && value.startsWith('"') && value.endsWith('"')) {
|
|
59
|
+
// Preserve the existing JSON-unescaping and malformed-quote fallback.
|
|
48
60
|
try {
|
|
49
61
|
value = JSON.parse(value) as string;
|
|
50
62
|
} catch {
|
|
@@ -406,6 +406,14 @@ const VALIDATED_KEYS: Record<string, ConfigValidator> = {
|
|
|
406
406
|
return "Invalid SWARM_ENABLED_TOOLS (expected comma-separated tool names or a JSON array of strings)";
|
|
407
407
|
}
|
|
408
408
|
},
|
|
409
|
+
COMPANY_EMAIL_DOMAINS: (value) =>
|
|
410
|
+
typeof value === "string" &&
|
|
411
|
+
value
|
|
412
|
+
.split(",")
|
|
413
|
+
.map((domain) => domain.trim())
|
|
414
|
+
.every((domain) => domain === "" || /^[a-z0-9-]+(\.[a-z0-9-]+)+$/i.test(domain))
|
|
415
|
+
? null
|
|
416
|
+
: "Invalid COMPANY_EMAIL_DOMAINS (expected comma-separated domains, e.g. example.com,example.dev)",
|
|
409
417
|
FEEDBACK_ENDPOINT: (value) => {
|
|
410
418
|
if (typeof value !== "string") {
|
|
411
419
|
return "Invalid FEEDBACK_ENDPOINT (must use HTTPS, or HTTP on a loopback host)";
|
package/src/be/users.ts
CHANGED
|
@@ -687,8 +687,28 @@ export async function mintRuntimeToken(
|
|
|
687
687
|
export async function mintScriptRunToken(
|
|
688
688
|
agentId: string,
|
|
689
689
|
ttlMs: number,
|
|
690
|
+
provenance: { sourceStepId?: string; sourceScriptRunId?: string } = {},
|
|
690
691
|
): Promise<{ tokenId: string; plaintext: string }> {
|
|
691
|
-
|
|
692
|
+
const token = await insertSessionToken(
|
|
693
|
+
agentId,
|
|
694
|
+
null,
|
|
695
|
+
null,
|
|
696
|
+
ttlMs,
|
|
697
|
+
null,
|
|
698
|
+
undefined,
|
|
699
|
+
null,
|
|
700
|
+
null,
|
|
701
|
+
true,
|
|
702
|
+
);
|
|
703
|
+
// Recorded before the plaintext leaves this function, so no request can
|
|
704
|
+
// present the token without its provenance.
|
|
705
|
+
if (provenance.sourceStepId || provenance.sourceScriptRunId) {
|
|
706
|
+
await getDbClient().run(
|
|
707
|
+
"UPDATE session_tokens SET sourceStepId = ?, sourceScriptRunId = ? WHERE id = ?",
|
|
708
|
+
[provenance.sourceStepId ?? null, provenance.sourceScriptRunId ?? null, token.tokenId],
|
|
709
|
+
);
|
|
710
|
+
}
|
|
711
|
+
return token;
|
|
692
712
|
}
|
|
693
713
|
|
|
694
714
|
/** Whether a session token was minted by `mintScriptRunToken`. */
|
|
@@ -956,6 +976,8 @@ export async function resolveSessionToken(
|
|
|
956
976
|
taskId: string | null;
|
|
957
977
|
runtimeId: string | null;
|
|
958
978
|
expiresAt: string;
|
|
979
|
+
sourceStepId?: string | null;
|
|
980
|
+
sourceScriptRunId?: string | null;
|
|
959
981
|
}
|
|
960
982
|
| null
|
|
961
983
|
> {
|
|
@@ -972,9 +994,11 @@ export async function resolveSessionToken(
|
|
|
972
994
|
placement: string | null;
|
|
973
995
|
expiresAt: string;
|
|
974
996
|
revokedAt: string | null;
|
|
997
|
+
sourceStepId: string | null;
|
|
998
|
+
sourceScriptRunId: string | null;
|
|
975
999
|
}>(
|
|
976
1000
|
`SELECT s.id, s.agentId, s.taskId, s.runtimeId, s.controllerId, s.expiresAt, s.revokedAt,
|
|
977
|
-
c.placement FROM session_tokens s LEFT JOIN runtime_controllers c ON c.id = s.controllerId
|
|
1001
|
+
s.sourceStepId, s.sourceScriptRunId, c.placement FROM session_tokens s LEFT JOIN runtime_controllers c ON c.id = s.controllerId
|
|
978
1002
|
WHERE s.tokenHash = ?`,
|
|
979
1003
|
[hash],
|
|
980
1004
|
);
|
|
@@ -1011,6 +1035,9 @@ export async function resolveSessionToken(
|
|
|
1011
1035
|
taskId: row.taskId,
|
|
1012
1036
|
runtimeId: row.runtimeId,
|
|
1013
1037
|
expiresAt: row.expiresAt,
|
|
1038
|
+
...(row.sourceStepId || row.sourceScriptRunId
|
|
1039
|
+
? { sourceStepId: row.sourceStepId, sourceScriptRunId: row.sourceScriptRunId }
|
|
1040
|
+
: {}),
|
|
1014
1041
|
};
|
|
1015
1042
|
}
|
|
1016
1043
|
|