@antelopejs/dms-assistant 0.1.0 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -17
- package/dist/builder/config.d.ts +1 -0
- package/dist/builder/config.js +9 -0
- package/dist/builder/config.js.map +1 -1
- package/dist/builder/constants/routes.d.ts +1 -0
- package/dist/builder/constants/routes.js +1 -0
- package/dist/builder/constants/routes.js.map +1 -1
- package/dist/builder/index.js +2 -0
- package/dist/builder/index.js.map +1 -1
- package/dist/builder/reload.d.ts +2 -0
- package/dist/builder/reload.js +24 -0
- package/dist/builder/reload.js.map +1 -0
- package/dist/builder/routes/database.d.ts +3 -0
- package/dist/builder/routes/database.js +11 -0
- package/dist/builder/routes/database.js.map +1 -1
- package/dist/constants/i18n.d.ts +1 -1
- package/dist/constants/i18n.js +1 -1
- package/dist/constants/i18n.js.map +1 -1
- package/dist/constants/project-mcp.d.ts +0 -2
- package/dist/constants/project-mcp.js +1 -3
- package/dist/constants/project-mcp.js.map +1 -1
- package/dist/constants/sidecar.d.ts +6 -6
- package/dist/constants/sidecar.js +6 -6
- package/dist/constants/sidecar.js.map +1 -1
- package/dist/index.js +0 -2
- package/dist/index.js.map +1 -1
- package/dist/lifecycle/project-mcp-json.js +6 -37
- package/dist/lifecycle/project-mcp-json.js.map +1 -1
- package/dist/lifecycle/sidecar-unavailable-error.js +1 -1
- package/dist/lifecycle/sidecar-unavailable-error.js.map +1 -1
- package/dist/pages/activity/page.js +1 -1
- package/dist/pages/activity/page.js.map +1 -1
- package/dist/pages/changes/page.js +1 -1
- package/dist/pages/changes/page.js.map +1 -1
- package/dist/routes/activity.js +1 -1
- package/dist/routes/activity.js.map +1 -1
- package/dist/vocabulary/enumerations.js +0 -1
- package/dist/vocabulary/enumerations.js.map +1 -1
- package/dist/vocabulary/tools.js +1 -1
- package/dist/vocabulary/tools.js.map +1 -1
- package/frontend-vue/app/chat/components/AnswerRecord.vue +3 -3
- package/frontend-vue/app/chat/components/ApprovalDock.vue +15 -11
- package/frontend-vue/app/chat/components/BlockOutline.vue +10 -10
- package/frontend-vue/app/chat/components/BlockPreviewCard.vue +9 -7
- package/frontend-vue/app/chat/components/BlockPreviewModal.vue +15 -14
- package/frontend-vue/app/chat/components/BlockPreviewThumb.vue +1 -1
- package/frontend-vue/app/chat/components/BuildDialog.vue +16 -13
- package/frontend-vue/app/chat/components/ChangeSetCard.vue +15 -13
- package/frontend-vue/app/chat/components/ChatEmpty.vue +4 -4
- package/frontend-vue/app/chat/components/ChatView.vue +45 -101
- package/frontend-vue/app/chat/components/Composer.vue +42 -34
- package/frontend-vue/app/chat/components/ConnectionBanner.vue +6 -5
- package/frontend-vue/app/chat/components/ConversationDrawer.vue +33 -27
- package/frontend-vue/app/chat/components/DiffView.vue +1 -1
- package/frontend-vue/app/chat/components/FoldBar.vue +34 -28
- package/frontend-vue/app/chat/components/MessageList.vue +10 -10
- package/frontend-vue/app/chat/components/NoticeCard.vue +17 -17
- package/frontend-vue/app/chat/components/PanelHeader.vue +16 -15
- package/frontend-vue/app/chat/components/PermissionCard.vue +11 -11
- package/frontend-vue/app/chat/components/PlanCard.vue +5 -5
- package/frontend-vue/app/chat/components/ProviderNotice.vue +6 -4
- package/frontend-vue/app/chat/components/QuestionDock.vue +13 -10
- package/frontend-vue/app/chat/components/QueueDock.vue +17 -15
- package/frontend-vue/app/chat/components/RulesList.vue +9 -5
- package/frontend-vue/app/chat/components/StepsDock.vue +2 -2
- package/frontend-vue/app/chat/components/ToolCluster.vue +3 -3
- package/frontend-vue/app/chat/components/ToolRow.vue +4 -4
- package/frontend-vue/app/chat/components/TurnErrorCard.vue +5 -5
- package/frontend-vue/app/chat/components/UndoConflictModal.vue +4 -4
- package/frontend-vue/app/chat/components/chat-tokens.css +83 -0
- package/frontend-vue/app/chat/composables/useChatI18n.ts +2 -1
- package/frontend-vue/app/chat/composables/useComposerAttachments.ts +3 -3
- package/frontend-vue/app/chat/constants/conversation.ts +4 -4
- package/frontend-vue/app/chat/constants/protocol.ts +2 -1
- package/frontend-vue/app/chat/constants/run-status.ts +6 -6
- package/frontend-vue/app/chat/types/protocol.ts +0 -7
- package/frontend-vue/app/chat/utils/permission-view.ts +44 -36
- package/frontend-vue/app/chat/utils/status-label.ts +7 -5
- package/frontend-vue/app/chat/utils/suggestions.ts +9 -9
- package/frontend-vue/app/chat/utils/tool-lexicon.ts +4 -4
- package/frontend-vue/app/components/ActivityDetail.vue +15 -13
- package/frontend-vue/app/components/ChangesView.vue +20 -20
- package/frontend-vue/app/components/ChatPanel.vue +31 -31
- package/frontend-vue/app/components/LauncherIcon.vue +44 -38
- package/frontend-vue/app/components/Onboarding.vue +3 -3
- package/frontend-vue/app/components/OnboardingWidget.vue +8 -4
- package/frontend-vue/app/components/PaletteAnswer.vue +27 -23
- package/frontend-vue/app/onboarding/analysis-lead.ts +66 -0
- package/frontend-vue/app/onboarding/connect-database.ts +92 -21
- package/frontend-vue/app/onboarding/connect-memory.ts +204 -0
- package/frontend-vue/app/onboarding/controller.ts +44 -6
- package/frontend-vue/app/onboarding/install.ts +7 -2
- package/frontend-vue/app/onboarding/runtime.ts +4 -4
- package/frontend-vue/app/plugins/ai.client.ts +8 -8
- package/frontend-vue/app/plugins/side-panel.ts +1 -1
- package/frontend-vue/app/runtime/assistant-actions.ts +6 -4
- package/frontend-vue/app/runtime/assistant-commands.ts +31 -16
- package/frontend-vue/app/runtime/assistant-notifications.ts +17 -9
- package/frontend-vue/app/runtime/assistant-session.ts +1 -1
- package/frontend-vue/app/runtime/channel-client.ts +1 -1
- package/frontend-vue/app/runtime/constants.ts +11 -11
- package/frontend-vue/app/runtime/sidecar-status.ts +1 -1
- package/frontend-vue/app/views/ChangeSetPanel.vue +20 -20
- package/frontend-vue/app/views/DecisionLabel.vue +1 -1
- package/frontend-vue/app/views/DiffView.vue +6 -6
- package/frontend-vue/app/views/ResultPill.vue +4 -2
- package/frontend-vue/app/views/RowStepper.vue +3 -3
- package/frontend-vue/app/views/UnavailableState.vue +5 -5
- package/frontend-vue/app/views/composables/useAiData.ts +1 -1
- package/frontend-vue/app/views/composables/useChangeSetActions.ts +13 -5
- package/frontend-vue/app/views/composables/useViewFormat.ts +1 -1
- package/frontend-vue/app/views/constants.ts +0 -1
- package/frontend-vue/app/views/onboarding/OnboardingAi.vue +15 -15
- package/frontend-vue/app/views/onboarding/OnboardingAnalysis.vue +13 -13
- package/frontend-vue/app/views/onboarding/OnboardingClaude.vue +14 -14
- package/frontend-vue/app/views/onboarding/OnboardingCodex.vue +11 -11
- package/frontend-vue/app/views/onboarding/OnboardingConnected.vue +4 -4
- package/frontend-vue/app/views/onboarding/OnboardingContinue.vue +18 -18
- package/frontend-vue/app/views/onboarding/OnboardingDatabase.vue +37 -33
- package/frontend-vue/app/views/onboarding/OnboardingDontShow.vue +1 -1
- package/frontend-vue/app/views/onboarding/OnboardingPaths.vue +7 -7
- package/frontend-vue/app/views/onboarding/OnboardingReady.vue +5 -5
- package/frontend-vue/app/views/onboarding/OnboardingScratch.vue +9 -9
- package/frontend-vue/app/views/onboarding/OnboardingWelcome.vue +11 -11
- package/frontend-vue/app/views/onboarding/login-text.ts +6 -6
- package/frontend-vue/app/views/types.ts +0 -1
- package/frontend-vue/app/views/utils/moment.ts +2 -2
- package/frontend-vue/builder/app/runtime/api.ts +2 -0
- package/frontend-vue/builder/app/runtime/database-build.ts +23 -1
- package/frontend-vue/builder/app/runtime/database-connect.ts +5 -0
- package/frontend-vue/builder/tests/database-connect.test.ts +1 -1
- package/frontend-vue/dms.frontend.ts +2 -2
- package/frontend-vue/i18n/locales/builder-en-GB.json +1 -1
- package/frontend-vue/i18n/locales/builder-fr-FR.json +1 -1
- package/frontend-vue/i18n/locales/{dms-ai-pages-en-GB.json → dms-assistant-pages-en-GB.json} +2 -3
- package/frontend-vue/i18n/locales/{dms-ai-pages-fr-FR.json → dms-assistant-pages-fr-FR.json} +2 -3
- package/frontend-vue/i18n/locales/{dms-ai-panel-en-GB.json → dms-assistant-panel-en-GB.json} +1 -2
- package/frontend-vue/i18n/locales/{dms-ai-panel-fr-FR.json → dms-assistant-panel-fr-FR.json} +1 -2
- package/frontend-vue/i18n/locales/{dms-ai-views-en-GB.json → dms-assistant-views-en-GB.json} +2 -3
- package/frontend-vue/i18n/locales/{dms-ai-views-fr-FR.json → dms-assistant-views-fr-FR.json} +2 -3
- package/frontend-vue/package.json +2 -2
- package/frontend-vue/pnpm-lock.yaml +71 -21
- package/frontend-vue/tests/chat/block-target.test.ts +1 -1
- package/frontend-vue/tests/chat/build-view.test.ts +9 -5
- package/frontend-vue/tests/chat/chat-scroll.test.ts +1 -1
- package/frontend-vue/tests/chat/held-card.test.ts +2 -2
- package/frontend-vue/tests/chat/provider-notice.test.ts +1 -1
- package/frontend-vue/tests/chat/tool-lexicon.test.ts +16 -10
- package/frontend-vue/tests/chat-panel.test.ts +10 -10
- package/frontend-vue/tests/chat-transport.test.ts +1 -1
- package/frontend-vue/tests/launcher-icon.test.ts +1 -1
- package/frontend-vue/tests/launcher-label.test.ts +40 -0
- package/frontend-vue/tests/onboarding-connect-memory.test.ts +126 -0
- package/frontend-vue/tests/onboarding-controller-restart.test.ts +134 -0
- package/frontend-vue/tests/onboarding-controller.test.ts +58 -0
- package/frontend-vue/tests/onboarding-database-engines.test.ts +2 -2
- package/frontend-vue/tests/onboarding-database-new-url.test.ts +174 -0
- package/frontend-vue/tests/onboarding-database-reload.test.ts +229 -0
- package/frontend-vue/tests/onboarding-database-tabs.test.ts +184 -0
- package/frontend-vue/tests/onboarding-database.test.ts +13 -118
- package/frontend-vue/tests/palette-assistant.test.ts +8 -8
- package/frontend-vue/tests/panel-approvals.test.ts +1 -1
- package/frontend-vue/tests/panel-closed-conversation.test.ts +53 -0
- package/frontend-vue/tests/panel-mockup-prompt.test.ts +2 -2
- package/frontend-vue/tests/panel-modes.test.ts +1 -16
- package/frontend-vue/tests/panel-questions.test.ts +1 -1
- package/frontend-vue/tests/panel-states.test.ts +1 -1
- package/frontend-vue/tests/panel-tools.test.ts +2 -2
- package/frontend-vue/tests/sidecar-guest.test.ts +1 -1
- package/frontend-vue/tests/support/api-error-presenter.ts +4 -2
- package/frontend-vue/tests/support/database-connect.ts +129 -0
- package/frontend-vue/tests/support/i18n.ts +1 -1
- package/frontend-vue/tests/support/onboarding-host.ts +1 -0
- package/frontend-vue/tests/support/onboarding.ts +29 -1
- package/frontend-vue/tests/views/api-data-reads.test.ts +7 -3
- package/frontend-vue/tests/views/diff-view.test.ts +4 -2
- package/package.json +5 -8
- package/sidecar/dist/agent/permission-bus.d.ts +1 -0
- package/sidecar/dist/agent/permission-bus.js +1 -0
- package/sidecar/dist/agent/permission-bus.js.map +1 -1
- package/sidecar/dist/agent/question-bus.d.ts +1 -0
- package/sidecar/dist/agent/question-bus.js +3 -0
- package/sidecar/dist/agent/question-bus.js.map +1 -1
- package/sidecar/dist/audit/activity-query.js +0 -1
- package/sidecar/dist/audit/activity-query.js.map +1 -1
- package/sidecar/dist/audit/activity.js +11 -3
- package/sidecar/dist/audit/activity.js.map +1 -1
- package/sidecar/dist/constants/audit.d.ts +1 -1
- package/sidecar/dist/constants/audit.js +0 -1
- package/sidecar/dist/constants/audit.js.map +1 -1
- package/sidecar/dist/constants/chatgpt.d.ts +7 -7
- package/sidecar/dist/constants/chatgpt.js +6 -6
- package/sidecar/dist/constants/chatgpt.js.map +1 -1
- package/sidecar/dist/constants/checkpoints.d.ts +2 -2
- package/sidecar/dist/constants/checkpoints.js +2 -2
- package/sidecar/dist/constants/checkpoints.js.map +1 -1
- package/sidecar/dist/constants/codex.d.ts +9 -9
- package/sidecar/dist/constants/codex.js +8 -8
- package/sidecar/dist/constants/codex.js.map +1 -1
- package/sidecar/dist/constants/daemon.d.ts +2 -2
- package/sidecar/dist/constants/daemon.js +2 -2
- package/sidecar/dist/constants/daemon.js.map +1 -1
- package/sidecar/dist/constants/env.d.ts +1 -1
- package/sidecar/dist/constants/env.js +1 -1
- package/sidecar/dist/constants/env.js.map +1 -1
- package/sidecar/dist/constants/mcp.d.ts +4 -4
- package/sidecar/dist/constants/mcp.js +2 -2
- package/sidecar/dist/constants/mcp.js.map +1 -1
- package/sidecar/dist/constants/paths.d.ts +1 -1
- package/sidecar/dist/constants/paths.js +5 -1
- package/sidecar/dist/constants/paths.js.map +1 -1
- package/sidecar/dist/constants/preview.d.ts +2 -2
- package/sidecar/dist/constants/preview.js +2 -17
- package/sidecar/dist/constants/preview.js.map +1 -1
- package/sidecar/dist/constants/providers.d.ts +2 -2
- package/sidecar/dist/constants/providers.js +2 -2
- package/sidecar/dist/constants/providers.js.map +1 -1
- package/sidecar/dist/constants/settings.d.ts +1 -1
- package/sidecar/dist/constants/settings.js +1 -1
- package/sidecar/dist/constants/settings.js.map +1 -1
- package/sidecar/dist/constants/skills.d.ts +1 -1
- package/sidecar/dist/constants/skills.js +1 -1
- package/sidecar/dist/constants/skills.js.map +1 -1
- package/sidecar/dist/constants/state.d.ts +2 -1
- package/sidecar/dist/constants/state.js +2 -1
- package/sidecar/dist/constants/state.js.map +1 -1
- package/sidecar/dist/constants/tool-titles.d.ts +0 -40
- package/sidecar/dist/constants/tool-titles.js +0 -42
- package/sidecar/dist/constants/tool-titles.js.map +1 -1
- package/sidecar/dist/index.js +5 -6
- package/sidecar/dist/index.js.map +1 -1
- package/sidecar/dist/mcp/tools/preview-blocks.js +24 -19
- package/sidecar/dist/mcp/tools/preview-blocks.js.map +1 -1
- package/sidecar/dist/mcp/types.d.ts +1 -1
- package/sidecar/dist/prompts/agent.js +1 -1
- package/sidecar/dist/prompts/agent.js.map +1 -1
- package/sidecar/dist/protocol/events.d.ts +10 -28
- package/sidecar/dist/protocol/events.js +7 -5
- package/sidecar/dist/protocol/events.js.map +1 -1
- package/sidecar/dist/protocol/preview.js +1 -1
- package/sidecar/dist/protocol/preview.js.map +1 -1
- package/sidecar/dist/providers/codex/permission-profiles.d.ts +1 -1
- package/sidecar/dist/providers/codex/permission-profiles.js +1 -1
- package/sidecar/dist/providers/codex/permission-profiles.js.map +1 -1
- package/sidecar/dist/server/chat-socket-registry.d.ts +1 -0
- package/sidecar/dist/server/chat-socket-registry.js +14 -0
- package/sidecar/dist/server/chat-socket-registry.js.map +1 -1
- package/sidecar/dist/server/host-command-router.d.ts +9 -2
- package/sidecar/dist/server/host-command-router.js +5 -2
- package/sidecar/dist/server/host-command-router.js.map +1 -1
- package/sidecar/dist/server/host-page.d.ts +3 -0
- package/sidecar/dist/server/host-page.js +5 -0
- package/sidecar/dist/server/host-page.js.map +1 -0
- package/sidecar/dist/server/host-socket-registry.d.ts +1 -1
- package/sidecar/dist/server/host-socket-registry.js +6 -6
- package/sidecar/dist/server/host-socket-registry.js.map +1 -1
- package/sidecar/dist/server/routing.js +62 -20
- package/sidecar/dist/server/routing.js.map +1 -1
- package/sidecar/dist/server/turns.js +11 -3
- package/sidecar/dist/server/turns.js.map +1 -1
- package/sidecar/dist/server/ws.js +10 -2
- package/sidecar/dist/server/ws.js.map +1 -1
- package/sidecar/dist/skills/plugin-wrapper.js +1 -1
- package/sidecar/dist/skills/plugin-wrapper.js.map +1 -1
- package/sidecar/dist/state/conversations.d.ts +3 -1
- package/sidecar/dist/state/conversations.js +54 -3
- package/sidecar/dist/state/conversations.js.map +1 -1
- package/sidecar/dist/state/host-state.d.ts +2 -2
- package/sidecar/dist/state/host-state.js +6 -6
- package/sidecar/dist/state/host-state.js.map +1 -1
- package/sidecar/dist/state/settings-store.js +1 -14
- package/sidecar/dist/state/settings-store.js.map +1 -1
- package/sidecar/dist/state/store.d.ts +1 -0
- package/sidecar/dist/state/store.js +16 -9
- package/sidecar/dist/state/store.js.map +1 -1
- package/sidecar/dist/state/stored-schemas.js +0 -4
- package/sidecar/dist/state/stored-schemas.js.map +1 -1
- package/sidecar/dist/state/types.d.ts +2 -5
- package/sidecar/dist/state/types.js.map +1 -1
- package/sidecar/package.json +3 -2
- package/skills/{dms-ai → dms-assistant}/SKILL.md +6 -6
- package/skills/{dms-ai → dms-assistant}/cases.json +13 -13
- package/skills/{dms-ai-code-mode → dms-assistant-code-mode}/SKILL.md +7 -7
- package/skills/{dms-ai-code-mode → dms-assistant-code-mode}/cases.json +11 -11
- package/dist/lifecycle/builder-settings-move.d.ts +0 -1
- package/dist/lifecycle/builder-settings-move.js +0 -182
- package/dist/lifecycle/builder-settings-move.js.map +0 -1
- package/dist/lifecycle/builder-settings-plan.d.ts +0 -59
- package/dist/lifecycle/builder-settings-plan.js +0 -176
- package/dist/lifecycle/builder-settings-plan.js.map +0 -1
- package/dist/lifecycle/builder-settings-text.d.ts +0 -19
- package/dist/lifecycle/builder-settings-text.js +0 -82
- package/dist/lifecycle/builder-settings-text.js.map +0 -1
- package/dist/lifecycle/entry-verdict.d.ts +0 -15
- package/dist/lifecycle/entry-verdict.js +0 -30
- package/dist/lifecycle/entry-verdict.js.map +0 -1
- package/dist/lifecycle/environment-bindings.d.ts +0 -8
- package/dist/lifecycle/environment-bindings.js +0 -154
- package/dist/lifecycle/environment-bindings.js.map +0 -1
- package/dist/lifecycle/legacy-entries.d.ts +0 -8
- package/dist/lifecycle/legacy-entries.js +0 -126
- package/dist/lifecycle/legacy-entries.js.map +0 -1
- package/sidecar/dist/mcp/sketch-refusals.d.ts +0 -2
- package/sidecar/dist/mcp/sketch-refusals.js +0 -6
- package/sidecar/dist/mcp/sketch-refusals.js.map +0 -1
- package/sidecar/dist/state/legacy-tool-names.d.ts +0 -3
- package/sidecar/dist/state/legacy-tool-names.js +0 -34
- package/sidecar/dist/state/legacy-tool-names.js.map +0 -1
|
@@ -11,14 +11,14 @@ const state = computed<LauncherState>(
|
|
|
11
11
|
</script>
|
|
12
12
|
|
|
13
13
|
<template>
|
|
14
|
-
<span class="dms-
|
|
15
|
-
<UIcon :name="LAUNCHER_ICON" class="dms-
|
|
16
|
-
<span class="dms-
|
|
14
|
+
<span class="dms-assistant-launcher" :data-state="state" aria-hidden="true">
|
|
15
|
+
<UIcon :name="LAUNCHER_ICON" class="dms-assistant-launcher__icon" />
|
|
16
|
+
<span class="dms-assistant-launcher__dot" />
|
|
17
17
|
</span>
|
|
18
18
|
</template>
|
|
19
19
|
|
|
20
20
|
<style scoped>
|
|
21
|
-
.dms-
|
|
21
|
+
.dms-assistant-launcher {
|
|
22
22
|
position: relative;
|
|
23
23
|
display: inline-flex;
|
|
24
24
|
width: 18px;
|
|
@@ -26,7 +26,7 @@ const state = computed<LauncherState>(
|
|
|
26
26
|
flex: none;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
.dms-
|
|
29
|
+
.dms-assistant-launcher__icon {
|
|
30
30
|
width: 18px;
|
|
31
31
|
height: 18px;
|
|
32
32
|
transform-origin: center;
|
|
@@ -35,7 +35,7 @@ const state = computed<LauncherState>(
|
|
|
35
35
|
opacity 0.2s ease;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
.dms-
|
|
38
|
+
.dms-assistant-launcher__dot {
|
|
39
39
|
position: absolute;
|
|
40
40
|
right: -3px;
|
|
41
41
|
bottom: -3px;
|
|
@@ -53,7 +53,7 @@ const state = computed<LauncherState>(
|
|
|
53
53
|
background-color 0.2s ease;
|
|
54
54
|
}
|
|
55
55
|
|
|
56
|
-
.dms-
|
|
56
|
+
.dms-assistant-launcher__dot::after {
|
|
57
57
|
content: "";
|
|
58
58
|
position: absolute;
|
|
59
59
|
inset: 0;
|
|
@@ -62,65 +62,71 @@ const state = computed<LauncherState>(
|
|
|
62
62
|
opacity: 0;
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
.dms-
|
|
65
|
+
.dms-assistant-launcher:not([data-state="connected"])
|
|
66
|
+
.dms-assistant-launcher__dot {
|
|
66
67
|
opacity: 1;
|
|
67
68
|
transform: scale(1);
|
|
68
69
|
}
|
|
69
70
|
|
|
70
|
-
.dms-
|
|
71
|
+
.dms-assistant-launcher[data-state="disconnected"]
|
|
72
|
+
.dms-assistant-launcher__icon {
|
|
71
73
|
opacity: 0.4;
|
|
72
74
|
}
|
|
73
75
|
|
|
74
|
-
.dms-
|
|
76
|
+
.dms-assistant-launcher[data-state="disconnected"]
|
|
77
|
+
.dms-assistant-launcher__dot {
|
|
75
78
|
background: var(--ui-bg);
|
|
76
79
|
border: 1.5px solid var(--ui-text-dimmed);
|
|
77
80
|
box-shadow: none;
|
|
78
81
|
}
|
|
79
82
|
|
|
80
|
-
.dms-
|
|
81
|
-
animation: dms-
|
|
83
|
+
.dms-assistant-launcher[data-state="connected"] {
|
|
84
|
+
animation: dms-assistant-launcher-settle 0.45s ease-out;
|
|
82
85
|
}
|
|
83
86
|
|
|
84
|
-
.dms-
|
|
87
|
+
.dms-assistant-launcher[data-state="working"] .dms-assistant-launcher__icon {
|
|
85
88
|
color: var(--ui-primary);
|
|
86
|
-
animation: dms-
|
|
89
|
+
animation: dms-assistant-launcher-twinkle 2.6s ease-in-out infinite;
|
|
87
90
|
}
|
|
88
91
|
|
|
89
|
-
.dms-
|
|
92
|
+
.dms-assistant-launcher[data-state="working"] .dms-assistant-launcher__dot {
|
|
90
93
|
background: var(--ui-primary);
|
|
91
94
|
}
|
|
92
95
|
|
|
93
|
-
.dms-
|
|
94
|
-
animation: dms-
|
|
96
|
+
.dms-assistant-launcher[data-state="finished"] .dms-assistant-launcher__icon {
|
|
97
|
+
animation: dms-assistant-launcher-pop 0.5s cubic-bezier(0.34, 1.56, 0.64, 1);
|
|
95
98
|
}
|
|
96
99
|
|
|
97
|
-
.dms-
|
|
100
|
+
.dms-assistant-launcher[data-state="finished"] .dms-assistant-launcher__dot {
|
|
98
101
|
background: var(--ui-success);
|
|
99
|
-
animation: dms-
|
|
102
|
+
animation: dms-assistant-launcher-dot-in 0.5s
|
|
103
|
+
cubic-bezier(0.34, 1.56, 0.64, 1);
|
|
100
104
|
}
|
|
101
105
|
|
|
102
|
-
.dms-
|
|
103
|
-
animation: dms-
|
|
106
|
+
.dms-assistant-launcher[data-state="question"] .dms-assistant-launcher__icon {
|
|
107
|
+
animation: dms-assistant-launcher-nudge 5s ease-in-out infinite;
|
|
104
108
|
}
|
|
105
109
|
|
|
106
|
-
.dms-
|
|
110
|
+
.dms-assistant-launcher[data-state="question"] .dms-assistant-launcher__dot {
|
|
107
111
|
background: var(--ui-warning);
|
|
108
112
|
box-shadow:
|
|
109
113
|
0 0 0 1.5px var(--ui-bg),
|
|
110
114
|
0 0 0 3.5px color-mix(in srgb, var(--ui-warning) 35%, transparent);
|
|
111
115
|
}
|
|
112
116
|
|
|
113
|
-
.dms-
|
|
114
|
-
|
|
117
|
+
.dms-assistant-launcher[data-state="question"]
|
|
118
|
+
.dms-assistant-launcher__dot::after {
|
|
119
|
+
animation: dms-assistant-launcher-ping 1.8s cubic-bezier(0, 0, 0.2, 1)
|
|
120
|
+
infinite;
|
|
115
121
|
}
|
|
116
122
|
|
|
117
|
-
@keyframes dms-
|
|
123
|
+
@keyframes dms-assistant-launcher-settle {
|
|
118
124
|
from {
|
|
119
125
|
transform: scale(0.88);
|
|
120
126
|
}
|
|
121
127
|
}
|
|
122
128
|
|
|
123
|
-
@keyframes dms-
|
|
129
|
+
@keyframes dms-assistant-launcher-twinkle {
|
|
124
130
|
0%,
|
|
125
131
|
100% {
|
|
126
132
|
opacity: 1;
|
|
@@ -132,7 +138,7 @@ const state = computed<LauncherState>(
|
|
|
132
138
|
}
|
|
133
139
|
}
|
|
134
140
|
|
|
135
|
-
@keyframes dms-
|
|
141
|
+
@keyframes dms-assistant-launcher-pop {
|
|
136
142
|
0% {
|
|
137
143
|
transform: scale(0.8);
|
|
138
144
|
}
|
|
@@ -141,14 +147,14 @@ const state = computed<LauncherState>(
|
|
|
141
147
|
}
|
|
142
148
|
}
|
|
143
149
|
|
|
144
|
-
@keyframes dms-
|
|
150
|
+
@keyframes dms-assistant-launcher-dot-in {
|
|
145
151
|
from {
|
|
146
152
|
opacity: 0;
|
|
147
153
|
transform: scale(0);
|
|
148
154
|
}
|
|
149
155
|
}
|
|
150
156
|
|
|
151
|
-
@keyframes dms-
|
|
157
|
+
@keyframes dms-assistant-launcher-nudge {
|
|
152
158
|
0%,
|
|
153
159
|
84%,
|
|
154
160
|
100% {
|
|
@@ -165,7 +171,7 @@ const state = computed<LauncherState>(
|
|
|
165
171
|
}
|
|
166
172
|
}
|
|
167
173
|
|
|
168
|
-
@keyframes dms-
|
|
174
|
+
@keyframes dms-assistant-launcher-ping {
|
|
169
175
|
0% {
|
|
170
176
|
opacity: 0.55;
|
|
171
177
|
transform: scale(1);
|
|
@@ -177,19 +183,19 @@ const state = computed<LauncherState>(
|
|
|
177
183
|
}
|
|
178
184
|
}
|
|
179
185
|
|
|
180
|
-
:root.dms-reduce-motion .dms-
|
|
181
|
-
:root.dms-reduce-motion .dms-
|
|
182
|
-
:root.dms-reduce-motion .dms-
|
|
183
|
-
:root.dms-reduce-motion .dms-
|
|
186
|
+
:root.dms-reduce-motion .dms-assistant-launcher,
|
|
187
|
+
:root.dms-reduce-motion .dms-assistant-launcher__icon,
|
|
188
|
+
:root.dms-reduce-motion .dms-assistant-launcher__dot,
|
|
189
|
+
:root.dms-reduce-motion .dms-assistant-launcher__dot::after {
|
|
184
190
|
animation: none !important;
|
|
185
191
|
transition: none;
|
|
186
192
|
}
|
|
187
193
|
|
|
188
194
|
@media (prefers-reduced-motion: reduce) {
|
|
189
|
-
:root:not(.dms-full-motion) .dms-
|
|
190
|
-
:root:not(.dms-full-motion) .dms-
|
|
191
|
-
:root:not(.dms-full-motion) .dms-
|
|
192
|
-
:root:not(.dms-full-motion) .dms-
|
|
195
|
+
:root:not(.dms-full-motion) .dms-assistant-launcher,
|
|
196
|
+
:root:not(.dms-full-motion) .dms-assistant-launcher__icon,
|
|
197
|
+
:root:not(.dms-full-motion) .dms-assistant-launcher__dot,
|
|
198
|
+
:root:not(.dms-full-motion) .dms-assistant-launcher__dot::after {
|
|
193
199
|
animation: none !important;
|
|
194
200
|
transition: none;
|
|
195
201
|
}
|
|
@@ -47,7 +47,7 @@ function toggle(open: boolean): void {
|
|
|
47
47
|
<UModal
|
|
48
48
|
v-if="controller && view"
|
|
49
49
|
:open="controller.isOpen.value"
|
|
50
|
-
:title="t('
|
|
50
|
+
:title="t('dms_assistant.views.onboarding.widget.label')"
|
|
51
51
|
:content="{ onInteractOutside: keepOpen }"
|
|
52
52
|
:ui="{
|
|
53
53
|
content:
|
|
@@ -62,7 +62,7 @@ function toggle(open: boolean): void {
|
|
|
62
62
|
class="flex gap-1.5"
|
|
63
63
|
role="img"
|
|
64
64
|
:aria-label="
|
|
65
|
-
t('
|
|
65
|
+
t('dms_assistant.views.onboarding.progress', { step: progress + 1 })
|
|
66
66
|
"
|
|
67
67
|
>
|
|
68
68
|
<span
|
|
@@ -77,7 +77,7 @@ function toggle(open: boolean): void {
|
|
|
77
77
|
color="neutral"
|
|
78
78
|
variant="ghost"
|
|
79
79
|
size="sm"
|
|
80
|
-
:aria-label="t('
|
|
80
|
+
:aria-label="t('dms_assistant.views.onboarding.close')"
|
|
81
81
|
@click="controller.close()"
|
|
82
82
|
/>
|
|
83
83
|
</div>
|
|
@@ -31,22 +31,26 @@ const mockups = computed(
|
|
|
31
31
|
<div class="flex items-center gap-2">
|
|
32
32
|
<DmsIconWell icon="i-ph-sparkle" tone="secondary" size="2xs" />
|
|
33
33
|
<span class="text-highlighted text-sm font-semibold">
|
|
34
|
-
{{ t("
|
|
34
|
+
{{ t("dms_assistant.views.onboarding.widget.label") }}
|
|
35
35
|
</span>
|
|
36
36
|
</div>
|
|
37
37
|
<dl class="grid grid-cols-[4.5rem_1fr] gap-x-2 gap-y-1.5 text-[13px]">
|
|
38
|
-
<dt class="text-muted">
|
|
38
|
+
<dt class="text-muted">
|
|
39
|
+
{{ t("dms_assistant.views.onboarding.widget.ai") }}
|
|
40
|
+
</dt>
|
|
39
41
|
<dd class="text-highlighted flex items-center gap-1.5">
|
|
40
42
|
<span
|
|
41
43
|
class="size-1.5 rounded-full"
|
|
42
44
|
:class="account ? 'bg-success' : 'bg-warning'"
|
|
43
45
|
aria-hidden="true"
|
|
44
46
|
/>
|
|
45
|
-
{{
|
|
47
|
+
{{
|
|
48
|
+
account ?? t("dms_assistant.views.onboarding.widget.not_connected")
|
|
49
|
+
}}
|
|
46
50
|
</dd>
|
|
47
51
|
<template v-if="mockups > 0">
|
|
48
52
|
<dt class="text-muted">
|
|
49
|
-
{{ t("
|
|
53
|
+
{{ t("dms_assistant.views.onboarding.widget.mockups") }}
|
|
50
54
|
</dt>
|
|
51
55
|
<dd class="text-highlighted">{{ mockups }}</dd>
|
|
52
56
|
</template>
|
|
@@ -72,30 +72,30 @@ onBeforeUnmount(() => {
|
|
|
72
72
|
</script>
|
|
73
73
|
|
|
74
74
|
<template>
|
|
75
|
-
<div class="dms-
|
|
76
|
-
<p v-if="turn === null" class="dms-
|
|
77
|
-
{{ t("
|
|
75
|
+
<div class="dms-assistant-palette-answer dms-assistant-chat-tokens">
|
|
76
|
+
<p v-if="turn === null" class="dms-assistant-palette-answer__note">
|
|
77
|
+
{{ t("dms_assistant.panel.palette.answer.not_running") }}
|
|
78
78
|
</p>
|
|
79
79
|
<template v-else>
|
|
80
|
-
<p class="dms-
|
|
80
|
+
<p class="dms-assistant-palette-answer__mode">
|
|
81
81
|
<UIcon name="i-ph-eye" />
|
|
82
|
-
{{ t("
|
|
82
|
+
{{ t("dms_assistant.panel.palette.answer.read_only") }}
|
|
83
83
|
</p>
|
|
84
84
|
<p
|
|
85
85
|
v-if="isStarting"
|
|
86
|
-
class="dms-
|
|
86
|
+
class="dms-assistant-palette-answer__progress"
|
|
87
87
|
role="status"
|
|
88
88
|
>
|
|
89
89
|
<span class="spin-ai" />
|
|
90
90
|
{{
|
|
91
91
|
turn.channel.isConnected.value
|
|
92
|
-
? t("
|
|
93
|
-
: t("
|
|
92
|
+
? t("dms_assistant.panel.palette.answer.thinking")
|
|
93
|
+
: t("dms_assistant.panel.status.connecting")
|
|
94
94
|
}}
|
|
95
95
|
</p>
|
|
96
96
|
<MessageList
|
|
97
97
|
v-else
|
|
98
|
-
class="dms-
|
|
98
|
+
class="dms-assistant-palette-answer__stream"
|
|
99
99
|
:messages="answer"
|
|
100
100
|
:change-sets="turn.conversation.changeSets.value"
|
|
101
101
|
:busy-change-set-ids="NO_BUSY_CHANGE_SETS"
|
|
@@ -112,26 +112,30 @@ onBeforeUnmount(() => {
|
|
|
112
112
|
@run-plan="continueInAssistant"
|
|
113
113
|
@edit-plan="continueInAssistant"
|
|
114
114
|
/>
|
|
115
|
-
<p
|
|
115
|
+
<p
|
|
116
|
+
v-if="isWaiting"
|
|
117
|
+
class="dms-assistant-palette-answer__waiting"
|
|
118
|
+
role="alert"
|
|
119
|
+
>
|
|
116
120
|
<UIcon name="i-ph-hand-palm" />
|
|
117
|
-
{{ t("
|
|
121
|
+
{{ t("dms_assistant.panel.palette.answer.waiting") }}
|
|
118
122
|
</p>
|
|
119
123
|
</template>
|
|
120
|
-
<div class="dms-
|
|
124
|
+
<div class="dms-assistant-palette-answer__actions">
|
|
121
125
|
<UButton
|
|
122
126
|
v-if="turn !== null"
|
|
123
127
|
size="sm"
|
|
124
128
|
color="secondary"
|
|
125
129
|
:variant="isWaiting ? 'solid' : 'soft'"
|
|
126
130
|
icon="i-ph-sidebar-simple"
|
|
127
|
-
:label="t('
|
|
131
|
+
:label="t('dms_assistant.panel.palette.answer.continue')"
|
|
128
132
|
@click="continueInAssistant"
|
|
129
133
|
/>
|
|
130
134
|
<UButton
|
|
131
135
|
size="sm"
|
|
132
136
|
color="neutral"
|
|
133
137
|
variant="ghost"
|
|
134
|
-
:label="t('
|
|
138
|
+
:label="t('dms_assistant.panel.palette.answer.close')"
|
|
135
139
|
@click="props.close()"
|
|
136
140
|
/>
|
|
137
141
|
</div>
|
|
@@ -139,16 +143,16 @@ onBeforeUnmount(() => {
|
|
|
139
143
|
</template>
|
|
140
144
|
|
|
141
145
|
<style scoped>
|
|
142
|
-
.dms-
|
|
146
|
+
.dms-assistant-palette-answer {
|
|
143
147
|
display: flex;
|
|
144
148
|
flex-direction: column;
|
|
145
149
|
gap: 10px;
|
|
146
150
|
font-size: 13px;
|
|
147
151
|
}
|
|
148
152
|
|
|
149
|
-
.dms-
|
|
150
|
-
.dms-
|
|
151
|
-
.dms-
|
|
153
|
+
.dms-assistant-palette-answer__mode,
|
|
154
|
+
.dms-assistant-palette-answer__progress,
|
|
155
|
+
.dms-assistant-palette-answer__waiting {
|
|
152
156
|
display: flex;
|
|
153
157
|
align-items: center;
|
|
154
158
|
gap: 6px;
|
|
@@ -157,27 +161,27 @@ onBeforeUnmount(() => {
|
|
|
157
161
|
color: var(--ui-text-muted);
|
|
158
162
|
}
|
|
159
163
|
|
|
160
|
-
.dms-
|
|
164
|
+
.dms-assistant-palette-answer__waiting {
|
|
161
165
|
color: var(--ui-warning);
|
|
162
166
|
font-weight: 500;
|
|
163
167
|
}
|
|
164
168
|
|
|
165
|
-
.dms-
|
|
169
|
+
.dms-assistant-palette-answer__stream {
|
|
166
170
|
max-height: min(46vh, 420px);
|
|
167
171
|
overflow-y: auto;
|
|
168
172
|
}
|
|
169
173
|
|
|
170
174
|
/* The palette's frame already names the assistant. */
|
|
171
|
-
.dms-
|
|
175
|
+
.dms-assistant-palette-answer__stream :deep(.cb-who) {
|
|
172
176
|
display: none;
|
|
173
177
|
}
|
|
174
178
|
|
|
175
|
-
.dms-
|
|
179
|
+
.dms-assistant-palette-answer__note {
|
|
176
180
|
margin: 0;
|
|
177
181
|
color: var(--ui-text-muted);
|
|
178
182
|
}
|
|
179
183
|
|
|
180
|
-
.dms-
|
|
184
|
+
.dms-assistant-palette-answer__actions {
|
|
181
185
|
display: flex;
|
|
182
186
|
flex-wrap: wrap;
|
|
183
187
|
gap: 6px;
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
type Locks = Pick<LockManager, "request">;
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Which follow of a connection starts and answers its analysis: one follow at a time across the
|
|
5
|
+
* tabs of the browser, so a tab duplicated while a connection loads, which copies the remembered
|
|
6
|
+
* connection, follows the same analysis without a second request. The lead is a Web Lock, which a
|
|
7
|
+
* closed tab releases. Where the browser has no Web Locks, outside a secure context, or refuses them, in a sandboxed
|
|
8
|
+
* frame, every follow leads.
|
|
9
|
+
*/
|
|
10
|
+
export interface AnalysisLead {
|
|
11
|
+
/** Whether this follow leads the analysis of `connection`; it keeps the lead until `release`. */
|
|
12
|
+
take: (connection: string) => Promise<boolean>;
|
|
13
|
+
release: () => void;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export function analysisLead(locks: Locks | undefined): AnalysisLead {
|
|
17
|
+
let held: { connection: string; release: () => void } | undefined;
|
|
18
|
+
let asking: { connection: string; dropped: boolean } | undefined;
|
|
19
|
+
|
|
20
|
+
function release(): void {
|
|
21
|
+
if (asking !== undefined) asking.dropped = true;
|
|
22
|
+
asking = undefined;
|
|
23
|
+
held?.release();
|
|
24
|
+
held = undefined;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function take(connection: string): Promise<boolean> {
|
|
28
|
+
if (locks === undefined || held?.connection === connection) {
|
|
29
|
+
return Promise.resolve(true);
|
|
30
|
+
}
|
|
31
|
+
release();
|
|
32
|
+
const ask = { connection, dropped: false };
|
|
33
|
+
asking = ask;
|
|
34
|
+
return new Promise((resolve) => {
|
|
35
|
+
locks
|
|
36
|
+
.request(
|
|
37
|
+
`dms-assistant:analysis:${connection}`,
|
|
38
|
+
{ ifAvailable: true },
|
|
39
|
+
(lock) => {
|
|
40
|
+
if (asking === ask) asking = undefined;
|
|
41
|
+
if (lock === null || ask.dropped) {
|
|
42
|
+
resolve(false);
|
|
43
|
+
return undefined;
|
|
44
|
+
}
|
|
45
|
+
return new Promise<void>((done) => {
|
|
46
|
+
held = { connection, release: done };
|
|
47
|
+
resolve(true);
|
|
48
|
+
});
|
|
49
|
+
},
|
|
50
|
+
)
|
|
51
|
+
.catch(() => {
|
|
52
|
+
if (asking === ask) asking = undefined;
|
|
53
|
+
resolve(!ask.dropped);
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
return { take, release };
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/** The lead over the tab's Web Locks, when the browser offers them. */
|
|
62
|
+
export function tabAnalysisLead(): AnalysisLead {
|
|
63
|
+
return analysisLead(
|
|
64
|
+
typeof navigator === "undefined" ? undefined : navigator.locks,
|
|
65
|
+
);
|
|
66
|
+
}
|
|
@@ -29,6 +29,8 @@ import type {
|
|
|
29
29
|
ProjectModules,
|
|
30
30
|
} from "../../builder/app/runtime/database-types";
|
|
31
31
|
import { t } from "../../builder/app/runtime/i18n";
|
|
32
|
+
import { tabAnalysisLead } from "./analysis-lead";
|
|
33
|
+
import type { ConnectMemory } from "./connect-memory";
|
|
32
34
|
import {
|
|
33
35
|
canConnect,
|
|
34
36
|
type ConnectCheck,
|
|
@@ -50,6 +52,9 @@ export function engineNames(locale: string): string {
|
|
|
50
52
|
|
|
51
53
|
const POLL_MS = 1_000;
|
|
52
54
|
|
|
55
|
+
/** The generation of the follow a remembered connection starts; every `connect` or `reset` moves past it. */
|
|
56
|
+
const RESUMED_LOOP = 0;
|
|
57
|
+
|
|
53
58
|
/**
|
|
54
59
|
* Where "Connect and analyse" stands: the form, the live check (which a failed check ends in),
|
|
55
60
|
* the access to give a database the account can write to, then the connection written and
|
|
@@ -83,8 +88,11 @@ export interface DatabaseConnect {
|
|
|
83
88
|
* read-only, or keeps the access an earlier visit wrote, then followed until its analysis is
|
|
84
89
|
* ready or a check fails. It resolves in every case. Called again after a failure with the same
|
|
85
90
|
* URL, it follows the written connection again without writing; with another URL for the same
|
|
86
|
-
* database, it writes only the new URL. Answers to an attempt that a later `connect`, `reset` or
|
|
87
|
-
* unmount replaced change nothing.
|
|
91
|
+
* database, it writes only the new URL, and follows the connection once the project loaded it. Answers to an attempt that a later `connect`, `reset` or
|
|
92
|
+
* unmount replaced change nothing. The connection written, even after an unmount, is remembered
|
|
93
|
+
* until its analysis is ready, the project's connection or analysis fails, the database has no
|
|
94
|
+
* table, the project no longer declares it, its time to be followed again runs out, or a later
|
|
95
|
+
* `connect` or `reset` in any popup of the tab; the next `useDatabaseConnect` follows it again.
|
|
88
96
|
*/
|
|
89
97
|
connect: (engine: DatabaseEngine, url: string) => Promise<UrlProblem | null>;
|
|
90
98
|
/** Writes the connection checked in `choosing` with this access, then follows it. */
|
|
@@ -101,7 +109,10 @@ interface Checked {
|
|
|
101
109
|
form: ConnectForm;
|
|
102
110
|
connection: string;
|
|
103
111
|
module: string;
|
|
112
|
+
access: DatabaseAccess;
|
|
104
113
|
writing: ConnectionWriting;
|
|
114
|
+
/** The memory's attempt this connect began. */
|
|
115
|
+
attempt: string;
|
|
105
116
|
}
|
|
106
117
|
|
|
107
118
|
/**
|
|
@@ -143,12 +154,26 @@ export function connectForm(
|
|
|
143
154
|
* "Connect and analyse" over the builder's live check and connect engine: the check of the URL
|
|
144
155
|
* before anything is written, the `ConfigureProject` batch the builder's form writes with the
|
|
145
156
|
* access chosen, then the builder's build answers polled each second through the project's reload
|
|
146
|
-
* and the analysis, its schemas picked as the builder pre-checks them.
|
|
157
|
+
* and the analysis, its schemas picked as the builder pre-checks them. A connection `memory` holds
|
|
158
|
+
* is followed again from the start, without its URL.
|
|
147
159
|
*/
|
|
148
|
-
export function useDatabaseConnect(
|
|
149
|
-
|
|
160
|
+
export function useDatabaseConnect(
|
|
161
|
+
api: BuilderApi,
|
|
162
|
+
memory: ConnectMemory,
|
|
163
|
+
): DatabaseConnect {
|
|
164
|
+
const remembered = memory.read();
|
|
165
|
+
const phase = ref<ConnectPhase>(
|
|
166
|
+
remembered === null
|
|
167
|
+
? { kind: "form" }
|
|
168
|
+
: {
|
|
169
|
+
kind: "analysing",
|
|
170
|
+
connection: remembered.connection,
|
|
171
|
+
module: remembered.module,
|
|
172
|
+
},
|
|
173
|
+
);
|
|
174
|
+
const resumeUntil = remembered?.until;
|
|
150
175
|
const view = ref<BuildView | null>(null);
|
|
151
|
-
const access = ref<DatabaseAccess | null>(null);
|
|
176
|
+
const access = ref<DatabaseAccess | null>(remembered?.access ?? null);
|
|
152
177
|
const refusal = ref<string | null>(null);
|
|
153
178
|
const failure = ref<string | null>(null);
|
|
154
179
|
let checked: Checked | undefined;
|
|
@@ -156,14 +181,19 @@ export function useDatabaseConnect(api: BuilderApi): DatabaseConnect {
|
|
|
156
181
|
let analysing = false;
|
|
157
182
|
let answeredSchemas: string | undefined;
|
|
158
183
|
let written: { connection: string; url: string } | undefined;
|
|
159
|
-
let generation =
|
|
184
|
+
let generation = RESUMED_LOOP;
|
|
160
185
|
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
161
186
|
let disposed = false;
|
|
187
|
+
const lead = tabAnalysisLead();
|
|
162
188
|
|
|
163
189
|
function current(loop: number): boolean {
|
|
164
190
|
return !disposed && loop === generation;
|
|
165
191
|
}
|
|
166
192
|
|
|
193
|
+
async function leads(connection: string, loop: number): Promise<boolean> {
|
|
194
|
+
return (await lead.take(connection)) && current(loop);
|
|
195
|
+
}
|
|
196
|
+
|
|
167
197
|
async function checkAccess(
|
|
168
198
|
engine: DatabaseEngine,
|
|
169
199
|
url: string,
|
|
@@ -217,9 +247,14 @@ export function useDatabaseConnect(api: BuilderApi): DatabaseConnect {
|
|
|
217
247
|
);
|
|
218
248
|
view.value = next;
|
|
219
249
|
if (next.schemas && !analysing && next.job !== answeredSchemas) {
|
|
250
|
+
if (!(await leads(connection, loop))) return next;
|
|
220
251
|
answeredSchemas = next.job;
|
|
221
252
|
await analyse(connection, module, loop, preferredSchemas(next.schemas));
|
|
222
|
-
} else if (
|
|
253
|
+
} else if (
|
|
254
|
+
next.needsAnalysis &&
|
|
255
|
+
!analysing &&
|
|
256
|
+
(await leads(connection, loop))
|
|
257
|
+
) {
|
|
223
258
|
await analyse(connection, module, loop);
|
|
224
259
|
}
|
|
225
260
|
return next;
|
|
@@ -230,27 +265,49 @@ export function useDatabaseConnect(api: BuilderApi): DatabaseConnect {
|
|
|
230
265
|
module: string,
|
|
231
266
|
loop: number,
|
|
232
267
|
): Promise<void> {
|
|
268
|
+
if (await keepsFollowing(connection, module, loop)) {
|
|
269
|
+
timer = setTimeout(() => void poll(connection, module, loop), POLL_MS);
|
|
270
|
+
} else if (current(loop)) {
|
|
271
|
+
lead.release();
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
async function keepsFollowing(
|
|
276
|
+
connection: string,
|
|
277
|
+
module: string,
|
|
278
|
+
loop: number,
|
|
279
|
+
): Promise<boolean> {
|
|
233
280
|
let next: BuildView | null;
|
|
234
281
|
try {
|
|
235
282
|
next = await followBuild(connection, module, loop);
|
|
236
283
|
} catch (error) {
|
|
237
284
|
if (current(loop)) failure.value = api.failure(error).detail;
|
|
238
|
-
return;
|
|
285
|
+
return false;
|
|
286
|
+
}
|
|
287
|
+
if (next === null || !current(loop)) return false;
|
|
288
|
+
const expired =
|
|
289
|
+
loop === RESUMED_LOOP &&
|
|
290
|
+
resumeUntil !== undefined &&
|
|
291
|
+
Date.now() >= resumeUntil;
|
|
292
|
+
if (next.undeclared || expired) {
|
|
293
|
+
memory.clear();
|
|
294
|
+
phase.value = { kind: "form" };
|
|
295
|
+
return false;
|
|
239
296
|
}
|
|
240
|
-
if (next === null || !current(loop)) return;
|
|
241
297
|
if (next.fork && next.job) {
|
|
298
|
+
memory.clear();
|
|
242
299
|
phase.value = { kind: "analysed", connection, module };
|
|
243
|
-
return;
|
|
300
|
+
return false;
|
|
244
301
|
}
|
|
245
|
-
|
|
246
|
-
next.gaveUp ||
|
|
302
|
+
if (
|
|
247
303
|
next.connectionError !== undefined ||
|
|
248
304
|
next.analysisFailed ||
|
|
249
|
-
next.empty
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
305
|
+
next.empty
|
|
306
|
+
) {
|
|
307
|
+
memory.clear();
|
|
308
|
+
return false;
|
|
253
309
|
}
|
|
310
|
+
return !next.gaveUp && failure.value === null;
|
|
254
311
|
}
|
|
255
312
|
|
|
256
313
|
async function write(
|
|
@@ -290,18 +347,25 @@ export function useDatabaseConnect(api: BuilderApi): DatabaseConnect {
|
|
|
290
347
|
choice: ConnectionAccess,
|
|
291
348
|
loop: number,
|
|
292
349
|
): Promise<void> {
|
|
293
|
-
const { connection, module } = target;
|
|
350
|
+
const { form, connection, module, access: answer } = target;
|
|
294
351
|
phase.value = { kind: "analysing", connection, module };
|
|
295
352
|
if (!(await write(target, choice, loop))) {
|
|
296
353
|
if (current(loop)) phase.value = { kind: "form" };
|
|
297
354
|
return;
|
|
298
355
|
}
|
|
356
|
+
memory.write(target.attempt, {
|
|
357
|
+
engine: form.engine,
|
|
358
|
+
connection,
|
|
359
|
+
access: answer,
|
|
360
|
+
});
|
|
299
361
|
if (current(loop)) await poll(connection, module, loop);
|
|
300
362
|
}
|
|
301
363
|
|
|
302
|
-
function stop(): number {
|
|
364
|
+
function stop(): { loop: number; attempt: string } {
|
|
303
365
|
if (timer !== undefined) clearTimeout(timer);
|
|
366
|
+
lead.release();
|
|
304
367
|
generation += 1;
|
|
368
|
+
const attempt = memory.begin();
|
|
305
369
|
checked = undefined;
|
|
306
370
|
refusal.value = null;
|
|
307
371
|
failure.value = null;
|
|
@@ -310,7 +374,7 @@ export function useDatabaseConnect(api: BuilderApi): DatabaseConnect {
|
|
|
310
374
|
reloadingSince = undefined;
|
|
311
375
|
analysing = false;
|
|
312
376
|
answeredSchemas = undefined;
|
|
313
|
-
return generation;
|
|
377
|
+
return { loop: generation, attempt };
|
|
314
378
|
}
|
|
315
379
|
|
|
316
380
|
async function connect(
|
|
@@ -319,7 +383,7 @@ export function useDatabaseConnect(api: BuilderApi): DatabaseConnect {
|
|
|
319
383
|
): Promise<UrlProblem | null> {
|
|
320
384
|
const form = connectForm(engine, url);
|
|
321
385
|
if ("kind" in form) return form;
|
|
322
|
-
const loop = stop();
|
|
386
|
+
const { loop, attempt } = stop();
|
|
323
387
|
phase.value = { kind: "checking" };
|
|
324
388
|
const answer = await checkAccess(engine, url);
|
|
325
389
|
if (!current(loop)) return null;
|
|
@@ -330,7 +394,9 @@ export function useDatabaseConnect(api: BuilderApi): DatabaseConnect {
|
|
|
330
394
|
form,
|
|
331
395
|
connection,
|
|
332
396
|
module: managedNames(form).tablesModule,
|
|
397
|
+
access: answer,
|
|
333
398
|
writing: { kind: "url" },
|
|
399
|
+
attempt,
|
|
334
400
|
};
|
|
335
401
|
if (written?.connection !== connection) {
|
|
336
402
|
let project: ProjectModules;
|
|
@@ -377,8 +443,13 @@ export function useDatabaseConnect(api: BuilderApi): DatabaseConnect {
|
|
|
377
443
|
onBeforeUnmount(() => {
|
|
378
444
|
disposed = true;
|
|
379
445
|
if (timer !== undefined) clearTimeout(timer);
|
|
446
|
+
lead.release();
|
|
380
447
|
});
|
|
381
448
|
|
|
449
|
+
if (remembered !== null) {
|
|
450
|
+
void poll(remembered.connection, remembered.module, RESUMED_LOOP);
|
|
451
|
+
}
|
|
452
|
+
|
|
382
453
|
return {
|
|
383
454
|
phase,
|
|
384
455
|
checks: computed(() =>
|