@kabmo-labs/kabmo 0.17.0 → 0.18.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/dist/client/index.html +1 -1
- package/dist/client/index.js +538 -457
- package/dist/client/static/js/index-hp75vsv9.css +1 -0
- package/dist/client/static/js/{index-rerjq5th.js → index-tc09dtca.js} +823 -814
- package/package.json +1 -1
- package/src/client/components/common/MarkdownRenderer.tsx +136 -89
- package/src/client/components/common/anchored-menu/index.test.tsx +141 -0
- package/src/client/components/common/anchored-menu/index.tsx +143 -0
- package/src/client/components/common/markdown-review/ReviewPopover.tsx +144 -0
- package/src/client/components/common/markdown-review/ReviewSummary.tsx +108 -0
- package/src/client/components/common/markdown-review/index.tsx +129 -0
- package/src/client/components/common/server-control/Panel.tsx +33 -23
- package/src/client/components/common/server-control/index.test.tsx +11 -5
- package/src/client/components/common/server-control/index.tsx +10 -8
- package/src/client/components/layout/session-sidebar/CategoryHeader.tsx +42 -21
- package/src/client/components/layout/session-sidebar/CategoryHeader.worktree.test.tsx +36 -17
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +8 -7
- package/src/client/components/layout/session-sidebar/about-modal/NotesDialog.tsx +94 -0
- package/src/client/components/layout/session-sidebar/about-modal/VersionLine.test.tsx +68 -0
- package/src/client/components/layout/session-sidebar/about-modal/VersionLine.tsx +36 -0
- package/src/client/components/layout/session-sidebar/about-modal/index.tsx +57 -34
- package/src/client/components/layout/session-sidebar/modern/WorkspaceHeader.tsx +28 -10
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +7 -6
- package/src/client/components/layout/session-sidebar/modern/workspace-header.test.tsx +1 -1
- package/src/client/components/layout/update-popup/ReleaseNotes.tsx +8 -3
- package/src/client/components/layout/update-popup/index.tsx +5 -1
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +13 -15
- package/src/client/components/mobile/mobile-right-sidebar/Header.tsx +23 -1
- package/src/client/components/mobile/mobile-right-sidebar/MissingFileBanner.tsx +30 -0
- package/src/client/components/mobile/mobile-right-sidebar/PreviewScroller.tsx +18 -2
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +22 -67
- package/src/client/components/mobile/mobile-session-sidebar/ItemMenu.tsx +110 -0
- package/src/client/components/settings/SettingsSidebarList.tsx +20 -0
- package/src/client/components/settings/categories/AgentSettings.tsx +23 -50
- package/src/client/components/settings/categories/CommandSettings.tsx +2 -2
- package/src/client/components/settings/categories/McpSettings.tsx +4 -21
- package/src/client/components/settings/categories/OmpSettings.tsx +147 -194
- package/src/client/components/settings/categories/SkillSettings.tsx +2 -2
- package/src/client/components/settings/categories/TokenUsageSettings.tsx +211 -229
- package/src/client/components/settings/categories/agent-settings/DetailPane.tsx +229 -237
- package/src/client/components/settings/categories/agent-settings/ModelPicker.tsx +71 -0
- package/src/client/components/settings/categories/agent-settings/SidebarList.tsx +9 -2
- package/src/client/components/settings/categories/agent-settings/levels.ts +38 -0
- package/src/client/components/settings/categories/behavior-settings/Editor.tsx +27 -7
- package/src/client/components/settings/categories/chat-settings/ToolRenderSection.tsx +23 -5
- package/src/client/components/settings/categories/command-settings/DetailPane.tsx +75 -33
- package/src/client/components/settings/categories/command-settings/SidebarList.tsx +7 -0
- package/src/client/components/settings/categories/mcp-settings/DetailPane.tsx +91 -76
- package/src/client/components/settings/categories/mcp-settings/EnvVarsSection.tsx +83 -0
- package/src/client/components/settings/categories/mcp-settings/ImportModal.tsx +26 -13
- package/src/client/components/settings/categories/mcp-settings/SidebarList.tsx +20 -0
- package/src/client/components/settings/categories/omp-settings/ConfigTabs.tsx +97 -36
- package/src/client/components/settings/categories/omp-settings/EngineHeader.tsx +151 -0
- package/src/client/components/settings/categories/omp-settings/ExtensionsPanel.tsx +68 -32
- package/src/client/components/settings/categories/omp-settings/OrderedChips.tsx +119 -0
- package/src/client/components/settings/categories/omp-settings/PresetBar.tsx +14 -7
- package/src/client/components/settings/categories/omp-settings/RoleEditor.tsx +15 -6
- package/src/client/components/settings/categories/omp-settings/RowEditor.tsx +165 -226
- package/src/client/components/settings/categories/omp-settings/types.ts +28 -0
- package/src/client/components/settings/categories/skill-settings/DetailHeader.tsx +35 -7
- package/src/client/components/settings/categories/skill-settings/DetailPane.tsx +34 -14
- package/src/client/components/settings/categories/skill-settings/SidebarList.tsx +21 -0
- package/src/client/components/settings/categories/skill-settings/pane.test.tsx +15 -6
- package/src/client/components/settings/categories/token-usage-settings/Breakdown.tsx +242 -102
- package/src/client/components/settings/categories/token-usage-settings/Chart.tsx +130 -56
- package/src/client/components/settings/categories/token-usage-settings/Controls.tsx +135 -0
- package/src/client/components/settings/categories/token-usage-settings/MetricsGrid.tsx +55 -33
- package/src/client/components/settings/categories/token-usage-settings/Provenance.tsx +59 -0
- package/src/client/components/settings/categories/token-usage-settings/panel.test.tsx +239 -0
- package/src/client/components/workspace/browser-panel/Screencast.test.ts +1 -0
- package/src/client/components/workspace/browser-panel/Screencast.tsx +17 -22
- package/src/client/components/workspace/browser-panel/TabStrip.test.tsx +158 -0
- package/src/client/components/workspace/browser-panel/TabStrip.tsx +90 -0
- package/src/client/components/workspace/browser-panel/index.tsx +50 -4
- package/src/client/components/workspace/browser-toolbar/index.tsx +41 -1
- package/src/client/components/workspace/chat-timeline/ThinkingSection.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/ToolCallingSection.tsx +2 -0
- package/src/client/components/workspace/chat-timeline/block-chrome.test.tsx +13 -2
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Bash.test.ts +88 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Bash.tsx +24 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Read.test.ts +34 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Read.tsx +5 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/ArtifactChip.tsx +7 -6
- package/src/client/components/workspace/chat-timeline/tool-renderers/styles/Tui.test.tsx +237 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/styles/Tui.tsx +191 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/styles/styles.test.tsx +1 -1
- package/src/client/components/workspace/diff-panel/MergeDiffView.tsx +21 -7
- package/src/client/components/workspace/diff-panel/changes.test.ts +51 -0
- package/src/client/components/workspace/diff-panel/changes.ts +28 -12
- package/src/client/components/workspace/diff-panel/merge.test.ts +28 -0
- package/src/client/components/workspace/diff-panel/merge.ts +21 -1
- package/src/client/components/workspace/editor/Body.tsx +7 -0
- package/src/client/components/workspace/editor/FileDocument.tsx +15 -21
- package/src/client/components/workspace/editor/FilePane.tsx +12 -0
- package/src/client/components/workspace/editor/PreviewPane.tsx +70 -0
- package/src/client/components/workspace/editor/Toolbar.tsx +17 -1
- package/src/client/components/workspace/editor/index.tsx +25 -22
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +14 -0
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +12 -86
- package/src/client/components/workspace/editor/toolbar-toggle.tsx +53 -0
- package/src/client/components/workspace/editor/toolbar-write-clusters.tsx +112 -0
- package/src/client/components/workspace/git-panel/commit-modal.test.ts +5 -3
- package/src/client/components/workspace/user-browser-panel/AddressBar.tsx +5 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateBar.test.tsx +201 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateBar.tsx +112 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateLayer.test.tsx +225 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateLayer.tsx +217 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateTarget.tsx +99 -0
- package/src/client/components/workspace/user-browser-panel/Frame.tsx +30 -1
- package/src/client/components/workspace/user-browser-panel/index.tsx +81 -2
- package/src/client/data/agent-data/builtin.ts +0 -10
- package/src/client/data/agent-data/orchestrator.ts +0 -45
- package/src/client/data/agent-data/specialist.ts +0 -100
- package/src/client/data/mock/token-usage.ts +170 -120
- package/src/client/data/settings/omp-schema.json +33 -1
- package/src/client/hooks/browser/use-annotate.test.ts +143 -0
- package/src/client/hooks/browser/use-annotate.ts +98 -0
- package/src/client/hooks/browser/use-close-tab.test.ts +148 -0
- package/src/client/hooks/browser/use-close-tab.ts +67 -0
- package/src/client/hooks/browser/use-screencast.ts +13 -1
- package/src/client/hooks/chat/composer/browser-context.test.ts +117 -0
- package/src/client/hooks/chat/composer/browser-context.ts +40 -16
- package/src/client/hooks/chat/composer/items.test.ts +1 -1
- package/src/client/hooks/chat/composer/review-context.ts +38 -0
- package/src/client/hooks/chat/composer/use-draft.test.ts +132 -0
- package/src/client/hooks/chat/composer/use-draft.ts +31 -2
- package/src/client/hooks/chat/timeline/row-window.test.ts +15 -2
- package/src/client/hooks/editor/use-document-annotations.ts +124 -0
- package/src/client/hooks/editor/use-editor-panel-ui.ts +52 -0
- package/src/client/hooks/editor/use-file-review-mode.ts +35 -0
- package/src/client/hooks/editor/use-preview-review.ts +148 -0
- package/src/client/hooks/settings/agents.ts +149 -0
- package/src/client/hooks/settings/crud-list.test.ts +28 -6
- package/src/client/hooks/settings/crud-list.ts +96 -57
- package/src/client/hooks/settings/omp-config.ts +164 -0
- package/src/client/hooks/settings/useTokenUsage.ts +125 -0
- package/src/client/hooks/settings/write-feedback.test.ts +104 -0
- package/src/client/hooks/settings/write-feedback.ts +63 -0
- package/src/client/hooks/ui/markdown-hydration.ts +125 -0
- package/src/client/hooks/ui/updates/index.test.ts +100 -1
- package/src/client/hooks/ui/updates/index.ts +50 -0
- package/src/client/hooks/ui/updates/notes.test.ts +138 -0
- package/src/client/hooks/ui/updates/notes.ts +57 -0
- package/src/client/lib/browser/element-at.test.ts +229 -0
- package/src/client/lib/browser/element-at.ts +139 -0
- package/src/client/lib/review/client.ts +73 -0
- package/src/client/lib/router/search-params.ts +42 -20
- package/src/client/tailwind.css +65 -0
- package/src/server/lib/btw/lifecycle.server.ts +2 -2
- package/src/server/lib/db/schema.ts +7 -0
- package/src/server/lib/db/seed-terminal.test.ts +4 -0
- package/src/server/lib/omp/config/agent-definitions.test.ts +273 -0
- package/src/server/lib/omp/config/agents.ts +231 -61
- package/src/server/lib/omp/config/definitions.test.ts +9 -105
- package/src/server/lib/omp/config/extensions.ts +16 -7
- package/src/server/lib/omp/config/omp-config-files.test.ts +27 -0
- package/src/server/lib/omp/rpc/constants.test.ts +11 -0
- package/src/server/lib/omp/rpc/constants.ts +15 -0
- package/src/server/lib/omp/rpc/process.ts +11 -14
- package/src/server/lib/omp/rpc/session-commands.ts +6 -3
- package/src/server/lib/omp/rpc/utility-agent-dir.test.ts +134 -0
- package/src/server/lib/omp/rpc/utility-agent-dir.ts +138 -0
- package/src/server/lib/omp/rpc/utility.ts +12 -0
- package/src/server/lib/review/schema.server.ts +45 -0
- package/src/server/lib/review/store.server.ts +138 -0
- package/src/server/lib/terminal/attach-replay.test.ts +132 -0
- package/src/server/lib/terminal/output.test.ts +166 -0
- package/src/server/lib/terminal/output.ts +104 -0
- package/src/server/lib/terminal/runtime.server.ts +5 -0
- package/src/server/lib/terminal/send-result.test.ts +33 -0
- package/src/server/lib/terminal/send-result.ts +32 -0
- package/src/server/lib/terminal/session.server.ts +45 -11
- package/src/server/lib/terminal/store-liveness.test.ts +4 -0
- package/src/server/lib/updates/active-notes.test.ts +149 -0
- package/src/server/lib/updates/active-notes.ts +75 -0
- package/src/server/lib/updates/changelog-file.ts +42 -11
- package/src/server/lib/updates/changelog.test.ts +15 -1
- package/src/server/lib/updates/omp.ts +42 -15
- package/src/server/lib/updates/release-url.ts +27 -1
- package/src/server/lib/usage/index-parse.test.ts +200 -0
- package/src/server/lib/usage/index-parse.ts +178 -0
- package/src/server/lib/usage/index-query.server.ts +248 -0
- package/src/server/lib/usage/index-scan.server.ts +343 -0
- package/src/server/lib/usage/index-schema.server.ts +82 -0
- package/src/server/lib/usage/index.test.ts +234 -0
- package/src/server/lib/usage/providers.server.ts +4 -53
- package/src/server/routes/browser/index.ts +3 -0
- package/src/server/routes/browser/stream.ts +31 -2
- package/src/server/routes/browser/tabs.test.ts +94 -0
- package/src/server/routes/browser/tabs.ts +85 -0
- package/src/server/routes/index.ts +2 -0
- package/src/server/routes/review/bindings.ts +11 -0
- package/src/server/routes/review/index.ts +127 -0
- package/src/server/routes/review/routes.test.ts +191 -0
- package/src/server/routes/settings/agents.test.ts +180 -0
- package/src/server/routes/settings/agents.ts +95 -102
- package/src/server/routes/settings/mcp.test.ts +135 -0
- package/src/server/routes/settings/mcp.ts +14 -6
- package/src/server/routes/settings/settings-store-routes.test.ts +6 -113
- package/src/server/routes/telemetry/tokens.test.ts +145 -0
- package/src/server/routes/telemetry/tokens.ts +70 -149
- package/src/server/routes/terminal/ws.ts +6 -5
- package/src/server/routes/updates/index.ts +2 -0
- package/src/server/routes/updates/notes.ts +34 -0
- package/src/server/routes/updates/routes.test.ts +49 -0
- package/src/shared/lib/browser/annotate.test.ts +283 -0
- package/src/shared/lib/browser/annotate.ts +231 -0
- package/src/shared/lib/browser/browser-viewer.test.ts +26 -4
- package/src/shared/lib/browser/frame-gate.test.ts +91 -0
- package/src/shared/lib/browser/frame-gate.ts +69 -0
- package/src/shared/lib/browser/frame-params.test.ts +43 -0
- package/src/shared/lib/browser/frame-params.ts +60 -0
- package/src/shared/lib/browser/frame-pipeline.test.ts +132 -0
- package/src/shared/lib/browser/frame-pipeline.ts +80 -0
- package/src/shared/lib/browser/page-context.ts +60 -4
- package/src/shared/lib/browser/snapshot.test.ts +115 -0
- package/src/shared/lib/browser/snapshot.ts +112 -0
- package/src/shared/lib/browser/tab-close.test.ts +74 -0
- package/src/shared/lib/browser/tab-close.ts +77 -0
- package/src/shared/lib/browser/viewer.ts +45 -26
- package/src/shared/lib/chat/timeline/block-chrome.ts +19 -0
- package/src/shared/lib/chat/timeline/tool-render-mode.ts +17 -4
- package/src/shared/lib/chat/tool/artifact.ts +55 -20
- package/src/shared/lib/chat/tool/bash-facts.ts +96 -0
- package/src/shared/lib/chat/tool/minimized.test.ts +98 -0
- package/src/shared/lib/chat/tool/minimized.ts +64 -0
- package/src/shared/lib/chat/tool/summary.test.ts +28 -8
- package/src/shared/lib/chat/tool/summary.ts +3 -32
- package/src/shared/lib/markdown/blocks/anchor.ts +63 -0
- package/src/shared/lib/markdown/blocks/blocks.test.ts +141 -0
- package/src/shared/lib/markdown/blocks/renderer.ts +120 -0
- package/src/shared/lib/markdown/blocks/scan.ts +100 -0
- package/src/shared/lib/markdown/blocks/types.ts +62 -0
- package/src/shared/lib/markdown/marked.ts +58 -147
- package/src/shared/lib/markdown/math-extensions.ts +168 -0
- package/src/shared/lib/markdown/review/prompt.ts +77 -0
- package/src/shared/lib/markdown/review/reconcile.ts +55 -0
- package/src/shared/lib/markdown/review/review.test.ts +96 -0
- package/src/shared/lib/markdown/xml-sections.test.ts +140 -0
- package/src/shared/lib/markdown/xml-sections.ts +139 -0
- package/src/shared/lib/models/provider/label.ts +57 -0
- package/src/shared/lib/omp/config/agent-file.test.ts +54 -0
- package/src/shared/lib/omp/config/agent-file.ts +43 -0
- package/src/shared/lib/omp/config/row-value.test.ts +95 -0
- package/src/shared/lib/omp/config/row-value.ts +97 -0
- package/src/shared/lib/omp/config/schema.test.ts +31 -0
- package/src/shared/lib/omp/config/schema.ts +6 -0
- package/src/shared/lib/omp/rpc/frame.test.ts +48 -47
- package/src/shared/lib/omp/rpc/frame.ts +49 -40
- package/src/shared/lib/ui/menu-anchor.test.ts +69 -0
- package/src/shared/lib/ui/menu-anchor.ts +89 -0
- package/src/shared/lib/usage/breakdown.test.ts +197 -0
- package/src/shared/lib/usage/breakdown.ts +241 -0
- package/src/shared/lib/usage/range.test.ts +204 -0
- package/src/shared/lib/usage/range.ts +240 -0
- package/src/shared/lib/usage/view.test.ts +85 -0
- package/src/shared/lib/usage/view.ts +74 -0
- package/src/shared/types/browser.ts +78 -0
- package/src/shared/types/index.ts +1 -0
- package/src/shared/types/settings/agent.ts +28 -6
- package/src/shared/types/settings/state.ts +4 -3
- package/src/shared/types/settings/write.ts +6 -0
- package/src/shared/types/tokenUsage.ts +128 -21
- package/src/shared/types/updates.ts +20 -0
- package/dist/client/static/js/index-3ve31rzx.css +0 -1
- package/src/server/lib/omp/session/usage/aggregate-shaping.test.ts +0 -149
- package/src/server/lib/omp/session/usage/aggregate.test.ts +0 -243
- package/src/server/lib/omp/session/usage/aggregate.ts +0 -330
- package/src/server/lib/omp/session/usage/shaping.ts +0 -130
|
@@ -9,69 +9,85 @@
|
|
|
9
9
|
*
|
|
10
10
|
* - Header: live engine state (running, model, thinking, context) + refresh.
|
|
11
11
|
* - Config: every schema entry with UI metadata, rendered in omp's own
|
|
12
|
-
* tab/group layout
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
12
|
+
* tab/group layout, with search across ALL keys, condition gating (e.g.
|
|
13
|
+
* `mnemopi.*` only when `memory.backend === 'mnemopi'`), per-row
|
|
14
|
+
* reset-to-default, and persistence through /api/settings/omp-config
|
|
15
|
+
* (`omp config set` under the hood).
|
|
16
16
|
* - Model Roles: role → model selector overrides (config.yml modelRoles).
|
|
17
|
-
* - Extensions:
|
|
17
|
+
* - Extensions: `.omp/extensions` toggles.
|
|
18
|
+
*
|
|
19
|
+
* Every write resolves with the server's answer: the per-key state lives in
|
|
20
|
+
* `useOmpConfigWrites`, and the panel keeps ONE problem banner for refusals
|
|
21
|
+
* that have no row of their own (a failed load, a rejected extension toggle) so
|
|
22
|
+
* they reach the screen instead of a console line.
|
|
18
23
|
*/
|
|
19
24
|
|
|
20
25
|
import { useCallback, useEffect, useState } from 'preact/hooks';
|
|
21
|
-
import {
|
|
26
|
+
import { AlertCircle, Check, X } from 'lucide-preact';
|
|
22
27
|
import type { SettingsState } from '@/shared/types';
|
|
23
28
|
import type { ConfigEntry } from '@/server/lib/omp/config/config-cli';
|
|
24
29
|
import { OMP_SCHEMA } from '@/shared/lib/omp/config/schema';
|
|
25
30
|
import { ConfigTabs } from '@/client/components/settings/categories/omp-settings/ConfigTabs';
|
|
31
|
+
import { EngineHeader } from '@/client/components/settings/categories/omp-settings/EngineHeader';
|
|
26
32
|
import { RoleEditor } from '@/client/components/settings/categories/omp-settings/RoleEditor';
|
|
27
|
-
import { useModelRoles } from '@/client/hooks/settings/model-roles';
|
|
28
33
|
import { ExtensionsPanel } from '@/client/components/settings/categories/omp-settings/ExtensionsPanel';
|
|
34
|
+
import type {
|
|
35
|
+
EngineState,
|
|
36
|
+
ExtensionItem,
|
|
37
|
+
} from '@/client/components/settings/categories/omp-settings/types';
|
|
38
|
+
import { useModelRoles } from '@/client/hooks/settings/model-roles';
|
|
39
|
+
import { useOmpConfigWrites } from '@/client/hooks/settings/omp-config';
|
|
29
40
|
|
|
30
41
|
interface OmpSettingsProps {
|
|
31
42
|
settings: SettingsState;
|
|
32
43
|
onUpdate: (updater: Partial<SettingsState> | ((prev: SettingsState) => SettingsState)) => void;
|
|
33
44
|
}
|
|
34
45
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
46
|
+
/** A problem that has no config row of its own to sit under. */
|
|
47
|
+
interface PanelProblem {
|
|
48
|
+
message: string;
|
|
49
|
+
/** The thing it belongs to, so the same failure can clear itself. */
|
|
50
|
+
scope?: string;
|
|
40
51
|
}
|
|
41
52
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
filePath: string;
|
|
47
|
-
disabled: boolean;
|
|
53
|
+
/** The read failure sentence of a payload, when it carries one. */
|
|
54
|
+
function payloadError(data: unknown): string | null {
|
|
55
|
+
if (typeof data !== 'object' || data === null || !('error' in data)) return null;
|
|
56
|
+
return typeof data.error === 'string' ? data.error : null;
|
|
48
57
|
}
|
|
49
58
|
|
|
50
59
|
export function OmpSettings(_props: OmpSettingsProps) {
|
|
51
|
-
const [state, setState] = useState<
|
|
60
|
+
const [state, setState] = useState<EngineState | null>(null);
|
|
52
61
|
const [stateRunning, setStateRunning] = useState(false);
|
|
53
|
-
const [entries, setEntries] = useState<Record<string, ConfigEntry>>({});
|
|
54
62
|
const [extensions, setExtensions] = useState<ExtensionItem[]>([]);
|
|
55
63
|
const [loading, setLoading] = useState(true);
|
|
56
|
-
const [
|
|
64
|
+
const [refreshing, setRefreshing] = useState(false);
|
|
65
|
+
const [updatedAt, setUpdatedAt] = useState<number | null>(null);
|
|
66
|
+
const [loadError, setLoadError] = useState<string | null>(null);
|
|
67
|
+
const [activeTabId, setActiveTabId] = useState(OMP_SCHEMA.tabs[0]?.id ?? 'appearance');
|
|
57
68
|
const [searchQuery, setSearchQuery] = useState('');
|
|
58
|
-
const [
|
|
59
|
-
const [
|
|
60
|
-
const [
|
|
61
|
-
const [saveErrors, setSaveErrors] = useState<Map<string, string>>(new Map());
|
|
69
|
+
const [pendingExtensions, setPendingExtensions] = useState<Set<string>>(new Set());
|
|
70
|
+
const [problem, setProblem] = useState<PanelProblem | null>(null);
|
|
71
|
+
const [mounted, setMounted] = useState(true);
|
|
62
72
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}, []);
|
|
73
|
+
useEffect(() => () => setMounted(false), []);
|
|
74
|
+
|
|
75
|
+
const writes = useOmpConfigWrites();
|
|
76
|
+
const { applyEntries, flashSaved, savedKey } = writes;
|
|
68
77
|
|
|
69
78
|
// The role map, its presets and the role dropdowns' catalog. Its writes answer
|
|
70
79
|
// with the server's whole map/list, so the panel never renders a guess.
|
|
71
80
|
const modelRoles = useModelRoles(flashSaved);
|
|
72
81
|
|
|
73
|
-
|
|
74
|
-
|
|
82
|
+
/**
|
|
83
|
+
* Read the whole panel. `initial` keeps the full-screen spinner for the first
|
|
84
|
+
* paint only: a refresh must not tear the panel down, or every open row loses
|
|
85
|
+
* its editor state for a snapshot that arrives a second later.
|
|
86
|
+
*/
|
|
87
|
+
const load = useCallback((initial: boolean) => {
|
|
88
|
+
if (initial) setLoading(true);
|
|
89
|
+
else setRefreshing(true);
|
|
90
|
+
setLoadError(null);
|
|
75
91
|
Promise.all([
|
|
76
92
|
fetch('/api/omp/state').then((res) => res.json()),
|
|
77
93
|
fetch('/api/settings/omp-config').then((res) => res.json()),
|
|
@@ -79,194 +95,128 @@ export function OmpSettings(_props: OmpSettingsProps) {
|
|
|
79
95
|
fetch('/api/omp/extensions').then((res) => res.json()),
|
|
80
96
|
])
|
|
81
97
|
.then(([stateData, configData, rolesData, extensionsData]) => {
|
|
82
|
-
if (
|
|
98
|
+
if (!mounted) return;
|
|
99
|
+
if (stateData.running && stateData.state) setState(stateData.state as EngineState);
|
|
100
|
+
else setState(null);
|
|
83
101
|
setStateRunning(Boolean(stateData.running));
|
|
84
|
-
|
|
102
|
+
const configFailure = payloadError(configData);
|
|
103
|
+
if (configFailure) setLoadError(configFailure);
|
|
104
|
+
else if (configData.entries) applyEntries(configData.entries as Record<string, ConfigEntry>);
|
|
85
105
|
modelRoles.applyPayload(rolesData);
|
|
86
|
-
|
|
106
|
+
const extensionFailure = payloadError(extensionsData);
|
|
107
|
+
if (extensionFailure) setProblem({ message: extensionFailure });
|
|
108
|
+
else if (Array.isArray(extensionsData.extensions)) setExtensions(extensionsData.extensions as ExtensionItem[]);
|
|
109
|
+
setUpdatedAt(Date.now());
|
|
110
|
+
})
|
|
111
|
+
.catch((err) => {
|
|
112
|
+
console.error('Failed to load omp settings:', err);
|
|
113
|
+
if (!mounted) return;
|
|
114
|
+
setLoadError(err instanceof Error ? err.message : String(err));
|
|
87
115
|
})
|
|
88
|
-
.
|
|
89
|
-
|
|
90
|
-
|
|
116
|
+
.finally(() => {
|
|
117
|
+
if (!mounted) return;
|
|
118
|
+
setLoading(false);
|
|
119
|
+
setRefreshing(false);
|
|
120
|
+
});
|
|
121
|
+
}, [applyEntries, modelRoles.applyPayload, mounted]);
|
|
91
122
|
|
|
92
|
-
useEffect(() => { load(); }, [load]);
|
|
123
|
+
useEffect(() => { load(true); }, [load]);
|
|
93
124
|
|
|
94
125
|
/**
|
|
95
|
-
*
|
|
96
|
-
*
|
|
97
|
-
*
|
|
98
|
-
* a bare "save failed" badge made all three read the same. The server already
|
|
99
|
-
* returns the sentence (`configFailureLine`); this is where it stops being
|
|
100
|
-
* dropped.
|
|
126
|
+
* Toggle one extension. The row owns its pending state and a refusal lands in
|
|
127
|
+
* the panel's problem banner: the old code only logged, so a rejected write
|
|
128
|
+
* left the row showing a state config.yml did not hold.
|
|
101
129
|
*/
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
next.delete(key);
|
|
106
|
-
return next;
|
|
107
|
-
});
|
|
108
|
-
setDirtyKeys((prev) => {
|
|
109
|
-
const next = new Set(prev);
|
|
110
|
-
next.delete(key);
|
|
111
|
-
return next;
|
|
112
|
-
});
|
|
113
|
-
if (ok) {
|
|
114
|
-
setSaveErrors((prev) => {
|
|
115
|
-
if (!prev.has(key)) return prev;
|
|
116
|
-
const next = new Map(prev);
|
|
117
|
-
next.delete(key);
|
|
118
|
-
return next;
|
|
119
|
-
});
|
|
120
|
-
if (returned !== undefined) {
|
|
121
|
-
setEntries((prev) => ({ ...prev, [key]: { ...prev[key], value: returned } }));
|
|
122
|
-
}
|
|
123
|
-
flashSaved(key);
|
|
124
|
-
} else {
|
|
125
|
-
setSaveErrors((prev) => new Map(prev).set(key, errorMessage ?? 'omp rejected the write'));
|
|
126
|
-
}
|
|
127
|
-
};
|
|
128
|
-
|
|
129
|
-
/** Commit a value; all editors save on change/blur, never per keystroke. */
|
|
130
|
-
const commitValue = useCallback(async (key: string, value: unknown): Promise<boolean> => {
|
|
131
|
-
setSavingKeys((prev) => new Set(prev).add(key));
|
|
132
|
-
setDirtyKeys((prev) => {
|
|
133
|
-
const next = new Set(prev);
|
|
134
|
-
next.delete(key);
|
|
135
|
-
return next;
|
|
136
|
-
});
|
|
130
|
+
const handleToggleExtension = async (extension: ExtensionItem) => {
|
|
131
|
+
const disabled = !extension.disabled;
|
|
132
|
+
setPendingExtensions((prev) => new Set(prev).add(extension.id));
|
|
137
133
|
try {
|
|
138
|
-
const res = await fetch('/api/
|
|
134
|
+
const res = await fetch('/api/omp/extensions', {
|
|
139
135
|
method: 'POST',
|
|
140
136
|
headers: { 'Content-Type': 'application/json' },
|
|
141
|
-
body: JSON.stringify({
|
|
137
|
+
body: JSON.stringify({ id: extension.id, disabled }),
|
|
142
138
|
});
|
|
143
|
-
const data = await res.json();
|
|
144
|
-
const
|
|
145
|
-
|
|
146
|
-
|
|
139
|
+
const data: unknown = await res.json().catch(() => null);
|
|
140
|
+
const error = payloadError(data) ?? (res.ok ? null : `The toggle answered ${res.status}`);
|
|
141
|
+
const scope = `ext-${extension.id}`;
|
|
142
|
+
if (error) {
|
|
143
|
+
setProblem({ message: error, scope });
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
setExtensions((prev) => prev.map((item) => (
|
|
147
|
+
item.id === extension.id ? { ...item, disabled } : item
|
|
148
|
+
)));
|
|
149
|
+
setProblem((current) => (current?.scope === scope ? null : current));
|
|
150
|
+
flashSaved(scope);
|
|
147
151
|
} catch (err) {
|
|
148
|
-
console.error('Failed to
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
method: 'POST',
|
|
159
|
-
headers: { 'Content-Type': 'application/json' },
|
|
160
|
-
body: JSON.stringify({ key, action: 'reset' }),
|
|
152
|
+
console.error('Failed to toggle extension:', err);
|
|
153
|
+
setProblem({
|
|
154
|
+
message: err instanceof Error ? err.message : String(err),
|
|
155
|
+
scope: `ext-${extension.id}`,
|
|
156
|
+
});
|
|
157
|
+
} finally {
|
|
158
|
+
setPendingExtensions((prev) => {
|
|
159
|
+
const next = new Set(prev);
|
|
160
|
+
next.delete(extension.id);
|
|
161
|
+
return next;
|
|
161
162
|
});
|
|
162
|
-
const data = await res.json();
|
|
163
|
-
const ok = Boolean(data.success);
|
|
164
|
-
applyWriteResult(key, ok, data.value, typeof data.error === 'string' ? data.error : undefined);
|
|
165
|
-
return ok;
|
|
166
|
-
} catch (err) {
|
|
167
|
-
console.error('Failed to reset omp config:', err);
|
|
168
|
-
applyWriteResult(key, false, undefined, err instanceof Error ? err.message : undefined);
|
|
169
|
-
return false;
|
|
170
163
|
}
|
|
171
|
-
}, []);
|
|
172
|
-
|
|
173
|
-
const handleDirty = useCallback((key: string, dirty: boolean) => {
|
|
174
|
-
setDirtyKeys((prev) => {
|
|
175
|
-
const next = new Set(prev);
|
|
176
|
-
if (dirty) next.add(key);
|
|
177
|
-
else next.delete(key);
|
|
178
|
-
return next;
|
|
179
|
-
});
|
|
180
|
-
}, []);
|
|
181
|
-
|
|
182
|
-
const handleToggleExtension = (extension: ExtensionItem) => {
|
|
183
|
-
fetch('/api/omp/extensions', {
|
|
184
|
-
method: 'POST',
|
|
185
|
-
headers: { 'Content-Type': 'application/json' },
|
|
186
|
-
body: JSON.stringify({ id: extension.id, disabled: !extension.disabled }),
|
|
187
|
-
})
|
|
188
|
-
.then((res) => res.json())
|
|
189
|
-
.then((data) => {
|
|
190
|
-
if (data.success) {
|
|
191
|
-
setExtensions((prev) => prev.map((item) => (
|
|
192
|
-
item.id === extension.id ? { ...item, disabled: !extension.disabled } : item
|
|
193
|
-
)));
|
|
194
|
-
flashSaved(`ext-${extension.id}`);
|
|
195
|
-
}
|
|
196
|
-
})
|
|
197
|
-
.catch((err) => console.error('Failed to toggle extension:', err));
|
|
198
164
|
};
|
|
199
165
|
|
|
200
166
|
if (loading) {
|
|
201
167
|
return (
|
|
202
168
|
<div className="flex items-center justify-center p-8 text-ink/40 text-xs">
|
|
203
|
-
|
|
169
|
+
Reading omp’s state, config schema and extensions…
|
|
204
170
|
</div>
|
|
205
171
|
);
|
|
206
172
|
}
|
|
207
173
|
|
|
208
174
|
return (
|
|
209
175
|
<div className="w-full space-y-4 text-ink pb-2 text-xs">
|
|
210
|
-
<
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
<button
|
|
228
|
-
type="button"
|
|
229
|
-
aria-label="Clear search"
|
|
230
|
-
onClick={() => setSearchQuery('')}
|
|
231
|
-
className="absolute right-1.5 top-1/2 -translate-y-1/2 text-ink/40 hover:text-ink cursor-pointer"
|
|
232
|
-
>
|
|
233
|
-
<X size={11} />
|
|
234
|
-
</button>
|
|
235
|
-
)}
|
|
236
|
-
</div>
|
|
176
|
+
<EngineHeader
|
|
177
|
+
running={stateRunning}
|
|
178
|
+
state={state}
|
|
179
|
+
refreshing={refreshing}
|
|
180
|
+
updatedAt={updatedAt}
|
|
181
|
+
searchQuery={searchQuery}
|
|
182
|
+
onSearchChange={setSearchQuery}
|
|
183
|
+
onRefresh={() => load(false)}
|
|
184
|
+
/>
|
|
185
|
+
|
|
186
|
+
{loadError && (
|
|
187
|
+
<div className="flex items-start gap-2 rounded-lg border border-error/30 bg-error/5 px-3 py-2 text-[11px] text-error">
|
|
188
|
+
<AlertCircle size={13} className="mt-px flex-shrink-0" />
|
|
189
|
+
<span className="flex-1">
|
|
190
|
+
omp’s config could not be read: {loadError}. The rows below cannot show what config.yml holds until this
|
|
191
|
+
succeeds.
|
|
192
|
+
</span>
|
|
237
193
|
<button
|
|
238
194
|
type="button"
|
|
239
|
-
onClick={load}
|
|
240
|
-
className="flex items-center gap-1
|
|
195
|
+
onClick={() => load(false)}
|
|
196
|
+
className="flex shrink-0 items-center gap-1 rounded border border-error/40 px-2 py-0.5 font-medium hover:bg-error/10 cursor-pointer"
|
|
241
197
|
>
|
|
242
|
-
|
|
198
|
+
Retry
|
|
243
199
|
</button>
|
|
244
200
|
</div>
|
|
245
|
-
|
|
201
|
+
)}
|
|
246
202
|
|
|
247
|
-
|
|
248
|
-
<div className="rounded-lg border border-
|
|
249
|
-
<
|
|
250
|
-
<
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
</div>
|
|
260
|
-
<div className="rounded-lg border border-ink/10 bg-ink/[0.03] px-3 py-2">
|
|
261
|
-
<div className="text-[10px] uppercase tracking-wide text-ink/40">Context</div>
|
|
262
|
-
<div className="font-semibold text-ink mt-0.5">
|
|
263
|
-
{state?.contextUsage?.percent != null ? `${state.contextUsage.percent.toFixed(1)}%` : '—'}
|
|
264
|
-
</div>
|
|
203
|
+
{problem && (
|
|
204
|
+
<div className="flex items-start gap-2 rounded-lg border border-error/30 bg-error/5 px-3 py-2 text-[11px] text-error">
|
|
205
|
+
<AlertCircle size={13} className="mt-px flex-shrink-0" />
|
|
206
|
+
<span className="flex-1 break-words">{problem.message}</span>
|
|
207
|
+
<button
|
|
208
|
+
type="button"
|
|
209
|
+
onClick={() => setProblem(null)}
|
|
210
|
+
aria-label="Dismiss error"
|
|
211
|
+
className="text-error/60 hover:text-error cursor-pointer"
|
|
212
|
+
>
|
|
213
|
+
<X size={12} />
|
|
214
|
+
</button>
|
|
265
215
|
</div>
|
|
266
|
-
|
|
216
|
+
)}
|
|
267
217
|
|
|
268
218
|
<div className="pt-1">
|
|
269
|
-
<div className="flex items-center justify-between pb-2">
|
|
219
|
+
<div className="flex items-center justify-between gap-3 pb-2">
|
|
270
220
|
<div>
|
|
271
221
|
<h3 className="text-sm font-semibold text-ink">Config</h3>
|
|
272
222
|
<p className="text-ink/50 mt-0.5">
|
|
@@ -275,21 +225,23 @@ export function OmpSettings(_props: OmpSettingsProps) {
|
|
|
275
225
|
</p>
|
|
276
226
|
</div>
|
|
277
227
|
{savedKey && savedKey !== 'role-map' && !savedKey.startsWith('ext-') && (
|
|
278
|
-
<span className="inline-flex items-center gap-1 text-[10px] text-ink/60">
|
|
228
|
+
<span className="inline-flex shrink-0 items-center gap-1 text-[10px] text-ink/60">
|
|
229
|
+
<Check size={11} /> saved <span className="font-mono">{savedKey}</span>
|
|
230
|
+
</span>
|
|
279
231
|
)}
|
|
280
232
|
</div>
|
|
281
233
|
<ConfigTabs
|
|
282
234
|
tabs={OMP_SCHEMA.tabs}
|
|
283
|
-
entries={entries}
|
|
235
|
+
entries={writes.entries}
|
|
284
236
|
activeTabId={activeTabId}
|
|
285
237
|
onSelectTab={setActiveTabId}
|
|
286
238
|
searchQuery={searchQuery}
|
|
287
|
-
dirtyKeys={dirtyKeys}
|
|
288
|
-
savingKeys={savingKeys}
|
|
289
|
-
saveErrors={saveErrors}
|
|
290
|
-
onCommit={commitValue}
|
|
291
|
-
onReset={
|
|
292
|
-
onDirty={
|
|
239
|
+
dirtyKeys={writes.dirtyKeys}
|
|
240
|
+
savingKeys={writes.savingKeys}
|
|
241
|
+
saveErrors={writes.saveErrors}
|
|
242
|
+
onCommit={writes.commitValue}
|
|
243
|
+
onReset={writes.resetKey}
|
|
244
|
+
onDirty={writes.setDirty}
|
|
293
245
|
/>
|
|
294
246
|
</div>
|
|
295
247
|
|
|
@@ -310,6 +262,7 @@ export function OmpSettings(_props: OmpSettingsProps) {
|
|
|
310
262
|
<ExtensionsPanel
|
|
311
263
|
extensions={extensions}
|
|
312
264
|
savedExtension={savedKey?.startsWith('ext-') ? savedKey.slice(4) : null}
|
|
265
|
+
pendingIds={pendingExtensions}
|
|
313
266
|
onToggle={handleToggleExtension}
|
|
314
267
|
/>
|
|
315
268
|
</div>
|
|
@@ -36,7 +36,7 @@ export function SkillSettings({ onNavigateToCatalog }: SkillSettingsProps) {
|
|
|
36
36
|
const query = roots.queryFor(selectedRootId);
|
|
37
37
|
const isWorkspaceScope = roots.isWorkspace(selectedRootId);
|
|
38
38
|
|
|
39
|
-
const { items: skills, selectedId, selected: selectedSkill, isCreatingNew, isLoading, select, startCreate, save, remove } =
|
|
39
|
+
const { items: skills, selectedId, selected: selectedSkill, isCreatingNew, isLoading, loadError, reload: reloadList, select, startCreate, save, remove } =
|
|
40
40
|
useCrudList<SkillItem, Partial<SkillItem>>({
|
|
41
41
|
endpoint: '/api/settings/skills',
|
|
42
42
|
query,
|
|
@@ -70,7 +70,6 @@ export function SkillSettings({ onNavigateToCatalog }: SkillSettingsProps) {
|
|
|
70
70
|
...(selected || { id: selectedId || `skill-${Date.now()}` }),
|
|
71
71
|
...skillData,
|
|
72
72
|
}) as SkillItem,
|
|
73
|
-
isDeleteError: (data) => Boolean((data as { error?: string } | null)?.error),
|
|
74
73
|
});
|
|
75
74
|
|
|
76
75
|
const reload = () => {
|
|
@@ -112,6 +111,7 @@ export function SkillSettings({ onNavigateToCatalog }: SkillSettingsProps) {
|
|
|
112
111
|
selectedProject={selectedRootId}
|
|
113
112
|
onSelectProject={setSelectedRootId}
|
|
114
113
|
projectOptions={roots.options}
|
|
114
|
+
{...(loadError ? { loadError, onRetry: reloadList } : {})}
|
|
115
115
|
/>
|
|
116
116
|
}
|
|
117
117
|
detail={
|