@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
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The judge panel: two answers, one note.
|
|
8
|
+
*
|
|
9
|
+
* Fixed at the rectangle the click reported rather than tracking its block. A
|
|
10
|
+
* rendered document rehydrates (mermaid, math, directives) and every hydrate
|
|
11
|
+
* moves blocks, so anything that measured once and followed would drift away
|
|
12
|
+
* from what it describes; a scroll closes it instead, which is also the moment
|
|
13
|
+
* the block under it is no longer where the user is looking.
|
|
14
|
+
*
|
|
15
|
+
* The two answers are `aria-pressed` buttons, not a radio or a checkbox: the
|
|
16
|
+
* pressed state IS the judgement, and a screen reader has to hear which one it
|
|
17
|
+
* is without counting options.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
import { useEffect, useRef } from 'preact/hooks';
|
|
21
|
+
import { Check, X } from 'lucide-preact';
|
|
22
|
+
|
|
23
|
+
import type { BlockVerdict, MdBlock } from '@/shared/lib/markdown/blocks/types';
|
|
24
|
+
import { ACTION_CLASS } from '@/client/components/workspace/editor/toolbar-toggle';
|
|
25
|
+
|
|
26
|
+
interface ReviewPopoverProps {
|
|
27
|
+
block: MdBlock;
|
|
28
|
+
verdict: BlockVerdict | null;
|
|
29
|
+
note: string;
|
|
30
|
+
anchor: { top: number; left: number };
|
|
31
|
+
onSave: (verdict: BlockVerdict, note: string) => void;
|
|
32
|
+
onRemove: () => void;
|
|
33
|
+
onClose: () => void;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function rangeOf(block: MdBlock): string {
|
|
37
|
+
return block.lineStart === block.lineEnd ? `L${block.lineStart}` : `L${block.lineStart}-${block.lineEnd}`;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
export function ReviewPopover({ block, verdict, note, anchor, onSave, onRemove, onClose }: ReviewPopoverProps) {
|
|
41
|
+
// The whole panel is one form, so the draft lives in the DOM rather than in
|
|
42
|
+
// state: two saves of the same block would otherwise need a re-seed effect,
|
|
43
|
+
// and the `key` on this element already re-mounts it per block.
|
|
44
|
+
const form = useRef<HTMLDivElement | null>(null);
|
|
45
|
+
const field = useRef<HTMLTextAreaElement | null>(null);
|
|
46
|
+
|
|
47
|
+
useEffect(() => {
|
|
48
|
+
field.current?.focus();
|
|
49
|
+
}, []);
|
|
50
|
+
|
|
51
|
+
useEffect(() => {
|
|
52
|
+
const onKey = (event: KeyboardEvent) => {
|
|
53
|
+
if (event.key !== 'Escape') return;
|
|
54
|
+
// `stopPropagation`, not `preventDefault`: Escape is also the panel's own
|
|
55
|
+
// chord for closing the find bar, and the innermost scope must win.
|
|
56
|
+
event.stopPropagation();
|
|
57
|
+
onClose();
|
|
58
|
+
};
|
|
59
|
+
// Capture, so the panel's own keydown handler cannot consume it first.
|
|
60
|
+
window.addEventListener('keydown', onKey, true);
|
|
61
|
+
return () => window.removeEventListener('keydown', onKey, true);
|
|
62
|
+
}, [onClose]);
|
|
63
|
+
|
|
64
|
+
const submit = (chosen: BlockVerdict) => onSave(chosen, field.current?.value ?? note);
|
|
65
|
+
|
|
66
|
+
return (
|
|
67
|
+
<div
|
|
68
|
+
ref={form}
|
|
69
|
+
role="dialog"
|
|
70
|
+
aria-label={`Review block ${rangeOf(block)}`}
|
|
71
|
+
// `fixed`, from the click's own rectangle — see the module note.
|
|
72
|
+
style={{ top: `${anchor.top}px`, left: `${anchor.left}px` }}
|
|
73
|
+
className="fixed z-[65] w-[min(24rem,calc(100vw-2rem))] rounded-md border border-ink/15 bg-paper shadow-lg p-2 font-sans text-[11.5px] text-ink"
|
|
74
|
+
onClick={(event) => event.stopPropagation()}
|
|
75
|
+
>
|
|
76
|
+
<div className="flex items-center gap-1.5 text-[10.5px] font-mono text-ink/50">
|
|
77
|
+
<span>{rangeOf(block)}</span>
|
|
78
|
+
<span className="truncate">«{block.quote}»</span>
|
|
79
|
+
<button
|
|
80
|
+
type="button"
|
|
81
|
+
onClick={onClose}
|
|
82
|
+
className="ml-auto cursor-pointer text-ink/50 hover:text-ink"
|
|
83
|
+
aria-label="Close review"
|
|
84
|
+
>
|
|
85
|
+
<X size={12} />
|
|
86
|
+
</button>
|
|
87
|
+
</div>
|
|
88
|
+
|
|
89
|
+
<div className="mt-1.5 flex items-center gap-1.5">
|
|
90
|
+
<button
|
|
91
|
+
type="button"
|
|
92
|
+
aria-pressed={verdict === 'good'}
|
|
93
|
+
title="This block is good — do not change it"
|
|
94
|
+
onClick={() => submit('good')}
|
|
95
|
+
className={`${ACTION_CLASS} border px-2 text-[11px] ${
|
|
96
|
+
verdict === 'good' ? 'border-ink bg-ink/10 text-ink' : 'border-ink/15 text-ink/70 hover:border-ink/40'
|
|
97
|
+
}`}
|
|
98
|
+
>
|
|
99
|
+
<Check size={11} /> Good
|
|
100
|
+
</button>
|
|
101
|
+
<button
|
|
102
|
+
type="button"
|
|
103
|
+
aria-pressed={verdict === 'needs-work'}
|
|
104
|
+
title="This block needs work"
|
|
105
|
+
onClick={() => submit('needs-work')}
|
|
106
|
+
className={`${ACTION_CLASS} border px-2 text-[11px] ${
|
|
107
|
+
verdict === 'needs-work' ? 'border-error bg-error/10 text-error' : 'border-ink/15 text-ink/70 hover:border-ink/40'
|
|
108
|
+
}`}
|
|
109
|
+
>
|
|
110
|
+
<X size={11} /> Needs work
|
|
111
|
+
</button>
|
|
112
|
+
{verdict && (
|
|
113
|
+
<button
|
|
114
|
+
type="button"
|
|
115
|
+
onClick={onRemove}
|
|
116
|
+
className={`${ACTION_CLASS} ml-auto border border-ink/15 px-2 text-[11px] text-ink/60 hover:text-error`}
|
|
117
|
+
>
|
|
118
|
+
Remove
|
|
119
|
+
</button>
|
|
120
|
+
)}
|
|
121
|
+
</div>
|
|
122
|
+
|
|
123
|
+
<textarea
|
|
124
|
+
ref={field}
|
|
125
|
+
defaultValue={note}
|
|
126
|
+
rows={3}
|
|
127
|
+
placeholder="What is wrong — or what is right — with this block…"
|
|
128
|
+
onKeyDown={(event) => {
|
|
129
|
+
// ⌘↵ saves the CURRENT verdict; a block with none is not saved by a
|
|
130
|
+
// keystroke that cannot say which answer it means.
|
|
131
|
+
if (event.key === 'Enter' && (event.metaKey || event.ctrlKey) && verdict) {
|
|
132
|
+
event.preventDefault();
|
|
133
|
+
submit(verdict);
|
|
134
|
+
}
|
|
135
|
+
}}
|
|
136
|
+
className="mt-1.5 w-full resize-y rounded border border-ink/15 bg-canvas/40 px-2 py-1 text-[11px] font-sans outline-none focus:border-ink"
|
|
137
|
+
/>
|
|
138
|
+
|
|
139
|
+
<div className="mt-1 flex items-center gap-1.5 text-[10.5px] text-ink/45">
|
|
140
|
+
<span>Click an answer to save · ⌘↵ keeps the note with it</span>
|
|
141
|
+
</div>
|
|
142
|
+
</div>
|
|
143
|
+
);
|
|
144
|
+
}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The review's totals, the way out, and the marks that no longer fit.
|
|
8
|
+
*
|
|
9
|
+
* Two rules this bar exists to keep:
|
|
10
|
+
*
|
|
11
|
+
* - **An outdated mark is SHOWN.** Its block was edited, so it matches nothing
|
|
12
|
+
* rendered — but the note is still the user's and the only copy of it.
|
|
13
|
+
* Dropping it silently is the one thing a review tool must never do, so it is
|
|
14
|
+
* listed with its stored quote and a Remove of its own.
|
|
15
|
+
* - **Sending is a prefill.** The button says "to the chat box": it writes the
|
|
16
|
+
* draft and focuses the composer. A review the user never read before it
|
|
17
|
+
* reached the agent is how a wrong note becomes an instruction.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
import { Send, X } from 'lucide-preact';
|
|
21
|
+
|
|
22
|
+
import type { DocumentAnnotation } from '@/shared/lib/markdown/blocks/types';
|
|
23
|
+
|
|
24
|
+
interface ReviewSummaryProps {
|
|
25
|
+
counts: { good: number; needsWork: number };
|
|
26
|
+
outdated: readonly DocumentAnnotation[];
|
|
27
|
+
error: string | null;
|
|
28
|
+
/** True once the block reached the composer, so the bar can say so. */
|
|
29
|
+
sent: boolean;
|
|
30
|
+
onSend: () => void;
|
|
31
|
+
onRemoveOutdated: (id: string) => void;
|
|
32
|
+
onExit: () => void;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
function rangeOf(annotation: DocumentAnnotation): string {
|
|
36
|
+
return annotation.lineStart === annotation.lineEnd
|
|
37
|
+
? `L${annotation.lineStart}`
|
|
38
|
+
: `L${annotation.lineStart}-${annotation.lineEnd}`;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export function ReviewSummary({ counts, outdated, error, sent, onSend, onRemoveOutdated, onExit }: ReviewSummaryProps) {
|
|
42
|
+
const total = counts.good + counts.needsWork;
|
|
43
|
+
|
|
44
|
+
return (
|
|
45
|
+
<div className="sticky bottom-0 z-40 mt-2 border-t border-ink/10 bg-paper/95 px-1 py-2 backdrop-blur">
|
|
46
|
+
{outdated.length > 0 && (
|
|
47
|
+
<div className="mb-1.5 space-y-1">
|
|
48
|
+
<div className="text-[10px] uppercase font-mono text-ink/40">
|
|
49
|
+
{outdated.length} outdated — the block was edited or is no longer rendered
|
|
50
|
+
</div>
|
|
51
|
+
{outdated.map((annotation) => (
|
|
52
|
+
<div key={annotation.id} className="flex items-start gap-1.5 text-[11px] text-ink/60">
|
|
53
|
+
<span className="font-mono text-[10.5px] text-ink/40">{rangeOf(annotation)}</span>
|
|
54
|
+
{/* Both halves, because they say different things: the QUOTE is
|
|
55
|
+
the block this note was written about, the NOTE is what the
|
|
56
|
+
user said about it — and the note is the reason the row is
|
|
57
|
+
worth keeping at all. */}
|
|
58
|
+
<span className="min-w-0 flex-1">
|
|
59
|
+
<span className="block truncate text-ink/45">{annotation.quote || '(block text unavailable)'}</span>
|
|
60
|
+
{annotation.note.trim() && <span className="block truncate text-ink/70">{annotation.note}</span>}
|
|
61
|
+
</span>
|
|
62
|
+
<button
|
|
63
|
+
type="button"
|
|
64
|
+
onClick={() => onRemoveOutdated(annotation.id)}
|
|
65
|
+
className="cursor-pointer text-ink/40 hover:text-error"
|
|
66
|
+
aria-label={`Remove outdated annotation at ${rangeOf(annotation)}`}
|
|
67
|
+
>
|
|
68
|
+
<X size={11} />
|
|
69
|
+
</button>
|
|
70
|
+
</div>
|
|
71
|
+
))}
|
|
72
|
+
</div>
|
|
73
|
+
)}
|
|
74
|
+
|
|
75
|
+
{error && (
|
|
76
|
+
<div role="alert" className="mb-1.5 text-[11px] text-error">
|
|
77
|
+
{error}
|
|
78
|
+
</div>
|
|
79
|
+
)}
|
|
80
|
+
|
|
81
|
+
<div className="flex items-center gap-2 font-sans text-[11px]">
|
|
82
|
+
<span className="text-ink/70">
|
|
83
|
+
<span className="text-ink">{counts.good}</span> good ·{' '}
|
|
84
|
+
<span className="text-error">{counts.needsWork}</span> needs work
|
|
85
|
+
</span>
|
|
86
|
+
{sent && <span className="text-ink/50">Added to the chat box</span>}
|
|
87
|
+
<button
|
|
88
|
+
type="button"
|
|
89
|
+
onClick={onExit}
|
|
90
|
+
className="ml-auto cursor-pointer p-1 text-ink/50 hover:text-ink"
|
|
91
|
+
title="Exit review mode"
|
|
92
|
+
aria-label="Exit review mode"
|
|
93
|
+
>
|
|
94
|
+
<X size={13} />
|
|
95
|
+
</button>
|
|
96
|
+
<button
|
|
97
|
+
type="button"
|
|
98
|
+
disabled={total === 0}
|
|
99
|
+
onClick={onSend}
|
|
100
|
+
title="Put this review into the chat box — you still choose to send it"
|
|
101
|
+
className="flex items-center gap-1 rounded border border-ink bg-ink px-2 py-1 text-canvas transition-colors cursor-pointer disabled:opacity-40 disabled:cursor-not-allowed"
|
|
102
|
+
>
|
|
103
|
+
<Send size={11} /> Send to chat
|
|
104
|
+
</button>
|
|
105
|
+
</div>
|
|
106
|
+
</div>
|
|
107
|
+
);
|
|
108
|
+
}
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Per-block review on a rendered markdown document: "this paragraph is good,
|
|
8
|
+
* that one needs work", with the verdicts handed to the agent as one prompt.
|
|
9
|
+
*
|
|
10
|
+
* ## Off unless the toolbar button turned it on
|
|
11
|
+
*
|
|
12
|
+
* `active` is the whole difference between this and an ordinary preview. Off:
|
|
13
|
+
* the renderer emits no block attributes, nothing is fetched, and every click
|
|
14
|
+
* keeps its usual meaning — links, copy buttons, the diagram viewer. On: each
|
|
15
|
+
* top-level block becomes addressable, a click opens the judge panel, and a rail
|
|
16
|
+
* stripe says what has been decided. An always-on layer would take those clicks
|
|
17
|
+
* away from a reader who never asked to review anything, which is why the mode
|
|
18
|
+
* is entered from a toolbar button and nowhere else.
|
|
19
|
+
*
|
|
20
|
+
* ## Identity is the block's text, not its line
|
|
21
|
+
*
|
|
22
|
+
* A render has no lines, and a line number lies the moment text above it is
|
|
23
|
+
* inserted. Each block carries `type:hash#occurrence` (`blocks/anchor.ts`), so a
|
|
24
|
+
* judgement follows its paragraph around the document; when the block's own text
|
|
25
|
+
* changes the anchor stops matching and the mark is reported as OUTDATED with
|
|
26
|
+
* its note intact — never dropped.
|
|
27
|
+
*/
|
|
28
|
+
|
|
29
|
+
import { useEffect, useState } from 'preact/hooks';
|
|
30
|
+
|
|
31
|
+
import { MarkdownRenderer } from '@/client/components/common/MarkdownRenderer';
|
|
32
|
+
import { ReviewPopover } from '@/client/components/common/markdown-review/ReviewPopover';
|
|
33
|
+
import { ReviewSummary } from '@/client/components/common/markdown-review/ReviewSummary';
|
|
34
|
+
import { usePreviewReview } from '@/client/hooks/editor/use-preview-review';
|
|
35
|
+
|
|
36
|
+
export interface MarkdownReviewProps {
|
|
37
|
+
/** The document's text — the preview's buffer, not a re-read from disk. */
|
|
38
|
+
content: string;
|
|
39
|
+
file: { name: string; path: string; root?: string | null; repo?: string | null };
|
|
40
|
+
/** Review mode, owned by the editor's toolbar. */
|
|
41
|
+
active: boolean;
|
|
42
|
+
/** The exit control inside the summary bar; the toolbar owns the same switch. */
|
|
43
|
+
onExit: () => void;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export function MarkdownReview({ content, file, active, onExit }: MarkdownReviewProps) {
|
|
47
|
+
const review = usePreviewReview({ file, active });
|
|
48
|
+
const [sent, setSent] = useState(false);
|
|
49
|
+
|
|
50
|
+
// A scroll moves the block out from under a fixed panel, so closing is the
|
|
51
|
+
// honest answer — see `ReviewPopover`.
|
|
52
|
+
useEffect(() => {
|
|
53
|
+
if (!review.selected) return;
|
|
54
|
+
const onScroll = () => review.close();
|
|
55
|
+
window.addEventListener('scroll', onScroll, true);
|
|
56
|
+
return () => window.removeEventListener('scroll', onScroll, true);
|
|
57
|
+
}, [review.selected]);
|
|
58
|
+
|
|
59
|
+
// The mode was switched off (toolbar, or another tab of the same file): the
|
|
60
|
+
// panel must not survive into the ordinary preview.
|
|
61
|
+
useEffect(() => {
|
|
62
|
+
if (!active) review.close();
|
|
63
|
+
}, [active]);
|
|
64
|
+
|
|
65
|
+
// "Added to the chat box" describes the LAST send, so a change to what would be
|
|
66
|
+
// sent retires it: leaving it up after a mark was removed would claim the
|
|
67
|
+
// composer holds the review that is on screen.
|
|
68
|
+
const total = review.counts.good + review.counts.needsWork;
|
|
69
|
+
useEffect(() => {
|
|
70
|
+
setSent(false);
|
|
71
|
+
}, [total]);
|
|
72
|
+
|
|
73
|
+
const selected = review.selectedBlock;
|
|
74
|
+
const annotation = review.selectedAnnotation;
|
|
75
|
+
|
|
76
|
+
return (
|
|
77
|
+
// The class is what review mode's CSS hangs off, so the hover and rail rules
|
|
78
|
+
// exist only while the mode is on.
|
|
79
|
+
<div className={active ? 'md-review-active' : undefined}>
|
|
80
|
+
<MarkdownRenderer
|
|
81
|
+
content={content}
|
|
82
|
+
document
|
|
83
|
+
scope={{ path: file.path, root: file.root ?? undefined, repo: file.repo ?? undefined }}
|
|
84
|
+
onBlocks={review.setBlocks}
|
|
85
|
+
review={
|
|
86
|
+
active
|
|
87
|
+
? { active: true, marks: review.marks, selected: review.selected, onPick: review.pick }
|
|
88
|
+
: undefined
|
|
89
|
+
}
|
|
90
|
+
/>
|
|
91
|
+
|
|
92
|
+
{active && selected && review.anchor && (
|
|
93
|
+
<ReviewPopover
|
|
94
|
+
// A new block is a new form: the textarea's draft must not follow the
|
|
95
|
+
// selection.
|
|
96
|
+
key={selected.key}
|
|
97
|
+
block={selected}
|
|
98
|
+
verdict={review.marks.get(selected.key) ?? null}
|
|
99
|
+
note={annotation?.note ?? ''}
|
|
100
|
+
anchor={review.anchor}
|
|
101
|
+
onSave={(verdict, note) => {
|
|
102
|
+
review.save({ block: selected, verdict, note });
|
|
103
|
+
review.close();
|
|
104
|
+
}}
|
|
105
|
+
onRemove={() => {
|
|
106
|
+
if (annotation) review.remove(annotation.id);
|
|
107
|
+
review.close();
|
|
108
|
+
}}
|
|
109
|
+
onClose={review.close}
|
|
110
|
+
/>
|
|
111
|
+
)}
|
|
112
|
+
|
|
113
|
+
{active && (
|
|
114
|
+
<ReviewSummary
|
|
115
|
+
counts={review.counts}
|
|
116
|
+
outdated={review.outdated}
|
|
117
|
+
error={review.error}
|
|
118
|
+
sent={sent}
|
|
119
|
+
onSend={() => setSent(review.send())}
|
|
120
|
+
onRemoveOutdated={review.remove}
|
|
121
|
+
onExit={() => {
|
|
122
|
+
review.close();
|
|
123
|
+
onExit();
|
|
124
|
+
}}
|
|
125
|
+
/>
|
|
126
|
+
)}
|
|
127
|
+
</div>
|
|
128
|
+
);
|
|
129
|
+
}
|
|
@@ -16,6 +16,8 @@
|
|
|
16
16
|
|
|
17
17
|
import { useState } from 'preact/hooks';
|
|
18
18
|
import { Check, Loader2, Play, Plus, RefreshCw, Server, Square, Trash2 } from 'lucide-preact';
|
|
19
|
+
import { AnchoredMenu } from '@/client/components/common/anchored-menu';
|
|
20
|
+
import { anchorRectOf } from '@/shared/lib/ui/menu-anchor';
|
|
19
21
|
import type { ShellServersStore } from '@/client/hooks/shell/servers';
|
|
20
22
|
import type { ShellServer } from '@/client/lib/shell/servers';
|
|
21
23
|
import { mobileOverlayStyle } from '@/shared/lib/ui/mobile-overlay';
|
|
@@ -28,6 +30,8 @@ interface ServerPanelProps {
|
|
|
28
30
|
/** `nav` hangs under a desktop navbar button; `chip` is a phone sheet. */
|
|
29
31
|
variant: ServerControlVariant;
|
|
30
32
|
store: ShellServersStore;
|
|
33
|
+
/** The button this panel hangs from; the nav variant is measured off it. */
|
|
34
|
+
triggerRef: { current: HTMLButtonElement | null };
|
|
31
35
|
}
|
|
32
36
|
|
|
33
37
|
function statusLine(server: ShellServer): string {
|
|
@@ -131,8 +135,24 @@ function Row({
|
|
|
131
135
|
* A server is only offered as connectable while it ANSWERS: the shell probes
|
|
132
136
|
* every URL before answering, so `running: false` is a real fact rather than a
|
|
133
137
|
* guess, and the row says so instead of letting a click fail on a blank window.
|
|
138
|
+
*
|
|
139
|
+
* ## The panel is portalled, and why that is the fix rather than a z-index bump
|
|
140
|
+
*
|
|
141
|
+
* The desktop trigger lives in the navbar, a FLEX ITEM at `z-20`; a `z-50`
|
|
142
|
+
* panel inside it is still confined to that stacking context, so anything at
|
|
143
|
+
* `z-20`+ in the chat column painted over it (measured: an `elementFromPoint`
|
|
144
|
+
* walk found the timeline's minimap on top of the panel's middle rows at
|
|
145
|
+
* 1100×460). Raising the panel's own number cannot help — the number that
|
|
146
|
+
* decides is the ANCESTOR's. Same story on the phone: the drawer's title bar
|
|
147
|
+
* is a `z-20` flex item, and the sheet's lower rows fell under the sticky
|
|
148
|
+
* workspace headers beneath it.
|
|
149
|
+
*
|
|
150
|
+
* So the body is drawn by `common/anchored-menu/`: `fixed`, in `document.body`,
|
|
151
|
+
* at the layer above every panel and modal. The nav variant measures the
|
|
152
|
+
* trigger it hangs from; the chip variant keeps `mobileOverlayStyle`'s insets,
|
|
153
|
+
* which are a property of the device rather than of the button.
|
|
134
154
|
*/
|
|
135
|
-
export function ServerPanel({ open, onClose, variant, store }: ServerPanelProps) {
|
|
155
|
+
export function ServerPanel({ open, onClose, variant, store, triggerRef }: ServerPanelProps) {
|
|
136
156
|
const [label, setLabel] = useState('');
|
|
137
157
|
const [url, setUrl] = useState('');
|
|
138
158
|
const [adding, setAdding] = useState(false);
|
|
@@ -155,30 +175,20 @@ export function ServerPanel({ open, onClose, variant, store }: ServerPanelProps)
|
|
|
155
175
|
}
|
|
156
176
|
};
|
|
157
177
|
|
|
158
|
-
//
|
|
159
|
-
//
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
? mobileOverlayStyle()
|
|
164
|
-
: undefined;
|
|
178
|
+
// The panel's own chrome. `overflow-hidden` is gone: the rows scroll inside
|
|
179
|
+
// the body below, and a clipping root would cut the Add form's focus ring.
|
|
180
|
+
const panelClass = variant === 'chip'
|
|
181
|
+
? 'rounded-xl border border-ink/15 bg-paper shadow-xl'
|
|
182
|
+
: 'w-[340px] rounded-xl border border-ink/15 bg-paper shadow-xl';
|
|
165
183
|
|
|
166
184
|
return (
|
|
167
|
-
<
|
|
185
|
+
<AnchoredMenu
|
|
186
|
+
anchor={variant === 'nav' && triggerRef.current ? anchorRectOf(triggerRef.current) : null}
|
|
187
|
+
viewportStyle={variant === 'chip' ? mobileOverlayStyle() : undefined}
|
|
168
188
|
role="dialog"
|
|
169
|
-
|
|
170
|
-
className={
|
|
171
|
-
|
|
172
|
-
? 'fixed z-50 rounded-xl border border-ink/15 bg-paper shadow-xl overflow-hidden'
|
|
173
|
-
: 'absolute right-2 top-full mt-1 z-50 w-[340px] rounded-xl border border-ink/15 bg-paper shadow-xl overflow-hidden'
|
|
174
|
-
}
|
|
175
|
-
style={placement}
|
|
176
|
-
onKeyDown={(event) => {
|
|
177
|
-
if (event.key === 'Escape') {
|
|
178
|
-
event.stopPropagation();
|
|
179
|
-
onClose();
|
|
180
|
-
}
|
|
181
|
-
}}
|
|
189
|
+
ariaLabel="Servers"
|
|
190
|
+
className={panelClass}
|
|
191
|
+
onClose={onClose}
|
|
182
192
|
>
|
|
183
193
|
<div className="flex items-center justify-between px-3 py-2 border-b border-ink/10">
|
|
184
194
|
<span className="flex items-center gap-1.5 text-xs font-semibold text-ink">
|
|
@@ -314,6 +324,6 @@ export function ServerPanel({ open, onClose, variant, store }: ServerPanelProps)
|
|
|
314
324
|
</button>
|
|
315
325
|
)}
|
|
316
326
|
</div>
|
|
317
|
-
</
|
|
327
|
+
</AnchoredMenu>
|
|
318
328
|
);
|
|
319
329
|
}
|
|
@@ -103,7 +103,13 @@ async function settle() {
|
|
|
103
103
|
});
|
|
104
104
|
}
|
|
105
105
|
|
|
106
|
-
|
|
106
|
+
/**
|
|
107
|
+
* The panel is PORTALLED to `document.body` (an `absolute` panel inside the
|
|
108
|
+
* navbar's `z-20` stacking context lost to column content at equal or higher
|
|
109
|
+
* numbers — see `Panel.tsx`), so the panel's words are read from the document
|
|
110
|
+
* rather than from the trigger's own container.
|
|
111
|
+
*/
|
|
112
|
+
const text = () => (win.document.body.textContent ?? '').replace(/\s+/g, ' ').trim();
|
|
107
113
|
|
|
108
114
|
beforeEach(() => {
|
|
109
115
|
win = new Window({ url: 'http://127.0.0.1:3001/' });
|
|
@@ -137,7 +143,7 @@ describe('ServerControl', () => {
|
|
|
137
143
|
expect(text()).toContain('Found on this machine');
|
|
138
144
|
expect(text()).toContain('Local :3000');
|
|
139
145
|
// The active row carries its own marker rather than a colour alone.
|
|
140
|
-
expect(
|
|
146
|
+
expect(win.document.querySelector('[aria-label="Active"]')).not.toBeNull();
|
|
141
147
|
});
|
|
142
148
|
|
|
143
149
|
test('the trigger and the panel read ONE list — one read, not two polls', async () => {
|
|
@@ -150,17 +156,17 @@ describe('ServerControl', () => {
|
|
|
150
156
|
mount(DESKTOP);
|
|
151
157
|
await settle();
|
|
152
158
|
expect(text()).toContain('Stopped');
|
|
153
|
-
const nas = [...
|
|
159
|
+
const nas = [...win.document.querySelectorAll('button')].find((button) =>
|
|
154
160
|
(button.textContent ?? '').includes('NAS'),
|
|
155
161
|
);
|
|
156
162
|
expect(nas).toBeDefined();
|
|
157
|
-
expect(
|
|
163
|
+
expect(nas?.disabled).toBe(true);
|
|
158
164
|
});
|
|
159
165
|
|
|
160
166
|
test('Stop is offered only for a server this shell started', async () => {
|
|
161
167
|
mount(DESKTOP);
|
|
162
168
|
await settle();
|
|
163
|
-
const stops = [...
|
|
169
|
+
const stops = [...win.document.querySelectorAll('button')].filter((button) =>
|
|
164
170
|
(button.getAttribute('aria-label') ?? '').startsWith('Stop '),
|
|
165
171
|
);
|
|
166
172
|
expect(stops.map((button) => button.getAttribute('aria-label'))).toEqual(['Stop Local :3001']);
|
|
@@ -31,7 +31,6 @@ import { useEffect, useRef, useState } from 'preact/hooks';
|
|
|
31
31
|
import { ServerCog } from 'lucide-preact';
|
|
32
32
|
import { useShellServers } from '@/client/hooks/shell/servers';
|
|
33
33
|
import { hasShellBridge } from '@/client/lib/shell/transport';
|
|
34
|
-
import { useOnClickOutside } from '@/client/hooks/ui/on-click-outside';
|
|
35
34
|
import { ServerPanel } from '@/client/components/common/server-control/Panel';
|
|
36
35
|
|
|
37
36
|
export type ServerControlVariant = 'nav' | 'chip';
|
|
@@ -50,15 +49,16 @@ export function ServerControl({ variant }: ServerControlProps) {
|
|
|
50
49
|
// would be a button that never works.
|
|
51
50
|
const available = hasShellBridge();
|
|
52
51
|
const [open, setOpen] = useState(false);
|
|
53
|
-
|
|
52
|
+
// The panel is PORTALLED (see `Panel.tsx` for the measured reason), so its
|
|
53
|
+
// dismissal is its own backdrop — an outside-click listener rooted at the
|
|
54
|
+
// trigger would read every click inside the panel as "outside".
|
|
55
|
+
const triggerRef = useRef<HTMLButtonElement>(null);
|
|
54
56
|
const store = useShellServers(open);
|
|
55
57
|
const active =
|
|
56
58
|
store.state?.entries.find((entry) => entry.id === store.state?.activeId) ??
|
|
57
59
|
store.state?.detected.find((entry) => entry.url === store.state?.activeUrl) ??
|
|
58
60
|
null;
|
|
59
61
|
|
|
60
|
-
useOnClickOutside(ref, () => setOpen(false));
|
|
61
|
-
|
|
62
62
|
// A shell that went away (a page kept across a host restart) must not leave a
|
|
63
63
|
// dangling promise behind: closing it is the honest state.
|
|
64
64
|
useEffect(() => {
|
|
@@ -73,8 +73,9 @@ export function ServerControl({ variant }: ServerControlProps) {
|
|
|
73
73
|
|
|
74
74
|
if (variant === 'chip') {
|
|
75
75
|
return (
|
|
76
|
-
<div className="relative flex-shrink-0"
|
|
76
|
+
<div className="relative flex-shrink-0">
|
|
77
77
|
<button
|
|
78
|
+
ref={triggerRef}
|
|
78
79
|
type="button"
|
|
79
80
|
onClick={() => setOpen((was) => !was)}
|
|
80
81
|
className={CHIP_CLASS}
|
|
@@ -85,14 +86,15 @@ export function ServerControl({ variant }: ServerControlProps) {
|
|
|
85
86
|
>
|
|
86
87
|
<ServerCog size={18} strokeWidth={1.8} />
|
|
87
88
|
</button>
|
|
88
|
-
<ServerPanel open={open} onClose={() => setOpen(false)} variant="chip" store={store} />
|
|
89
|
+
<ServerPanel open={open} onClose={() => setOpen(false)} variant="chip" store={store} triggerRef={triggerRef} />
|
|
89
90
|
</div>
|
|
90
91
|
);
|
|
91
92
|
}
|
|
92
93
|
|
|
93
94
|
return (
|
|
94
|
-
<div className="relative"
|
|
95
|
+
<div className="relative">
|
|
95
96
|
<button
|
|
97
|
+
ref={triggerRef}
|
|
96
98
|
type="button"
|
|
97
99
|
onClick={() => setOpen((was) => !was)}
|
|
98
100
|
className="flex items-center gap-1.5 rounded px-1.5 py-1 text-ink/60 hover:text-ink hover:bg-ink/10 transition-colors cursor-pointer"
|
|
@@ -112,7 +114,7 @@ export function ServerControl({ variant }: ServerControlProps) {
|
|
|
112
114
|
aria-hidden="true"
|
|
113
115
|
/>
|
|
114
116
|
</button>
|
|
115
|
-
<ServerPanel open={open} onClose={() => setOpen(false)} variant="nav" store={store} />
|
|
117
|
+
<ServerPanel open={open} onClose={() => setOpen(false)} variant="nav" store={store} triggerRef={triggerRef} />
|
|
116
118
|
</div>
|
|
117
119
|
);
|
|
118
120
|
}
|