@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
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { overwriteTerminalTaskResultText } from "../be/db";
|
|
2
2
|
import type { AgentTask } from "../types";
|
|
3
3
|
import { isTerminalTaskStatus } from "../types";
|
|
4
|
+
import { isEffectiveOutputSchema } from "../utils/output-schema";
|
|
4
5
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
5
6
|
import { validateJsonSchema } from "../workflows/json-schema-validator";
|
|
6
7
|
|
|
7
8
|
export type TerminalResultWrite = {
|
|
8
|
-
status?: "completed" | "failed";
|
|
9
|
+
status?: "completed" | "failed" | "skipped";
|
|
9
10
|
output?: string;
|
|
10
11
|
failureReason?: string;
|
|
11
12
|
force?: boolean;
|
|
@@ -23,7 +24,7 @@ export type TerminalResultGuardResult =
|
|
|
23
24
|
};
|
|
24
25
|
|
|
25
26
|
export function getTaskOutputValidationError(outputSchema: unknown, output: string | undefined) {
|
|
26
|
-
if (!outputSchema
|
|
27
|
+
if (!isEffectiveOutputSchema(outputSchema)) return undefined;
|
|
27
28
|
|
|
28
29
|
const schema = outputSchema as Record<string, unknown>;
|
|
29
30
|
if (!output) {
|
package/src/telemetry.ts
CHANGED
|
@@ -42,7 +42,34 @@ type FamilyProps<Prefix extends string, S extends string> = PropsFor<
|
|
|
42
42
|
Extract<SwarmEventName, `${Prefix}.${S}`>
|
|
43
43
|
>;
|
|
44
44
|
|
|
45
|
-
const
|
|
45
|
+
const DEFAULT_TELEMETRY_ENDPOINT = "https://proxy.desplega.sh/v1/events";
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* `DESPLEGA_TELEMETRY_ENDPOINT` is a test knob: the black-box suite points it at a
|
|
49
|
+
* loopback mock sink. Telemetry carries install ids and route templates, so the
|
|
50
|
+
* override is accepted only for https origins or plain http on loopback. Anything
|
|
51
|
+
* else is ignored with a warning and the default sink is used.
|
|
52
|
+
*/
|
|
53
|
+
export function resolveTelemetryEndpoint(raw: string | undefined): string {
|
|
54
|
+
const value = raw?.trim();
|
|
55
|
+
if (!value) return DEFAULT_TELEMETRY_ENDPOINT;
|
|
56
|
+
let url: URL;
|
|
57
|
+
try {
|
|
58
|
+
url = new URL(value);
|
|
59
|
+
} catch {
|
|
60
|
+
console.warn("[telemetry] DESPLEGA_TELEMETRY_ENDPOINT is not a URL; using the default sink");
|
|
61
|
+
return DEFAULT_TELEMETRY_ENDPOINT;
|
|
62
|
+
}
|
|
63
|
+
const loopback =
|
|
64
|
+
url.hostname === "127.0.0.1" || url.hostname === "localhost" || url.hostname === "[::1]";
|
|
65
|
+
if (url.protocol === "https:" || (url.protocol === "http:" && loopback)) return url.toString();
|
|
66
|
+
console.warn(
|
|
67
|
+
"[telemetry] DESPLEGA_TELEMETRY_ENDPOINT must be https, or http on loopback; using the default sink",
|
|
68
|
+
);
|
|
69
|
+
return DEFAULT_TELEMETRY_ENDPOINT;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
const TELEMETRY_ENDPOINT = resolveTelemetryEndpoint(process.env.DESPLEGA_TELEMETRY_ENDPOINT);
|
|
46
73
|
const PRODUCT = "agent-swarm";
|
|
47
74
|
const TIMEOUT_MS = 5_000;
|
|
48
75
|
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, test } from "bun:test";
|
|
2
|
+
import { unlinkSync } from "node:fs";
|
|
3
|
+
import {
|
|
4
|
+
closeDb,
|
|
5
|
+
createAgent,
|
|
6
|
+
createAgentMailInboxMapping,
|
|
7
|
+
deleteAgentMailInboxMapping,
|
|
8
|
+
getAgentMailInboxMapping,
|
|
9
|
+
initDb,
|
|
10
|
+
} from "../be/db";
|
|
11
|
+
|
|
12
|
+
const TEST_DB_PATH = "./test-agentmail-inbox-mapping.sqlite";
|
|
13
|
+
|
|
14
|
+
function removeDbFiles() {
|
|
15
|
+
for (const suffix of ["", "-wal", "-shm"]) {
|
|
16
|
+
try {
|
|
17
|
+
unlinkSync(`${TEST_DB_PATH}${suffix}`);
|
|
18
|
+
} catch {}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
let ownerId = "";
|
|
23
|
+
let otherId = "";
|
|
24
|
+
|
|
25
|
+
beforeEach(async () => {
|
|
26
|
+
removeDbFiles();
|
|
27
|
+
initDb(TEST_DB_PATH);
|
|
28
|
+
ownerId = (await createAgent({ name: "Owner", isLead: false, status: "idle" })).id;
|
|
29
|
+
otherId = (await createAgent({ name: "Other", isLead: false, status: "idle" })).id;
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
afterEach(() => {
|
|
33
|
+
closeDb();
|
|
34
|
+
removeDbFiles();
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
describe("createAgentMailInboxMapping", () => {
|
|
38
|
+
test("maps a free inbox to the caller", async () => {
|
|
39
|
+
const mapping = await createAgentMailInboxMapping("inb_free", ownerId, "free@agentmail.to");
|
|
40
|
+
expect(mapping).toMatchObject({
|
|
41
|
+
inboxId: "inb_free",
|
|
42
|
+
agentId: ownerId,
|
|
43
|
+
inboxEmail: "free@agentmail.to",
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
test("the owner registering again keeps the mapping and refreshes the email", async () => {
|
|
48
|
+
const first = await createAgentMailInboxMapping("inb_again", ownerId, "old@agentmail.to");
|
|
49
|
+
const again = await createAgentMailInboxMapping("inb_again", ownerId, "new@agentmail.to");
|
|
50
|
+
expect(again).toMatchObject({
|
|
51
|
+
id: first?.id,
|
|
52
|
+
agentId: ownerId,
|
|
53
|
+
inboxEmail: "new@agentmail.to",
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
test("another agent cannot take over a mapped inbox, and nothing changes", async () => {
|
|
58
|
+
await createAgentMailInboxMapping("inb_owned", ownerId, "owned@agentmail.to");
|
|
59
|
+
const taken = await createAgentMailInboxMapping("inb_owned", otherId, "taken@agentmail.to");
|
|
60
|
+
expect(taken).toBeNull();
|
|
61
|
+
expect(await getAgentMailInboxMapping("inb_owned")).toMatchObject({
|
|
62
|
+
agentId: ownerId,
|
|
63
|
+
inboxEmail: "owned@agentmail.to",
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
test("a freed inbox can be mapped by another agent", async () => {
|
|
68
|
+
await createAgentMailInboxMapping("inb_freed", ownerId);
|
|
69
|
+
expect(await deleteAgentMailInboxMapping("inb_freed")).toBe(true);
|
|
70
|
+
const mapping = await createAgentMailInboxMapping("inb_freed", otherId);
|
|
71
|
+
expect(mapping?.agentId).toBe(otherId);
|
|
72
|
+
});
|
|
73
|
+
});
|
|
@@ -1111,6 +1111,64 @@ describe("Approval Requests", () => {
|
|
|
1111
1111
|
// No approval-type questions means default is "approved"
|
|
1112
1112
|
expect(data.approvalRequest.status).toBe("approved");
|
|
1113
1113
|
});
|
|
1114
|
+
|
|
1115
|
+
test("production route defaults required to true and validates answered optional questions", async () => {
|
|
1116
|
+
const productionServer = createProductionApprovalServer();
|
|
1117
|
+
const port = await listenOnFreePort(productionServer);
|
|
1118
|
+
const origin = `http://127.0.0.1:${port}`;
|
|
1119
|
+
const post = (path: string, body: unknown) =>
|
|
1120
|
+
fetch(`${origin}${path}`, {
|
|
1121
|
+
method: "POST",
|
|
1122
|
+
headers: { "Content-Type": "application/json" },
|
|
1123
|
+
body: JSON.stringify(body),
|
|
1124
|
+
});
|
|
1125
|
+
const create = async (questions: unknown[]) => {
|
|
1126
|
+
const res = await post("/api/approval-requests", {
|
|
1127
|
+
title: "Defaults",
|
|
1128
|
+
questions,
|
|
1129
|
+
approvers: { policy: "any" },
|
|
1130
|
+
});
|
|
1131
|
+
expect(res.status).toBe(201);
|
|
1132
|
+
return ((await res.json()) as { approvalRequest: { id: string; questions: unknown[] } })
|
|
1133
|
+
.approvalRequest;
|
|
1134
|
+
};
|
|
1135
|
+
try {
|
|
1136
|
+
// A question that does not set `required` is stored as required: an empty answer is refused.
|
|
1137
|
+
const lax = await create([{ id: "go", type: "approval", label: "Go?" }]);
|
|
1138
|
+
expect(lax.questions).toEqual([
|
|
1139
|
+
{ id: "go", type: "approval", label: "Go?", required: true },
|
|
1140
|
+
]);
|
|
1141
|
+
const empty = await post(`/api/approval-requests/${lax.id}/respond`, { responses: {} });
|
|
1142
|
+
expect(empty.status).toBe(400);
|
|
1143
|
+
expect((await getApprovalRequestById(lax.id))?.status).toBe("pending");
|
|
1144
|
+
|
|
1145
|
+
// An answered optional question is validated; an unanswered one is allowed.
|
|
1146
|
+
const optional = await create([
|
|
1147
|
+
{ id: "go", type: "approval", label: "Go?" },
|
|
1148
|
+
{
|
|
1149
|
+
id: "color",
|
|
1150
|
+
type: "single-select",
|
|
1151
|
+
label: "Color",
|
|
1152
|
+
required: false,
|
|
1153
|
+
options: [{ value: "red", label: "Red" }],
|
|
1154
|
+
},
|
|
1155
|
+
]);
|
|
1156
|
+
const outOfOptions = await post(`/api/approval-requests/${optional.id}/respond`, {
|
|
1157
|
+
responses: { go: { approved: true }, color: "green" },
|
|
1158
|
+
});
|
|
1159
|
+
expect(outOfOptions.status).toBe(400);
|
|
1160
|
+
expect(((await outOfOptions.json()) as { error: string }).error).toContain("color");
|
|
1161
|
+
expect((await getApprovalRequestById(optional.id))?.status).toBe("pending");
|
|
1162
|
+
const unanswered = await post(`/api/approval-requests/${optional.id}/respond`, {
|
|
1163
|
+
responses: { go: { approved: true }, color: "" },
|
|
1164
|
+
});
|
|
1165
|
+
expect(unanswered.status).toBe(200);
|
|
1166
|
+
} finally {
|
|
1167
|
+
await new Promise<void>((resolve, reject) =>
|
|
1168
|
+
productionServer.close((error) => (error ? reject(error) : resolve())),
|
|
1169
|
+
);
|
|
1170
|
+
}
|
|
1171
|
+
});
|
|
1114
1172
|
});
|
|
1115
1173
|
|
|
1116
1174
|
// ─── HITL Executor ──────────────────────────────────────────
|
|
@@ -397,6 +397,42 @@ describe("runClaudeManagedSetup — entry point", () => {
|
|
|
397
397
|
expect(exit).not.toHaveBeenCalled();
|
|
398
398
|
});
|
|
399
399
|
|
|
400
|
+
test("--help documents AGENT_SWARM_API_KEY before API_KEY for --api-key", async () => {
|
|
401
|
+
const lines: string[] = [];
|
|
402
|
+
const origLog = console.log;
|
|
403
|
+
console.log = (...args: unknown[]) => {
|
|
404
|
+
lines.push(args.map(String).join(" "));
|
|
405
|
+
};
|
|
406
|
+
try {
|
|
407
|
+
await runClaudeManagedSetup(["--help"], {
|
|
408
|
+
log: mock(() => undefined),
|
|
409
|
+
error: mock(() => undefined),
|
|
410
|
+
exit: mock(() => {
|
|
411
|
+
throw new Error("exit was called");
|
|
412
|
+
}),
|
|
413
|
+
flow: mock(async () => {
|
|
414
|
+
throw new Error("flow should not be called");
|
|
415
|
+
}),
|
|
416
|
+
resolveConfig: mock(async () => {
|
|
417
|
+
throw new Error("resolveConfig should not be called");
|
|
418
|
+
}),
|
|
419
|
+
});
|
|
420
|
+
} finally {
|
|
421
|
+
console.log = origLog;
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
const text = lines.join("\n");
|
|
425
|
+
expect(text).toContain("AGENT_SWARM_API_KEY");
|
|
426
|
+
expect(text).toContain("API_KEY");
|
|
427
|
+
expect(text).toContain("123123");
|
|
428
|
+
// Prefer the namespaced key, then legacy API_KEY (same order as getApiKey / COMMAND_HELP).
|
|
429
|
+
const apiKeyLine = text
|
|
430
|
+
.split("\n")
|
|
431
|
+
.find((line) => line.includes("--api-key") && line.includes("default:"));
|
|
432
|
+
expect(apiKeyLine).toBeDefined();
|
|
433
|
+
expect(apiKeyLine!).toMatch(/AGENT_SWARM_API_KEY.*API_KEY/);
|
|
434
|
+
});
|
|
435
|
+
|
|
400
436
|
test("on error, calls error() + exit(1) without throwing", async () => {
|
|
401
437
|
const log = mock((_msg: string) => undefined);
|
|
402
438
|
const errorMessages: string[] = [];
|
|
@@ -579,10 +579,10 @@ describe("Codex app-server session", () => {
|
|
|
579
579
|
expect(snapshots).toHaveLength(2);
|
|
580
580
|
expect(snapshots[0]).toMatchObject({ contextUsedTokens: 51_000, contextTotalTokens: 258_400 });
|
|
581
581
|
expect(snapshots[0]?.contextPercent).toBeCloseTo((51_000 / 258_400) * 100, 6);
|
|
582
|
-
//
|
|
582
|
+
// Missing updates retain the last window the running harness reported.
|
|
583
583
|
expect(snapshots[1]).toMatchObject({
|
|
584
584
|
contextUsedTokens: 61_000,
|
|
585
|
-
contextTotalTokens:
|
|
585
|
+
contextTotalTokens: 258_400,
|
|
586
586
|
});
|
|
587
587
|
});
|
|
588
588
|
|
|
@@ -16,7 +16,9 @@ import { handleCore } from "../http/core";
|
|
|
16
16
|
import { handleOnboarding } from "../http/onboarding";
|
|
17
17
|
import { getPathSegments, parseQueryParams } from "../http/utils";
|
|
18
18
|
import {
|
|
19
|
+
codexDeviceVerificationUrl,
|
|
19
20
|
DeviceCodeNotEnabledError,
|
|
21
|
+
exchangeDeviceAuthorizationCode,
|
|
20
22
|
pollDeviceToken,
|
|
21
23
|
requestDeviceCode,
|
|
22
24
|
} from "../providers/codex-oauth/device";
|
|
@@ -170,6 +172,64 @@ describe("Codex device provider", () => {
|
|
|
170
172
|
});
|
|
171
173
|
});
|
|
172
174
|
|
|
175
|
+
describe("Codex device base URL", () => {
|
|
176
|
+
const BASE_ENV = "CODEX_OAUTH_DEVICE_BASE_URL";
|
|
177
|
+
const original = process.env[BASE_ENV];
|
|
178
|
+
afterEach(() => {
|
|
179
|
+
if (original === undefined) delete process.env[BASE_ENV];
|
|
180
|
+
else process.env[BASE_ENV] = original;
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
test("all device URLs follow the base read at call time", async () => {
|
|
184
|
+
process.env[BASE_ENV] = "http://127.0.0.1:9999/";
|
|
185
|
+
const seen: string[] = [];
|
|
186
|
+
fetchImpl = (async (input, init) => {
|
|
187
|
+
const url = String(input);
|
|
188
|
+
seen.push(url);
|
|
189
|
+
if (url.endsWith("/usercode")) {
|
|
190
|
+
return jsonResponse({ device_auth_id: "device-base", user_code: "BASE", interval: 5 });
|
|
191
|
+
}
|
|
192
|
+
if (url.endsWith("/deviceauth/token")) {
|
|
193
|
+
return jsonResponse({ authorization_code: "base-code", code_verifier: "base-verifier" });
|
|
194
|
+
}
|
|
195
|
+
expect(url).toBe("http://127.0.0.1:9999/oauth/token");
|
|
196
|
+
expect(new URLSearchParams(String(init?.body)).get("redirect_uri")).toBe(
|
|
197
|
+
"http://127.0.0.1:9999/deviceauth/callback",
|
|
198
|
+
);
|
|
199
|
+
return jsonResponse({
|
|
200
|
+
access_token: accountToken("account-base"),
|
|
201
|
+
refresh_token: "refresh-base",
|
|
202
|
+
expires_in: 3600,
|
|
203
|
+
});
|
|
204
|
+
}) as typeof fetch;
|
|
205
|
+
|
|
206
|
+
await requestDeviceCode();
|
|
207
|
+
await pollDeviceToken("device-base", "BASE");
|
|
208
|
+
await exchangeDeviceAuthorizationCode("base-code", "base-verifier");
|
|
209
|
+
expect(seen).toEqual([
|
|
210
|
+
"http://127.0.0.1:9999/api/accounts/deviceauth/usercode",
|
|
211
|
+
"http://127.0.0.1:9999/api/accounts/deviceauth/token",
|
|
212
|
+
"http://127.0.0.1:9999/oauth/token",
|
|
213
|
+
]);
|
|
214
|
+
expect(codexDeviceVerificationUrl()).toBe("http://127.0.0.1:9999/codex/device");
|
|
215
|
+
});
|
|
216
|
+
|
|
217
|
+
test("an unset or blank base falls back to auth.openai.com", async () => {
|
|
218
|
+
const seen: string[] = [];
|
|
219
|
+
fetchImpl = (async (input) => {
|
|
220
|
+
seen.push(String(input));
|
|
221
|
+
return new Response(null, { status: 403 });
|
|
222
|
+
}) as typeof fetch;
|
|
223
|
+
|
|
224
|
+
delete process.env[BASE_ENV];
|
|
225
|
+
await pollDeviceToken("device", "code");
|
|
226
|
+
process.env[BASE_ENV] = " ";
|
|
227
|
+
await pollDeviceToken("device", "code");
|
|
228
|
+
expect(seen).toEqual([DEVICE_TOKEN_URL, DEVICE_TOKEN_URL]);
|
|
229
|
+
expect(codexDeviceVerificationUrl()).toBe("https://auth.openai.com/codex/device");
|
|
230
|
+
});
|
|
231
|
+
});
|
|
232
|
+
|
|
173
233
|
describe("Codex device HTTP routes", () => {
|
|
174
234
|
test("completes the flow, saves the first free slot, and updates onboarding", async () => {
|
|
175
235
|
await request("/api/onboarding", "GET");
|
|
@@ -216,10 +216,47 @@ describe("createCodexSwarmEventHandler", () => {
|
|
|
216
216
|
});
|
|
217
217
|
|
|
218
218
|
describe("result", () => {
|
|
219
|
+
test("uses the result model's catalog window without a prior context update", () => {
|
|
220
|
+
const { calls } = installFetchStub(() => new Response("{}", { status: 200 }));
|
|
221
|
+
const handler = createCodexSwarmEventHandler(buildOpts());
|
|
222
|
+
handler({ type: "session_init", sessionId: "thread-abc" });
|
|
223
|
+
handler({
|
|
224
|
+
type: "result",
|
|
225
|
+
cost: {
|
|
226
|
+
sessionId: "thread-abc",
|
|
227
|
+
agentId: "agent-1",
|
|
228
|
+
totalCostUsd: 0,
|
|
229
|
+
durationMs: 1234,
|
|
230
|
+
numTurns: 1,
|
|
231
|
+
model: "gpt-5.4",
|
|
232
|
+
isError: false,
|
|
233
|
+
},
|
|
234
|
+
isError: false,
|
|
235
|
+
});
|
|
236
|
+
|
|
237
|
+
const snapshots = calls.filter((call) => call.url.includes("/api/tasks/task-1/context"));
|
|
238
|
+
expect(snapshots).toHaveLength(1);
|
|
239
|
+
expect(JSON.parse(String(snapshots[0]?.init?.body))).toEqual({
|
|
240
|
+
eventType: "completion",
|
|
241
|
+
sessionId: "thread-abc",
|
|
242
|
+
contextTotalTokens: 1_050_000,
|
|
243
|
+
});
|
|
244
|
+
});
|
|
245
|
+
|
|
219
246
|
test("posts a completion context event", async () => {
|
|
220
247
|
const { calls } = installFetchStub(() => new Response("{}", { status: 200 }));
|
|
221
248
|
const handler = createCodexSwarmEventHandler(buildOpts());
|
|
222
249
|
handler({ type: "session_init", sessionId: "thread-abc" });
|
|
250
|
+
// The second live update is throttled, but its window must reach completion.
|
|
251
|
+
for (const contextTotalTokens of [258_400, 272_000]) {
|
|
252
|
+
handler({
|
|
253
|
+
type: "context_usage",
|
|
254
|
+
contextUsedTokens: 1000,
|
|
255
|
+
contextTotalTokens,
|
|
256
|
+
contextPercent: 1,
|
|
257
|
+
outputTokens: 50,
|
|
258
|
+
});
|
|
259
|
+
}
|
|
223
260
|
handler({
|
|
224
261
|
type: "result",
|
|
225
262
|
cost: {
|
|
@@ -239,11 +276,16 @@ describe("createCodexSwarmEventHandler", () => {
|
|
|
239
276
|
isError: false,
|
|
240
277
|
});
|
|
241
278
|
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
242
|
-
const ctxCall = calls.find(
|
|
279
|
+
const ctxCall = calls.find(
|
|
280
|
+
(c) =>
|
|
281
|
+
c.url.includes("/api/tasks/task-1/context") &&
|
|
282
|
+
JSON.parse(String(c.init?.body)).eventType === "completion",
|
|
283
|
+
);
|
|
243
284
|
expect(ctxCall).toBeDefined();
|
|
244
285
|
const body = JSON.parse((ctxCall?.init?.body as string) ?? "{}");
|
|
245
286
|
expect(body.eventType).toBe("completion");
|
|
246
287
|
expect(body.sessionId).toBe("thread-abc");
|
|
288
|
+
expect(body.contextTotalTokens).toBe(272_000);
|
|
247
289
|
});
|
|
248
290
|
});
|
|
249
291
|
|
|
@@ -8,6 +8,20 @@ import {
|
|
|
8
8
|
} from "../utils/context-window";
|
|
9
9
|
|
|
10
10
|
describe("getContextWindowSize", () => {
|
|
11
|
+
test("prefers the live harness window over the API catalog maximum", () => {
|
|
12
|
+
expect(getContextWindowSize("gpt-5.6-luna", 272_000)).toBe(272_000);
|
|
13
|
+
expect(getContextWindowSize("openai-codex/gpt-5.6-luna", 272_000)).toBe(272_000);
|
|
14
|
+
expect(getContextWindowSize("unknown-model", 64_000)).toBe(64_000);
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
test("ignores missing or invalid live windows", () => {
|
|
18
|
+
for (const window of [undefined, null, 0, -1, Number.NaN, Number.POSITIVE_INFINITY]) {
|
|
19
|
+
expect(getContextWindowSize("gpt-5.6-luna", window)).toBe(
|
|
20
|
+
getContextWindowSize("gpt-5.6-luna"),
|
|
21
|
+
);
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
|
|
11
25
|
// Windows come from the model catalog: a model the catalog lacks (mythos is
|
|
12
26
|
// not on models.dev) gets the 200K default until an overlay row adds it.
|
|
13
27
|
test("returns 1M for fable models", () => {
|
|
@@ -132,8 +132,9 @@ describe("Tracker Sync CRUD", () => {
|
|
|
132
132
|
|
|
133
133
|
test("deleteTrackerSync removes the mapping", async () => {
|
|
134
134
|
const sync = (await getTrackerSyncByExternalId("jira", "task", "JIRA-456"))!;
|
|
135
|
-
await deleteTrackerSync(sync.id);
|
|
135
|
+
expect(await deleteTrackerSync(sync.id)).toBe(true);
|
|
136
136
|
expect(await getTrackerSyncByExternalId("jira", "task", "JIRA-456")).toBeNull();
|
|
137
|
+
expect(await deleteTrackerSync(sync.id)).toBe(false);
|
|
137
138
|
});
|
|
138
139
|
});
|
|
139
140
|
|
|
@@ -593,6 +593,7 @@ value:setTaskTitleIfUnset
|
|
|
593
593
|
value:setUserFavorite
|
|
594
594
|
value:settleSupersededTaskDependents
|
|
595
595
|
value:shouldBlockPolling
|
|
596
|
+
value:skipTask
|
|
596
597
|
value:startTask
|
|
597
598
|
value:supersedeTask
|
|
598
599
|
value:sweepExpiredKv
|
|
@@ -662,6 +663,7 @@ value:resetOrphanedInProgressTasksForAgent
|
|
|
662
663
|
value:resumeTask
|
|
663
664
|
value:setTaskTitleIfUnset
|
|
664
665
|
value:settleSupersededTaskDependents
|
|
666
|
+
value:skipTask
|
|
665
667
|
value:startTask
|
|
666
668
|
value:supersedeTask
|
|
667
669
|
value:updateTaskClaudeSessionId
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
getScheduledTaskById,
|
|
18
18
|
getTaskById,
|
|
19
19
|
initDb,
|
|
20
|
+
skipTask,
|
|
20
21
|
startTask,
|
|
21
22
|
supersedeTask,
|
|
22
23
|
updateScheduledTask,
|
|
@@ -253,6 +254,7 @@ describe("defer-task wakeOn", () => {
|
|
|
253
254
|
"completed",
|
|
254
255
|
"failed",
|
|
255
256
|
"cancelled",
|
|
257
|
+
"skipped",
|
|
256
258
|
])("all is the default and waits for the final member to be %s", async (status) => {
|
|
257
259
|
const { producers, schedule } = await multiFixture();
|
|
258
260
|
await completeTask(producers[0]!.id, "first result");
|
|
@@ -262,7 +264,8 @@ describe("defer-task wakeOn", () => {
|
|
|
262
264
|
expect(await dispatchDeferredTaskWait(schedule.id, "task.completed")).toEqual({});
|
|
263
265
|
if (status === "completed") await completeTask(producers[1]!.id, "second result");
|
|
264
266
|
else if (status === "failed") await failTask(producers[1]!.id, "second result failed");
|
|
265
|
-
else await cancelTask(producers[1]!.id, "second result cancelled");
|
|
267
|
+
else if (status === "cancelled") await cancelTask(producers[1]!.id, "second result cancelled");
|
|
268
|
+
else await skipTask(producers[1]!.id, "second result not mine");
|
|
266
269
|
await reconcileDeferredTaskWaits(producers[1]!.id);
|
|
267
270
|
const found = await children(schedule.id);
|
|
268
271
|
expect(found).toHaveLength(1);
|
|
@@ -275,11 +278,13 @@ describe("defer-task wakeOn", () => {
|
|
|
275
278
|
"completed",
|
|
276
279
|
"failed",
|
|
277
280
|
"cancelled",
|
|
281
|
+
"skipped",
|
|
278
282
|
])("explicit any wakes on the first %s member", async (status) => {
|
|
279
283
|
const { producers, schedule } = await multiFixture("any");
|
|
280
284
|
if (status === "completed") await completeTask(producers[1]!.id, "ready");
|
|
281
285
|
else if (status === "failed") await failTask(producers[1]!.id, "failed");
|
|
282
|
-
else await cancelTask(producers[1]!.id, "cancelled");
|
|
286
|
+
else if (status === "cancelled") await cancelTask(producers[1]!.id, "cancelled");
|
|
287
|
+
else await skipTask(producers[1]!.id, "not mine");
|
|
283
288
|
await reconcileDeferredTaskWaits(producers[1]!.id);
|
|
284
289
|
expect(await children(schedule.id)).toHaveLength(1);
|
|
285
290
|
expect((await children(schedule.id))[0]!.task).toContain("any tasks matched settled");
|