@kabmo-labs/kabmo 0.11.1 → 0.12.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 +67 -421
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +426 -413
- package/dist/client/static/js/{index-amss8pge.js → index-0smc9gm2.js} +1123 -747
- package/dist/client/static/js/index-shexbk5f.css +1 -0
- package/marketplace/marketplace.json +13 -3
- package/marketplace/plugins/command-runner/package.json +4 -2
- package/marketplace/plugins/git-forge/README.md +219 -0
- package/marketplace/plugins/git-forge/icon.svg +20 -0
- package/marketplace/plugins/git-forge/package.json +56 -0
- package/marketplace/plugins/git-forge/src/app.tsx +82 -0
- package/marketplace/plugins/git-forge/src/command.test.ts +181 -0
- package/marketplace/plugins/git-forge/src/command.ts +119 -0
- package/marketplace/plugins/git-forge/src/header.tsx +87 -0
- package/marketplace/plugins/git-forge/src/panel/Badge.tsx +76 -0
- package/marketplace/plugins/git-forge/src/panel/Change.tsx +150 -0
- package/marketplace/plugins/git-forge/src/panel/CiBadge.tsx +51 -0
- package/marketplace/plugins/git-forge/src/panel/Credential.tsx +107 -0
- package/marketplace/plugins/git-forge/src/panel/Glyph.tsx +70 -0
- package/marketplace/plugins/git-forge/src/panel/Header.tsx +255 -0
- package/marketplace/plugins/git-forge/src/panel/ItemView.tsx +198 -0
- package/marketplace/plugins/git-forge/src/panel/List.tsx +89 -0
- package/marketplace/plugins/git-forge/src/panel/Row.tsx +68 -0
- package/marketplace/plugins/git-forge/src/panel/Sidebar.tsx +94 -0
- package/marketplace/plugins/git-forge/src/panel/Write.tsx +236 -0
- package/marketplace/plugins/git-forge/src/panel/format.ts +78 -0
- package/marketplace/plugins/git-forge/src/panel/index.test.tsx +344 -0
- package/marketplace/plugins/git-forge/src/panel/index.tsx +193 -0
- package/marketplace/plugins/git-forge/src/panel/use-forge.ts +250 -0
- package/marketplace/plugins/git-forge/src/panel/write.test.tsx +269 -0
- package/marketplace/plugins/git-forge/src/protocol.ts +308 -0
- package/marketplace/plugins/git-forge/src/server/adapters.test.ts +274 -0
- package/marketplace/plugins/git-forge/src/server/bitbucket.ts +307 -0
- package/marketplace/plugins/git-forge/src/server/capabilities.test.ts +116 -0
- package/marketplace/plugins/git-forge/src/server/capabilities.ts +105 -0
- package/marketplace/plugins/git-forge/src/server/ci.test.ts +88 -0
- package/marketplace/plugins/git-forge/src/server/ci.ts +118 -0
- package/marketplace/plugins/git-forge/src/server/context.ts +76 -0
- package/marketplace/plugins/git-forge/src/server/diff.test.ts +127 -0
- package/marketplace/plugins/git-forge/src/server/diff.ts +120 -0
- package/marketplace/plugins/git-forge/src/server/filters.test.ts +138 -0
- package/marketplace/plugins/git-forge/src/server/filters.ts +138 -0
- package/marketplace/plugins/git-forge/src/server/forges.test.ts +235 -0
- package/marketplace/plugins/git-forge/src/server/gitea.ts +296 -0
- package/marketplace/plugins/git-forge/src/server/github-extras.ts +92 -0
- package/marketplace/plugins/git-forge/src/server/github.ts +320 -0
- package/marketplace/plugins/git-forge/src/server/gitlab-detail.ts +207 -0
- package/marketplace/plugins/git-forge/src/server/gitlab.test.ts +195 -0
- package/marketplace/plugins/git-forge/src/server/gitlab.ts +176 -0
- package/marketplace/plugins/git-forge/src/server/http.test.ts +270 -0
- package/marketplace/plugins/git-forge/src/server/http.ts +329 -0
- package/marketplace/plugins/git-forge/src/server/map.ts +120 -0
- package/marketplace/plugins/git-forge/src/server/registry.ts +47 -0
- package/marketplace/plugins/git-forge/src/server/remote.test.ts +146 -0
- package/marketplace/plugins/git-forge/src/server/remote.ts +188 -0
- package/marketplace/plugins/git-forge/src/server/scope-probe.test.ts +98 -0
- package/marketplace/plugins/git-forge/src/server/scope-probe.ts +128 -0
- package/marketplace/plugins/git-forge/src/server/scope.ts +66 -0
- package/marketplace/plugins/git-forge/src/server/test-context.ts +67 -0
- package/marketplace/plugins/git-forge/src/server/test-host.ts +51 -0
- package/marketplace/plugins/git-forge/src/server/token.test.ts +107 -0
- package/marketplace/plugins/git-forge/src/server/token.ts +139 -0
- package/marketplace/plugins/git-forge/src/server/write-http.test.ts +127 -0
- package/marketplace/plugins/git-forge/src/server/write-http.ts +110 -0
- package/marketplace/plugins/git-forge/src/server/writes.test.ts +218 -0
- package/marketplace/plugins/git-forge/src/server/writes.ts +313 -0
- package/marketplace/plugins/git-forge/src/server.ts +284 -0
- package/marketplace/plugins/git-forge/tsconfig.json +16 -0
- package/marketplace/plugins/session-info/package.json +4 -2
- package/marketplace/plugins/stats/package.json +4 -2
- package/package.json +6 -1
- package/src/client/components/common/code-surface/blame-hover.ts +188 -0
- package/src/client/components/common/code-surface/blame-panel.test.ts +304 -0
- package/src/client/components/common/code-surface/blame-panel.ts +306 -0
- package/src/client/components/common/code-surface/blame.test.ts +303 -0
- package/src/client/components/common/code-surface/blame.ts +227 -0
- package/src/client/components/common/code-surface/conflict-markers.test.ts +135 -0
- package/src/client/components/common/code-surface/conflict-markers.ts +144 -0
- package/src/client/components/common/code-surface/documents.ts +48 -1
- package/src/client/components/common/code-surface/extensions.test.ts +4 -0
- package/src/client/components/common/code-surface/extensions.ts +44 -0
- package/src/client/components/common/code-surface/fold-stack.test.ts +4 -0
- package/src/client/components/common/code-surface/indent.test.ts +5 -0
- package/src/client/components/common/code-surface/index.tsx +16 -2
- package/src/client/components/common/code-surface/lint-parsers.test.ts +109 -0
- package/src/client/components/common/code-surface/lint-parsers.ts +134 -0
- package/src/client/components/common/code-surface/lint.test.ts +101 -0
- package/src/client/components/common/code-surface/lint.ts +85 -0
- package/src/client/components/common/code-surface/props.ts +17 -0
- package/src/client/components/common/code-surface/surface-failures.test.ts +132 -0
- package/src/client/components/common/code-surface/theme.ts +71 -0
- package/src/client/components/common/header-controls/index.test.tsx +1 -1
- package/src/client/components/common/header-controls/plugin-entry.test.tsx +1 -1
- package/src/client/components/common/header-controls/shell-chrome.test.tsx +1 -1
- package/src/client/components/common/provider-icon/Plate.tsx +88 -0
- package/src/client/components/common/provider-icon/index.tsx +55 -11
- package/src/client/components/layout/session-sidebar/SessionsView.tsx +5 -2
- package/src/client/components/mobile/SessionSidebar.tsx +2 -10
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +6 -0
- package/src/client/components/mobile/mobile-right-sidebar/StatusBar.tsx +8 -0
- package/src/client/components/settings/categories/AppearanceSettings.tsx +3 -0
- package/src/client/components/settings/categories/ProviderSettings.tsx +43 -41
- package/src/client/components/settings/categories/appearance-settings/EditorBlameSection.tsx +97 -0
- package/src/client/components/settings/categories/panel-plugins/AvailableList.tsx +106 -54
- package/src/client/components/settings/categories/panel-plugins/GitFreshness.tsx +14 -1
- package/src/client/components/settings/categories/panel-plugins/InstalledList.tsx +39 -150
- package/src/client/components/settings/categories/panel-plugins/Meta.test.tsx +143 -0
- package/src/client/components/settings/categories/panel-plugins/Meta.tsx +157 -0
- package/src/client/components/settings/categories/panel-plugins/Placement.test.tsx +149 -0
- package/src/client/components/settings/categories/panel-plugins/Placement.tsx +99 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.tsx +270 -0
- package/src/client/components/settings/categories/panel-plugins/Section.tsx +11 -3
- package/src/client/components/settings/categories/provider-settings/AddModelModal.tsx +25 -0
- package/src/client/components/settings/categories/provider-settings/AuthSection.tsx +135 -80
- package/src/client/components/settings/categories/provider-settings/DeleteProviderModal.tsx +51 -21
- package/src/client/components/settings/categories/provider-settings/EntryAdvanced.tsx +175 -0
- package/src/client/components/settings/categories/provider-settings/EntryModal.tsx +275 -0
- package/src/client/components/settings/categories/provider-settings/Header.tsx +40 -9
- package/src/client/components/settings/categories/provider-settings/LoginModal.tsx +142 -160
- package/src/client/components/settings/categories/provider-settings/LogoutProviderModal.tsx +2 -2
- package/src/client/components/settings/categories/provider-settings/ModelCapabilitiesModal.tsx +84 -46
- package/src/client/components/settings/categories/provider-settings/ModelsList.tsx +217 -102
- package/src/client/components/settings/categories/provider-settings/PresetPicker.tsx +5 -2
- package/src/client/components/settings/categories/provider-settings/SidebarList.plugin.test.ts +3 -3
- package/src/client/components/settings/categories/provider-settings/SidebarList.tsx +158 -102
- package/src/client/components/settings/categories/provider-settings/auth-section.test.tsx +135 -0
- package/src/client/components/settings/categories/provider-settings/groups.test.ts +98 -0
- package/src/client/components/settings/categories/provider-settings/groups.ts +108 -0
- package/src/client/components/settings/categories/provider-settings/layout.test.tsx +325 -0
- package/src/client/components/settings/categories/provider-settings/model-dialogs.test.tsx +135 -0
- package/src/client/components/settings/categories/provider-settings/preset-picker.test.tsx +73 -0
- package/src/client/components/settings/categories/usage-settings/ProviderCard.tsx +22 -2
- package/src/client/components/settings/categories/usage-settings/ProviderDetail.tsx +2 -0
- package/src/client/components/settings/categories/usage-settings/SidebarList.tsx +16 -6
- package/src/client/components/settings/categories/usage-settings/providers.ts +3 -0
- package/src/client/components/settings/categories/usage-settings/usage-and-picker.test.ts +19 -0
- package/src/client/components/settings/categories/usage-settings/usage-icons.test.tsx +143 -0
- package/src/client/components/workspace/chat-timeline/MinimapShortcuts.test.ts +2 -1
- package/src/client/components/workspace/chat-timeline/chat-input/GoalBanner.test.ts +23 -19
- package/src/client/components/workspace/chat-timeline/chat-input/ModeToggles.test.ts +23 -19
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.test.ts +20 -18
- package/src/client/components/workspace/chat-timeline/chat-input/compact.test.tsx +19 -6
- package/src/client/components/workspace/chat-timeline/index.tsx +7 -16
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Wait.missing.test.ts +100 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Wait.test.ts +3 -47
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Wait.tsx +8 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/wait-test-util.ts +62 -0
- package/src/client/components/workspace/diff-panel/HunkStepper.tsx +62 -0
- package/src/client/components/workspace/diff-panel/MergeDiffView.tsx +29 -0
- package/src/client/components/workspace/diff-panel/Toolbar.tsx +32 -1
- package/src/client/components/workspace/diff-panel/changes.ts +69 -0
- package/src/client/components/workspace/diff-panel/chunks.ts +85 -0
- package/src/client/components/workspace/diff-panel/index.tsx +21 -1
- package/src/client/components/workspace/diff-panel/merge.test.ts +145 -0
- package/src/client/components/workspace/diff-panel/merge.ts +63 -68
- package/src/client/components/workspace/editor/EditorDropOverlay.tsx +6 -1
- package/src/client/components/workspace/editor/FileDocument.tsx +51 -1
- package/src/client/components/workspace/editor/FilePane.tsx +25 -1
- package/src/client/components/workspace/editor/StatusBar.tsx +19 -0
- package/src/client/components/workspace/editor/Toolbar.tsx +29 -5
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +86 -0
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +48 -16
- package/src/client/components/workspace/editor/viewers/bytes.ts +16 -0
- package/src/client/components/workspace/git-panel/index.test.ts +46 -1
- package/src/client/components/workspace/git-panel/index.tsx +11 -38
- package/src/client/components/workspace/model-dropdown/Item.plugin.test.ts +66 -0
- package/src/client/components/workspace/model-dropdown/Item.tsx +71 -62
- package/src/client/components/workspace/model-dropdown/Section.tsx +31 -14
- package/src/client/components/workspace/model-dropdown/collapsed.ts +72 -0
- package/src/client/components/workspace/model-dropdown/index.tsx +42 -19
- package/src/client/components/workspace/model-dropdown/refresh.test.tsx +260 -0
- package/src/client/components/workspace/model-dropdown/trigger.test.ts +34 -0
- package/src/client/components/workspace/model-dropdown/use-catalog.ts +13 -2
- package/src/client/components/workspace/usage-panel/ProviderSelect.tsx +19 -3
- package/src/client/hooks/chat/omp/folder-auto-expand.ts +113 -0
- package/src/client/hooks/chat/omp/index.ts +20 -0
- package/src/client/hooks/chat/omp/pending-rows.ts +21 -0
- package/src/client/hooks/chat/omp/pending-sessions.test.ts +16 -1
- package/src/client/hooks/chat/omp/session-sidebar-controller.test.ts +102 -0
- package/src/client/hooks/chat/omp/session-sidebar-controller.ts +21 -1
- package/src/client/hooks/chat/omp/stream.ts +8 -1
- package/src/client/hooks/chat/timeline/index.ts +1 -1
- package/src/client/hooks/chat/timeline/new-chat-open.ts +60 -0
- package/src/client/hooks/editor/blame-settings.ts +67 -0
- package/src/client/hooks/editor/blame.test.ts +272 -0
- package/src/client/hooks/editor/blame.ts +232 -0
- package/src/client/hooks/editor/file-editor-types.ts +23 -0
- package/src/client/hooks/editor/save-file.test.ts +20 -0
- package/src/client/hooks/editor/use-editor-drop.test-util.ts +198 -0
- package/src/client/hooks/editor/use-editor-drop.test.ts +70 -175
- package/src/client/hooks/editor/use-editor-drop.ts +19 -36
- package/src/client/hooks/editor/use-file-editor.ts +7 -1
- package/src/client/hooks/settings/providers/actions.ts +90 -194
- package/src/client/hooks/settings/providers/api.ts +7 -1
- package/src/client/hooks/settings/providers/index.ts +171 -59
- package/src/client/hooks/settings/providers/login.test.ts +79 -0
- package/src/client/hooks/settings/providers/login.ts +276 -0
- package/src/client/hooks/settings/providers/messages.ts +28 -0
- package/src/client/hooks/settings/providers/model-actions.ts +178 -0
- package/src/client/hooks/ui/editor-error-toast.ts +47 -0
- package/src/client/hooks/ui/open-file.ts +7 -0
- package/src/client/hooks/ui/toasts.ts +7 -0
- package/src/client/hooks/workspace/file-tabs.ts +4 -1
- package/src/client/hooks/workspace/folder-expansion.test.ts +62 -0
- package/src/client/hooks/workspace/folder-expansion.ts +33 -0
- package/src/client/hooks/workspace/git-action-outcome.ts +86 -0
- package/src/client/hooks/workspace/git-actions.ts +29 -2
- package/src/client/hooks/workspace/plugin-contributions.test.ts +117 -0
- package/src/client/hooks/workspace/plugin-contributions.ts +146 -0
- package/src/client/lib/editor-errors.test.ts +85 -0
- package/src/client/lib/editor-errors.ts +71 -0
- package/src/client/lib/fs/resolve-open.test.ts +125 -0
- package/src/client/lib/fs/resolve-open.ts +90 -0
- package/src/client/lib/git/action-message.test.ts +82 -0
- package/src/client/lib/git/action-message.ts +160 -0
- package/src/client/lib/launch/device-files.test.ts +160 -0
- package/src/client/lib/launch/device-files.ts +197 -0
- package/src/client/lib/native/open-paths.test.ts +140 -0
- package/src/client/lib/native/open-paths.ts +157 -0
- package/src/client/lib/plugins/bootstrap.test.ts +1 -1
- package/src/client/main.tsx +20 -0
- package/src/server/db.server.test.ts +39 -0
- package/src/server/db.server.ts +21 -2
- package/src/server/lib/db/schema.ts +2 -0
- package/src/server/lib/fs/external-roots.test.ts +100 -0
- package/src/server/lib/fs/external-roots.ts +101 -0
- package/src/server/lib/fs/git-actions-branch.ts +15 -2
- package/src/server/lib/fs/git-actions-shared.ts +24 -0
- package/src/server/lib/fs/git-actions-sync.test.ts +18 -7
- package/src/server/lib/fs/git-actions-worktree.ts +5 -1
- package/src/server/lib/fs/git-blame.test.ts +206 -0
- package/src/server/lib/fs/git-blame.ts +189 -0
- package/src/server/lib/fs/root.ts +14 -0
- package/src/server/lib/http/same-origin.ts +28 -7
- package/src/server/lib/models/catalog.server.ts +230 -0
- package/src/server/lib/models/catalog.test.ts +83 -0
- package/src/server/lib/models/credential-origin.server.ts +108 -0
- package/src/server/lib/models/credential-origin.test.ts +132 -0
- package/src/server/lib/models/provider-icon-fetch.ts +115 -0
- package/src/server/lib/models/provider-icon-parse.test.ts +134 -0
- package/src/server/lib/models/provider-icon-parse.ts +139 -0
- package/src/server/lib/models/provider-icon-store.server.ts +118 -0
- package/src/server/lib/models/provider-icon-store.test.ts +107 -0
- package/src/server/lib/models/provider-icon.server.ts +209 -0
- package/src/server/lib/models/provider-items.server.ts +211 -37
- package/src/server/lib/models/provider-items.test.ts +201 -0
- package/src/server/lib/models/provider-registry.server.test.ts +27 -9
- package/src/server/lib/models/provider-registry.server.ts +160 -67
- package/src/server/lib/models/registry.server.test.ts +3 -3
- package/src/server/lib/models/registry.server.ts +8 -0
- package/src/server/lib/omp/config/definitions.test.ts +5 -4
- package/src/server/lib/omp/config/models-config.ts +42 -0
- package/src/server/lib/omp/config/provider-entry.test.ts +205 -0
- package/src/server/lib/omp/config/provider-entry.ts +197 -0
- package/src/server/lib/omp/config/provider-seeds.ts +10 -0
- package/src/server/lib/omp/core/models-json.ts +69 -0
- package/src/server/lib/omp/session/messages.ts +17 -3
- package/src/server/lib/omp/session/sidebar-data.canonical.test.ts +13 -3
- package/src/server/lib/panels/bundled-catalog.server.ts +7 -0
- package/src/server/lib/panels/catalog-offers.server.ts +68 -0
- package/src/server/lib/panels/git-update.server.test.ts +14 -0
- package/src/server/lib/panels/git-update.server.ts +63 -1
- package/src/server/lib/panels/manifest.test.ts +65 -0
- package/src/server/lib/panels/manifest.ts +55 -1
- package/src/server/lib/panels/offers.server.test.ts +191 -0
- package/src/server/lib/panels/offers.server.ts +108 -0
- package/src/server/lib/panels/registry.server.test.ts +35 -1
- package/src/server/lib/panels/registry.server.ts +51 -142
- package/src/server/lib/panels/scan.server.ts +162 -0
- package/src/server/lib/route-adapter.ts +13 -2
- package/src/server/lib/tray/tray.test.ts +2 -1
- package/src/server/lib/usage/providers.server.ts +4 -1
- package/src/server/routes/chat/session.ts +7 -1
- package/src/server/routes/fs/git-blame-loader.test.ts +146 -0
- package/src/server/routes/fs/git.ts +17 -0
- package/src/server/routes/fs/grant.test.ts +135 -0
- package/src/server/routes/fs/grant.ts +79 -0
- package/src/server/routes/fs/index.ts +2 -0
- package/src/server/routes/fs/scope.ts +34 -17
- package/src/server/routes/omp/login.ts +41 -14
- package/src/server/routes/omp/routes.test.ts +23 -10
- package/src/server/routes/settings/index.ts +8 -0
- package/src/server/routes/settings/provider-entry.ts +108 -0
- package/src/server/routes/settings/provider-icon.ts +99 -0
- package/src/server/routes/settings/provider-model.ts +4 -1
- package/src/server/routes/settings/provider-refresh.ts +87 -0
- package/src/server/routes/settings/providers.ts +31 -2
- package/src/shared/lib/chat/omp/fold.test.ts +34 -0
- package/src/shared/lib/chat/omp/tool-frames.test.ts +20 -0
- package/src/shared/lib/chat/omp/tool-frames.ts +5 -1
- package/src/shared/lib/chat/omp/tool-results.ts +29 -3
- package/src/shared/lib/chat/tool/wait-facts.ts +4 -0
- package/src/shared/lib/fs/git-blame.test.ts +266 -0
- package/src/shared/lib/fs/git-blame.ts +246 -0
- package/src/shared/lib/git/url.ts +18 -0
- package/src/shared/lib/markdown/sanitize.test.ts +57 -0
- package/src/shared/lib/markdown/sanitize.ts +30 -7
- package/src/shared/lib/models/provider/connection.ts +135 -0
- package/src/shared/lib/models/provider/dialect.test.ts +4 -2
- package/src/shared/lib/models/provider/dialect.ts +76 -6
- package/src/shared/lib/models/provider/models.ts +2 -0
- package/src/shared/lib/models/provider/origin.ts +94 -0
- package/src/shared/lib/models/provider/provider-ui.test.ts +7 -0
- package/src/shared/lib/models/server-cache.ts +8 -3
- package/src/shared/lib/omp/session/messages-map-pending.test.ts +110 -0
- package/src/shared/lib/omp/session/messages-map.ts +34 -2
- package/src/shared/lib/omp/session/prewarm-misc.test.ts +7 -90
- package/src/shared/lib/omp/session/prewarm.test.ts +133 -0
- package/src/shared/lib/omp/session/prewarm.ts +23 -1
- package/src/shared/lib/omp/session/wait.test.ts +28 -0
- package/src/shared/lib/omp/session/wait.ts +38 -3
- package/src/shared/lib/panels/slot-labels.test.ts +61 -0
- package/src/shared/lib/panels/slot-labels.ts +133 -0
- package/src/shared/lib/workspace/panel-ids.ts +11 -0
- package/src/shared/types/fs.ts +6 -0
- package/src/shared/types/index.ts +1 -0
- package/src/shared/types/models.ts +12 -0
- package/src/shared/types/panels-registry.ts +277 -0
- package/src/shared/types/panels.ts +46 -213
- package/src/shared/types/settings/provider.ts +58 -0
- package/src/shared/types/settings/usage.ts +10 -0
- package/src/test-support/pristine-globals.ts +7 -0
- package/dist/client/static/js/index-bq6qeayr.css +0 -1
- package/src/client/components/settings/categories/provider-settings/ReconnectModal.tsx +0 -184
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { useState } from 'preact/hooks';
|
|
2
|
+
import { ProviderIcon } from '@/client/components/common/provider-icon';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* The parts of a provider a mark needs. Every field is optional because the two
|
|
6
|
+
* callers carry different shapes: the settings list has a full `ProviderItem`,
|
|
7
|
+
* while a model row only knows the catalog's `providerIcon` key and the slug it
|
|
8
|
+
* was served by. `ProviderIcon` already resolves from any of them.
|
|
9
|
+
*/
|
|
10
|
+
export interface ProviderMarkSource {
|
|
11
|
+
icon?: string;
|
|
12
|
+
slug?: string;
|
|
13
|
+
name?: string;
|
|
14
|
+
iconUrl?: string;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
interface ProviderIconPlateProps {
|
|
18
|
+
provider: ProviderMarkSource;
|
|
19
|
+
/** Outer box, in px. The mark inside is sized from it. */
|
|
20
|
+
size: number;
|
|
21
|
+
/** Corner radius, in px. Defaults to a quarter of the box. */
|
|
22
|
+
radius?: number;
|
|
23
|
+
className?: string;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* A provider's mark on a rounded plate.
|
|
28
|
+
*
|
|
29
|
+
* The plate is what makes a list of providers readable: without it the marks
|
|
30
|
+
* have no consistent BOX — a brand SVG is square while the initials fallback is
|
|
31
|
+
* a pill whose width follows its text (`t.` is narrower than `ti.`) — so every
|
|
32
|
+
* row's name started at a different x and the column of names, dots and counts
|
|
33
|
+
* came out ragged. A fixed-size plate gives all three a shared origin.
|
|
34
|
+
*
|
|
35
|
+
* Lives in `common/` because TWO surfaces draw it — the provider settings list
|
|
36
|
+
* and the composer's model picker — and a composer importing from a settings
|
|
37
|
+
* folder is the kind of edge that turns into a copy the first time one of them
|
|
38
|
+
* needs a tweak.
|
|
39
|
+
*
|
|
40
|
+
* **A provider's own web icon wins when it has one**, and it is the only mark
|
|
41
|
+
* drawn in COLOUR: it is the site's own logo (`iconUrl`, fetched from the
|
|
42
|
+
* provider's `baseUrl`), and recolouring it to `currentColor` would turn a
|
|
43
|
+
* brand mark into a silhouette. Everything else stays monochrome on purpose —
|
|
44
|
+
* the app's palette is a paper/ink system, and a table of hand-drawn brand
|
|
45
|
+
* shapes is what made the one coloured logo stand out as an accident rather
|
|
46
|
+
* than as identity.
|
|
47
|
+
*
|
|
48
|
+
* A failed image falls back to the built-in mark: the bytes come from a third
|
|
49
|
+
* party, so a 404 after the fact (the site dropped its favicon) must not leave
|
|
50
|
+
* a broken-image glyph in the row.
|
|
51
|
+
*/
|
|
52
|
+
export function ProviderIconPlate({ provider, size, radius, className = '' }: ProviderIconPlateProps) {
|
|
53
|
+
const [imageFailed, setImageFailed] = useState(false);
|
|
54
|
+
const inset = Math.max(1, Math.round(size * 0.12));
|
|
55
|
+
const markSize = Math.max(10, size - inset * 2);
|
|
56
|
+
const showWebIcon = Boolean(provider.iconUrl) && !imageFailed;
|
|
57
|
+
|
|
58
|
+
return (
|
|
59
|
+
<span
|
|
60
|
+
aria-hidden="true"
|
|
61
|
+
className={`inline-flex flex-shrink-0 items-center justify-center overflow-hidden border border-ink/10 bg-ink/5 text-ink/80 ${className}`}
|
|
62
|
+
style={{ width: size, height: size, borderRadius: radius ?? Math.round(size * 0.28) }}
|
|
63
|
+
>
|
|
64
|
+
{showWebIcon ? (
|
|
65
|
+
<img
|
|
66
|
+
src={provider.iconUrl}
|
|
67
|
+
alt=""
|
|
68
|
+
width={markSize}
|
|
69
|
+
height={markSize}
|
|
70
|
+
loading="lazy"
|
|
71
|
+
decoding="async"
|
|
72
|
+
// `contain`, never `cover`: a wide wordmark would be cropped into an
|
|
73
|
+
// unreadable stripe, and a transparent logo needs no background.
|
|
74
|
+
className="h-full w-full object-contain p-[2px]"
|
|
75
|
+
onError={() => setImageFailed(true)}
|
|
76
|
+
/>
|
|
77
|
+
) : (
|
|
78
|
+
<ProviderIcon
|
|
79
|
+
icon={provider.icon}
|
|
80
|
+
slug={provider.slug}
|
|
81
|
+
name={provider.name}
|
|
82
|
+
size={markSize}
|
|
83
|
+
bounded
|
|
84
|
+
/>
|
|
85
|
+
)}
|
|
86
|
+
</span>
|
|
87
|
+
);
|
|
88
|
+
}
|
|
@@ -44,9 +44,27 @@ interface ProviderIconProps {
|
|
|
44
44
|
name?: string;
|
|
45
45
|
size?: number;
|
|
46
46
|
className?: string;
|
|
47
|
+
/**
|
|
48
|
+
* Draw inside a box of exactly `size` and never exceed it.
|
|
49
|
+
*
|
|
50
|
+
* The initials fallback is a PILL whose width follows its text, which is right
|
|
51
|
+
* when it stands alone beside a name (the composer picker) and wrong inside a
|
|
52
|
+
* fixed plate: measured in the settings list, `ab.` at the unbounded 1.2x font
|
|
53
|
+
* came out ~25px wide in a 20px content box and spilled over the plate's
|
|
54
|
+
* rounded edge. Bounded, the badge becomes a square that centres the text and
|
|
55
|
+
* sizes the font to fit the initials it actually has.
|
|
56
|
+
*/
|
|
57
|
+
bounded?: boolean;
|
|
47
58
|
}
|
|
48
59
|
|
|
49
|
-
export function ProviderIcon({
|
|
60
|
+
export function ProviderIcon({
|
|
61
|
+
icon,
|
|
62
|
+
slug,
|
|
63
|
+
name,
|
|
64
|
+
size = 16,
|
|
65
|
+
className = '',
|
|
66
|
+
bounded = false,
|
|
67
|
+
}: ProviderIconProps) {
|
|
50
68
|
// The ONE resolution point: a plugin's `providerIcon` registration for this
|
|
51
69
|
// provider wins over the built-in table, and any other provider is untouched.
|
|
52
70
|
// Read reactively, so a bundle that registers after this icon mounted still
|
|
@@ -55,25 +73,47 @@ export function ProviderIcon({ icon, slug, name, size = 16, className = '' }: Pr
|
|
|
55
73
|
const glyph = resolveProviderMark([icon, slug, name], registered);
|
|
56
74
|
|
|
57
75
|
if (!glyph) {
|
|
58
|
-
// No mark: the initials badge.
|
|
59
|
-
//
|
|
60
|
-
// it is
|
|
61
|
-
//
|
|
62
|
-
//
|
|
63
|
-
// `
|
|
76
|
+
// No mark: the initials badge.
|
|
77
|
+
//
|
|
78
|
+
// Standalone (the default) it is a PILL, not a square — the text sits at the
|
|
79
|
+
// same visual weight as a brand mark beside it, and `ti.` is far wider than
|
|
80
|
+
// it is tall, so a square would force a font half the height of its
|
|
81
|
+
// neighbours' ink (measured: `ti.` fits a 15px column only at 9.5px, whose
|
|
82
|
+
// ink is 6.4px against the marks' 13.8px median). Width follows the text.
|
|
83
|
+
//
|
|
84
|
+
// `bounded` is the plate case, where the box is fixed and nothing may leave
|
|
85
|
+
// it: the badge becomes a square of exactly `size`, the text is centred, and
|
|
86
|
+
// the font is chosen from the initials' own length — three characters
|
|
87
|
+
// (`ab.`, `ti.`) are the widest the contract can produce
|
|
88
|
+
// ({@link providerInitials} caps at two words), so that is what the size is
|
|
89
|
+
// derived from.
|
|
64
90
|
//
|
|
65
|
-
// 1.2x is the largest size whose ink still lands inside the box (measured on
|
|
66
|
-
// canvas: ink 10-15px in a 16px band with >=1px clearance, versus clipping
|
|
67
|
-
// at 1.3x), and it brings the text level with the marks' ink.
|
|
68
91
|
// `aria-hidden` because the provider's name is always rendered beside it —
|
|
69
92
|
// a screen reader announcing "t." first is noise.
|
|
93
|
+
const initials = providerInitials(name || slug || icon || '');
|
|
94
|
+
if (bounded) {
|
|
95
|
+
return (
|
|
96
|
+
<span
|
|
97
|
+
aria-hidden="true"
|
|
98
|
+
className={`inline-flex flex-shrink-0 items-center justify-center overflow-hidden font-semibold lowercase leading-none ${className}`}
|
|
99
|
+
style={{
|
|
100
|
+
width: size,
|
|
101
|
+
height: size,
|
|
102
|
+
fontSize: Math.round(size * (initials.length >= 3 ? 0.64 : 0.82)),
|
|
103
|
+
letterSpacing: '-0.02em',
|
|
104
|
+
}}
|
|
105
|
+
>
|
|
106
|
+
{initials}
|
|
107
|
+
</span>
|
|
108
|
+
);
|
|
109
|
+
}
|
|
70
110
|
return (
|
|
71
111
|
<span
|
|
72
112
|
aria-hidden="true"
|
|
73
113
|
className={`inline-flex flex-shrink-0 items-center justify-center font-semibold lowercase leading-none ${className}`}
|
|
74
114
|
style={{ height: size, minWidth: size, paddingInline: Math.max(1, Math.round(size * 0.12)), fontSize: Math.round(size * 1.2) }}
|
|
75
115
|
>
|
|
76
|
-
{
|
|
116
|
+
{initials}
|
|
77
117
|
</span>
|
|
78
118
|
);
|
|
79
119
|
}
|
|
@@ -92,6 +132,10 @@ export function ProviderIcon({ icon, slug, name, size = 16, className = '' }: Pr
|
|
|
92
132
|
// carry their own attributes (`azure`'s `fill-opacity`, `synthetic`'s
|
|
93
133
|
// stroked outline, the baked `currentColor` paths) keep them.
|
|
94
134
|
fill="currentColor"
|
|
135
|
+
// `block` + the explicit width/height are the containment contract: an
|
|
136
|
+
// inline SVG sits on the text baseline and adds descender space, which is
|
|
137
|
+
// how a mark "fits" its attributes yet still pushes a plate's edge.
|
|
138
|
+
style={{ display: 'block' }}
|
|
95
139
|
className={`flex-shrink-0 ${className}`}
|
|
96
140
|
aria-hidden="true"
|
|
97
141
|
focusable="false"
|
|
@@ -121,10 +121,13 @@ export function SessionsView({
|
|
|
121
121
|
};
|
|
122
122
|
|
|
123
123
|
/** The folder whose context a new session will inherit — same resolution
|
|
124
|
-
* the send path uses, so the prewarmed cwd matches the spawn cwd.
|
|
124
|
+
* the send path uses, so the prewarmed cwd matches the spawn cwd. The
|
|
125
|
+
* access mode is deliberately not passed: the trigger reads the live
|
|
126
|
+
* setting, which is what the send path spawns with (`appSettings` here is
|
|
127
|
+
* the boot-time prop and goes stale the moment the composer changes it). */
|
|
125
128
|
const prewarmForNewSession = (folderId?: number) => {
|
|
126
129
|
const cwd = spawnCwdForNewSession(folders, sessionParam, folderId);
|
|
127
|
-
if (cwd) triggerSessionPrewarm(cwd
|
|
130
|
+
if (cwd) triggerSessionPrewarm(cwd);
|
|
128
131
|
};
|
|
129
132
|
|
|
130
133
|
const handleNewSession = () => {
|
|
@@ -16,6 +16,7 @@ import { useScheduledTaskCount } from '@/client/hooks/workspace/scheduled-tasks'
|
|
|
16
16
|
import { MobileSessionListSkeleton } from '@/client/components/mobile/mobile-session-sidebar/Skeleton';
|
|
17
17
|
import { useBatchSelection } from '@/client/hooks/workspace/batch-selection';
|
|
18
18
|
import { useBatchDeleteRun } from '@/client/hooks/workspace/batch-delete-run';
|
|
19
|
+
import { setFolderExpanded } from '@/client/hooks/workspace/folder-expansion';
|
|
19
20
|
import { phoneLeftStripVisible } from '@/shared/lib/workspace/mobile-dock';
|
|
20
21
|
import { dockBodyProps, useMobileDock } from '@/client/components/mobile/mobile-session-sidebar/use-dock';
|
|
21
22
|
import { MobileDockBody, MobileDockStrip } from '@/client/components/mobile/mobile-session-sidebar/Dock';
|
|
@@ -116,16 +117,7 @@ export function MobileSessionSidebar({
|
|
|
116
117
|
}));
|
|
117
118
|
const folder = folders.find(item => item.id === folderId);
|
|
118
119
|
const nextExpanded = !(expandedFolders[folderId] ?? folder?.isExpanded ?? true);
|
|
119
|
-
|
|
120
|
-
method: 'POST',
|
|
121
|
-
body: new URLSearchParams({ isExpanded: String(nextExpanded) }),
|
|
122
|
-
})
|
|
123
|
-
.then((response) => {
|
|
124
|
-
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
|
125
|
-
})
|
|
126
|
-
.catch((error: unknown) => {
|
|
127
|
-
console.error('Failed to save mobile workspace state:', error);
|
|
128
|
-
});
|
|
120
|
+
void setFolderExpanded(folderId, nextExpanded);
|
|
129
121
|
};
|
|
130
122
|
|
|
131
123
|
// Seeded from the list the drawer RENDERS, not from the raw server payload:
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { useCallback, useRef, useState } from 'preact/hooks';
|
|
2
2
|
import { AlertTriangle } from 'lucide-preact';
|
|
3
3
|
import { CodeSurface, type CodeSurfaceHandle } from '@/client/components/common/code-surface';
|
|
4
|
+
import { countConflicts } from '@/client/components/common/code-surface/conflict-markers';
|
|
4
5
|
import { ImageViewer } from '@/client/components/common/image-viewer';
|
|
5
6
|
import { EditorHeader } from '@/client/components/mobile/mobile-right-sidebar/Header';
|
|
6
7
|
import { PreviewScroller } from '@/client/components/mobile/mobile-right-sidebar/PreviewScroller';
|
|
@@ -132,6 +133,9 @@ export function MobileFullEditor({ file, missing = false, onClose, onFileSaved,
|
|
|
132
133
|
const content = editor.content;
|
|
133
134
|
const lang = editor.language;
|
|
134
135
|
const linesCount = content.split('\n').length;
|
|
136
|
+
// The same count the desktop strip prints, from the same helper: a conflicted
|
|
137
|
+
// file opened on a phone must say so before the reader scrolls into it.
|
|
138
|
+
const conflicts = countConflicts(content);
|
|
135
139
|
|
|
136
140
|
/**
|
|
137
141
|
* Serve an outline row's jump: caret on the line, scrolled into view.
|
|
@@ -292,6 +296,7 @@ export function MobileFullEditor({ file, missing = false, onClose, onFileSaved,
|
|
|
292
296
|
indentUnitText={indentUnitFor(editorIndent)}
|
|
293
297
|
typing={editorTyping}
|
|
294
298
|
padding={12}
|
|
299
|
+
placeholder="This file is empty"
|
|
295
300
|
style={{
|
|
296
301
|
fontFamily: editorFontFamily,
|
|
297
302
|
fontSize: `${fontSize}px`,
|
|
@@ -326,6 +331,7 @@ export function MobileFullEditor({ file, missing = false, onClose, onFileSaved,
|
|
|
326
331
|
language={lang}
|
|
327
332
|
saveStatus={editor.saveStatus}
|
|
328
333
|
path={file.path}
|
|
334
|
+
conflicts={conflicts}
|
|
329
335
|
/>
|
|
330
336
|
|
|
331
337
|
{editor.saveMissingConfirm && file.path && (
|
|
@@ -29,6 +29,8 @@ interface EditorStatusBarProps {
|
|
|
29
29
|
language: string;
|
|
30
30
|
saveStatus: FileEditorSaveStatus;
|
|
31
31
|
path?: string;
|
|
32
|
+
/** Merge-conflict blocks in the buffer, or 0 (see the desktop strip). */
|
|
33
|
+
conflicts?: number;
|
|
32
34
|
}
|
|
33
35
|
|
|
34
36
|
export function EditorStatusBar({
|
|
@@ -40,6 +42,7 @@ export function EditorStatusBar({
|
|
|
40
42
|
language,
|
|
41
43
|
saveStatus,
|
|
42
44
|
path,
|
|
45
|
+
conflicts = 0,
|
|
43
46
|
}: EditorStatusBarProps) {
|
|
44
47
|
return (
|
|
45
48
|
<footer
|
|
@@ -58,6 +61,11 @@ export function EditorStatusBar({
|
|
|
58
61
|
<span className="uppercase">{VIEWER_LABELS[viewerKind]}</span>
|
|
59
62
|
) : (
|
|
60
63
|
<>
|
|
64
|
+
{conflicts > 0 && (
|
|
65
|
+
<span className="text-error font-semibold tabular-nums">
|
|
66
|
+
⚠ {conflicts}
|
|
67
|
+
</span>
|
|
68
|
+
)}
|
|
61
69
|
<span>{lineCount} lines</span>
|
|
62
70
|
<span>{charCount} chars</span>
|
|
63
71
|
<span className="uppercase">{language}</span>
|
|
@@ -6,6 +6,7 @@ import { EditorFontSection } from '@/client/components/settings/categories/appea
|
|
|
6
6
|
import { EditorThemeSection } from '@/client/components/settings/categories/appearance-settings/EditorThemeSection';
|
|
7
7
|
import { EditorIndentSection } from '@/client/components/settings/categories/appearance-settings/EditorIndentSection';
|
|
8
8
|
import { EditorTypingSection } from '@/client/components/settings/categories/appearance-settings/EditorTypingSection';
|
|
9
|
+
import { EditorBlameSection } from '@/client/components/settings/categories/appearance-settings/EditorBlameSection';
|
|
9
10
|
|
|
10
11
|
interface AppearanceSettingsProps {
|
|
11
12
|
settings: SettingsState;
|
|
@@ -34,6 +35,8 @@ export function AppearanceSettings({ settings, onUpdate }: AppearanceSettingsPro
|
|
|
34
35
|
<EditorIndentSection settings={settings} onUpdate={onUpdate} />
|
|
35
36
|
|
|
36
37
|
<EditorTypingSection settings={settings} onUpdate={onUpdate} />
|
|
38
|
+
|
|
39
|
+
<EditorBlameSection settings={settings} onUpdate={onUpdate} />
|
|
37
40
|
</div>
|
|
38
41
|
);
|
|
39
42
|
}
|
|
@@ -5,7 +5,7 @@ import { ProviderHeader } from '@/client/components/settings/categories/provider
|
|
|
5
5
|
import { ProviderAuthSection } from '@/client/components/settings/categories/provider-settings/AuthSection';
|
|
6
6
|
import { ProviderModelsList } from '@/client/components/settings/categories/provider-settings/ModelsList';
|
|
7
7
|
import { AddProviderModal } from '@/client/components/settings/categories/provider-settings/AddProviderModal';
|
|
8
|
-
import {
|
|
8
|
+
import { ProviderEntryModal } from '@/client/components/settings/categories/provider-settings/EntryModal';
|
|
9
9
|
import { LoginModal } from '@/client/components/settings/categories/provider-settings/LoginModal';
|
|
10
10
|
import { ModelConfigModal } from '@/client/components/settings/categories/provider-settings/ModelConfigModal';
|
|
11
11
|
import { ModelCapabilitiesModal } from '@/client/components/settings/categories/provider-settings/ModelCapabilitiesModal';
|
|
@@ -13,7 +13,6 @@ import { AddModelModal } from '@/client/components/settings/categories/provider-
|
|
|
13
13
|
import { DeleteProviderModal } from '@/client/components/settings/categories/provider-settings/DeleteProviderModal';
|
|
14
14
|
import { LogoutProviderModal } from '@/client/components/settings/categories/provider-settings/LogoutProviderModal';
|
|
15
15
|
import { providerEmptyReason, providerFetchBlockReason } from '@/shared/lib/models/provider/dialect';
|
|
16
|
-
import { configuredProviderSlugs } from '@/shared/lib/models/provider/presets';
|
|
17
16
|
import { useSettingsMasterDetail } from '@/client/hooks/settings/master-detail';
|
|
18
17
|
import { SettingsMasterDetail } from '@/client/components/settings/master-detail';
|
|
19
18
|
|
|
@@ -27,14 +26,19 @@ export function ProviderSettings({
|
|
|
27
26
|
onAddModalClose,
|
|
28
27
|
}: ProviderSettingsProps) {
|
|
29
28
|
const masterDetail = useSettingsMasterDetail();
|
|
29
|
+
|
|
30
30
|
const {
|
|
31
31
|
providers,
|
|
32
|
-
connectedProviders,
|
|
33
32
|
availablePresetProviders,
|
|
33
|
+
existingSlugs,
|
|
34
34
|
selectedProvider,
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
catalogError,
|
|
36
|
+
isLoading,
|
|
37
|
+
isRefreshingList,
|
|
38
|
+
handleRefreshList,
|
|
37
39
|
isFetchingModels,
|
|
40
|
+
isRefreshingIcon,
|
|
41
|
+
handleRefreshIcon,
|
|
38
42
|
toasts,
|
|
39
43
|
pushToast,
|
|
40
44
|
dismissToast,
|
|
@@ -47,11 +51,10 @@ export function ProviderSettings({
|
|
|
47
51
|
isLogoutModalOpen,
|
|
48
52
|
setIsLogoutModalOpen,
|
|
49
53
|
isDeletingProvider,
|
|
50
|
-
handleDeleteProvider,
|
|
51
54
|
isAddModalOpen,
|
|
52
55
|
setIsAddModalOpen,
|
|
53
|
-
|
|
54
|
-
|
|
56
|
+
isEntryModalOpen,
|
|
57
|
+
setIsEntryModalOpen,
|
|
55
58
|
isLoginModalOpen,
|
|
56
59
|
setIsLoginModalOpen,
|
|
57
60
|
configModel,
|
|
@@ -60,12 +63,13 @@ export function ProviderSettings({
|
|
|
60
63
|
setCapabilitiesModel,
|
|
61
64
|
setSelectedProviderId,
|
|
62
65
|
handleAddProvider,
|
|
63
|
-
|
|
66
|
+
handleConnect,
|
|
67
|
+
handleEntrySaved,
|
|
68
|
+
handleRefreshModels,
|
|
64
69
|
handleFetchModels,
|
|
65
|
-
handleFetchModelsFromList,
|
|
66
70
|
handleOmpAuthSuccess,
|
|
67
|
-
handleToggleDisconnect,
|
|
68
71
|
handleToggleProviderDisabled,
|
|
72
|
+
handleDeleteProvider,
|
|
69
73
|
handleHideAll,
|
|
70
74
|
handleShowAll,
|
|
71
75
|
handleToggleModelVisibility,
|
|
@@ -84,39 +88,32 @@ export function ProviderSettings({
|
|
|
84
88
|
listLabel="Providers"
|
|
85
89
|
list={
|
|
86
90
|
<ProviderSidebarList
|
|
87
|
-
providers={
|
|
88
|
-
selectedProviderId={selectedProvider?.id
|
|
91
|
+
providers={providers}
|
|
92
|
+
selectedProviderId={selectedProvider?.id ?? ''}
|
|
89
93
|
onSelectProvider={(id) => {
|
|
90
94
|
setSelectedProviderId(id);
|
|
91
95
|
masterDetail.openDetail();
|
|
92
96
|
}}
|
|
93
97
|
onOpenAddModal={() => setIsAddModalOpen(true)}
|
|
94
|
-
|
|
95
|
-
|
|
98
|
+
onRefresh={() => void handleRefreshList()}
|
|
99
|
+
isRefreshing={isRefreshingList}
|
|
100
|
+
isLoading={isLoading}
|
|
101
|
+
{...(catalogError ? { catalogError } : {})}
|
|
96
102
|
/>
|
|
97
103
|
}
|
|
98
104
|
detail={
|
|
99
105
|
<div className="flex-1 scrollbar-overlay-container p-6 md:p-8 space-y-6">
|
|
100
106
|
{selectedProvider ? (
|
|
101
107
|
<>
|
|
102
|
-
<ProviderHeader
|
|
108
|
+
<ProviderHeader
|
|
109
|
+
provider={selectedProvider}
|
|
110
|
+
onRefreshIcon={() => void handleRefreshIcon()}
|
|
111
|
+
isRefreshingIcon={isRefreshingIcon}
|
|
112
|
+
/>
|
|
103
113
|
|
|
104
114
|
<ProviderAuthSection
|
|
105
115
|
provider={selectedProvider}
|
|
106
|
-
|
|
107
|
-
// A provider omp signs in through `/login` needs the OAuth
|
|
108
|
-
// dialog; one whose endpoint and key live in models.yml (or the
|
|
109
|
-
// Kabmo overlay) is edited in place. Testing the provider ID
|
|
110
|
-
// for `omp-auth-` was wrong: a native models.yml entry shares
|
|
111
|
-
// that ID prefix once merged, and a keyless local server has no
|
|
112
|
-
// login flow to complete at all.
|
|
113
|
-
if (selectedProvider.credentialSource === 'omp-auth' && selectedProvider.auth !== 'none') {
|
|
114
|
-
setIsLoginModalOpen(true);
|
|
115
|
-
} else {
|
|
116
|
-
setIsReconnectModalOpen(true);
|
|
117
|
-
}
|
|
118
|
-
}}
|
|
119
|
-
onToggleDisconnect={handleToggleDisconnect}
|
|
116
|
+
onConnect={handleConnect}
|
|
120
117
|
onToggleDisabled={handleToggleProviderDisabled}
|
|
121
118
|
onDelete={() => setIsDeleteModalOpen(true)}
|
|
122
119
|
onSignOut={() => setIsLogoutModalOpen(true)}
|
|
@@ -128,7 +125,8 @@ export function ProviderSettings({
|
|
|
128
125
|
onToggleModelVisibility={handleToggleModelVisibility}
|
|
129
126
|
onHideAll={handleHideAll}
|
|
130
127
|
onShowAll={handleShowAll}
|
|
131
|
-
|
|
128
|
+
onRefreshModels={handleRefreshModels}
|
|
129
|
+
onImportModels={handleFetchModels}
|
|
132
130
|
onAddModel={() => setIsAddModelModalOpen(true)}
|
|
133
131
|
fetchBlockReason={providerFetchBlockReason(selectedProvider)}
|
|
134
132
|
isFetchingModels={isFetchingModels}
|
|
@@ -136,9 +134,14 @@ export function ProviderSettings({
|
|
|
136
134
|
onOpenModelCapabilities={(model) => setCapabilitiesModel(model)}
|
|
137
135
|
/>
|
|
138
136
|
</>
|
|
137
|
+
) : isLoading ? (
|
|
138
|
+
<div className="py-12 text-center text-xs text-ink/40">Reading omp’s provider registry…</div>
|
|
139
139
|
) : (
|
|
140
|
-
<div className="py-12 text-center text-xs text-ink/40">
|
|
141
|
-
|
|
140
|
+
<div className="py-12 text-center text-xs text-ink/40 space-y-2">
|
|
141
|
+
<p>omp reports no providers yet.</p>
|
|
142
|
+
<p className="text-[11px] text-ink/35">
|
|
143
|
+
Sign in to a provider from the list, or add one with the plus button.
|
|
144
|
+
</p>
|
|
142
145
|
</div>
|
|
143
146
|
)}
|
|
144
147
|
</div>
|
|
@@ -161,17 +164,16 @@ export function ProviderSettings({
|
|
|
161
164
|
masterDetail.openDetail();
|
|
162
165
|
}}
|
|
163
166
|
presets={availablePresetProviders}
|
|
164
|
-
existingSlugs={
|
|
167
|
+
existingSlugs={existingSlugs}
|
|
165
168
|
/>
|
|
166
169
|
|
|
167
170
|
{selectedProvider && (
|
|
168
|
-
<
|
|
169
|
-
|
|
171
|
+
<ProviderEntryModal
|
|
172
|
+
key={selectedProvider.id}
|
|
173
|
+
isOpen={isEntryModalOpen}
|
|
170
174
|
provider={selectedProvider}
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
onReconnect={handleReconnect}
|
|
174
|
-
onFetchModels={handleFetchModels}
|
|
175
|
+
onClose={() => setIsEntryModalOpen(false)}
|
|
176
|
+
onSaved={(changed: string[]) => void handleEntrySaved(changed)}
|
|
175
177
|
/>
|
|
176
178
|
)}
|
|
177
179
|
|
|
@@ -180,7 +182,7 @@ export function ProviderSettings({
|
|
|
180
182
|
isOpen={isLoginModalOpen}
|
|
181
183
|
provider={selectedProvider}
|
|
182
184
|
onClose={() => setIsLoginModalOpen(false)}
|
|
183
|
-
onAuthenticated={handleOmpAuthSuccess}
|
|
185
|
+
onAuthenticated={() => void handleOmpAuthSuccess()}
|
|
184
186
|
/>
|
|
185
187
|
)}
|
|
186
188
|
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Settings → Appearance → Editor blame.
|
|
8
|
+
*
|
|
9
|
+
* Two switches rather than one, because they answer different questions: the
|
|
10
|
+
* card is the FEATURE (a hover that names the author and the commit), and the
|
|
11
|
+
* inline label is a DECORATION that costs horizontal room on every attributed
|
|
12
|
+
* line. A user who wants the first without the second is the common case — the
|
|
13
|
+
* editor panel is 320px wide at its floor.
|
|
14
|
+
*
|
|
15
|
+
* Both reach an editor that is already open through
|
|
16
|
+
* `EDITOR_BLAME_CHANGED_EVENT`; `appSettings` is a boot-time prop, so a value
|
|
17
|
+
* read once would never arrive. The event fires only when a value moved.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
import { readKabmoSetting, writeKabmoSettings } from '@/shared/lib/settings/client';
|
|
21
|
+
import type { SettingsState } from '@/shared/types';
|
|
22
|
+
import {
|
|
23
|
+
DEFAULT_EDITOR_BLAME,
|
|
24
|
+
EDITOR_BLAME_CHANGED_EVENT,
|
|
25
|
+
currentEditorBlame,
|
|
26
|
+
} from '@/client/hooks/editor/blame-settings';
|
|
27
|
+
|
|
28
|
+
interface EditorBlameSectionProps {
|
|
29
|
+
settings: SettingsState;
|
|
30
|
+
onUpdate: (updater: Partial<SettingsState> | ((previous: SettingsState) => SettingsState)) => void;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/** One switch row. */
|
|
34
|
+
function Toggle({
|
|
35
|
+
label,
|
|
36
|
+
hint,
|
|
37
|
+
checked,
|
|
38
|
+
onChange,
|
|
39
|
+
}: {
|
|
40
|
+
label: string;
|
|
41
|
+
hint: string;
|
|
42
|
+
checked: boolean;
|
|
43
|
+
onChange: (next: boolean) => void;
|
|
44
|
+
}) {
|
|
45
|
+
return (
|
|
46
|
+
<label className="flex items-start justify-between gap-3 cursor-pointer">
|
|
47
|
+
<span className="min-w-0">
|
|
48
|
+
<span className="block text-xs text-ink">{label}</span>
|
|
49
|
+
<span className="block text-[11px] text-ink/50 mt-0.5">{hint}</span>
|
|
50
|
+
</span>
|
|
51
|
+
<input
|
|
52
|
+
type="checkbox"
|
|
53
|
+
checked={checked}
|
|
54
|
+
onChange={(event) => onChange((event.target as HTMLInputElement).checked)}
|
|
55
|
+
className="mt-0.5 shrink-0 accent-ink"
|
|
56
|
+
/>
|
|
57
|
+
</label>
|
|
58
|
+
);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export function EditorBlameSection({ settings: _settings, onUpdate }: EditorBlameSectionProps) {
|
|
62
|
+
const enabled = readKabmoSetting<boolean>('editorBlame');
|
|
63
|
+
const inline = readKabmoSetting<boolean>('editorBlameInline');
|
|
64
|
+
const resolved = currentEditorBlame();
|
|
65
|
+
|
|
66
|
+
const commit = (patch: { editorBlame?: boolean; editorBlameInline?: boolean }) => {
|
|
67
|
+
const next = { ...currentEditorBlame(), ...patch };
|
|
68
|
+
writeKabmoSettings(patch);
|
|
69
|
+
onUpdate((previous) => ({ ...previous }));
|
|
70
|
+
window.dispatchEvent(new CustomEvent(EDITOR_BLAME_CHANGED_EVENT, { detail: next }));
|
|
71
|
+
};
|
|
72
|
+
|
|
73
|
+
return (
|
|
74
|
+
<section className="space-y-3">
|
|
75
|
+
<div>
|
|
76
|
+
<h4 className="text-xs font-semibold text-ink">Line blame</h4>
|
|
77
|
+
<p className="text-[11px] text-ink/50 mt-0.5">
|
|
78
|
+
Who last touched a line, and which commit. Read from git, so it needs a committed file.
|
|
79
|
+
</p>
|
|
80
|
+
</div>
|
|
81
|
+
<div className="space-y-2.5 rounded-lg border border-ink/10 p-3">
|
|
82
|
+
<Toggle
|
|
83
|
+
label="Show blame on hover"
|
|
84
|
+
hint="Hover a line number — or the label, when it is on — to see the author, the commit and the line's own history."
|
|
85
|
+
checked={typeof enabled === 'boolean' ? enabled : DEFAULT_EDITOR_BLAME.enabled}
|
|
86
|
+
onChange={(value) => commit({ editorBlame: value })}
|
|
87
|
+
/>
|
|
88
|
+
<Toggle
|
|
89
|
+
label="Show the label in the editor"
|
|
90
|
+
hint={`Puts “author · age” at the end of each block. It costs horizontal room, so it is off on a narrow panel by default (${resolved.inline ? 'on' : 'off'}).`}
|
|
91
|
+
checked={typeof inline === 'boolean' ? inline : DEFAULT_EDITOR_BLAME.inline}
|
|
92
|
+
onChange={(value) => commit({ editorBlameInline: value })}
|
|
93
|
+
/>
|
|
94
|
+
</div>
|
|
95
|
+
</section>
|
|
96
|
+
);
|
|
97
|
+
}
|