@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
|
@@ -103,8 +103,9 @@ export async function exchangeAuthorizationCode(
|
|
|
103
103
|
verifier: string,
|
|
104
104
|
redirectUri: string = REDIRECT_URI,
|
|
105
105
|
signal?: AbortSignal,
|
|
106
|
+
tokenUrl: string = TOKEN_URL,
|
|
106
107
|
): Promise<TokenResult> {
|
|
107
|
-
const response = await _fetchHolder.current(
|
|
108
|
+
const response = await _fetchHolder.current(tokenUrl, {
|
|
108
109
|
method: "POST",
|
|
109
110
|
headers: { "Content-Type": "application/x-www-form-urlencoded" },
|
|
110
111
|
body: new URLSearchParams({
|
|
@@ -1077,6 +1077,8 @@ export class PiMonoSession implements ProviderSession {
|
|
|
1077
1077
|
* surface it directly.
|
|
1078
1078
|
*/
|
|
1079
1079
|
private prevOutputTokens = 0;
|
|
1080
|
+
/** Pi SessionStats omits reasoning; assistant events report it as an output subset. */
|
|
1081
|
+
private reasoningOutputTokens = 0;
|
|
1080
1082
|
/**
|
|
1081
1083
|
* Terminal error message captured from structured pi-coding-agent events.
|
|
1082
1084
|
*
|
|
@@ -1206,8 +1208,13 @@ export class PiMonoSession implements ProviderSession {
|
|
|
1206
1208
|
role?: string;
|
|
1207
1209
|
stopReason?: string;
|
|
1208
1210
|
errorMessage?: string;
|
|
1211
|
+
usage?: { reasoning?: number };
|
|
1209
1212
|
};
|
|
1210
1213
|
if (endMsg.role === "assistant") {
|
|
1214
|
+
const reasoning = endMsg.usage?.reasoning;
|
|
1215
|
+
if (typeof reasoning === "number" && Number.isFinite(reasoning) && reasoning >= 0) {
|
|
1216
|
+
this.reasoningOutputTokens += reasoning;
|
|
1217
|
+
}
|
|
1211
1218
|
const turn = describeAssistantTurn(event.message);
|
|
1212
1219
|
this.lastAssistantTurn = turn;
|
|
1213
1220
|
// Ahead of the turn's text and tool lines: the chip rides on the
|
|
@@ -1601,6 +1608,7 @@ export class PiMonoSession implements ProviderSession {
|
|
|
1601
1608
|
totalCostUsd: stats.cost || 0,
|
|
1602
1609
|
inputTokens: stats.tokens.input,
|
|
1603
1610
|
outputTokens: stats.tokens.output,
|
|
1611
|
+
reasoningOutputTokens: this.reasoningOutputTokens,
|
|
1604
1612
|
cacheReadTokens: stats.tokens.cacheRead,
|
|
1605
1613
|
cacheWriteTokens: stats.tokens.cacheWrite,
|
|
1606
1614
|
// Phase 7: real wallclock duration; pi-ai SessionStats doesn't carry
|
|
@@ -47,7 +47,12 @@ rate by hand should also update this file.
|
|
|
47
47
|
Shortnames (`opus`, `sonnet`, `haiku`) ALSO get rows keyed by the current
|
|
48
48
|
default full id (e.g. `opus → claude-opus-4-7`). Pi-mono uses the same
|
|
49
49
|
shortname forms, so they're projected under `provider='pi'` as well.
|
|
50
|
-
- OpenAI models → rows under `provider='codex'
|
|
50
|
+
- OpenAI models → rows under `provider='codex'`, and `provider='pi'` for
|
|
51
|
+
the ChatGPT subscription route. Pricing accepts `openai-codex/<id>`;
|
|
52
|
+
`session_costs.model` and its per-model breakdown store the bare OpenAI
|
|
53
|
+
`<id>` so pi and Codex share one rollup key. Migration 271 normalizes
|
|
54
|
+
historical subscription rows. Task configuration, latest-model reports,
|
|
55
|
+
and session logs keep the route prefix for credential selection and debugging.
|
|
51
56
|
- OpenRouter models → rows under `provider='opencode'`, `provider='pi'` and
|
|
52
57
|
`provider='dsh'` (dsh strips `openrouter/` at lookup). These are
|
|
53
58
|
OpenRouter's model-level list price, the cheapest endpoint's rate, so they
|
|
@@ -140,6 +145,16 @@ list prices. They do not include plan discounts, included usage, or the $0.25
|
|
|
140
145
|
per million Cursor Token Rate that Teams and Enterprise plans add to
|
|
141
146
|
third-party (not Composer) requests.
|
|
142
147
|
|
|
148
|
+
## Usage recording
|
|
149
|
+
|
|
150
|
+
Context snapshots use the running harness's latest positive finite window
|
|
151
|
+
before the catalog's API maximum. The runner retains this value for completion
|
|
152
|
+
even when a progress post was throttled; Codex also retains it across native
|
|
153
|
+
notifications that omit the window. Pi reasoning usage is an informational
|
|
154
|
+
subset of output tokens and is not charged again.
|
|
155
|
+
An adapter-side completion without prior context updates resolves its window
|
|
156
|
+
from the result model's catalog entry, independently of the runner snapshot.
|
|
157
|
+
|
|
143
158
|
## Manual overrides
|
|
144
159
|
|
|
145
160
|
Cost components models.dev doesn't carry are encoded in
|
|
@@ -41,6 +41,7 @@
|
|
|
41
41
|
*/
|
|
42
42
|
|
|
43
43
|
import { checkToolLoop } from "../hooks/tool-loop-detection";
|
|
44
|
+
import { getContextWindowSize } from "../utils/context-window";
|
|
44
45
|
import type { ProviderEvent } from "./types";
|
|
45
46
|
|
|
46
47
|
/** Throttle windows (ms) keyed by action name. Exported for unit assertions. */
|
|
@@ -96,6 +97,7 @@ export function createSwarmEventHandler(
|
|
|
96
97
|
): (event: ProviderEvent) => void {
|
|
97
98
|
const lastCall: Record<string, number> = {};
|
|
98
99
|
let sessionId: string | undefined;
|
|
100
|
+
let latestContextWindow: number | undefined;
|
|
99
101
|
|
|
100
102
|
const shouldRun = (key: string, throttleMs: number): boolean => {
|
|
101
103
|
const now = Date.now();
|
|
@@ -221,7 +223,7 @@ export function createSwarmEventHandler(
|
|
|
221
223
|
}
|
|
222
224
|
};
|
|
223
225
|
|
|
224
|
-
const progressCompletion = (): void => {
|
|
226
|
+
const progressCompletion = (model: string): void => {
|
|
225
227
|
if (opts.taskId) {
|
|
226
228
|
fireAndForget(`${opts.apiUrl}/api/tasks/${encodeURIComponent(opts.taskId)}/context`, {
|
|
227
229
|
method: "POST",
|
|
@@ -229,6 +231,7 @@ export function createSwarmEventHandler(
|
|
|
229
231
|
body: JSON.stringify({
|
|
230
232
|
eventType: "completion",
|
|
231
233
|
sessionId: sessionId ?? `${opts.sessionIdFallbackPrefix ?? "session"}-${opts.taskId}`,
|
|
234
|
+
contextTotalTokens: getContextWindowSize(model, latestContextWindow),
|
|
232
235
|
}),
|
|
233
236
|
});
|
|
234
237
|
}
|
|
@@ -251,6 +254,13 @@ export function createSwarmEventHandler(
|
|
|
251
254
|
break;
|
|
252
255
|
}
|
|
253
256
|
case "context_usage": {
|
|
257
|
+
if (
|
|
258
|
+
event.contextTotalTokens != null &&
|
|
259
|
+
Number.isFinite(event.contextTotalTokens) &&
|
|
260
|
+
event.contextTotalTokens > 0
|
|
261
|
+
) {
|
|
262
|
+
latestContextWindow = event.contextTotalTokens;
|
|
263
|
+
}
|
|
254
264
|
progressContextUsage({
|
|
255
265
|
contextUsedTokens: event.contextUsedTokens,
|
|
256
266
|
contextTotalTokens: event.contextTotalTokens,
|
|
@@ -260,6 +270,9 @@ export function createSwarmEventHandler(
|
|
|
260
270
|
break;
|
|
261
271
|
}
|
|
262
272
|
case "compaction": {
|
|
273
|
+
if (Number.isFinite(event.contextTotalTokens) && event.contextTotalTokens > 0) {
|
|
274
|
+
latestContextWindow = event.contextTotalTokens;
|
|
275
|
+
}
|
|
263
276
|
progressCompaction({
|
|
264
277
|
contextTotalTokens: event.contextTotalTokens,
|
|
265
278
|
preCompactTokens: event.preCompactTokens,
|
|
@@ -268,7 +281,7 @@ export function createSwarmEventHandler(
|
|
|
268
281
|
break;
|
|
269
282
|
}
|
|
270
283
|
case "result": {
|
|
271
|
-
progressCompletion();
|
|
284
|
+
progressCompletion(event.cost.model);
|
|
272
285
|
break;
|
|
273
286
|
}
|
|
274
287
|
}
|
|
@@ -287,6 +287,7 @@ export const LEGACY_POLICY = {
|
|
|
287
287
|
"task.parent.attach": taskFsMutate,
|
|
288
288
|
"session.share": operatorOrUser,
|
|
289
289
|
"session.presence": operatorOrUser,
|
|
290
|
+
"session.read.all": operatorOrUser,
|
|
290
291
|
"task.progress.write": taskProgressWrite,
|
|
291
292
|
"favorite.write.own": anyAuthenticated,
|
|
292
293
|
"memory.learning.inject": leadOnly,
|
package/src/rbac/permissions.ts
CHANGED
|
@@ -106,6 +106,11 @@ export const PERMISSIONS = {
|
|
|
106
106
|
description: "Join the presence room of a session the principal can view.",
|
|
107
107
|
namespace: "task",
|
|
108
108
|
},
|
|
109
|
+
"session.read.all": {
|
|
110
|
+
description:
|
|
111
|
+
"Opt in to read every user's tasks and sessions (the dashboard's All users scope). Read-only: writes and steering still need the principal's own access.",
|
|
112
|
+
namespace: "task",
|
|
113
|
+
},
|
|
109
114
|
"favorite.write.own": {
|
|
110
115
|
description: "Set a favorite the caller owns.",
|
|
111
116
|
namespace: "favorite",
|
|
@@ -21,7 +21,7 @@ type TaskWait = {
|
|
|
21
21
|
|
|
22
22
|
type WaitMember = { taskId: string; taskStatus: string | null; deferred: number };
|
|
23
23
|
|
|
24
|
-
type WakeReason = "ceiling" | "task.completed" | "task.failed" | "task.cancelled";
|
|
24
|
+
type WakeReason = "ceiling" | "task.completed" | "task.failed" | "task.cancelled" | "task.skipped";
|
|
25
25
|
|
|
26
26
|
/**
|
|
27
27
|
* Read the wait row and its member set and decide whether the wait is ready.
|
|
@@ -59,7 +59,8 @@ async function resolveWaitCause(
|
|
|
59
59
|
!member.deferred &&
|
|
60
60
|
(member.taskStatus === "completed" ||
|
|
61
61
|
member.taskStatus === "failed" ||
|
|
62
|
-
member.taskStatus === "cancelled"
|
|
62
|
+
member.taskStatus === "cancelled" ||
|
|
63
|
+
member.taskStatus === "skipped") &&
|
|
63
64
|
(wait.eventName === "settled" || wait.eventName === `task.${member.taskStatus}`),
|
|
64
65
|
);
|
|
65
66
|
if (!matched.length || (wait.mode === "all" && matched.length !== members.length))
|
|
@@ -224,12 +225,14 @@ export async function reconcileDeferredTaskWaits(taskId?: string): Promise<void>
|
|
|
224
225
|
// even when the triggering event named their superseded parent.
|
|
225
226
|
return reconcileDeferredTaskWaits();
|
|
226
227
|
}
|
|
227
|
-
const rows = await client.query<
|
|
228
|
+
const rows = await client.query<
|
|
229
|
+
TaskWait & { taskStatus: "completed" | "failed" | "cancelled" | "skipped" }
|
|
230
|
+
>(
|
|
228
231
|
`SELECT DISTINCT w.*, t.status AS taskStatus FROM deferred_task_waits w
|
|
229
232
|
JOIN deferred_task_wait_members m ON m.scheduleId = w.scheduleId
|
|
230
233
|
JOIN agent_tasks t ON t.id = m.taskId
|
|
231
234
|
JOIN scheduled_tasks s ON s.id = w.scheduleId
|
|
232
|
-
WHERE w.status = 'pending' AND s.enabled = 1 AND t.status IN ('completed', 'failed', 'cancelled')
|
|
235
|
+
WHERE w.status = 'pending' AND s.enabled = 1 AND t.status IN ('completed', 'failed', 'cancelled', 'skipped')
|
|
233
236
|
AND NOT EXISTS (
|
|
234
237
|
SELECT 1 FROM scheduled_tasks d
|
|
235
238
|
WHERE d.parentTaskId = t.id AND d.taskType = 'deferred' AND d.enabled = 1
|
|
@@ -295,6 +298,7 @@ export async function initDeferredTaskWaits(): Promise<void> {
|
|
|
295
298
|
workflowEventBus.on("task.completed", onTaskEvent);
|
|
296
299
|
workflowEventBus.on("task.failed", onTaskEvent);
|
|
297
300
|
workflowEventBus.on("task.cancelled", onTaskEvent);
|
|
301
|
+
workflowEventBus.on("task.skipped", onTaskEvent);
|
|
298
302
|
workflowEventBus.on("task.superseded", onTaskEvent);
|
|
299
303
|
// The resume may be committed after its parent's supersede event.
|
|
300
304
|
workflowEventBus.on("task.created", onTaskEvent);
|
|
@@ -305,6 +309,7 @@ export function stopDeferredTaskWaits(): void {
|
|
|
305
309
|
workflowEventBus.off("task.completed", onTaskEvent);
|
|
306
310
|
workflowEventBus.off("task.failed", onTaskEvent);
|
|
307
311
|
workflowEventBus.off("task.cancelled", onTaskEvent);
|
|
312
|
+
workflowEventBus.off("task.skipped", onTaskEvent);
|
|
308
313
|
workflowEventBus.off("task.superseded", onTaskEvent);
|
|
309
314
|
workflowEventBus.off("task.created", onTaskEvent);
|
|
310
315
|
}
|
|
@@ -77,8 +77,10 @@ try {
|
|
|
77
77
|
process.exit(0);
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
+
// `io: "input"` describes what callers send, so a `.default()` field is optional
|
|
81
|
+
// (its `default` is kept). The default output mode would mark it `required`.
|
|
80
82
|
// biome-ignore lint/suspicious/noExplicitAny: argsSchema is a Zod schema at runtime
|
|
81
|
-
const schema = toJSONSchema(mod.argsSchema as any);
|
|
83
|
+
const schema = toJSONSchema(mod.argsSchema as any, { io: "input" });
|
|
82
84
|
await Bun.write(resultFile, JSON.stringify(schema));
|
|
83
85
|
process.exit(0);
|
|
84
86
|
} catch (err) {
|
|
@@ -104,7 +104,7 @@ function bridgeRequestFor(name: string, args: unknown): BridgeRequest | null {
|
|
|
104
104
|
case "task_storeProgress": {
|
|
105
105
|
const taskId = typeof body.taskId === "string" ? body.taskId : undefined;
|
|
106
106
|
if (!taskId) throw new Error("task_storeProgress requires string `taskId`");
|
|
107
|
-
if (body.status === "completed" || body.status === "failed") {
|
|
107
|
+
if (body.status === "completed" || body.status === "failed" || body.status === "skipped") {
|
|
108
108
|
return {
|
|
109
109
|
method: "POST",
|
|
110
110
|
path: `/api/tasks/${encodeURIComponent(taskId)}/finish`,
|
|
@@ -5,6 +5,7 @@ declare module "swarm-extension" {
|
|
|
5
5
|
agentId?: string | null | undefined;
|
|
6
6
|
creatorAgentId?: string | undefined;
|
|
7
7
|
source?:
|
|
8
|
+
| "chat"
|
|
8
9
|
| "workflow"
|
|
9
10
|
| "schedule"
|
|
10
11
|
| "slack"
|
|
@@ -20,7 +21,6 @@ declare module "swarm-extension" {
|
|
|
20
21
|
| "ui"
|
|
21
22
|
| "system"
|
|
22
23
|
| "comb"
|
|
23
|
-
| "chat"
|
|
24
24
|
| undefined;
|
|
25
25
|
routingReason?:
|
|
26
26
|
| "skill"
|
|
@@ -60,7 +60,7 @@ declare module "swarm-extension" {
|
|
|
60
60
|
parentTaskId?: string | undefined;
|
|
61
61
|
model?: string | undefined;
|
|
62
62
|
modelTier?: "smol" | "regular" | "smart" | "ultra" | undefined;
|
|
63
|
-
effort?: "
|
|
63
|
+
effort?: "low" | "medium" | "high" | "max" | "off" | "xhigh" | undefined;
|
|
64
64
|
profile?: string | undefined;
|
|
65
65
|
scheduleId?: string | undefined;
|
|
66
66
|
workflowRunId?: string | undefined;
|
|
@@ -87,18 +87,18 @@ declare module "swarm-extension" {
|
|
|
87
87
|
sourceAgentId?: string | undefined;
|
|
88
88
|
role?: string | undefined;
|
|
89
89
|
harnessProvider?:
|
|
90
|
-
| "claude"
|
|
91
|
-
| "codex"
|
|
92
90
|
| "pi"
|
|
93
|
-
| "
|
|
91
|
+
| "claude"
|
|
94
92
|
| "claude-managed"
|
|
93
|
+
| "codex"
|
|
94
|
+
| "grok"
|
|
95
|
+
| "fx"
|
|
95
96
|
| "opencode"
|
|
96
|
-
| "acp"
|
|
97
97
|
| "dsh"
|
|
98
|
-
| "amp"
|
|
99
98
|
| "cursor"
|
|
100
|
-
| "
|
|
101
|
-
| "
|
|
99
|
+
| "amp"
|
|
100
|
+
| "devin"
|
|
101
|
+
| "acp"
|
|
102
102
|
| undefined;
|
|
103
103
|
leadOnly?: boolean | undefined;
|
|
104
104
|
}
|
|
@@ -111,6 +111,7 @@ declare module "swarm-extension" {
|
|
|
111
111
|
agentId: string | null;
|
|
112
112
|
task: string;
|
|
113
113
|
status:
|
|
114
|
+
| "skipped"
|
|
114
115
|
| "draft"
|
|
115
116
|
| "backlog"
|
|
116
117
|
| "unassigned"
|
|
@@ -124,6 +125,7 @@ declare module "swarm-extension" {
|
|
|
124
125
|
| "cancelled"
|
|
125
126
|
| "superseded";
|
|
126
127
|
source:
|
|
128
|
+
| "chat"
|
|
127
129
|
| "workflow"
|
|
128
130
|
| "schedule"
|
|
129
131
|
| "slack"
|
|
@@ -138,8 +140,7 @@ declare module "swarm-extension" {
|
|
|
138
140
|
| "api"
|
|
139
141
|
| "ui"
|
|
140
142
|
| "system"
|
|
141
|
-
| "comb"
|
|
142
|
-
| "chat";
|
|
143
|
+
| "comb";
|
|
143
144
|
tags: string[];
|
|
144
145
|
priority: number;
|
|
145
146
|
dependsOn: string[];
|
|
@@ -194,11 +195,11 @@ declare module "swarm-extension" {
|
|
|
194
195
|
claudeSessionId?: string | undefined;
|
|
195
196
|
model?: string | undefined;
|
|
196
197
|
modelTier?: "smol" | "regular" | "smart" | "ultra" | undefined;
|
|
197
|
-
effort?: "
|
|
198
|
+
effort?: "low" | "medium" | "high" | "max" | "off" | "xhigh" | undefined;
|
|
198
199
|
resolvedModel?: string | undefined;
|
|
199
200
|
modelSource?: string | undefined;
|
|
200
201
|
modelAlias?: string | undefined;
|
|
201
|
-
resolvedEffort?: "
|
|
202
|
+
resolvedEffort?: "low" | "medium" | "high" | "max" | "off" | "xhigh" | undefined;
|
|
202
203
|
profile?: string | undefined;
|
|
203
204
|
resolvedProfile?: string | undefined;
|
|
204
205
|
scheduleId?: string | undefined;
|
|
@@ -223,18 +224,18 @@ declare module "swarm-extension" {
|
|
|
223
224
|
requestedByUserId?: string | undefined;
|
|
224
225
|
swarmVersion?: string | undefined;
|
|
225
226
|
provider?:
|
|
226
|
-
| "claude"
|
|
227
|
-
| "codex"
|
|
228
227
|
| "pi"
|
|
229
|
-
| "
|
|
228
|
+
| "claude"
|
|
230
229
|
| "claude-managed"
|
|
230
|
+
| "codex"
|
|
231
|
+
| "grok"
|
|
232
|
+
| "fx"
|
|
231
233
|
| "opencode"
|
|
232
|
-
| "acp"
|
|
233
234
|
| "dsh"
|
|
234
|
-
| "amp"
|
|
235
235
|
| "cursor"
|
|
236
|
-
| "
|
|
237
|
-
| "
|
|
236
|
+
| "amp"
|
|
237
|
+
| "devin"
|
|
238
|
+
| "acp"
|
|
238
239
|
| undefined;
|
|
239
240
|
providerMeta?: Record<string, unknown> | undefined;
|
|
240
241
|
harnessVariant?: string | undefined;
|
|
@@ -246,18 +247,18 @@ declare module "swarm-extension" {
|
|
|
246
247
|
sourceAgentId?: string | undefined;
|
|
247
248
|
role?: string | undefined;
|
|
248
249
|
harnessProvider?:
|
|
249
|
-
| "claude"
|
|
250
|
-
| "codex"
|
|
251
250
|
| "pi"
|
|
252
|
-
| "
|
|
251
|
+
| "claude"
|
|
253
252
|
| "claude-managed"
|
|
253
|
+
| "codex"
|
|
254
|
+
| "grok"
|
|
255
|
+
| "fx"
|
|
254
256
|
| "opencode"
|
|
255
|
-
| "acp"
|
|
256
257
|
| "dsh"
|
|
257
|
-
| "amp"
|
|
258
258
|
| "cursor"
|
|
259
|
-
| "
|
|
260
|
-
| "
|
|
259
|
+
| "amp"
|
|
260
|
+
| "devin"
|
|
261
|
+
| "acp"
|
|
261
262
|
| undefined;
|
|
262
263
|
leadOnly?: boolean | undefined;
|
|
263
264
|
}
|
|
@@ -281,7 +282,7 @@ declare module "swarm-extension" {
|
|
|
281
282
|
|
|
282
283
|
export type SteerMode = "steer" | "queue";
|
|
283
284
|
|
|
284
|
-
export type SteeringSource = "script" | "slack" | "mcp" | "api" | "ui"
|
|
285
|
+
export type SteeringSource = "chat" | "script" | "slack" | "mcp" | "api" | "ui";
|
|
285
286
|
|
|
286
287
|
export type RequestInfo = {
|
|
287
288
|
sessionId: string | undefined;
|
package/src/server-user.ts
CHANGED
|
@@ -61,7 +61,7 @@ export const userSendTaskInputSchema = z
|
|
|
61
61
|
.record(z.string(), z.unknown())
|
|
62
62
|
.optional()
|
|
63
63
|
.describe(
|
|
64
|
-
"Optional JSON Schema the assignee's final output must satisfy. store-progress rejects a completion that does not match. Supported keywords: type, required, properties, enum, const, items.",
|
|
64
|
+
"Optional JSON Schema the assignee's final output must satisfy. store-progress rejects a completion that does not match. Supported keywords: type, required, properties, enum, const, items. An empty object {} means no schema.",
|
|
65
65
|
),
|
|
66
66
|
})
|
|
67
67
|
.superRefine((data, ctx) => checkOutputSchemaShape(data.outputSchema, ctx));
|
package/src/slack/ack.ts
CHANGED
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
SLACK_REACTION_DEFAULTS,
|
|
12
12
|
type SlackReactionEvent,
|
|
13
13
|
} from "./reaction-shortcode";
|
|
14
|
-
import { deferralWakes, isAwaitingWake } from "./task-output";
|
|
14
|
+
import { deferralWakes, isAwaitingWake, isDeferredTask } from "./task-output";
|
|
15
15
|
|
|
16
16
|
export { reactionName, type SlackReactionEvent } from "./reaction-shortcode";
|
|
17
17
|
|
|
@@ -134,6 +134,27 @@ export async function finalizeSlackMessageReaction(
|
|
|
134
134
|
await addReaction(client, channel, timestamp, outcome, event);
|
|
135
135
|
}
|
|
136
136
|
|
|
137
|
+
/**
|
|
138
|
+
* Mark a Slack message as seen but not taken: drop this bot's acceptance
|
|
139
|
+
* reactions and add the configured skip reaction (`SLACK_REACTION_SKIPPED`,
|
|
140
|
+
* default `mute`). Shared by the `skipped` task status and the
|
|
141
|
+
* `pre.task.create` extension block, so both look the same in the thread.
|
|
142
|
+
* Reactions only: a skip never posts a message, so it notifies no one.
|
|
143
|
+
*/
|
|
144
|
+
export async function skipSlackMessageReaction(
|
|
145
|
+
client: SlackReactionClient,
|
|
146
|
+
channel: string,
|
|
147
|
+
timestamp: string,
|
|
148
|
+
): Promise<void> {
|
|
149
|
+
await finalizeSlackMessageReaction(
|
|
150
|
+
client,
|
|
151
|
+
channel,
|
|
152
|
+
timestamp,
|
|
153
|
+
reactionName("skipped"),
|
|
154
|
+
"skipped",
|
|
155
|
+
);
|
|
156
|
+
}
|
|
157
|
+
|
|
137
158
|
/**
|
|
138
159
|
* The reaction to apply for one finalization: the shortcode to send, plus the
|
|
139
160
|
* configurable event it came from when there is one. A choice with no `event`
|
|
@@ -144,10 +165,23 @@ export type SlackReactionChoice = { name: string; event?: SlackReactionEvent };
|
|
|
144
165
|
|
|
145
166
|
/** The reaction choice for a task's terminal outcome, honouring operator config. */
|
|
146
167
|
export function terminalReactionChoice(task: AgentTask): SlackReactionChoice {
|
|
147
|
-
const event =
|
|
168
|
+
const event: SlackReactionEvent =
|
|
169
|
+
task.status === "skipped" ? "skipped" : terminalReactionEvent(task.status);
|
|
148
170
|
return { name: reactionName(event), event };
|
|
149
171
|
}
|
|
150
172
|
|
|
173
|
+
/**
|
|
174
|
+
* The trigger message's terminal event. A skipped task did not answer, so it
|
|
175
|
+
* does not count against the tasks that did: the skip reaction shows only when
|
|
176
|
+
* every linked task skipped. A deferral is stored `completed` but its outcome
|
|
177
|
+
* is its wake-up's, which is also linked, so it does not count either.
|
|
178
|
+
*/
|
|
179
|
+
function linkedTasksReactionEvent(linkedTasks: AgentTask[]): SlackReactionEvent {
|
|
180
|
+
const answered = linkedTasks.filter((task) => task.status !== "skipped" && !isDeferredTask(task));
|
|
181
|
+
if (answered.length === 0) return "skipped";
|
|
182
|
+
return answered.every((task) => task.status === "completed") ? "completed" : "failed";
|
|
183
|
+
}
|
|
184
|
+
|
|
151
185
|
/** Finalize acknowledgement reactions that were added to Slack steer messages. */
|
|
152
186
|
export async function finalizeSlackSteerReactions(
|
|
153
187
|
tasks: AgentTask[],
|
|
@@ -231,16 +265,18 @@ export async function finalizeTerminalSlackReactions(tasks: AgentTask[]): Promis
|
|
|
231
265
|
) {
|
|
232
266
|
continue;
|
|
233
267
|
}
|
|
234
|
-
const event
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
268
|
+
const event = linkedTasksReactionEvent(linkedTasks);
|
|
269
|
+
const finalized =
|
|
270
|
+
event === "skipped"
|
|
271
|
+
? skipSlackMessageReaction(app.client, channelId, timestamp)
|
|
272
|
+
: finalizeSlackMessageReaction(
|
|
273
|
+
app.client,
|
|
274
|
+
channelId,
|
|
275
|
+
timestamp,
|
|
276
|
+
reactionName(event),
|
|
277
|
+
event,
|
|
278
|
+
);
|
|
279
|
+
void finalized.catch((error) =>
|
|
244
280
|
console.error(`[Slack] Failed to finalize reaction for ${channelId}/${timestamp}:`, error),
|
|
245
281
|
);
|
|
246
282
|
}
|
package/src/slack/blocks.ts
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import type { ReactionEvent } from "@/integrations/reaction-events";
|
|
2
2
|
|
|
3
|
-
/**
|
|
4
|
-
|
|
3
|
+
/**
|
|
4
|
+
* The shared lifecycle events, plus Slack's own `skipped`: the swarm saw the
|
|
5
|
+
* message and decided it was not its to answer (a `skipped` task, or a
|
|
6
|
+
* `pre.task.create` extension block). Slack maps each one to a shortcode below.
|
|
7
|
+
*/
|
|
8
|
+
export type SlackReactionEvent = ReactionEvent | "skipped";
|
|
5
9
|
|
|
6
10
|
export const SLACK_REACTION_DEFAULTS: Record<SlackReactionEvent, string> = {
|
|
7
11
|
accepted: "eyes",
|
|
@@ -10,6 +14,7 @@ export const SLACK_REACTION_DEFAULTS: Record<SlackReactionEvent, string> = {
|
|
|
10
14
|
steered: "speech_balloon",
|
|
11
15
|
completed: "white_check_mark",
|
|
12
16
|
failed: "x",
|
|
17
|
+
skipped: "mute",
|
|
13
18
|
};
|
|
14
19
|
|
|
15
20
|
export const SLACK_REACTION_CONFIG_KEYS: Record<SlackReactionEvent, string> = {
|
|
@@ -19,6 +24,7 @@ export const SLACK_REACTION_CONFIG_KEYS: Record<SlackReactionEvent, string> = {
|
|
|
19
24
|
steered: "SLACK_REACTION_STEERED",
|
|
20
25
|
completed: "SLACK_REACTION_COMPLETED",
|
|
21
26
|
failed: "SLACK_REACTION_FAILED",
|
|
27
|
+
skipped: "SLACK_REACTION_SKIPPED",
|
|
22
28
|
};
|
|
23
29
|
|
|
24
30
|
/**
|
package/src/slack/render-v2.ts
CHANGED
|
@@ -353,6 +353,8 @@ async function taskStateGlyph(
|
|
|
353
353
|
return "🚫";
|
|
354
354
|
case "superseded":
|
|
355
355
|
return "↪️";
|
|
356
|
+
case "skipped":
|
|
357
|
+
return `:${reactionName("skipped")}:`;
|
|
356
358
|
default:
|
|
357
359
|
return "🕒";
|
|
358
360
|
}
|
|
@@ -378,7 +380,7 @@ function terminalEnd(task: AgentTask, now: Date): Date {
|
|
|
378
380
|
}
|
|
379
381
|
|
|
380
382
|
function isTerminalTreeStatus(status: AgentTask["status"]): boolean {
|
|
381
|
-
return ["completed", "failed", "cancelled", "superseded"].includes(status);
|
|
383
|
+
return ["completed", "failed", "cancelled", "superseded", "skipped"].includes(status);
|
|
382
384
|
}
|
|
383
385
|
|
|
384
386
|
function cleanTaskDescription(task: AgentTask): string {
|
|
@@ -440,6 +442,16 @@ function renderProgress(progress: string | undefined): string | undefined {
|
|
|
440
442
|
return `${normalized.slice(0, cut).trimEnd()}…`;
|
|
441
443
|
}
|
|
442
444
|
|
|
445
|
+
/** A skipped row's reason: one line, bounded like progress, no trailing ellipsis. */
|
|
446
|
+
function renderSkipReason(reason: string | undefined): string | undefined {
|
|
447
|
+
const normalized = markdownToSlack(reason ?? "")
|
|
448
|
+
.replace(/\s+/g, " ")
|
|
449
|
+
.trim();
|
|
450
|
+
if (!normalized) return undefined;
|
|
451
|
+
if (normalized.length <= MAX_TREE_PROGRESS_LENGTH) return normalized;
|
|
452
|
+
return `${normalized.slice(0, MAX_TREE_PROGRESS_LENGTH - 1).trimEnd()}…`;
|
|
453
|
+
}
|
|
454
|
+
|
|
443
455
|
async function renderNodeLines(
|
|
444
456
|
node: RenderNode,
|
|
445
457
|
depth: number,
|
|
@@ -456,8 +468,15 @@ async function renderNodeLines(
|
|
|
456
468
|
? `${indent.slice(0, MAX_TREE_PREFIX_LENGTH - 1)}…`
|
|
457
469
|
: indent;
|
|
458
470
|
let line = `${boundedPrefix}↳ ${await taskStateGlyph(node.task, now, threadTasks)} ${await renderNodeLabel(node, isAsk)} · ${duration} · ${getTaskLink(node.task.id)}`;
|
|
459
|
-
|
|
460
|
-
|
|
471
|
+
// A skip posts no outcome card, so its row carries the reason. Editing the
|
|
472
|
+
// tree is silent; it notifies no one.
|
|
473
|
+
const detail =
|
|
474
|
+
node.task.status === "skipped"
|
|
475
|
+
? renderSkipReason(node.task.failureReason)
|
|
476
|
+
: isTerminalTreeStatus(node.task.status)
|
|
477
|
+
? undefined
|
|
478
|
+
: renderProgress(node.task.progress);
|
|
479
|
+
const suffix = detail ? ` · ${detail}` : "";
|
|
461
480
|
if (suffix && line.length + suffix.length <= MAX_TREE_NODE_LINE_LENGTH) {
|
|
462
481
|
line += suffix;
|
|
463
482
|
}
|
|
@@ -903,6 +922,14 @@ async function outcomeContent(task: AgentTask, slackReplySent: boolean): Promise
|
|
|
903
922
|
outcomeText(task.failureReason, "Task was cancelled."),
|
|
904
923
|
);
|
|
905
924
|
}
|
|
925
|
+
// Only a deferral card resolved by a skipped wake-up reaches here: a skip
|
|
926
|
+
// gets no outcome card of its own. The rewrite is an edit, so it is silent.
|
|
927
|
+
if (task.status === "skipped") {
|
|
928
|
+
return withStatusLead(
|
|
929
|
+
`:${reactionName("skipped")}: **Skipped:**`,
|
|
930
|
+
outcomeText(task.failureReason, "Task was skipped."),
|
|
931
|
+
);
|
|
932
|
+
}
|
|
906
933
|
// A deferral's output is engine-authored, never posted by hand via
|
|
907
934
|
// slack-reply, so it must not collapse into the "agent completed" summary
|
|
908
935
|
// even when the agent also sent a slack-reply earlier in the same task.
|
package/src/slack/task-output.ts
CHANGED
|
@@ -93,6 +93,9 @@ export function isAwaitingWake(
|
|
|
93
93
|
if (!isDeferredTask(task)) return false;
|
|
94
94
|
return !deferralWakes(task, threadTasks).some(
|
|
95
95
|
(wake) =>
|
|
96
|
-
wake.status === "completed" ||
|
|
96
|
+
wake.status === "completed" ||
|
|
97
|
+
wake.status === "failed" ||
|
|
98
|
+
wake.status === "cancelled" ||
|
|
99
|
+
wake.status === "skipped",
|
|
97
100
|
);
|
|
98
101
|
}
|
|
@@ -10,7 +10,7 @@ import { createAdditiveBuffer } from "../tasks/additive-buffer";
|
|
|
10
10
|
import { slackContextKey } from "../tasks/context-key";
|
|
11
11
|
import { TaskCreationBlockedError } from "../tasks/errors";
|
|
12
12
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
13
|
-
import { ackSlackMessage } from "./ack";
|
|
13
|
+
import { ackSlackMessage, skipSlackMessageReaction } from "./ack";
|
|
14
14
|
import { getSlackApp } from "./app";
|
|
15
15
|
import { buildBufferFlushBlocks } from "./blocks";
|
|
16
16
|
import { resolveSlackUserId, rewriteSlackMentions } from "./enrich";
|
|
@@ -349,7 +349,7 @@ async function slackFlush(
|
|
|
349
349
|
scrubSecrets(error.reason),
|
|
350
350
|
);
|
|
351
351
|
if (app) {
|
|
352
|
-
await
|
|
352
|
+
await skipSlackMessageReaction(app.client, channelId, items.at(-1)!.ts);
|
|
353
353
|
}
|
|
354
354
|
return;
|
|
355
355
|
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { finalizeTerminalSlackReactions } from "../slack/ack";
|
|
2
|
+
import type { AgentTask } from "../types";
|
|
3
|
+
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* The one-line reason a `skipped` finish carries. Accept it from output too,
|
|
7
|
+
* since that is where a finishing call usually puts its text; the caller keeps
|
|
8
|
+
* output empty so nothing that publishes a task result has text to post.
|
|
9
|
+
* Undefined when neither field has text.
|
|
10
|
+
*/
|
|
11
|
+
export function skipReasonFrom(failureReason?: string, output?: string): string | undefined {
|
|
12
|
+
return (failureReason ?? output)?.replace(/\s+/g, " ").trim() || undefined;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* A skip posts nothing to the thread: no outcome card, no relay, no lead
|
|
17
|
+
* follow-up. It only swaps the trigger message's ack reaction for the skip
|
|
18
|
+
* reaction. Call it once, after a fresh skip committed.
|
|
19
|
+
*/
|
|
20
|
+
export function finalizeSkippedTaskReaction(task: AgentTask, caller: string): void {
|
|
21
|
+
if (!task.slackChannelId) return;
|
|
22
|
+
void finalizeTerminalSlackReactions([task]).catch((error) =>
|
|
23
|
+
console.error(
|
|
24
|
+
`[${caller}] skip reaction failed:`,
|
|
25
|
+
scrubSecrets(error instanceof Error ? error.message : String(error)),
|
|
26
|
+
),
|
|
27
|
+
);
|
|
28
|
+
}
|