@qvac/core 0.5.0 → 0.6.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/CHANGELOG.md +75 -1
- package/dist-lib/lib/api/agents.js +3 -2
- package/dist-lib/lib/api/app-config.d.ts +1 -1
- package/dist-lib/lib/api/app-config.js +54 -15
- package/dist-lib/lib/api/attachments.d.ts +6 -5
- package/dist-lib/lib/api/attachments.js +4 -2
- package/dist-lib/lib/api/chat.d.ts +7 -3
- package/dist-lib/lib/api/chat.js +4 -4
- package/dist-lib/lib/api/chunks.js +3 -3
- package/dist-lib/lib/api/config.js +2 -2
- package/dist-lib/lib/api/current-mesh.d.ts +3 -4
- package/dist-lib/lib/api/current-mesh.js +9 -4
- package/dist-lib/lib/api/custom-models.d.ts +8 -1
- package/dist-lib/lib/api/custom-models.js +53 -16
- package/dist-lib/lib/api/devices.d.ts +14 -5
- package/dist-lib/lib/api/devices.js +13 -8
- package/dist-lib/lib/api/diagnostics.d.ts +1 -0
- package/dist-lib/lib/api/diagnostics.js +1 -1
- package/dist-lib/lib/api/effective-ctx-size.d.ts +6 -1
- package/dist-lib/lib/api/effective-ctx-size.js +5 -3
- package/dist-lib/lib/api/execution.js +2 -1
- package/dist-lib/lib/api/files.js +2 -1
- package/dist-lib/lib/api/index.d.ts +5 -1
- package/dist-lib/lib/api/index.js +101 -102
- package/dist-lib/lib/api/instrument.js +29 -20
- package/dist-lib/lib/api/knowledge.d.ts +6 -5
- package/dist-lib/lib/api/knowledge.js +8 -6
- package/dist-lib/lib/api/local-files.js +1 -1
- package/dist-lib/lib/api/logs.js +6 -3
- package/dist-lib/lib/api/members.js +22 -13
- package/dist-lib/lib/api/mesh.js +3 -3
- package/dist-lib/lib/api/model-download.js +1 -1
- package/dist-lib/lib/api/network.d.ts +1 -0
- package/dist-lib/lib/api/network.js +1 -1
- package/dist-lib/lib/api/notifications.js +23 -13
- package/dist-lib/lib/api/rag.d.ts +6 -1
- package/dist-lib/lib/api/rag.js +20 -11
- package/dist-lib/lib/api/range.d.ts +2 -2
- package/dist-lib/lib/api/sync.js +1 -1
- package/dist-lib/lib/api/tool-activity.js +7 -3
- package/dist-lib/lib/api/tool-configs.js +2 -4
- package/dist-lib/lib/api/upload-frames.d.ts +7 -8
- package/dist-lib/lib/api/upload-frames.js +2 -1
- package/dist-lib/lib/api/watchable.d.ts +6 -1
- package/dist-lib/lib/api/watchable.js +23 -14
- package/dist-lib/lib/assistant/fetch-body.js +4 -2
- package/dist-lib/lib/assistant/harness.d.ts +48 -27
- package/dist-lib/lib/assistant/harness.js +40 -16
- package/dist-lib/lib/assistant/history.d.ts +9 -7
- package/dist-lib/lib/assistant/history.js +77 -42
- package/dist-lib/lib/assistant/message.d.ts +5 -3
- package/dist-lib/lib/assistant/message.js +4 -2
- package/dist-lib/lib/assistant/skill-encode.d.ts +3 -1
- package/dist-lib/lib/assistant/skill-encode.js +52 -62
- package/dist-lib/lib/assistant-client.js +7 -4
- package/dist-lib/lib/assistant-tree.js +27 -11
- package/dist-lib/lib/assistant.d.ts +30 -11
- package/dist-lib/lib/assistant.js +824 -378
- package/dist-lib/lib/audio-format.d.ts +1 -1
- package/dist-lib/lib/audio-format.js +1 -1
- package/dist-lib/lib/chat-title.js +9 -4
- package/dist-lib/lib/client.js +3 -2
- package/dist-lib/lib/collabora/convert.d.ts +2 -2
- package/dist-lib/lib/collabora/convert.js +6 -3
- package/dist-lib/lib/collabora/entry.js +9 -5
- package/dist-lib/lib/collabora/protocol.d.ts +2 -2
- package/dist-lib/lib/collabora/protocol.js +14 -7
- package/dist-lib/lib/collabora/worker.js +14 -7
- package/dist-lib/lib/compaction.d.ts +5 -6
- package/dist-lib/lib/compaction.js +14 -7
- package/dist-lib/lib/core/account-recovery.d.ts +4 -3
- package/dist-lib/lib/core/account-recovery.js +7 -4
- package/dist-lib/lib/core/agent.js +17 -15
- package/dist-lib/lib/core/approval-rules.d.ts +7 -6
- package/dist-lib/lib/core/approval-rules.js +12 -6
- package/dist-lib/lib/core/archived-mesh.d.ts +7 -5
- package/dist-lib/lib/core/archived-mesh.js +25 -22
- package/dist-lib/lib/core/async-iterable.js +10 -5
- package/dist-lib/lib/core/attachment-link.d.ts +2 -2
- package/dist-lib/lib/core/audio-attachment.js +1 -1
- package/dist-lib/lib/core/blind-peers.d.ts +2 -2
- package/dist-lib/lib/core/chat-activity.d.ts +2 -2
- package/dist-lib/lib/core/chat-activity.js +42 -21
- package/dist-lib/lib/core/chat-group.d.ts +8 -6
- package/dist-lib/lib/core/chat-group.js +17 -10
- package/dist-lib/lib/core/chat-order.d.ts +11 -9
- package/dist-lib/lib/core/chat-order.js +1 -3
- package/dist-lib/lib/core/chat-search.d.ts +4 -4
- package/dist-lib/lib/core/chat-search.js +38 -24
- package/dist-lib/lib/core/chat.d.ts +20 -14
- package/dist-lib/lib/core/chat.js +42 -28
- package/dist-lib/lib/core/chunk.d.ts +19 -23
- package/dist-lib/lib/core/chunk.js +27 -21
- package/dist-lib/lib/core/collections.d.ts +69 -0
- package/dist-lib/lib/core/collections.js +69 -0
- package/dist-lib/lib/core/contract/activity.d.ts +6 -2
- package/dist-lib/lib/core/contract/activity.js +15 -12
- package/dist-lib/lib/core/contract/agents.js +3 -2
- package/dist-lib/lib/core/contract/approval-rules.js +1 -1
- package/dist-lib/lib/core/contract/attestations.js +1 -1
- package/dist-lib/lib/core/contract/chat-group.js +1 -1
- package/dist-lib/lib/core/contract/chat.js +1 -1
- package/dist-lib/lib/core/contract/chunks.js +10 -9
- package/dist-lib/lib/core/contract/compute.js +2 -1
- package/dist-lib/lib/core/contract/devices.js +6 -5
- package/dist-lib/lib/core/contract/grant-order.js +5 -6
- package/dist-lib/lib/core/contract/index.js +4 -2
- package/dist-lib/lib/core/contract/indexing.js +3 -3
- package/dist-lib/lib/core/contract/invites.d.ts +8 -3
- package/dist-lib/lib/core/contract/invites.js +52 -26
- package/dist-lib/lib/core/contract/joined-meshes.js +3 -3
- package/dist-lib/lib/core/contract/knowledge.js +5 -5
- package/dist-lib/lib/core/contract/members.d.ts +13 -2
- package/dist-lib/lib/core/contract/members.js +46 -25
- package/dist-lib/lib/core/contract/mesh-kind.js +9 -8
- package/dist-lib/lib/core/contract/seal.js +1 -1
- package/dist-lib/lib/core/contract/seed-defaults.js +1 -3
- package/dist-lib/lib/core/contract/tool-activity.js +5 -5
- package/dist-lib/lib/core/contract/tool-configs.js +1 -2
- package/dist-lib/lib/core/contract/writers.d.ts +6 -1
- package/dist-lib/lib/core/contract/writers.js +55 -34
- package/dist-lib/lib/core/departures.js +16 -8
- package/dist-lib/lib/core/device-invites.js +3 -2
- package/dist-lib/lib/core/devices.js +6 -3
- package/dist-lib/lib/core/document-attachment.d.ts +20 -11
- package/dist-lib/lib/core/document-attachment.js +10 -5
- package/dist-lib/lib/core/files/attachments.d.ts +2 -5
- package/dist-lib/lib/core/files/attachments.js +6 -3
- package/dist-lib/lib/core/files/index.d.ts +44 -52
- package/dist-lib/lib/core/files/index.js +142 -93
- package/dist-lib/lib/core/files/knowledge.d.ts +2 -5
- package/dist-lib/lib/core/files/local-index.js +9 -5
- package/dist-lib/lib/core/files/preview/image.d.ts +0 -1
- package/dist-lib/lib/core/files/preview/image.js +9 -6
- package/dist-lib/lib/core/files/preview/index.d.ts +8 -11
- package/dist-lib/lib/core/files/preview/index.js +20 -15
- package/dist-lib/lib/core/files/processing/claims.d.ts +6 -5
- package/dist-lib/lib/core/files/processing/claims.js +16 -8
- package/dist-lib/lib/core/files/processing/document.d.ts +21 -50
- package/dist-lib/lib/core/files/processing/index.d.ts +18 -13
- package/dist-lib/lib/core/files/processing/index.js +65 -37
- package/dist-lib/lib/core/files/processing/ownership.d.ts +8 -1
- package/dist-lib/lib/core/files/processing/ownership.js +1 -1
- package/dist-lib/lib/core/files/processing/protocol.d.ts +19 -19
- package/dist-lib/lib/core/files/processing/protocol.js +5 -5
- package/dist-lib/lib/core/files/processing/settle.d.ts +10 -7
- package/dist-lib/lib/core/files/processing/settle.js +22 -11
- package/dist-lib/lib/core/files/processing/source.js +14 -8
- package/dist-lib/lib/core/files/processing/state.d.ts +13 -11
- package/dist-lib/lib/core/files/processing/state.js +19 -12
- package/dist-lib/lib/core/files/rag/build.d.ts +2 -2
- package/dist-lib/lib/core/files/rag/build.js +2 -1
- package/dist-lib/lib/core/files/rag/document-types.d.ts +4 -6
- package/dist-lib/lib/core/files/rag/index.d.ts +10 -13
- package/dist-lib/lib/core/files/rag/index.js +3 -2
- package/dist-lib/lib/core/files/rag/load.d.ts +10 -9
- package/dist-lib/lib/core/files/rag/load.js +26 -13
- package/dist-lib/lib/core/files/rag/policy.js +2 -1
- package/dist-lib/lib/core/files/rag/produce.js +33 -19
- package/dist-lib/lib/core/files/rag/retrieval/full-text.d.ts +5 -3
- package/dist-lib/lib/core/files/rag/retrieval/full-text.js +30 -10
- package/dist-lib/lib/core/files/records/chunks.js +4 -2
- package/dist-lib/lib/core/files/records/knowledge.d.ts +10 -11
- package/dist-lib/lib/core/files/records/knowledge.js +9 -8
- package/dist-lib/lib/core/files/records/linkage.js +6 -3
- package/dist-lib/lib/core/files/records/output.d.ts +5 -4
- package/dist-lib/lib/core/files/records/output.js +8 -4
- package/dist-lib/lib/core/files/records/reclaim.js +41 -25
- package/dist-lib/lib/core/files/records/routing.d.ts +4 -6
- package/dist-lib/lib/core/files/records/routing.js +15 -8
- package/dist-lib/lib/core/files/records/source.d.ts +5 -4
- package/dist-lib/lib/core/files/records/source.js +20 -14
- package/dist-lib/lib/core/files/records/sweep.js +1 -3
- package/dist-lib/lib/core/files/store/blob.d.ts +10 -10
- package/dist-lib/lib/core/files/store/blob.js +25 -19
- package/dist-lib/lib/core/files/store/index.d.ts +1 -6
- package/dist-lib/lib/core/files/store/index.js +4 -4
- package/dist-lib/lib/core/files/store/inline.d.ts +2 -2
- package/dist-lib/lib/core/files/store/inline.js +6 -3
- package/dist-lib/lib/core/files/store/reference.d.ts +6 -9
- package/dist-lib/lib/core/files/store/reference.js +25 -17
- package/dist-lib/lib/core/files/store/server.d.ts +7 -6
- package/dist-lib/lib/core/files/store/server.js +22 -11
- package/dist-lib/lib/core/files/store/sweep.js +13 -7
- package/dist-lib/lib/core/files/upload-input.d.ts +4 -12
- package/dist-lib/lib/core/files/upload-input.js +10 -5
- package/dist-lib/lib/core/files/upload.d.ts +27 -24
- package/dist-lib/lib/core/files/upload.js +74 -51
- package/dist-lib/lib/core/fs-drives.js +4 -2
- package/dist-lib/lib/core/grant-expiry.js +12 -7
- package/dist-lib/lib/core/handoff-channel.js +27 -13
- package/dist-lib/lib/core/harness-loan.js +35 -17
- package/dist-lib/lib/core/helpers/index.js +6 -2
- package/dist-lib/lib/core/hosted-agents.js +19 -12
- package/dist-lib/lib/core/id.js +1 -1
- package/dist-lib/lib/core/identity.js +6 -3
- package/dist-lib/lib/core/image/cache-sweep.d.ts +12 -10
- package/dist-lib/lib/core/image/cache-sweep.js +11 -6
- package/dist-lib/lib/core/image/normalize.d.ts +6 -0
- package/dist-lib/lib/core/image/normalize.js +12 -2
- package/dist-lib/lib/core/image/sniff.js +42 -21
- package/dist-lib/lib/core/inference-calls-receiver.js +7 -4
- package/dist-lib/lib/core/invite-grants.js +4 -2
- package/dist-lib/lib/core/invite.js +2 -1
- package/dist-lib/lib/core/local/files.js +20 -19
- package/dist-lib/lib/core/local/index.d.ts +69 -46
- package/dist-lib/lib/core/local/index.js +146 -129
- package/dist-lib/lib/core/membership.d.ts +12 -2
- package/dist-lib/lib/core/membership.js +55 -33
- package/dist-lib/lib/core/mesh-seed-handoff.js +7 -1
- package/dist-lib/lib/core/mesh.d.ts +37 -27
- package/dist-lib/lib/core/mesh.js +131 -73
- package/dist-lib/lib/core/migrations/agent-catalog.js +3 -2
- package/dist-lib/lib/core/migrations/agent-indexes.js +3 -3
- package/dist-lib/lib/core/migrations/file-index.js +7 -4
- package/dist-lib/lib/core/migrations/index.d.ts +4 -3
- package/dist-lib/lib/core/migrations/membership.js +9 -4
- package/dist-lib/lib/core/migrations/seal.js +3 -2
- package/dist-lib/lib/core/min-version.js +4 -2
- package/dist-lib/lib/core/next-frame.d.ts +5 -4
- package/dist-lib/lib/core/next-frame.js +6 -3
- package/dist-lib/lib/core/notification.d.ts +5 -1
- package/dist-lib/lib/core/notification.js +89 -77
- package/dist-lib/lib/core/ota-config.js +2 -1
- package/dist-lib/lib/core/pdf/rasterize.d.ts +18 -0
- package/dist-lib/lib/core/pdf/rasterize.js +57 -0
- package/dist-lib/lib/core/prompt-history.js +4 -2
- package/dist-lib/lib/core/range.d.ts +4 -4
- package/dist-lib/lib/core/range.js +12 -6
- package/dist-lib/lib/core/rank.d.ts +5 -4
- package/dist-lib/lib/core/rank.js +2 -1
- package/dist-lib/lib/core/send.d.ts +4 -4
- package/dist-lib/lib/core/send.js +6 -3
- package/dist-lib/lib/core/skill-overlay-receiver.js +7 -4
- package/dist-lib/lib/core/skill-secrets.js +16 -9
- package/dist-lib/lib/core/sync/chunks.js +2 -1
- package/dist-lib/lib/core/sync/devices.js +3 -1
- package/dist-lib/lib/core/sync/files.d.ts +2 -4
- package/dist-lib/lib/core/sync/files.js +28 -20
- package/dist-lib/lib/core/sync/index.d.ts +2 -5
- package/dist-lib/lib/core/sync/index.js +20 -15
- package/dist-lib/lib/core/sync-status.js +10 -7
- package/dist-lib/lib/core/system-info.js +4 -2
- package/dist-lib/lib/core/tool-activity.d.ts +4 -3
- package/dist-lib/lib/core/tool-activity.js +1 -1
- package/dist-lib/lib/core/tool-configs.js +12 -7
- package/dist-lib/lib/core.d.ts +38 -26
- package/dist-lib/lib/core.js +987 -539
- package/dist-lib/lib/credential-pusher.d.ts +12 -17
- package/dist-lib/lib/credential-pusher.js +61 -42
- package/dist-lib/lib/custom-model-pusher.d.ts +7 -3
- package/dist-lib/lib/custom-model-pusher.js +15 -7
- package/dist-lib/lib/custom-model-task.d.ts +1 -0
- package/dist-lib/lib/custom-model-task.js +12 -0
- package/dist-lib/lib/deadline.js +4 -2
- package/dist-lib/lib/diagnostics.d.ts +1 -5
- package/dist-lib/lib/frame-readable.d.ts +3 -0
- package/dist-lib/lib/frame-readable.js +3 -0
- package/dist-lib/lib/fs-drive-bridge.js +24 -14
- package/dist-lib/lib/fs-grants.js +13 -8
- package/dist-lib/lib/guards.d.ts +3 -0
- package/dist-lib/lib/guards.js +9 -0
- package/dist-lib/lib/inference-calls.d.ts +28 -23
- package/dist-lib/lib/inference-calls.js +25 -13
- package/dist-lib/lib/integrations/mcp-providers.d.ts +2 -2
- package/dist-lib/lib/integrations/setup-routes.d.ts +2 -2
- package/dist-lib/lib/knowledge-search.d.ts +6 -5
- package/dist-lib/lib/knowledge-search.js +26 -18
- package/dist-lib/lib/kv-cache-reclaim.js +4 -2
- package/dist-lib/lib/kv-cache.js +8 -4
- package/dist-lib/lib/legacy-core-domain.d.ts +42 -42
- package/dist-lib/lib/log-buffer.js +2 -1
- package/dist-lib/lib/log.js +25 -15
- package/dist-lib/lib/mesh-scoped-engine.js +12 -4
- package/dist-lib/lib/model-catalog-revision.js +6 -3
- package/dist-lib/lib/model-clamp.js +6 -3
- package/dist-lib/lib/model-context.d.ts +8 -3
- package/dist-lib/lib/model-context.js +13 -5
- package/dist-lib/lib/model-download-status.js +4 -2
- package/dist-lib/lib/model-download.d.ts +12 -4
- package/dist-lib/lib/model-download.js +200 -103
- package/dist-lib/lib/model-idle-pusher.d.ts +2 -2
- package/dist-lib/lib/model-idle-pusher.js +3 -4
- package/dist-lib/lib/oauth/browser-connect.d.ts +10 -8
- package/dist-lib/lib/oauth/browser-connect.js +33 -20
- package/dist-lib/lib/oauth/client.d.ts +2 -2
- package/dist-lib/lib/oauth/flow-core.js +23 -9
- package/dist-lib/lib/oauth/flow.d.ts +1 -3
- package/dist-lib/lib/oauth/flow.js +9 -5
- package/dist-lib/lib/oauth/keys.d.ts +4 -4
- package/dist-lib/lib/oauth/keys.js +18 -12
- package/dist-lib/lib/oauth/loopback.d.ts +2 -2
- package/dist-lib/lib/oauth/loopback.js +147 -107
- package/dist-lib/lib/oauth/loopback.stub.d.ts +2 -2
- package/dist-lib/lib/oauth/loopback.stub.js +1 -1
- package/dist-lib/lib/oauth/pkce.d.ts +4 -2
- package/dist-lib/lib/oauth/pkce.js +10 -0
- package/dist-lib/lib/oauth/providers.js +5 -5
- package/dist-lib/lib/oauth/redirect-types.d.ts +12 -7
- package/dist-lib/lib/oauth/register.js +3 -2
- package/dist-lib/lib/oauth/registry.d.ts +2 -2
- package/dist-lib/lib/oauth/registry.js +2 -1
- package/dist-lib/lib/oauth/resolve.d.ts +30 -10
- package/dist-lib/lib/oauth/resolve.js +12 -6
- package/dist-lib/lib/oauth/token-exchange-core.d.ts +12 -4
- package/dist-lib/lib/oauth/token-exchange-core.js +1 -1
- package/dist-lib/lib/oauth/types.d.ts +12 -12
- package/dist-lib/lib/oauth.d.ts +4 -5
- package/dist-lib/lib/oauth.js +2 -3
- package/dist-lib/lib/reconnecting-watch.d.ts +1 -1
- package/dist-lib/lib/reconnecting-watch.js +6 -6
- package/dist-lib/lib/retry-budget.js +6 -3
- package/dist-lib/lib/run-notices.d.ts +1 -0
- package/dist-lib/lib/run-notices.js +5 -2
- package/dist-lib/lib/run-transcript.d.ts +2 -4
- package/dist-lib/lib/run-transcript.js +4 -2
- package/dist-lib/lib/skill-readiness.js +4 -2
- package/dist-lib/lib/skill-types.d.ts +16 -16
- package/dist-lib/lib/suspend-lifecycle.d.ts +4 -4
- package/dist-lib/lib/suspend-lifecycle.js +10 -5
- package/dist-lib/lib/task.js +22 -12
- package/dist-lib/lib/unref.d.ts +3 -2
- package/dist-lib/lib/unref.js +2 -1
- package/dist-lib/lib/wav-duration.js +10 -5
- package/dist-lib/lib/write-queue.d.ts +5 -4
- package/dist-lib/lib/write-queue.js +2 -1
- package/dist-lib/schema/build.js +10 -6
- package/dist-lib/schema/config.d.ts +2 -3
- package/dist-lib/schema/content.d.ts +17 -2
- package/dist-lib/schema/content.js +2 -1
- package/dist-lib/schema/engine.d.ts +3 -2
- package/dist-lib/schema/engine.js +95 -6
- package/dist-lib/schema/field-order.js +22 -11
- package/dist-lib/schema/indexes.d.ts +22 -0
- package/dist-lib/schema/{helpers.js → indexes.js} +14 -57
- package/dist-lib/schema/local.d.ts +3 -2
- package/dist-lib/schema/local.js +7 -2
- package/dist-lib/schema/media-kind.d.ts +8 -0
- package/dist-lib/schema/media-kind.js +52 -0
- package/dist-lib/schema/qvac.d.ts +12 -9
- package/dist-lib/schema/qvac.js +8 -4
- package/dist-lib/spec/bind.js +12 -0
- package/dist-lib/spec/calls.js +4 -0
- package/dist-lib/spec/capabilities.d.ts +12 -4
- package/dist-lib/spec/hrpc/hrpc.json +54 -2
- package/dist-lib/spec/hrpc/index.js +53 -5
- package/dist-lib/spec/hrpc/messages.js +783 -494
- package/dist-lib/spec/hyperschema/index.js +783 -494
- package/dist-lib/spec/hyperschema/schema.json +247 -1
- package/dist-lib/spec/hyperschema/types.d.ts +69 -1
- package/dist-lib/spec/local/hyperdb/index.js +1 -1
- package/dist-lib/spec/local/hyperdb/messages.js +82 -14
- package/dist-lib/spec/local/hyperschema/index.js +42 -8
- package/dist-lib/spec/local/hyperschema/schema.json +27 -1
- package/dist-lib/spec/local/hyperschema/types.d.ts +6 -1
- package/dist-lib/spec/mesh/hyperdb/index.js +1 -1
- package/package.json +7 -3
- package/tui/app.mjs +2424 -941
- package/tui/boot.mjs +17 -46
- package/tui/index.mjs +10 -5
- package/tui/lib/boot-timing.mjs +8 -8
- package/tui/lib/busy-words.mjs +21 -22
- package/tui/lib/export.mjs +100 -32
- package/tui/lib/knowledge-command.mjs +64 -19
- package/tui/lib/knowledge-import.mjs +52 -18
- package/tui/lib/render.mjs +65 -33
- package/tui/lib/save-file.mjs +30 -13
- package/tui/lib/select.mjs +23 -5
- package/tui/lib/selection.mjs +6 -4
- package/tui/lib/setup.mjs +11 -19
- package/tui/lib/sidebar.mjs +23 -13
- package/tui/lib/splash.mjs +6 -7
- package/tui/lib/upload-frames.mjs +1 -2
- package/tui/lib/usage.mjs +13 -9
- package/tui/lib/wrap.mjs +35 -6
- package/tui/main.mjs +54 -78
- package/worker/assistant-sidecar.mjs +5 -10
- package/worker/stow-entry.mjs +7 -4
- package/dist-lib/lib/custom-model-source.d.ts +0 -15
- package/dist-lib/lib/custom-model-source.js +0 -46
- package/dist-lib/lib/oauth/common.d.ts +0 -38
- package/dist-lib/lib/oauth/common.js +0 -34
- package/dist-lib/schema/helpers.d.ts +0 -33
|
@@ -1,6 +1,17 @@
|
|
|
1
1
|
import type HyperDB from 'hyperdb';
|
|
2
2
|
import type { Router } from '../../../spec/mesh/hyperdispatch/index.js';
|
|
3
3
|
import type { QvacDevice, QvacMember } from '../../../spec/mesh/hyperschema/types.d.ts';
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
interface MemberClaim {
|
|
5
|
+
readonly deviceId: Buffer;
|
|
6
|
+
readonly writerKey: Buffer;
|
|
7
|
+
readonly memberId: Buffer;
|
|
8
|
+
readonly claim: Buffer;
|
|
9
|
+
}
|
|
10
|
+
export declare function provenMember(meshPublicKey: Buffer, { deviceId, writerKey, memberId, claim }: MemberClaim): Promise<Buffer | null>;
|
|
11
|
+
interface LinkMemberOptions {
|
|
12
|
+
readonly member: QvacMember;
|
|
13
|
+
readonly proof: Buffer;
|
|
14
|
+
}
|
|
15
|
+
export declare function linkMember(tx: HyperDB, device: QvacDevice, { member, proof }: LinkMemberOptions): Promise<QvacMember>;
|
|
6
16
|
export declare function registerMemberRoutes(router: Router): void;
|
|
17
|
+
export {};
|
|
@@ -5,19 +5,18 @@ import { liveDeviceForWriter, trackActivity } from './activity.js';
|
|
|
5
5
|
import { meshKind } from './mesh-kind.js';
|
|
6
6
|
import { admitDevice } from './writers.js';
|
|
7
7
|
import b4a from 'b4a';
|
|
8
|
-
|
|
9
|
-
const MEMBERS = '@qvac/members';
|
|
10
|
-
const FOUNDERS = '@qvac/mesh-founders';
|
|
8
|
+
import { DEVICES, MEMBERS, MESH_FOUNDERS } from '../collections.js';
|
|
11
9
|
function hex(buffer) {
|
|
12
10
|
return b4a.toHex(buffer).slice(0, 16);
|
|
13
11
|
}
|
|
14
|
-
export async function provenMember(meshPublicKey, deviceId, writerKey, memberId, claim) {
|
|
12
|
+
export async function provenMember(meshPublicKey, { deviceId, writerKey, memberId, claim }) {
|
|
15
13
|
const attestation = claimAttestation(meshPublicKey, deviceId, writerKey);
|
|
16
|
-
if (!(await verifyMemberClaim(claim, { memberId, deviceId, attestation })))
|
|
14
|
+
if (!(await verifyMemberClaim(claim, { memberId, deviceId, attestation }))) {
|
|
17
15
|
return null;
|
|
16
|
+
}
|
|
18
17
|
return bareDeviceProof(claim);
|
|
19
18
|
}
|
|
20
|
-
export async function linkMember(tx, device, member, proof) {
|
|
19
|
+
export async function linkMember(tx, device, { member, proof }) {
|
|
21
20
|
const existing = await tx.get(MEMBERS, { id: member.id });
|
|
22
21
|
const joined = existing ?? {
|
|
23
22
|
id: member.id,
|
|
@@ -25,12 +24,13 @@ export async function linkMember(tx, device, member, proof) {
|
|
|
25
24
|
joinedAt: member.joinedAt,
|
|
26
25
|
updatedAt: member.updatedAt
|
|
27
26
|
};
|
|
28
|
-
if (!existing)
|
|
27
|
+
if (!existing) {
|
|
29
28
|
await tx.insert(MEMBERS, joined);
|
|
30
|
-
|
|
29
|
+
}
|
|
30
|
+
await tx.insert(DEVICES, link(device, { memberId: member.id, proof, attestedAt: member.joinedAt }));
|
|
31
31
|
return joined;
|
|
32
32
|
}
|
|
33
|
-
function link(device, memberId, proof, attestedAt) {
|
|
33
|
+
function link(device, { memberId, proof, attestedAt }) {
|
|
34
34
|
return {
|
|
35
35
|
...device,
|
|
36
36
|
memberId,
|
|
@@ -66,14 +66,14 @@ export function registerMemberRoutes(router) {
|
|
|
66
66
|
updatedAt: member.updatedAt
|
|
67
67
|
};
|
|
68
68
|
await tx.insert(MEMBERS, minted);
|
|
69
|
-
await tx.insert(
|
|
70
|
-
await tx.insert(DEVICES, link(minter, member.id, proof, member.joinedAt));
|
|
69
|
+
await tx.insert(MESH_FOUNDERS, { id: 'mesh', memberId: member.id });
|
|
70
|
+
await tx.insert(DEVICES, link(minter, { memberId: member.id, proof, attestedAt: member.joinedAt }));
|
|
71
71
|
log?.info('contract', 'member minted', { id: b4a.toHex(member.id).slice(0, 16) });
|
|
72
72
|
return minted;
|
|
73
73
|
}));
|
|
74
74
|
router.add('@qvac/update-member', trackActivity(async ({ member }, { tx, node, log }) => {
|
|
75
75
|
const author = await liveDeviceForWriter(tx, node.key);
|
|
76
|
-
if (!author?.memberId
|
|
76
|
+
if (!author?.memberId || !b4a.equals(author.memberId, member.id)) {
|
|
77
77
|
log?.warn('contract', 'update-member dropped: the writer is no device of this member');
|
|
78
78
|
return;
|
|
79
79
|
}
|
|
@@ -112,7 +112,7 @@ export function registerMemberRoutes(router) {
|
|
|
112
112
|
return;
|
|
113
113
|
}
|
|
114
114
|
if (author.memberId) {
|
|
115
|
-
if (author.memberId
|
|
115
|
+
if (b4a.equals(author.memberId, member.id)) {
|
|
116
116
|
log?.debug('contract', 'join-member dropped: the device is already owned by this member', ids);
|
|
117
117
|
}
|
|
118
118
|
else {
|
|
@@ -123,7 +123,12 @@ export function registerMemberRoutes(router) {
|
|
|
123
123
|
}
|
|
124
124
|
return;
|
|
125
125
|
}
|
|
126
|
-
const stored = await provenMember(meshPublicKey,
|
|
126
|
+
const stored = await provenMember(meshPublicKey, {
|
|
127
|
+
deviceId: author.id,
|
|
128
|
+
writerKey: node.key,
|
|
129
|
+
memberId: member.id,
|
|
130
|
+
claim: proof
|
|
131
|
+
});
|
|
127
132
|
if (!stored) {
|
|
128
133
|
log?.warn('contract', 'join-member dropped: the claim does not bind this mesh and writer', {
|
|
129
134
|
...ids,
|
|
@@ -132,7 +137,7 @@ export function registerMemberRoutes(router) {
|
|
|
132
137
|
});
|
|
133
138
|
return;
|
|
134
139
|
}
|
|
135
|
-
const joined = await linkMember(tx, author, member, stored);
|
|
140
|
+
const joined = await linkMember(tx, author, { member, proof: stored });
|
|
136
141
|
log?.info('contract', 'member joined', ids);
|
|
137
142
|
return joined;
|
|
138
143
|
}));
|
|
@@ -164,7 +169,7 @@ export function registerMemberRoutes(router) {
|
|
|
164
169
|
log?.warn('contract', 'recover-device dropped: the device was removed', ids);
|
|
165
170
|
return;
|
|
166
171
|
}
|
|
167
|
-
if (existing?.memberId && !
|
|
172
|
+
if (existing?.memberId && !b4a.equals(existing.memberId, memberId)) {
|
|
168
173
|
log?.warn('contract', 'recover-device dropped: the device is owned by another member', ids);
|
|
169
174
|
return;
|
|
170
175
|
}
|
|
@@ -173,16 +178,29 @@ export function registerMemberRoutes(router) {
|
|
|
173
178
|
deviceId,
|
|
174
179
|
attestation: claimAttestation(meshPublicKey, deviceId, node.key)
|
|
175
180
|
});
|
|
176
|
-
|
|
181
|
+
const deviceProof = recovered ? bareDeviceProof(proof) : null;
|
|
182
|
+
if (!deviceProof) {
|
|
177
183
|
log?.warn('contract', "recover-device dropped: the claim is not the identity's own", ids);
|
|
178
184
|
return;
|
|
179
185
|
}
|
|
180
|
-
const admission = await admitDevice(context,
|
|
181
|
-
|
|
186
|
+
const admission = await admitDevice(context, payload.device, {
|
|
187
|
+
id: deviceId,
|
|
188
|
+
writerKey: node.key,
|
|
189
|
+
claim: payload
|
|
190
|
+
});
|
|
191
|
+
if (admission === 'refused') {
|
|
182
192
|
return;
|
|
193
|
+
}
|
|
183
194
|
await host.addWriter(node.key);
|
|
184
195
|
const admitted = await tx.get(DEVICES, { id: deviceId });
|
|
185
|
-
|
|
196
|
+
if (!admitted) {
|
|
197
|
+
return;
|
|
198
|
+
}
|
|
199
|
+
await tx.insert(DEVICES, link(admitted, {
|
|
200
|
+
memberId,
|
|
201
|
+
proof: deviceProof,
|
|
202
|
+
attestedAt: payload.device.joinedAt
|
|
203
|
+
}));
|
|
186
204
|
log?.info('contract', 'device recovered into its member', ids);
|
|
187
205
|
return payload.device;
|
|
188
206
|
}));
|
|
@@ -192,16 +210,17 @@ export function registerMemberRoutes(router) {
|
|
|
192
210
|
log?.debug('contract', 'attest-member-device dropped: unknown device');
|
|
193
211
|
return;
|
|
194
212
|
}
|
|
195
|
-
if (device.memberId && !device.memberId
|
|
213
|
+
if (device.memberId && !b4a.equals(device.memberId, op.memberId)) {
|
|
196
214
|
log?.warn('contract', 'attest-member-device dropped: a device may not change member');
|
|
197
215
|
return;
|
|
198
216
|
}
|
|
199
217
|
const signer = await liveDeviceForWriter(tx, node.key);
|
|
200
|
-
if (signer?.id.equals(op.deviceId) && (await meshKind(tx)) === 'shared') {
|
|
218
|
+
if (signer?.id && b4a.equals(signer?.id, op.deviceId) && (await meshKind(tx)) === 'shared') {
|
|
201
219
|
log?.warn('contract', 'attest-member-device dropped: a shared mesh links a device only at admission');
|
|
202
220
|
return;
|
|
203
221
|
}
|
|
204
|
-
const speaksForMember = signer?.memberId
|
|
222
|
+
const speaksForMember = (!!signer?.memberId && b4a.equals(signer.memberId, op.memberId)) ||
|
|
223
|
+
(!!signer?.id && b4a.equals(signer.id, op.deviceId));
|
|
205
224
|
if (!speaksForMember) {
|
|
206
225
|
log?.warn('contract', 'attest-member-device dropped: the writer speaks for another member');
|
|
207
226
|
return;
|
|
@@ -215,11 +234,13 @@ export function registerMemberRoutes(router) {
|
|
|
215
234
|
log?.warn('contract', 'attest-member-device dropped: the proof does not stand');
|
|
216
235
|
return;
|
|
217
236
|
}
|
|
218
|
-
if (device.memberId
|
|
237
|
+
if (device.memberId &&
|
|
238
|
+
b4a.equals(device.memberId, op.memberId) &&
|
|
239
|
+
op.attestedAt <= (device.attestedAt || 0)) {
|
|
219
240
|
log?.debug('contract', 'attest-member-device dropped: not newer than the stored attestation');
|
|
220
241
|
return;
|
|
221
242
|
}
|
|
222
|
-
await tx.insert(DEVICES, link(device, op.memberId, op.proof, op.attestedAt));
|
|
243
|
+
await tx.insert(DEVICES, link(device, { memberId: op.memberId, proof: op.proof, attestedAt: op.attestedAt }));
|
|
223
244
|
log?.info('contract', 'device attested to a member', {
|
|
224
245
|
id: b4a.toHex(op.deviceId).slice(0, 16)
|
|
225
246
|
});
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { liveDeviceForWriter, trackActivity } from './activity.js';
|
|
2
|
-
|
|
2
|
+
import b4a from 'b4a';
|
|
3
|
+
import { MEMBERS, MESH_FOUNDERS, MESH_KINDS } from '../collections.js';
|
|
3
4
|
const ROW = 'mesh';
|
|
4
|
-
const MEMBERS = '@qvac/members';
|
|
5
|
-
const FOUNDERS = '@qvac/mesh-founders';
|
|
6
5
|
export async function meshKind(tx) {
|
|
7
6
|
const row = await tx.get(MESH_KINDS, { id: ROW });
|
|
8
7
|
return row?.kind ?? null;
|
|
@@ -13,13 +12,15 @@ async function mayMint(kind, { tx, host, node }, compute) {
|
|
|
13
12
|
if (kind !== 'account' || compute)
|
|
14
13
|
return false;
|
|
15
14
|
const memberId = (await liveDeviceForWriter(tx, node.key))?.memberId;
|
|
16
|
-
if (!memberId)
|
|
15
|
+
if (!memberId) {
|
|
17
16
|
return false;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
}
|
|
18
|
+
const founder = await tx.get(MESH_FOUNDERS, { id: ROW });
|
|
19
|
+
if (founder) {
|
|
20
|
+
return b4a.equals(founder.memberId, memberId);
|
|
21
|
+
}
|
|
21
22
|
for await (const member of tx.find(MEMBERS)) {
|
|
22
|
-
if (!member.id
|
|
23
|
+
if (!b4a.equals(member.id, memberId))
|
|
23
24
|
return false;
|
|
24
25
|
}
|
|
25
26
|
return true;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { trackActivity } from './activity.js';
|
|
2
|
-
|
|
3
|
-
const CHATS = '@qvac/chats';
|
|
4
|
-
const MESH_BLIND_PEERS = '@qvac/mesh-blind-peers';
|
|
2
|
+
import { AGENTS, CHATS, MESH_BLIND_PEERS } from '../collections.js';
|
|
5
3
|
export function registerSeedDefaultsRoutes(router) {
|
|
6
4
|
router.add('@qvac/seed-defaults', trackActivity(async (op, { tx, log }) => {
|
|
7
5
|
let seeded = false;
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { capToolActivityArguments } from '../../../schema/qvac.js';
|
|
2
|
-
|
|
3
|
-
const TOOL_ACTIVITY_COUNTERS = '@qvac/tool-activity-counter';
|
|
2
|
+
import { TOOL_ACTIVITY, TOOL_ACTIVITY_COUNTER } from '../collections.js';
|
|
4
3
|
export function registerToolActivityRoutes(router) {
|
|
5
4
|
router.add('@qvac/append-tool-activity', async ({ activity }, { tx, log }) => {
|
|
6
5
|
const existing = await tx.get(TOOL_ACTIVITY, { id: activity.id });
|
|
7
|
-
if (existing)
|
|
6
|
+
if (existing) {
|
|
8
7
|
return;
|
|
9
|
-
|
|
8
|
+
}
|
|
9
|
+
const counter = await tx.get(TOOL_ACTIVITY_COUNTER, {
|
|
10
10
|
agentId: activity.agentId
|
|
11
11
|
});
|
|
12
12
|
const seq = (counter?.count ?? 0) + 1;
|
|
13
13
|
const capped = capToolActivityArguments(activity.arguments);
|
|
14
|
-
await tx.insert(
|
|
14
|
+
await tx.insert(TOOL_ACTIVITY_COUNTER, {
|
|
15
15
|
agentId: activity.agentId,
|
|
16
16
|
count: seq
|
|
17
17
|
});
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { toolConfigsWithinBounds } from '../../../schema/qvac.js';
|
|
2
2
|
import { toolConfigsCarrySecret } from '../tool-configs.js';
|
|
3
3
|
import { trackActivity } from './activity.js';
|
|
4
|
-
|
|
5
|
-
const AGENTS = '@qvac/agents';
|
|
4
|
+
import { AGENTS, TOOL_CONFIGS } from '../collections.js';
|
|
6
5
|
export function registerToolConfigsRoutes(router) {
|
|
7
6
|
router.add('@qvac/put-tool-configs', trackActivity(async ({ settings }, { tx, log }) => {
|
|
8
7
|
if (!toolConfigsWithinBounds(settings.settings)) {
|
|
@@ -5,6 +5,11 @@ type Admission = 'admitted' | 'refused' | 'writer-only';
|
|
|
5
5
|
type Claim = Pick<QvacWriterClaim, 'claimedMemberId' | 'inviteToken'> & {
|
|
6
6
|
readonly deviceSignature?: Buffer | null;
|
|
7
7
|
};
|
|
8
|
-
|
|
8
|
+
interface WriterCandidate {
|
|
9
|
+
readonly id: Buffer;
|
|
10
|
+
readonly writerKey: Buffer;
|
|
11
|
+
readonly claim?: Claim;
|
|
12
|
+
}
|
|
13
|
+
export declare function admitDevice({ tx, node, host, meshPublicKey, log }: RouterContext, device: QvacDevice | null | undefined, { id, writerKey, claim }: WriterCandidate): Promise<Admission>;
|
|
9
14
|
export declare function registerWriterRoutes(router: Router): void;
|
|
10
15
|
export {};
|
|
@@ -7,27 +7,26 @@ import { isKickedRow } from '../helpers/index.js';
|
|
|
7
7
|
import { verifyDeviceProof } from '../identity.js';
|
|
8
8
|
import { sealed } from './seal.js';
|
|
9
9
|
import b4a from 'b4a';
|
|
10
|
-
|
|
11
|
-
const MEMBERS = '@qvac/members';
|
|
12
|
-
const GRANTS = '@qvac/mesh-invite-grants';
|
|
10
|
+
import { DEVICES, MEMBERS, MESH_INVITE_GRANTS } from '../collections.js';
|
|
13
11
|
async function boundToAnother(tx, writerKey, id) {
|
|
14
12
|
for await (const device of devicesByWriterKey(tx, writerKey)) {
|
|
15
|
-
if (!
|
|
13
|
+
if (!b4a.equals(device.id, id))
|
|
16
14
|
return true;
|
|
17
15
|
}
|
|
18
16
|
return false;
|
|
19
17
|
}
|
|
20
|
-
export async function admitDevice({ tx, node, host, meshPublicKey, log },
|
|
18
|
+
export async function admitDevice({ tx, node, host, meshPublicKey, log }, device, { id, writerKey, claim }) {
|
|
21
19
|
const existing = await tx.get(DEVICES, { id });
|
|
22
20
|
if ((await meshKind(tx)) === 'shared' && (await boundToAnother(tx, writerKey, id))) {
|
|
23
21
|
log?.warn('contract', 'admission refused: another device is bound to this writer key', {
|
|
24
|
-
id:
|
|
22
|
+
id: b4a.toHex(id).slice(0, 16)
|
|
25
23
|
});
|
|
26
24
|
return 'refused';
|
|
27
25
|
}
|
|
28
26
|
if (!device) {
|
|
29
|
-
if (!existing)
|
|
27
|
+
if (!existing) {
|
|
30
28
|
return 'writer-only';
|
|
29
|
+
}
|
|
31
30
|
log?.debug('contract', 'admission refused: no profile to weigh against the existing row');
|
|
32
31
|
return 'refused';
|
|
33
32
|
}
|
|
@@ -38,7 +37,7 @@ export async function admitDevice({ tx, node, host, meshPublicKey, log }, id, de
|
|
|
38
37
|
joinedAt: device.joinedAt
|
|
39
38
|
});
|
|
40
39
|
const bound = existing?.writerKey ?? null;
|
|
41
|
-
const rebinding = bound !== null && !
|
|
40
|
+
const rebinding = bound !== null && !b4a.equals(bound, writerKey);
|
|
42
41
|
const alreadyAdmitted = bound !== null && !rebinding && !existing?.revoked;
|
|
43
42
|
const reclaims = signed && existing && !existing.deviceSignature;
|
|
44
43
|
if (existing &&
|
|
@@ -47,7 +46,7 @@ export async function admitDevice({ tx, node, host, meshPublicKey, log }, id, de
|
|
|
47
46
|
log?.debug('contract', 'admission refused: claim is not newer than the device row');
|
|
48
47
|
return 'refused';
|
|
49
48
|
}
|
|
50
|
-
if (alreadyAdmitted && !node.key
|
|
49
|
+
if (alreadyAdmitted && !b4a.equals(node.key, writerKey)) {
|
|
51
50
|
log?.warn('contract', 'admission refused: another writer may not rewrite a live device row', {
|
|
52
51
|
id: b4a.toHex(id).slice(0, 16)
|
|
53
52
|
});
|
|
@@ -74,7 +73,7 @@ export async function admitDevice({ tx, node, host, meshPublicKey, log }, id, de
|
|
|
74
73
|
appBuild: device.appBuild ?? existing?.appBuild,
|
|
75
74
|
appChannel: device.appChannel ?? existing?.appChannel,
|
|
76
75
|
platform: device.platform ?? existing?.platform,
|
|
77
|
-
deviceSignature: signed ? claim
|
|
76
|
+
deviceSignature: signed ? claim?.deviceSignature : existing?.deviceSignature,
|
|
78
77
|
claimedMemberId: claim?.claimedMemberId ?? existing?.claimedMemberId,
|
|
79
78
|
inviteToken: claim?.inviteToken ?? existing?.inviteToken,
|
|
80
79
|
id,
|
|
@@ -85,9 +84,9 @@ export async function admitDevice({ tx, node, host, meshPublicKey, log }, id, de
|
|
|
85
84
|
});
|
|
86
85
|
if (rebinding) {
|
|
87
86
|
await host.removeWriter(bound);
|
|
88
|
-
await markWriterRevoked(tx, bound, true);
|
|
87
|
+
await markWriterRevoked(tx, bound, { revoked: true });
|
|
89
88
|
}
|
|
90
|
-
await markWriterRevoked(tx, writerKey, false);
|
|
89
|
+
await markWriterRevoked(tx, writerKey, { revoked: false });
|
|
91
90
|
if (!alreadyAdmitted) {
|
|
92
91
|
log?.info('contract', 'device admitted', { id: b4a.toHex(id).slice(0, 16) });
|
|
93
92
|
}
|
|
@@ -95,18 +94,20 @@ export async function admitDevice({ tx, node, host, meshPublicKey, log }, id, de
|
|
|
95
94
|
}
|
|
96
95
|
async function hasStanding({ tx, node }) {
|
|
97
96
|
const author = await liveDeviceForWriter(tx, node.key);
|
|
98
|
-
if (!author?.memberId)
|
|
97
|
+
if (!author?.memberId) {
|
|
99
98
|
return false;
|
|
99
|
+
}
|
|
100
100
|
return (await tx.get(MEMBERS, { id: author.memberId })) !== null;
|
|
101
101
|
}
|
|
102
102
|
async function revokeIssuedGrants({ tx, node }, issued) {
|
|
103
103
|
const live = [];
|
|
104
|
-
for await (const grant of tx.find(
|
|
105
|
-
if (!grant.revokedAt && issued(grant))
|
|
104
|
+
for await (const grant of tx.find(MESH_INVITE_GRANTS)) {
|
|
105
|
+
if (!grant.revokedAt && issued(grant)) {
|
|
106
106
|
live.push(grant);
|
|
107
|
+
}
|
|
107
108
|
}
|
|
108
109
|
for (const grant of live) {
|
|
109
|
-
await tx.insert(
|
|
110
|
+
await tx.insert(MESH_INVITE_GRANTS, {
|
|
110
111
|
...grant,
|
|
111
112
|
revokedAt: node.timestamp,
|
|
112
113
|
revokedBy: node.key
|
|
@@ -116,16 +117,17 @@ async function revokeIssuedGrants({ tx, node }, issued) {
|
|
|
116
117
|
async function revokeWriter(payload, context) {
|
|
117
118
|
await context.host.removeWriter(payload.writerKey);
|
|
118
119
|
const id = payload.deviceId;
|
|
119
|
-
if (!id)
|
|
120
|
+
if (!id) {
|
|
120
121
|
return;
|
|
122
|
+
}
|
|
121
123
|
const existing = await context.tx.get(DEVICES, { id });
|
|
122
124
|
if (!existing) {
|
|
123
125
|
context.log?.debug('contract', 'remove-writer: no device row to revoke');
|
|
124
126
|
return;
|
|
125
127
|
}
|
|
126
128
|
const current = existing.writerKey;
|
|
127
|
-
if (current && !
|
|
128
|
-
if (context.node.key
|
|
129
|
+
if (current && !b4a.equals(current, payload.writerKey)) {
|
|
130
|
+
if (b4a.equals(context.node.key, payload.writerKey) || b4a.equals(context.node.key, current)) {
|
|
129
131
|
context.log?.debug('contract', 'remove-writer dropped: writer key already superseded');
|
|
130
132
|
return;
|
|
131
133
|
}
|
|
@@ -138,18 +140,20 @@ async function revokeWriter(payload, context) {
|
|
|
138
140
|
revokedBy: context.node.key
|
|
139
141
|
};
|
|
140
142
|
await context.tx.insert(DEVICES, revoked);
|
|
141
|
-
await markWriterRevoked(context.tx, current ?? payload.writerKey, true);
|
|
143
|
+
await markWriterRevoked(context.tx, current ?? payload.writerKey, { revoked: true });
|
|
142
144
|
context.log?.info('contract', 'writer removed, device revoked', {
|
|
143
145
|
id: b4a.toHex(id).slice(0, 16)
|
|
144
146
|
});
|
|
145
|
-
await revokeIssuedGrants(context, (grant) => grant.issuerDeviceId
|
|
147
|
+
await revokeIssuedGrants(context, (grant) => !!grant.issuerDeviceId && b4a.equals(grant.issuerDeviceId, id));
|
|
146
148
|
const owner = existing.memberId ?? existing.claimedMemberId;
|
|
147
149
|
const kicker = owner && (await liveDeviceForWriter(context.tx, context.node.key));
|
|
148
|
-
|
|
150
|
+
const kickerMember = kicker ? (kicker.memberId ?? kicker.claimedMemberId) : null;
|
|
151
|
+
if (owner && kicker && !(kickerMember && b4a.equals(kickerMember, owner))) {
|
|
149
152
|
await recordMemberRemoval(context.tx, owner);
|
|
150
153
|
}
|
|
151
|
-
if (context.node.key
|
|
154
|
+
if (b4a.equals(context.node.key, payload.writerKey)) {
|
|
152
155
|
return;
|
|
156
|
+
}
|
|
153
157
|
return revoked;
|
|
154
158
|
}
|
|
155
159
|
export function registerWriterRoutes(router) {
|
|
@@ -169,18 +173,23 @@ export function registerWriterRoutes(router) {
|
|
|
169
173
|
const existing = await context.tx.get(DEVICES, { id: payload.device.id });
|
|
170
174
|
const signedLive = existing && !existing.revoked && existing.deviceSignature;
|
|
171
175
|
const bound = signedLive ? existing.writerKey : null;
|
|
172
|
-
if (bound && !
|
|
176
|
+
if (bound && !b4a.equals(bound, payload.writerKey)) {
|
|
173
177
|
context.log?.warn('contract', 'add-writer dropped: it may not move a live device');
|
|
174
178
|
return;
|
|
175
179
|
}
|
|
176
|
-
const admission = await admitDevice(context, payload.device
|
|
177
|
-
|
|
180
|
+
const admission = await admitDevice(context, payload.device, {
|
|
181
|
+
id: payload.device.id,
|
|
182
|
+
writerKey: payload.writerKey,
|
|
183
|
+
claim: payload
|
|
184
|
+
});
|
|
185
|
+
if (admission !== 'admitted') {
|
|
178
186
|
return;
|
|
187
|
+
}
|
|
179
188
|
await context.host.addWriter(payload.writerKey);
|
|
180
189
|
return payload.device;
|
|
181
190
|
}));
|
|
182
191
|
router.add('@qvac/remove-writer', trackActivity(async (payload, context) => {
|
|
183
|
-
const self = context.node.key
|
|
192
|
+
const self = b4a.equals(context.node.key, payload.writerKey);
|
|
184
193
|
if (!self && !(await hasStanding(context))) {
|
|
185
194
|
context.log?.warn('contract', 'remove-writer dropped: the author speaks for no member here');
|
|
186
195
|
return;
|
|
@@ -195,15 +204,16 @@ export function registerWriterRoutes(router) {
|
|
|
195
204
|
const removals = [];
|
|
196
205
|
for await (const device of context.tx.find(DEVICES)) {
|
|
197
206
|
const claims = device.memberId ?? device.claimedMemberId;
|
|
198
|
-
if (device.revoked || !device.writerKey || !claims
|
|
207
|
+
if (device.revoked || !device.writerKey || !claims || !b4a.equals(claims, memberId)) {
|
|
199
208
|
continue;
|
|
209
|
+
}
|
|
200
210
|
removals.push({ writerKey: device.writerKey, deviceId: device.id, revokedAt });
|
|
201
211
|
}
|
|
202
212
|
let removed;
|
|
203
213
|
for (const removal of removals) {
|
|
204
214
|
removed = (await revokeWriter(removal, context)) ?? removed;
|
|
205
215
|
}
|
|
206
|
-
await revokeIssuedGrants(context, (grant) => grant.issuerMemberId
|
|
216
|
+
await revokeIssuedGrants(context, (grant) => !!grant.issuerMemberId && b4a.equals(grant.issuerMemberId, memberId));
|
|
207
217
|
return removed;
|
|
208
218
|
}));
|
|
209
219
|
router.add('@qvac/join', trackActivity(async (payload, context) => {
|
|
@@ -228,9 +238,14 @@ export function registerWriterRoutes(router) {
|
|
|
228
238
|
await context.host.addWriter(context.node.key);
|
|
229
239
|
return;
|
|
230
240
|
}
|
|
231
|
-
const admission = await admitDevice(context,
|
|
232
|
-
|
|
241
|
+
const admission = await admitDevice(context, payload.device, {
|
|
242
|
+
id,
|
|
243
|
+
writerKey: context.node.key,
|
|
244
|
+
claim: payload
|
|
245
|
+
});
|
|
246
|
+
if (admission === 'refused') {
|
|
233
247
|
return;
|
|
248
|
+
}
|
|
234
249
|
await context.host.addWriter(context.node.key);
|
|
235
250
|
return admission === 'admitted' ? payload.device : null;
|
|
236
251
|
}));
|
|
@@ -268,15 +283,21 @@ export function registerWriterRoutes(router) {
|
|
|
268
283
|
log?.warn('contract', 'vouched-join dropped: the joiner was removed from this mesh');
|
|
269
284
|
return;
|
|
270
285
|
}
|
|
271
|
-
if (existing &&
|
|
286
|
+
if (existing &&
|
|
287
|
+
!existing.revoked &&
|
|
288
|
+
!(existing.writerKey && b4a.equals(existing.writerKey, writerKey))) {
|
|
272
289
|
log?.warn('contract', 'vouched-join dropped: the joiner is live here on another writer');
|
|
273
290
|
return;
|
|
274
291
|
}
|
|
275
|
-
const admission = await admitDevice(context,
|
|
276
|
-
if (admission === 'refused')
|
|
292
|
+
const admission = await admitDevice(context, device, { id, writerKey, claim: payload });
|
|
293
|
+
if (admission === 'refused') {
|
|
277
294
|
return;
|
|
295
|
+
}
|
|
278
296
|
await context.host.addWriter(writerKey);
|
|
279
297
|
const admitted = await tx.get(DEVICES, { id });
|
|
298
|
+
if (!admitted) {
|
|
299
|
+
return;
|
|
300
|
+
}
|
|
280
301
|
const proven = payload.memberProof &&
|
|
281
302
|
(await verifyDeviceProof(payload.memberProof, { memberId, deviceId: id }));
|
|
282
303
|
await tx.insert(DEVICES, {
|
|
@@ -31,8 +31,9 @@ export class PendingDepartures {
|
|
|
31
31
|
async _flush() {
|
|
32
32
|
await this._lock.lock();
|
|
33
33
|
try {
|
|
34
|
-
if (this._closing)
|
|
34
|
+
if (this._closing) {
|
|
35
35
|
return;
|
|
36
|
+
}
|
|
36
37
|
for (const row of await this._local.departures()) {
|
|
37
38
|
if (this._closing)
|
|
38
39
|
return;
|
|
@@ -63,13 +64,15 @@ export class PendingDepartures {
|
|
|
63
64
|
const scope = [...SCOPE, b4a.toHex(row.key).slice(0, 8)];
|
|
64
65
|
try {
|
|
65
66
|
await mesh.ready();
|
|
66
|
-
if (this._closing || mesh.closing)
|
|
67
|
+
if (this._closing || mesh.closing) {
|
|
67
68
|
return;
|
|
69
|
+
}
|
|
68
70
|
this._swarm.join(mesh.discoveryKey, { server: true, client: true });
|
|
69
71
|
mesh.startBlindPeering(this._swarm.dht);
|
|
70
72
|
this._log?.info(scope, 'reopened a departed mesh to deliver its removal');
|
|
71
|
-
if (!(await waitForDelivery(mesh)))
|
|
73
|
+
if (!(await waitForDelivery(mesh))) {
|
|
72
74
|
return;
|
|
75
|
+
}
|
|
73
76
|
await this._local.deleteDeparture(row.key);
|
|
74
77
|
this._log?.info(scope, 'departure delivered');
|
|
75
78
|
}
|
|
@@ -84,8 +87,9 @@ export class PendingDepartures {
|
|
|
84
87
|
try {
|
|
85
88
|
this._parked.add(hex);
|
|
86
89
|
const entry = this._active.get(hex);
|
|
87
|
-
if (!entry)
|
|
90
|
+
if (!entry) {
|
|
88
91
|
return;
|
|
92
|
+
}
|
|
89
93
|
await entry.mesh.close().catch(noop);
|
|
90
94
|
await entry.done;
|
|
91
95
|
}
|
|
@@ -100,12 +104,14 @@ export class PendingDepartures {
|
|
|
100
104
|
return this._local.deleteDeparture(key);
|
|
101
105
|
}
|
|
102
106
|
async suspend() {
|
|
103
|
-
for (const { mesh } of this._active.values())
|
|
107
|
+
for (const { mesh } of this._active.values()) {
|
|
104
108
|
await mesh.suspend();
|
|
109
|
+
}
|
|
105
110
|
}
|
|
106
111
|
async resume() {
|
|
107
|
-
for (const { mesh } of this._active.values())
|
|
112
|
+
for (const { mesh } of this._active.values()) {
|
|
108
113
|
await mesh.resume();
|
|
114
|
+
}
|
|
109
115
|
}
|
|
110
116
|
async close() {
|
|
111
117
|
this._closing = true;
|
|
@@ -120,8 +126,9 @@ function waitForDelivery(mesh) {
|
|
|
120
126
|
let uploaded = 0;
|
|
121
127
|
const delivered = () => local.length > 0 &&
|
|
122
128
|
(uploaded >= local.length || local.peers.some((peer) => peer.remoteLength >= local.length));
|
|
123
|
-
if (delivered())
|
|
129
|
+
if (delivered()) {
|
|
124
130
|
return Promise.resolve(true);
|
|
131
|
+
}
|
|
125
132
|
return new Promise((resolve) => {
|
|
126
133
|
const settle = (ok) => {
|
|
127
134
|
local.off('upload', onUpload);
|
|
@@ -131,8 +138,9 @@ function waitForDelivery(mesh) {
|
|
|
131
138
|
resolve(ok);
|
|
132
139
|
};
|
|
133
140
|
const check = () => {
|
|
134
|
-
if (delivered())
|
|
141
|
+
if (delivered()) {
|
|
135
142
|
settle(true);
|
|
143
|
+
}
|
|
136
144
|
};
|
|
137
145
|
const onUpload = (index) => {
|
|
138
146
|
uploaded = Math.max(uploaded, index + 1);
|
|
@@ -14,7 +14,7 @@ export function openDeviceInvites(store) {
|
|
|
14
14
|
return (Array.isArray(value) ? value : []).filter((entry) => typeof entry?.nonce === 'string' && now - entry.issuedAt < INVITE_TTL_MS);
|
|
15
15
|
}
|
|
16
16
|
function matching(issued, token, deviceId) {
|
|
17
|
-
return issued.findIndex(({ nonce }) => deviceInviteToken(
|
|
17
|
+
return issued.findIndex(({ nonce }) => b4a.equals(deviceInviteToken(b4a.from(nonce, 'hex'), deviceId), token));
|
|
18
18
|
}
|
|
19
19
|
return {
|
|
20
20
|
async issue() {
|
|
@@ -42,8 +42,9 @@ export function openDeviceInvites(store) {
|
|
|
42
42
|
try {
|
|
43
43
|
const issued = await outstanding();
|
|
44
44
|
const index = matching(issued, token, deviceId);
|
|
45
|
-
if (index === -1 || issued[index].spent)
|
|
45
|
+
if (index === -1 || issued[index].spent) {
|
|
46
46
|
return false;
|
|
47
|
+
}
|
|
47
48
|
await store.set(NONCES_KEY, issued.map((entry, i) => (i === index ? { ...entry, spent: true } : entry)));
|
|
48
49
|
return true;
|
|
49
50
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { readinessForAgents } from '../skill-readiness.js';
|
|
2
2
|
import { listAgents } from './agent.js';
|
|
3
|
+
import { DEVICES } from './collections.js';
|
|
3
4
|
export async function saveDeviceCapabilities(store, input, isAccount) {
|
|
4
5
|
const report = isAccount(store) ? input : await hostedOnly(store, input);
|
|
5
6
|
await store.dispatch('report-device-capabilities', report);
|
|
@@ -10,13 +11,14 @@ export async function retractInventory(store, deviceId, isAccount) {
|
|
|
10
11
|
const snap = store.view.snapshot();
|
|
11
12
|
let row;
|
|
12
13
|
try {
|
|
13
|
-
row = await snap.get(
|
|
14
|
+
row = await snap.get(DEVICES, { id: deviceId });
|
|
14
15
|
}
|
|
15
16
|
finally {
|
|
16
17
|
await snap.close();
|
|
17
18
|
}
|
|
18
|
-
if (!row)
|
|
19
|
+
if (!row) {
|
|
19
20
|
return;
|
|
21
|
+
}
|
|
20
22
|
const trimmed = await hostedOnly(store, {
|
|
21
23
|
deviceId,
|
|
22
24
|
installedToolNames: [],
|
|
@@ -33,8 +35,9 @@ export async function retractInventory(store, deviceId, isAccount) {
|
|
|
33
35
|
row.toolCatalog
|
|
34
36
|
].some((list) => list?.length) ||
|
|
35
37
|
(row.readySkillNames?.length ?? 0) > (trimmed.readySkillNames?.length ?? 0);
|
|
36
|
-
if (leaked)
|
|
38
|
+
if (leaked) {
|
|
37
39
|
await store.dispatch('report-device-capabilities', trimmed);
|
|
40
|
+
}
|
|
38
41
|
}
|
|
39
42
|
async function hostedOnly(store, input) {
|
|
40
43
|
const hosted = new Set((await listAgents(store, input.deviceId)).map((agent) => agent.id));
|