@desplega.ai/agent-swarm 2.12.0 → 2.13.0
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-cn53011z.js +17 -0
- package/dist/{acp-targets-311gcyvw.js → acp-targets-86f0sh6g.js} +9 -8
- package/dist/{actions-c4chgxp6.js → actions-zv8vcxvr.js} +24 -23
- package/dist/{agent-fs-provision-0b9awm5n.js → agent-fs-provision-jqshb33y.js} +4 -4
- package/dist/{amp-adapter-r0veq6x5.js → amp-adapter-gt503ywc.js} +2 -2
- package/dist/{app-hn5fftf5.js → app-6t4k5rh1.js} +6 -4
- package/dist/{approval-notifications-3g6yc8nv.js → approval-notifications-fcfw063h.js} +7 -6
- package/dist/{assistant-cpjgpjvp.js → assistant-9dzybh12.js} +25 -24
- package/dist/{boot-args-schema-hce1av1h.js → boot-args-schema-xzfp2feg.js} +1 -1
- package/dist/{boot-reembed-d7xcym0j.js → boot-reembed-3jz0p2jk.js} +1 -1
- package/dist/{boot-reembed-bztbxc4z.js → boot-reembed-r88wngfg.js} +5 -2
- package/dist/{boot-scrub-sweep-mkmm16gk.js → boot-scrub-sweep-scrqhw48.js} +2 -2
- package/dist/{boot-seeds-arrkbe8t.js → boot-seeds-vb2dcrrb.js} +4 -4
- package/dist/{claude-adapter-ykpyr5p8.js → claude-adapter-h3mp9hgs.js} +7 -6
- package/dist/{claude-managed-adapter-ssg6z4bt.js → claude-managed-adapter-kpbyj2vb.js} +3 -3
- package/dist/{claude-managed-setup-trd59v7b.js → claude-managed-setup-0efr3wkg.js} +5 -5
- package/dist/{claude-sdk-session-yjcze0j1.js → claude-sdk-session-03dw669q.js} +7 -6
- package/dist/{cli-e3ahxq5y.js → cli-0b655smz.js} +4 -4
- package/dist/{cli-mcymtvwn.js → cli-0dg7ytxm.js} +89 -11
- package/dist/cli-0jkenasr.js +148 -0
- package/dist/{cli-c7j31hq9.js → cli-0pazkmd4.js} +3 -3
- package/dist/{cli-5tg94mdw.js → cli-117g15t4.js} +8 -11
- package/dist/{cli-r14ac1y0.js → cli-1dbv9mj9.js} +1 -1
- package/dist/{cli-q8tc22bj.js → cli-1v82d2w6.js} +3 -3
- package/dist/{cli-pe3yxedk.js → cli-2jk4s7z1.js} +2 -2
- package/dist/{cli-0pp1yjg2.js → cli-2skf1mdf.js} +8 -8
- package/dist/{cli-2tw284hj.js → cli-48nvk6sb.js} +1 -1
- package/dist/{cli-en6dmkxd.js → cli-49f5jyhh.js} +2 -2
- package/dist/{cli-2z2c4k6q.js → cli-50w82h6m.js} +21 -0
- package/dist/{cli-dd2k2mcd.js → cli-6a40p4kv.js} +1 -1
- package/dist/{cli-yegz2g06.js → cli-6h88mn9q.js} +3 -3
- package/dist/{cli-52nfye5j.js → cli-7dbhnsj9.js} +23 -15
- package/dist/{cli-04zc3f7b.js → cli-9fsagra4.js} +1 -1
- package/dist/{cli-nja15knq.js → cli-9m9kyw77.js} +3 -3
- package/dist/{cli-k5jx8jya.js → cli-ajjvqhf3.js} +1 -1
- package/dist/{cli-hbvgzjq4.js → cli-avqkr20b.js} +2 -2
- package/dist/{cli-yfpc6qy9.js → cli-avxh26pd.js} +46 -15
- package/dist/{cli-q2dywc8h.js → cli-b2jh3dyb.js} +4 -4
- package/dist/{cli-m5qtmrbc.js → cli-c8v2yvej.js} +2 -2
- package/dist/{cli-gfy6hbd9.js → cli-ct8sz3np.js} +17 -10
- package/dist/{cli-bz97ff9n.js → cli-dka73bak.js} +1 -1
- package/dist/{cli-dkvtfgn4.js → cli-dkejt425.js} +75 -16
- package/dist/{cli-sv2r3bw8.js → cli-dnh64e8e.js} +2 -2
- package/dist/{cli-kwr5qv5g.js → cli-eb279wn3.js} +2 -2
- package/dist/{cli-hhc47ack.js → cli-f1952kjy.js} +2 -2
- package/dist/{cli-5z0g0e8v.js → cli-f8rcvf2x.js} +49 -13
- package/dist/{cli-eq4kew31.js → cli-fhvk2nvp.js} +24 -11
- package/dist/{cli-xf4z5bdn.js → cli-fz9pcjsw.js} +2 -2
- package/dist/{cli-fxd1mwtr.js → cli-g6j6ac3h.js} +1 -1
- package/dist/{cli-ya3kf4gs.js → cli-gfcv679k.js} +1 -1
- package/dist/{cli-55tc8cj4.js → cli-hbq0kwxz.js} +4 -4
- package/dist/{cli-39qm0rtm.js → cli-hc6e4tac.js} +28 -149
- package/dist/{cli-j5gtytvg.js → cli-hgsxnjyg.js} +13 -10
- package/dist/{cli-h70a2mxy.js → cli-hpb9x72z.js} +48 -8
- package/dist/{cli-7yn42w6m.js → cli-j53hpbsm.js} +1 -1
- package/dist/{cli-12vek61e.js → cli-jj3c5nyb.js} +471 -119
- package/dist/{cli-fy4gb74g.js → cli-kde4ky90.js} +1 -1
- package/dist/{cli-9qe5y107.js → cli-kspxjftk.js} +1 -1
- package/dist/{cli-bp6k9acz.js → cli-mh7pdxe0.js} +16 -16
- package/dist/{cli-v9ya390t.js → cli-mz34pxbk.js} +8 -8
- package/dist/{cli-ma9ys8rt.js → cli-nc6a8b5b.js} +7 -4
- package/dist/{cli-1htmtqc2.js → cli-prf7kz78.js} +49 -49
- package/dist/{cli-01tvvtad.js → cli-qec9bynj.js} +3 -3
- package/dist/{cli-t75xngj1.js → cli-qhhb30e8.js} +7 -7
- package/dist/{cli-73q4g5nx.js → cli-qm3ntjqs.js} +12 -12
- package/dist/{cli-tm60vtax.js → cli-rfejbpe1.js} +1 -1
- package/dist/{cli-agjbj5x0.js → cli-sdh61g52.js} +37 -19
- package/dist/{cli-9y4tgrkf.js → cli-skd2c4ej.js} +2 -1
- package/dist/{cli-5x03v6en.js → cli-sq913bh1.js} +8 -8
- package/dist/{cli-b93d81yg.js → cli-t35hx078.js} +1 -1
- package/dist/{cli-r0mz92by.js → cli-tn91wc6e.js} +1 -1
- package/dist/{cli-wvjqaqcp.js → cli-tstj6e8e.js} +1113 -227
- package/dist/{cli-xm34qj8m.js → cli-w14j2z4k.js} +2 -2
- package/dist/{cli-eqq0hwvx.js → cli-wndegmns.js} +1 -1
- package/dist/{cli-0k1a0sde.js → cli-wrhbym01.js} +6 -6
- package/dist/{cli-fyaq4zdv.js → cli-wv20kbr3.js} +6 -6
- package/dist/{cli-mq2fbgva.js → cli-wxwv3t11.js} +2 -2
- package/dist/{cli-krbcr00p.js → cli-xfjn2kyq.js} +58 -4
- package/dist/{cli-5r95eqbh.js → cli-y260hgep.js} +1 -1
- package/dist/{cli-cjqyse9q.js → cli-y4a4458j.js} +3 -3
- package/dist/{cli-2amwhyv2.js → cli-y518qkjg.js} +5 -3
- package/dist/{cli-0vcqcwfn.js → cli-yfvhvw8m.js} +2 -0
- package/dist/cli-yn4kt85g.js +148 -0
- package/dist/{cli-n8f0fs3c.js → cli-ytc7fpza.js} +8 -8
- package/dist/{cli-e8n0hdzd.js → cli-z64t9pe6.js} +1 -1
- package/dist/{cli-72yms3ey.js → cli-zqmmy073.js} +198 -18
- package/dist/cli.js +18 -16
- package/dist/{codex-adapter-wc6e4wct.js → codex-adapter-f3yp0kaj.js} +5 -5
- package/dist/{codex-hook-aqtj17yr.js → codex-hook-262cekfp.js} +73 -2
- package/dist/{codex-session-runner-ppfgjd97.js → codex-session-runner-ns4mv70p.js} +5 -5
- package/dist/{commands-tsv2vx5b.js → commands-5bzf2tfw.js} +3 -3
- package/dist/{controller-ye4sdwsy.js → controller-5xt7kvfm.js} +2 -2
- package/dist/{controllers-connect-zn4dg69h.js → controllers-connect-0gg13mzp.js} +24 -23
- package/dist/core-0fqtbrxa.js +42 -0
- package/dist/{cursor-adapter-q2g9vwts.js → cursor-adapter-p0c5zv6r.js} +1 -1
- package/dist/{db-g111qn9j.js → db-2s68ycq7.js} +3 -3
- package/dist/{db-3r1fyr2n.js → db-q7q639k5.js} +4 -2
- package/dist/{dispatcher-4q8s0mx8.js → dispatcher-j2y1q7ae.js} +24 -21
- package/dist/{dsh-adapter-mmcw1z5s.js → dsh-adapter-pgnkf4st.js} +1 -1
- package/dist/{easter-egg-3d-04ke6hcp.js → easter-egg-3d-0kea97jf.js} +1 -1
- package/dist/{embedding-space-kcdn52vz.js → embedding-space-3n6mhhmy.js} +6 -6
- package/dist/{embeddings-jnzcd91a.js → embeddings-jfmj6yme.js} +1 -1
- package/dist/{execute-74amghty.js → execute-tjrej979.js} +1 -1
- package/dist/{external-channel-v9zgxnxz.js → external-channel-jy8w2gg3.js} +2 -2
- package/dist/fx-adapter-k6w3jvz9.js +20 -0
- package/dist/grok-adapter-4q5tssw0.js +20 -0
- package/dist/handlers-qxgfvvsf.js +41 -0
- package/dist/{heartbeat-p8pk1msj.js → heartbeat-6tr2w2da.js} +25 -24
- package/dist/{hook-p5reemds.js → hook-bpnncsec.js} +76 -17
- package/dist/{hook-k1h73zd7.js → hook-fv1jwrv7.js} +6 -5
- package/dist/{http-ms1z5xxy.js → http-bpa26czn.js} +785 -181
- package/dist/index-0mcxjdsa.js +44 -0
- package/dist/{index-kn63q1gr.js → index-52tgbhrw.js} +29 -28
- package/dist/index-dz4q23ag.js +40 -0
- package/dist/{index-76zzxtzf.js → index-mpj0z9e0.js} +1 -1
- package/dist/index-s175jckx.js +39 -0
- package/dist/{index-gjn6qfgn.js → index-s8re7mvq.js} +1 -1
- package/dist/{index-fbkqhvvj.js → index-w216g9y9.js} +198 -160
- package/dist/{keepalive-031js8jz.js → keepalive-d6z12s04.js} +3 -3
- package/dist/lead-p3hx7h35.js +79 -0
- package/dist/{maintenance-sq9v3qx9.js → maintenance-7kac6g2g.js} +1 -1
- package/dist/{oauth-refresh-sweep-zqmnyvs8.js → oauth-refresh-sweep-t1xjetbh.js} +2 -2
- package/dist/{object-webhooks-r24wwb5y.js → object-webhooks-6rdagg0r.js} +7 -7
- package/dist/{onboard-p25yhh7t.js → onboard-32y1cfxy.js} +3 -3
- package/dist/{opencode-adapter-wcjc4zdk.js → opencode-adapter-enp3v31n.js} +7 -6
- package/dist/{otel-impl-ff1gf20m.js → otel-impl-k0tm5ptj.js} +1 -1
- package/dist/{pending-hxj5yatb.js → pending-24zebgvs.js} +23 -22
- package/dist/{pi-mono-adapter-vkp4zz7p.js → pi-mono-adapter-yj72xxxe.js} +85 -16
- package/dist/{pricing-refresh-9w7gx41w.js → pricing-refresh-cf25x38j.js} +2 -2
- package/dist/{rbac-roles-84aw10nz.js → rbac-roles-0wydd22m.js} +3 -3
- package/dist/{rbac-roles-hz74vckp.js → rbac-roles-at6crb3r.js} +7 -4
- package/dist/{registry-eeyx1201.js → registry-zv0zvxsx.js} +1 -1
- package/dist/{render-v2-nrdkg9gf.js → render-v2-nvcw0jd7.js} +8 -4
- package/dist/{resume-s6ey36rh.js → resume-y4w0k5v3.js} +9 -8
- package/dist/{runtime-x0b4pyam.js → runtime-vpe43hx0.js} +1 -1
- package/dist/{session-access-xv49tk14.js → session-access-gkyvnfye.js} +5 -4
- package/dist/{session-source-backfill-r5j988ah.js → session-source-backfill-3w2st4m2.js} +2 -2
- package/dist/{setup-mj0krk1p.js → setup-axxvqtys.js} +1 -1
- package/dist/thread-buffer-rwa7d4dx.js +42 -0
- package/dist/{tree-visibility-cbrsfaar.js → tree-visibility-y4fqvab5.js} +2 -2
- package/dist/{user-merge-jobs-f9d8nwnw.js → user-merge-jobs-kcmwvrc6.js} +3 -3
- package/dist/{virtual-modules-ns0ryw05.js → virtual-modules-7d92dct1.js} +3 -3
- package/dist/{work-objects-pydhzast.js → work-objects-f708e069.js} +27 -25
- package/dist/worker-8rg9gz74.js +79 -0
- package/dist/{worker-follow-up-9z2xec5e.js → worker-follow-up-0by8wztc.js} +22 -21
- package/dist/xlsx-9acfmxr1.js +31534 -0
- package/openapi.json +1385 -204
- package/package.json +5 -3
- package/src/agentmail/handlers.ts +26 -19
- package/src/apps/catalog.generated.json +31 -0
- package/src/apps/row-store.ts +37 -14
- package/src/azure-devops/handlers.ts +2 -0
- package/src/be/audit-user.ts +46 -6
- package/src/be/db/kv-windows.ts +22 -0
- package/src/be/db/session-moves.ts +3 -3
- package/src/be/db/session-tree.ts +52 -5
- package/src/be/db/skill-audit.ts +17 -0
- package/src/be/db/tasks/write.ts +18 -3
- package/src/be/db.ts +114 -23
- package/src/be/extensions/assets.ts +11 -7
- package/src/be/memory/demotion-evidence.ts +2 -2
- package/src/be/memory/providers/sqlite-store.ts +151 -18
- package/src/be/memory/search-read-worker.ts +60 -0
- package/src/be/memory/search-reader.ts +223 -0
- package/src/be/migrations/337_favorites_session_hidden_key.sql +39 -0
- package/src/be/migrations/338_audit_agent_columns.sql +30 -0
- package/src/be/migrations/339_deferred_event_waits.sql +26 -0
- package/src/be/model-tier-resolution.ts +18 -1
- package/src/be/multi-runtime.ts +17 -0
- package/src/be/primitives/object-embed.ts +250 -0
- package/src/be/primitives/objects.ts +29 -9
- package/src/be/primitives/sheets/service.ts +138 -6
- package/src/be/primitives/sheets/xlsx.ts +367 -0
- package/src/be/rbac-roles.ts +3 -0
- package/src/be/repo-checked-update.ts +4 -4
- package/src/be/repo-merge-policy.ts +26 -9
- package/src/be/scripts/boot-reembed.ts +6 -0
- package/src/be/scripts/db.ts +17 -5
- package/src/be/scripts/embeddings.ts +6 -0
- package/src/be/scripts/typecheck.ts +43 -2
- package/src/be/seed/schedules-seeder.ts +9 -1
- package/src/be/seed/workflows-seeder.ts +9 -1
- package/src/be/seed-scripts/index.ts +2 -0
- package/src/be/seed-skills/index.ts +12 -0
- package/src/be/swarm-config-guard.ts +1 -0
- package/src/be/unmapped-identities.ts +95 -1
- package/src/bitbucket/handlers.ts +2 -0
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/event-waits/github.ts +43 -0
- package/src/event-waits/index.ts +29 -0
- package/src/event-waits/types.ts +51 -0
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/extensions/dispatcher.ts +9 -0
- package/src/fs/agent-fs-provider.ts +4 -1
- package/src/github/handlers.ts +3 -1
- package/src/github/pull-request-state.ts +34 -0
- package/src/gitlab/handlers.ts +12 -7
- package/src/hooks/codex-hook.ts +99 -1
- package/src/hooks/hook.ts +85 -11
- package/src/hooks/native-tool-hooks.ts +245 -0
- package/src/http/all-routes.ts +1 -0
- package/src/http/assets.ts +4 -3
- package/src/http/comb.ts +2 -2
- package/src/http/favorite-owner.ts +2 -2
- package/src/http/favorites.ts +3 -2
- package/src/http/fs.ts +13 -4
- package/src/http/index.ts +2 -0
- package/src/http/mcp-bridge.ts +4 -0
- package/src/http/objects.ts +265 -0
- package/src/http/pages.ts +3 -3
- package/src/http/poll.ts +43 -12
- package/src/http/repos.ts +7 -6
- package/src/http/schedules.ts +10 -6
- package/src/http/script-connections.ts +2 -2
- package/src/http/scripts.ts +9 -0
- package/src/http/sessions.ts +30 -12
- package/src/http/skills.ts +17 -0
- package/src/http/task-requester.ts +2 -2
- package/src/http/tasks.ts +13 -3
- package/src/http/tool-hooks.ts +24 -2
- package/src/http/trackers/authorize-gate.ts +2 -2
- package/src/http/users.ts +136 -1
- package/src/http/workflow-events.ts +13 -0
- package/src/http/workflows.ts +21 -11
- package/src/linear/sync.ts +3 -1
- package/src/prompts/base-prompt.ts +35 -13
- package/src/prompts/session-templates.ts +25 -0
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/dsh-adapter.ts +1 -1
- package/src/providers/opencode-adapter.ts +1 -0
- package/src/providers/opencode-swarm-plugin.ts +50 -1
- package/src/providers/pi-mono-adapter.ts +139 -9
- package/src/providers/pi-mono-extension.ts +69 -0
- package/src/providers/runtime-dependencies.ts +1 -1
- package/src/rbac/legacy-policy.ts +3 -0
- package/src/rbac/permissions.ts +11 -1
- package/src/scheduler/deferred-task-waits.ts +170 -13
- package/src/scripts-runtime/executors/types.ts +5 -0
- package/src/scripts-runtime/loader.ts +8 -0
- package/src/scripts-runtime/mcp-client.ts +4 -0
- package/src/scripts-runtime/sdk-allowlist.ts +14 -1
- package/src/scripts-runtime/swarm-config.ts +8 -0
- package/src/scripts-runtime/swarm-sdk.ts +4 -0
- package/src/scripts-runtime/types/stdlib.d.ts +47 -4
- package/src/scripts-runtime/types/swarm-extension.d.ts +1 -0
- package/src/scripts-runtime/types/swarm-sdk.d.ts +47 -4
- package/src/server.ts +4 -0
- package/src/slack/enrich.ts +81 -21
- package/src/slack/handlers.test.ts +55 -2
- package/src/slack/handlers.ts +38 -3
- package/src/slack/render-v2.ts +19 -0
- package/src/slack/session-mirror.ts +208 -0
- package/src/slack/thread-participants.ts +0 -5
- package/src/slack/watcher.ts +3 -0
- package/src/slack/work-objects.test.ts +2 -1
- package/src/slack/work-objects.ts +7 -2
- package/src/tests/agentmail-filters.test.ts +4 -3
- package/src/tests/audit-agent-person.test.ts +825 -0
- package/src/tests/audit-updated-by.test.ts +19 -12
- package/src/tests/claude-hook-output.test.ts +107 -2
- package/src/tests/claude-managed-setup.test.ts +1 -1
- package/src/tests/codex-adapter.test.ts +6 -6
- package/src/tests/codex-gpt6-release.test.ts +4 -4
- package/src/tests/db-task-read-contract.test.ts +1 -0
- package/src/tests/db-task-write-contract.test.ts +1 -0
- package/src/tests/dsh-adapter.test.ts +1 -1
- package/src/tests/extensions-catalog.test.ts +33 -25
- package/src/tests/fixtures/sheets/eocd-count-mismatch.xlsx +0 -0
- package/src/tests/fixtures/sheets/rich-budget.xlsx +0 -0
- package/src/tests/fixtures/sheets/tracker-export.xlsx +0 -0
- package/src/tests/kv-storage.test.ts +3 -0
- package/src/tests/memory-search-reader.test.ts +258 -0
- package/src/tests/memory-search-stall.test.ts +197 -20
- package/src/tests/model-control.test.ts +4 -4
- package/src/tests/model-tier-resolution.test.ts +2 -2
- package/src/tests/multi-runtime-registration.test.ts +8 -2
- package/src/tests/native-tool-hooks.test.ts +188 -0
- package/src/tests/opencode-swarm-plugin.test.ts +6 -1
- package/src/tests/pi-provider-runtime-keys.test.ts +163 -0
- package/src/tests/poll-probe-readonly.test.ts +108 -0
- package/src/tests/primitives-sheets-xlsx.test.ts +549 -0
- package/src/tests/prompt-template-session.test.ts +3 -2
- package/src/tests/rbac-roles.test.ts +3 -0
- package/src/tests/script-connections.test.ts +4 -0
- package/src/tests/seed-model-profiles.test.ts +1 -1
- package/src/tests/sessions-tree.test.ts +10 -2
- package/src/tests/slack-thread-participants.test.ts +66 -4
- package/src/tests/tool-registrar-no-input.test.ts +1 -0
- package/src/tools/defer-task.ts +154 -12
- package/src/tools/objects.ts +10 -5
- package/src/tools/repos/update-repo.ts +6 -6
- package/src/tools/schedules/create-schedule.ts +1 -0
- package/src/tools/schedules/list-schedules.ts +3 -0
- package/src/tools/schedules/patch-schedule.ts +12 -3
- package/src/tools/schedules/update-schedule.ts +12 -3
- package/src/tools/sheets.ts +66 -0
- package/src/tools/skills/skill-create.ts +6 -0
- package/src/tools/skills/skill-install-remote.ts +6 -0
- package/src/tools/skills/skill-sync-remote.ts +9 -0
- package/src/tools/skills/skill-update.ts +9 -1
- package/src/tools/tool-config.ts +3 -1
- package/src/tools/utils.ts +15 -0
- package/src/tools/workflows/create-workflow.ts +9 -4
- package/src/tools/workflows/patch-workflow-node.ts +1 -1
- package/src/tools/workflows/patch-workflow.ts +5 -2
- package/src/tools/workflows/update-workflow.ts +13 -7
- package/src/types.ts +96 -12
- package/src/workflows/input.ts +12 -5
- package/src/workflows/patch-definition.ts +13 -5
- package/src/workflows/triggers.ts +11 -6
- package/src/workflows/version.ts +7 -1
- package/templates/skills/boards-and-sheets/config.json +14 -0
- package/templates/skills/boards-and-sheets/content.md +163 -0
- package/templates/skills/swarm-docs/content.md +9 -0
- package/dist/acp-adapter-11m13kx4.js +0 -16
- package/dist/core-dxcy02sc.js +0 -41
- package/dist/fx-adapter-0ar6pqm3.js +0 -19
- package/dist/grok-adapter-t6m74fb1.js +0 -19
- package/dist/handlers-9kwcrc4k.js +0 -38
- package/dist/index-23cdfzr6.js +0 -39
- package/dist/index-g7kkjs5b.js +0 -38
- package/dist/index-stk36pa5.js +0 -43
- package/dist/lead-mfggjtfk.js +0 -77
- package/dist/thread-buffer-temgaqsy.js +0 -41
- package/dist/worker-efcemc22.js +0 -77
- /package/dist/{cli-cah298e5.js → cli-m4ejz4nj.js} +0 -0
|
@@ -147,12 +147,29 @@ export async function getAgentModelTierOverrides(agentId: string): Promise<Model
|
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
149
|
|
|
150
|
+
function storedModelTierOverrides(overrides: ModelTierOverrides): string | null {
|
|
151
|
+
return Object.keys(overrides).length > 0 ? JSON.stringify(overrides) : null;
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
/** Read-only twin of `setAgentModelTierOverrides`: true when that call would write. */
|
|
155
|
+
export async function modelTierOverridesDiffer(
|
|
156
|
+
agentId: string,
|
|
157
|
+
overrides: ModelTierOverrides,
|
|
158
|
+
): Promise<boolean> {
|
|
159
|
+
const next = storedModelTierOverrides(overrides);
|
|
160
|
+
const row = await getDbClient().get<{ id: string }>(
|
|
161
|
+
"SELECT id FROM agents WHERE id = ? AND modelTierOverrides IS NOT ?",
|
|
162
|
+
[agentId, next],
|
|
163
|
+
);
|
|
164
|
+
return row !== null;
|
|
165
|
+
}
|
|
166
|
+
|
|
150
167
|
/** Store the worker's overrides; no write when unchanged. Empty object clears. */
|
|
151
168
|
export async function setAgentModelTierOverrides(
|
|
152
169
|
agentId: string,
|
|
153
170
|
overrides: ModelTierOverrides,
|
|
154
171
|
): Promise<void> {
|
|
155
|
-
const next =
|
|
172
|
+
const next = storedModelTierOverrides(overrides);
|
|
156
173
|
await getDbClient().run(
|
|
157
174
|
"UPDATE agents SET modelTierOverrides = ? WHERE id = ? AND modelTierOverrides IS NOT ?",
|
|
158
175
|
[next, agentId, next],
|
package/src/be/multi-runtime.ts
CHANGED
|
@@ -343,6 +343,23 @@ export async function touchRuntimeInstance(id: string, agentId: string): Promise
|
|
|
343
343
|
return result.changes > 0;
|
|
344
344
|
}
|
|
345
345
|
|
|
346
|
+
/**
|
|
347
|
+
* Read-only twin of `touchRuntimeInstance` for the idle poll: true when the
|
|
348
|
+
* runtime is live and was touched within a tenth of the stale threshold
|
|
349
|
+
* (30 s at the 5 min default). Every liveness reader compares against the
|
|
350
|
+
* full threshold, so skipping the touch then changes nothing they see.
|
|
351
|
+
*/
|
|
352
|
+
export async function isRuntimeInstanceFresh(id: string, agentId: string): Promise<boolean> {
|
|
353
|
+
const freshCutoff = new Date(Date.now() - runtimeStaleThresholdMinutes() * 6_000).toISOString();
|
|
354
|
+
const row = await getDbClient().get<{ id: string }>(
|
|
355
|
+
`SELECT id FROM runtime_instances
|
|
356
|
+
WHERE id = ? AND agent_id = ? AND status = 'active' AND last_seen_at >= ?
|
|
357
|
+
AND ${WORKSPACE_CONFIRMED_SQL}`,
|
|
358
|
+
[id, agentId, freshCutoff],
|
|
359
|
+
);
|
|
360
|
+
return row !== null;
|
|
361
|
+
}
|
|
362
|
+
|
|
346
363
|
/** Mark one runtime instance offline (scoped to its agent, like touch). */
|
|
347
364
|
export async function markRuntimeInstanceOffline(
|
|
348
365
|
id: string,
|
|
@@ -0,0 +1,250 @@
|
|
|
1
|
+
import { FilesError } from "@/fs/provider";
|
|
2
|
+
import { buildAgentFsLiveUrl } from "@/utils/constants";
|
|
3
|
+
import { agentFsClientFor } from "../agent-fs-identity";
|
|
4
|
+
import { getDbClient, getSwarmConfigs } from "../db";
|
|
5
|
+
import { parseScene } from "./boards/elements";
|
|
6
|
+
import {
|
|
7
|
+
ObjectsError,
|
|
8
|
+
PRIMITIVE_KINDS,
|
|
9
|
+
type PrimitiveObject,
|
|
10
|
+
recordObjectVersion,
|
|
11
|
+
} from "./objects";
|
|
12
|
+
import { appendSheetRows, type CellInput, clearSheetRange, setSheetRange } from "./sheets/service";
|
|
13
|
+
import { MAX_OBJECT_BYTES } from "./write-object";
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Objects for people: the embed routes (src/http/objects.ts) read and save a
|
|
17
|
+
* board or sheet on behalf of a dashboard or page viewer. Swarm RBAC is the
|
|
18
|
+
* gate; agent-fs sees the object's owner agent as the writer, with its own
|
|
19
|
+
* key. Only objects on the swarm's shared drive are reachable, where agents
|
|
20
|
+
* are already editors, so a viewer cannot reach an agent's private drive.
|
|
21
|
+
*/
|
|
22
|
+
|
|
23
|
+
type Json = Record<string, unknown>;
|
|
24
|
+
type Row = Omit<PrimitiveObject, "link">;
|
|
25
|
+
|
|
26
|
+
/** A refusal with the HTTP status the route returns. */
|
|
27
|
+
export class ObjectEmbedError extends Error {
|
|
28
|
+
constructor(
|
|
29
|
+
readonly status: 400 | 403 | 404 | 409 | 413 | 503,
|
|
30
|
+
message: string,
|
|
31
|
+
/** The file's current agent-fs version, on a 409. */
|
|
32
|
+
readonly version?: number | null,
|
|
33
|
+
) {
|
|
34
|
+
super(message);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** Who saves through an embed: the agent-fs commit message and `updated_by`. */
|
|
39
|
+
export type EmbedActor = { via: "app" | "page"; userId: string | null; name: string | null };
|
|
40
|
+
|
|
41
|
+
const versionOf = (value: string | null | undefined): number | null =>
|
|
42
|
+
value && Number.isFinite(Number(value)) ? Number(value) : null;
|
|
43
|
+
|
|
44
|
+
/** The swarm's shared drive, resolved like agent-fs provisioning does: global config, then env. */
|
|
45
|
+
async function sharedDrive(): Promise<{ orgId: string; driveId: string } | null> {
|
|
46
|
+
const value = async (key: string) =>
|
|
47
|
+
(await getSwarmConfigs({ scope: "global", key }))[0]?.value?.trim() || process.env[key]?.trim();
|
|
48
|
+
const orgId = (await value("AGENT_FS_DEFAULT_ORG_ID")) || (await value("AGENT_FS_SHARED_ORG_ID"));
|
|
49
|
+
const driveId = await value("AGENT_FS_DEFAULT_DRIVE_ID");
|
|
50
|
+
return orgId && driveId ? { orgId, driveId } : null;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/** Look up the object, check its drive, and open an agent-fs client as its owner agent. */
|
|
54
|
+
async function open(id: string) {
|
|
55
|
+
const row = await getDbClient().get<Row>("SELECT * FROM primitive_objects WHERE id = ?", [id]);
|
|
56
|
+
if (!row) throw new ObjectEmbedError(404, `no object with id '${id}'`);
|
|
57
|
+
const shared = await sharedDrive();
|
|
58
|
+
if (!shared || shared.orgId !== row.orgId || shared.driveId !== row.driveId) {
|
|
59
|
+
throw new ObjectEmbedError(403, "this object is not on the swarm's shared agent-fs drive");
|
|
60
|
+
}
|
|
61
|
+
if (row.deletedAt) throw new ObjectEmbedError(404, `object '${id}' was deleted on agent-fs`);
|
|
62
|
+
const client = row.ownerAgentId ? await agentFsClientFor(row.ownerAgentId) : undefined;
|
|
63
|
+
if (!client || !row.ownerAgentId) {
|
|
64
|
+
throw new ObjectEmbedError(503, "owner agent has no agent-fs key");
|
|
65
|
+
}
|
|
66
|
+
if (client.identity.orgId !== row.orgId || client.identity.driveId !== row.driveId) {
|
|
67
|
+
throw new ObjectEmbedError(
|
|
68
|
+
503,
|
|
69
|
+
"owner agent's default agent-fs drive is not the object's drive",
|
|
70
|
+
);
|
|
71
|
+
}
|
|
72
|
+
const scope = { taskId: "", name: "", key: row.path, orgId: row.orgId, driveId: row.driveId };
|
|
73
|
+
return { row, owner: row.ownerAgentId, provider: client.provider, scope };
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
const withLink = (row: Row): PrimitiveObject => ({ ...row, link: buildAgentFsLiveUrl(row) });
|
|
77
|
+
|
|
78
|
+
/** agent-fs keeps this drive's rows fresh through `file.changed` (object-webhooks.ts). */
|
|
79
|
+
async function driveWatched(orgId: string, driveId: string): Promise<boolean> {
|
|
80
|
+
const hook = await getDbClient().get<{ status: string }>(
|
|
81
|
+
"SELECT status FROM agent_fs_object_webhooks WHERE orgId = ? AND driveId = ?",
|
|
82
|
+
[orgId, driveId],
|
|
83
|
+
);
|
|
84
|
+
return hook?.status === "active";
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
/** The row records the person behind the last save; a save with no person clears it. */
|
|
88
|
+
async function recordEditor(id: string, userId: string | null): Promise<void> {
|
|
89
|
+
await getDbClient().run("UPDATE primitive_objects SET updated_by = ? WHERE id = ?", [userId, id]);
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/** Service refusals become 400, except the CAS give-up, which is a 409 the caller retries. */
|
|
93
|
+
function asEmbedError(error: unknown): unknown {
|
|
94
|
+
if (!(error instanceof ObjectsError)) return error;
|
|
95
|
+
// The sheet and object services raise this one refusal after their last 409 retry.
|
|
96
|
+
const status = error.message.startsWith("concurrent writers") ? 409 : 400;
|
|
97
|
+
return new ObjectEmbedError(status, error.message);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
export type ObjectRead =
|
|
101
|
+
| { object: PrimitiveObject; version: number | null; unchanged: true }
|
|
102
|
+
| { object: PrimitiveObject; version: number | null; unchanged: false; content: unknown };
|
|
103
|
+
|
|
104
|
+
/**
|
|
105
|
+
* Read an object with its content. With `knownVersion`, answer `unchanged`
|
|
106
|
+
* without a download when the file is still at that version: from the row
|
|
107
|
+
* alone when webhooks keep it fresh, else from one agent-fs `stat`.
|
|
108
|
+
*/
|
|
109
|
+
export async function readObject(id: string, knownVersion?: number): Promise<ObjectRead> {
|
|
110
|
+
const { row, provider, scope } = await open(id);
|
|
111
|
+
if (knownVersion !== undefined) {
|
|
112
|
+
if (row.fileVersion === knownVersion && (await driveWatched(row.orgId, row.driveId))) {
|
|
113
|
+
return { object: withLink(row), version: knownVersion, unchanged: true };
|
|
114
|
+
}
|
|
115
|
+
let current: number | null = null;
|
|
116
|
+
try {
|
|
117
|
+
current = await provider.currentVersion(scope);
|
|
118
|
+
} catch (error) {
|
|
119
|
+
if (error instanceof FilesError && error.code === "Unauthorized") throw error;
|
|
120
|
+
// No stat (older agent-fs, a flaky call): fall through to a full read.
|
|
121
|
+
}
|
|
122
|
+
if (current !== null && current === knownVersion) {
|
|
123
|
+
return { object: withLink(row), version: current, unchanged: true };
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
let response: Response;
|
|
127
|
+
try {
|
|
128
|
+
response = await provider.download(scope);
|
|
129
|
+
} catch (error) {
|
|
130
|
+
if (error instanceof FilesError && error.code === "NotFound") {
|
|
131
|
+
throw new ObjectEmbedError(404, `the file for object '${id}' is missing on agent-fs`);
|
|
132
|
+
}
|
|
133
|
+
throw error;
|
|
134
|
+
}
|
|
135
|
+
const version = versionOf(response.headers.get("x-agent-fs-version")) ?? row.fileVersion;
|
|
136
|
+
const text = await response.text();
|
|
137
|
+
let content: unknown = text;
|
|
138
|
+
try {
|
|
139
|
+
content = JSON.parse(text);
|
|
140
|
+
} catch {
|
|
141
|
+
// Not JSON (a hand-edited file): return the raw text.
|
|
142
|
+
}
|
|
143
|
+
return { object: withLink({ ...row, fileVersion: version }), version, unchanged: false, content };
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
/**
|
|
147
|
+
* Replace a board's scene, guarded by `ifMatch`. No re-read and re-apply: a
|
|
148
|
+
* full scene from an editor cannot merge, so a 409 hands back the current
|
|
149
|
+
* version and the editor decides. The write keeps `swarm.id` and the title.
|
|
150
|
+
*/
|
|
151
|
+
export async function saveBoardContent(input: {
|
|
152
|
+
id: string;
|
|
153
|
+
content: unknown;
|
|
154
|
+
ifMatch: number;
|
|
155
|
+
actor: EmbedActor;
|
|
156
|
+
}): Promise<{ object: PrimitiveObject; version: number | null }> {
|
|
157
|
+
const { row, provider, scope } = await open(input.id);
|
|
158
|
+
if (row.kind !== "board") {
|
|
159
|
+
throw new ObjectEmbedError(
|
|
160
|
+
400,
|
|
161
|
+
`object ${row.id} is a ${row.kind}; only a board takes a full save`,
|
|
162
|
+
);
|
|
163
|
+
}
|
|
164
|
+
let scene: Json;
|
|
165
|
+
try {
|
|
166
|
+
scene = parseScene(input.content, row.path);
|
|
167
|
+
} catch (error) {
|
|
168
|
+
throw asEmbedError(error);
|
|
169
|
+
}
|
|
170
|
+
if (scene.type !== undefined && scene.type !== "excalidraw") {
|
|
171
|
+
throw new ObjectEmbedError(
|
|
172
|
+
400,
|
|
173
|
+
"content is not an Excalidraw scene (type must be 'excalidraw')",
|
|
174
|
+
);
|
|
175
|
+
}
|
|
176
|
+
const doc = PRIMITIVE_KINDS.board?.withId(scene, row.id) ?? scene;
|
|
177
|
+
const swarm = doc.swarm as Json;
|
|
178
|
+
if (swarm.title === undefined && row.title) swarm.title = row.title;
|
|
179
|
+
const body = JSON.stringify(doc, null, 2);
|
|
180
|
+
if (Buffer.byteLength(body) > MAX_OBJECT_BYTES) {
|
|
181
|
+
throw new ObjectEmbedError(
|
|
182
|
+
413,
|
|
183
|
+
`the board would exceed ${MAX_OBJECT_BYTES} bytes; nothing written`,
|
|
184
|
+
);
|
|
185
|
+
}
|
|
186
|
+
let written: { version?: string };
|
|
187
|
+
try {
|
|
188
|
+
written = await provider.upload(scope, body, {
|
|
189
|
+
contentType: "application/json",
|
|
190
|
+
ifMatch: String(input.ifMatch),
|
|
191
|
+
message: `edit via ${input.actor.via} by ${input.actor.name ?? "operator"}`,
|
|
192
|
+
});
|
|
193
|
+
} catch (error) {
|
|
194
|
+
if (!(error instanceof FilesError && error.code === "Conflict")) throw error;
|
|
195
|
+
const current = await provider.currentVersion(scope).catch(() => null);
|
|
196
|
+
throw new ObjectEmbedError(
|
|
197
|
+
409,
|
|
198
|
+
`the board changed on agent-fs since version ${input.ifMatch}; reload it`,
|
|
199
|
+
current,
|
|
200
|
+
);
|
|
201
|
+
}
|
|
202
|
+
const version = versionOf(written.version);
|
|
203
|
+
await recordObjectVersion(row.id, version);
|
|
204
|
+
await recordEditor(row.id, input.actor.userId);
|
|
205
|
+
return { object: withLink({ ...row, fileVersion: version }), version };
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
export type SheetOp =
|
|
209
|
+
| { op: "setRange"; range: string; values: CellInput[][] }
|
|
210
|
+
| { op: "clearRange"; range: string }
|
|
211
|
+
| { op: "appendRows"; tab: string; rows: CellInput[][] };
|
|
212
|
+
|
|
213
|
+
export type SheetOpResult = {
|
|
214
|
+
op: SheetOp["op"];
|
|
215
|
+
range: string;
|
|
216
|
+
version: number;
|
|
217
|
+
changed?: number;
|
|
218
|
+
recalculated?: number;
|
|
219
|
+
cleared?: number;
|
|
220
|
+
};
|
|
221
|
+
|
|
222
|
+
/** Run one cell patch through the sheet service (server-side recalc, CAS retry) as the owner. */
|
|
223
|
+
export async function applySheetOp(input: {
|
|
224
|
+
id: string;
|
|
225
|
+
op: SheetOp;
|
|
226
|
+
actor: EmbedActor;
|
|
227
|
+
}): Promise<SheetOpResult> {
|
|
228
|
+
const { row, owner } = await open(input.id);
|
|
229
|
+
if (row.kind !== "sheet") {
|
|
230
|
+
throw new ObjectEmbedError(400, `object ${row.id} is a ${row.kind}, not a sheet`);
|
|
231
|
+
}
|
|
232
|
+
const target = { agentId: owner, id: row.id };
|
|
233
|
+
const { op } = input;
|
|
234
|
+
let result: Omit<SheetOpResult, "op">;
|
|
235
|
+
try {
|
|
236
|
+
if (op.op === "setRange") {
|
|
237
|
+
result = await setSheetRange({ ...target, range: op.range, values: op.values });
|
|
238
|
+
} else if (op.op === "clearRange") {
|
|
239
|
+
result = await clearSheetRange({ ...target, range: op.range });
|
|
240
|
+
} else {
|
|
241
|
+
result = await appendSheetRows({ ...target, tab: op.tab, rows: op.rows });
|
|
242
|
+
}
|
|
243
|
+
} catch (error) {
|
|
244
|
+
throw asEmbedError(error);
|
|
245
|
+
}
|
|
246
|
+
// shortcut: the agent-fs commit message stays the sheet service's `sheet <op>`; pass the
|
|
247
|
+
// actor through mutate() when the history view needs who edited a sheet.
|
|
248
|
+
await recordEditor(row.id, input.actor.userId);
|
|
249
|
+
return { op: op.op, ...result };
|
|
250
|
+
}
|
|
@@ -124,7 +124,7 @@ function kindFor(kind: string): PrimitiveKind {
|
|
|
124
124
|
return def;
|
|
125
125
|
}
|
|
126
126
|
|
|
127
|
-
function normalizePath(path: string): string {
|
|
127
|
+
export function normalizePath(path: string): string {
|
|
128
128
|
try {
|
|
129
129
|
return normalizeStoredKey(path);
|
|
130
130
|
} catch (error) {
|
|
@@ -345,11 +345,17 @@ export type ReindexReport = {
|
|
|
345
345
|
truncated: boolean;
|
|
346
346
|
/** Which limit cut this call short; null when the pass finished. */
|
|
347
347
|
cutBy: "files" | "reads" | "time" | "bytes" | null;
|
|
348
|
+
/** True when nothing was written: `adopted` and `restored` list what a real run would change. */
|
|
349
|
+
dryRun: boolean;
|
|
348
350
|
};
|
|
349
351
|
|
|
350
352
|
export async function reindexObjects(input: {
|
|
351
353
|
agentId: string | undefined;
|
|
352
354
|
kind?: string;
|
|
355
|
+
/** Only files whose path starts with this (same match as object-list `prefix`). */
|
|
356
|
+
prefix?: string;
|
|
357
|
+
/** Report what would change; write no file and no row. */
|
|
358
|
+
dryRun?: boolean;
|
|
353
359
|
/** Override the per-call budget (tests). */
|
|
354
360
|
limits?: Partial<ReindexLimits>;
|
|
355
361
|
}): Promise<ReindexReport> {
|
|
@@ -364,11 +370,14 @@ export async function reindexObjects(input: {
|
|
|
364
370
|
}
|
|
365
371
|
reindexing.add(lock);
|
|
366
372
|
try {
|
|
367
|
-
const report = await reindexDrive(
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
373
|
+
const report = await reindexDrive(
|
|
374
|
+
client,
|
|
375
|
+
kinds,
|
|
376
|
+
input.agentId,
|
|
377
|
+
{ ...REINDEX_LIMITS, ...input.limits },
|
|
378
|
+
{ prefix: input.prefix?.replace(/^\/+/, "") ?? "", dryRun: input.dryRun === true },
|
|
379
|
+
);
|
|
380
|
+
if (!report.dryRun) watchDrive(client.orgId, client.driveId);
|
|
372
381
|
return report;
|
|
373
382
|
} finally {
|
|
374
383
|
reindexing.delete(lock);
|
|
@@ -380,6 +389,7 @@ async function reindexDrive(
|
|
|
380
389
|
kinds: string[],
|
|
381
390
|
agentId: string | undefined,
|
|
382
391
|
limits: ReindexLimits,
|
|
392
|
+
{ prefix, dryRun }: { prefix: string; dryRun: boolean },
|
|
383
393
|
): Promise<ReindexReport> {
|
|
384
394
|
const db = getDbClient();
|
|
385
395
|
const report: ReindexReport = {
|
|
@@ -391,7 +401,9 @@ async function reindexDrive(
|
|
|
391
401
|
conflicts: [],
|
|
392
402
|
truncated: false,
|
|
393
403
|
cutBy: null,
|
|
404
|
+
dryRun,
|
|
394
405
|
};
|
|
406
|
+
const inScope = (path: string) => path.startsWith(prefix);
|
|
395
407
|
const startedAt = Date.now();
|
|
396
408
|
let reads = 0;
|
|
397
409
|
let bytes = 0;
|
|
@@ -404,8 +416,10 @@ async function reindexDrive(
|
|
|
404
416
|
if (report.truncated) break;
|
|
405
417
|
const kind = kindFor(kindName);
|
|
406
418
|
const all = (await provider.glob(kind.glob)).map((p) => p.replace(/^\/+/, ""));
|
|
407
|
-
const
|
|
408
|
-
|
|
419
|
+
const scoped = all.filter(inScope);
|
|
420
|
+
const paths = scoped.slice(0, MAX_REINDEX_FILES - report.scanned);
|
|
421
|
+
if (paths.length < scoped.length) cut("files");
|
|
422
|
+
// The whole drive, not just the prefix: a copy inside the prefix of a file outside it is still a copy.
|
|
409
423
|
const onDrive = new Set(all);
|
|
410
424
|
// Ids already given to a file in this pass: a copied file must not steal one.
|
|
411
425
|
const claimed = new Map<string, string>();
|
|
@@ -473,6 +487,11 @@ async function reindexDrive(
|
|
|
473
487
|
// Stock Excalidraw save (id dropped) or a copy: keep the path's id, else a new one.
|
|
474
488
|
const embedded = kind.readId(json);
|
|
475
489
|
id = atPath && atPath.id !== embedded ? atPath.id : crypto.randomUUID();
|
|
490
|
+
if (dryRun) {
|
|
491
|
+
report.adopted.push(path);
|
|
492
|
+
claimed.set(id, path);
|
|
493
|
+
continue;
|
|
494
|
+
}
|
|
476
495
|
try {
|
|
477
496
|
({ version = null } = await provider.upload(
|
|
478
497
|
scope(path),
|
|
@@ -494,6 +513,7 @@ async function reindexDrive(
|
|
|
494
513
|
}
|
|
495
514
|
|
|
496
515
|
claimed.set(id, path);
|
|
516
|
+
if (dryRun) continue;
|
|
497
517
|
const title = swarmBlock(json).title;
|
|
498
518
|
await saveRow({
|
|
499
519
|
id,
|
|
@@ -512,7 +532,7 @@ async function reindexDrive(
|
|
|
512
532
|
"SELECT path FROM primitive_objects WHERE orgId = ? AND driveId = ? AND kind = ? ORDER BY path",
|
|
513
533
|
[orgId, driveId, kindName],
|
|
514
534
|
);
|
|
515
|
-
report.missing.push(...rows.map((r) => r.path).filter((p) => !onDrive.has(p)));
|
|
535
|
+
report.missing.push(...rows.map((r) => r.path).filter((p) => inScope(p) && !onDrive.has(p)));
|
|
516
536
|
}
|
|
517
537
|
}
|
|
518
538
|
return report;
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { FilesError } from "@/fs/provider";
|
|
2
|
+
import { buildAgentFsLiveUrl } from "@/utils/constants";
|
|
2
3
|
import { agentFsClientFor } from "../../agent-fs-identity";
|
|
3
4
|
import { getDbClient } from "../../db";
|
|
4
5
|
import {
|
|
6
|
+
clientFor,
|
|
5
7
|
createObject,
|
|
6
8
|
getObject,
|
|
7
9
|
listObjects,
|
|
8
10
|
NO_AGENT_FS_IDENTITY,
|
|
11
|
+
normalizePath,
|
|
9
12
|
ObjectsError,
|
|
10
13
|
type PrimitiveObject,
|
|
11
14
|
} from "../objects";
|
|
@@ -24,6 +27,7 @@ import type { EnginePatch } from "./engine-worker";
|
|
|
24
27
|
import {
|
|
25
28
|
checkTabName,
|
|
26
29
|
constantInput,
|
|
30
|
+
emptySheet,
|
|
27
31
|
MAX_CELLS,
|
|
28
32
|
MAX_FILE_BYTES,
|
|
29
33
|
MAX_RANGE_CELLS,
|
|
@@ -34,6 +38,7 @@ import {
|
|
|
34
38
|
type SheetTab,
|
|
35
39
|
usedExtent,
|
|
36
40
|
} from "./format";
|
|
41
|
+
import { buildXlsx, MAX_XLSX_BYTES, parseXlsx, XLSX_MIME } from "./xlsx";
|
|
37
42
|
|
|
38
43
|
/** One sheet call: the caller and the file, by `id` or `path`. */
|
|
39
44
|
export type SheetTarget = { agentId: string | undefined; id?: string; path?: string };
|
|
@@ -53,6 +58,16 @@ const refuse = <T>(run: () => T): T => {
|
|
|
53
58
|
}
|
|
54
59
|
};
|
|
55
60
|
|
|
61
|
+
/** A workbook file before `SheetDocSchema` parses it; only its `swarm` block is read. */
|
|
62
|
+
type UnparsedWorkbook = { swarm?: unknown };
|
|
63
|
+
|
|
64
|
+
/** The workbook's `swarm.id`, or undefined when a save dropped it. */
|
|
65
|
+
function embeddedId(content: UnparsedWorkbook): string | undefined {
|
|
66
|
+
const { swarm } = content;
|
|
67
|
+
const id = swarm && typeof swarm === "object" ? (swarm as { id?: unknown }).id : undefined;
|
|
68
|
+
return typeof id === "string" && id.length > 0 ? id : undefined;
|
|
69
|
+
}
|
|
70
|
+
|
|
56
71
|
async function load(target: SheetTarget) {
|
|
57
72
|
const { object, missing, content } = await getObject({ ...target, includeContent: true });
|
|
58
73
|
if (object.kind !== "sheet") {
|
|
@@ -65,7 +80,16 @@ async function load(target: SheetTarget) {
|
|
|
65
80
|
}
|
|
66
81
|
const parsed = SheetDocSchema.safeParse(content);
|
|
67
82
|
if (!parsed.success) {
|
|
68
|
-
const
|
|
83
|
+
const { issues } = parsed.error;
|
|
84
|
+
// Only the swarm block is wrong and it carries no id: a save outside the sheet tools
|
|
85
|
+
// (a hand edit, another app) dropped it, and reindex writes it back. Any other shape
|
|
86
|
+
// error keeps the generic refusal, since reindex would not fix it.
|
|
87
|
+
if (issues.every((i) => i.path[0] === "swarm") && !embeddedId(content as UnparsedWorkbook)) {
|
|
88
|
+
throw new ObjectsError(
|
|
89
|
+
`${object.path} has no embedded swarm.id, so a save outside the sheet tools dropped it; run object-reindex (ctx.objects.reindex) with prefix '${object.path}' to write the id back, then retry`,
|
|
90
|
+
);
|
|
91
|
+
}
|
|
92
|
+
const issue = issues[0];
|
|
69
93
|
throw new ObjectsError(
|
|
70
94
|
`${object.path} is not a valid swarm-sheet/1 workbook: ${issue?.path.join(".") || "document"}: ${issue?.message}`,
|
|
71
95
|
);
|
|
@@ -76,6 +100,15 @@ async function load(target: SheetTarget) {
|
|
|
76
100
|
return { object, version: object.fileVersion, doc: parsed.data };
|
|
77
101
|
}
|
|
78
102
|
|
|
103
|
+
/** The exact bytes a sheet file holds, size-checked. Save and the import preflight both use it, so they cannot disagree. */
|
|
104
|
+
function sheetBody(doc: SheetDoc): string {
|
|
105
|
+
const body = JSON.stringify(doc, null, 2);
|
|
106
|
+
if (Buffer.byteLength(body) > MAX_FILE_BYTES) {
|
|
107
|
+
throw new ObjectsError(`the sheet would exceed ${MAX_FILE_BYTES} bytes (5 MiB)`);
|
|
108
|
+
}
|
|
109
|
+
return body;
|
|
110
|
+
}
|
|
111
|
+
|
|
79
112
|
async function save(
|
|
80
113
|
agentId: string | undefined,
|
|
81
114
|
object: PrimitiveObject,
|
|
@@ -83,10 +116,7 @@ async function save(
|
|
|
83
116
|
version: number,
|
|
84
117
|
op: string,
|
|
85
118
|
) {
|
|
86
|
-
const body =
|
|
87
|
-
if (Buffer.byteLength(body) > MAX_FILE_BYTES) {
|
|
88
|
-
throw new ObjectsError(`the sheet would exceed ${MAX_FILE_BYTES} bytes (5 MiB)`);
|
|
89
|
-
}
|
|
119
|
+
const body = sheetBody(doc);
|
|
90
120
|
const client = agentId ? await agentFsClientFor(agentId) : undefined;
|
|
91
121
|
if (!client) throw new ObjectsError(NO_AGENT_FS_IDENTITY);
|
|
92
122
|
const { orgId, driveId } = client.identity;
|
|
@@ -152,7 +182,11 @@ function inputFor(value: CellInput): string {
|
|
|
152
182
|
}
|
|
153
183
|
|
|
154
184
|
/** Recalculate `doc` with `patches` and report which cells moved. */
|
|
155
|
-
async function recalc(
|
|
185
|
+
async function recalc(
|
|
186
|
+
agentId: string | undefined,
|
|
187
|
+
doc: Pick<SheetDoc, "tabs">,
|
|
188
|
+
patches: EnginePatch[],
|
|
189
|
+
) {
|
|
156
190
|
const { cells, changed } = await sheetEngine().recalc(doc.tabs, patches, {
|
|
157
191
|
maxCells: MAX_CELLS,
|
|
158
192
|
caller: agentId,
|
|
@@ -413,3 +447,101 @@ export async function addSheetTab(target: SheetTarget & { name: string; after?:
|
|
|
413
447
|
});
|
|
414
448
|
return { ...result, version };
|
|
415
449
|
}
|
|
450
|
+
|
|
451
|
+
/** Read an `.xlsx` off the drive. Refuses a missing file or one over the size limit before parsing. */
|
|
452
|
+
async function readXlsx(agentId: string | undefined, sourcePath: string): Promise<Uint8Array> {
|
|
453
|
+
if (!/\.xlsx$/i.test(sourcePath)) throw new ObjectsError("sourcePath must end in .xlsx");
|
|
454
|
+
const { provider, scope } = await clientFor(agentId);
|
|
455
|
+
const source = normalizePath(sourcePath);
|
|
456
|
+
let response: Response;
|
|
457
|
+
try {
|
|
458
|
+
response = await provider.download(scope(source));
|
|
459
|
+
} catch (error) {
|
|
460
|
+
if (error instanceof FilesError && error.code === "NotFound") {
|
|
461
|
+
throw new ObjectsError(`no file at '${source}' on this drive`);
|
|
462
|
+
}
|
|
463
|
+
throw error;
|
|
464
|
+
}
|
|
465
|
+
const tooBig = () =>
|
|
466
|
+
new ObjectsError(`${source} is over the ${MAX_XLSX_BYTES} byte limit (5 MiB) for an xlsx`);
|
|
467
|
+
if (Number(response.headers.get("content-length")) > MAX_XLSX_BYTES) {
|
|
468
|
+
await response.body?.cancel();
|
|
469
|
+
throw tooBig();
|
|
470
|
+
}
|
|
471
|
+
// shortcut: a body with no content-length is read whole before the check; agent-fs caps files at 50 MiB.
|
|
472
|
+
const bytes = new Uint8Array(await response.arrayBuffer());
|
|
473
|
+
if (bytes.length > MAX_XLSX_BYTES) throw tooBig();
|
|
474
|
+
return bytes;
|
|
475
|
+
}
|
|
476
|
+
|
|
477
|
+
/**
|
|
478
|
+
* Import an `.xlsx` from the drive as a new sheet. Parse and recalculate first, so a bad
|
|
479
|
+
* file or an over-limit workbook leaves nothing behind. `dropped` names what the file had
|
|
480
|
+
* that a sheet cannot hold.
|
|
481
|
+
*/
|
|
482
|
+
export async function importSheetXlsx(input: {
|
|
483
|
+
agentId: string | undefined;
|
|
484
|
+
sourcePath: string;
|
|
485
|
+
path: string;
|
|
486
|
+
title?: string;
|
|
487
|
+
}) {
|
|
488
|
+
if (!input.path.endsWith(".sheet.json")) {
|
|
489
|
+
throw new ObjectsError("a sheet path must end with '.sheet.json'");
|
|
490
|
+
}
|
|
491
|
+
const bytes = await readXlsx(input.agentId, input.sourcePath);
|
|
492
|
+
const { tabs, dropped } = await parseXlsx(bytes);
|
|
493
|
+
const draft = { tabs };
|
|
494
|
+
await recalc(input.agentId, draft, []);
|
|
495
|
+
// Size the file createObject writes and save rewrites with these tabs, not a compact stand-in.
|
|
496
|
+
sheetBody({ ...emptySheet(crypto.randomUUID(), input.title), tabs: draft.tabs });
|
|
497
|
+
const created = await createObject({
|
|
498
|
+
agentId: input.agentId,
|
|
499
|
+
kind: "sheet",
|
|
500
|
+
path: input.path,
|
|
501
|
+
title: input.title,
|
|
502
|
+
});
|
|
503
|
+
try {
|
|
504
|
+
const { version } = await mutate(
|
|
505
|
+
{ agentId: input.agentId, id: created.id },
|
|
506
|
+
"import xlsx",
|
|
507
|
+
async (doc) => {
|
|
508
|
+
doc.tabs = draft.tabs;
|
|
509
|
+
return { doc, result: null };
|
|
510
|
+
},
|
|
511
|
+
);
|
|
512
|
+
return { object: { ...created, fileVersion: version }, link: created.link, dropped };
|
|
513
|
+
} catch (error) {
|
|
514
|
+
if (error instanceof ObjectsError) {
|
|
515
|
+
throw new ObjectsError(
|
|
516
|
+
`created ${created.path} (id ${created.id}) but could not write the imported tabs: ${error.message}`,
|
|
517
|
+
);
|
|
518
|
+
}
|
|
519
|
+
throw error;
|
|
520
|
+
}
|
|
521
|
+
}
|
|
522
|
+
|
|
523
|
+
/** Export a sheet to an `.xlsx` on the drive. Create-only unless `overwrite`. */
|
|
524
|
+
export async function exportSheetXlsx(
|
|
525
|
+
target: SheetTarget & { targetPath: string; overwrite?: boolean },
|
|
526
|
+
) {
|
|
527
|
+
if (!/\.xlsx$/i.test(target.targetPath)) throw new ObjectsError("targetPath must end in .xlsx");
|
|
528
|
+
const { object, doc } = await load(target);
|
|
529
|
+
const { bytes, dropped } = await buildXlsx(doc.tabs);
|
|
530
|
+
const { provider, orgId, driveId, scope } = await clientFor(target.agentId);
|
|
531
|
+
const path = normalizePath(target.targetPath);
|
|
532
|
+
try {
|
|
533
|
+
await provider.upload(scope(path), bytes, {
|
|
534
|
+
contentType: XLSX_MIME,
|
|
535
|
+
ifNoneMatch: target.overwrite ? undefined : "*",
|
|
536
|
+
message: `export ${object.path}`,
|
|
537
|
+
});
|
|
538
|
+
} catch (error) {
|
|
539
|
+
if (error instanceof FilesError && error.code === "Conflict") {
|
|
540
|
+
throw new ObjectsError(
|
|
541
|
+
`a file already exists at '${path}'; pass overwrite: true to replace it`,
|
|
542
|
+
);
|
|
543
|
+
}
|
|
544
|
+
throw error;
|
|
545
|
+
}
|
|
546
|
+
return { path, link: buildAgentFsLiveUrl({ orgId, driveId, path }), dropped };
|
|
547
|
+
}
|