@desplega.ai/agent-swarm 2.7.7 → 2.7.8
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-7b4vk3h5.js → acp-adapter-vg5hqkvj.js} +6 -6
- package/dist/{actions-3tt153af.js → actions-4m1ct4nh.js} +18 -18
- package/dist/{amp-adapter-njpts0yr.js → amp-adapter-txqh7eqj.js} +2 -2
- package/dist/{app-nky4378f.js → app-e00m45gn.js} +3 -3
- package/dist/{assistant-jnb669pa.js → assistant-gd08kr9e.js} +20 -20
- package/dist/boot-args-schema-tjrkpbvm.js +89 -0
- package/dist/{boot-reembed-9mgvaztt.js → boot-reembed-21hbck22.js} +1 -1
- package/dist/{boot-reembed-qs2djdej.js → boot-reembed-mdxd3wgp.js} +1 -1
- package/dist/{boot-scrub-sweep-yjpdj7s1.js → boot-scrub-sweep-qy0zr9t2.js} +3 -3
- package/dist/{boot-seeds-5cm6ambd.js → boot-seeds-n46eaxdv.js} +4 -4
- package/dist/{claude-adapter-fn287zmm.js → claude-adapter-j37w2eds.js} +6 -6
- package/dist/{claude-managed-adapter-dvs2xw5n.js → claude-managed-adapter-8jvcma9a.js} +3 -3
- package/dist/{claude-managed-setup-wtdz2mj2.js → claude-managed-setup-rzkjmgc1.js} +3 -3
- package/dist/{claude-sdk-session-x91kqyhm.js → claude-sdk-session-4k7w73t0.js} +7 -7
- package/dist/{cli-rtt8g4v9.js → cli-0ykgn1h5.js} +1 -1
- package/dist/{cli-5b456bpf.js → cli-1cxrbkk6.js} +2 -2
- package/dist/{cli-5jnhv72d.js → cli-269q28a1.js} +4 -2
- package/dist/{cli-k1nje3v3.js → cli-32m9eda8.js} +49 -37
- package/dist/{cli-35rsp8ye.js → cli-3e4snnzf.js} +1 -1
- package/dist/{cli-5zx699j9.js → cli-4t50yq3j.js} +2 -2
- package/dist/{cli-n6bv12jn.js → cli-5j0m12ns.js} +10 -3
- package/dist/{cli-dhar9qay.js → cli-5ja3b75e.js} +2 -2
- package/dist/{cli-g08zdaec.js → cli-66ww7fer.js} +1 -1
- package/dist/{cli-nmzhp1b5.js → cli-7axf41jq.js} +25 -14
- package/dist/{cli-gz6q4eve.js → cli-84rj785g.js} +5 -5
- package/dist/{cli-fyt2g4wd.js → cli-85gzce7b.js} +5 -5
- package/dist/{cli-3fg0bdcv.js → cli-8h0ayw8c.js} +1 -1
- package/dist/{cli-qghe0h66.js → cli-8rpcng8j.js} +2 -2
- package/dist/{cli-ws19768n.js → cli-8sdejs1f.js} +115 -51
- package/dist/{cli-8305gbq0.js → cli-9m8hdawy.js} +3 -3
- package/dist/{cli-excnnjg2.js → cli-ae0dnfee.js} +1 -1
- package/dist/{cli-e0kmphd6.js → cli-bb0mmdk8.js} +2 -2
- package/dist/{cli-1c6tzt8g.js → cli-bbw9wj9m.js} +8 -8
- package/dist/{cli-pjctyea3.js → cli-bshb7jas.js} +2 -2
- package/dist/{cli-08bmz9z9.js → cli-btfsp3mv.js} +3 -3
- package/dist/{cli-4zsenjhy.js → cli-c0kqky8y.js} +16 -3
- package/dist/{cli-tgrv9cjx.js → cli-dq8x79v8.js} +1 -1
- package/dist/{cli-ftyxyspd.js → cli-eqtfgfr6.js} +1 -1
- package/dist/{cli-ddaanqkd.js → cli-eyg1pa00.js} +3 -3
- package/dist/{cli-8sckt74b.js → cli-fyhr5h4s.js} +34 -12
- package/dist/{cli-q3tkegby.js → cli-fzachfnf.js} +1 -1
- package/dist/{cli-ayayvfg4.js → cli-ga786dzg.js} +13 -10
- package/dist/{cli-yyj3j5m4.js → cli-gazw7kpa.js} +2 -2
- package/dist/{cli-e46hg0xw.js → cli-gvx71kqv.js} +2 -2
- package/dist/{cli-pc6n7fre.js → cli-jdv6ypxs.js} +1 -1
- package/dist/{cli-cm5yqn35.js → cli-kf3pxxdg.js} +1 -0
- package/dist/{cli-6g0hb4cp.js → cli-kyr67fgx.js} +7 -7
- package/dist/{cli-95jzxcp3.js → cli-m0hmeqma.js} +2 -2
- package/dist/{cli-6pfd54vx.js → cli-msg9m2ny.js} +3 -1
- package/dist/{cli-afkqkrtw.js → cli-nbsf8yvn.js} +15 -3
- package/dist/{cli-tfyyvzx6.js → cli-njwac61j.js} +5 -0
- package/dist/{cli-vz22fyqv.js → cli-nn3ysbqk.js} +1 -1
- package/dist/{cli-m0da8j35.js → cli-p3vsj0d3.js} +5 -5
- package/dist/{cli-72v799xn.js → cli-ppjxh6ah.js} +3 -3
- package/dist/{cli-k899ehvh.js → cli-q4ebh7h7.js} +4 -4
- package/dist/{cli-75gkpjvw.js → cli-qd57hhhh.js} +2 -2
- package/dist/{cli-qh4d4tvk.js → cli-rjknb2ae.js} +4 -4
- package/dist/{cli-caj33vcq.js → cli-s4ss5g59.js} +1 -1
- package/dist/{cli-cb2a8pna.js → cli-sq4n7af4.js} +1 -1
- package/dist/{cli-vfym7wmz.js → cli-ssnjfg5p.js} +5 -5
- package/dist/{cli-je518txm.js → cli-t60ajbbp.js} +8 -8
- package/dist/{cli-adeegh7d.js → cli-tpksw2nr.js} +21 -17
- package/dist/{cli-wk5yrfwd.js → cli-w4xnbm46.js} +150 -58
- package/dist/{cli-k8196sh2.js → cli-wemma3jd.js} +8 -7
- package/dist/{cli-cppkf404.js → cli-xq9r2wtt.js} +45 -21
- package/dist/{cli-bfv7vdg6.js → cli-xr8908my.js} +11 -11
- package/dist/{cli-73jzwksr.js → cli-ycscb2ar.js} +4 -1
- package/dist/{cli-p82cnnjq.js → cli-yqefz277.js} +1 -1
- package/dist/{cli-jtjtabxe.js → cli-z1srzaf6.js} +11 -3
- package/dist/{cli-pq73h5mz.js → cli-z75yxkjh.js} +3 -3
- package/dist/{cli-e5bzrn01.js → cli-zkky4t5g.js} +1 -1
- package/dist/cli.js +17 -15
- package/dist/{codex-adapter-cf2yxe9m.js → codex-adapter-88z6psm4.js} +5 -5
- package/dist/{codex-hook-a0c6g6t6.js → codex-hook-fac6175r.js} +1 -1
- package/dist/{codex-login-y0pmff1c.js → codex-login-74wa4hmq.js} +1 -1
- package/dist/{codex-session-runner-6vfzdgbd.js → codex-session-runner-zwbcwzvx.js} +5 -5
- package/dist/{commands-t3mfy7vn.js → commands-7amxs716.js} +3 -3
- package/dist/{controller-q7xrbaz0.js → controller-5rkkc37m.js} +2 -2
- package/dist/{controllers-connect-c6nm70kg.js → controllers-connect-m7d4vxxb.js} +19 -19
- package/dist/{cursor-adapter-ftd81ga8.js → cursor-adapter-x1q18693.js} +1 -1
- package/dist/{db-vemtpmcc.js → db-athc68zt.js} +4 -2
- package/dist/{db-dk572x25.js → db-h2fsfve3.js} +3 -3
- package/dist/{dispatcher-kh7ecxh9.js → dispatcher-b1yz2bnn.js} +17 -17
- package/dist/{dsh-adapter-v8628r89.js → dsh-adapter-e33bkxq9.js} +1 -1
- package/dist/{easter-egg-3d-nenw4x63.js → easter-egg-3d-pv5qnzc8.js} +1 -1
- package/dist/{embedding-space-0jepb239.js → embedding-space-b4txbwrk.js} +6 -6
- package/dist/{embeddings-xxt49yxg.js → embeddings-m6zn6tad.js} +1 -1
- package/dist/{execute-1mhw6e4x.js → execute-68nwny8m.js} +1 -1
- package/dist/{external-channel-55v12e60.js → external-channel-gkckmhzh.js} +2 -2
- package/dist/{fx-adapter-bs8wqrk5.js → fx-adapter-m5jbgd5q.js} +7 -7
- package/dist/{grok-adapter-gpjqmkcq.js → grok-adapter-csvv7sac.js} +7 -7
- package/dist/handlers-8x5gfbzx.js +32 -0
- package/dist/{heartbeat-k42svnr0.js → heartbeat-6c2y3267.js} +20 -20
- package/dist/{hook-6nphweh0.js → hook-q5fv0jy2.js} +6 -6
- package/dist/{hook-114m7hap.js → hook-w0q2wcrv.js} +5 -5
- package/dist/{http-r8cc4wz7.js → http-bxat8dg3.js} +260 -120
- package/dist/{index-nh3wyqdt.js → index-bxrexmfy.js} +13 -13
- package/dist/{index-e3s8wmxy.js → index-cqhqpgrv.js} +1 -1
- package/dist/{index-fpk4bcd9.js → index-fm0czesf.js} +1 -1
- package/dist/index-hpfte8jd.js +33 -0
- package/dist/index-ncf7yb5s.js +30 -0
- package/dist/index-vte6dyeh.js +37 -0
- package/dist/{keepalive-x060nt9p.js → keepalive-qnt21cv0.js} +3 -3
- package/dist/lead-4bvftzm6.js +71 -0
- package/dist/{maintenance-2xxfexhf.js → maintenance-btdr68y4.js} +1 -1
- package/dist/{oauth-refresh-sweep-fckc4ar5.js → oauth-refresh-sweep-vczabeh4.js} +2 -2
- package/dist/{onboard-zc48j237.js → onboard-k33ezyq8.js} +2 -2
- package/dist/{opencode-adapter-r690h1cr.js → opencode-adapter-3dst2ka7.js} +5 -5
- package/dist/{otel-impl-r5xbh81q.js → otel-impl-13am7a65.js} +1 -1
- package/dist/{pi-mono-adapter-c7v8sdec.js → pi-mono-adapter-c53de1gd.js} +15 -9
- package/dist/{pricing-refresh-3pmre11v.js → pricing-refresh-9fcbnq3f.js} +3 -3
- package/dist/{rbac-roles-910mmkgz.js → rbac-roles-66j5h4y5.js} +5 -3
- package/dist/{rbac-roles-3vbshwsb.js → rbac-roles-gw0p9h3j.js} +2 -2
- package/dist/{render-v2-pxykkbab.js → render-v2-fg8bmdn4.js} +3 -3
- package/dist/{resume-adda0bwy.js → resume-1c8kr3nh.js} +6 -6
- package/dist/{runtime-fnbm7stk.js → runtime-tzf9j7tc.js} +1 -1
- package/dist/{session-access-2fvamrdc.js → session-access-d0atq10j.js} +7 -5
- package/dist/{session-source-backfill-08xvv0sm.js → session-source-backfill-0vscqmsa.js} +2 -2
- package/dist/{setup-1aqmvmh1.js → setup-tvfa7rwe.js} +1 -1
- package/dist/{virtual-modules-d2pjk9j1.js → virtual-modules-efxcp740.js} +2 -2
- package/dist/{work-objects-9s0yrm5j.js → work-objects-ks71xqeb.js} +20 -20
- package/dist/worker-e7v2bvm9.js +71 -0
- package/dist/{worker-follow-up-3q78fqmr.js → worker-follow-up-bfx0h9hg.js} +17 -17
- package/openapi.json +104 -24
- package/package.json +3 -1
- package/src/be/db/model-profiles.ts +1 -1
- package/src/be/db/session-tree.ts +9 -5
- package/src/be/db/session-visibility.ts +25 -9
- package/src/be/db/tasks/read.ts +11 -6
- package/src/be/db/tasks/write.ts +77 -7
- package/src/be/db-queries/tracker.ts +4 -2
- package/src/be/db.ts +49 -17
- package/src/be/migrations/271_subscription_usage_model.sql +30 -0
- package/src/be/model-validation.ts +19 -1
- package/src/be/rbac-roles.ts +21 -0
- package/src/be/runtime-pools/routing.ts +1 -1
- package/src/be/scripts/boot-args-schema.ts +95 -0
- package/src/be/scripts/extract-schema.ts +15 -10
- package/src/be/seed-scripts/catalog/boot-triage.inline.ts +1 -1
- package/src/be/seed-scripts/catalog/boot-triage.ts +1 -1
- package/src/be/seed-scripts/catalog/get-child-outputs.ts +1 -1
- package/src/be/seed-scripts/catalog/wait-for-task.ts +1 -1
- package/src/be/swarm-config-guard.ts +7 -0
- package/src/be/users.ts +6 -4
- package/src/commands/claude-managed-setup.ts +1 -1
- package/src/commands/runner.ts +26 -9
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/http/agents.ts +7 -1
- package/src/http/approval-requests.ts +30 -6
- package/src/http/codex-oauth-device.ts +2 -2
- package/src/http/index.ts +8 -0
- package/src/http/mcp-oauth.ts +6 -0
- package/src/http/mcp-servers.ts +8 -0
- package/src/http/models-catalog.ts +1 -1
- package/src/http/pages-public.ts +38 -1
- package/src/http/poll.ts +3 -4
- package/src/http/prompt-templates.ts +1 -1
- package/src/http/schedules.ts +4 -0
- package/src/http/script-runs.ts +6 -1
- package/src/http/session-access.ts +61 -6
- package/src/http/sessions.ts +23 -7
- package/src/http/tasks.ts +53 -9
- package/src/http/users.ts +30 -1
- package/src/http/utils.ts +2 -1
- package/src/http/workflows.ts +11 -7
- package/src/prompts/session-templates.ts +1 -0
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/codex-adapter.ts +9 -2
- package/src/providers/codex-oauth/device.ts +49 -15
- package/src/providers/codex-oauth/flow.ts +2 -1
- package/src/providers/pi-mono-adapter.ts +8 -0
- package/src/providers/pricing-sources.md +16 -1
- package/src/providers/swarm-events-shared.ts +15 -2
- package/src/rbac/legacy-policy.ts +1 -0
- package/src/rbac/permissions.ts +5 -0
- package/src/scheduler/deferred-task-waits.ts +9 -4
- package/src/scripts-runtime/extract-args-schema.ts +3 -1
- package/src/scripts-runtime/swarm-sdk.ts +1 -1
- package/src/scripts-runtime/types/swarm-extension.d.ts +29 -28
- package/src/server-user.ts +1 -1
- package/src/slack/ack.ts +48 -12
- package/src/slack/blocks.ts +1 -0
- package/src/slack/reaction-shortcode.ts +8 -2
- package/src/slack/render-v2.ts +30 -3
- package/src/slack/task-output.ts +4 -1
- package/src/slack/thread-buffer.ts +2 -2
- package/src/tasks/task-skip.ts +28 -0
- package/src/tasks/terminal-result-guard.ts +3 -2
- package/src/telemetry.ts +28 -1
- package/src/tests/agentmail-inbox-mapping.test.ts +73 -0
- package/src/tests/approval-requests.test.ts +58 -0
- package/src/tests/claude-managed-setup.test.ts +36 -0
- package/src/tests/codex-adapter.test.ts +2 -2
- package/src/tests/codex-oauth-device.test.ts +60 -0
- package/src/tests/codex-swarm-events.test.ts +43 -1
- package/src/tests/context-window.test.ts +14 -0
- package/src/tests/db-queries-tracker.test.ts +2 -1
- package/src/tests/db-task-read-contract.test.ts +1 -0
- package/src/tests/db-task-write-contract.test.ts +2 -0
- package/src/tests/deferred-task-wake.test.ts +7 -2
- package/src/tests/e2e-coverage-contract.test.ts +235 -0
- package/src/tests/empty-output-schema.test.ts +160 -0
- package/src/tests/env-flag.test.ts +1 -0
- package/src/tests/explicit-model-validation.test.ts +14 -0
- package/src/tests/http-api-integration.test.ts +2 -2
- package/src/tests/http-users.test.ts +63 -0
- package/src/tests/mcp-input-caps.test.ts +4 -3
- package/src/tests/merge-gate-detect-changes.test.ts +22 -0
- package/src/tests/pages-authed-mode.test.ts +13 -2
- package/src/tests/pi-mono-adapter.test.ts +39 -4
- package/src/tests/rbac-engine.test.ts +1 -0
- package/src/tests/runner-context-usage.test.ts +119 -0
- package/src/tests/script-connections.test.ts +2 -0
- package/src/tests/script-executor-quickjs.test.ts +2 -0
- package/src/tests/script-runs-http.test.ts +57 -0
- package/src/tests/scripts-boot-args-schema.test.ts +181 -0
- package/src/tests/scripts-runtime.test.ts +24 -0
- package/src/tests/sdk-store-progress-skipped.test.ts +155 -0
- package/src/tests/session-costs-model-key-normalize.test.ts +59 -0
- package/src/tests/session-sharing.test.ts +212 -2
- package/src/tests/slack-reaction-config.test.ts +1 -0
- package/src/tests/slack-render-v2.test.ts +73 -0
- package/src/tests/slack-skip-reaction.test.ts +203 -0
- package/src/tests/store-progress-skipped.test.ts +159 -0
- package/src/tests/subscription-usage-migration.test.ts +57 -0
- package/src/tests/swarm-config-reserved-keys.test.ts +3 -0
- package/src/tests/telemetry-endpoint-override.test.ts +27 -0
- package/src/tests/trigger-claiming.test.ts +2 -0
- package/src/tests/workflow-system-one-extraction.test.ts +29 -0
- package/src/tools/create-channel.ts +1 -1
- package/src/tools/defer-task.ts +1 -1
- package/src/tools/register-agentmail-inbox.ts +5 -0
- package/src/tools/repos/update-repo.ts +1 -1
- package/src/tools/request-human-input.ts +1 -1
- package/src/tools/send-task.ts +1 -1
- package/src/tools/store-progress.ts +39 -8
- package/src/tools/tracker/tracker-unlink.ts +2 -1
- package/src/tools/workflows/retry-workflow-run.ts +3 -0
- package/src/types.ts +11 -2
- package/src/utils/context-window.ts +6 -1
- package/src/utils/output-schema.ts +23 -0
- package/src/workflows/executors/system-one-providers.ts +25 -6
- package/src/workflows/recovery.ts +8 -4
- package/src/workflows/resume.ts +19 -0
- package/dist/handlers-zxmp1ta4.js +0 -32
- package/dist/index-a8phxqnk.js +0 -37
- package/dist/index-k6h00t4c.js +0 -30
- package/dist/index-xrz7te8h.js +0 -33
- package/dist/lead-956sd2yc.js +0 -71
- package/dist/worker-y15hy08h.js +0 -71
|
@@ -1869,7 +1869,7 @@ describe("PiMonoSession — per-call usage line", () => {
|
|
|
1869
1869
|
}
|
|
1870
1870
|
|
|
1871
1871
|
test("one call_usage raw_log line per assistant message_end with usage", async () => {
|
|
1872
|
-
const { events } = await runWithEvents([
|
|
1872
|
+
const { events, result } = await runWithEvents([
|
|
1873
1873
|
assistantEnd([{ type: "toolCall", id: "call-1", name: "bash", arguments: {} }], {
|
|
1874
1874
|
input: 120,
|
|
1875
1875
|
cacheRead: 9_000,
|
|
@@ -1880,11 +1880,20 @@ describe("PiMonoSession — per-call usage line", () => {
|
|
|
1880
1880
|
}),
|
|
1881
1881
|
{
|
|
1882
1882
|
type: "message_end",
|
|
1883
|
-
message: {
|
|
1883
|
+
message: {
|
|
1884
|
+
role: "user",
|
|
1885
|
+
content: [{ type: "text", text: "tool output" }],
|
|
1886
|
+
usage: { reasoning: 999 },
|
|
1887
|
+
},
|
|
1884
1888
|
} as unknown as AgentSessionEvent,
|
|
1885
1889
|
// No usage (some providers omit it): no line.
|
|
1886
1890
|
assistantEnd([{ type: "text", text: "thinking out loud" }]),
|
|
1887
|
-
assistantEnd([{ type: "text", text: "Done" }], {
|
|
1891
|
+
assistantEnd([{ type: "text", text: "Done" }], {
|
|
1892
|
+
input: 5,
|
|
1893
|
+
cacheRead: 9_500,
|
|
1894
|
+
output: 3,
|
|
1895
|
+
reasoning: 2,
|
|
1896
|
+
}),
|
|
1888
1897
|
]);
|
|
1889
1898
|
|
|
1890
1899
|
const raw = events.flatMap((e) =>
|
|
@@ -1900,9 +1909,13 @@ describe("PiMonoSession — per-call usage line", () => {
|
|
|
1900
1909
|
{
|
|
1901
1910
|
type: "call_usage",
|
|
1902
1911
|
harness: "pi",
|
|
1903
|
-
usage: { input: 5, cacheRead: 9_500, cacheWrite: 0, output: 3, reasoning:
|
|
1912
|
+
usage: { input: 5, cacheRead: 9_500, cacheWrite: 0, output: 3, reasoning: 2 },
|
|
1904
1913
|
},
|
|
1905
1914
|
]);
|
|
1915
|
+
expect(result.cost?.reasoningOutputTokens).toBe(14);
|
|
1916
|
+
expect(events.findLast((event) => event.type === "result")?.cost.reasoningOutputTokens).toBe(
|
|
1917
|
+
14,
|
|
1918
|
+
);
|
|
1906
1919
|
// The usage line precedes the call's own text line.
|
|
1907
1920
|
const done = raw.findIndex(
|
|
1908
1921
|
(line) => line.type === "assistant" && JSON.stringify(line).includes('"Done"'),
|
|
@@ -1912,4 +1925,26 @@ describe("PiMonoSession — per-call usage line", () => {
|
|
|
1912
1925
|
// Token counts only: no message content rides on the line.
|
|
1913
1926
|
expect(JSON.stringify(usageLines)).not.toContain("tool output");
|
|
1914
1927
|
});
|
|
1928
|
+
|
|
1929
|
+
test("retains partial reasoning usage when the assistant fails", async () => {
|
|
1930
|
+
const { result } = await runWithEvents([
|
|
1931
|
+
assistantEnd([{ type: "text", text: "Partial reply" }], {
|
|
1932
|
+
input: 5,
|
|
1933
|
+
output: 20,
|
|
1934
|
+
reasoning: 12,
|
|
1935
|
+
}),
|
|
1936
|
+
{
|
|
1937
|
+
type: "message_end",
|
|
1938
|
+
message: {
|
|
1939
|
+
role: "assistant",
|
|
1940
|
+
content: [],
|
|
1941
|
+
stopReason: "error",
|
|
1942
|
+
errorMessage: "request failed",
|
|
1943
|
+
usage: { input: 5, output: 10, reasoning: 8 },
|
|
1944
|
+
},
|
|
1945
|
+
} as unknown as AgentSessionEvent,
|
|
1946
|
+
]);
|
|
1947
|
+
expect(result.isError).toBe(true);
|
|
1948
|
+
expect(result.cost?.reasoningOutputTokens).toBe(20);
|
|
1949
|
+
});
|
|
1915
1950
|
});
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { afterAll, afterEach, beforeAll, describe, expect, test } from "bun:test";
|
|
2
|
+
import { spawnProviderProcess } from "../commands/runner";
|
|
3
|
+
import type { CostData, ProviderEvent, ProviderSessionConfig } from "../providers/types";
|
|
4
|
+
import { getContextWindowSize } from "../utils/context-window";
|
|
5
|
+
|
|
6
|
+
const originalFetch = globalThis.fetch;
|
|
7
|
+
const directory = `${import.meta.dir}/../../work/runner-context-${crypto.randomUUID()}`;
|
|
8
|
+
|
|
9
|
+
beforeAll(async () => {
|
|
10
|
+
await Bun.$`mkdir -p ${directory}`.quiet();
|
|
11
|
+
});
|
|
12
|
+
afterAll(async () => {
|
|
13
|
+
await Bun.$`rm -rf ${directory}`.quiet();
|
|
14
|
+
});
|
|
15
|
+
afterEach(() => {
|
|
16
|
+
globalThis.fetch = originalFetch;
|
|
17
|
+
});
|
|
18
|
+
|
|
19
|
+
describe("runner completion context", () => {
|
|
20
|
+
for (const harness of ["pi", "codex"] as const) {
|
|
21
|
+
for (const withLiveWindow of [true, false]) {
|
|
22
|
+
test(`${harness}: ${withLiveWindow ? "retains the latest throttled live window" : "falls back to the catalog without live usage"}`, async () => {
|
|
23
|
+
const snapshots: Array<Record<string, unknown>> = [];
|
|
24
|
+
globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => {
|
|
25
|
+
const path = new URL(input instanceof Request ? input.url : input.toString()).pathname;
|
|
26
|
+
if (path === "/api/config/resolved") {
|
|
27
|
+
// Keep Codex on a fake gateway so the runner never reads local OAuth credentials.
|
|
28
|
+
return Response.json({
|
|
29
|
+
configs: [
|
|
30
|
+
{ key: "CODEX_GATEWAY_BASE_URL", value: "https://gateway.invalid/v1" },
|
|
31
|
+
{ key: "CODEX_GATEWAY_API_KEY", value: "example-gateway-key" },
|
|
32
|
+
],
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
if (path.endsWith("/context")) snapshots.push(JSON.parse(String(init?.body)));
|
|
36
|
+
return Response.json({ configs: [], enabled: false });
|
|
37
|
+
}) as typeof fetch;
|
|
38
|
+
|
|
39
|
+
const model = harness === "pi" ? "openai-codex/gpt-5.6-luna" : "gpt-5.6-luna";
|
|
40
|
+
const cost: CostData = {
|
|
41
|
+
sessionId: "provider-session",
|
|
42
|
+
agentId: crypto.randomUUID(),
|
|
43
|
+
totalCostUsd: 0,
|
|
44
|
+
inputTokens: 100,
|
|
45
|
+
outputTokens: 50,
|
|
46
|
+
model,
|
|
47
|
+
durationMs: 1,
|
|
48
|
+
numTurns: 1,
|
|
49
|
+
isError: false,
|
|
50
|
+
provider: harness,
|
|
51
|
+
};
|
|
52
|
+
let configuredModel: string | undefined;
|
|
53
|
+
const adapter = {
|
|
54
|
+
name: harness,
|
|
55
|
+
traits: {},
|
|
56
|
+
async createSession(config: ProviderSessionConfig) {
|
|
57
|
+
configuredModel = config.model;
|
|
58
|
+
return {
|
|
59
|
+
sessionId: "provider-session",
|
|
60
|
+
onEvent(listener: (event: ProviderEvent) => void) {
|
|
61
|
+
listener({ type: "session_init", sessionId: "provider-session" });
|
|
62
|
+
if (withLiveWindow) {
|
|
63
|
+
// Only the first progress event is posted. A later unknown window
|
|
64
|
+
// must not erase the second event's authoritative live limit.
|
|
65
|
+
for (const contextTotalTokens of [258_400, 272_000, null, 0]) {
|
|
66
|
+
listener({
|
|
67
|
+
type: "context_usage",
|
|
68
|
+
contextUsedTokens: 1000,
|
|
69
|
+
contextTotalTokens,
|
|
70
|
+
contextPercent: 1,
|
|
71
|
+
outputTokens: 50,
|
|
72
|
+
contextFormula: "harness-reported",
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
},
|
|
77
|
+
async waitForCompletion() {
|
|
78
|
+
return { exitCode: 0, isError: false, cost };
|
|
79
|
+
},
|
|
80
|
+
async abort() {},
|
|
81
|
+
};
|
|
82
|
+
},
|
|
83
|
+
} as unknown as Parameters<typeof spawnProviderProcess>[0];
|
|
84
|
+
|
|
85
|
+
const running = await spawnProviderProcess(
|
|
86
|
+
adapter,
|
|
87
|
+
{
|
|
88
|
+
prompt: "hello",
|
|
89
|
+
systemPrompt: "fixture",
|
|
90
|
+
logFile: `${directory}/session.jsonl`,
|
|
91
|
+
role: "worker",
|
|
92
|
+
apiUrl: "http://runner.invalid",
|
|
93
|
+
apiKey: "example-runner-key",
|
|
94
|
+
agentId: cost.agentId,
|
|
95
|
+
runnerSessionId: crypto.randomUUID(),
|
|
96
|
+
iteration: 1,
|
|
97
|
+
taskId: crypto.randomUUID(),
|
|
98
|
+
model,
|
|
99
|
+
harnessProvider: harness,
|
|
100
|
+
cwd: directory,
|
|
101
|
+
},
|
|
102
|
+
directory,
|
|
103
|
+
true,
|
|
104
|
+
);
|
|
105
|
+
await running.promise;
|
|
106
|
+
expect(configuredModel).toBe(model);
|
|
107
|
+
const completion = snapshots.find((snapshot) => snapshot.eventType === "completion");
|
|
108
|
+
expect(completion?.contextTotalTokens).toBe(
|
|
109
|
+
withLiveWindow ? 272_000 : getContextWindowSize(model),
|
|
110
|
+
);
|
|
111
|
+
expect(completion?.cumulativeInputTokens).toBe(100);
|
|
112
|
+
expect(completion?.cumulativeOutputTokens).toBe(50);
|
|
113
|
+
expect(snapshots.filter((snapshot) => snapshot.eventType === "progress")).toHaveLength(
|
|
114
|
+
withLiveWindow ? 1 : 0,
|
|
115
|
+
);
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
});
|
|
@@ -680,6 +680,8 @@ describe("script connections", () => {
|
|
|
680
680
|
markMigrationApplied(database, "266_script_runs_source_task.sql");
|
|
681
681
|
// 269 alters pages, which this migration-112-only fixture does not create.
|
|
682
682
|
markMigrationApplied(database, "269_pages_design_system.sql");
|
|
683
|
+
// 271 normalizes session_costs, which this migration-112-only fixture lacks.
|
|
684
|
+
markMigrationApplied(database, "271_subscription_usage_model.sql");
|
|
683
685
|
|
|
684
686
|
const id = crypto.randomUUID();
|
|
685
687
|
const now = new Date().toISOString();
|
|
@@ -20,6 +20,8 @@ function hangUntilAborted(req: Request): Promise<Response> {
|
|
|
20
20
|
hang.aborted++;
|
|
21
21
|
resolve(new Response("aborted"));
|
|
22
22
|
});
|
|
23
|
+
// Bun reports canceled uploads only when the handler consumes their bodies.
|
|
24
|
+
void req.arrayBuffer().catch(() => {});
|
|
23
25
|
});
|
|
24
26
|
}
|
|
25
27
|
async function waitFor(check: () => boolean, timeoutMs = 3_000): Promise<boolean> {
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
getLatestTaskByContextKey,
|
|
16
16
|
getPendingTaskForAgent,
|
|
17
17
|
initDb,
|
|
18
|
+
skipTask,
|
|
18
19
|
updateScriptRun,
|
|
19
20
|
} from "../be/db";
|
|
20
21
|
import * as modelValidation from "../be/model-validation";
|
|
@@ -24,6 +25,7 @@ import { handleScriptRuns } from "../http/script-runs";
|
|
|
24
25
|
import { getPathSegments, parseQueryParams } from "../http/utils";
|
|
25
26
|
import { localProcessScriptExecutor } from "../script-workflows/executor";
|
|
26
27
|
import { setScriptRunExecutor } from "../script-workflows/supervisor";
|
|
28
|
+
import { buildWorkflowCtx } from "../script-workflows/workflow-ctx";
|
|
27
29
|
import {
|
|
28
30
|
FOLLOW_UP_DISPATCH_CAP,
|
|
29
31
|
FOLLOW_UP_DISPATCH_WINDOW_MINUTES,
|
|
@@ -700,6 +702,61 @@ describe("/api/script-runs HTTP", () => {
|
|
|
700
702
|
expect(await response.json()).toEqual({ taskId: step?.id, taskOutput: stepOutput });
|
|
701
703
|
});
|
|
702
704
|
|
|
705
|
+
for (const failOnTaskFailure of [undefined, false] as const) {
|
|
706
|
+
test(`a skipped agent-task step settles the ctx.step.agentTask wait (failOnTaskFailure: ${failOnTaskFailure ?? "default"})`, async () => {
|
|
707
|
+
const created = await dispatch("/api/script-runs", {
|
|
708
|
+
method: "POST",
|
|
709
|
+
agentId,
|
|
710
|
+
body: createBody(),
|
|
711
|
+
});
|
|
712
|
+
const { id: runId } = (await created.json()) as { id: string };
|
|
713
|
+
// Drive the real ctx through these handlers, not a canned 409.
|
|
714
|
+
const realFetch = globalThis.fetch;
|
|
715
|
+
globalThis.fetch = (async (url: unknown, init?: RequestInit) => {
|
|
716
|
+
const { pathname, search } = new URL(String(url));
|
|
717
|
+
const response = await dispatch(pathname + search, {
|
|
718
|
+
...init,
|
|
719
|
+
headers: Object.fromEntries(new Headers(init?.headers).entries()),
|
|
720
|
+
});
|
|
721
|
+
return new Response(response.text || null, { status: response.status });
|
|
722
|
+
}) as typeof fetch;
|
|
723
|
+
try {
|
|
724
|
+
const { ctx } = buildWorkflowCtx({
|
|
725
|
+
runId,
|
|
726
|
+
agentId,
|
|
727
|
+
apiKey: API_KEY,
|
|
728
|
+
baseUrl: "http://script-runs.test",
|
|
729
|
+
args: {},
|
|
730
|
+
});
|
|
731
|
+
const step = ctx.step.agentTask("triage", {
|
|
732
|
+
task: "triage the thread",
|
|
733
|
+
timeoutMs: 5_000,
|
|
734
|
+
...(failOnTaskFailure === false ? { failOnTaskFailure } : {}),
|
|
735
|
+
});
|
|
736
|
+
const settled = step.then(
|
|
737
|
+
(value) => ({ value }),
|
|
738
|
+
(error: unknown) => ({ error }),
|
|
739
|
+
);
|
|
740
|
+
|
|
741
|
+
await Bun.sleep(50);
|
|
742
|
+
const task = await getLatestScriptRunStepTaskByContextKey(`script-run:${runId}:triage`);
|
|
743
|
+
expect(task).not.toBeNull();
|
|
744
|
+
await skipTask(task!.id, "Not mine.");
|
|
745
|
+
|
|
746
|
+
const outcome = await settled;
|
|
747
|
+
if (failOnTaskFailure === false) {
|
|
748
|
+
expect(outcome).toEqual({
|
|
749
|
+
value: { taskId: task!.id, status: "failed", error: "Agent task skipped" },
|
|
750
|
+
});
|
|
751
|
+
} else {
|
|
752
|
+
expect(String((outcome as { error?: unknown }).error)).toContain("Agent task skipped");
|
|
753
|
+
}
|
|
754
|
+
} finally {
|
|
755
|
+
globalThis.fetch = realFetch;
|
|
756
|
+
}
|
|
757
|
+
}, 15_000);
|
|
758
|
+
}
|
|
759
|
+
|
|
703
760
|
describe("agent-task parentTaskId attach gate", () => {
|
|
704
761
|
let foreignAgentId: string;
|
|
705
762
|
|
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
import { afterAll, beforeAll, beforeEach, describe, expect, spyOn, test } from "bun:test";
|
|
2
|
+
import { unlink } from "node:fs/promises";
|
|
3
|
+
import { closeDb, getDbClient, initDb } from "../be/db";
|
|
4
|
+
import { runBootArgsSchemaBackfill } from "../be/scripts/boot-args-schema";
|
|
5
|
+
import { getScript, listScriptVersions, upsertScriptByName } from "../be/scripts/db";
|
|
6
|
+
|
|
7
|
+
const TEST_DB_PATH = "./test-scripts-boot-args-schema.sqlite";
|
|
8
|
+
|
|
9
|
+
const signatureJson = JSON.stringify({
|
|
10
|
+
argsType: "{ n: number }",
|
|
11
|
+
resultType: "Promise<number>",
|
|
12
|
+
description: "",
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
const defaultedSource = `
|
|
16
|
+
import { z } from "zod";
|
|
17
|
+
export const argsSchema = z.object({ n: z.number(), scale: z.number().default(2) });
|
|
18
|
+
export default async (args: z.infer<typeof argsSchema>) => args.n * args.scale;
|
|
19
|
+
`;
|
|
20
|
+
|
|
21
|
+
// What `toJSONSchema(argsSchema)` produced before `io: "input"`: `scale` is required.
|
|
22
|
+
const STALE_SCHEMA = JSON.stringify({
|
|
23
|
+
$schema: "https://json-schema.org/draft/2020-12/schema",
|
|
24
|
+
type: "object",
|
|
25
|
+
properties: { n: { type: "number" }, scale: { default: 2, type: "number" } },
|
|
26
|
+
required: ["n", "scale"],
|
|
27
|
+
additionalProperties: false,
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
async function clearDb() {
|
|
31
|
+
for (const suffix of ["", "-wal", "-shm"]) {
|
|
32
|
+
try {
|
|
33
|
+
await unlink(TEST_DB_PATH + suffix);
|
|
34
|
+
} catch {}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
async function seed(
|
|
39
|
+
name: string,
|
|
40
|
+
overrides: Partial<Parameters<typeof upsertScriptByName>[0]> = {},
|
|
41
|
+
) {
|
|
42
|
+
const { script } = await upsertScriptByName({
|
|
43
|
+
name,
|
|
44
|
+
scope: "global",
|
|
45
|
+
source: defaultedSource,
|
|
46
|
+
description: "Script with a defaulted arg",
|
|
47
|
+
intent: "Boot args schema backfill test",
|
|
48
|
+
signatureJson,
|
|
49
|
+
argsJsonSchema: STALE_SCHEMA,
|
|
50
|
+
embeddingMode: "skip",
|
|
51
|
+
...overrides,
|
|
52
|
+
});
|
|
53
|
+
return script;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
function requiredOf(schema: string | null | undefined): string[] {
|
|
57
|
+
return (JSON.parse(schema as string) as { required: string[] }).required;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** Runs the backfill and returns its `rewrote N of M` summary line. */
|
|
61
|
+
async function runAndReadSummary(): Promise<string | undefined> {
|
|
62
|
+
const log = spyOn(console, "log");
|
|
63
|
+
try {
|
|
64
|
+
await runBootArgsSchemaBackfill();
|
|
65
|
+
return log.mock.calls
|
|
66
|
+
.map((call) => String(call[0]))
|
|
67
|
+
.find((line) => line.startsWith("[boot-args-schema]"));
|
|
68
|
+
} finally {
|
|
69
|
+
log.mockRestore();
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
beforeAll(async () => {
|
|
74
|
+
await clearDb();
|
|
75
|
+
initDb(TEST_DB_PATH);
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
afterAll(async () => {
|
|
79
|
+
closeDb();
|
|
80
|
+
await clearDb();
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
beforeEach(async () => {
|
|
84
|
+
await getDbClient().run("DELETE FROM scripts");
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
describe("boot-args-schema backfill", () => {
|
|
88
|
+
test("fixes a stale schema in place for every scope, then a second run rewrites 0", async () => {
|
|
89
|
+
const global = await seed("stale-global");
|
|
90
|
+
const agent = await seed("stale-agent", { scope: "agent", scopeId: "agent-1" });
|
|
91
|
+
expect(requiredOf(global.argsJsonSchema)).toEqual(["n", "scale"]);
|
|
92
|
+
|
|
93
|
+
expect(await runAndReadSummary()).toBe("[boot-args-schema] rewrote 2 of 2 script schemas");
|
|
94
|
+
|
|
95
|
+
for (const before of [global, agent]) {
|
|
96
|
+
const after = await getScript({
|
|
97
|
+
name: before.name,
|
|
98
|
+
scope: before.scope,
|
|
99
|
+
scopeId: before.scopeId,
|
|
100
|
+
});
|
|
101
|
+
const schema = JSON.parse(after?.argsJsonSchema as string) as {
|
|
102
|
+
required: string[];
|
|
103
|
+
properties: { scale: { default: number } };
|
|
104
|
+
};
|
|
105
|
+
expect(schema.required).toEqual(["n"]);
|
|
106
|
+
expect(schema.properties.scale.default).toBe(2);
|
|
107
|
+
// In place: same version, same timestamps, no new history row.
|
|
108
|
+
expect(after?.version).toBe(before.version);
|
|
109
|
+
expect(after?.updatedAt).toBe(before.updatedAt);
|
|
110
|
+
expect(await listScriptVersions(before.id)).toHaveLength(1);
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
expect(await runAndReadSummary()).toBe("[boot-args-schema] rewrote 0 of 2 script schemas");
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
test("keeps malformed schema JSON and skips scratch and schema-less rows", async () => {
|
|
117
|
+
const keep = await seed("malformed-schema", { argsJsonSchema: "{" });
|
|
118
|
+
await seed("scratch-stale", { scope: "agent", scopeId: "agent-1", isScratch: true });
|
|
119
|
+
await seed("never-had-schema", { argsJsonSchema: null });
|
|
120
|
+
|
|
121
|
+
// Only `keep` is examined: the scratch row and the null-schema row are filtered out.
|
|
122
|
+
expect(await runAndReadSummary()).toBe("[boot-args-schema] rewrote 0 of 1 script schemas");
|
|
123
|
+
|
|
124
|
+
const after = await getScript({ name: keep.name, scope: "global" });
|
|
125
|
+
expect(after?.argsJsonSchema).toBe("{");
|
|
126
|
+
const scratch = await getScript({
|
|
127
|
+
name: "scratch-stale",
|
|
128
|
+
scope: "agent",
|
|
129
|
+
scopeId: "agent-1",
|
|
130
|
+
});
|
|
131
|
+
expect(scratch?.argsJsonSchema).toBe(STALE_SCHEMA);
|
|
132
|
+
const bare = await getScript({ name: "never-had-schema", scope: "global" });
|
|
133
|
+
expect(bare?.argsJsonSchema).toBeNull();
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
test("never executes stored source, including on repeated boots", async () => {
|
|
137
|
+
const marker = `${process.cwd()}/${TEST_DB_PATH}.${crypto.randomUUID()}.marker`;
|
|
138
|
+
const file = Bun.file(marker);
|
|
139
|
+
try {
|
|
140
|
+
await seed("side-effects", {
|
|
141
|
+
source: `${defaultedSource}\nawait Bun.write(${JSON.stringify(marker)}, "executed");`,
|
|
142
|
+
});
|
|
143
|
+
expect(await runAndReadSummary()).toBe("[boot-args-schema] rewrote 1 of 1 script schemas");
|
|
144
|
+
expect(await file.exists()).toBe(false);
|
|
145
|
+
expect(await runAndReadSummary()).toBe("[boot-args-schema] rewrote 0 of 1 script schemas");
|
|
146
|
+
expect(await file.exists()).toBe(false);
|
|
147
|
+
} finally {
|
|
148
|
+
await file.delete().catch(() => {});
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
test("normalizes nested schema nodes and preserves literal defaults", async () => {
|
|
153
|
+
const literal = { required: ["x"], properties: { x: { type: "number", default: 1 } } };
|
|
154
|
+
const nested = {
|
|
155
|
+
type: "object",
|
|
156
|
+
properties: {
|
|
157
|
+
options: {
|
|
158
|
+
type: "array",
|
|
159
|
+
items: {
|
|
160
|
+
type: "object",
|
|
161
|
+
properties: { value: { type: "object", default: literal } },
|
|
162
|
+
required: ["value"],
|
|
163
|
+
},
|
|
164
|
+
},
|
|
165
|
+
},
|
|
166
|
+
required: ["options"],
|
|
167
|
+
};
|
|
168
|
+
await seed("nested", { argsJsonSchema: JSON.stringify(nested) });
|
|
169
|
+
expect(await runAndReadSummary()).toBe("[boot-args-schema] rewrote 1 of 1 script schemas");
|
|
170
|
+
const after = await getScript({ name: "nested", scope: "global" });
|
|
171
|
+
const schema = JSON.parse(after?.argsJsonSchema as string);
|
|
172
|
+
expect(schema.required).toEqual(["options"]);
|
|
173
|
+
expect(schema.properties.options.items.required).toBeUndefined();
|
|
174
|
+
expect(schema.properties.options.items.properties.value.default).toEqual(literal);
|
|
175
|
+
});
|
|
176
|
+
|
|
177
|
+
test("no-ops without logging when no script has a stored schema", async () => {
|
|
178
|
+
await seed("bare", { argsJsonSchema: null });
|
|
179
|
+
expect(await runAndReadSummary()).toBeUndefined();
|
|
180
|
+
});
|
|
181
|
+
});
|
|
@@ -582,6 +582,30 @@ describe("runScript", () => {
|
|
|
582
582
|
});
|
|
583
583
|
}
|
|
584
584
|
|
|
585
|
+
spawnTest(
|
|
586
|
+
"extracted args schema leaves defaulted fields optional and keeps their default",
|
|
587
|
+
async () => {
|
|
588
|
+
const schema = await extractArgsJsonSchema(`
|
|
589
|
+
import { z } from "zod";
|
|
590
|
+
export const argsSchema = z.object({
|
|
591
|
+
n: z.number(),
|
|
592
|
+
scale: z.number().default(2),
|
|
593
|
+
nested: z.object({ a: z.number().default(1), b: z.string() }).default({ a: 1, b: "x" }),
|
|
594
|
+
});
|
|
595
|
+
export default async (args: z.infer<typeof argsSchema>) => args.n * args.scale;
|
|
596
|
+
`);
|
|
597
|
+
expect(schema).not.toBeNull();
|
|
598
|
+
const parsed = JSON.parse(schema!) as {
|
|
599
|
+
required: string[];
|
|
600
|
+
properties: Record<string, { default?: unknown; required?: string[] }>;
|
|
601
|
+
};
|
|
602
|
+
expect(parsed.required).toEqual(["n"]);
|
|
603
|
+
expect(parsed.properties.scale?.default).toBe(2);
|
|
604
|
+
expect(parsed.properties.nested?.default).toEqual({ a: 1, b: "x" });
|
|
605
|
+
expect(parsed.properties.nested?.required).toEqual(["b"]);
|
|
606
|
+
},
|
|
607
|
+
);
|
|
608
|
+
|
|
585
609
|
spawnTest("script without argsSchema still works (backward-compat)", async () => {
|
|
586
610
|
const output = await runScript({
|
|
587
611
|
agentId: "agent-1",
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
import { afterAll, beforeAll, describe, expect, test } from "bun:test";
|
|
2
|
+
import { unlink } from "node:fs/promises";
|
|
3
|
+
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
4
|
+
import { Readable } from "node:stream";
|
|
5
|
+
import {
|
|
6
|
+
closeDb,
|
|
7
|
+
createAgent,
|
|
8
|
+
createTaskExtended,
|
|
9
|
+
getDbClient,
|
|
10
|
+
getTaskById,
|
|
11
|
+
initDb,
|
|
12
|
+
startTask,
|
|
13
|
+
} from "../be/db";
|
|
14
|
+
import { handleCore } from "../http/core";
|
|
15
|
+
import { handleTasks } from "../http/tasks";
|
|
16
|
+
import { getPathSegments, parseQueryParams } from "../http/utils";
|
|
17
|
+
import { SwarmConfig } from "../scripts-runtime/swarm-config";
|
|
18
|
+
import { createSwarmSdk } from "../scripts-runtime/swarm-sdk";
|
|
19
|
+
|
|
20
|
+
// ctx.swarm.task_storeProgress({ status: "skipped" }) must end the task as
|
|
21
|
+
// skipped through the real HTTP route, keeping the reason, like the MCP tool.
|
|
22
|
+
|
|
23
|
+
const TEST_DB_PATH = "./test-sdk-store-progress-skipped.sqlite";
|
|
24
|
+
const API_KEY = "example-test-sdk-store-progress-skipped-key-1234567890";
|
|
25
|
+
|
|
26
|
+
let agentId: string;
|
|
27
|
+
let httpServer: ReturnType<typeof Bun.serve>;
|
|
28
|
+
let savedApiKey: string | undefined;
|
|
29
|
+
|
|
30
|
+
async function removeDbFiles(): Promise<void> {
|
|
31
|
+
for (const suffix of ["", "-wal", "-shm"]) {
|
|
32
|
+
try {
|
|
33
|
+
await unlink(TEST_DB_PATH + suffix);
|
|
34
|
+
} catch (error) {
|
|
35
|
+
if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** Run one request through the real core + tasks handlers. */
|
|
41
|
+
async function handle(request: Request): Promise<Response> {
|
|
42
|
+
const url = new URL(request.url);
|
|
43
|
+
const body = await request.text();
|
|
44
|
+
const req = Readable.from(body ? [Buffer.from(body)] : []) as IncomingMessage;
|
|
45
|
+
req.method = request.method;
|
|
46
|
+
req.url = url.pathname + url.search;
|
|
47
|
+
req.headers = Object.fromEntries(request.headers.entries());
|
|
48
|
+
|
|
49
|
+
let status = 200;
|
|
50
|
+
let text = "";
|
|
51
|
+
const res = {
|
|
52
|
+
headersSent: false,
|
|
53
|
+
writableEnded: false,
|
|
54
|
+
setHeader() {},
|
|
55
|
+
writeHead(code: number) {
|
|
56
|
+
status = code;
|
|
57
|
+
this.headersSent = true;
|
|
58
|
+
return this;
|
|
59
|
+
},
|
|
60
|
+
end(chunk?: unknown) {
|
|
61
|
+
if (chunk !== undefined) text += String(chunk);
|
|
62
|
+
this.writableEnded = true;
|
|
63
|
+
return this;
|
|
64
|
+
},
|
|
65
|
+
} as unknown as ServerResponse;
|
|
66
|
+
|
|
67
|
+
const requestAgentId = req.headers["x-agent-id"] as string | undefined;
|
|
68
|
+
if (!(await handleCore(req, res, requestAgentId, API_KEY))) {
|
|
69
|
+
const pathSegments = getPathSegments(req.url || "");
|
|
70
|
+
const queryParams = parseQueryParams(req.url || "");
|
|
71
|
+
if (!(await handleTasks(req, res, pathSegments, queryParams, requestAgentId))) {
|
|
72
|
+
return new Response("Not Found", { status: 404 });
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return new Response(text, { status, headers: { "Content-Type": "application/json" } });
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
function sdk() {
|
|
79
|
+
return createSwarmSdk(
|
|
80
|
+
new SwarmConfig({
|
|
81
|
+
system: {
|
|
82
|
+
apiKey: { value: API_KEY, isSecret: true },
|
|
83
|
+
agentId: { value: agentId, isSecret: false },
|
|
84
|
+
mcpBaseUrl: { value: `http://127.0.0.1:${httpServer.port}`, isSecret: false },
|
|
85
|
+
},
|
|
86
|
+
user: {},
|
|
87
|
+
}),
|
|
88
|
+
);
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
async function startedTask(text: string) {
|
|
92
|
+
const row = await createTaskExtended(text, { agentId, source: "mcp" });
|
|
93
|
+
await startTask(row.id);
|
|
94
|
+
return row;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
beforeAll(async () => {
|
|
98
|
+
savedApiKey = process.env.AGENT_SWARM_API_KEY;
|
|
99
|
+
process.env.AGENT_SWARM_API_KEY = API_KEY;
|
|
100
|
+
await removeDbFiles();
|
|
101
|
+
initDb(TEST_DB_PATH);
|
|
102
|
+
agentId = (await createAgent({ name: "sdk-skip-worker", isLead: false, status: "idle" })).id;
|
|
103
|
+
httpServer = Bun.serve({ port: 0, fetch: handle });
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
afterAll(async () => {
|
|
107
|
+
httpServer.stop(true);
|
|
108
|
+
closeDb();
|
|
109
|
+
await removeDbFiles();
|
|
110
|
+
if (savedApiKey === undefined) delete process.env.AGENT_SWARM_API_KEY;
|
|
111
|
+
else process.env.AGENT_SWARM_API_KEY = savedApiKey;
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
describe("ctx.swarm.task_storeProgress status skipped", () => {
|
|
115
|
+
test("skips the task, keeps the reason, and creates no follow-up", async () => {
|
|
116
|
+
const task = await startedTask("thread chatter");
|
|
117
|
+
await sdk().task_storeProgress({
|
|
118
|
+
taskId: task.id,
|
|
119
|
+
status: "skipped",
|
|
120
|
+
failureReason: "Addressed to\n another agent.",
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
const after = await getTaskById(task.id);
|
|
124
|
+
expect(after?.status).toBe("skipped");
|
|
125
|
+
expect(after?.failureReason).toBe("Addressed to another agent.");
|
|
126
|
+
expect(after?.output).toBeFalsy();
|
|
127
|
+
const followUps = await getDbClient().get<{ n: number }>(
|
|
128
|
+
"SELECT COUNT(*) AS n FROM agent_tasks WHERE parentTaskId = ?",
|
|
129
|
+
[task.id],
|
|
130
|
+
);
|
|
131
|
+
expect(followUps?.n).toBe(0);
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
test("takes the reason from output when failureReason is absent", async () => {
|
|
135
|
+
const task = await startedTask("thread chatter");
|
|
136
|
+
await sdk().task_storeProgress({ taskId: task.id, status: "skipped", output: "Not mine." });
|
|
137
|
+
const after = await getTaskById(task.id);
|
|
138
|
+
expect(after?.status).toBe("skipped");
|
|
139
|
+
expect(after?.failureReason).toBe("Not mine.");
|
|
140
|
+
expect(after?.output).toBeFalsy();
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
test("refuses a skip with no reason and leaves the task running", async () => {
|
|
144
|
+
const task = await startedTask("thread chatter");
|
|
145
|
+
const result = (await sdk().task_storeProgress({ taskId: task.id, status: "skipped" })) as {
|
|
146
|
+
success: boolean;
|
|
147
|
+
status: number;
|
|
148
|
+
data: { error?: string };
|
|
149
|
+
};
|
|
150
|
+
expect(result.success).toBe(false);
|
|
151
|
+
expect(result.status).toBe(400);
|
|
152
|
+
expect(result.data.error).toContain("needs a one-line reason");
|
|
153
|
+
expect((await getTaskById(task.id))?.status).toBe("in_progress");
|
|
154
|
+
});
|
|
155
|
+
});
|