@desplega.ai/agent-swarm 1.164.1 → 1.166.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/README.md +1 -1
- package/dist/acp-adapter-yzfxn8vj.js +23 -0
- package/dist/{actions-hp2h32dx.js → actions-qz3m692w.js} +24 -28
- package/dist/{amp-adapter-zfd7djyx.js → amp-adapter-j1xbmsqz.js} +7 -7
- package/dist/{app-w2d26h4f.js → app-43vrdmv8.js} +9 -10
- package/dist/{assistant-45pc4en7.js → assistant-ertffmka.js} +25 -29
- package/dist/{boot-reembed-k1q2s4fc.js → boot-reembed-998jtpdg.js} +12 -15
- package/dist/{boot-reembed-6rhcpsjf.js → boot-reembed-s7k7c6v2.js} +13 -15
- package/dist/boot-scrub-sweep-nepsk4t1.js +211 -0
- package/dist/{boot-seeds-ex93edx7.js → boot-seeds-vvzs1zhk.js} +12 -12
- package/dist/{claude-adapter-hcxd0szm.js → claude-adapter-2zvmekrp.js} +15 -17
- package/dist/{claude-managed-adapter-fz7xps2r.js → claude-managed-adapter-s49wbk8t.js} +5 -5
- package/dist/{claude-managed-setup-xx6f15h9.js → claude-managed-setup-cvhqq8qn.js} +4 -4
- package/dist/{claude-sdk-session-6nb9raem.js → claude-sdk-session-kkbxtw5q.js} +2624 -2606
- package/dist/{cli-etbrt8x1.js → cli-0nhdwxd5.js} +4 -4
- package/dist/{cli-jeefgppq.js → cli-0qjcsxgz.js} +7 -7
- package/dist/{cli-6behs2bt.js → cli-32bca7nr.js} +1 -1
- package/dist/{cli-gt8v96qx.js → cli-3ddybbbx.js} +4 -4
- package/dist/{acp-adapter-rxvek4ym.js → cli-3qn4r334.js} +317 -35
- package/dist/{cli-1d3w4xm3.js → cli-4r1sjfc4.js} +14 -6
- package/dist/{cli-691f2rxm.js → cli-66zh26sp.js} +68 -16
- package/dist/{cli-et8wdyqh.js → cli-68r1j4sg.js} +9 -9
- package/dist/{cli-xb7kyanp.js → cli-8kgvmkak.js} +3 -3
- package/dist/{cli-fdpkw8vk.js → cli-8t229cmr.js} +8 -8
- package/dist/{cli-gc54qc0p.js → cli-aqcey741.js} +1 -1
- package/dist/{cli-4q4cmr4t.js → cli-cpfmqz3n.js} +8 -8
- package/dist/{cli-a9bw0xxt.js → cli-df56tqdw.js} +997 -408
- package/dist/{cli-n7h1kqpf.js → cli-dmtrxqhg.js} +6 -1
- package/dist/{cli-xfb7333f.js → cli-dw2q9f7g.js} +5 -5
- package/dist/{cli-4drstbb9.js → cli-ecknp7p1.js} +81 -23
- package/dist/{cli-v0pvvhfq.js → cli-efnd2kce.js} +36 -1
- package/dist/{cli-1wetf34q.js → cli-f2n17zhp.js} +1 -1
- package/dist/{cli-2c8eky5y.js → cli-feh3dkah.js} +1 -1
- package/dist/cli-fn697bnt.js +126 -0
- package/dist/{cli-v5pr2fgt.js → cli-gt8azyet.js} +3 -3
- package/dist/{cli-dbszf3rw.js → cli-h3x613ze.js} +4 -4
- package/dist/{cli-nwhb8y2e.js → cli-hf5s9pgf.js} +1 -1
- package/dist/cli-j2jbr8af.js +516 -0
- package/dist/{cli-agjzafns.js → cli-jhm6hzjn.js} +593 -10
- package/dist/{cli-j0tmc908.js → cli-jvj6a0cv.js} +484 -477
- package/dist/{cli-xxz89c2n.js → cli-mb75wpxf.js} +1 -1
- package/dist/{cli-07s39g1n.js → cli-mv2520nm.js} +1 -1
- package/dist/{cli-v90vfwyb.js → cli-mwegs4af.js} +5 -5
- package/dist/{cli-bz1gbac9.js → cli-p4ztb80h.js} +2 -2
- package/dist/{cli-1wd1n2ya.js → cli-rfphkzh5.js} +1 -1
- package/dist/{cli-976r1zqx.js → cli-rggdq8wq.js} +5 -5
- package/dist/{cli-3ajw5v5v.js → cli-rsy933yz.js} +6 -6
- package/dist/{cli-yj790e19.js → cli-tadfgd0t.js} +8 -1
- package/dist/{cli-cn53e7vc.js → cli-ttbsse3f.js} +6 -1
- package/dist/{cli-dyqsrqcf.js → cli-v2a8x45d.js} +4 -4
- package/dist/{cli-wbvnn6tk.js → cli-v6vv7dy8.js} +91 -9
- package/dist/{cli-z2ap2c0c.js → cli-vzc73wet.js} +90 -55
- package/dist/cli-wt7ccy4r.js +2654 -0
- package/dist/{cli-4cn19jvn.js → cli-x7kpr72a.js} +3 -3
- package/dist/{cli-003785v9.js → cli-xvc3q9br.js} +1 -1
- package/dist/{cli-v0e7jpr5.js → cli-xvdgasgy.js} +13 -4
- package/dist/{cli-asqeg4ve.js → cli-y59h2pk9.js} +2 -2
- package/dist/{cli-0wn3ypqv.js → cli-yshaazs1.js} +14121 -3478
- package/dist/{cli-wg8yjqtw.js → cli-ysnyhws9.js} +16 -3
- package/dist/cli-zp67qg5x.js +92 -0
- package/dist/{cli-g3qgrzck.js → cli-zsh093hk.js} +71 -3
- package/dist/{cli-ma3zvh39.js → cli-zy7vwsne.js} +6066 -5829
- package/dist/cli.js +79 -26
- package/dist/{codex-adapter-pcxdn10v.js → codex-adapter-dw1wxqt8.js} +10 -10
- package/dist/{codex-hook-b1fb7c2k.js → codex-hook-d2rkvf39.js} +1 -1
- package/dist/{codex-login-059nm145.js → codex-login-terbdsqq.js} +2 -2
- package/dist/{codex-session-runner-xzwwddp8.js → codex-session-runner-3cgb8y1g.js} +10 -10
- package/dist/{commands-98at8mkn.js → commands-mhxam6z2.js} +9 -9
- package/dist/{cursor-adapter-dkg6qnkp.js → cursor-adapter-2qda3st7.js} +6 -6
- package/dist/{db-01g8wtvw.js → db-sjks418k.js} +11 -9
- package/dist/{devin-adapter-qmttt2fz.js → devin-adapter-bffjj5n4.js} +2 -2
- package/dist/{dispatcher-nn2k1wxd.js → dispatcher-1es759rn.js} +22 -26
- package/dist/{dsh-adapter-w4d4vwdq.js → dsh-adapter-bek4cyw9.js} +6 -6
- package/dist/{e2b-9e4g2hvt.js → e2b-nd50eccg.js} +1 -1
- package/dist/{event-bus-z7v2t26e.js → event-bus-vnfthafg.js} +2 -2
- package/dist/grok-adapter-ar9cw9jg.js +29 -0
- package/dist/{handlers-b0kqsbg8.js → handlers-1gkbhktr.js} +25 -29
- package/dist/{hook-sap7v1aj.js → hook-ds2zxq9v.js} +16 -18
- package/dist/{hook-pz50gqep.js → hook-vxa3tcsy.js} +10 -12
- package/dist/{http-ncr8rmd0.js → http-3h21z9md.js} +679 -227
- package/dist/{index-c4aqcyz1.js → index-9b65j1m5.js} +11 -11
- package/dist/{index-r46s01nq.js → index-bn6cy8ps.js} +22 -26
- package/dist/{index-38kqdt3e.js → index-dkfxpkmm.js} +23 -27
- package/dist/{index-630kj5vd.js → index-f8xnqrye.js} +55 -43
- package/dist/{index-fdk1t4d6.js → index-n0rxa4ca.js} +11962 -9900
- package/dist/{index-9nrj7797.js → index-n99fycq7.js} +22 -26
- package/dist/{keepalive-31613r2h.js → keepalive-3xspa9jw.js} +14 -11
- package/dist/{lead-mx59tr5s.js → lead-6qphc124.js} +43 -43
- package/dist/{maintenance-55ff39ca.js → maintenance-0teem1bb.js} +10 -12
- package/dist/{node-f0ykebbv.js → node-9sg7ajby.js} +25 -7
- package/dist/{oauth-refresh-sweep-anma954w.js → oauth-refresh-sweep-sh9q25xp.js} +13 -10
- package/dist/{onboard-b2fy8ftb.js → onboard-54qmnqxe.js} +4 -3
- package/dist/{opencode-adapter-p1s92tmy.js → opencode-adapter-wjfa2wvd.js} +6 -6
- package/dist/{otel-impl-9brvt7xv.js → otel-impl-ycqzp2a1.js} +2 -2
- package/dist/{pi-mono-adapter-kz4rrwvd.js → pi-mono-adapter-e77e9zst.js} +6 -6
- package/dist/{pricing-refresh-7w8mbmva.js → pricing-refresh-atnkngqs.js} +10 -10
- package/dist/{rbac-roles-ejp7qwvb.js → rbac-roles-9pjphh9q.js} +10 -10
- package/dist/{rbac-roles-nhk4r7bc.js → rbac-roles-j78wdksm.js} +10 -10
- package/dist/{render-v2-2gzt8skq.js → render-v2-pxjs49fx.js} +9 -10
- package/dist/{setup-5et8t412.js → setup-ymej0xtx.js} +2 -2
- package/dist/{work-objects-tb0er7qa.js → work-objects-3nh4ymzb.js} +26 -30
- package/dist/{worker-62cv075d.js → worker-qa9fkz5s.js} +43 -43
- package/dist/{x-vbxb31jr.js → x-ma4gnfgy.js} +2 -2
- package/openapi.json +457 -31
- package/package.json +14 -6
- package/plugin/commands/create-pr.md +7 -1
- package/plugin/pi-skills/create-pr/SKILL.md +7 -1
- package/src/agentmail/app.ts +5 -4
- package/src/be/automation-preflight.ts +11 -9
- package/src/be/boot-scrub-sweep.ts +302 -0
- package/src/be/connector-codes.ts +81 -0
- package/src/be/crypto/key-bootstrap.ts +1 -1
- package/src/be/db/approvals.ts +15 -1
- package/src/be/db/codex-oauth-device-flows.ts +40 -0
- package/src/be/db/config-secrets.ts +31 -0
- package/src/be/db/runtime.ts +4 -0
- package/src/be/db/script-runs.ts +15 -0
- package/src/be/db/tasks/write.ts +1 -1
- package/src/be/db-queries/mcp-oauth.ts +5 -0
- package/src/be/db-queries/oauth.ts +77 -0
- package/src/be/db.ts +162 -59
- package/src/be/events.ts +17 -1
- package/src/be/memory/index-content.ts +2 -2
- package/src/be/memory/providers/sqlite-store.ts +63 -11
- package/src/be/memory/types.ts +14 -0
- package/src/be/migrations/197_connector_codes.sql +23 -0
- package/src/be/migrations/198_permission_audit_guest.sql +33 -0
- package/src/be/migrations/200_backfill_auto_memory_expiry.sql +20 -0
- package/src/be/migrations/201_workflow_replay_columns.sql +10 -0
- package/src/be/migrations/202_codex_oauth_device_flows.sql +24 -0
- package/src/be/model-tier-resolution.ts +2 -1
- package/src/be/model-validation.ts +1 -1
- package/src/be/pricing-normalize.ts +3 -0
- package/src/be/rbac-audit.ts +2 -1
- package/src/be/scripts/db.ts +28 -4
- package/src/be/scripts/source-secrets.ts +37 -0
- package/src/be/scripts/typecheck.ts +23 -2
- package/src/be/scrub-json.ts +32 -0
- package/src/be/sealed-json.ts +59 -0
- package/src/be/secret-registry.ts +131 -0
- package/src/be/seed-pricing.ts +14 -0
- package/src/be/users.ts +7 -1
- package/src/be/workflow-replay.ts +77 -0
- package/src/cli.tsx +7 -0
- package/src/commands/provider-credentials.ts +46 -8
- package/src/commands/runner.ts +2 -10
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/github/app.ts +4 -4
- package/src/heartbeat/heartbeat.ts +20 -8
- package/src/hooks/pr-body-guard.ts +1 -1
- package/src/http/agents.ts +1 -0
- package/src/http/approval-requests.ts +1 -0
- package/src/http/apps.ts +3 -0
- package/src/http/auth.ts +4 -1
- package/src/http/codex-oauth-device.ts +8 -10
- package/src/http/codex-oauth-keep-warm.ts +2 -2
- package/src/http/config-values.ts +59 -0
- package/src/http/config.ts +5 -0
- package/src/http/db-query-bounded.ts +3 -0
- package/src/http/db-query-shared.ts +107 -15
- package/src/http/db-query.ts +10 -2
- package/src/http/extensions.ts +1 -0
- package/src/http/index.ts +23 -6
- package/src/http/integrations.ts +1 -38
- package/src/http/ip-rate-limit.ts +82 -0
- package/src/http/kv.ts +38 -4
- package/src/http/mcp-servers.ts +1 -0
- package/src/http/memory.ts +9 -0
- package/src/http/models-catalog.ts +2 -0
- package/src/http/operator-actor.ts +4 -0
- package/src/http/page-proxy.ts +22 -0
- package/src/http/pages.ts +4 -2
- package/src/http/realtime.ts +1 -1
- package/src/http/request-principal.ts +14 -1
- package/src/http/script-connections.ts +8 -0
- package/src/http/script-runs.ts +12 -4
- package/src/http/scripts.ts +15 -0
- package/src/http/session-cost-recompute.ts +3 -2
- package/src/http/tasks.ts +9 -0
- package/src/http/users.ts +226 -0
- package/src/http/workflows.ts +3 -2
- package/src/http.ts +1 -0
- package/src/integrations/kapso/client.ts +3 -1
- package/src/jira/app.ts +2 -2
- package/src/kv-view.ts +324 -0
- package/src/linear/app.ts +2 -2
- package/src/oauth/mcp-wrapper.ts +1 -1
- package/src/prompts/memories.ts +42 -1
- package/src/providers/acp-adapter.ts +85 -24
- package/src/providers/acp-target-catalog.ts +54 -1
- package/src/providers/acp-targets.ts +358 -4
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/cursor-adapter.ts +1 -1
- package/src/providers/grok-adapter.ts +186 -0
- package/src/providers/index.ts +5 -1
- package/src/providers/pricing-sources.md +6 -0
- package/src/providers/reasoning-effort.ts +17 -1
- package/src/providers/types.ts +2 -1
- package/src/rbac/can.ts +4 -3
- package/src/rbac/legacy-policy.ts +3 -3
- package/src/rbac/types.ts +6 -0
- package/src/script-workflows/supervisor.ts +11 -2
- package/src/scripts-runtime/eval-harness.ts +2 -12
- package/src/scripts-runtime/executors/quickjs-bundle.ts +152 -0
- package/src/scripts-runtime/executors/quickjs-prelude.ts +285 -0
- package/src/scripts-runtime/executors/quickjs-runner.ts +580 -0
- package/src/scripts-runtime/executors/quickjs-worker.ts +81 -0
- package/src/scripts-runtime/executors/quickjs.ts +196 -0
- package/src/scripts-runtime/executors/registry.ts +2 -0
- package/src/scripts-runtime/executors/sourcemap.ts +79 -0
- package/src/scripts-runtime/script-error-hints.ts +14 -0
- package/src/scripts-runtime/swarm-sdk.ts +9 -2
- package/src/scripts-runtime/types/stdlib.d.ts +27 -8
- package/src/scripts-runtime/types/swarm-extension.d.ts +3 -0
- package/src/scripts-runtime/types/swarm-sdk.d.ts +27 -8
- package/src/server-user.ts +2 -20
- package/src/server.ts +3 -1
- package/src/slack/app.ts +4 -0
- package/src/slack/config.ts +3 -1
- package/src/slack/egress-scrub.ts +87 -0
- package/src/tests/acp-adapter.test.ts +191 -2
- package/src/tests/boot-scrub-sweep.test.ts +390 -0
- package/src/tests/budget-user-scope.test.ts +7 -21
- package/src/tests/check-pr-body.test.ts +149 -6
- package/src/tests/check-text-columns.test.ts +145 -0
- package/src/tests/claude-adapter-binary.test.ts +1 -1
- package/src/tests/claude-sdk-process.fixture.ts +13 -2
- package/src/tests/codex-oauth-device.test.ts +23 -37
- package/src/tests/codex-oauth-keep-warm.test.ts +29 -0
- package/src/tests/console-scrub.test.ts +141 -0
- package/src/tests/credential-check.test.ts +90 -0
- package/src/tests/db-query-denylist.test.ts +202 -0
- 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/docs-index-footprint.test.js +3 -3
- package/src/tests/entrypoint-acp-target-binary.test.ts +44 -1
- package/src/tests/events-scrub.test.ts +88 -0
- package/src/tests/explicit-model-validation.test.ts +81 -0
- package/src/tests/extensions-pre-task.test.ts +33 -1
- package/src/tests/fixtures/grok/acp-updates-recorded.jsonl +53 -0
- package/src/tests/fixtures/grok/prompt-response-meta.json +36 -0
- package/src/tests/fixtures/secret-corpus.ts +320 -0
- package/src/tests/grok-adapter.test.ts +647 -0
- package/src/tests/heartbeat-checklist.test.ts +44 -0
- package/src/tests/integration-disable-flags.test.ts +156 -0
- package/src/tests/kv-http.test.ts +34 -0
- package/src/tests/kv-tool.test.ts +274 -1
- package/src/tests/kv-view.test.ts +147 -0
- package/src/tests/mcp-user-route.test.ts +257 -15
- package/src/tests/memory-injection-outcome.test.ts +143 -0
- package/src/tests/model-tier-resolution.test.ts +76 -3
- package/src/tests/page-guest-session.test.ts +424 -0
- package/src/tests/page-proxy.test.ts +1 -1
- package/src/tests/page-viewer-auth.test.ts +22 -1
- package/src/tests/pr-body-leaks.test.ts +157 -2
- package/src/tests/preload.ts +10 -0
- package/src/tests/provider-registration.test.ts +3 -1
- package/src/tests/rbac-audit.test.ts +32 -0
- package/src/tests/rbac-mcp-admission-e2e.test.ts +4 -62
- package/src/tests/script-connections.test.ts +9 -0
- package/src/tests/script-executor-conformance.test.ts +3 -0
- package/src/tests/script-executor-quickjs.test.ts +442 -0
- package/src/tests/script-executor-registry.test.ts +6 -1
- package/src/tests/script-runs-http.test.ts +126 -1
- package/src/tests/script-runs-scrub.test.ts +275 -0
- package/src/tests/scripts-http.test.ts +82 -1
- package/src/tests/scripts-mcp-e2e.test.ts +42 -6
- package/src/tests/scripts-runtime.test.ts +37 -0
- package/src/tests/scrubbed-text-12e.test.ts +289 -0
- package/src/tests/sealed-key-guard.test.ts +166 -0
- package/src/tests/secret-canary-sweep.test.ts +958 -0
- package/src/tests/secret-registry.test.ts +355 -0
- package/src/tests/secret-rules.test.ts +230 -0
- package/src/tests/secret-scrubber.test.ts +317 -1
- package/src/tests/session-costs-golden.test.ts +17 -0
- package/src/tests/slack-egress-scrub.test.ts +216 -0
- package/src/tests/swarm-tool-result-gate.test.ts +143 -30
- package/src/tests/task-tools-ctx.test.ts +3 -0
- package/src/tests/user-token-routes.test.ts +342 -3
- package/src/tests/workflow-replay.test.ts +518 -0
- package/src/tests/workflow-scrub.test.ts +242 -0
- package/src/tests/workflow-system-one-decision-providers.test.ts +737 -0
- package/src/tools/db-query.ts +1 -1
- package/src/tools/inject-learning.ts +1 -1
- package/src/tools/kv/kv-get.ts +136 -6
- package/src/tools/send-task.ts +61 -17
- package/src/tools/utils.ts +186 -43
- package/src/tools/workflows/get-workflow-run.ts +3 -2
- package/src/types.ts +16 -1
- package/src/utils/console-scrub-install.ts +5 -0
- package/src/utils/console-scrub.ts +57 -0
- package/src/utils/credentials.ts +8 -0
- package/src/utils/page-session.ts +6 -2
- package/src/utils/pr-body-leaks.ts +149 -10
- package/src/utils/request-auth-context.ts +2 -0
- package/src/utils/secret-rules.generated.ts +2055 -0
- package/src/utils/secret-scrubber.ts +662 -36
- package/src/workflows/engine.ts +39 -4
- package/src/workflows/executors/notify.ts +6 -1
- package/src/workflows/executors/system-one-decision.ts +31 -12
- package/src/workflows/executors/system-one-openai-wire.ts +168 -0
- package/src/workflows/executors/system-one-providers.ts +112 -11
- package/src/workflows/executors/system-one-wire.ts +79 -0
- package/src/workflows/recovery.ts +10 -1
- package/src/workflows/resume.ts +62 -3
- package/src/workflows/retry-poller.ts +3 -0
- package/templates/ai-toolbox.manifest.json +2 -2
- package/templates/skills/agent-browser/SKILL.md +5 -5
- package/templates/skills/agent-browser/config.json +1 -1
- package/templates/skills/agent-browser/content.md +4 -4
- package/templates/skills/artifacts/content.md +17 -7
- package/templates/skills/jira-interaction/config.json +1 -1
- package/templates/skills/jira-interaction/content.md +56 -205
- package/templates/skills/linear-interaction/config.json +1 -1
- package/templates/skills/linear-interaction/content.md +31 -50
- package/templates/skills/pages/content.md +8 -4
- package/templates/skills/qa/content.md +2 -2
- package/templates/skills/workflow-iterate/content.md +4 -4
- package/tsconfig.json +3 -3
- package/dist/boot-scrub-logs-t8xg7wd7.js +0 -99
- package/dist/cli-0a7r5331.js +0 -168
- package/dist/cli-93rxw9yd.js +0 -951
- package/dist/cli-cvk6yzw5.js +0 -40
- package/dist/cli-dgnj0zcc.js +0 -40
- package/dist/cli-qt5wzq6v.js +0 -256
- package/dist/cli-v7fqehqd.js +0 -9281
- package/dist/cli-vbr859rz.js +0 -572
- package/src/be/boot-scrub-logs.ts +0 -132
|
@@ -12,60 +12,64 @@ import {
|
|
|
12
12
|
import {
|
|
13
13
|
DEFAULT_MODEL,
|
|
14
14
|
resolveCredential
|
|
15
|
-
} from "./cli-
|
|
15
|
+
} from "./cli-f2n17zhp.js";
|
|
16
16
|
import {
|
|
17
17
|
DEFAULT_OPENROUTER_BASE_URL,
|
|
18
18
|
getOpenRouterBaseUrl
|
|
19
19
|
} from "./cli-3dpj7atn.js";
|
|
20
|
-
import {
|
|
21
|
-
embedScript
|
|
22
|
-
} from "./cli-0a7r5331.js";
|
|
23
20
|
import {
|
|
24
21
|
calculatePKCECodeChallenge,
|
|
25
22
|
ensureAuthorizationTokenOrThrow,
|
|
26
23
|
generateRandomCodeVerifier,
|
|
27
24
|
generateRandomState,
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
getOAuthAppById,
|
|
31
|
-
oauthAppRowToProviderConfig,
|
|
32
|
-
updateAuthorizationTokens,
|
|
33
|
-
upsertAuthorization
|
|
34
|
-
} from "./cli-93rxw9yd.js";
|
|
25
|
+
oauthAppRowToProviderConfig
|
|
26
|
+
} from "./cli-j2jbr8af.js";
|
|
35
27
|
import {
|
|
36
28
|
getSlackApp
|
|
37
|
-
} from "./cli-
|
|
29
|
+
} from "./cli-ecknp7p1.js";
|
|
38
30
|
import {
|
|
39
31
|
CredentialBroker,
|
|
40
32
|
DEFAULT_CREDENTIAL_BINDINGS,
|
|
41
33
|
claimApprovalCancellationNotification,
|
|
42
34
|
completeApprovalCancellationNotificationClaim,
|
|
43
|
-
computeContentHash,
|
|
44
35
|
createTaskExtended,
|
|
45
36
|
decryptSecret,
|
|
46
37
|
encryptSecret,
|
|
38
|
+
getAuthorizationById,
|
|
47
39
|
getDb,
|
|
48
40
|
getDbClient,
|
|
49
41
|
getEncryptionKey,
|
|
50
42
|
getLeadAgent,
|
|
51
43
|
getMcpServerById,
|
|
44
|
+
getOAuthApp,
|
|
45
|
+
getOAuthAppById,
|
|
52
46
|
getResolvedConfig,
|
|
47
|
+
getScriptById,
|
|
53
48
|
getTaskById,
|
|
54
49
|
init_credential_broker,
|
|
55
50
|
init_crypto,
|
|
56
51
|
init_date_utils,
|
|
57
52
|
init_db,
|
|
53
|
+
init_db1 as init_db2,
|
|
54
|
+
init_oauth,
|
|
55
|
+
init_secret_registry,
|
|
58
56
|
normalizeDateRequired,
|
|
57
|
+
oauthSecretName,
|
|
59
58
|
placeholderForConfigKey,
|
|
59
|
+
registerStoredSecret,
|
|
60
60
|
releaseApprovalCancellationNotificationClaim,
|
|
61
|
+
restoreScratchScriptLastUsedIfUnchanged,
|
|
62
|
+
touchScratchScriptLastUsed,
|
|
63
|
+
updateAuthorizationTokens,
|
|
64
|
+
upsertAuthorization,
|
|
61
65
|
upsertSwarmConfig
|
|
62
|
-
} from "./cli-
|
|
66
|
+
} from "./cli-yshaazs1.js";
|
|
63
67
|
import {
|
|
64
68
|
TERMINAL_TASK_STATUSES,
|
|
65
69
|
defaultAssetKey,
|
|
66
70
|
init_key,
|
|
67
71
|
init_types
|
|
68
|
-
} from "./cli-
|
|
72
|
+
} from "./cli-xvdgasgy.js";
|
|
69
73
|
import {
|
|
70
74
|
getAppUrl,
|
|
71
75
|
init_constants
|
|
@@ -102,7 +106,7 @@ import {
|
|
|
102
106
|
registerVolatileSecret,
|
|
103
107
|
scrubObject,
|
|
104
108
|
scrubSecrets
|
|
105
|
-
} from "./cli-
|
|
109
|
+
} from "./cli-wt7ccy4r.js";
|
|
106
110
|
import {
|
|
107
111
|
__commonJS,
|
|
108
112
|
__require,
|
|
@@ -175254,7 +175258,7 @@ init_constants();
|
|
|
175254
175258
|
init_secret_scrubber();
|
|
175255
175259
|
|
|
175256
175260
|
// src/workflows/approval-notifications.ts
|
|
175257
|
-
|
|
175261
|
+
init_db2();
|
|
175258
175262
|
init_resolver();
|
|
175259
175263
|
init_types();
|
|
175260
175264
|
init_secret_scrubber();
|
|
@@ -175590,7 +175594,7 @@ class HumanInTheLoopExecutor extends BaseExecutor {
|
|
|
175590
175594
|
}
|
|
175591
175595
|
if (notification.channel === "slack") {
|
|
175592
175596
|
try {
|
|
175593
|
-
const { getSlackApp: getSlackApp2 } = await import("./app-
|
|
175597
|
+
const { getSlackApp: getSlackApp2 } = await import("./app-43vrdmv8.js");
|
|
175594
175598
|
const slackApp = getSlackApp2();
|
|
175595
175599
|
if (!slackApp) {
|
|
175596
175600
|
console.warn("[HITL] Slack not initialized — cannot send notification");
|
|
@@ -175677,6 +175681,180 @@ function formatTimeout(seconds) {
|
|
|
175677
175681
|
return mins > 0 ? `${hours}h ${mins}m` : `${hours}h`;
|
|
175678
175682
|
}
|
|
175679
175683
|
|
|
175684
|
+
// src/workflows/executors/system-one-wire.ts
|
|
175685
|
+
class SystemOneWireError extends Error {
|
|
175686
|
+
}
|
|
175687
|
+
var VALIDATION_PREFIX = "SystemOne response failed validation: ";
|
|
175688
|
+
function wireContractError(message) {
|
|
175689
|
+
throw new SystemOneWireError(`${VALIDATION_PREFIX}${message}`);
|
|
175690
|
+
}
|
|
175691
|
+
function isRecord(value) {
|
|
175692
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
175693
|
+
}
|
|
175694
|
+
var SYSTEM_ONE_WIRE = {
|
|
175695
|
+
buildRequest: (config, model) => ({
|
|
175696
|
+
state: config.state,
|
|
175697
|
+
...model === undefined ? {} : { model },
|
|
175698
|
+
questions: config.questions
|
|
175699
|
+
}),
|
|
175700
|
+
toSystemOne: (body) => body
|
|
175701
|
+
};
|
|
175702
|
+
var CLOUDFLARE_WIRE = {
|
|
175703
|
+
buildRequest: SYSTEM_ONE_WIRE.buildRequest,
|
|
175704
|
+
toSystemOne(body) {
|
|
175705
|
+
if (!isRecord(body))
|
|
175706
|
+
wireContractError("response body must be a JSON object");
|
|
175707
|
+
if (body.success !== true) {
|
|
175708
|
+
const code = cloudflareErrorCode(body);
|
|
175709
|
+
throw new SystemOneWireError(`Cloudflare Workers AI reported a failed run${code ? ` (${code})` : ""}. No decision was made.`);
|
|
175710
|
+
}
|
|
175711
|
+
if (!isRecord(body.result))
|
|
175712
|
+
wireContractError("Cloudflare response is missing its result");
|
|
175713
|
+
return body.result;
|
|
175714
|
+
}
|
|
175715
|
+
};
|
|
175716
|
+
var ERROR_CODE_RE = /^[A-Za-z0-9._:-]{1,64}$/;
|
|
175717
|
+
function cloudflareErrorCode(body) {
|
|
175718
|
+
const first = Array.isArray(body.errors) ? body.errors[0] : undefined;
|
|
175719
|
+
const code = isRecord(first) ? first.code : undefined;
|
|
175720
|
+
if (typeof code === "number" && Number.isSafeInteger(code))
|
|
175721
|
+
return String(code);
|
|
175722
|
+
return typeof code === "string" && ERROR_CODE_RE.test(code) ? code : undefined;
|
|
175723
|
+
}
|
|
175724
|
+
|
|
175725
|
+
// src/workflows/executors/system-one-openai-wire.ts
|
|
175726
|
+
function entryText(entry) {
|
|
175727
|
+
if (entry === undefined || entry === null)
|
|
175728
|
+
return;
|
|
175729
|
+
return typeof entry === "string" ? entry : JSON.stringify(entry);
|
|
175730
|
+
}
|
|
175731
|
+
function openaiInput(state) {
|
|
175732
|
+
if (typeof state === "string")
|
|
175733
|
+
return state;
|
|
175734
|
+
if (Array.isArray(state)) {
|
|
175735
|
+
return [
|
|
175736
|
+
{
|
|
175737
|
+
role: "user",
|
|
175738
|
+
content: state.map((text) => ({ type: "input_text", text: String(text) }))
|
|
175739
|
+
}
|
|
175740
|
+
];
|
|
175741
|
+
}
|
|
175742
|
+
return JSON.stringify(state);
|
|
175743
|
+
}
|
|
175744
|
+
function openaiQuestion(name, question) {
|
|
175745
|
+
const instructions = entryText(question.instructions) ?? "";
|
|
175746
|
+
switch (question.type) {
|
|
175747
|
+
case "noul": {
|
|
175748
|
+
const whenTrue = entryText(question.criteria?.true);
|
|
175749
|
+
const whenFalse = entryText(question.criteria?.false);
|
|
175750
|
+
const parts = [instructions];
|
|
175751
|
+
if (whenTrue)
|
|
175752
|
+
parts.push(`True when: ${whenTrue}`);
|
|
175753
|
+
if (whenFalse)
|
|
175754
|
+
parts.push(`False when: ${whenFalse}`);
|
|
175755
|
+
return { type: "predicate", name, instructions: parts.join(`
|
|
175756
|
+
|
|
175757
|
+
`) };
|
|
175758
|
+
}
|
|
175759
|
+
case "choice":
|
|
175760
|
+
return {
|
|
175761
|
+
type: "choice",
|
|
175762
|
+
name,
|
|
175763
|
+
instructions,
|
|
175764
|
+
choices: Object.entries(question.criteria).map(([value, entry]) => {
|
|
175765
|
+
const description = entryText(entry);
|
|
175766
|
+
return description === undefined ? { value } : { value, description };
|
|
175767
|
+
})
|
|
175768
|
+
};
|
|
175769
|
+
case "score":
|
|
175770
|
+
return {
|
|
175771
|
+
type: "score",
|
|
175772
|
+
name,
|
|
175773
|
+
instructions,
|
|
175774
|
+
levels: question.criteria.map((entry, index) => ({
|
|
175775
|
+
label: entryText(entry) ?? String(index)
|
|
175776
|
+
}))
|
|
175777
|
+
};
|
|
175778
|
+
}
|
|
175779
|
+
}
|
|
175780
|
+
function probabilityMap(value, at) {
|
|
175781
|
+
if (!Array.isArray(value))
|
|
175782
|
+
return value;
|
|
175783
|
+
const out = {};
|
|
175784
|
+
for (const item of value) {
|
|
175785
|
+
if (!isRecord(item) || typeof item.value !== "string" && typeof item.value !== "number") {
|
|
175786
|
+
wireContractError(`${at} entries must carry a string or number value`);
|
|
175787
|
+
}
|
|
175788
|
+
const key = String(item.value);
|
|
175789
|
+
if (Object.hasOwn(out, key))
|
|
175790
|
+
wireContractError(`${at} lists an option twice`);
|
|
175791
|
+
out[key] = item.probability;
|
|
175792
|
+
}
|
|
175793
|
+
return out;
|
|
175794
|
+
}
|
|
175795
|
+
function toSystemOneAnswer(id, question, raw) {
|
|
175796
|
+
const at = `answer "${id}".probabilities`;
|
|
175797
|
+
switch (raw.type) {
|
|
175798
|
+
case "predicate":
|
|
175799
|
+
return { type: "noul", noul: raw.probability };
|
|
175800
|
+
case "choice":
|
|
175801
|
+
return {
|
|
175802
|
+
type: "choice",
|
|
175803
|
+
choice: raw.choice,
|
|
175804
|
+
probabilities: probabilityMap(raw.probabilities, at),
|
|
175805
|
+
confidence: raw.confidence
|
|
175806
|
+
};
|
|
175807
|
+
case "score":
|
|
175808
|
+
return {
|
|
175809
|
+
type: "score",
|
|
175810
|
+
score: raw.score,
|
|
175811
|
+
probabilities: probabilityMap(raw.probabilities, at),
|
|
175812
|
+
legend: question.type === "score" ? Object.fromEntries(question.criteria.map((entry, index) => [String(index), entry])) : undefined,
|
|
175813
|
+
confidence: raw.confidence
|
|
175814
|
+
};
|
|
175815
|
+
default:
|
|
175816
|
+
return raw;
|
|
175817
|
+
}
|
|
175818
|
+
}
|
|
175819
|
+
var OPENAI_DECISIONS_WIRE = {
|
|
175820
|
+
buildRequest: (config, model) => ({
|
|
175821
|
+
...model === undefined ? {} : { model },
|
|
175822
|
+
input: openaiInput(config.state),
|
|
175823
|
+
questions: Object.entries(config.questions).map(([name, question]) => openaiQuestion(name, question))
|
|
175824
|
+
}),
|
|
175825
|
+
toSystemOne(body, { questions }) {
|
|
175826
|
+
if (!isRecord(body))
|
|
175827
|
+
wireContractError("response body must be a JSON object");
|
|
175828
|
+
if (!Array.isArray(body.answers))
|
|
175829
|
+
wireContractError("response is missing the answers array");
|
|
175830
|
+
const byName = new Map;
|
|
175831
|
+
for (const answer of body.answers) {
|
|
175832
|
+
if (!isRecord(answer) || typeof answer.name !== "string") {
|
|
175833
|
+
wireContractError("every answer must be an object naming its question");
|
|
175834
|
+
}
|
|
175835
|
+
if (!Object.hasOwn(questions, answer.name)) {
|
|
175836
|
+
wireContractError("response contains an answer for an undeclared question");
|
|
175837
|
+
}
|
|
175838
|
+
if (byName.has(answer.name)) {
|
|
175839
|
+
wireContractError(`response answers question "${answer.name}" twice`);
|
|
175840
|
+
}
|
|
175841
|
+
byName.set(answer.name, answer);
|
|
175842
|
+
}
|
|
175843
|
+
const refused = [...byName.values()].filter((answer) => answer.type === "refusal").map((answer) => `"${answer.name}"`);
|
|
175844
|
+
if (refused.length > 0) {
|
|
175845
|
+
throw new SystemOneWireError(`OpenAI refused question${refused.length > 1 ? "s" : ""} ${refused.join(", ")}; no decision was made`);
|
|
175846
|
+
}
|
|
175847
|
+
const answers = {};
|
|
175848
|
+
for (const [id, answer] of byName) {
|
|
175849
|
+
const question = questions[id];
|
|
175850
|
+
if (question)
|
|
175851
|
+
answers[id] = toSystemOneAnswer(id, question, answer);
|
|
175852
|
+
}
|
|
175853
|
+
const usage = isRecord(body.usage) ? { input_tokens: body.usage.input_tokens, output_tokens: body.usage.output_tokens } : body.usage;
|
|
175854
|
+
return { model: body.model, answers, usage };
|
|
175855
|
+
}
|
|
175856
|
+
};
|
|
175857
|
+
|
|
175680
175858
|
// src/workflows/executors/workflow-llm.ts
|
|
175681
175859
|
async function resolveWorkflowLlmConfig(requestedModel, env = process.env, options = {}) {
|
|
175682
175860
|
const credential = await resolveCredential({ env });
|
|
@@ -175703,6 +175881,10 @@ var TYPESAFE_KEY = "TYPESAFE_API_KEY";
|
|
|
175703
175881
|
var OPENROUTER_KEY = "OPENROUTER_API_KEY";
|
|
175704
175882
|
var LAYA_KEY = "LAYA_API_KEY";
|
|
175705
175883
|
var LAYA_URL_KEY = "LAYA_URL";
|
|
175884
|
+
var OPENAI_DECISIONS_KEY = "OPENAI_DECISIONS_API_KEY";
|
|
175885
|
+
var CLOUDFLARE_TOKEN_KEY = "CLOUDFLARE_API_TOKEN";
|
|
175886
|
+
var CLOUDFLARE_ACCOUNT_KEY = "CLOUDFLARE_ACCOUNT_ID";
|
|
175887
|
+
var CLOUDFLARE_ACCOUNT_RE = /^[0-9a-f]{32}$/;
|
|
175706
175888
|
async function readGlobalConfig(db, key) {
|
|
175707
175889
|
const rows = await db.getSwarmConfigs({ scope: "global", key });
|
|
175708
175890
|
return rows.find((row) => row.scope === "global" && row.key === key)?.value;
|
|
@@ -175739,6 +175921,33 @@ var SYSTEM_ONE_PROVIDERS = {
|
|
|
175739
175921
|
endpoint: { configKey: LAYA_URL_KEY, path: "/v1/systemone" },
|
|
175740
175922
|
confidenceField: "answer_confidence",
|
|
175741
175923
|
readKey: ({ db }) => readGlobalConfig(db, LAYA_KEY)
|
|
175924
|
+
},
|
|
175925
|
+
openai: {
|
|
175926
|
+
label: "OpenAI",
|
|
175927
|
+
keyName: OPENAI_DECISIONS_KEY,
|
|
175928
|
+
endpoint: "https://api.openai.com/v1/decisions",
|
|
175929
|
+
defaultModel: "gpt-6-luna",
|
|
175930
|
+
confidenceField: "confidence",
|
|
175931
|
+
wire: OPENAI_DECISIONS_WIRE,
|
|
175932
|
+
readKey: ({ db }) => readGlobalConfig(db, OPENAI_DECISIONS_KEY)
|
|
175933
|
+
},
|
|
175934
|
+
cloudflare: {
|
|
175935
|
+
label: "Cloudflare Workers AI",
|
|
175936
|
+
keyName: CLOUDFLARE_TOKEN_KEY,
|
|
175937
|
+
endpoint: {
|
|
175938
|
+
configKey: CLOUDFLARE_ACCOUNT_KEY,
|
|
175939
|
+
describe: "the 32-character id of a Cloudflare account",
|
|
175940
|
+
build: (accountId, model) => {
|
|
175941
|
+
const id = accountId.trim();
|
|
175942
|
+
return CLOUDFLARE_ACCOUNT_RE.test(id) ? `https://api.cloudflare.com/client/v4/accounts/${id}/ai/run/@cf/cloudflare/${model}` : null;
|
|
175943
|
+
}
|
|
175944
|
+
},
|
|
175945
|
+
defaultModel: "clef",
|
|
175946
|
+
allowedModels: ["clef", "clef-flash"],
|
|
175947
|
+
limits: { maxQuestions: 64 },
|
|
175948
|
+
confidenceField: "confidence",
|
|
175949
|
+
wire: CLOUDFLARE_WIRE,
|
|
175950
|
+
readKey: ({ db }) => readGlobalConfig(db, CLOUDFLARE_TOKEN_KEY)
|
|
175742
175951
|
}
|
|
175743
175952
|
};
|
|
175744
175953
|
var SYSTEM_ONE_PROVIDER_IDS = Object.keys(SYSTEM_ONE_PROVIDERS);
|
|
@@ -175771,10 +175980,16 @@ function systemOneKeyRejectedMessage(id, status, code) {
|
|
|
175771
175980
|
function urlKeyOf(provider) {
|
|
175772
175981
|
return typeof provider.endpoint === "string" ? null : provider.endpoint.configKey;
|
|
175773
175982
|
}
|
|
175983
|
+
function isBuiltEndpoint(endpoint) {
|
|
175984
|
+
return typeof endpoint !== "string" && "build" in endpoint;
|
|
175985
|
+
}
|
|
175986
|
+
function urlDescriptionOf(provider) {
|
|
175987
|
+
return isBuiltEndpoint(provider.endpoint) ? provider.endpoint.describe : `the URL of a ${provider.label} server`;
|
|
175988
|
+
}
|
|
175774
175989
|
function systemOneUrlMissingMessage(id) {
|
|
175775
175990
|
const provider = SYSTEM_ONE_PROVIDERS[id];
|
|
175776
175991
|
const configKey = urlKeyOf(provider) ?? "";
|
|
175777
|
-
return `${configKey} is not configured. SystemOne provider "${id}" needs
|
|
175992
|
+
return `${configKey} is not configured. SystemOne provider "${id}" needs ${urlDescriptionOf(provider)}. ${SET_URL(configKey)}`;
|
|
175778
175993
|
}
|
|
175779
175994
|
function systemOneUrlUnreadableMessage(id) {
|
|
175780
175995
|
return `Could not read ${urlKeyOf(SYSTEM_ONE_PROVIDERS[id]) ?? ""} from swarm config`;
|
|
@@ -175782,8 +175997,21 @@ function systemOneUrlUnreadableMessage(id) {
|
|
|
175782
175997
|
function systemOneUrlInvalidMessage(id) {
|
|
175783
175998
|
const provider = SYSTEM_ONE_PROVIDERS[id];
|
|
175784
175999
|
const configKey = urlKeyOf(provider) ?? "";
|
|
176000
|
+
if (isBuiltEndpoint(provider.endpoint)) {
|
|
176001
|
+
return `${configKey} is not ${provider.endpoint.describe}. ${SET_URL(configKey)}`;
|
|
176002
|
+
}
|
|
175785
176003
|
return `${configKey} is not a usable ${provider.label} server URL. It must be an https URL (http only for localhost) with no credentials, query, or fragment. ${SET_URL(configKey)}`;
|
|
175786
176004
|
}
|
|
176005
|
+
function systemOneModelProblem(id, model) {
|
|
176006
|
+
const { allowedModels } = SYSTEM_ONE_PROVIDERS[id];
|
|
176007
|
+
if (!allowedModels || model !== undefined && allowedModels.includes(model))
|
|
176008
|
+
return null;
|
|
176009
|
+
return `SystemOne provider "${id}" serves only the models ${allowedModels.join(", ")}; set model to one of them or leave it unset.`;
|
|
176010
|
+
}
|
|
176011
|
+
function systemOneQuestionLimitProblem(id, count) {
|
|
176012
|
+
const max = SYSTEM_ONE_PROVIDERS[id].limits?.maxQuestions;
|
|
176013
|
+
return max !== undefined && count > max ? `SystemOne provider "${id}" takes at most ${max} questions per node; this node has ${count}.` : null;
|
|
176014
|
+
}
|
|
175787
176015
|
function hasWhitespaceOrControl(value) {
|
|
175788
176016
|
for (const char of value) {
|
|
175789
176017
|
const code = char.charCodeAt(0);
|
|
@@ -175818,7 +176046,7 @@ async function resolveSystemOneTarget(id, ctx, overrides = {}) {
|
|
|
175818
176046
|
if (typeof provider.endpoint === "string") {
|
|
175819
176047
|
endpoint = provider.endpoint;
|
|
175820
176048
|
} else {
|
|
175821
|
-
const { configKey
|
|
176049
|
+
const { configKey } = provider.endpoint;
|
|
175822
176050
|
let base;
|
|
175823
176051
|
let readable = true;
|
|
175824
176052
|
try {
|
|
@@ -175831,7 +176059,7 @@ async function resolveSystemOneTarget(id, ctx, overrides = {}) {
|
|
|
175831
176059
|
if (!base || base.trim() === "") {
|
|
175832
176060
|
errors.push(systemOneUrlMissingMessage(id));
|
|
175833
176061
|
} else {
|
|
175834
|
-
const resolved = systemOneEndpointFromBase(base, path);
|
|
176062
|
+
const resolved = isBuiltEndpoint(provider.endpoint) ? provider.endpoint.build(base, overrides.model ?? provider.defaultModel ?? "") : systemOneEndpointFromBase(base, provider.endpoint.path);
|
|
175835
176063
|
if (resolved)
|
|
175836
176064
|
endpoint = resolved;
|
|
175837
176065
|
else
|
|
@@ -175983,6 +176211,12 @@ var SystemOneDecisionConfigSchema = exports_external.strictObject({
|
|
|
175983
176211
|
});
|
|
175984
176212
|
}
|
|
175985
176213
|
}
|
|
176214
|
+
const modelProblem = systemOneModelProblem(config.provider, config.model ?? SYSTEM_ONE_PROVIDERS[config.provider].defaultModel);
|
|
176215
|
+
if (modelProblem)
|
|
176216
|
+
ctx.addIssue({ code: "custom", path: ["model"], message: modelProblem });
|
|
176217
|
+
const limitProblem = systemOneQuestionLimitProblem(config.provider, questionIds.length);
|
|
176218
|
+
if (limitProblem)
|
|
176219
|
+
ctx.addIssue({ code: "custom", path: ["questions"], message: limitProblem });
|
|
175986
176220
|
});
|
|
175987
176221
|
var NoulAnswerSchema = exports_external.strictObject({ type: exports_external.literal("noul"), noul: Unit });
|
|
175988
176222
|
var ChoiceAnswerSchema = exports_external.strictObject({
|
|
@@ -176053,7 +176287,7 @@ function systemOneStaticShapeViolations(node) {
|
|
|
176053
176287
|
if (typeof provider === "string" && provider.includes("{{")) {
|
|
176054
176288
|
violations.push(`Node "${node.id}" (system-one-decision) config.provider must be a literal (${SYSTEM_ONE_PROVIDER_IDS.join(", ")}), not a {{token}}: the provider decides which credential is checked before the run starts`);
|
|
176055
176289
|
}
|
|
176056
|
-
if (
|
|
176290
|
+
if (isRecord2(node.config.humanReview) && node.next != null) {
|
|
176057
176291
|
if (typeof node.next === "string" || Array.isArray(node.next)) {
|
|
176058
176292
|
violations.push(`Node "${node.id}" (system-one-decision) sets humanReview, so next must map output ports (${REVIEW_PORTS.join(", ")}): a single or list next would run the same successors after a rejection or a timeout`);
|
|
176059
176293
|
} else {
|
|
@@ -176079,7 +176313,7 @@ class SystemOneContractError extends Error {
|
|
|
176079
176313
|
function fail(message) {
|
|
176080
176314
|
throw new SystemOneContractError(message);
|
|
176081
176315
|
}
|
|
176082
|
-
function
|
|
176316
|
+
function isRecord2(value) {
|
|
176083
176317
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
176084
176318
|
}
|
|
176085
176319
|
function unit(value, what) {
|
|
@@ -176089,7 +176323,7 @@ function unit(value, what) {
|
|
|
176089
176323
|
return value;
|
|
176090
176324
|
}
|
|
176091
176325
|
function distribution(value, keys, what) {
|
|
176092
|
-
if (!
|
|
176326
|
+
if (!isRecord2(value))
|
|
176093
176327
|
fail(`${what} must be an object`);
|
|
176094
176328
|
const actual = Object.keys(value);
|
|
176095
176329
|
const missing = keys.filter((key) => !Object.hasOwn(value, key));
|
|
@@ -176111,7 +176345,7 @@ function distribution(value, keys, what) {
|
|
|
176111
176345
|
}
|
|
176112
176346
|
function validateAnswer(id, question, raw, confidenceField) {
|
|
176113
176347
|
const at = `answer "${id}"`;
|
|
176114
|
-
if (!
|
|
176348
|
+
if (!isRecord2(raw))
|
|
176115
176349
|
fail(`${at} must be an object`);
|
|
176116
176350
|
if (raw.type !== question.type) {
|
|
176117
176351
|
fail(`${at} has type ${JSON.stringify(raw.type)} but the question declares "${question.type}"`);
|
|
@@ -176137,7 +176371,7 @@ function validateAnswer(id, question, raw, confidenceField) {
|
|
|
176137
176371
|
if (typeof raw.score !== "number" || !Number.isFinite(raw.score) || raw.score < 0 || raw.score > top) {
|
|
176138
176372
|
fail(`${at}.score must be a finite number between 0 and ${top}`);
|
|
176139
176373
|
}
|
|
176140
|
-
if (!
|
|
176374
|
+
if (!isRecord2(raw.legend))
|
|
176141
176375
|
fail(`${at}.legend must be an object`);
|
|
176142
176376
|
const legend = {};
|
|
176143
176377
|
for (const key of indices) {
|
|
@@ -176160,18 +176394,18 @@ function validateAnswer(id, question, raw, confidenceField) {
|
|
|
176160
176394
|
}
|
|
176161
176395
|
var MAX_ROUTING_MODEL_CHARS = 128;
|
|
176162
176396
|
function readRoutingModel(routing) {
|
|
176163
|
-
if (!
|
|
176397
|
+
if (!isRecord2(routing))
|
|
176164
176398
|
return;
|
|
176165
176399
|
const { model } = routing;
|
|
176166
176400
|
return typeof model === "string" && model !== "" && model.length <= MAX_ROUTING_MODEL_CHARS ? model : undefined;
|
|
176167
176401
|
}
|
|
176168
176402
|
function validateSystemOneResponse(questions, body, requestId, confidenceField = "confidence") {
|
|
176169
|
-
if (!
|
|
176403
|
+
if (!isRecord2(body))
|
|
176170
176404
|
fail("response body must be a JSON object");
|
|
176171
176405
|
if (typeof body.model !== "string" || body.model === "") {
|
|
176172
176406
|
fail("response is missing the model that produced the answers");
|
|
176173
176407
|
}
|
|
176174
|
-
if (!
|
|
176408
|
+
if (!isRecord2(body.answers))
|
|
176175
176409
|
fail("response is missing the answers object");
|
|
176176
176410
|
const usage = exports_external.object({ input_tokens: exports_external.number().int().min(0), output_tokens: exports_external.number().int().min(0) }).safeParse(body.usage);
|
|
176177
176411
|
if (!usage.success)
|
|
@@ -176342,9 +176576,9 @@ function resolveReviewedDecision(parkedOutput, approval) {
|
|
|
176342
176576
|
return finish("approved", answers, questions);
|
|
176343
176577
|
}
|
|
176344
176578
|
var REQUEST_ID_RE = /^[A-Za-z0-9._:-]{1,128}$/;
|
|
176345
|
-
var
|
|
176579
|
+
var ERROR_CODE_RE2 = /^[A-Za-z0-9._:-]{1,64}$/;
|
|
176346
176580
|
function readRequestId(headers) {
|
|
176347
|
-
const value = headers.get("x-request-id") ?? headers.get("request-id");
|
|
176581
|
+
const value = headers.get("x-request-id") ?? headers.get("request-id") ?? headers.get("cf-ray");
|
|
176348
176582
|
return value && REQUEST_ID_RE.test(value) ? value : undefined;
|
|
176349
176583
|
}
|
|
176350
176584
|
function parseRetryAfter(value, now) {
|
|
@@ -176365,10 +176599,10 @@ function readErrorCode(text) {
|
|
|
176365
176599
|
} catch {
|
|
176366
176600
|
return;
|
|
176367
176601
|
}
|
|
176368
|
-
if (!
|
|
176602
|
+
if (!isRecord2(parsed))
|
|
176369
176603
|
return;
|
|
176370
|
-
const nested =
|
|
176371
|
-
const detail =
|
|
176604
|
+
const nested = isRecord2(parsed.error) ? parsed.error : undefined;
|
|
176605
|
+
const detail = isRecord2(parsed.detail) ? parsed.detail : undefined;
|
|
176372
176606
|
for (const candidate of [
|
|
176373
176607
|
nested?.code,
|
|
176374
176608
|
nested?.type,
|
|
@@ -176376,10 +176610,10 @@ function readErrorCode(text) {
|
|
|
176376
176610
|
parsed.code,
|
|
176377
176611
|
parsed.type
|
|
176378
176612
|
]) {
|
|
176379
|
-
if (typeof candidate === "string" &&
|
|
176613
|
+
if (typeof candidate === "string" && ERROR_CODE_RE2.test(candidate))
|
|
176380
176614
|
return candidate;
|
|
176381
176615
|
}
|
|
176382
|
-
return;
|
|
176616
|
+
return cloudflareErrorCode(parsed);
|
|
176383
176617
|
}
|
|
176384
176618
|
function defaultSleep(ms, signal) {
|
|
176385
176619
|
return new Promise((resolve) => {
|
|
@@ -176408,10 +176642,11 @@ class SystemOneDecisionExecutor extends BaseExecutor {
|
|
|
176408
176642
|
providerContext() {
|
|
176409
176643
|
return { db: this.deps.db, env: this.options.env ?? process.env };
|
|
176410
176644
|
}
|
|
176411
|
-
resolveTarget(id) {
|
|
176645
|
+
resolveTarget(id, model) {
|
|
176412
176646
|
return resolveSystemOneTarget(id, this.providerContext(), {
|
|
176413
176647
|
apiKey: this.options.getApiKey,
|
|
176414
|
-
serverUrl: this.options.getServerUrl
|
|
176648
|
+
serverUrl: this.options.getServerUrl,
|
|
176649
|
+
model
|
|
176415
176650
|
});
|
|
176416
176651
|
}
|
|
176417
176652
|
async checkReadiness(nodes) {
|
|
@@ -176438,16 +176673,16 @@ class SystemOneDecisionExecutor extends BaseExecutor {
|
|
|
176438
176673
|
}
|
|
176439
176674
|
const providerId = config.provider;
|
|
176440
176675
|
const provider = SYSTEM_ONE_PROVIDERS[providerId];
|
|
176441
|
-
const
|
|
176676
|
+
const model = config.model ?? provider.defaultModel;
|
|
176677
|
+
const modelProblem = systemOneModelProblem(providerId, model);
|
|
176678
|
+
if (modelProblem)
|
|
176679
|
+
return { status: "failed", error: modelProblem };
|
|
176680
|
+
const target = await this.resolveTarget(providerId, model);
|
|
176442
176681
|
if (!target.ok)
|
|
176443
176682
|
return { status: "failed", error: target.error };
|
|
176444
176683
|
const { apiKey, endpoint } = target;
|
|
176445
|
-
const
|
|
176446
|
-
const body = JSON.stringify(
|
|
176447
|
-
state: config.state,
|
|
176448
|
-
...model === undefined ? {} : { model },
|
|
176449
|
-
questions: config.questions
|
|
176450
|
-
});
|
|
176684
|
+
const wire = provider.wire ?? SYSTEM_ONE_WIRE;
|
|
176685
|
+
const body = JSON.stringify(wire.buildRequest(config, model));
|
|
176451
176686
|
const scrub = (message) => message.split(apiKey).join("[REDACTED]");
|
|
176452
176687
|
const sent = await this.send(providerId, endpoint, apiKey, body, config.timeoutMs, config.maxRetries);
|
|
176453
176688
|
if (!sent.ok)
|
|
@@ -176460,8 +176695,12 @@ class SystemOneDecisionExecutor extends BaseExecutor {
|
|
|
176460
176695
|
}
|
|
176461
176696
|
let decision;
|
|
176462
176697
|
try {
|
|
176463
|
-
decision = validateSystemOneResponse(config.questions, parsed, sent.requestId, provider.confidenceField);
|
|
176698
|
+
decision = validateSystemOneResponse(config.questions, wire.toSystemOne(parsed, { questions: config.questions, model }), sent.requestId, provider.confidenceField);
|
|
176464
176699
|
} catch (err) {
|
|
176700
|
+
if (err instanceof SystemOneWireError) {
|
|
176701
|
+
const withId = sent.requestId ? `${err.message} [request ${sent.requestId}]` : err.message;
|
|
176702
|
+
return { status: "failed", error: scrub(withId) };
|
|
176703
|
+
}
|
|
176465
176704
|
if (err instanceof SystemOneContractError) {
|
|
176466
176705
|
return {
|
|
176467
176706
|
status: "failed",
|
|
@@ -176998,7 +177237,8 @@ function applyDefinitionPatch(def, patch) {
|
|
|
176998
177237
|
|
|
176999
177238
|
// src/be/script-connections.ts
|
|
177000
177239
|
init_zod();
|
|
177001
|
-
|
|
177240
|
+
init_db2();
|
|
177241
|
+
init_oauth();
|
|
177002
177242
|
|
|
177003
177243
|
// src/oauth/mcp-wrapper.ts
|
|
177004
177244
|
init_env_flag();
|
|
@@ -177367,13 +177607,15 @@ init_credential_broker();
|
|
|
177367
177607
|
init_secret_scrubber();
|
|
177368
177608
|
|
|
177369
177609
|
// src/be/mcp-proxy.ts
|
|
177370
|
-
|
|
177610
|
+
init_db2();
|
|
177371
177611
|
|
|
177372
177612
|
// src/be/db-queries/mcp-oauth.ts
|
|
177373
177613
|
init_secret_scrubber();
|
|
177374
177614
|
init_crypto();
|
|
177375
177615
|
init_date_utils();
|
|
177376
|
-
|
|
177616
|
+
init_db2();
|
|
177617
|
+
init_secret_registry();
|
|
177618
|
+
init_oauth();
|
|
177377
177619
|
function parseObject(value) {
|
|
177378
177620
|
try {
|
|
177379
177621
|
const parsed = JSON.parse(value || "{}");
|
|
@@ -177460,6 +177702,7 @@ async function upsertMcpApp(input) {
|
|
|
177460
177702
|
invalidated: false
|
|
177461
177703
|
});
|
|
177462
177704
|
const encryptedClientSecret = input.dcrClientSecret == null || input.dcrClientSecret === "" ? existing?.clientSecret ?? null : encryptSecret(input.dcrClientSecret, getEncryptionKey());
|
|
177705
|
+
registerStoredSecret(input.dcrClientSecret, oauthSecretName(`mcp-${input.mcpServerId}`, "client_secret"));
|
|
177463
177706
|
const source = "dcr";
|
|
177464
177707
|
if (existing) {
|
|
177465
177708
|
await getDbClient().run(`UPDATE oauth_apps SET
|
|
@@ -179322,9 +179565,10 @@ ${members.join(`
|
|
|
179322
179565
|
// src/be/script-credential-broker.ts
|
|
179323
179566
|
init_credential_broker();
|
|
179324
179567
|
init_secret_scrubber();
|
|
179325
|
-
|
|
179568
|
+
init_db2();
|
|
179326
179569
|
|
|
179327
179570
|
// src/be/oauth-credential-bindings.ts
|
|
179571
|
+
init_oauth();
|
|
179328
179572
|
var OAUTH_BINDING_REFRESH_BUFFER_MS = 5 * 60 * 1000;
|
|
179329
179573
|
function oauthAppToProviderConfig(app) {
|
|
179330
179574
|
return oauthAppRowToProviderConfig(app);
|
|
@@ -179387,419 +179631,6 @@ async function buildScriptCredentialBindings(input) {
|
|
|
179387
179631
|
return (await buildScriptCredentialBindingsWithFailures(input)).egressSecrets;
|
|
179388
179632
|
}
|
|
179389
179633
|
|
|
179390
|
-
// src/be/scripts/db.ts
|
|
179391
|
-
init_key();
|
|
179392
|
-
init_secret_scrubber();
|
|
179393
|
-
|
|
179394
|
-
// src/utils/short-id.ts
|
|
179395
|
-
import { randomBytes } from "node:crypto";
|
|
179396
|
-
var LETTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
|
179397
|
-
var BASE62 = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
|
179398
|
-
function generateShortId(len = 12) {
|
|
179399
|
-
let out = "";
|
|
179400
|
-
while (out.length < len) {
|
|
179401
|
-
for (const byte of randomBytes((len - out.length) * 2)) {
|
|
179402
|
-
if (byte < 208) {
|
|
179403
|
-
out += LETTERS[byte % 52];
|
|
179404
|
-
if (out.length === len)
|
|
179405
|
-
break;
|
|
179406
|
-
}
|
|
179407
|
-
}
|
|
179408
|
-
}
|
|
179409
|
-
return out;
|
|
179410
|
-
}
|
|
179411
|
-
function base62(bytes) {
|
|
179412
|
-
let out = "";
|
|
179413
|
-
for (const byte of bytes)
|
|
179414
|
-
out += BASE62[byte % 62];
|
|
179415
|
-
return out;
|
|
179416
|
-
}
|
|
179417
|
-
function generateBearerToken() {
|
|
179418
|
-
return `xsk_${base62(randomBytes(24))}`;
|
|
179419
|
-
}
|
|
179420
|
-
|
|
179421
|
-
// src/be/scripts/db.ts
|
|
179422
|
-
init_crypto();
|
|
179423
|
-
init_db();
|
|
179424
|
-
function normalizeScopeId(scope, scopeId) {
|
|
179425
|
-
if (scope === "global")
|
|
179426
|
-
return null;
|
|
179427
|
-
if (!scopeId) {
|
|
179428
|
-
throw new Error("scopeId is required for agent-scoped scripts");
|
|
179429
|
-
}
|
|
179430
|
-
return scopeId;
|
|
179431
|
-
}
|
|
179432
|
-
function rowToScript(row) {
|
|
179433
|
-
return {
|
|
179434
|
-
...row,
|
|
179435
|
-
scopeId: row.scopeId ?? null,
|
|
179436
|
-
isScratch: row.isScratch === 1,
|
|
179437
|
-
typeChecked: row.typeChecked === 1,
|
|
179438
|
-
createdByAgentId: row.createdByAgentId ?? null
|
|
179439
|
-
};
|
|
179440
|
-
}
|
|
179441
|
-
function rowToScriptVersion(row) {
|
|
179442
|
-
return {
|
|
179443
|
-
...row,
|
|
179444
|
-
changedByAgentId: row.changedByAgentId ?? null,
|
|
179445
|
-
changeReason: row.changeReason ?? null
|
|
179446
|
-
};
|
|
179447
|
-
}
|
|
179448
|
-
async function insertScriptVersion(args) {
|
|
179449
|
-
await getDbClient().run(`INSERT INTO script_versions (
|
|
179450
|
-
id, scriptId, version, source, description, intent, signatureJson,
|
|
179451
|
-
contentHash, changedByAgentId, changedAt, changeReason
|
|
179452
|
-
)
|
|
179453
|
-
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
|
|
179454
|
-
crypto.randomUUID(),
|
|
179455
|
-
args.scriptId,
|
|
179456
|
-
args.version,
|
|
179457
|
-
args.source,
|
|
179458
|
-
args.description,
|
|
179459
|
-
args.intent,
|
|
179460
|
-
args.signatureJson,
|
|
179461
|
-
args.contentHash,
|
|
179462
|
-
args.changedByAgentId ?? null,
|
|
179463
|
-
new Date().toISOString(),
|
|
179464
|
-
args.changeReason ?? null
|
|
179465
|
-
]);
|
|
179466
|
-
}
|
|
179467
|
-
async function insertScript(args) {
|
|
179468
|
-
const now = new Date().toISOString();
|
|
179469
|
-
const id = crypto.randomUUID();
|
|
179470
|
-
const scopeId = normalizeScopeId(args.scope, args.scopeId);
|
|
179471
|
-
const contentHash = computeContentHash(args.source);
|
|
179472
|
-
const fsMode = args.fsMode ?? "none";
|
|
179473
|
-
const isScratch = args.isScratch ? 1 : 0;
|
|
179474
|
-
const typeChecked = args.typeChecked ? 1 : 0;
|
|
179475
|
-
return await getDbClient().transaction(async (tx) => {
|
|
179476
|
-
const row = await tx.get(`INSERT INTO scripts (
|
|
179477
|
-
id, "key", name, scope, scopeId, source, description, intent, signatureJson,
|
|
179478
|
-
argsJsonSchema, contentHash, isScratch, typeChecked, fsMode, createdByAgentId, createdAt, updatedAt,
|
|
179479
|
-
created_by, updated_by
|
|
179480
|
-
)
|
|
179481
|
-
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
179482
|
-
RETURNING *`, [
|
|
179483
|
-
id,
|
|
179484
|
-
defaultAssetKey("script", id),
|
|
179485
|
-
args.name,
|
|
179486
|
-
args.scope,
|
|
179487
|
-
scopeId,
|
|
179488
|
-
args.source,
|
|
179489
|
-
args.description,
|
|
179490
|
-
args.intent,
|
|
179491
|
-
args.signatureJson,
|
|
179492
|
-
args.argsJsonSchema ?? null,
|
|
179493
|
-
contentHash,
|
|
179494
|
-
isScratch,
|
|
179495
|
-
typeChecked,
|
|
179496
|
-
fsMode,
|
|
179497
|
-
args.agentId ?? null,
|
|
179498
|
-
now,
|
|
179499
|
-
now,
|
|
179500
|
-
args.createdBy ?? null,
|
|
179501
|
-
args.createdBy ?? null
|
|
179502
|
-
]);
|
|
179503
|
-
if (!row)
|
|
179504
|
-
throw new Error("Failed to insert script");
|
|
179505
|
-
await insertScriptVersion({
|
|
179506
|
-
scriptId: row.id,
|
|
179507
|
-
version: row.version,
|
|
179508
|
-
source: row.source,
|
|
179509
|
-
description: row.description,
|
|
179510
|
-
intent: row.intent,
|
|
179511
|
-
signatureJson: row.signatureJson,
|
|
179512
|
-
contentHash: row.contentHash,
|
|
179513
|
-
changedByAgentId: args.agentId ?? null,
|
|
179514
|
-
changeReason: args.changeReason ?? "Initial creation"
|
|
179515
|
-
});
|
|
179516
|
-
return rowToScript(row);
|
|
179517
|
-
});
|
|
179518
|
-
}
|
|
179519
|
-
async function upsertScriptByName(args) {
|
|
179520
|
-
const shouldEmbed = args.embeddingMode !== "skip";
|
|
179521
|
-
const existing = await getScript(args);
|
|
179522
|
-
if (!existing) {
|
|
179523
|
-
const script2 = await insertScript(args);
|
|
179524
|
-
if (!script2.isScratch && shouldEmbed) {
|
|
179525
|
-
await embedScript(script2);
|
|
179526
|
-
}
|
|
179527
|
-
return {
|
|
179528
|
-
script: script2,
|
|
179529
|
-
isNew: true,
|
|
179530
|
-
contentDeduped: false
|
|
179531
|
-
};
|
|
179532
|
-
}
|
|
179533
|
-
const contentHash = computeContentHash(args.source);
|
|
179534
|
-
if (existing.contentHash === contentHash) {
|
|
179535
|
-
const fsMode2 = args.fsMode ?? existing.fsMode;
|
|
179536
|
-
const isScratch2 = args.isScratch ?? existing.isScratch;
|
|
179537
|
-
const typeChecked2 = args.typeChecked ?? existing.typeChecked;
|
|
179538
|
-
const argsJsonSchema2 = args.argsJsonSchema !== undefined ? args.argsJsonSchema : existing.argsJsonSchema;
|
|
179539
|
-
const trackedMetadataChanged = args.description !== existing.description || args.intent !== existing.intent || args.signatureJson !== existing.signatureJson || argsJsonSchema2 !== existing.argsJsonSchema;
|
|
179540
|
-
const promotedFromScratch = existing.isScratch && !isScratch2;
|
|
179541
|
-
const refreshScratchLastUsed = existing.scope === "agent" && existing.name.startsWith("scratch-") && existing.isScratch && isScratch2;
|
|
179542
|
-
if (fsMode2 !== existing.fsMode || isScratch2 !== existing.isScratch || typeChecked2 !== existing.typeChecked || trackedMetadataChanged || refreshScratchLastUsed) {
|
|
179543
|
-
const row = await getDbClient().get(`UPDATE scripts
|
|
179544
|
-
SET description = ?, intent = ?, signatureJson = ?, argsJsonSchema = ?,
|
|
179545
|
-
isScratch = ?, typeChecked = ?, fsMode = ?, updatedAt = ?, updated_by = ?
|
|
179546
|
-
WHERE id = ?
|
|
179547
|
-
RETURNING *`, [
|
|
179548
|
-
args.description,
|
|
179549
|
-
args.intent,
|
|
179550
|
-
args.signatureJson,
|
|
179551
|
-
argsJsonSchema2 ?? null,
|
|
179552
|
-
isScratch2 ? 1 : 0,
|
|
179553
|
-
typeChecked2 ? 1 : 0,
|
|
179554
|
-
fsMode2,
|
|
179555
|
-
new Date().toISOString(),
|
|
179556
|
-
args.createdBy ?? null,
|
|
179557
|
-
existing.id
|
|
179558
|
-
]);
|
|
179559
|
-
if (!row)
|
|
179560
|
-
throw new Error("Failed to update script metadata");
|
|
179561
|
-
const script2 = rowToScript(row);
|
|
179562
|
-
if (!script2.isScratch && shouldEmbed && (trackedMetadataChanged || promotedFromScratch)) {
|
|
179563
|
-
await embedScript(script2);
|
|
179564
|
-
}
|
|
179565
|
-
return {
|
|
179566
|
-
script: script2,
|
|
179567
|
-
isNew: false,
|
|
179568
|
-
contentDeduped: true
|
|
179569
|
-
};
|
|
179570
|
-
}
|
|
179571
|
-
return {
|
|
179572
|
-
script: existing,
|
|
179573
|
-
isNew: false,
|
|
179574
|
-
contentDeduped: true
|
|
179575
|
-
};
|
|
179576
|
-
}
|
|
179577
|
-
const now = new Date().toISOString();
|
|
179578
|
-
const newVersion = existing.version + 1;
|
|
179579
|
-
const fsMode = args.fsMode ?? existing.fsMode;
|
|
179580
|
-
const isScratch = args.isScratch ?? existing.isScratch;
|
|
179581
|
-
const typeChecked = args.typeChecked ?? existing.typeChecked;
|
|
179582
|
-
const argsJsonSchema = args.argsJsonSchema !== undefined ? args.argsJsonSchema : existing.argsJsonSchema;
|
|
179583
|
-
const script = await getDbClient().transaction(async (tx) => {
|
|
179584
|
-
const row = await tx.get(`UPDATE scripts
|
|
179585
|
-
SET source = ?, description = ?, intent = ?, signatureJson = ?, argsJsonSchema = ?,
|
|
179586
|
-
contentHash = ?, version = ?, isScratch = ?, typeChecked = ?, fsMode = ?, updatedAt = ?, updated_by = ?
|
|
179587
|
-
WHERE id = ?
|
|
179588
|
-
RETURNING *`, [
|
|
179589
|
-
args.source,
|
|
179590
|
-
args.description,
|
|
179591
|
-
args.intent,
|
|
179592
|
-
args.signatureJson,
|
|
179593
|
-
argsJsonSchema ?? null,
|
|
179594
|
-
contentHash,
|
|
179595
|
-
newVersion,
|
|
179596
|
-
isScratch ? 1 : 0,
|
|
179597
|
-
typeChecked ? 1 : 0,
|
|
179598
|
-
fsMode,
|
|
179599
|
-
now,
|
|
179600
|
-
args.createdBy ?? null,
|
|
179601
|
-
existing.id
|
|
179602
|
-
]);
|
|
179603
|
-
if (!row)
|
|
179604
|
-
throw new Error("Failed to update script");
|
|
179605
|
-
await insertScriptVersion({
|
|
179606
|
-
scriptId: row.id,
|
|
179607
|
-
version: row.version,
|
|
179608
|
-
source: row.source,
|
|
179609
|
-
description: row.description,
|
|
179610
|
-
intent: row.intent,
|
|
179611
|
-
signatureJson: row.signatureJson,
|
|
179612
|
-
contentHash: row.contentHash,
|
|
179613
|
-
changedByAgentId: args.agentId ?? null,
|
|
179614
|
-
changeReason: args.changeReason ?? null
|
|
179615
|
-
});
|
|
179616
|
-
return rowToScript(row);
|
|
179617
|
-
});
|
|
179618
|
-
if (!script.isScratch && shouldEmbed) {
|
|
179619
|
-
await embedScript(script);
|
|
179620
|
-
}
|
|
179621
|
-
return {
|
|
179622
|
-
script,
|
|
179623
|
-
isNew: false,
|
|
179624
|
-
contentDeduped: false
|
|
179625
|
-
};
|
|
179626
|
-
}
|
|
179627
|
-
async function getScript(args) {
|
|
179628
|
-
const scopeId = normalizeScopeId(args.scope, args.scopeId);
|
|
179629
|
-
const row = scopeId === null ? await getDbClient().get("SELECT * FROM scripts WHERE name = ? AND scope = ? AND scopeId IS NULL", [args.name, args.scope]) : await getDbClient().get("SELECT * FROM scripts WHERE name = ? AND scope = ? AND scopeId = ?", [args.name, args.scope, scopeId]);
|
|
179630
|
-
return row ? rowToScript(row) : null;
|
|
179631
|
-
}
|
|
179632
|
-
async function getScriptById(id) {
|
|
179633
|
-
const row = await getDbClient().get("SELECT * FROM scripts WHERE id = ?", [id]);
|
|
179634
|
-
return row ? rowToScript(row) : null;
|
|
179635
|
-
}
|
|
179636
|
-
async function getScriptVersion(args) {
|
|
179637
|
-
if (args.version === undefined && args.contentHash === undefined) {
|
|
179638
|
-
throw new Error("version or contentHash is required");
|
|
179639
|
-
}
|
|
179640
|
-
const row = args.version !== undefined ? await getDbClient().get("SELECT * FROM script_versions WHERE scriptId = ? AND version = ?", [args.scriptId, args.version]) : await getDbClient().get("SELECT * FROM script_versions WHERE scriptId = ? AND contentHash = ? ORDER BY version DESC LIMIT 1", [args.scriptId, args.contentHash]);
|
|
179641
|
-
return row ? rowToScriptVersion(row) : null;
|
|
179642
|
-
}
|
|
179643
|
-
async function listScripts(args) {
|
|
179644
|
-
const conditions = [];
|
|
179645
|
-
const params = [];
|
|
179646
|
-
if (args?.scope) {
|
|
179647
|
-
conditions.push("scope = ?");
|
|
179648
|
-
params.push(args.scope);
|
|
179649
|
-
if (args.scope === "global") {
|
|
179650
|
-
conditions.push("scopeId IS NULL");
|
|
179651
|
-
} else if (args.scopeId !== undefined) {
|
|
179652
|
-
conditions.push("scopeId = ?");
|
|
179653
|
-
params.push(normalizeScopeId(args.scope, args.scopeId));
|
|
179654
|
-
}
|
|
179655
|
-
} else if (args?.scopeId !== undefined) {
|
|
179656
|
-
conditions.push("scopeId = ?");
|
|
179657
|
-
params.push(args.scopeId ?? "");
|
|
179658
|
-
}
|
|
179659
|
-
if (!args?.includeScratch) {
|
|
179660
|
-
conditions.push("isScratch = 0");
|
|
179661
|
-
}
|
|
179662
|
-
const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
|
|
179663
|
-
const rows = await getDbClient().query(`SELECT * FROM scripts ${whereClause} ORDER BY scope ASC, scopeId ASC, name ASC`, params);
|
|
179664
|
-
return rows.map(rowToScript);
|
|
179665
|
-
}
|
|
179666
|
-
async function listScriptVersions(scriptId) {
|
|
179667
|
-
const rows = await getDbClient().query("SELECT * FROM script_versions WHERE scriptId = ? ORDER BY version DESC", [scriptId]);
|
|
179668
|
-
return rows.map(rowToScriptVersion);
|
|
179669
|
-
}
|
|
179670
|
-
async function deleteScript(args) {
|
|
179671
|
-
const existing = await getScript(args);
|
|
179672
|
-
if (!existing)
|
|
179673
|
-
return false;
|
|
179674
|
-
const result = await getDbClient().run("DELETE FROM scripts WHERE id = ?", [existing.id]);
|
|
179675
|
-
return result.changes > 0;
|
|
179676
|
-
}
|
|
179677
|
-
async function touchScratchScriptLastUsed(id, at = new Date().toISOString()) {
|
|
179678
|
-
const result = await getDbClient().run(`UPDATE scripts SET updatedAt = ?
|
|
179679
|
-
WHERE id = ? AND scope = 'agent' AND isScratch = 1 AND name GLOB 'scratch-*'`, [at, id]);
|
|
179680
|
-
return result.changes > 0 ? at : null;
|
|
179681
|
-
}
|
|
179682
|
-
async function restoreScratchScriptLastUsedIfUnchanged(id, priorUpdatedAt, expectedUpdatedAt) {
|
|
179683
|
-
const result = await getDbClient().run(`UPDATE scripts SET updatedAt = ?
|
|
179684
|
-
WHERE id = ? AND scope = 'agent' AND isScratch = 1 AND name GLOB 'scratch-*' AND updatedAt = ?`, [priorUpdatedAt, id, expectedUpdatedAt]);
|
|
179685
|
-
return result.changes > 0;
|
|
179686
|
-
}
|
|
179687
|
-
var SCRIPT_API_ID_LEN = 12;
|
|
179688
|
-
function rowToScriptApi(row) {
|
|
179689
|
-
return {
|
|
179690
|
-
id: row.id,
|
|
179691
|
-
scriptId: row.scriptId,
|
|
179692
|
-
agentId: row.agentId,
|
|
179693
|
-
authMode: row.authMode,
|
|
179694
|
-
enabled: row.enabled === 1,
|
|
179695
|
-
label: row.label ?? null,
|
|
179696
|
-
callCount: row.callCount,
|
|
179697
|
-
lastUsedAt: row.lastUsedAt ?? null,
|
|
179698
|
-
createdAt: row.createdAt
|
|
179699
|
-
};
|
|
179700
|
-
}
|
|
179701
|
-
function isUniqueConstraintError(err) {
|
|
179702
|
-
return err instanceof Error && /UNIQUE constraint failed/i.test(err.message);
|
|
179703
|
-
}
|
|
179704
|
-
async function createScriptApi(args) {
|
|
179705
|
-
const now = new Date().toISOString();
|
|
179706
|
-
const token = args.authMode === "bearer" ? generateBearerToken() : null;
|
|
179707
|
-
const encrypted = token ? encryptSecret(token, getEncryptionKey()) : null;
|
|
179708
|
-
const createdBy = args.createdBy ?? null;
|
|
179709
|
-
for (let attempt = 0;attempt < 5; attempt++) {
|
|
179710
|
-
const id = generateShortId(SCRIPT_API_ID_LEN);
|
|
179711
|
-
try {
|
|
179712
|
-
const row = await getDbClient().get(`INSERT INTO script_apis
|
|
179713
|
-
(id, scriptId, agentId, authMode, bearerTokenEncrypted, enabled, label,
|
|
179714
|
-
callCount, lastUsedAt, createdAt, created_by, updated_by)
|
|
179715
|
-
VALUES (?, ?, ?, ?, ?, 1, ?, 0, NULL, ?, ?, ?)
|
|
179716
|
-
RETURNING *`, [
|
|
179717
|
-
id,
|
|
179718
|
-
args.scriptId,
|
|
179719
|
-
args.agentId,
|
|
179720
|
-
args.authMode,
|
|
179721
|
-
encrypted,
|
|
179722
|
-
args.label ?? null,
|
|
179723
|
-
now,
|
|
179724
|
-
createdBy,
|
|
179725
|
-
createdBy
|
|
179726
|
-
]);
|
|
179727
|
-
if (!row)
|
|
179728
|
-
throw new Error("Failed to create script API endpoint");
|
|
179729
|
-
if (token)
|
|
179730
|
-
registerVolatileSecret(token, `script-api:${id}`);
|
|
179731
|
-
return { ...rowToScriptApi(row), token };
|
|
179732
|
-
} catch (err) {
|
|
179733
|
-
if (isUniqueConstraintError(err) && attempt < 4)
|
|
179734
|
-
continue;
|
|
179735
|
-
throw err;
|
|
179736
|
-
}
|
|
179737
|
-
}
|
|
179738
|
-
throw new Error("Failed to allocate a unique script API endpoint id");
|
|
179739
|
-
}
|
|
179740
|
-
async function listScriptApisForScript(scriptId) {
|
|
179741
|
-
const rows = await getDbClient().query("SELECT * FROM script_apis WHERE scriptId = ? ORDER BY createdAt DESC", [scriptId]);
|
|
179742
|
-
return rows.map(rowToScriptApi);
|
|
179743
|
-
}
|
|
179744
|
-
async function getScriptApiById(id) {
|
|
179745
|
-
const row = await getDbClient().get("SELECT * FROM script_apis WHERE id = ?", [id]);
|
|
179746
|
-
if (!row)
|
|
179747
|
-
return null;
|
|
179748
|
-
return { ...rowToScriptApi(row), bearerTokenEncrypted: row.bearerTokenEncrypted ?? null };
|
|
179749
|
-
}
|
|
179750
|
-
async function getScriptApiSecret(id) {
|
|
179751
|
-
const row = await getDbClient().get("SELECT bearerTokenEncrypted FROM script_apis WHERE id = ?", [id]);
|
|
179752
|
-
if (!row?.bearerTokenEncrypted)
|
|
179753
|
-
return null;
|
|
179754
|
-
const token = decryptSecret(row.bearerTokenEncrypted, getEncryptionKey());
|
|
179755
|
-
registerVolatileSecret(token, `script-api:${id}`);
|
|
179756
|
-
return token;
|
|
179757
|
-
}
|
|
179758
|
-
async function updateScriptApi(id, args) {
|
|
179759
|
-
const sets = [];
|
|
179760
|
-
const vals = [];
|
|
179761
|
-
if (args.enabled !== undefined) {
|
|
179762
|
-
sets.push("enabled = ?");
|
|
179763
|
-
vals.push(args.enabled ? 1 : 0);
|
|
179764
|
-
}
|
|
179765
|
-
if (args.label !== undefined) {
|
|
179766
|
-
sets.push("label = ?");
|
|
179767
|
-
vals.push(args.label);
|
|
179768
|
-
}
|
|
179769
|
-
if (args.updatedBy !== undefined) {
|
|
179770
|
-
sets.push("updated_by = ?");
|
|
179771
|
-
vals.push(args.updatedBy);
|
|
179772
|
-
}
|
|
179773
|
-
if (sets.length === 0) {
|
|
179774
|
-
const row2 = await getDbClient().get("SELECT * FROM script_apis WHERE id = ?", [
|
|
179775
|
-
id
|
|
179776
|
-
]);
|
|
179777
|
-
return row2 ? rowToScriptApi(row2) : null;
|
|
179778
|
-
}
|
|
179779
|
-
vals.push(id);
|
|
179780
|
-
const row = await getDbClient().get(`UPDATE script_apis SET ${sets.join(", ")} WHERE id = ? RETURNING *`, vals);
|
|
179781
|
-
return row ? rowToScriptApi(row) : null;
|
|
179782
|
-
}
|
|
179783
|
-
async function rotateScriptApiSecret(id, updatedBy) {
|
|
179784
|
-
const existing = await getScriptApiById(id);
|
|
179785
|
-
if (!existing || existing.authMode !== "bearer")
|
|
179786
|
-
return null;
|
|
179787
|
-
const token = generateBearerToken();
|
|
179788
|
-
const encrypted = encryptSecret(token, getEncryptionKey());
|
|
179789
|
-
const row = await getDbClient().get("UPDATE script_apis SET bearerTokenEncrypted = ?, updated_by = ? WHERE id = ? RETURNING *", [encrypted, updatedBy ?? null, id]);
|
|
179790
|
-
if (!row)
|
|
179791
|
-
return null;
|
|
179792
|
-
registerVolatileSecret(token, `script-api:${id}`);
|
|
179793
|
-
return { ...rowToScriptApi(row), token };
|
|
179794
|
-
}
|
|
179795
|
-
async function deleteScriptApi(id) {
|
|
179796
|
-
const result = await getDbClient().run("DELETE FROM script_apis WHERE id = ?", [id]);
|
|
179797
|
-
return result.changes > 0;
|
|
179798
|
-
}
|
|
179799
|
-
async function recordScriptApiUsage(id) {
|
|
179800
|
-
await getDbClient().run("UPDATE script_apis SET callCount = callCount + 1, lastUsedAt = ? WHERE id = ?", [new Date().toISOString(), id]);
|
|
179801
|
-
}
|
|
179802
|
-
|
|
179803
179634
|
// src/scripts-runtime/import-allowlist.ts
|
|
179804
179635
|
var import_typescript = __toESM(require_typescript(), 1);
|
|
179805
179636
|
var SCRIPT_ALLOWED_BARE_IMPORTS = ["swarm-sdk", "stdlib", "zod"];
|
|
@@ -180201,9 +180032,162 @@ class NativeScriptExecutor {
|
|
|
180201
180032
|
}
|
|
180202
180033
|
}
|
|
180203
180034
|
|
|
180035
|
+
// src/scripts-runtime/executors/quickjs.ts
|
|
180036
|
+
var POOL_SIZE = 4;
|
|
180037
|
+
var UNRESPONSIVE_GRACE_MS = 5000;
|
|
180038
|
+
var RECYCLE_WASM_HEAP_BYTES = 64 * 1024 * 1024;
|
|
180039
|
+
function workerSpecifier() {
|
|
180040
|
+
if (import.meta.url.includes("/$bunfs/"))
|
|
180041
|
+
return "./scripts-runtime/executors/quickjs-worker.ts";
|
|
180042
|
+
return new URL("./quickjs-worker.ts", import.meta.url).href;
|
|
180043
|
+
}
|
|
180044
|
+
function emptyOutput(error, stderr = "") {
|
|
180045
|
+
return {
|
|
180046
|
+
result: undefined,
|
|
180047
|
+
stdout: "",
|
|
180048
|
+
stderr,
|
|
180049
|
+
truncated: { stdout: false, stderr: false },
|
|
180050
|
+
durationMs: 0,
|
|
180051
|
+
exitCode: 1,
|
|
180052
|
+
error
|
|
180053
|
+
};
|
|
180054
|
+
}
|
|
180055
|
+
|
|
180056
|
+
class QuickJSWorkerPool {
|
|
180057
|
+
size;
|
|
180058
|
+
slots = [];
|
|
180059
|
+
waiters = [];
|
|
180060
|
+
constructor(size) {
|
|
180061
|
+
this.size = size;
|
|
180062
|
+
}
|
|
180063
|
+
spawn() {
|
|
180064
|
+
const worker = new Worker(workerSpecifier());
|
|
180065
|
+
worker.unref?.();
|
|
180066
|
+
const ready = new Promise((resolve, reject) => {
|
|
180067
|
+
const onMessage = (event) => {
|
|
180068
|
+
if (event.data.type === "ready")
|
|
180069
|
+
resolve();
|
|
180070
|
+
else if (event.data.type === "fatal" && event.data.id === undefined) {
|
|
180071
|
+
reject(new Error(event.data.message));
|
|
180072
|
+
} else
|
|
180073
|
+
return;
|
|
180074
|
+
worker.removeEventListener("message", onMessage);
|
|
180075
|
+
};
|
|
180076
|
+
worker.addEventListener("message", onMessage);
|
|
180077
|
+
worker.addEventListener("error", (event) => reject(new Error(event.message)), { once: true });
|
|
180078
|
+
});
|
|
180079
|
+
ready.catch(() => {});
|
|
180080
|
+
const slot = { worker, ready, busy: true };
|
|
180081
|
+
this.slots.push(slot);
|
|
180082
|
+
return slot;
|
|
180083
|
+
}
|
|
180084
|
+
acquire() {
|
|
180085
|
+
const idle = this.slots.find((slot) => !slot.busy);
|
|
180086
|
+
if (idle) {
|
|
180087
|
+
idle.busy = true;
|
|
180088
|
+
return Promise.resolve(idle);
|
|
180089
|
+
}
|
|
180090
|
+
if (this.slots.length < this.size)
|
|
180091
|
+
return Promise.resolve(this.spawn());
|
|
180092
|
+
return new Promise((resolve) => this.waiters.push(resolve));
|
|
180093
|
+
}
|
|
180094
|
+
release(slot) {
|
|
180095
|
+
const waiter = this.waiters.shift();
|
|
180096
|
+
if (waiter)
|
|
180097
|
+
waiter(slot);
|
|
180098
|
+
else
|
|
180099
|
+
slot.busy = false;
|
|
180100
|
+
}
|
|
180101
|
+
get workerCount() {
|
|
180102
|
+
return this.slots.length;
|
|
180103
|
+
}
|
|
180104
|
+
discard(slot) {
|
|
180105
|
+
slot.worker.terminate();
|
|
180106
|
+
const index = this.slots.indexOf(slot);
|
|
180107
|
+
if (index !== -1)
|
|
180108
|
+
this.slots.splice(index, 1);
|
|
180109
|
+
const waiter = this.waiters.shift();
|
|
180110
|
+
if (waiter)
|
|
180111
|
+
waiter(this.spawn());
|
|
180112
|
+
}
|
|
180113
|
+
}
|
|
180114
|
+
var sharedPool;
|
|
180115
|
+
var requestSeq = 0;
|
|
180116
|
+
|
|
180117
|
+
class QuickJSScriptExecutor {
|
|
180118
|
+
name = "quickjs";
|
|
180119
|
+
async run(input) {
|
|
180120
|
+
if (input.fsMode === "workspace-rw") {
|
|
180121
|
+
return emptyOutput("executor_error", "workspace-rw not supported by quickjs executor");
|
|
180122
|
+
}
|
|
180123
|
+
if (input.signal?.aborted)
|
|
180124
|
+
return emptyOutput("killed");
|
|
180125
|
+
sharedPool ??= new QuickJSWorkerPool(POOL_SIZE);
|
|
180126
|
+
const pool = sharedPool;
|
|
180127
|
+
const slot = await pool.acquire();
|
|
180128
|
+
if (input.signal?.aborted) {
|
|
180129
|
+
pool.release(slot);
|
|
180130
|
+
return emptyOutput("killed");
|
|
180131
|
+
}
|
|
180132
|
+
try {
|
|
180133
|
+
await slot.ready;
|
|
180134
|
+
} catch (error) {
|
|
180135
|
+
pool.discard(slot);
|
|
180136
|
+
return emptyOutput("executor_error", `quickjs worker failed to start: ${error instanceof Error ? error.message : String(error)}`);
|
|
180137
|
+
}
|
|
180138
|
+
const id = ++requestSeq;
|
|
180139
|
+
const start = performance.now();
|
|
180140
|
+
return await new Promise((resolve) => {
|
|
180141
|
+
let settled = false;
|
|
180142
|
+
const settle = (output, healthy) => {
|
|
180143
|
+
if (settled)
|
|
180144
|
+
return;
|
|
180145
|
+
settled = true;
|
|
180146
|
+
clearTimeout(watchdog);
|
|
180147
|
+
slot.worker.removeEventListener("message", onMessage);
|
|
180148
|
+
slot.worker.removeEventListener("error", onError);
|
|
180149
|
+
input.signal?.removeEventListener("abort", onAbort);
|
|
180150
|
+
if (healthy)
|
|
180151
|
+
pool.release(slot);
|
|
180152
|
+
else
|
|
180153
|
+
pool.discard(slot);
|
|
180154
|
+
resolve(output);
|
|
180155
|
+
};
|
|
180156
|
+
const elapsed = () => Math.round(performance.now() - start);
|
|
180157
|
+
const onMessage = (event) => {
|
|
180158
|
+
const message = event.data;
|
|
180159
|
+
if (message.type === "result" && message.id === id) {
|
|
180160
|
+
const reusable = message.leakedHostCalls === 0 && (message.wasmHeapBytes ?? 0) <= RECYCLE_WASM_HEAP_BYTES;
|
|
180161
|
+
settle(message.output, reusable);
|
|
180162
|
+
} else if (message.type === "fatal" && message.id === id) {
|
|
180163
|
+
settle({ ...emptyOutput("executor_error", message.message), durationMs: elapsed() }, false);
|
|
180164
|
+
}
|
|
180165
|
+
};
|
|
180166
|
+
const onError = (event) => {
|
|
180167
|
+
settle({ ...emptyOutput("executor_error", event.message), durationMs: elapsed() }, false);
|
|
180168
|
+
};
|
|
180169
|
+
const onAbort = () => settle({ ...emptyOutput("killed"), durationMs: elapsed() }, false);
|
|
180170
|
+
const watchdog = setTimeout(() => settle({ ...emptyOutput("timeout"), exitCode: 124, durationMs: elapsed() }, false), input.resources.wallClockMs + UNRESPONSIVE_GRACE_MS);
|
|
180171
|
+
slot.worker.addEventListener("message", onMessage);
|
|
180172
|
+
slot.worker.addEventListener("error", onError);
|
|
180173
|
+
input.signal?.addEventListener("abort", onAbort, { once: true });
|
|
180174
|
+
slot.worker.postMessage({
|
|
180175
|
+
id,
|
|
180176
|
+
job: {
|
|
180177
|
+
source: input.source,
|
|
180178
|
+
args: input.args,
|
|
180179
|
+
configPayload: input.configPayload,
|
|
180180
|
+
resources: input.resources
|
|
180181
|
+
}
|
|
180182
|
+
});
|
|
180183
|
+
});
|
|
180184
|
+
}
|
|
180185
|
+
}
|
|
180186
|
+
|
|
180204
180187
|
// src/scripts-runtime/executors/registry.ts
|
|
180205
180188
|
var EXECUTORS = {
|
|
180206
|
-
native: () => new NativeScriptExecutor
|
|
180189
|
+
native: () => new NativeScriptExecutor,
|
|
180190
|
+
quickjs: () => new QuickJSScriptExecutor
|
|
180207
180191
|
};
|
|
180208
180192
|
function getScriptExecutor(name = process.env.SCRIPT_EXECUTOR ?? "native") {
|
|
180209
180193
|
const factory = EXECUTORS[name];
|
|
@@ -180411,8 +180395,10 @@ import { fileURLToPath as fileURLToPath3 } from "node:url";
|
|
|
180411
180395
|
|
|
180412
180396
|
// src/apps/definition.ts
|
|
180413
180397
|
init_zod();
|
|
180398
|
+
init_db();
|
|
180414
180399
|
|
|
180415
180400
|
// src/be/scripts/run-saved.ts
|
|
180401
|
+
init_db();
|
|
180416
180402
|
function getSavedScriptOwnerAgentId(script) {
|
|
180417
180403
|
return script.scopeId ?? script.createdByAgentId;
|
|
180418
180404
|
}
|
|
@@ -182807,7 +182793,7 @@ function validatePage(definition, catalog, target) {
|
|
|
182807
182793
|
}
|
|
182808
182794
|
|
|
182809
182795
|
// src/apps/sync-run-as.ts
|
|
182810
|
-
|
|
182796
|
+
init_db2();
|
|
182811
182797
|
async function resolveSyncRunAs(script) {
|
|
182812
182798
|
return getSavedScriptOwnerAgentId(script) ?? (await getLeadAgent())?.id ?? "app-sync";
|
|
182813
182799
|
}
|
|
@@ -183529,29 +183515,29 @@ function applyAppDefinitionPatch(stored, patch) {
|
|
|
183529
183515
|
|
|
183530
183516
|
// src/apps/store.ts
|
|
183531
183517
|
init_key();
|
|
183532
|
-
|
|
183518
|
+
init_db2();
|
|
183533
183519
|
|
|
183534
183520
|
// src/apps/format-upgrades.ts
|
|
183535
183521
|
var CURRENT_APP_SCHEMA_VERSION = 1;
|
|
183536
|
-
function
|
|
183522
|
+
function isRecord3(value) {
|
|
183537
183523
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
183538
183524
|
}
|
|
183539
183525
|
function upgradeFrom0(raw) {
|
|
183540
183526
|
const upgraded = { ...raw };
|
|
183541
|
-
if (
|
|
183527
|
+
if (isRecord3(upgraded.page) && !Object.hasOwn(upgraded, "pages")) {
|
|
183542
183528
|
upgraded.pages = { main: upgraded.page };
|
|
183543
183529
|
upgraded.defaultPage = "main";
|
|
183544
183530
|
}
|
|
183545
183531
|
delete upgraded.page;
|
|
183546
|
-
if (
|
|
183532
|
+
if (isRecord3(upgraded.models)) {
|
|
183547
183533
|
upgraded.models = Object.fromEntries(Object.entries(upgraded.models).map(([modelName, model]) => {
|
|
183548
|
-
if (!
|
|
183534
|
+
if (!isRecord3(model))
|
|
183549
183535
|
return [modelName, model];
|
|
183550
183536
|
const upgradedModel = { ...model };
|
|
183551
183537
|
delete upgradedModel.sources;
|
|
183552
|
-
if (
|
|
183538
|
+
if (isRecord3(upgradedModel.columns)) {
|
|
183553
183539
|
upgradedModel.columns = Object.fromEntries(Object.entries(upgradedModel.columns).map(([columnName, column]) => {
|
|
183554
|
-
if (!
|
|
183540
|
+
if (!isRecord3(column))
|
|
183555
183541
|
return [columnName, column];
|
|
183556
183542
|
const upgradedColumn = { ...column };
|
|
183557
183543
|
delete upgradedColumn.source;
|
|
@@ -183566,13 +183552,13 @@ function upgradeFrom0(raw) {
|
|
|
183566
183552
|
}
|
|
183567
183553
|
var APP_FORMAT_UPGRADES = [{ from: 0, to: 1, upgrade: upgradeFrom0 }];
|
|
183568
183554
|
function schemaVersionOf(raw) {
|
|
183569
|
-
if (!
|
|
183555
|
+
if (!isRecord3(raw) || typeof raw.schemaVersion !== "number" || !Number.isInteger(raw.schemaVersion)) {
|
|
183570
183556
|
return 0;
|
|
183571
183557
|
}
|
|
183572
183558
|
return raw.schemaVersion;
|
|
183573
183559
|
}
|
|
183574
183560
|
function upgradeAppDefinition(raw) {
|
|
183575
|
-
if (!
|
|
183561
|
+
if (!isRecord3(raw))
|
|
183576
183562
|
return raw;
|
|
183577
183563
|
let upgraded = raw;
|
|
183578
183564
|
let version = schemaVersionOf(upgraded);
|
|
@@ -184000,6 +183986,26 @@ export interface KvEntry<T = unknown> {
|
|
|
184000
183986
|
expiresAt: number | null;
|
|
184001
183987
|
createdAt: number;
|
|
184002
183988
|
updatedAt: number;
|
|
183989
|
+
/** Present only on a path/offset/limit read. */
|
|
183990
|
+
view?: KvView;
|
|
183991
|
+
}
|
|
183992
|
+
|
|
183993
|
+
export interface KvViewArgs {
|
|
183994
|
+
/** Dot path into the JSON value, e.g. "outcome.data.rows" or "rows.3". */
|
|
183995
|
+
path?: string;
|
|
183996
|
+
/** First array item / object key / string char. Default 0. */
|
|
183997
|
+
offset?: number;
|
|
183998
|
+
/** Max items / keys / chars. Unbounded in scripts. */
|
|
183999
|
+
limit?: number;
|
|
184000
|
+
}
|
|
184001
|
+
|
|
184002
|
+
export interface KvView {
|
|
184003
|
+
path: string;
|
|
184004
|
+
type: "object" | "array" | "string" | "number" | "boolean" | "null";
|
|
184005
|
+
total?: number;
|
|
184006
|
+
offset?: number;
|
|
184007
|
+
returned?: number;
|
|
184008
|
+
nextOffset?: number | null;
|
|
184003
184009
|
}
|
|
184004
184010
|
|
|
184005
184011
|
export interface KvSdkSuccess<T, TStatus extends number = 200> {
|
|
@@ -184069,8 +184075,9 @@ export interface SwarmSdk {
|
|
|
184069
184075
|
task_defer(args: { taskId: string; delayMs?: number; runAt?: string; wakeOn?: { event: "task.completed" | "task.failed" | "settled"; taskId: string }; summary: string; note: string; checks?: string[] }): Promise<unknown>;
|
|
184070
184076
|
task_poll(args?: Record<string, unknown>): Promise<unknown>;
|
|
184071
184077
|
// --- kv ---
|
|
184072
|
-
|
|
184073
|
-
|
|
184078
|
+
/** path/offset/limit return a view: \`value\` is the slice at a dot path (JSON strings count as JSON), paged over items/keys/chars; \`view\` describes it. */
|
|
184079
|
+
kv_get<T = unknown>(args: { key: string; namespace?: string } & KvViewArgs): Promise<KvSdkResponse<KvEntry<T>>>;
|
|
184080
|
+
kv_getOrNull<T = unknown>(args: { key: string; namespace?: string } & KvViewArgs): Promise<KvEntry<T> | null>;
|
|
184074
184081
|
kv_set<T>(args: KvSetArgsBase & { value: T; valueType?: "json" }): Promise<KvSdkResponse<KvEntry<T>>>;
|
|
184075
184082
|
kv_set(args: KvSetArgsBase & { value: string; valueType: "string" }): Promise<KvSdkResponse<KvEntry<string>>>;
|
|
184076
184083
|
kv_set(args: KvSetArgsBase & { value: number | string; valueType: "integer" }): Promise<KvSdkResponse<KvEntry<number>>>;
|
|
@@ -184910,4 +184917,4 @@ void _scriptMain;
|
|
|
184910
184917
|
});
|
|
184911
184918
|
}
|
|
184912
184919
|
|
|
184913
|
-
export { require_dist, isInvalidClientError, assertUrlSafe, publicEndpointSsrfOptions, discoverProtectedResourceMetadata, discoverAuthorizationServerMetadata, normalizeTokenEndpointAuthMethod, resolveAdvertisedTokenEndpointAuthMethod, authMethodForStoredClient, selectDcrTokenEndpointAuthMethod, registerClient, buildAuthorizeUrl, exchangeCodeForTokens, refreshMcpToken, revokeMcpToken, computeExpiresAt, getMcpOAuthToken, findReusableMcpOAuthClient, invalidateMcpOAuthClient, upsertMcpOAuthToken, applyMcpOAuthRefresh, markMcpOAuthTokenStatus, deleteMcpOAuthToken, insertMcpOAuthPending, consumeMcpOAuthPending, gcMcpOAuthPending, setMcpServerAuthMethod, ensureMcpToken, callMcpServerTool, listVendoredOpenapiEntries, ConnectionAuthInputSchema, connectionAuthSummary, listRelationalCredentialBindings, getCredentialBindingById, findCredentialBindingByIdentity, upsertCredentialBinding, disableCredentialBinding, listScriptConnections, listScriptConnectionsAsync, getScriptConnectionById, ScriptConnectionConflictError, connectionAuthInputFromFlat, upsertScriptConnection, refreshScriptConnection, setScriptConnectionEnabled, getScriptApiConnectionDescriptors, getScriptMcpConnectionDescriptors, getScriptApiTypes, getScriptMcpTypes, oauthAppToProviderConfig, getOAuthProviderConfig, getOAuthBindingTokenStatus, buildScriptCredentialBindingsWithFailures, buildScriptCredentialBindings,
|
|
184920
|
+
export { require_dist, isInvalidClientError, assertUrlSafe, publicEndpointSsrfOptions, discoverProtectedResourceMetadata, discoverAuthorizationServerMetadata, normalizeTokenEndpointAuthMethod, resolveAdvertisedTokenEndpointAuthMethod, authMethodForStoredClient, selectDcrTokenEndpointAuthMethod, registerClient, buildAuthorizeUrl, exchangeCodeForTokens, refreshMcpToken, revokeMcpToken, computeExpiresAt, getMcpOAuthToken, findReusableMcpOAuthClient, invalidateMcpOAuthClient, upsertMcpOAuthToken, applyMcpOAuthRefresh, markMcpOAuthTokenStatus, deleteMcpOAuthToken, insertMcpOAuthPending, consumeMcpOAuthPending, gcMcpOAuthPending, setMcpServerAuthMethod, ensureMcpToken, callMcpServerTool, listVendoredOpenapiEntries, ConnectionAuthInputSchema, connectionAuthSummary, listRelationalCredentialBindings, getCredentialBindingById, findCredentialBindingByIdentity, upsertCredentialBinding, disableCredentialBinding, listScriptConnections, listScriptConnectionsAsync, getScriptConnectionById, ScriptConnectionConflictError, connectionAuthInputFromFlat, upsertScriptConnection, refreshScriptConnection, setScriptConnectionEnabled, getScriptApiConnectionDescriptors, getScriptMcpConnectionDescriptors, getScriptApiTypes, getScriptMcpTypes, oauthAppToProviderConfig, getOAuthProviderConfig, getOAuthBindingTokenStatus, buildScriptCredentialBindingsWithFailures, buildScriptCredentialBindings, buildSandboxedCommand, sandboxSpawnEnv, createCappedStreamState, snapshotCapped, readStreamCapped, writeBareImportShim, MIN_SCRIPT_WALL_CLOCK_MS, SCRIPT_LONG_TIMEOUT_HINT_MS, MAX_SCRIPT_WALL_CLOCK_MS, DEFAULT_SCRIPT_RESOURCES, require_typescript, checkImportAllowlist, validateScriptImports, runScript, BaseExecutor, postApprovalCancellationUpdates, createApprovalFollowUpTask, HumanInTheLoopExecutor, resolveWorkflowLlmConfig, SYSTEM_ONE_DECISION_NODE_TYPE, systemOneRetryViolations, systemOneUnresolvedError, SystemOneDecisionExecutor, getNextTargets, generateEdges, findEntryNodes, resolveValidationPort, getSuccessors, definitionNodeIds, validateDefinition, applyDefinitionPatch, extractScriptSignature, extractArgsJsonSchema, getSavedScriptOwnerAgentId, runSavedScriptAsAgent, resolveSyncRunAs, AppNameSchema, ColumnKindSchema, isIso8601Date, SYSTEM_COLUMN_KINDS, SORTABLE_SYSTEM_DATE_COLUMNS, AppElementsSchema, AppDefinitionSchema, collectScriptReferences, parseAppDefinition, applyAppDefinitionPatch, upgradeAppDefinition, decodeAppDefinition, appDefinitionNeedsRepair, createApp, getApp, listApps, listAppRecords, updateApp, deleteApp, getScriptAppTypes, SCRIPT_SDK_TYPES, scriptSdkTypesWithGeneratedApis, SCRIPT_STDLIB_MODULE_TYPES, scriptStdlibTypesWithGeneratedApis, typecheckWithAmbient, typecheckScript };
|