@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,239 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The Token Usage panel's period control and its breakdown table.
|
|
8
|
+
*
|
|
9
|
+
* The panel has ONE period control, because Day / Week / Month / 90 days / All
|
|
10
|
+
* time / Custom are all the same kind of choice: which trailing span to report.
|
|
11
|
+
* Two things are pinned here, because both were reported as bugs:
|
|
12
|
+
*
|
|
13
|
+
* - choosing a period must be a single click in one list (there is no second
|
|
14
|
+
* daily/weekly/monthly switch beside it);
|
|
15
|
+
* - no figure may be a per-day/per-week average — a period is one span, so
|
|
16
|
+
* every number is that span's total, and a derived "per day" number is what
|
|
17
|
+
* made the selector look like it only repainted the chart.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
import { afterEach, beforeEach, describe, expect, test } from 'bun:test';
|
|
21
|
+
import { Window } from 'happy-dom';
|
|
22
|
+
import { h, render } from 'preact';
|
|
23
|
+
import { act } from 'preact/test-utils';
|
|
24
|
+
import { TokenUsageControls } from '@/client/components/settings/categories/token-usage-settings/Controls';
|
|
25
|
+
import { TokenUsageBreakdown } from '@/client/components/settings/categories/token-usage-settings/Breakdown';
|
|
26
|
+
import { dayRows, providerModelRows } from '@/shared/lib/usage/breakdown';
|
|
27
|
+
import { timeRangeOptions } from '@/shared/lib/usage/range';
|
|
28
|
+
import type { UsageProviderRow, UsageTotals } from '@/shared/types';
|
|
29
|
+
import { installDomGlobals, restoreDomGlobals } from '@/test-support/pristine-globals';
|
|
30
|
+
|
|
31
|
+
let container: HTMLElement;
|
|
32
|
+
let picked: string[];
|
|
33
|
+
let from: string[];
|
|
34
|
+
let to: string[];
|
|
35
|
+
|
|
36
|
+
const NOW = new Date(2026, 10, 3, 12).getTime();
|
|
37
|
+
|
|
38
|
+
function controls(): void {
|
|
39
|
+
render(
|
|
40
|
+
h(TokenUsageControls, {
|
|
41
|
+
range: '30d',
|
|
42
|
+
onRange: (value: string) => picked.push(value),
|
|
43
|
+
ranges: timeRangeOptions(NOW),
|
|
44
|
+
customFrom: '2026-10-05',
|
|
45
|
+
customTo: '2026-11-03',
|
|
46
|
+
onCustomFrom: (value: string) => from.push(value),
|
|
47
|
+
onCustomTo: (value: string) => to.push(value),
|
|
48
|
+
periodLabel: 'Oct 5 – Nov 3, 2026',
|
|
49
|
+
generatedAt: NOW,
|
|
50
|
+
refreshing: false,
|
|
51
|
+
onRefresh: () => {},
|
|
52
|
+
}),
|
|
53
|
+
container,
|
|
54
|
+
);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
const buttons = (): HTMLButtonElement[] => [...container.querySelectorAll('button')];
|
|
58
|
+
|
|
59
|
+
beforeEach(() => {
|
|
60
|
+
installDomGlobals(new Window({ url: 'http://127.0.0.1/' }));
|
|
61
|
+
container = document.createElement('div');
|
|
62
|
+
document.body.append(container);
|
|
63
|
+
picked = [];
|
|
64
|
+
from = [];
|
|
65
|
+
to = [];
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
afterEach(() => {
|
|
69
|
+
render(null, container);
|
|
70
|
+
container.remove();
|
|
71
|
+
restoreDomGlobals();
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
describe('TokenUsageControls', () => {
|
|
75
|
+
test('the trigger names the ACTIVE period, not a generic "Custom…"', () => {
|
|
76
|
+
controls();
|
|
77
|
+
const trigger = buttons()[0];
|
|
78
|
+
expect(trigger.getAttribute('aria-expanded')).toBe('false');
|
|
79
|
+
expect(trigger.textContent).toContain('Month');
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
test('one list holds every span, so there is no second cadence switch', () => {
|
|
83
|
+
controls();
|
|
84
|
+
act(() => buttons()[0].click());
|
|
85
|
+
const labels = buttons().map((button) => button.textContent?.trim() ?? '');
|
|
86
|
+
// Day/Week/Month ARE periods here; a "Daily / Weekly / Monthly" group would
|
|
87
|
+
// be the duplicate control this replaced.
|
|
88
|
+
expect(labels.some((label) => label.startsWith('Day'))).toBe(true);
|
|
89
|
+
expect(labels.some((label) => label.startsWith('Week'))).toBe(true);
|
|
90
|
+
expect(labels.some((label) => label.startsWith('Month'))).toBe(true);
|
|
91
|
+
expect(labels.some((label) => label.startsWith('90 days'))).toBe(true);
|
|
92
|
+
expect(labels.some((label) => label.startsWith('All time'))).toBe(true);
|
|
93
|
+
expect(labels.some((label) => label.startsWith('Custom…'))).toBe(true);
|
|
94
|
+
expect(container.textContent).not.toContain('Daily');
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
test('choosing a span reports that range and closes the list', () => {
|
|
98
|
+
controls();
|
|
99
|
+
act(() => buttons()[0].click());
|
|
100
|
+
const week = buttons().find((button) => button.textContent?.trim().startsWith('Week'));
|
|
101
|
+
act(() => week?.click());
|
|
102
|
+
expect(picked).toEqual(['7d']);
|
|
103
|
+
expect(container.textContent).not.toContain('Custom…');
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
test('the period menu is anchored to the left edge on phones', () => {
|
|
107
|
+
controls();
|
|
108
|
+
act(() => buttons()[0].click());
|
|
109
|
+
const menu = [...container.querySelectorAll('div.absolute')].find((el) =>
|
|
110
|
+
(el.textContent ?? '').includes('Custom…'),
|
|
111
|
+
);
|
|
112
|
+
// `right-0` on a full-width trigger hung the menu off the LEFT of the
|
|
113
|
+
// viewport (measured at x=-157); it anchors left and only right-aligns from
|
|
114
|
+
// `sm` up.
|
|
115
|
+
expect(menu?.className).toContain('left-0');
|
|
116
|
+
expect(menu?.className).toContain('sm:right-0');
|
|
117
|
+
expect(menu?.className).toContain('max-w-[calc(100vw-2rem)]');
|
|
118
|
+
});
|
|
119
|
+
|
|
120
|
+
test('a custom span exposes both date inputs, capped at the payload day', () => {
|
|
121
|
+
render(
|
|
122
|
+
h(TokenUsageControls, {
|
|
123
|
+
range: 'custom',
|
|
124
|
+
onRange: (value: string) => picked.push(value),
|
|
125
|
+
ranges: timeRangeOptions(NOW),
|
|
126
|
+
customFrom: '2026-10-05',
|
|
127
|
+
customTo: '2026-11-03',
|
|
128
|
+
onCustomFrom: (value: string) => from.push(value),
|
|
129
|
+
onCustomTo: (value: string) => to.push(value),
|
|
130
|
+
periodLabel: 'Oct 5 – Nov 3, 2026',
|
|
131
|
+
generatedAt: NOW,
|
|
132
|
+
refreshing: false,
|
|
133
|
+
onRefresh: () => {},
|
|
134
|
+
}),
|
|
135
|
+
container,
|
|
136
|
+
);
|
|
137
|
+
// The button itself names the window, so an equal-to-preset range is still
|
|
138
|
+
// visibly a different state.
|
|
139
|
+
expect(buttons()[0].textContent).toContain('2026-10-05 – 2026-11-03');
|
|
140
|
+
act(() => buttons()[0].click());
|
|
141
|
+
const inputs = [...container.querySelectorAll('input[type=date]')] as HTMLInputElement[];
|
|
142
|
+
expect(inputs.map((input) => input.value)).toEqual(['2026-10-05', '2026-11-03']);
|
|
143
|
+
expect(inputs[1].max).toBe('2026-11-03');
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
describe('TokenUsageBreakdown', () => {
|
|
148
|
+
const totals: UsageTotals = {
|
|
149
|
+
cost: 20, tokens: 1_000_000, input: 50_000, output: 50_000, cacheRead: 900_000,
|
|
150
|
+
cacheWrite: 0, reasoning: 0, cacheReadCost: 1, records: 40, unpriced: 0, activeDays: 6,
|
|
151
|
+
};
|
|
152
|
+
const providers: UsageProviderRow[] = [
|
|
153
|
+
{
|
|
154
|
+
id: 'kenari-jatis', name: 'Kenari Jatis', cost: 18, tokens: 900, input: 0, output: 0,
|
|
155
|
+
cacheRead: 0, cacheWrite: 0, reasoning: 0, cacheReadCost: 0, records: 1, unpriced: 0,
|
|
156
|
+
models: [{
|
|
157
|
+
model: 'deepseek-v4-1-flash', cost: 18, tokens: 900, input: 0, output: 0,
|
|
158
|
+
cacheRead: 0, cacheWrite: 0, reasoning: 0, cacheReadCost: 0, records: 1, unpriced: 0,
|
|
159
|
+
}],
|
|
160
|
+
},
|
|
161
|
+
];
|
|
162
|
+
|
|
163
|
+
function table(granularity: 'day' | 'week' | 'month'): void {
|
|
164
|
+
render(
|
|
165
|
+
h(TokenUsageBreakdown, {
|
|
166
|
+
tab: 'model',
|
|
167
|
+
onTab: () => {},
|
|
168
|
+
rows: providerModelRows(providers, totals.cost),
|
|
169
|
+
totals,
|
|
170
|
+
granularity,
|
|
171
|
+
providerNames: { 'kenari-jatis': 'Kenari Jatis' },
|
|
172
|
+
}),
|
|
173
|
+
container,
|
|
174
|
+
);
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
test('every cell is the period total — no per-day or per-week figure', () => {
|
|
178
|
+
table('day');
|
|
179
|
+
const text = container.textContent ?? '';
|
|
180
|
+
expect(text).toContain('$18.00');
|
|
181
|
+
expect(text).toContain('900');
|
|
182
|
+
// The averages that made the selector look inert are gone.
|
|
183
|
+
expect(text).not.toMatch(/\/day|\/wk|\/mo|per day|per week|per month/);
|
|
184
|
+
expect(text).toContain('period total');
|
|
185
|
+
});
|
|
186
|
+
|
|
187
|
+
test('the time tab is named for the bucket width the period implies', () => {
|
|
188
|
+
table('week');
|
|
189
|
+
const labels = [...container.querySelectorAll('[role="tab"]')].map((tab) => tab.textContent?.trim());
|
|
190
|
+
expect(labels).toContain('WEEK');
|
|
191
|
+
expect(labels).not.toContain('DAY');
|
|
192
|
+
});
|
|
193
|
+
|
|
194
|
+
test('a time tab renders every row of the period, never a truncated eight', () => {
|
|
195
|
+
// Eleven days of period, two of which saw usage: the table must list all
|
|
196
|
+
// eleven, because it describes the PERIOD, not the days that had work.
|
|
197
|
+
const days = Array.from({ length: 11 }, (_, index) => ({
|
|
198
|
+
day: `2026-11-${String(index + 1).padStart(2, '0')}`,
|
|
199
|
+
providers: {},
|
|
200
|
+
cost: index === 3 ? 4 : 0,
|
|
201
|
+
tokens: index === 3 ? 40 : 0,
|
|
202
|
+
input: 0, output: 0, cacheRead: 0, cacheWrite: 0, reasoning: 0,
|
|
203
|
+
cacheReadCost: 0, records: index === 3 ? 2 : 0, unpriced: 0,
|
|
204
|
+
}));
|
|
205
|
+
render(
|
|
206
|
+
h(TokenUsageBreakdown, {
|
|
207
|
+
tab: 'day',
|
|
208
|
+
onTab: () => {},
|
|
209
|
+
rows: dayRows(days, 'day', 4, { from: '2026-11-01', to: '2026-11-11' }),
|
|
210
|
+
totals,
|
|
211
|
+
granularity: 'day',
|
|
212
|
+
providerNames: {},
|
|
213
|
+
}),
|
|
214
|
+
container,
|
|
215
|
+
);
|
|
216
|
+
const bodyRows = container.querySelectorAll('tbody tr');
|
|
217
|
+
expect(bodyRows).toHaveLength(11);
|
|
218
|
+
// The period is fully listed, so there is no "show all" left to click.
|
|
219
|
+
expect(container.textContent).not.toContain('Show all');
|
|
220
|
+
expect(container.textContent).toContain('11 rows · day');
|
|
221
|
+
});
|
|
222
|
+
|
|
223
|
+
test('the tab row can wrap, so the last tab is never pushed out of the card', () => {
|
|
224
|
+
table('month');
|
|
225
|
+
const header = container.querySelector('[role="tablist"][aria-label="Breakdown"]')?.parentElement;
|
|
226
|
+
expect(header?.className).toContain('flex-wrap');
|
|
227
|
+
// The four tabs must stay inside the card at phone widths; measured in the
|
|
228
|
+
// browser, a non-wrapping row put PROJECT 14–84 px outside it.
|
|
229
|
+
const tabs = [...container.querySelectorAll('[aria-label="Breakdown"] [role="tab"]')];
|
|
230
|
+
expect(tabs.map((tab) => tab.textContent?.trim())).toEqual(['PROVIDER', 'MODEL', 'MONTH', 'PROJECT']);
|
|
231
|
+
});
|
|
232
|
+
|
|
233
|
+
test('the provider tree keeps both providers of one model id separate', () => {
|
|
234
|
+
table('day');
|
|
235
|
+
const text = container.textContent ?? '';
|
|
236
|
+
expect(text).toContain('Kenari Jatis');
|
|
237
|
+
expect(text.match(/deepseek-v4-1-flash/g)).toHaveLength(1);
|
|
238
|
+
});
|
|
239
|
+
});
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { useEffect, useRef, useState } from 'preact/hooks';
|
|
2
2
|
import { Globe, Loader2, Radio } from 'lucide-preact';
|
|
3
3
|
import { ActivityToasts } from '@/client/components/workspace/browser-panel/ActivityToasts';
|
|
4
|
+
import { BrowserTabStrip } from '@/client/components/workspace/browser-panel/TabStrip';
|
|
4
5
|
import { drawFrame } from '@/client/lib/browser/frame-canvas';
|
|
5
6
|
import type { BrowserPanelAction, BrowserTabInfo, BrowserViewStatus } from '@/shared/types';
|
|
6
7
|
|
|
@@ -13,6 +14,10 @@ interface BrowserScreencastProps {
|
|
|
13
14
|
frame?: { data: string; mimeType: string } | null;
|
|
14
15
|
actions: BrowserPanelAction[];
|
|
15
16
|
onSelectTarget: (targetId: string) => void;
|
|
17
|
+
/** Close one of the session's tabs; only the strip offers it. */
|
|
18
|
+
onCloseTarget: (targetId: string) => void;
|
|
19
|
+
/** Tab whose close request is in flight. */
|
|
20
|
+
closingTarget?: string | null;
|
|
16
21
|
zoomLevel: number;
|
|
17
22
|
}
|
|
18
23
|
|
|
@@ -39,6 +44,8 @@ export function BrowserScreencast({
|
|
|
39
44
|
frame,
|
|
40
45
|
actions,
|
|
41
46
|
onSelectTarget,
|
|
47
|
+
onCloseTarget,
|
|
48
|
+
closingTarget,
|
|
42
49
|
zoomLevel,
|
|
43
50
|
}: BrowserScreencastProps) {
|
|
44
51
|
const isLive = status === 'live';
|
|
@@ -69,28 +76,16 @@ export function BrowserScreencast({
|
|
|
69
76
|
return (
|
|
70
77
|
<div className="flex-1 flex flex-col min-h-0 bg-canvas/60 relative overflow-hidden">
|
|
71
78
|
<ActivityToasts actions={actions} />
|
|
72
|
-
{/* Tab strip:
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
className={`px-2 py-0.5 rounded text-[11px] font-mono max-w-[220px] truncate border transition-colors cursor-pointer ${
|
|
83
|
-
active
|
|
84
|
-
? 'bg-ink text-canvas border-ink'
|
|
85
|
-
: 'bg-paper text-ink/70 border-ink/15 hover:border-ink/35 hover:text-ink'
|
|
86
|
-
}`}
|
|
87
|
-
title={tab.url || tab.title || tab.targetId}
|
|
88
|
-
>
|
|
89
|
-
{tab.title || tab.url || tab.targetId}
|
|
90
|
-
</button>
|
|
91
|
-
);
|
|
92
|
-
})}
|
|
93
|
-
</div>
|
|
79
|
+
{/* Tab strip: the selector needs two tabs, but the CLOSE control is the
|
|
80
|
+
point of the strip — a single leftover page must be closable too. */}
|
|
81
|
+
{isLive && tabs.length > 0 && (
|
|
82
|
+
<BrowserTabStrip
|
|
83
|
+
tabs={tabs}
|
|
84
|
+
targetId={targetId}
|
|
85
|
+
closing={closingTarget}
|
|
86
|
+
onSelectTarget={onSelectTarget}
|
|
87
|
+
onCloseTarget={onCloseTarget}
|
|
88
|
+
/>
|
|
94
89
|
)}
|
|
95
90
|
|
|
96
91
|
<div className="flex-1 flex items-center justify-center p-2 min-h-0 overflow-auto">
|
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The agent browser's tab strip, and the close control that makes it usable.
|
|
8
|
+
*
|
|
9
|
+
* Why this exists at all: omp opens a page per site and never tidies up, and
|
|
10
|
+
* the viewer follows the NEWEST owned tab — so a stale page keeps stealing the
|
|
11
|
+
* panel. The strip is the only map of those pages, which makes it the only
|
|
12
|
+
* place they can be closed.
|
|
13
|
+
*
|
|
14
|
+
* Pinned here: one close control per tab, the ACTIVE tab's control stays visible
|
|
15
|
+
* (a hover-only control is unreachable on a touch screen and the active tab is
|
|
16
|
+
* the one most likely to be closed), a click closes THAT tab and does not
|
|
17
|
+
* bubble into a select, and the tab being closed has its control disabled.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'bun:test';
|
|
21
|
+
import { Window } from 'happy-dom';
|
|
22
|
+
import { h, render } from 'preact';
|
|
23
|
+
import { act } from 'preact/test-utils';
|
|
24
|
+
import { BrowserTabStrip } from '@/client/components/workspace/browser-panel/TabStrip';
|
|
25
|
+
import type { BrowserTabInfo } from '@/shared/types';
|
|
26
|
+
|
|
27
|
+
const DOM_GLOBALS = ['window', 'document', 'navigator', 'Node', 'Element', 'HTMLElement', 'Event'] as const;
|
|
28
|
+
const native: Partial<Record<(typeof DOM_GLOBALS)[number], unknown>> = {};
|
|
29
|
+
let container: HTMLElement | undefined;
|
|
30
|
+
|
|
31
|
+
beforeAll(() => {
|
|
32
|
+
const win = new Window({ url: 'http://localhost' });
|
|
33
|
+
const target = globalThis as unknown as Record<string, unknown>;
|
|
34
|
+
for (const key of DOM_GLOBALS) {
|
|
35
|
+
if (!(key in native)) native[key] = target[key];
|
|
36
|
+
target[key] = (win as unknown as Record<string, unknown>)[key];
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
afterAll(() => {
|
|
41
|
+
const target = globalThis as unknown as Record<string, unknown>;
|
|
42
|
+
for (const key of DOM_GLOBALS) {
|
|
43
|
+
if (native[key] === undefined) delete target[key];
|
|
44
|
+
else target[key] = native[key];
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
afterEach(() => {
|
|
49
|
+
if (container) render(null, container);
|
|
50
|
+
container?.remove();
|
|
51
|
+
container = undefined;
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
const TABS: BrowserTabInfo[] = [
|
|
55
|
+
{ targetId: 't1', url: 'https://one.test', title: 'One' },
|
|
56
|
+
{ targetId: 't2', url: 'https://two.test', title: 'Two' },
|
|
57
|
+
{ targetId: 't3', url: 'https://three.test', title: 'Three' },
|
|
58
|
+
];
|
|
59
|
+
|
|
60
|
+
interface Recorder {
|
|
61
|
+
selected: string[];
|
|
62
|
+
closed: string[];
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
async function mount(props: { targetId?: string; closing?: string | null } = {}): Promise<{ host: HTMLElement; seen: Recorder }> {
|
|
66
|
+
const seen: Recorder = { selected: [], closed: [] };
|
|
67
|
+
const host = document.body.appendChild(document.createElement('div'));
|
|
68
|
+
container = host;
|
|
69
|
+
await act(async () => {
|
|
70
|
+
render(
|
|
71
|
+
h(BrowserTabStrip, {
|
|
72
|
+
tabs: TABS,
|
|
73
|
+
targetId: props.targetId ?? 't2',
|
|
74
|
+
closing: props.closing ?? null,
|
|
75
|
+
onSelectTarget: (id) => seen.selected.push(id),
|
|
76
|
+
onCloseTarget: (id) => seen.closed.push(id),
|
|
77
|
+
}),
|
|
78
|
+
host,
|
|
79
|
+
);
|
|
80
|
+
});
|
|
81
|
+
return { host, seen };
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
const closeButtons = (host: HTMLElement): HTMLButtonElement[] =>
|
|
85
|
+
[...host.querySelectorAll('button')].filter((button) => button.getAttribute('aria-label')?.startsWith('Tutup tab '));
|
|
86
|
+
|
|
87
|
+
describe('BrowserTabStrip', () => {
|
|
88
|
+
test('every tab gets a close control named for that tab', async () => {
|
|
89
|
+
const { host } = await mount();
|
|
90
|
+
const buttons = closeButtons(host);
|
|
91
|
+
expect(buttons).toHaveLength(TABS.length);
|
|
92
|
+
expect(buttons.map((button) => button.getAttribute('aria-label'))).toEqual([
|
|
93
|
+
'Tutup tab One',
|
|
94
|
+
'Tutup tab Two',
|
|
95
|
+
'Tutup tab Three',
|
|
96
|
+
]);
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
test('a close click names exactly that tab', async () => {
|
|
100
|
+
const { host, seen } = await mount();
|
|
101
|
+
const second = closeButtons(host)[1];
|
|
102
|
+
await act(async () => {
|
|
103
|
+
second.click();
|
|
104
|
+
});
|
|
105
|
+
expect(seen.closed).toEqual(['t2']);
|
|
106
|
+
// Closing must not also select: the panel re-points the viewer itself once
|
|
107
|
+
// the server confirms, and a select here would fight that.
|
|
108
|
+
expect(seen.selected).toEqual([]);
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
test('the active tab keeps its close control visible', async () => {
|
|
112
|
+
const { host } = await mount({ targetId: 't2' });
|
|
113
|
+
const [first, second, third] = closeButtons(host);
|
|
114
|
+
// The inactive ones reveal on hover/focus only.
|
|
115
|
+
expect(first.className).toContain('opacity-0');
|
|
116
|
+
expect(third.className).toContain('opacity-0');
|
|
117
|
+
// The active one does not, so a touch user can still close it.
|
|
118
|
+
expect(second.className).not.toContain('opacity-0');
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
test('the tab being closed has its control disabled', async () => {
|
|
122
|
+
const { host } = await mount({ closing: 't3' });
|
|
123
|
+
expect(closeButtons(host)[2].disabled).toBe(true);
|
|
124
|
+
expect(closeButtons(host)[0].disabled).toBe(false);
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
test('selecting a tab still works, and the active one unpins to follow newest', async () => {
|
|
128
|
+
const { host, seen } = await mount({ targetId: 't2' });
|
|
129
|
+
const select = (index: number) => [...host.querySelectorAll('button')].filter((b) => b.getAttribute('aria-pressed') !== null)[index];
|
|
130
|
+
await act(async () => {
|
|
131
|
+
select(0).click();
|
|
132
|
+
});
|
|
133
|
+
await act(async () => {
|
|
134
|
+
select(1).click();
|
|
135
|
+
});
|
|
136
|
+
expect(seen.selected).toEqual(['t1', '']);
|
|
137
|
+
});
|
|
138
|
+
|
|
139
|
+
test('a tab with no title falls back to its URL, then its id', async () => {
|
|
140
|
+
const host = document.body.appendChild(document.createElement('div'));
|
|
141
|
+
container = host;
|
|
142
|
+
await act(async () => {
|
|
143
|
+
render(
|
|
144
|
+
h(BrowserTabStrip, {
|
|
145
|
+
tabs: [
|
|
146
|
+
{ targetId: 'a', url: 'https://url-only.test', title: '' },
|
|
147
|
+
{ targetId: 'b', url: '', title: '' },
|
|
148
|
+
],
|
|
149
|
+
onSelectTarget: () => {},
|
|
150
|
+
onCloseTarget: () => {},
|
|
151
|
+
}),
|
|
152
|
+
host,
|
|
153
|
+
);
|
|
154
|
+
});
|
|
155
|
+
expect(host.textContent).toContain('https://url-only.test');
|
|
156
|
+
expect(host.textContent).toContain('b');
|
|
157
|
+
});
|
|
158
|
+
});
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The agent browser's tab strip: which pages this session owns, which one the
|
|
8
|
+
* panel is showing, and a close control per tab.
|
|
9
|
+
*
|
|
10
|
+
* The close button exists because omp opens a page per site it visits and never
|
|
11
|
+
* tidies up. The strip is the only place a user can see them, so it is also the
|
|
12
|
+
* only place they can be closed — and closing is what keeps the panel on the
|
|
13
|
+
* page the user cares about, since the viewer follows the NEWEST owned tab.
|
|
14
|
+
*
|
|
15
|
+
* Every tab is closable, not just the active one: the fleet of stale pages is
|
|
16
|
+
* the problem being solved. The close control is `group-hover` revealed except
|
|
17
|
+
* on the active tab, which keeps it visible — a control that only appears on
|
|
18
|
+
* hover is unreachable on a touch screen, and the active tab is the one a user
|
|
19
|
+
* is most likely to want gone.
|
|
20
|
+
*/
|
|
21
|
+
|
|
22
|
+
import { useEffect, useRef } from 'preact/hooks';
|
|
23
|
+
import { X } from 'lucide-preact';
|
|
24
|
+
import type { BrowserTabInfo } from '@/shared/types';
|
|
25
|
+
|
|
26
|
+
interface BrowserTabStripProps {
|
|
27
|
+
tabs: BrowserTabInfo[];
|
|
28
|
+
targetId?: string;
|
|
29
|
+
/** Tab whose close request is in flight (its button is disabled). */
|
|
30
|
+
closing?: string | null;
|
|
31
|
+
onSelectTarget: (targetId: string) => void;
|
|
32
|
+
onCloseTarget: (targetId: string) => void;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** What a tab row says: its title, else its URL, else the id as a last resort. */
|
|
36
|
+
function tabLabel(tab: BrowserTabInfo): string {
|
|
37
|
+
return tab.title || tab.url || tab.targetId;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
export function BrowserTabStrip({ tabs, targetId, closing, onSelectTarget, onCloseTarget }: BrowserTabStripProps) {
|
|
41
|
+
const activeRef = useRef<HTMLDivElement | null>(null);
|
|
42
|
+
|
|
43
|
+
// A session that opens pages can push the active tab out of view; the strip
|
|
44
|
+
// is the only map of them, so it must keep the current one visible.
|
|
45
|
+
useEffect(() => {
|
|
46
|
+
activeRef.current?.scrollIntoView({ block: 'nearest', inline: 'nearest' });
|
|
47
|
+
}, [targetId, tabs.length]);
|
|
48
|
+
|
|
49
|
+
return (
|
|
50
|
+
<div className="px-2 py-1 border-b border-ink/10 bg-paper flex items-center gap-1 overflow-x-auto flex-shrink-0">
|
|
51
|
+
{tabs.map((tab) => {
|
|
52
|
+
const active = tab.targetId === targetId;
|
|
53
|
+
const label = tabLabel(tab);
|
|
54
|
+
return (
|
|
55
|
+
<div
|
|
56
|
+
key={tab.targetId}
|
|
57
|
+
ref={active ? activeRef : undefined}
|
|
58
|
+
className={`group flex items-center rounded border transition-colors flex-shrink-0 ${
|
|
59
|
+
active
|
|
60
|
+
? 'bg-ink text-canvas border-ink'
|
|
61
|
+
: 'bg-paper text-ink/70 border-ink/15 hover:border-ink/35 hover:text-ink'
|
|
62
|
+
}`}
|
|
63
|
+
>
|
|
64
|
+
<button
|
|
65
|
+
type="button"
|
|
66
|
+
onClick={() => onSelectTarget(active ? '' : tab.targetId)}
|
|
67
|
+
className="pl-2 pr-1 py-0.5 text-[11px] font-mono max-w-[220px] truncate cursor-pointer"
|
|
68
|
+
title={`${label}\n${tab.url}`}
|
|
69
|
+
aria-pressed={active}
|
|
70
|
+
>
|
|
71
|
+
{label}
|
|
72
|
+
</button>
|
|
73
|
+
<button
|
|
74
|
+
type="button"
|
|
75
|
+
onClick={() => onCloseTarget(tab.targetId)}
|
|
76
|
+
disabled={closing === tab.targetId}
|
|
77
|
+
className={`mr-0.5 p-1 rounded hover:bg-error hover:text-paper transition-colors cursor-pointer disabled:opacity-40 disabled:cursor-not-allowed ${
|
|
78
|
+
active ? 'text-canvas/70' : 'text-ink/40 opacity-0 group-hover:opacity-100 focus-visible:opacity-100'
|
|
79
|
+
}`}
|
|
80
|
+
aria-label={`Tutup tab ${label}`}
|
|
81
|
+
title={`Tutup tab ${label}`}
|
|
82
|
+
>
|
|
83
|
+
<X size={11} />
|
|
84
|
+
</button>
|
|
85
|
+
</div>
|
|
86
|
+
);
|
|
87
|
+
})}
|
|
88
|
+
</div>
|
|
89
|
+
);
|
|
90
|
+
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { useCallback } from 'preact/hooks';
|
|
1
|
+
import { useCallback, useState } from 'preact/hooks';
|
|
2
2
|
import { BrowserAddressBar } from '@/client/components/workspace/browser-panel/AddressBar';
|
|
3
3
|
import { BrowserScreencast } from '@/client/components/workspace/browser-panel/Screencast';
|
|
4
4
|
import { useScreencast } from '@/client/hooks/browser/use-screencast';
|
|
5
|
+
import { useCloseBrowserTab } from '@/client/hooks/browser/use-close-tab';
|
|
5
6
|
import { useSessionState } from '@/client/hooks/workspace/session-state';
|
|
6
7
|
import { emitBrowserPageContext } from '@/shared/lib/browser/page-context';
|
|
7
8
|
|
|
@@ -15,8 +16,13 @@ interface BrowserPanelProps {
|
|
|
15
16
|
* Read-only live view of the browser tab this session's omp agent drives in the
|
|
16
17
|
* project-shared Chromium (see app/lib/browser/ + /api/browser/:id/stream).
|
|
17
18
|
*
|
|
18
|
-
* This panel only mirrors what the agent does
|
|
19
|
-
* the
|
|
19
|
+
* This panel only mirrors what the agent does, with ONE exception: it can CLOSE
|
|
20
|
+
* the session's tabs. The agent opens a page per site and never tidies up, and
|
|
21
|
+
* the viewer follows the newest owned tab — so without a close control a stale
|
|
22
|
+
* page keeps stealing the panel.
|
|
23
|
+
*
|
|
24
|
+
* Interactive browsing belongs to the separate user-browser panel, which runs
|
|
25
|
+
* its own private Chromium.
|
|
20
26
|
*
|
|
21
27
|
* There is deliberately NO device/viewport selector here: the surface is a
|
|
22
28
|
* fixed-resolution screencast JPEG, so a preset could only letterbox the image
|
|
@@ -26,7 +32,9 @@ interface BrowserPanelProps {
|
|
|
26
32
|
*/
|
|
27
33
|
export function BrowserPanel({ className = '', active = true }: BrowserPanelProps) {
|
|
28
34
|
const [zoomLevel, setZoomLevel] = useSessionState<number>('browser.zoomLevel', 100);
|
|
29
|
-
const { status, url, title, tabs, targetId, frame, actions, selectTarget, reconnect } = useScreencast(active);
|
|
35
|
+
const { status, url, title, tabs, targetId, frame, actions, sessionId, selectTarget, reconnect } = useScreencast(active);
|
|
36
|
+
const { closeTab, closing } = useCloseBrowserTab(sessionId);
|
|
37
|
+
const [closeError, setCloseError] = useState<string | null>(null);
|
|
30
38
|
|
|
31
39
|
const handleOpenExternal = () => {
|
|
32
40
|
if (!url) return;
|
|
@@ -40,6 +48,24 @@ export function BrowserPanel({ className = '', active = true }: BrowserPanelProp
|
|
|
40
48
|
emitBrowserPageContext({ url, title });
|
|
41
49
|
}, [url, title]);
|
|
42
50
|
|
|
51
|
+
// Closing a tab re-points the viewer at the neighbour the server named. The
|
|
52
|
+
// empty string means "follow the newest owned tab"; a real id pins it so the
|
|
53
|
+
// strip does not jump to an unrelated page.
|
|
54
|
+
const handleCloseTarget = useCallback(
|
|
55
|
+
(closingTarget: string) => {
|
|
56
|
+
if (closing === closingTarget) return;
|
|
57
|
+
void closeTab(closingTarget).then((result) => {
|
|
58
|
+
if (!result.ok) {
|
|
59
|
+
setCloseError(result.error ?? 'Gagal menutup tab');
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
setCloseError(null);
|
|
63
|
+
selectTarget(result.next ?? '');
|
|
64
|
+
});
|
|
65
|
+
},
|
|
66
|
+
[closeTab, closing, selectTarget],
|
|
67
|
+
);
|
|
68
|
+
|
|
43
69
|
return (
|
|
44
70
|
<div className={`flex flex-col h-full w-full bg-paper text-ink overflow-hidden select-none ${className}`}>
|
|
45
71
|
<BrowserAddressBar
|
|
@@ -54,6 +80,24 @@ export function BrowserPanel({ className = '', active = true }: BrowserPanelProp
|
|
|
54
80
|
onResetZoom={() => setZoomLevel(100)}
|
|
55
81
|
/>
|
|
56
82
|
|
|
83
|
+
{closeError && (
|
|
84
|
+
<div
|
|
85
|
+
role="alert"
|
|
86
|
+
className="px-2.5 py-1 border-b border-error/30 bg-error/5 text-[11px] text-error flex items-center justify-between gap-2 flex-shrink-0"
|
|
87
|
+
>
|
|
88
|
+
<span className="truncate" title={closeError}>
|
|
89
|
+
{closeError}
|
|
90
|
+
</span>
|
|
91
|
+
<button
|
|
92
|
+
type="button"
|
|
93
|
+
onClick={() => setCloseError(null)}
|
|
94
|
+
className="text-[10px] uppercase tracking-wide text-error/80 hover:text-error cursor-pointer flex-shrink-0"
|
|
95
|
+
>
|
|
96
|
+
Tutup
|
|
97
|
+
</button>
|
|
98
|
+
</div>
|
|
99
|
+
)}
|
|
100
|
+
|
|
57
101
|
<BrowserScreencast
|
|
58
102
|
status={status}
|
|
59
103
|
url={url}
|
|
@@ -62,6 +106,8 @@ export function BrowserPanel({ className = '', active = true }: BrowserPanelProp
|
|
|
62
106
|
frame={frame}
|
|
63
107
|
actions={actions}
|
|
64
108
|
onSelectTarget={selectTarget}
|
|
109
|
+
onCloseTarget={handleCloseTarget}
|
|
110
|
+
closingTarget={closing}
|
|
65
111
|
zoomLevel={zoomLevel}
|
|
66
112
|
/>
|
|
67
113
|
</div>
|