@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,201 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The provider row builders.
|
|
8
|
+
*
|
|
9
|
+
* Two behaviours here were the panel's most misleading gaps: an unauthenticated
|
|
10
|
+
* provider was not listed at all (so it could not be signed in from the panel
|
|
11
|
+
* that signs providers in), and a model's capabilities were invented rather
|
|
12
|
+
* than read — every row said `hasVision: false` / `hasTools: true`.
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
import { describe, expect, test } from 'bun:test';
|
|
16
|
+
import {
|
|
17
|
+
catalogProviderItem,
|
|
18
|
+
loginProviderItem,
|
|
19
|
+
nativeProviderItem,
|
|
20
|
+
providerModels,
|
|
21
|
+
type CredentialContext,
|
|
22
|
+
} from '@/server/lib/models/provider-items.server';
|
|
23
|
+
import type { CatalogModel } from '@/server/lib/models/catalog.server';
|
|
24
|
+
|
|
25
|
+
const credentials: CredentialContext = {
|
|
26
|
+
modelsYmlKeys: new Set(),
|
|
27
|
+
originOf: () => undefined,
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
function catalogModel(overrides: Partial<CatalogModel> & { id: string }): CatalogModel {
|
|
31
|
+
return {
|
|
32
|
+
name: overrides.id,
|
|
33
|
+
provider: 'gateway',
|
|
34
|
+
kind: 'chat',
|
|
35
|
+
selector: `gateway/${overrides.id}`,
|
|
36
|
+
input: ['text'],
|
|
37
|
+
...overrides,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
describe('loginProviderItem', () => {
|
|
42
|
+
test('an unauthenticated provider is listed, not filtered out', () => {
|
|
43
|
+
// omp's own /models hub lists these dimmed under "Not signed in"; filtering
|
|
44
|
+
// them out made an OAuth provider that had never been signed in unreachable.
|
|
45
|
+
const item = loginProviderItem(
|
|
46
|
+
{ id: 'anthropic', name: 'Anthropic', available: true, authenticated: false },
|
|
47
|
+
{ disabled: false, credentials },
|
|
48
|
+
);
|
|
49
|
+
|
|
50
|
+
expect(item.status).toBe('disconnected');
|
|
51
|
+
expect(item.oauth).toBe(true);
|
|
52
|
+
expect(item.credentialOrigin).toBeUndefined();
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
test('a stored OAuth credential is named as a login', () => {
|
|
56
|
+
const item = loginProviderItem(
|
|
57
|
+
{ id: 'anthropic', name: 'Anthropic', available: true, authenticated: true },
|
|
58
|
+
{ disabled: false, credentials: { ...credentials, originOf: () => 'login' } },
|
|
59
|
+
);
|
|
60
|
+
|
|
61
|
+
expect(item.status).toBe('connected');
|
|
62
|
+
expect(item.credentialOrigin).toBe('login');
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
test('a disabled provider reports disconnected whatever its credential says', () => {
|
|
66
|
+
const item = loginProviderItem(
|
|
67
|
+
{ id: 'anthropic', name: 'Anthropic', available: true, authenticated: true },
|
|
68
|
+
{ disabled: true, credentials },
|
|
69
|
+
);
|
|
70
|
+
expect(item.status).toBe('disconnected');
|
|
71
|
+
expect(item.disabled).toBe(true);
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
test('its models come from the catalog, including non-chat kinds', () => {
|
|
75
|
+
const item = loginProviderItem(
|
|
76
|
+
{ id: 'gateway', name: 'Gateway', available: true, authenticated: true },
|
|
77
|
+
{
|
|
78
|
+
disabled: false,
|
|
79
|
+
credentials,
|
|
80
|
+
catalog: [
|
|
81
|
+
catalogModel({ id: 'chat-x' }),
|
|
82
|
+
catalogModel({ id: 'embed-x', kind: 'embedding', input: [] }),
|
|
83
|
+
],
|
|
84
|
+
},
|
|
85
|
+
);
|
|
86
|
+
|
|
87
|
+
expect(item.models.map((model) => model.id)).toEqual(['chat-x', 'embed-x']);
|
|
88
|
+
expect(item.models[1].kind).toBe('embedding');
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
describe('nativeProviderItem', () => {
|
|
93
|
+
test('capabilities come from the record, not from a default', () => {
|
|
94
|
+
const item = nativeProviderItem(
|
|
95
|
+
{
|
|
96
|
+
slug: 'local',
|
|
97
|
+
baseUrl: 'http://localhost:1234/v1',
|
|
98
|
+
modelIds: ['vision-x', 'plain'],
|
|
99
|
+
models: [
|
|
100
|
+
{ id: 'vision-x', imageInput: true, reasoning: true, supportsTools: true },
|
|
101
|
+
{ id: 'plain', supportsTools: false },
|
|
102
|
+
],
|
|
103
|
+
},
|
|
104
|
+
false,
|
|
105
|
+
undefined,
|
|
106
|
+
undefined,
|
|
107
|
+
credentials,
|
|
108
|
+
);
|
|
109
|
+
|
|
110
|
+
const vision = item.models.find((model) => model.id === 'vision-x');
|
|
111
|
+
const plain = item.models.find((model) => model.id === 'plain');
|
|
112
|
+
expect(vision?.hasVision).toBe(true);
|
|
113
|
+
expect(vision?.hasReasoning).toBe(true);
|
|
114
|
+
expect(plain?.hasVision).toBe(false);
|
|
115
|
+
// A model that declares no tool support must not claim it.
|
|
116
|
+
expect(plain?.hasTools).toBe(false);
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
test('carries the entry fields the panel shows', () => {
|
|
120
|
+
const item = nativeProviderItem(
|
|
121
|
+
{
|
|
122
|
+
slug: 'gateway',
|
|
123
|
+
baseUrl: 'https://x/v1',
|
|
124
|
+
api: 'anthropic-messages',
|
|
125
|
+
auth: 'none',
|
|
126
|
+
discovery: 'lm-studio',
|
|
127
|
+
headers: { 'X-Route': 'a' },
|
|
128
|
+
transport: 'pi-native',
|
|
129
|
+
modelIds: [],
|
|
130
|
+
models: [],
|
|
131
|
+
},
|
|
132
|
+
false,
|
|
133
|
+
undefined,
|
|
134
|
+
undefined,
|
|
135
|
+
credentials,
|
|
136
|
+
);
|
|
137
|
+
|
|
138
|
+
expect(item.api).toBe('anthropic-messages');
|
|
139
|
+
expect(item.auth).toBe('none');
|
|
140
|
+
expect(item.discovery).toBe('lm-studio');
|
|
141
|
+
expect(item.headers).toEqual({ 'X-Route': 'a' });
|
|
142
|
+
expect(item.transport).toBe('pi-native');
|
|
143
|
+
expect(item.inModelsYml).toBe(true);
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
describe('providerModels', () => {
|
|
148
|
+
test('the union keeps a registered id the catalog does not serve', () => {
|
|
149
|
+
// A model whose credential lapsed, or one omp filters out of the listing,
|
|
150
|
+
// still exists in models.yml — dropping it read as "deleted".
|
|
151
|
+
const models = providerModels(
|
|
152
|
+
{ name: 'gateway', slug: 'gateway' },
|
|
153
|
+
[catalogModel({ id: 'from-catalog', contextWindow: 1000 })],
|
|
154
|
+
[{ id: 'file-only' }],
|
|
155
|
+
);
|
|
156
|
+
|
|
157
|
+
expect(models.map((model) => model.id)).toEqual(['from-catalog', 'file-only']);
|
|
158
|
+
});
|
|
159
|
+
|
|
160
|
+
test('a catalog row wins over the file entry for the same id', () => {
|
|
161
|
+
const models = providerModels(
|
|
162
|
+
{ name: 'gateway', slug: 'gateway' },
|
|
163
|
+
[catalogModel({ id: 'shared', contextWindow: 200000 })],
|
|
164
|
+
[{ id: 'shared', contextWindow: 4096 }],
|
|
165
|
+
);
|
|
166
|
+
|
|
167
|
+
expect(models).toHaveLength(1);
|
|
168
|
+
expect(models[0].contextWindow).toContain('200K');
|
|
169
|
+
});
|
|
170
|
+
|
|
171
|
+
test('the overlay supplies visibility and saved knobs', () => {
|
|
172
|
+
const models = providerModels(
|
|
173
|
+
{ name: 'gateway', slug: 'gateway' },
|
|
174
|
+
[catalogModel({ id: 'a' }), catalogModel({ id: 'b' })],
|
|
175
|
+
[],
|
|
176
|
+
new Map([
|
|
177
|
+
['a', { isVisible: false }],
|
|
178
|
+
['b', { isVisible: true, maxTokens: 4096 }],
|
|
179
|
+
]),
|
|
180
|
+
);
|
|
181
|
+
|
|
182
|
+
expect(models.find((model) => model.id === 'a')?.isVisible).toBe(false);
|
|
183
|
+
expect(models.find((model) => model.id === 'b')?.maxTokens).toBe(4096);
|
|
184
|
+
});
|
|
185
|
+
});
|
|
186
|
+
|
|
187
|
+
describe('catalogProviderItem', () => {
|
|
188
|
+
test('a discovered keyless endpoint gets a row of its own', () => {
|
|
189
|
+
// Its models reach the chat picker, so the panel that manages providers has
|
|
190
|
+
// to list it — it appeared in neither get_login_providers nor models.yml.
|
|
191
|
+
const item = catalogProviderItem(
|
|
192
|
+
'ollama',
|
|
193
|
+
[catalogModel({ id: 'llama3', provider: 'ollama' })],
|
|
194
|
+
undefined,
|
|
195
|
+
);
|
|
196
|
+
|
|
197
|
+
expect(item.slug).toBe('ollama');
|
|
198
|
+
expect(item.status).toBe('connected');
|
|
199
|
+
expect(item.models.map((model) => model.id)).toEqual(['llama3']);
|
|
200
|
+
});
|
|
201
|
+
});
|
|
@@ -20,9 +20,15 @@
|
|
|
20
20
|
import { describe, expect, test } from 'bun:test';
|
|
21
21
|
|
|
22
22
|
import { deduplicateProviderItems } from '@/server/lib/models/provider-registry.server';
|
|
23
|
-
import { nativeProviderItem } from '@/server/lib/models/provider-items.server';
|
|
23
|
+
import { nativeProviderItem, type CredentialContext } from '@/server/lib/models/provider-items.server';
|
|
24
24
|
import type { ProviderItem } from '@/shared/types/settings/provider';
|
|
25
25
|
|
|
26
|
+
/** No stored credentials: every provider's origin resolves from models.yml alone. */
|
|
27
|
+
const credentials: CredentialContext = {
|
|
28
|
+
modelsYmlKeys: new Set<string>(),
|
|
29
|
+
originOf: () => undefined,
|
|
30
|
+
};
|
|
31
|
+
|
|
26
32
|
function item(overrides: Partial<ProviderItem> & { slug: string }): ProviderItem {
|
|
27
33
|
return {
|
|
28
34
|
id: `id-${overrides.slug}`,
|
|
@@ -130,13 +136,19 @@ describe('nativeProviderItem', () => {
|
|
|
130
136
|
// `baseUrl` at all, so the button read `disabled` for every native provider
|
|
131
137
|
// even though its endpoint was in the file. It is also not a secret — the
|
|
132
138
|
// label beside it prints the same URL.
|
|
133
|
-
const native = nativeProviderItem(
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
139
|
+
const native = nativeProviderItem(
|
|
140
|
+
{
|
|
141
|
+
slug: 'kenari',
|
|
142
|
+
baseUrl: 'https://kenari.id/v1',
|
|
143
|
+
api: 'openai-completions',
|
|
144
|
+
modelIds: ['m'],
|
|
145
|
+
models: [{ id: 'm' }],
|
|
146
|
+
},
|
|
147
|
+
false,
|
|
148
|
+
undefined,
|
|
149
|
+
undefined,
|
|
150
|
+
credentials,
|
|
151
|
+
);
|
|
140
152
|
expect(native.baseUrl).toBe('https://kenari.id/v1');
|
|
141
153
|
expect(native.inModelsYml).toBe(true);
|
|
142
154
|
expect(native.modelSource).toBe('fetch');
|
|
@@ -145,7 +157,13 @@ describe('nativeProviderItem', () => {
|
|
|
145
157
|
test('omits the endpoint entirely when the entry declares none', () => {
|
|
146
158
|
// A discovery entry is listed by omp and needs no probe URL; an empty
|
|
147
159
|
// string would read as "known but unusable" instead of "not applicable".
|
|
148
|
-
const native = nativeProviderItem(
|
|
160
|
+
const native = nativeProviderItem(
|
|
161
|
+
{ slug: 'lm-studio', discovery: 'lm-studio', modelIds: [], models: [] },
|
|
162
|
+
false,
|
|
163
|
+
undefined,
|
|
164
|
+
undefined,
|
|
165
|
+
credentials,
|
|
166
|
+
);
|
|
149
167
|
expect(native.baseUrl).toBeUndefined();
|
|
150
168
|
expect(native.modelSource).toBe('discovery');
|
|
151
169
|
});
|
|
@@ -4,19 +4,39 @@
|
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
|
-
* Provider registry assembly for the provider settings. Folds the
|
|
7
|
+
* Provider registry assembly for the provider settings. Folds the four omp
|
|
8
8
|
* sources — auth login providers, models.yml registrations, config.yml
|
|
9
|
-
* disabledProviders — with Kabmo's local SQLite
|
|
10
|
-
* ProviderItem list the settings UI renders. Server-only:
|
|
11
|
-
* files and drives the shared utility RPC process.
|
|
9
|
+
* disabledProviders, and the CLI model catalog — with Kabmo's local SQLite
|
|
10
|
+
* overlay into the ProviderItem list the settings UI renders. Server-only:
|
|
11
|
+
* reads omp config files and drives the shared utility RPC process.
|
|
12
|
+
*
|
|
13
|
+
* Every provider omp KNOWS is listed, including one with no credential. omp's
|
|
14
|
+
* own `/models` hub draws them the same way (dimmed, under "Not signed in",
|
|
15
|
+
* with a pick forwarding to `/login`), and filtering them out made an OAuth
|
|
16
|
+
* provider that had never been signed in unreachable from the panel that is
|
|
17
|
+
* supposed to be able to sign it in.
|
|
12
18
|
*/
|
|
13
19
|
|
|
14
20
|
import { readDisabledProviders } from '@/server/lib/omp/config/disabled-providers';
|
|
15
21
|
import { getModelsConfigPath, readNativeProviders } from '@/server/lib/omp/config/models-config';
|
|
16
|
-
import { runUtilityCommand, type OmpModel } from '@/server/lib/omp/rpc/utility';
|
|
17
|
-
import {
|
|
22
|
+
import { runUtilityCommand, type OmpLoginProvider, type OmpModel } from '@/server/lib/omp/rpc/utility';
|
|
23
|
+
import {
|
|
24
|
+
catalogProviderItem,
|
|
25
|
+
disabledProviderItem,
|
|
26
|
+
loginProviderItem,
|
|
27
|
+
nativeProviderItem,
|
|
28
|
+
type CredentialContext,
|
|
29
|
+
type ModelOverlay,
|
|
30
|
+
} from '@/server/lib/models/provider-items.server';
|
|
31
|
+
import { readModelCatalogByProvider, type CatalogByProvider } from '@/server/lib/models/catalog.server';
|
|
32
|
+
import {
|
|
33
|
+
readAgentDbCredentialIndex,
|
|
34
|
+
resolveCredentialOrigin,
|
|
35
|
+
type AgentDbCredentialIndex,
|
|
36
|
+
} from '@/server/lib/models/credential-origin.server';
|
|
37
|
+
import { stampProviderIcons } from '@/server/lib/models/provider-icon.server';
|
|
18
38
|
import { removeLegacyKenariModels } from '@/shared/lib/models/provider/cleanup';
|
|
19
|
-
import type { ProviderItem } from '@/shared/types';
|
|
39
|
+
import type { ProviderItem, ProviderModel } from '@/shared/types';
|
|
20
40
|
|
|
21
41
|
/** app_settings key holding Kabmo-local provider overlay. */
|
|
22
42
|
export const PROVIDERS_SETTINGS_KEY = 'omp_providers_config';
|
|
@@ -24,10 +44,14 @@ export const PROVIDERS_SETTINGS_KEY = 'omp_providers_config';
|
|
|
24
44
|
const RPC_CACHE_TTL_MS = 60_000;
|
|
25
45
|
|
|
26
46
|
/** Minimal shape of a get_login_providers entry, as Kabmo reads it. */
|
|
27
|
-
export interface DetectedLoginProvider {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
47
|
+
export interface DetectedLoginProvider extends OmpLoginProvider {}
|
|
48
|
+
|
|
49
|
+
function isOmpModel(model: unknown): model is OmpModel {
|
|
50
|
+
return (
|
|
51
|
+
typeof model === 'object' && model !== null
|
|
52
|
+
&& typeof (model as OmpModel).id === 'string'
|
|
53
|
+
&& typeof (model as OmpModel).provider === 'string'
|
|
54
|
+
);
|
|
31
55
|
}
|
|
32
56
|
|
|
33
57
|
function isDetectedLoginProvider(provider: unknown): provider is DetectedLoginProvider {
|
|
@@ -39,26 +63,25 @@ function isDetectedLoginProvider(provider: unknown): provider is DetectedLoginPr
|
|
|
39
63
|
);
|
|
40
64
|
}
|
|
41
65
|
|
|
42
|
-
function isOmpModel(model: unknown): model is OmpModel {
|
|
43
|
-
return (
|
|
44
|
-
typeof model === 'object' && model !== null
|
|
45
|
-
&& typeof (model as OmpModel).id === 'string'
|
|
46
|
-
&& typeof (model as OmpModel).provider === 'string'
|
|
47
|
-
);
|
|
48
|
-
}
|
|
49
|
-
|
|
50
66
|
export interface OmpRegistrySnapshot {
|
|
51
67
|
/** Login providers omp reports (authenticated or not). */
|
|
52
68
|
providers: DetectedLoginProvider[];
|
|
53
|
-
/**
|
|
69
|
+
/**
|
|
70
|
+
* Every CHAT model omp currently serves.
|
|
71
|
+
*
|
|
72
|
+
* Deliberately the RPC's own view, chat only: the two callers that read this
|
|
73
|
+
* (`provider-key.ts`, the boot banner) ask a PROVIDER-level question — "does
|
|
74
|
+
* this provider serve anything" — and one chat model answers it. The settings
|
|
75
|
+
* panel's model list does NOT come from here: it needs every kind, so it
|
|
76
|
+
* reads `omp models --json --kind all` (`catalog.server.ts`).
|
|
77
|
+
*/
|
|
54
78
|
models: OmpModel[];
|
|
55
79
|
}
|
|
56
80
|
|
|
57
81
|
/**
|
|
58
|
-
* Raw omp registry probe — the
|
|
59
|
-
*
|
|
60
|
-
*
|
|
61
|
-
* Throws when the utility RPC is unreachable; each caller degrades its own way.
|
|
82
|
+
* Raw omp registry probe — the login providers omp knows and the chat models
|
|
83
|
+
* they serve. Throws when the utility RPC is unreachable; each caller degrades
|
|
84
|
+
* its own way.
|
|
62
85
|
*/
|
|
63
86
|
export async function fetchOmpRegistrySnapshot(): Promise<OmpRegistrySnapshot> {
|
|
64
87
|
const [loginResponse, modelsResponse] = await Promise.all([
|
|
@@ -71,42 +94,14 @@ export async function fetchOmpRegistrySnapshot(): Promise<OmpRegistrySnapshot> {
|
|
|
71
94
|
};
|
|
72
95
|
}
|
|
73
96
|
|
|
74
|
-
/**
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
*/
|
|
79
|
-
async function loadRpcProviderItems(): Promise<ProviderItem[]> {
|
|
80
|
-
const cached = globalThis.__kabmoProvidersRpcCache;
|
|
81
|
-
if (cached && cached.expiresAt > Date.now()) return cached.data;
|
|
97
|
+
/** Login providers from the shared RPC, cached for a minute. */
|
|
98
|
+
async function loadLoginProviders(): Promise<DetectedLoginProvider[]> {
|
|
99
|
+
const cached = globalThis.__kabmoLoginProvidersCache;
|
|
100
|
+
if (cached && cached.expiresAt > Date.now()) return cached.data as DetectedLoginProvider[];
|
|
82
101
|
try {
|
|
83
|
-
const { providers
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
const items = loginProviders.map((provider) => {
|
|
87
|
-
const providerModels = available.filter((model) => model.provider === provider.id);
|
|
88
|
-
const isDisabled = disabled.has(provider.id);
|
|
89
|
-
return {
|
|
90
|
-
id: `omp-auth-${provider.id}`,
|
|
91
|
-
name: provider.name,
|
|
92
|
-
slug: provider.id,
|
|
93
|
-
icon: provider.id,
|
|
94
|
-
status: (provider.authenticated && !isDisabled ? 'connected' : 'disconnected') as ProviderItem['status'],
|
|
95
|
-
disabled: isDisabled,
|
|
96
|
-
configuredIn: 'omp auth credentials',
|
|
97
|
-
credentialSource: 'omp-auth' as const,
|
|
98
|
-
models: providerModels.map((model) => ({
|
|
99
|
-
id: model.id,
|
|
100
|
-
name: typeof model.name === 'string' && model.name.length > 0 ? model.name : model.id,
|
|
101
|
-
contextWindow: model.contextWindow ? `${Math.round(model.contextWindow / 1000)}K ctx` : '',
|
|
102
|
-
hasTools: true,
|
|
103
|
-
hasVision: false,
|
|
104
|
-
isVisible: true,
|
|
105
|
-
})),
|
|
106
|
-
};
|
|
107
|
-
});
|
|
108
|
-
globalThis.__kabmoProvidersRpcCache = { data: items, expiresAt: Date.now() + RPC_CACHE_TTL_MS };
|
|
109
|
-
return items;
|
|
102
|
+
const { providers } = await fetchOmpRegistrySnapshot();
|
|
103
|
+
globalThis.__kabmoLoginProvidersCache = { data: providers, expiresAt: Date.now() + RPC_CACHE_TTL_MS };
|
|
104
|
+
return providers;
|
|
110
105
|
} catch {
|
|
111
106
|
// RPC unavailable (cold start / omp busy) — degrade to the remaining sources.
|
|
112
107
|
return [];
|
|
@@ -150,6 +145,10 @@ function mergeProviderItems(existing: ProviderItem, incoming: ProviderItem): Pro
|
|
|
150
145
|
credentialSource: primary.credentialSource === 'models.yml' || secondary.credentialSource === 'models.yml'
|
|
151
146
|
? 'models.yml'
|
|
152
147
|
: primary.credentialSource ?? secondary.credentialSource,
|
|
148
|
+
// The origin is a fact about the credential STORE, so the half that knows
|
|
149
|
+
// it wins over the half that does not.
|
|
150
|
+
credentialOrigin: primary.credentialOrigin ?? secondary.credentialOrigin,
|
|
151
|
+
oauth: primary.oauth === true || secondary.oauth === true,
|
|
153
152
|
// A union, not a winner-takes-all: the two halves see different files
|
|
154
153
|
// (auth sees login providers, native sees models.yml), and the flag decides
|
|
155
154
|
// whether the delete button may appear at all.
|
|
@@ -159,6 +158,9 @@ function mergeProviderItems(existing: ProviderItem, incoming: ProviderItem): Pro
|
|
|
159
158
|
api: primary.api ?? secondary.api,
|
|
160
159
|
auth: primary.auth ?? secondary.auth,
|
|
161
160
|
discovery: primary.discovery ?? secondary.discovery,
|
|
161
|
+
headers: primary.headers ?? secondary.headers,
|
|
162
|
+
authHeader: primary.authHeader ?? secondary.authHeader,
|
|
163
|
+
transport: primary.transport ?? secondary.transport,
|
|
162
164
|
configuredIn: primary.apiKey || primary.baseUrl ? primary.configuredIn : secondary.configuredIn,
|
|
163
165
|
models,
|
|
164
166
|
};
|
|
@@ -206,6 +208,7 @@ function applyStoredOverrides(registry: ProviderItem[], stored: ProviderItem[]):
|
|
|
206
208
|
const savedModels = new Map(saved.models.map((model) => [model.id, model]));
|
|
207
209
|
return {
|
|
208
210
|
...provider,
|
|
211
|
+
inOverlay: true,
|
|
209
212
|
models: provider.models.map((model) => {
|
|
210
213
|
const previous = savedModels.get(model.id);
|
|
211
214
|
if (!previous) return model;
|
|
@@ -222,17 +225,94 @@ function applyStoredOverrides(registry: ProviderItem[], stored: ProviderItem[]):
|
|
|
222
225
|
});
|
|
223
226
|
}
|
|
224
227
|
|
|
225
|
-
/**
|
|
226
|
-
|
|
227
|
-
const
|
|
228
|
-
|
|
229
|
-
const
|
|
230
|
-
const
|
|
228
|
+
/** The overlay's per-model state for one provider, keyed by model id. */
|
|
229
|
+
function overlayFor(stored: ProviderItem[], slug: string): ModelOverlay | undefined {
|
|
230
|
+
const saved = stored.find((provider) => provider.slug.trim().toLowerCase() === slug.trim().toLowerCase());
|
|
231
|
+
if (!saved || saved.models.length === 0) return undefined;
|
|
232
|
+
const overlay: ModelOverlay = new Map();
|
|
233
|
+
for (const model of saved.models) {
|
|
234
|
+
overlay.set(model.id, {
|
|
235
|
+
isVisible: model.isVisible !== false,
|
|
236
|
+
...(model.temperature !== undefined ? { temperature: model.temperature } : {}),
|
|
237
|
+
...(model.maxTokens !== undefined ? { maxTokens: model.maxTokens } : {}),
|
|
238
|
+
...(model.topP !== undefined ? { topP: model.topP } : {}),
|
|
239
|
+
...(model.reasoningEffort !== undefined ? { reasoningEffort: model.reasoningEffort } : {}),
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
return overlay;
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
function credentialContext(
|
|
246
|
+
credentials: AgentDbCredentialIndex,
|
|
247
|
+
modelsYmlKeys: Set<string>,
|
|
248
|
+
authenticated: Set<string>,
|
|
249
|
+
): CredentialContext {
|
|
250
|
+
return {
|
|
251
|
+
modelsYmlKeys,
|
|
252
|
+
originOf: (slug: string) => resolveCredentialOrigin({
|
|
253
|
+
slug,
|
|
254
|
+
authenticated: authenticated.has(slug.trim().toLowerCase()),
|
|
255
|
+
inModelsYml: false,
|
|
256
|
+
hasModelsYmlKey: modelsYmlKeys.has(slug.trim().toLowerCase()),
|
|
257
|
+
credentials,
|
|
258
|
+
}),
|
|
259
|
+
};
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
/** Merge every omp provider source with app-local custom SQLite entries. */
|
|
263
|
+
export async function mergeProviders(custom: ProviderItem[]): Promise<{
|
|
264
|
+
providers: ProviderItem[];
|
|
265
|
+
modelsConfigPath: string;
|
|
266
|
+
catalogError: string | null;
|
|
267
|
+
}> {
|
|
268
|
+
const [disabled, loginProviders, native, catalog, credentials] = await Promise.all([
|
|
269
|
+
readDisabledProviders().catch(() => new Set<string>()),
|
|
270
|
+
loadLoginProviders(),
|
|
271
|
+
readNativeProviders(),
|
|
272
|
+
readModelCatalogByProvider(),
|
|
273
|
+
readAgentDbCredentialIndex(),
|
|
274
|
+
]);
|
|
275
|
+
const modelsYmlKeys = new Set(
|
|
276
|
+
native.filter((info) => info.hasApiKey === true).map((info) => info.slug.trim().toLowerCase()),
|
|
277
|
+
);
|
|
278
|
+
const authenticated = new Set(
|
|
279
|
+
loginProviders
|
|
280
|
+
.filter((provider) => provider.authenticated)
|
|
281
|
+
.map((provider) => provider.id.trim().toLowerCase()),
|
|
282
|
+
);
|
|
283
|
+
const ctx = credentialContext(credentials, modelsYmlKeys, authenticated);
|
|
284
|
+
const catalogFor = (slug: string) => catalog.byProvider.get(slug.trim().toLowerCase());
|
|
285
|
+
|
|
286
|
+
const authItems = loginProviders.map((provider) => loginProviderItem(provider, {
|
|
287
|
+
disabled: disabled.has(provider.id),
|
|
288
|
+
...(catalogFor(provider.id) ? { catalog: catalogFor(provider.id) } : {}),
|
|
289
|
+
nativeModels: native.find((info) => info.slug === provider.id)?.models,
|
|
290
|
+
overlay: overlayFor(custom, provider.id),
|
|
291
|
+
credentials: ctx,
|
|
292
|
+
}));
|
|
293
|
+
const nativeItems = native.map((info) => nativeProviderItem(
|
|
294
|
+
info,
|
|
295
|
+
disabled.has(info.slug),
|
|
296
|
+
catalogFor(info.slug),
|
|
297
|
+
overlayFor(custom, info.slug),
|
|
298
|
+
ctx,
|
|
299
|
+
));
|
|
231
300
|
const disabledItems = [...disabled]
|
|
232
301
|
.filter((slug) => !nativeItems.some((n) => n.slug === slug) && !authItems.some((a) => a.slug === slug))
|
|
233
302
|
.map(disabledProviderItem);
|
|
303
|
+
// Providers that serve models but appear in neither source: a keyless local
|
|
304
|
+
// endpoint omp discovers itself. Their models reach the chat picker, so the
|
|
305
|
+
// panel that manages providers must list them too.
|
|
306
|
+
const knownSlugs = new Set([
|
|
307
|
+
...loginProviders.map((provider) => provider.id.trim().toLowerCase()),
|
|
308
|
+
...native.map((info) => info.slug.trim().toLowerCase()),
|
|
309
|
+
]);
|
|
310
|
+
const catalogOnly = [...catalog.byProvider.entries()]
|
|
311
|
+
.filter(([slug]) => !knownSlugs.has(slug) && !disabled.has(slug))
|
|
312
|
+
.map(([slug, models]) => catalogProviderItem(slug, models, overlayFor(custom, slug)));
|
|
313
|
+
|
|
234
314
|
const registryItems = applyStoredOverrides(
|
|
235
|
-
deduplicateProviderItems([...authItems, ...nativeItems, ...disabledItems]),
|
|
315
|
+
deduplicateProviderItems([...authItems, ...nativeItems, ...catalogOnly, ...disabledItems]),
|
|
236
316
|
custom,
|
|
237
317
|
);
|
|
238
318
|
const nativeSlugs = new Set(registryItems.map((provider) => provider.slug.toLowerCase()));
|
|
@@ -250,8 +330,21 @@ export async function mergeProviders(custom: ProviderItem[]): Promise<{ provider
|
|
|
250
330
|
? { ...provider, inModelsYml: true }
|
|
251
331
|
: provider
|
|
252
332
|
));
|
|
333
|
+
// A provider's own site is the only identity a `models.yml` endpoint has, so
|
|
334
|
+
// its favicon replaces the initials fallback wherever one has been fetched.
|
|
335
|
+
// `stampProviderIcons` reads stored stamps only and fetches in the background
|
|
336
|
+
// — a provider list must never wait on a third-party host.
|
|
337
|
+
const stamped = await stampProviderIcons(providers);
|
|
253
338
|
return {
|
|
254
|
-
providers,
|
|
339
|
+
providers: stamped,
|
|
255
340
|
modelsConfigPath: await getModelsConfigPath(),
|
|
341
|
+
catalogError: catalog.error,
|
|
256
342
|
};
|
|
257
343
|
}
|
|
344
|
+
|
|
345
|
+
/** Every provider's models, for the model pickers that only need the list. */
|
|
346
|
+
export function flattenProviderModels(providers: ProviderItem[]): ProviderModel[] {
|
|
347
|
+
return providers.flatMap((provider) => provider.models);
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
export type { CatalogByProvider };
|
|
@@ -74,7 +74,7 @@ afterAll(() => {
|
|
|
74
74
|
afterEach(() => {
|
|
75
75
|
disposeUtilityRpc();
|
|
76
76
|
globalThis.__kabmoModelsCache = undefined;
|
|
77
|
-
globalThis.
|
|
77
|
+
globalThis.__kabmoLoginProvidersCache = undefined;
|
|
78
78
|
globalThis.__kabmoDb?.resolved?.raw.close();
|
|
79
79
|
globalThis.__kabmoDb = undefined;
|
|
80
80
|
delete Bun.env.FAKE_OMP_RESPONSES;
|
|
@@ -158,10 +158,10 @@ describe('loadModelsWithCache', () => {
|
|
|
158
158
|
|
|
159
159
|
test('invalidateModelsCache drops the model and provider caches together', () => {
|
|
160
160
|
globalThis.__kabmoModelsCache = { data: EMPTY_MODELS, expiresAt: Date.now() + 60_000 };
|
|
161
|
-
globalThis.
|
|
161
|
+
globalThis.__kabmoLoginProvidersCache = { data: [], expiresAt: Date.now() + 60_000 };
|
|
162
162
|
invalidateModelsCache();
|
|
163
163
|
expect(globalThis.__kabmoModelsCache).toBeUndefined();
|
|
164
|
-
expect(globalThis.
|
|
164
|
+
expect(globalThis.__kabmoLoginProvidersCache).toBeUndefined();
|
|
165
165
|
});
|
|
166
166
|
});
|
|
167
167
|
|
|
@@ -17,6 +17,7 @@ import { PROVIDERS_SETTINGS_KEY } from '@/server/lib/models/provider-registry.se
|
|
|
17
17
|
import { readSettingsJson } from '@/server/lib/db/settings-store';
|
|
18
18
|
import { readDisabledProviders } from '@/server/lib/omp/config/disabled-providers';
|
|
19
19
|
import { runUtilityCommand, type OmpModel } from '@/server/lib/omp/rpc/utility';
|
|
20
|
+
import { readProviderIconUrls } from '@/server/lib/models/provider-icon.server';
|
|
20
21
|
import { invalidateModelsCaches } from '@/shared/lib/models/server-cache';
|
|
21
22
|
import type { ModelsData, ProviderItem } from '@/shared/types';
|
|
22
23
|
|
|
@@ -137,6 +138,10 @@ async function loadModels(): Promise<ModelsData> {
|
|
|
137
138
|
|
|
138
139
|
const disabledProviders = await readDisabledProviders();
|
|
139
140
|
const hiddenModelKeys = await readHiddenModelKeys();
|
|
141
|
+
// The provider's own site is the only identity a custom endpoint has, and the
|
|
142
|
+
// picker draws a mark per section and per selected model. Read as STAMPS (one
|
|
143
|
+
// query, no bytes) — the bytes are served by `/api/provider-icon`.
|
|
144
|
+
const providerIconUrls = await readProviderIconUrls();
|
|
140
145
|
const nameMap: Record<string, string> = {};
|
|
141
146
|
const thinkingLevels: Record<string, string[]> = {};
|
|
142
147
|
const modelList = filterSelectableModels(available, disabledProviders, hiddenModelKeys)
|
|
@@ -144,6 +149,9 @@ async function loadModels(): Promise<ModelsData> {
|
|
|
144
149
|
id: m.id,
|
|
145
150
|
name: m.name,
|
|
146
151
|
provider: m.provider,
|
|
152
|
+
...(providerIconUrls.get(m.provider.trim().toLowerCase())
|
|
153
|
+
? { providerIconUrl: providerIconUrls.get(m.provider.trim().toLowerCase()) }
|
|
154
|
+
: {}),
|
|
147
155
|
thinkingLevels: thinkingLevelsFor(m),
|
|
148
156
|
supportsFastMode: supportsFastMode(m),
|
|
149
157
|
contextWindow: m.contextWindow ?? undefined,
|
|
@@ -134,13 +134,14 @@ describe('discoverNativeAgents', () => {
|
|
|
134
134
|
|
|
135
135
|
const found = await discoverNativeAgents();
|
|
136
136
|
expect(found.map((agent) => agent.id).sort()).toEqual(['omp-user-one', 'omp-user-two']);
|
|
137
|
-
|
|
137
|
+
// By id, never by index: `readdir` order is not guaranteed (Windows returned `two` first).
|
|
138
|
+
const byId = new Map(found.map((agent) => [agent.id, agent]));
|
|
139
|
+
expect(byId.get('omp-user-one')).toMatchObject({
|
|
138
140
|
name: 'First', description: 'a description', mode: 'subagent', overrideModel: 'fast', thinkingVariant: 'high',
|
|
139
141
|
temperature: 0.5, topP: null, systemPrompt: 'system prompt', sourceRoot: 'user', filePath: join(userAgents, 'one.md'),
|
|
140
142
|
});
|
|
141
|
-
expect(
|
|
142
|
-
name: 'two', description: '', mode: 'all', temperature: null, topP: null,
|
|
143
|
-
systemPrompt: 'no frontmatter body',
|
|
143
|
+
expect(byId.get('omp-user-two')).toMatchObject({
|
|
144
|
+
name: 'two', description: '', mode: 'all', temperature: null, topP: null, systemPrompt: 'no frontmatter body',
|
|
144
145
|
});
|
|
145
146
|
});
|
|
146
147
|
|