@qvac/core 1.0.0-rc.1 → 1.0.0-rc.10
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/CHANGELOG.md +1203 -1
- package/README.md +56 -45
- package/dist-lib/index.d.ts +3 -2
- package/dist-lib/index.js +1 -1
- package/dist-lib/lib/api/agent-folders.d.ts +22 -0
- package/dist-lib/lib/api/agent-folders.js +115 -0
- package/dist-lib/lib/api/agents.d.ts +20 -2
- package/dist-lib/lib/api/agents.js +128 -24
- package/dist-lib/lib/api/app-config.d.ts +7 -1
- package/dist-lib/lib/api/app-config.js +37 -6
- package/dist-lib/lib/api/approval-rules.d.ts +1 -1
- package/dist-lib/lib/api/approval-rules.js +12 -5
- package/dist-lib/lib/api/attachments.d.ts +1 -1
- package/dist-lib/lib/api/attachments.js +14 -2
- package/dist-lib/lib/api/chat-move.d.ts +4 -0
- package/dist-lib/lib/api/chat-move.js +7 -0
- package/dist-lib/lib/api/chat.d.ts +12 -2
- package/dist-lib/lib/api/chat.js +100 -9
- package/dist-lib/lib/api/chunk-delta.d.ts +12 -0
- package/dist-lib/lib/api/chunk-delta.js +115 -0
- package/dist-lib/lib/api/chunks.d.ts +19 -2
- package/dist-lib/lib/api/chunks.js +73 -13
- package/dist-lib/lib/api/config.d.ts +11 -3
- package/dist-lib/lib/api/config.js +51 -5
- package/dist-lib/lib/api/current-mesh.d.ts +13 -5
- package/dist-lib/lib/api/current-mesh.js +15 -11
- package/dist-lib/lib/api/custom-models.d.ts +7 -1
- package/dist-lib/lib/api/custom-models.js +12 -12
- package/dist-lib/lib/api/device-routes.d.ts +14 -0
- package/dist-lib/lib/api/device-routes.js +144 -0
- package/dist-lib/lib/api/devices.d.ts +3 -2
- package/dist-lib/lib/api/devices.js +28 -28
- package/dist-lib/lib/api/diagnostics.d.ts +2 -1
- package/dist-lib/lib/api/diagnostics.js +2 -2
- package/dist-lib/lib/api/execution.d.ts +16 -1
- package/dist-lib/lib/api/execution.js +72 -16
- package/dist-lib/lib/api/files.d.ts +1 -1
- package/dist-lib/lib/api/files.js +65 -8
- package/dist-lib/lib/api/host-run-log.d.ts +2 -41
- package/dist-lib/lib/api/host-run-log.js +35 -83
- package/dist-lib/lib/api/index.d.ts +39 -7
- package/dist-lib/lib/api/index.js +116 -36
- package/dist-lib/lib/api/instrument.d.ts +2 -2
- package/dist-lib/lib/api/instrument.js +24 -48
- package/dist-lib/lib/api/knowledge.d.ts +4 -1
- package/dist-lib/lib/api/knowledge.js +25 -7
- package/dist-lib/lib/api/local-files.d.ts +5 -1
- package/dist-lib/lib/api/local-files.js +9 -5
- package/dist-lib/lib/api/logs.js +3 -3
- package/dist-lib/lib/api/members.d.ts +10 -1
- package/dist-lib/lib/api/members.js +69 -44
- package/dist-lib/lib/api/mesh.d.ts +15 -6
- package/dist-lib/lib/api/mesh.js +13 -9
- package/dist-lib/lib/api/model-download.d.ts +2 -1
- package/dist-lib/lib/api/model-download.js +2 -2
- package/dist-lib/lib/api/network.d.ts +10 -2
- package/dist-lib/lib/api/network.js +8 -2
- package/dist-lib/lib/api/notifications.d.ts +3 -1
- package/dist-lib/lib/api/notifications.js +14 -9
- package/dist-lib/lib/api/projects.d.ts +20 -0
- package/dist-lib/lib/api/projects.js +172 -0
- package/dist-lib/lib/api/rag-plugin.d.ts +17 -0
- package/dist-lib/lib/api/rag-plugin.js +44 -0
- package/dist-lib/lib/api/rag.d.ts +0 -1
- package/dist-lib/lib/api/rag.js +106 -33
- package/dist-lib/lib/api/served.d.ts +17 -0
- package/dist-lib/lib/api/served.js +65 -0
- package/dist-lib/lib/api/sync.d.ts +2 -1
- package/dist-lib/lib/api/sync.js +13 -3
- package/dist-lib/lib/api/tool-activity.d.ts +2 -1
- package/dist-lib/lib/api/tool-activity.js +4 -3
- package/dist-lib/lib/api/tool-configs.d.ts +2 -1
- package/dist-lib/lib/api/tool-configs.js +6 -9
- package/dist-lib/lib/api/upload-frames.d.ts +0 -1
- package/dist-lib/lib/api/upload-frames.js +0 -1
- package/dist-lib/lib/api/watchable.d.ts +3 -2
- package/dist-lib/lib/api/watchable.js +2 -3
- package/dist-lib/lib/api/workspace.d.ts +12 -0
- package/dist-lib/lib/api/workspace.js +61 -0
- package/dist-lib/lib/assistant/fake-models.d.ts +20 -0
- package/dist-lib/lib/assistant/fake-models.js +112 -0
- package/dist-lib/lib/assistant/harness.d.ts +48 -31
- package/dist-lib/lib/assistant/harness.js +51 -10
- package/dist-lib/lib/assistant/history.d.ts +37 -17
- package/dist-lib/lib/assistant/history.js +212 -87
- package/dist-lib/lib/assistant/host-run-log.d.ts +6 -1
- package/dist-lib/lib/assistant/host-run-log.js +24 -36
- package/dist-lib/lib/assistant/media-round.d.ts +61 -0
- package/dist-lib/lib/assistant/media-round.js +111 -0
- package/dist-lib/lib/assistant/message.d.ts +28 -1
- package/dist-lib/lib/assistant/message.js +65 -2
- package/dist-lib/lib/assistant/model-round.d.ts +118 -0
- package/dist-lib/lib/assistant/model-round.js +706 -0
- package/dist-lib/lib/assistant/pdf-budget.d.ts +11 -0
- package/dist-lib/lib/assistant/pdf-budget.js +12 -0
- package/dist-lib/lib/assistant/pdf-pages.d.ts +25 -0
- package/dist-lib/lib/assistant/pdf-pages.js +75 -0
- package/dist-lib/lib/assistant/round-host.d.ts +65 -0
- package/dist-lib/lib/assistant/round-host.js +332 -0
- package/dist-lib/lib/assistant/skill-encode.d.ts +2 -1
- package/dist-lib/lib/assistant/skill-encode.js +2 -1
- package/dist-lib/lib/assistant/upload.d.ts +12 -0
- package/dist-lib/lib/assistant/upload.js +36 -0
- package/dist-lib/lib/assistant/video-budget.d.ts +13 -0
- package/dist-lib/lib/assistant/video-budget.js +29 -0
- package/dist-lib/lib/assistant-client.d.ts +5 -1
- package/dist-lib/lib/assistant-client.js +54 -14
- package/dist-lib/lib/assistant-tree.d.ts +14 -3
- package/dist-lib/lib/assistant-tree.js +113 -21
- package/dist-lib/lib/assistant.d.ts +115 -25
- package/dist-lib/lib/assistant.js +2409 -1245
- package/dist-lib/lib/audio-format.js +1 -1
- package/dist-lib/lib/chat-suggestion.d.ts +3 -0
- package/dist-lib/lib/chat-suggestion.js +47 -0
- package/dist-lib/lib/client.d.ts +3 -2
- package/dist-lib/lib/client.js +18 -3
- package/dist-lib/lib/compaction.d.ts +3 -1
- package/dist-lib/lib/compaction.js +18 -4
- package/dist-lib/lib/constants.d.ts +10 -0
- package/dist-lib/lib/constants.js +10 -0
- package/dist-lib/lib/core/agent-copies.d.ts +9 -0
- package/dist-lib/lib/core/agent-copies.js +47 -0
- package/dist-lib/lib/core/agent-hosting.d.ts +25 -0
- package/dist-lib/lib/core/agent-hosting.js +76 -0
- package/dist-lib/lib/core/agent.d.ts +9 -1
- package/dist-lib/lib/core/agent.js +58 -63
- package/dist-lib/lib/core/approval-rules.d.ts +5 -1
- package/dist-lib/lib/core/approval-rules.js +17 -9
- package/dist-lib/lib/core/archived-mesh.d.ts +14 -7
- package/dist-lib/lib/core/archived-mesh.js +75 -59
- package/dist-lib/lib/core/async-iterable.js +1 -1
- package/dist-lib/lib/core/blind-peers.d.ts +1 -0
- package/dist-lib/lib/core/blind-peers.js +1 -0
- package/dist-lib/lib/core/chat-activity.d.ts +1 -1
- package/dist-lib/lib/core/chat-activity.js +45 -34
- package/dist-lib/lib/core/chat-copy.d.ts +42 -0
- package/dist-lib/lib/core/chat-copy.js +404 -0
- package/dist-lib/lib/core/chat-fork.d.ts +16 -0
- package/dist-lib/lib/core/chat-fork.js +246 -0
- package/dist-lib/lib/core/chat-group.js +10 -22
- package/dist-lib/lib/core/chat-move.d.ts +77 -0
- package/dist-lib/lib/core/chat-move.js +601 -0
- package/dist-lib/lib/core/chat-order.d.ts +2 -1
- package/dist-lib/lib/core/chat-order.js +28 -19
- package/dist-lib/lib/core/chat-read.d.ts +4 -0
- package/dist-lib/lib/core/chat-read.js +49 -0
- package/dist-lib/lib/core/chat-search.js +14 -12
- package/dist-lib/lib/core/chat.d.ts +32 -4
- package/dist-lib/lib/core/chat.js +135 -61
- package/dist-lib/lib/core/chunk.d.ts +35 -7
- package/dist-lib/lib/core/chunk.js +271 -72
- package/dist-lib/lib/core/collections.d.ts +41 -1
- package/dist-lib/lib/core/collections.js +41 -1
- package/dist-lib/lib/core/config-value.d.ts +7 -0
- package/dist-lib/lib/core/config-value.js +15 -0
- package/dist-lib/lib/core/contract/activity.d.ts +7 -2
- package/dist-lib/lib/core/contract/activity.js +71 -23
- package/dist-lib/lib/core/contract/agent-join.d.ts +10 -0
- package/dist-lib/lib/core/contract/agent-join.js +104 -0
- package/dist-lib/lib/core/contract/agents.d.ts +5 -0
- package/dist-lib/lib/core/contract/agents.js +142 -3
- package/dist-lib/lib/core/contract/chat.d.ts +4 -0
- package/dist-lib/lib/core/contract/chat.js +53 -3
- package/dist-lib/lib/core/contract/chunks.d.ts +7 -0
- package/dist-lib/lib/core/contract/chunks.js +125 -38
- package/dist-lib/lib/core/contract/devices.js +6 -4
- package/dist-lib/lib/core/contract/index.d.ts +2 -3
- package/dist-lib/lib/core/contract/index.js +38 -11
- package/dist-lib/lib/core/contract/indexing.d.ts +1 -0
- package/dist-lib/lib/core/contract/indexing.js +51 -7
- package/dist-lib/lib/core/contract/invites.d.ts +3 -14
- package/dist-lib/lib/core/contract/invites.js +26 -36
- package/dist-lib/lib/core/contract/joined-meshes.js +4 -1
- package/dist-lib/lib/core/contract/knowledge.d.ts +1 -0
- package/dist-lib/lib/core/contract/knowledge.js +57 -6
- package/dist-lib/lib/core/contract/members.d.ts +3 -1
- package/dist-lib/lib/core/contract/members.js +48 -12
- package/dist-lib/lib/core/contract/mesh-kind.d.ts +3 -3
- package/dist-lib/lib/core/contract/mesh-kind.js +20 -16
- package/dist-lib/lib/core/contract/mesh-name.d.ts +3 -0
- package/dist-lib/lib/core/contract/mesh-name.js +31 -0
- package/dist-lib/lib/core/contract/mesh-rules.d.ts +8 -0
- package/dist-lib/lib/core/contract/mesh-rules.js +35 -0
- package/dist-lib/lib/core/contract/mesh-seeds.d.ts +2 -0
- package/dist-lib/lib/core/contract/mesh-seeds.js +26 -0
- package/dist-lib/lib/core/contract/model-requests.d.ts +26 -0
- package/dist-lib/lib/core/contract/model-requests.js +280 -0
- package/dist-lib/lib/core/contract/oldest-version.d.ts +9 -0
- package/dist-lib/lib/core/contract/oldest-version.js +20 -0
- package/dist-lib/lib/core/contract/open-join.d.ts +2 -0
- package/dist-lib/lib/core/contract/open-join.js +77 -0
- package/dist-lib/lib/core/contract/project-device-keys.d.ts +9 -0
- package/dist-lib/lib/core/contract/project-device-keys.js +38 -0
- package/dist-lib/lib/core/contract/project-host-keys.d.ts +9 -0
- package/dist-lib/lib/core/contract/project-host-keys.js +52 -0
- package/dist-lib/lib/core/contract/project-order.d.ts +2 -0
- package/dist-lib/lib/core/contract/project-order.js +25 -0
- package/dist-lib/lib/core/contract/projects.d.ts +23 -0
- package/dist-lib/lib/core/contract/projects.js +339 -0
- package/dist-lib/lib/core/contract/public-mesh.d.ts +3 -0
- package/dist-lib/lib/core/contract/public-mesh.js +31 -0
- package/dist-lib/lib/core/contract/public-seeds.d.ts +9 -0
- package/dist-lib/lib/core/contract/public-seeds.js +43 -0
- package/dist-lib/lib/core/contract/roles.d.ts +10 -0
- package/dist-lib/lib/core/contract/roles.js +123 -0
- package/dist-lib/lib/core/contract/run-requests.d.ts +11 -0
- package/dist-lib/lib/core/contract/run-requests.js +114 -0
- package/dist-lib/lib/core/contract/seed-defaults.d.ts +3 -1
- package/dist-lib/lib/core/contract/seed-defaults.js +17 -4
- package/dist-lib/lib/core/contract/shipped-rows.d.ts +2 -0
- package/dist-lib/lib/core/contract/shipped-rows.js +22 -0
- package/dist-lib/lib/core/contract/skill-secrets.d.ts +3 -0
- package/dist-lib/lib/core/contract/skill-secrets.js +32 -0
- package/dist-lib/lib/core/contract/tool-activity.js +12 -1
- package/dist-lib/lib/core/contract/tool-configs.js +2 -1
- package/dist-lib/lib/core/contract/types.d.ts +2 -2
- package/dist-lib/lib/core/contract/workspace.d.ts +31 -0
- package/dist-lib/lib/core/contract/workspace.js +311 -0
- package/dist-lib/lib/core/contract/writers.js +100 -16
- package/dist-lib/lib/core/deleted-agent-runs.d.ts +8 -0
- package/dist-lib/lib/core/deleted-agent-runs.js +57 -0
- package/dist-lib/lib/core/departures.d.ts +18 -5
- package/dist-lib/lib/core/departures.js +82 -6
- package/dist-lib/lib/core/device-control.d.ts +21 -0
- package/dist-lib/lib/core/device-control.js +91 -0
- package/dist-lib/lib/core/device-seal.d.ts +4 -0
- package/dist-lib/lib/core/device-seal.js +22 -0
- package/dist-lib/lib/core/devices.d.ts +2 -1
- package/dist-lib/lib/core/devices.js +6 -11
- package/dist-lib/lib/core/document-attachment.d.ts +10 -0
- package/dist-lib/lib/core/document-attachment.js +14 -0
- package/dist-lib/lib/core/files/attachments.d.ts +2 -0
- package/dist-lib/lib/core/files/attachments.js +23 -7
- package/dist-lib/lib/core/files/index.d.ts +28 -15
- package/dist-lib/lib/core/files/index.js +222 -43
- package/dist-lib/lib/core/files/knowledge.d.ts +10 -1
- package/dist-lib/lib/core/files/knowledge.js +77 -5
- package/dist-lib/lib/core/files/preview/index.js +6 -2
- package/dist-lib/lib/core/files/processing/claims.d.ts +7 -0
- package/dist-lib/lib/core/files/processing/claims.js +33 -7
- package/dist-lib/lib/core/files/processing/document.d.ts +8 -0
- package/dist-lib/lib/core/files/processing/document.js +26 -2
- package/dist-lib/lib/core/files/processing/index.d.ts +12 -3
- package/dist-lib/lib/core/files/processing/index.js +122 -73
- package/dist-lib/lib/core/files/processing/protocol.d.ts +7 -1
- package/dist-lib/lib/core/files/processing/protocol.js +27 -37
- package/dist-lib/lib/core/files/processing/source.d.ts +4 -0
- package/dist-lib/lib/core/files/processing/source.js +12 -4
- package/dist-lib/lib/core/files/processing/state.d.ts +5 -1
- package/dist-lib/lib/core/files/processing/state.js +9 -1
- package/dist-lib/lib/core/files/rag/build.d.ts +15 -2
- package/dist-lib/lib/core/files/rag/build.js +119 -21
- package/dist-lib/lib/core/files/rag/failure.d.ts +20 -0
- package/dist-lib/lib/core/files/rag/failure.js +58 -0
- package/dist-lib/lib/core/files/rag/index.d.ts +21 -5
- package/dist-lib/lib/core/files/rag/index.js +38 -9
- package/dist-lib/lib/core/files/rag/joined-index.d.ts +6 -0
- package/dist-lib/lib/core/files/rag/joined-index.js +35 -0
- package/dist-lib/lib/core/files/rag/limits.d.ts +1 -0
- package/dist-lib/lib/core/files/rag/limits.js +1 -0
- package/dist-lib/lib/core/files/rag/load.d.ts +3 -3
- package/dist-lib/lib/core/files/rag/load.js +6 -3
- package/dist-lib/lib/core/files/rag/plugin-index.d.ts +32 -0
- package/dist-lib/lib/core/files/rag/plugin-index.js +120 -0
- package/dist-lib/lib/core/files/rag/policy.d.ts +10 -1
- package/dist-lib/lib/core/files/rag/policy.js +23 -2
- package/dist-lib/lib/core/files/rag/produce.d.ts +3 -4
- package/dist-lib/lib/core/files/rag/produce.js +31 -18
- package/dist-lib/lib/core/files/rag/retrieval/full-text.d.ts +2 -0
- package/dist-lib/lib/core/files/rag/retrieval/full-text.js +8 -2
- package/dist-lib/lib/core/files/rag/similarity.d.ts +2 -2
- package/dist-lib/lib/core/files/rag/similarity.js +2 -3
- package/dist-lib/lib/core/files/records/chunks.js +22 -1
- package/dist-lib/lib/core/files/records/index.d.ts +1 -1
- package/dist-lib/lib/core/files/records/index.js +1 -1
- package/dist-lib/lib/core/files/records/knowledge.d.ts +12 -4
- package/dist-lib/lib/core/files/records/knowledge.js +34 -30
- package/dist-lib/lib/core/files/records/purge.js +13 -8
- package/dist-lib/lib/core/files/records/reclaim.js +21 -55
- package/dist-lib/lib/core/files/records/routing.d.ts +1 -1
- package/dist-lib/lib/core/files/records/routing.js +6 -2
- package/dist-lib/lib/core/files/records/source.js +3 -5
- package/dist-lib/lib/core/files/records/sweep.d.ts +3 -0
- package/dist-lib/lib/core/files/records/sweep.js +9 -3
- package/dist-lib/lib/core/files/store/blob.d.ts +2 -0
- package/dist-lib/lib/core/files/store/blob.js +2 -2
- package/dist-lib/lib/core/files/store/index.d.ts +3 -1
- package/dist-lib/lib/core/files/store/index.js +4 -1
- package/dist-lib/lib/core/files/store/reference.d.ts +3 -0
- package/dist-lib/lib/core/files/store/reference.js +12 -2
- package/dist-lib/lib/core/files/store/sweep.js +3 -1
- package/dist-lib/lib/core/files/upload.d.ts +5 -1
- package/dist-lib/lib/core/files/upload.js +117 -51
- package/dist-lib/lib/core/first-event.d.ts +6 -0
- package/dist-lib/lib/core/first-event.js +13 -0
- package/dist-lib/lib/core/fs-drives.d.ts +6 -3
- package/dist-lib/lib/core/fs-drives.js +35 -35
- package/dist-lib/lib/core/helpers/index.d.ts +1 -1
- package/dist-lib/lib/core/helpers/index.js +2 -2
- package/dist-lib/lib/core/id.d.ts +1 -0
- package/dist-lib/lib/core/id.js +3 -0
- package/dist-lib/lib/core/identity.d.ts +3 -1
- package/dist-lib/lib/core/identity.js +25 -4
- package/dist-lib/lib/core/invite.d.ts +6 -2
- package/dist-lib/lib/core/invite.js +22 -8
- package/dist-lib/lib/core/local/files.d.ts +2 -1
- package/dist-lib/lib/core/local/files.js +5 -7
- package/dist-lib/lib/core/local/index.d.ts +93 -8
- package/dist-lib/lib/core/local/index.js +327 -28
- package/dist-lib/lib/core/local/run-logs.d.ts +38 -0
- package/dist-lib/lib/core/local/run-logs.js +132 -0
- package/dist-lib/lib/core/member-key.d.ts +7 -0
- package/dist-lib/lib/core/member-key.js +24 -0
- package/dist-lib/lib/core/membership.d.ts +3 -14
- package/dist-lib/lib/core/membership.js +3 -96
- package/dist-lib/lib/core/mesh.d.ts +132 -29
- package/dist-lib/lib/core/mesh.js +775 -215
- package/dist-lib/lib/core/migrations/agent-catalog.js +2 -8
- package/dist-lib/lib/core/migrations/agent-tools-scope.d.ts +2 -0
- package/dist-lib/lib/core/migrations/agent-tools-scope.js +18 -0
- package/dist-lib/lib/core/migrations/chat-chunks.d.ts +4 -0
- package/dist-lib/lib/core/migrations/chat-chunks.js +47 -0
- package/dist-lib/lib/core/migrations/file-index.d.ts +1 -1
- package/dist-lib/lib/core/migrations/file-index.js +8 -6
- package/dist-lib/lib/core/migrations/index.d.ts +2 -1
- package/dist-lib/lib/core/migrations/index.js +69 -8
- package/dist-lib/lib/core/migrations/writer-links.d.ts +3 -0
- package/dist-lib/lib/core/migrations/writer-links.js +30 -0
- package/dist-lib/lib/core/model-requests.d.ts +13 -0
- package/dist-lib/lib/core/model-requests.js +65 -0
- package/dist-lib/lib/core/next-frame.js +2 -1
- package/dist-lib/lib/core/notification.js +100 -25
- package/dist-lib/lib/core/pdf/figure.d.ts +22 -0
- package/dist-lib/lib/core/pdf/figure.js +64 -0
- package/dist-lib/lib/core/pdf/rasterize.d.ts +12 -3
- package/dist-lib/lib/core/pdf/rasterize.js +77 -28
- package/dist-lib/lib/core/peer-duplex.d.ts +34 -0
- package/dist-lib/lib/core/{harness-loan.js → peer-duplex.js} +104 -45
- package/dist-lib/lib/core/project-keys.d.ts +16 -0
- package/dist-lib/lib/core/project-keys.js +65 -0
- package/dist-lib/lib/core/prompt-history.js +4 -4
- package/dist-lib/lib/core/protocol-pairing.d.ts +11 -0
- package/dist-lib/lib/core/protocol-pairing.js +22 -0
- package/dist-lib/lib/core/public-mesh.d.ts +25 -0
- package/dist-lib/lib/core/public-mesh.js +81 -0
- package/dist-lib/lib/core/purge.d.ts +3 -0
- package/dist-lib/lib/core/purge.js +7 -0
- package/dist-lib/lib/core/run-driver.d.ts +17 -0
- package/dist-lib/lib/core/run-driver.js +20 -0
- package/dist-lib/lib/core/run-requests.d.ts +14 -0
- package/dist-lib/lib/core/run-requests.js +78 -0
- package/dist-lib/lib/core/send.d.ts +2 -0
- package/dist-lib/lib/core/send.js +17 -4
- package/dist-lib/lib/core/senders.d.ts +19 -0
- package/dist-lib/lib/core/senders.js +45 -0
- package/dist-lib/lib/core/shared-agents.d.ts +40 -0
- package/dist-lib/lib/core/shared-agents.js +283 -0
- package/dist-lib/lib/core/skill-availability.d.ts +33 -0
- package/dist-lib/lib/core/skill-availability.js +67 -0
- package/dist-lib/lib/core/skill-secrets.d.ts +13 -18
- package/dist-lib/lib/core/skill-secrets.js +93 -72
- package/dist-lib/lib/core/sync/background.d.ts +34 -0
- package/dist-lib/lib/core/sync/background.js +86 -0
- package/dist-lib/lib/core/sync/changed.d.ts +20 -0
- package/dist-lib/lib/core/sync/changed.js +7 -0
- package/dist-lib/lib/core/sync/devices.js +6 -3
- package/dist-lib/lib/core/sync/files.d.ts +1 -0
- package/dist-lib/lib/core/sync/files.js +50 -72
- package/dist-lib/lib/core/sync/index.d.ts +1 -1
- package/dist-lib/lib/core/sync/index.js +193 -81
- package/dist-lib/lib/core/sync/view-updates.d.ts +39 -0
- package/dist-lib/lib/core/sync/view-updates.js +124 -0
- package/dist-lib/lib/core/sync-status.js +99 -43
- package/dist-lib/lib/core/system-info.d.ts +2 -2
- package/dist-lib/lib/core/system-info.js +10 -11
- package/dist-lib/lib/core/tool-activity.js +6 -12
- package/dist-lib/lib/core/tool-configs.d.ts +5 -3
- package/dist-lib/lib/core/tool-configs.js +27 -39
- package/dist-lib/lib/core/transcript-visibility.d.ts +5 -5
- package/dist-lib/lib/core/transcript-visibility.js +27 -31
- package/dist-lib/lib/core/upgrade-agents.d.ts +11 -0
- package/dist-lib/lib/core/upgrade-agents.js +78 -0
- package/dist-lib/lib/core/upgrade-summary.d.ts +19 -0
- package/dist-lib/lib/core/upgrade-summary.js +67 -0
- package/dist-lib/lib/core/vault-managed-skills.d.ts +18 -0
- package/dist-lib/lib/core/vault-managed-skills.js +105 -0
- package/dist-lib/lib/core/video/attachment.d.ts +1 -0
- package/dist-lib/lib/core/video/attachment.js +7 -0
- package/dist-lib/lib/core/video/digest.d.ts +16 -0
- package/dist-lib/lib/core/video/digest.js +57 -0
- package/dist-lib/lib/core/video/frames.d.ts +32 -0
- package/dist-lib/lib/core/video/frames.js +224 -0
- package/dist-lib/lib/core/view-read.d.ts +4 -0
- package/dist-lib/lib/core/view-read.js +23 -0
- package/dist-lib/lib/core/workspace-upgrade.d.ts +23 -0
- package/dist-lib/lib/core/workspace-upgrade.js +51 -0
- package/dist-lib/lib/core.d.ts +345 -88
- package/dist-lib/lib/core.js +4275 -1513
- package/dist-lib/lib/credential-pusher.d.ts +17 -7
- package/dist-lib/lib/credential-pusher.js +111 -62
- package/dist-lib/lib/custom-model-pusher.d.ts +2 -4
- package/dist-lib/lib/custom-model-task.d.ts +2 -1
- package/dist-lib/lib/custom-model-task.js +2 -2
- package/dist-lib/lib/device-tree.d.ts +18 -0
- package/dist-lib/lib/device-tree.js +32 -0
- package/dist-lib/lib/diagnostics.d.ts +7 -0
- package/dist-lib/lib/diagnostics.js +22 -0
- package/dist-lib/lib/doctor/checks.d.ts +15 -0
- package/dist-lib/lib/doctor/checks.js +272 -0
- package/dist-lib/lib/doctor/redact.d.ts +4 -0
- package/dist-lib/lib/doctor/redact.js +31 -0
- package/dist-lib/lib/doctor/render.d.ts +8 -0
- package/dist-lib/lib/doctor/render.js +83 -0
- package/dist-lib/lib/doctor/tree.d.ts +5 -0
- package/dist-lib/lib/doctor/tree.js +167 -0
- package/dist-lib/lib/downloads-allowed-pusher.d.ts +8 -0
- package/dist-lib/lib/downloads-allowed-pusher.js +37 -0
- package/dist-lib/lib/errors.d.ts +814 -0
- package/dist-lib/lib/errors.js +748 -0
- package/dist-lib/lib/fs-drive-bridge.d.ts +8 -1
- package/dist-lib/lib/fs-drive-bridge.js +312 -31
- package/dist-lib/lib/guards.d.ts +1 -0
- package/dist-lib/lib/guards.js +4 -0
- package/dist-lib/lib/inference-calls.d.ts +1 -2
- package/dist-lib/lib/inference-calls.js +2 -10
- package/dist-lib/lib/integrations/setup-routes.js +7 -5
- package/dist-lib/lib/knowledge-search.d.ts +1 -1
- package/dist-lib/lib/knowledge-search.js +5 -51
- package/dist-lib/lib/kv-cache-ledger.d.ts +22 -0
- package/dist-lib/lib/kv-cache-ledger.js +72 -0
- package/dist-lib/lib/kv-cache-reclaim.d.ts +2 -1
- package/dist-lib/lib/kv-cache-reclaim.js +30 -0
- package/dist-lib/lib/kv-cache-retention.d.ts +36 -0
- package/dist-lib/lib/kv-cache-retention.js +101 -0
- package/dist-lib/lib/latest-frame.d.ts +10 -0
- package/dist-lib/lib/latest-frame.js +48 -0
- package/dist-lib/lib/llm-model-names.d.ts +1 -1
- package/dist-lib/lib/llm-model-names.js +1 -1
- package/dist-lib/lib/log.d.ts +7 -6
- package/dist-lib/lib/log.js +14 -7
- package/dist-lib/lib/logger-type.d.ts +2 -5
- package/dist-lib/lib/mesh-scoped-engine.js +47 -2
- package/dist-lib/lib/model-context.js +1 -2
- package/dist-lib/lib/model-download-status.d.ts +3 -3
- package/dist-lib/lib/model-download.d.ts +22 -13
- package/dist-lib/lib/model-download.js +106 -37
- package/dist-lib/lib/model-idle-pusher.d.ts +2 -4
- package/dist-lib/lib/model-memory-cap.d.ts +30 -0
- package/dist-lib/lib/model-memory-cap.js +78 -0
- package/dist-lib/lib/models-watch.d.ts +1 -1
- package/dist-lib/lib/models-watch.js +4 -4
- package/dist-lib/lib/oauth/browser-connect.js +3 -2
- package/dist-lib/lib/oauth/flow-core.js +5 -3
- package/dist-lib/lib/oauth/flow.js +1 -1
- package/dist-lib/lib/oauth/loopback.d.ts +1 -0
- package/dist-lib/lib/oauth/loopback.js +57 -12
- package/dist-lib/lib/oauth/providers.js +4 -2
- package/dist-lib/lib/oauth/redirect-types.d.ts +1 -0
- package/dist-lib/lib/oauth/register.js +35 -19
- package/dist-lib/lib/oauth/request.d.ts +10 -0
- package/dist-lib/lib/oauth/request.js +22 -0
- package/dist-lib/lib/oauth/resolve.js +42 -13
- package/dist-lib/lib/oauth/token-exchange-core.js +40 -31
- package/dist-lib/lib/oauth/types.d.ts +3 -0
- package/dist-lib/lib/oauth.d.ts +2 -1
- package/dist-lib/lib/oauth.js +1 -0
- package/dist-lib/lib/persistent-dir.d.ts +1 -0
- package/dist-lib/lib/persistent-dir.js +9 -0
- package/dist-lib/lib/probe-rounds.d.ts +8 -0
- package/dist-lib/lib/probe-rounds.js +10 -0
- package/dist-lib/lib/reconnecting-watch.js +19 -11
- package/dist-lib/lib/run-input.d.ts +14 -0
- package/dist-lib/lib/run-input.js +33 -0
- package/dist-lib/lib/run-notices.d.ts +5 -0
- package/dist-lib/lib/run-notices.js +13 -2
- package/dist-lib/lib/run-replay.d.ts +45 -0
- package/dist-lib/lib/run-replay.js +169 -0
- package/dist-lib/lib/run-transcript.d.ts +13 -12
- package/dist-lib/lib/run-transcript.js +20 -19
- package/dist-lib/lib/suspend-lifecycle.js +15 -5
- package/dist-lib/lib/task.js +6 -4
- package/dist-lib/lib/test-env.d.ts +1 -0
- package/dist-lib/lib/test-env.js +4 -0
- package/dist-lib/schema/build.js +66 -55
- package/dist-lib/schema/config.d.ts +1 -1
- package/dist-lib/schema/config.js +1 -1
- package/dist-lib/schema/content.d.ts +5 -1
- package/dist-lib/schema/content.js +60 -12
- package/dist-lib/schema/engine.d.ts +1 -0
- package/dist-lib/schema/engine.js +941 -152
- package/dist-lib/schema/field-order.js +8 -1
- package/dist-lib/schema/indexes.d.ts +10 -0
- package/dist-lib/schema/indexes.js +53 -3
- package/dist-lib/schema/local.js +83 -5
- package/dist-lib/schema/qvac.d.ts +4 -1
- package/dist-lib/schema/qvac.js +558 -16
- package/dist-lib/spec/bind.js +261 -48
- package/dist-lib/spec/calls.js +56 -5
- package/dist-lib/spec/capabilities.d.ts +129 -20
- package/dist-lib/spec/config/hyperconf/index.js +1 -1
- package/dist-lib/spec/hrpc/hrpc.json +870 -207
- package/dist-lib/spec/hrpc/index.js +969 -347
- package/dist-lib/spec/hrpc/messages.js +7590 -4896
- package/dist-lib/spec/hyperschema/index.js +7590 -4896
- package/dist-lib/spec/hyperschema/schema.json +5316 -3224
- package/dist-lib/spec/hyperschema/types.d.ts +576 -62
- package/dist-lib/spec/local/hyperdb/db.json +95 -1
- package/dist-lib/spec/local/hyperdb/index.js +459 -2
- package/dist-lib/spec/local/hyperdb/messages.js +1588 -488
- package/dist-lib/spec/local/hyperschema/index.js +584 -16
- package/dist-lib/spec/local/hyperschema/schema.json +369 -1
- package/dist-lib/spec/local/hyperschema/types.d.ts +88 -2
- package/dist-lib/spec/mesh/hyperdb/db.json +711 -9
- package/dist-lib/spec/mesh/hyperdb/index.js +2769 -7
- package/dist-lib/spec/mesh/hyperdb/messages.js +7140 -1298
- package/dist-lib/spec/mesh/hyperdispatch/dispatch.json +205 -1
- package/dist-lib/spec/mesh/hyperdispatch/index.js +579 -1
- package/dist-lib/spec/mesh/hyperdispatch/messages.js +4017 -267
- package/dist-lib/spec/mesh/hyperschema/index.js +4017 -267
- package/dist-lib/spec/mesh/hyperschema/schema.json +2193 -19
- package/dist-lib/spec/mesh/hyperschema/types.d.ts +550 -6
- package/package.json +136 -90
- package/tui/README.md +119 -20
- package/tui/app.mjs +2000 -621
- package/tui/boot.mjs +74 -9
- package/tui/cli.mjs +93 -0
- package/tui/index.mjs +2 -51
- package/tui/lib/connect-sheet.mjs +350 -0
- package/tui/lib/device-target.mjs +64 -0
- package/tui/lib/folders-command.mjs +84 -0
- package/tui/lib/fork-command.mjs +43 -0
- package/tui/lib/knowledge-import.mjs +3 -21
- package/tui/lib/local-path.mjs +21 -0
- package/tui/lib/move-command.mjs +17 -0
- package/tui/lib/render.mjs +30 -1
- package/tui/lib/setup.mjs +59 -25
- package/tui/lib/skill-connect.mjs +145 -0
- package/tui/lib/updater.mjs +86 -0
- package/tui/main.mjs +44 -18
- package/tui/plugins.mjs +158 -0
- package/worker/assistant-sidecar.mjs +28 -4
- package/worker/stow-entry.mjs +3 -50
- package/dist-lib/lib/core/contract/compute.d.ts +0 -11
- package/dist-lib/lib/core/contract/compute.js +0 -48
- package/dist-lib/lib/core/device-invites.d.ts +0 -11
- package/dist-lib/lib/core/device-invites.js +0 -63
- package/dist-lib/lib/core/files/processing/settle.d.ts +0 -13
- package/dist-lib/lib/core/files/processing/settle.js +0 -86
- package/dist-lib/lib/core/grant-expiry.d.ts +0 -11
- package/dist-lib/lib/core/grant-expiry.js +0 -66
- package/dist-lib/lib/core/handoff-channel.d.ts +0 -47
- package/dist-lib/lib/core/handoff-channel.js +0 -123
- package/dist-lib/lib/core/harness-loan.d.ts +0 -29
- package/dist-lib/lib/core/host-run-log-store.d.ts +0 -114
- package/dist-lib/lib/core/host-run-log-store.js +0 -976
- package/dist-lib/lib/core/hosted-agents.d.ts +0 -38
- package/dist-lib/lib/core/hosted-agents.js +0 -140
- package/dist-lib/lib/core/inference-calls-handoff.d.ts +0 -20
- package/dist-lib/lib/core/inference-calls-handoff.js +0 -37
- package/dist-lib/lib/core/inference-calls-receiver.d.ts +0 -14
- package/dist-lib/lib/core/inference-calls-receiver.js +0 -42
- package/dist-lib/lib/core/mesh-seed-handoff.d.ts +0 -25
- package/dist-lib/lib/core/mesh-seed-handoff.js +0 -52
- package/dist-lib/lib/core/migrations/device-indexes.d.ts +0 -2
- package/dist-lib/lib/core/migrations/device-indexes.js +0 -7
- package/dist-lib/lib/core/secret-handoff.d.ts +0 -17
- package/dist-lib/lib/core/secret-handoff.js +0 -29
- package/dist-lib/lib/core/skill-overlay-handoff.d.ts +0 -25
- package/dist-lib/lib/core/skill-overlay-handoff.js +0 -50
- package/dist-lib/lib/core/skill-overlay-receiver.d.ts +0 -8
- package/dist-lib/lib/core/skill-overlay-receiver.js +0 -23
- package/dist-lib/lib/image-cache-dir.d.ts +0 -1
- package/dist-lib/lib/image-cache-dir.js +0 -5
- package/dist-lib/lib/log-levels.d.ts +0 -7
- package/dist-lib/lib/log-levels.js +0 -1
- package/dist-lib/lib/logger.d.ts +0 -5
- package/dist-lib/lib/logger.js +0 -18
- package/dist-lib/lib/oauth/loopback.stub.d.ts +0 -3
- package/dist-lib/lib/oauth/loopback.stub.js +0 -6
|
@@ -4,7 +4,7 @@ import { type MusicModelChoice } from '@qvac/harness/music-catalog';
|
|
|
4
4
|
import type { AssistantAppConfig } from '../spec/hyperschema/types.d.ts';
|
|
5
5
|
import { type ModelProgressFrame } from '@qvac/harness/model-progress';
|
|
6
6
|
import { type StatusRow } from './model-download-status.ts';
|
|
7
|
-
import type {
|
|
7
|
+
import type { LoggerInterface } from '@qvac/logging';
|
|
8
8
|
export interface DownloadArgs {
|
|
9
9
|
model: string;
|
|
10
10
|
addon?: string;
|
|
@@ -20,6 +20,14 @@ export interface ImageDownloadObservation {
|
|
|
20
20
|
}
|
|
21
21
|
export type DownloadFrame = ModelProgressFrame;
|
|
22
22
|
export type DownloadEventStream = AsyncIterable<ModelProgressFrame>;
|
|
23
|
+
export interface CacheWaitOptions {
|
|
24
|
+
readonly onHold?: () => void;
|
|
25
|
+
readonly onProgress?: (percentage: number) => void;
|
|
26
|
+
readonly onStall?: () => void;
|
|
27
|
+
}
|
|
28
|
+
export interface RetryOptions {
|
|
29
|
+
readonly sibling?: boolean;
|
|
30
|
+
}
|
|
23
31
|
interface DownloadHarness {
|
|
24
32
|
list?(options?: {
|
|
25
33
|
cachedOnly?: boolean;
|
|
@@ -50,14 +58,6 @@ interface DownloadEngine {
|
|
|
50
58
|
agentsWatch(request: {
|
|
51
59
|
meshId: string;
|
|
52
60
|
}): AsyncIterable<unknown>;
|
|
53
|
-
listDevices(request: {
|
|
54
|
-
meshId: string;
|
|
55
|
-
}): Promise<{
|
|
56
|
-
devices?: ReadonlyArray<{
|
|
57
|
-
id: Buffer;
|
|
58
|
-
capabilityProfile: string;
|
|
59
|
-
}> | null;
|
|
60
|
-
}>;
|
|
61
61
|
getAgent(request: {
|
|
62
62
|
agentId: string;
|
|
63
63
|
meshId: string;
|
|
@@ -113,7 +113,7 @@ interface ReconcilerOptions {
|
|
|
113
113
|
retryMs?: number;
|
|
114
114
|
now?: () => number;
|
|
115
115
|
createScheduler?: (onFire: () => void) => RetryScheduler;
|
|
116
|
-
logger?:
|
|
116
|
+
logger?: LoggerInterface | null;
|
|
117
117
|
mobileClass?: boolean;
|
|
118
118
|
}
|
|
119
119
|
interface RetryScheduler {
|
|
@@ -141,6 +141,8 @@ export declare class ModelDownloadReconciler {
|
|
|
141
141
|
private readonly _observedProgress;
|
|
142
142
|
private readonly _observedSpeed;
|
|
143
143
|
private readonly _requestedModels;
|
|
144
|
+
private readonly _siblingRequests;
|
|
145
|
+
private readonly _heldLoads;
|
|
144
146
|
private readonly _releasing;
|
|
145
147
|
private readonly _targetTotals;
|
|
146
148
|
private _config;
|
|
@@ -150,7 +152,6 @@ export declare class ModelDownloadReconciler {
|
|
|
150
152
|
private _musicChoice;
|
|
151
153
|
private _preemptLlm;
|
|
152
154
|
private _pausedLocalLlm;
|
|
153
|
-
private _profile;
|
|
154
155
|
private _capability;
|
|
155
156
|
private readonly _handled;
|
|
156
157
|
private readonly _demands;
|
|
@@ -171,11 +172,14 @@ export declare class ModelDownloadReconciler {
|
|
|
171
172
|
resume(): void;
|
|
172
173
|
meshAdopted(): void;
|
|
173
174
|
yieldToRuns(models: ReadonlyArray<string>): void;
|
|
175
|
+
observeHeldLoad(model: string): void;
|
|
176
|
+
observeDroppedHeldLoad(model: string): void;
|
|
174
177
|
observeImageProgress(observation: ImageDownloadObservation): void;
|
|
175
178
|
private _transfer;
|
|
176
179
|
private _completeTransfer;
|
|
177
|
-
waitUntilCached(model: string, signal: AbortSignal): Promise<void>;
|
|
178
|
-
retry(name: string): Promise<void>;
|
|
180
|
+
waitUntilCached(model: string, signal: AbortSignal, { onHold, onProgress, onStall }?: CacheWaitOptions): Promise<void>;
|
|
181
|
+
retry(name: string, { sibling }?: RetryOptions): Promise<void>;
|
|
182
|
+
siblingResumed(name: string): void;
|
|
179
183
|
release<T>(name: string, removeFiles: () => Promise<T>): Promise<T>;
|
|
180
184
|
close(): Promise<void>;
|
|
181
185
|
private _watchConfig;
|
|
@@ -189,12 +193,17 @@ export declare class ModelDownloadReconciler {
|
|
|
189
193
|
private _drain;
|
|
190
194
|
private _step;
|
|
191
195
|
private _writeWaiting;
|
|
196
|
+
private _announceHolds;
|
|
197
|
+
private _announceProgress;
|
|
198
|
+
private _announceStall;
|
|
199
|
+
private _writeFailure;
|
|
192
200
|
private _flushObservedProgress;
|
|
193
201
|
private _shouldPreempt;
|
|
194
202
|
private _waiting;
|
|
195
203
|
private _nextTarget;
|
|
196
204
|
private _scheduleNextRetry;
|
|
197
205
|
private _desired;
|
|
206
|
+
private _heldBack;
|
|
198
207
|
private _reclaimCached;
|
|
199
208
|
private _modelAvailability;
|
|
200
209
|
private _deviceProfile;
|
|
@@ -8,6 +8,7 @@ import { RetryBudget } from './retry-budget.js';
|
|
|
8
8
|
import { unref } from './unref.js';
|
|
9
9
|
import b4a from 'b4a';
|
|
10
10
|
import { errorMessage } from './guards.js';
|
|
11
|
+
import { CoreError } from './errors.js';
|
|
11
12
|
const WATCH_RETRY_MS = 30_000;
|
|
12
13
|
const LOCAL_PROGRESS_INTERVAL_MS = 750;
|
|
13
14
|
const LOCAL_PROGRESS_PERCENTAGE_STEP = 1;
|
|
@@ -33,6 +34,8 @@ export class ModelDownloadReconciler {
|
|
|
33
34
|
_observedProgress = new Map();
|
|
34
35
|
_observedSpeed = new Map();
|
|
35
36
|
_requestedModels = new Set();
|
|
37
|
+
_siblingRequests = new Set();
|
|
38
|
+
_heldLoads = new Set();
|
|
36
39
|
_releasing = new Set();
|
|
37
40
|
_targetTotals = new Map();
|
|
38
41
|
_config = null;
|
|
@@ -42,7 +45,6 @@ export class ModelDownloadReconciler {
|
|
|
42
45
|
_musicChoice = undefined;
|
|
43
46
|
_preemptLlm = null;
|
|
44
47
|
_pausedLocalLlm = null;
|
|
45
|
-
_profile = null;
|
|
46
48
|
_capability = null;
|
|
47
49
|
_handled = new Set();
|
|
48
50
|
_demands = new Map();
|
|
@@ -128,6 +130,17 @@ export class ModelDownloadReconciler {
|
|
|
128
130
|
this._runModels = next;
|
|
129
131
|
this._kick();
|
|
130
132
|
}
|
|
133
|
+
observeHeldLoad(model) {
|
|
134
|
+
if (this._closed)
|
|
135
|
+
return;
|
|
136
|
+
this._heldLoads.add(model);
|
|
137
|
+
this._kick();
|
|
138
|
+
}
|
|
139
|
+
observeDroppedHeldLoad(model) {
|
|
140
|
+
if (this._closed || !this._heldLoads.delete(model))
|
|
141
|
+
return;
|
|
142
|
+
this._kick();
|
|
143
|
+
}
|
|
131
144
|
observeImageProgress(observation) {
|
|
132
145
|
if (this._closed)
|
|
133
146
|
return;
|
|
@@ -170,7 +183,7 @@ export class ModelDownloadReconciler {
|
|
|
170
183
|
this._pendingCompletions.delete(name);
|
|
171
184
|
this._completedTransfers.add(name);
|
|
172
185
|
}
|
|
173
|
-
async waitUntilCached(model, signal) {
|
|
186
|
+
async waitUntilCached(model, signal, { onHold, onProgress, onStall } = {}) {
|
|
174
187
|
if (this._closed ||
|
|
175
188
|
!this._harness.list ||
|
|
176
189
|
!this._harness.download ||
|
|
@@ -195,7 +208,15 @@ export class ModelDownloadReconciler {
|
|
|
195
208
|
this._removeDemandWaiter(model, waiter);
|
|
196
209
|
resolve();
|
|
197
210
|
};
|
|
198
|
-
const waiter = {
|
|
211
|
+
const waiter = {
|
|
212
|
+
signal,
|
|
213
|
+
abort,
|
|
214
|
+
reject,
|
|
215
|
+
resolve,
|
|
216
|
+
onHold: onHold ?? null,
|
|
217
|
+
onProgress: onProgress ?? null,
|
|
218
|
+
onStall: onStall ?? null
|
|
219
|
+
};
|
|
199
220
|
const demand = this._demands.get(model) ?? {
|
|
200
221
|
addon,
|
|
201
222
|
failures: 0,
|
|
@@ -207,10 +228,15 @@ export class ModelDownloadReconciler {
|
|
|
207
228
|
this._kick();
|
|
208
229
|
});
|
|
209
230
|
}
|
|
210
|
-
async retry(name) {
|
|
231
|
+
async retry(name, { sibling = false } = {}) {
|
|
211
232
|
if (this._closed)
|
|
212
|
-
throw new
|
|
213
|
-
|
|
233
|
+
throw new CoreError('MODEL_DOWNLOAD_CLOSED');
|
|
234
|
+
if (!sibling) {
|
|
235
|
+
this._requestedModels.add(name);
|
|
236
|
+
}
|
|
237
|
+
else if (!this._requestedModels.has(name)) {
|
|
238
|
+
this._siblingRequests.add(name);
|
|
239
|
+
}
|
|
214
240
|
this._attemptGenerations.set(name, this._attemptGeneration(name) + 1);
|
|
215
241
|
const demand = this._demands.get(name);
|
|
216
242
|
if (demand) {
|
|
@@ -223,11 +249,17 @@ export class ModelDownloadReconciler {
|
|
|
223
249
|
}
|
|
224
250
|
this._kick();
|
|
225
251
|
}
|
|
252
|
+
siblingResumed(name) {
|
|
253
|
+
if (this._config?.pausedModels?.includes(name) && this._requestedModels.delete(name)) {
|
|
254
|
+
this._siblingRequests.add(name);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
226
257
|
async release(name, removeFiles) {
|
|
227
258
|
if (this._closed)
|
|
228
|
-
throw new
|
|
259
|
+
throw new CoreError('MODEL_DOWNLOAD_CLOSED');
|
|
229
260
|
this._releasing.add(name);
|
|
230
261
|
this._requestedModels.delete(name);
|
|
262
|
+
this._siblingRequests.delete(name);
|
|
231
263
|
this._handled.delete(name);
|
|
232
264
|
try {
|
|
233
265
|
if (this._active?.model === name) {
|
|
@@ -339,18 +371,25 @@ export class ModelDownloadReconciler {
|
|
|
339
371
|
if (!meshId) {
|
|
340
372
|
return;
|
|
341
373
|
}
|
|
374
|
+
let active = null;
|
|
342
375
|
const run = async () => {
|
|
343
376
|
const stream = this._engine.agentsWatch({ meshId });
|
|
344
|
-
|
|
377
|
+
const iterator = stream[Symbol.asyncIterator]();
|
|
378
|
+
active = iterator;
|
|
379
|
+
this._agentsStream = iterator;
|
|
345
380
|
while (true) {
|
|
346
|
-
const { done } = await
|
|
347
|
-
if (done || this._closed) {
|
|
381
|
+
const { done } = await iterator.next();
|
|
382
|
+
if (done || this._closed || this._agentsStream !== iterator) {
|
|
348
383
|
return;
|
|
349
384
|
}
|
|
350
385
|
this._kick();
|
|
351
386
|
}
|
|
352
387
|
};
|
|
353
|
-
run().catch((err) =>
|
|
388
|
+
run().catch((err) => {
|
|
389
|
+
if (active && this._agentsStream !== active)
|
|
390
|
+
return;
|
|
391
|
+
this._restartWatch('agents', err, () => this._watchAgents());
|
|
392
|
+
});
|
|
354
393
|
}
|
|
355
394
|
_restartWatch(name, err, restart) {
|
|
356
395
|
if (this._closed)
|
|
@@ -410,7 +449,7 @@ export class ModelDownloadReconciler {
|
|
|
410
449
|
if (this._closed || this._paused) {
|
|
411
450
|
return;
|
|
412
451
|
}
|
|
413
|
-
const downloadable = new Map(targets.filter((t) => !t.paused).map((t) => [t.name, t]));
|
|
452
|
+
const downloadable = new Map(targets.filter((t) => !t.paused && !t.held).map((t) => [t.name, t]));
|
|
414
453
|
if (this._active && !downloadable.has(this._active.model)) {
|
|
415
454
|
const stillWanted = targets.some((t) => t.name === this._active?.model);
|
|
416
455
|
await this._stopActive(!stillWanted);
|
|
@@ -427,6 +466,7 @@ export class ModelDownloadReconciler {
|
|
|
427
466
|
}
|
|
428
467
|
const next = this._active ? null : preferred;
|
|
429
468
|
await this._writeWaiting(targets, next?.name, now);
|
|
469
|
+
this._announceHolds(targets);
|
|
430
470
|
if (next && !this._closed && !this._paused) {
|
|
431
471
|
this._begin(next);
|
|
432
472
|
}
|
|
@@ -435,6 +475,10 @@ export class ModelDownloadReconciler {
|
|
|
435
475
|
for (const target of targets) {
|
|
436
476
|
if (target.paused) {
|
|
437
477
|
await this._status.write(target.name, 'paused', { bytesPerSecond: 0 });
|
|
478
|
+
this._announceStall(target.name);
|
|
479
|
+
}
|
|
480
|
+
else if (target.held) {
|
|
481
|
+
await this._status.write(target.name, 'held', { total: target.total, bytesPerSecond: 0 });
|
|
438
482
|
}
|
|
439
483
|
else if (this._waiting(target.name, nextName, now)) {
|
|
440
484
|
await this._status.write(target.name, 'queued', {
|
|
@@ -444,6 +488,29 @@ export class ModelDownloadReconciler {
|
|
|
444
488
|
}
|
|
445
489
|
}
|
|
446
490
|
}
|
|
491
|
+
_announceHolds(targets) {
|
|
492
|
+
for (const target of targets) {
|
|
493
|
+
if (!target.held)
|
|
494
|
+
continue;
|
|
495
|
+
for (const waiter of this._demands.get(target.name)?.waiters ?? []) {
|
|
496
|
+
waiter.onHold?.();
|
|
497
|
+
}
|
|
498
|
+
}
|
|
499
|
+
}
|
|
500
|
+
_announceProgress(model, percentage) {
|
|
501
|
+
for (const waiter of this._demands.get(model)?.waiters ?? []) {
|
|
502
|
+
waiter.onProgress?.(percentage);
|
|
503
|
+
}
|
|
504
|
+
}
|
|
505
|
+
_announceStall(model) {
|
|
506
|
+
for (const waiter of this._demands.get(model)?.waiters ?? []) {
|
|
507
|
+
waiter.onStall?.();
|
|
508
|
+
}
|
|
509
|
+
}
|
|
510
|
+
async _writeFailure(model, error) {
|
|
511
|
+
await this._status.write(model, 'error', { error, bytesPerSecond: 0 });
|
|
512
|
+
this._announceStall(model);
|
|
513
|
+
}
|
|
447
514
|
async _flushObservedProgress() {
|
|
448
515
|
for (const [model, progress] of this._observedProgress) {
|
|
449
516
|
await this._transfer(model);
|
|
@@ -479,6 +546,7 @@ export class ModelDownloadReconciler {
|
|
|
479
546
|
total,
|
|
480
547
|
bytesPerSecond: speed.sample({ downloaded, total, aggregate: true }, progress.at, model)
|
|
481
548
|
});
|
|
549
|
+
this._announceProgress(model, progress.percentage);
|
|
482
550
|
}
|
|
483
551
|
}
|
|
484
552
|
_shouldPreempt(preferred, preemptLlm) {
|
|
@@ -518,7 +586,11 @@ export class ModelDownloadReconciler {
|
|
|
518
586
|
}
|
|
519
587
|
}
|
|
520
588
|
async _desired() {
|
|
589
|
+
if (this._config === null) {
|
|
590
|
+
return [];
|
|
591
|
+
}
|
|
521
592
|
if (this._demands.size === 0 &&
|
|
593
|
+
this._heldLoads.size === 0 &&
|
|
522
594
|
this._handled.size === 0 &&
|
|
523
595
|
!this._config?.onboardingCompleted) {
|
|
524
596
|
await this._status.clearUnwanted(new Set());
|
|
@@ -556,7 +628,7 @@ export class ModelDownloadReconciler {
|
|
|
556
628
|
}
|
|
557
629
|
}
|
|
558
630
|
}
|
|
559
|
-
for (const name of this._requestedModels) {
|
|
631
|
+
for (const name of [...this._requestedModels, ...this._siblingRequests]) {
|
|
560
632
|
if (wanted.has(name))
|
|
561
633
|
continue;
|
|
562
634
|
const addon = availability.addons.get(name);
|
|
@@ -565,6 +637,16 @@ export class ModelDownloadReconciler {
|
|
|
565
637
|
}
|
|
566
638
|
wanted.set(name, { name, addon, paused: paused.has(name) });
|
|
567
639
|
}
|
|
640
|
+
for (const name of this._heldLoads) {
|
|
641
|
+
if (this._config?.autoDownloadModels !== false || availability.cached.has(name)) {
|
|
642
|
+
this._heldLoads.delete(name);
|
|
643
|
+
continue;
|
|
644
|
+
}
|
|
645
|
+
const addon = availability.addons.get(name);
|
|
646
|
+
if (!wanted.has(name) && addon !== undefined) {
|
|
647
|
+
wanted.set(name, { name, addon, paused: paused.has(name) });
|
|
648
|
+
}
|
|
649
|
+
}
|
|
568
650
|
const wantedNames = new Set(wanted.keys());
|
|
569
651
|
for (const name of this._attemptGenerations.keys()) {
|
|
570
652
|
if (!wantedNames.has(name)) {
|
|
@@ -577,12 +659,14 @@ export class ModelDownloadReconciler {
|
|
|
577
659
|
for (const model of wanted.values()) {
|
|
578
660
|
if (availability.cached.has(model.name)) {
|
|
579
661
|
this._requestedModels.delete(model.name);
|
|
662
|
+
this._siblingRequests.delete(model.name);
|
|
580
663
|
this._resolveDemand(model.name);
|
|
581
664
|
await this._status.clear(model.name);
|
|
582
665
|
continue;
|
|
583
666
|
}
|
|
584
667
|
pending.push({
|
|
585
668
|
...model,
|
|
669
|
+
held: this._heldBack(model.name),
|
|
586
670
|
total: availability.totals.get(model.name) ?? 0
|
|
587
671
|
});
|
|
588
672
|
}
|
|
@@ -599,6 +683,9 @@ export class ModelDownloadReconciler {
|
|
|
599
683
|
}
|
|
600
684
|
return pending;
|
|
601
685
|
}
|
|
686
|
+
_heldBack(name) {
|
|
687
|
+
return this._config?.autoDownloadModels === false && !this._requestedModels.has(name);
|
|
688
|
+
}
|
|
602
689
|
async _reclaimCached(cached) {
|
|
603
690
|
for (const name of this._config?.releasedModels ?? []) {
|
|
604
691
|
if (!cached.has(name) || this._releasing.has(name))
|
|
@@ -619,18 +706,7 @@ export class ModelDownloadReconciler {
|
|
|
619
706
|
return { cached, totals, addons };
|
|
620
707
|
}
|
|
621
708
|
async _deviceProfile() {
|
|
622
|
-
|
|
623
|
-
return this._profile;
|
|
624
|
-
const meshId = this._meshId();
|
|
625
|
-
if (!meshId) {
|
|
626
|
-
return this._profile ?? 'mid';
|
|
627
|
-
}
|
|
628
|
-
const { devices } = await this._engine.listDevices({ meshId }).catch(() => ({ devices: [] }));
|
|
629
|
-
const self = (devices ?? []).find((device) => b4a.equals(device.id, this._deviceId));
|
|
630
|
-
if (self) {
|
|
631
|
-
this._profile = self.capabilityProfile;
|
|
632
|
-
}
|
|
633
|
-
return this._profile ?? 'mid';
|
|
709
|
+
return (await this._hostCapability())?.capabilityProfile ?? 'low';
|
|
634
710
|
}
|
|
635
711
|
async _hostCapability() {
|
|
636
712
|
if (this._capability)
|
|
@@ -787,6 +863,7 @@ export class ModelDownloadReconciler {
|
|
|
787
863
|
}
|
|
788
864
|
const bytes = transfer ?? progressBytes(event);
|
|
789
865
|
const percentage = transfer?.percentage ?? 0;
|
|
866
|
+
this._announceProgress(model, percentage);
|
|
790
867
|
if (shouldFlush(localFlush, { at, percentage })) {
|
|
791
868
|
const written = await this._status.write(model, 'downloading', {
|
|
792
869
|
percentage,
|
|
@@ -818,6 +895,7 @@ export class ModelDownloadReconciler {
|
|
|
818
895
|
})) {
|
|
819
896
|
localFlush = { at: initialAt, percentage: initialPercentage };
|
|
820
897
|
}
|
|
898
|
+
this._announceProgress(model, initialPercentage);
|
|
821
899
|
if (!this._harness.download) {
|
|
822
900
|
throw new Error('the harness cannot download models');
|
|
823
901
|
}
|
|
@@ -846,18 +924,12 @@ export class ModelDownloadReconciler {
|
|
|
846
924
|
else if (event.type === 'error' && current()) {
|
|
847
925
|
retry = true;
|
|
848
926
|
failureMessage = typeof event.message === 'string' ? event.message : 'download failed';
|
|
849
|
-
await this.
|
|
850
|
-
error: failureMessage,
|
|
851
|
-
bytesPerSecond: 0
|
|
852
|
-
});
|
|
927
|
+
await this._writeFailure(model, failureMessage);
|
|
853
928
|
}
|
|
854
929
|
else if (event.type === 'aborted' && current() && !controller.signal.aborted) {
|
|
855
930
|
retry = true;
|
|
856
931
|
failureMessage = 'download interrupted';
|
|
857
|
-
await this.
|
|
858
|
-
error: failureMessage,
|
|
859
|
-
bytesPerSecond: 0
|
|
860
|
-
});
|
|
932
|
+
await this._writeFailure(model, failureMessage);
|
|
861
933
|
}
|
|
862
934
|
}
|
|
863
935
|
if (current() && !controller.signal.aborted && !completed && !retry) {
|
|
@@ -868,10 +940,7 @@ export class ModelDownloadReconciler {
|
|
|
868
940
|
if (!this._closed && current()) {
|
|
869
941
|
retry = true;
|
|
870
942
|
failureMessage = errorMessage(err);
|
|
871
|
-
await this.
|
|
872
|
-
error: failureMessage,
|
|
873
|
-
bytesPerSecond: 0
|
|
874
|
-
});
|
|
943
|
+
await this._writeFailure(model, failureMessage);
|
|
875
944
|
}
|
|
876
945
|
}
|
|
877
946
|
finally {
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import type { Harness } from './assistant.ts';
|
|
2
|
+
import type { LoggerInterface } from '@qvac/logging';
|
|
2
3
|
import type { openLocalStore } from './core/local/index.ts';
|
|
3
4
|
type LocalStore = Awaited<ReturnType<typeof openLocalStore>>;
|
|
4
|
-
interface Logger {
|
|
5
|
-
warn(...args: unknown[]): void;
|
|
6
|
-
}
|
|
7
5
|
export type ModelIdleTarget = Pick<Harness, 'setModelIdleTimeout'>;
|
|
8
6
|
export type ModelIdleSource = Pick<LocalStore, 'get' | 'watch' | 'unwatch'>;
|
|
9
|
-
export declare function startModelIdlePusher(harness: ModelIdleTarget, state: ModelIdleSource, logger?:
|
|
7
|
+
export declare function startModelIdlePusher(harness: ModelIdleTarget, state: ModelIdleSource, logger?: LoggerInterface | null): () => Promise<void>;
|
|
10
8
|
export {};
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { Harness } from './assistant.ts';
|
|
2
|
+
import type { LoggerInterface } from '@qvac/logging';
|
|
3
|
+
import type { openLocalStore } from './core/local/index.ts';
|
|
4
|
+
type LocalStore = Awaited<ReturnType<typeof openLocalStore>>;
|
|
5
|
+
export type ModelMemoryTarget = Pick<Harness, 'setModelMemoryCap' | 'capability' | 'memoryUsage'>;
|
|
6
|
+
export type ModelMemorySource = Pick<LocalStore, 'get' | 'watch' | 'unwatch'>;
|
|
7
|
+
export interface ModelMemorySummary {
|
|
8
|
+
readonly usableBytes: number;
|
|
9
|
+
readonly capPercent: number;
|
|
10
|
+
readonly capBytes: number;
|
|
11
|
+
readonly totalBytes?: number;
|
|
12
|
+
readonly source?: string;
|
|
13
|
+
readonly gpuClass?: string;
|
|
14
|
+
}
|
|
15
|
+
export interface ModelMemoryUse extends ModelMemorySummary {
|
|
16
|
+
readonly usedBytes: number;
|
|
17
|
+
readonly overCap: boolean;
|
|
18
|
+
}
|
|
19
|
+
export interface ModelMemoryCap {
|
|
20
|
+
summary(): Promise<ModelMemoryUse | null>;
|
|
21
|
+
stop(): Promise<void>;
|
|
22
|
+
}
|
|
23
|
+
export interface ModelMemoryCapOptions {
|
|
24
|
+
logger?: LoggerInterface | null;
|
|
25
|
+
onPushed?: () => void;
|
|
26
|
+
}
|
|
27
|
+
export declare function startModelMemoryCap(harness: ModelMemoryTarget, state: ModelMemorySource, { logger, onPushed }?: ModelMemoryCapOptions): ModelMemoryCap;
|
|
28
|
+
export declare function withUsage(cap: ModelMemorySummary, usedBytes: number): ModelMemoryUse;
|
|
29
|
+
export declare function memoryCapPercent(value: unknown): number;
|
|
30
|
+
export {};
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import ScopeLock from 'scope-lock';
|
|
2
|
+
import { MODEL_MEMORY_CAP_DEFAULT, MODEL_MEMORY_CAP_KEY, MODEL_MEMORY_CAP_MAX, MODEL_MEMORY_CAP_MIN } from './constants.js';
|
|
3
|
+
import { errorMessage } from './guards.js';
|
|
4
|
+
export function startModelMemoryCap(harness, state, { logger, onPushed } = {}) {
|
|
5
|
+
const lock = new ScopeLock({ debounce: true });
|
|
6
|
+
let disposed = false;
|
|
7
|
+
let pushed = null;
|
|
8
|
+
let budget = null;
|
|
9
|
+
const push = async () => {
|
|
10
|
+
const percent = memoryCapPercent(await state.get(MODEL_MEMORY_CAP_KEY));
|
|
11
|
+
if (disposed || percent === pushed || !harness.setModelMemoryCap) {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
await harness.setModelMemoryCap(percent === MODEL_MEMORY_CAP_MIN ? 0 : percent);
|
|
15
|
+
budget ??= (await harness.capability?.())?.memoryBudget ?? null;
|
|
16
|
+
pushed = percent;
|
|
17
|
+
onPushed?.();
|
|
18
|
+
};
|
|
19
|
+
const schedule = async () => {
|
|
20
|
+
if (disposed || !(await lock.lock()))
|
|
21
|
+
return;
|
|
22
|
+
try {
|
|
23
|
+
await push();
|
|
24
|
+
}
|
|
25
|
+
catch (err) {
|
|
26
|
+
logger?.warn('model-memory-cap', 'push failed', errorMessage(err));
|
|
27
|
+
}
|
|
28
|
+
finally {
|
|
29
|
+
lock.unlock();
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
const listener = () => void schedule();
|
|
33
|
+
state.watch(listener);
|
|
34
|
+
void schedule();
|
|
35
|
+
return {
|
|
36
|
+
summary: async () => {
|
|
37
|
+
const capPercent = pushed;
|
|
38
|
+
if (capPercent === null || budget === null || !harness.memoryUsage) {
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
const usage = await harness.memoryUsage().catch((err) => {
|
|
42
|
+
logger?.warn('model-memory-cap', 'usage read failed', errorMessage(err));
|
|
43
|
+
return null;
|
|
44
|
+
});
|
|
45
|
+
const capBytes = Math.round((capPercent / 100) * budget.availableBytes);
|
|
46
|
+
return usage && withUsage(capSummary(budget, capPercent, capBytes), usage.usedBytes);
|
|
47
|
+
},
|
|
48
|
+
stop: async () => {
|
|
49
|
+
disposed = true;
|
|
50
|
+
state.unwatch(listener);
|
|
51
|
+
lock.destroy();
|
|
52
|
+
await lock.flush();
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
function capSummary({ availableBytes, totalBytes, source, gpuClass }, capPercent, capBytes) {
|
|
57
|
+
return {
|
|
58
|
+
usableBytes: availableBytes,
|
|
59
|
+
capPercent,
|
|
60
|
+
capBytes,
|
|
61
|
+
totalBytes,
|
|
62
|
+
source,
|
|
63
|
+
gpuClass
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
export function withUsage(cap, usedBytes) {
|
|
67
|
+
return {
|
|
68
|
+
...cap,
|
|
69
|
+
usedBytes,
|
|
70
|
+
overCap: cap.capPercent > MODEL_MEMORY_CAP_MIN && usedBytes > cap.capBytes
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
export function memoryCapPercent(value) {
|
|
74
|
+
if (typeof value !== 'number' || !Number.isFinite(value)) {
|
|
75
|
+
return MODEL_MEMORY_CAP_DEFAULT;
|
|
76
|
+
}
|
|
77
|
+
return Math.min(MODEL_MEMORY_CAP_MAX, Math.max(MODEL_MEMORY_CAP_MIN, Math.round(value)));
|
|
78
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AssistantModelCatalogRevision, AssistantModelInfo, AssistantModelInfoList } from '../spec/hyperschema/types.d.ts';
|
|
2
2
|
type Catalog = () => Promise<AsyncIterable<AssistantModelCatalogRevision> | null>;
|
|
3
|
-
type Read = () => Promise<
|
|
3
|
+
type Read = () => Promise<AssistantModelInfoList | null>;
|
|
4
4
|
export declare function watchModels(catalog: Catalog, read: Read): AsyncIterable<AssistantModelInfoList>;
|
|
5
5
|
export declare function asEncoded(models: AssistantModelInfo[]): AssistantModelInfo[];
|
|
6
6
|
export {};
|
|
@@ -15,12 +15,12 @@ class ModelsWatch {
|
|
|
15
15
|
this._opening ??= this._open();
|
|
16
16
|
const revisions = await this._opening;
|
|
17
17
|
while (revisions && !this._closed && !(await revisions.next()).done) {
|
|
18
|
-
const
|
|
19
|
-
if (
|
|
18
|
+
const list = this._closed ? null : await this._read();
|
|
19
|
+
if (list === null || this._closed || snapshotEquals(list, this._last)) {
|
|
20
20
|
continue;
|
|
21
21
|
}
|
|
22
|
-
this._last =
|
|
23
|
-
return { value:
|
|
22
|
+
this._last = list;
|
|
23
|
+
return { value: list, done: false };
|
|
24
24
|
}
|
|
25
25
|
return { value: undefined, done: true };
|
|
26
26
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createServer } from 'http';
|
|
2
2
|
import { URL } from 'url';
|
|
3
3
|
import { OAUTH_CALLBACK_PATH, OAUTH_WAIT_FOR_CODE_TIMEOUT_MS } from './keys.js';
|
|
4
|
+
import { CoreError } from '../errors.js';
|
|
4
5
|
export function waitForOAuthCallback(opts) {
|
|
5
6
|
const { port, state, timeoutMs = OAUTH_WAIT_FOR_CODE_TIMEOUT_MS, onListening } = opts;
|
|
6
7
|
return new Promise((resolve, reject) => {
|
|
@@ -51,7 +52,7 @@ export function waitForOAuthCallback(opts) {
|
|
|
51
52
|
body: '<html><body><p>Authorization failed. You can close this tab.</p></body></html>',
|
|
52
53
|
close: true
|
|
53
54
|
});
|
|
54
|
-
settle({ error: new
|
|
55
|
+
settle({ error: new CoreError('OAUTH_PROVIDER_ERROR', [error]) }, res);
|
|
55
56
|
}
|
|
56
57
|
else if (code) {
|
|
57
58
|
respond(res, 200, {
|
|
@@ -64,7 +65,7 @@ export function waitForOAuthCallback(opts) {
|
|
|
64
65
|
respond(res, 204);
|
|
65
66
|
}
|
|
66
67
|
});
|
|
67
|
-
const timer = setTimeout(() => settle({ error: new
|
|
68
|
+
const timer = setTimeout(() => settle({ error: new CoreError('OAUTH_CALLBACK_TIMEOUT') }), timeoutMs);
|
|
68
69
|
server.once('error', (err) => settle({ error: err }));
|
|
69
70
|
server.listen(port, '127.0.0.1', () => onListening?.());
|
|
70
71
|
});
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CoreError } from '../errors.js';
|
|
1
2
|
import { generateRuntimePkceChallenge } from './pkce-runtime.js';
|
|
2
3
|
import { resolveDynamicClientId } from './register.js';
|
|
3
4
|
import { exchangeCodeWithFetch } from './token-exchange-core.js';
|
|
@@ -17,8 +18,7 @@ function buildAuthParams(config, { clientId, redirectUri, state, pkce }) {
|
|
|
17
18
|
return params;
|
|
18
19
|
}
|
|
19
20
|
export async function runOAuthFlowWithRuntime(config, deps, runtime) {
|
|
20
|
-
const openUrl = deps.openUrl ??
|
|
21
|
-
(() => Promise.reject(new Error('OAuth browser launcher is unavailable; inject openUrl or createRedirect')));
|
|
21
|
+
const openUrl = deps.openUrl ?? (() => Promise.reject(new CoreError('OAUTH_LAUNCHER_UNAVAILABLE')));
|
|
22
22
|
const pkce = await generateRuntimePkceChallenge(runtime);
|
|
23
23
|
const state = runtime.randomBase64Url(16);
|
|
24
24
|
const redirect = await deps.createRedirect({ port: config.port, credentialKey: config.credentialKey, state }, { openUrl });
|
|
@@ -32,10 +32,12 @@ export async function runOAuthFlowWithRuntime(config, deps, runtime) {
|
|
|
32
32
|
state,
|
|
33
33
|
pkce
|
|
34
34
|
});
|
|
35
|
+
deps.onStage?.('awaiting-callback');
|
|
35
36
|
const callback = await redirect.authorize(`${config.authUrl}?${authParams.toString()}`, deps.timeoutMs, state);
|
|
36
37
|
if (callback.state !== state) {
|
|
37
|
-
throw new
|
|
38
|
+
throw new CoreError('OAUTH_STATE_MISMATCH');
|
|
38
39
|
}
|
|
40
|
+
deps.onStage?.('exchanging-code');
|
|
39
41
|
return exchangeCodeWithFetch(config, {
|
|
40
42
|
clientId,
|
|
41
43
|
redirectUri: redirect.redirectUri,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { abortOAuthLoopback, openOAuthLoopback } from '
|
|
1
|
+
import { abortOAuthLoopback, openOAuthLoopback } from './loopback.js';
|
|
2
2
|
import { randomBase64Url, sha256Base64Url } from '@qvac/core/oauth/runtime/crypto';
|
|
3
3
|
import defaultFetch from '@qvac/core/oauth/runtime/fetch';
|
|
4
4
|
import { runOAuthFlowWithRuntime } from './flow-core.js';
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { OAuthLoopbackServer, OAuthLoopbackTarget } from './redirect-types.ts';
|
|
2
2
|
export declare function abortOAuthLoopback(credentialKey: string): Promise<boolean>;
|
|
3
|
+
export declare function deliverOAuthCallback(address: string): boolean;
|
|
3
4
|
export declare function openOAuthLoopback(port: number, target: OAuthLoopbackTarget): Promise<OAuthLoopbackServer>;
|