@kabmo-labs/kabmo 0.30.1 → 0.31.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +79 -21
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +481 -462
- package/dist/client/static/js/{index-bwhhehnh.js → index-r3bhgvkt.js} +772 -773
- package/marketplace/plugins/stats/package.json +2 -2
- package/marketplace/plugins/stats/src/format.test.ts +7 -1
- package/package.json +2 -2
- package/src/client/components/common/context-usage-button/McpSection.tsx +133 -0
- package/src/client/components/common/context-usage-button/Ring.tsx +12 -6
- package/src/client/components/common/context-usage-button/index.test.tsx +24 -13
- package/src/client/components/common/context-usage-button/index.tsx +32 -34
- package/src/client/components/common/session-row/TrailingSlot.tsx +6 -2
- package/src/client/components/common/session-row/session-row.test.tsx +13 -0
- package/src/client/components/layout/desktop-layout/index.tsx +5 -1
- package/src/client/components/mobile/RightSidebar.tsx +2 -1
- package/src/client/components/settings/categories/McpSettings.tsx +10 -3
- package/src/client/components/settings/categories/mcp-settings/AdvancedSection.tsx +244 -0
- package/src/client/components/settings/categories/mcp-settings/ConnectionTest.tsx +3 -3
- package/src/client/components/settings/categories/mcp-settings/DetailPane.tsx +55 -97
- package/src/client/components/settings/categories/mcp-settings/ImportModal.tsx +12 -64
- package/src/client/components/settings/categories/mcp-settings/{EnvVarsSection.tsx → KeyValueSection.tsx} +42 -24
- package/src/client/components/settings/categories/mcp-settings/SidebarList.tsx +1 -1
- package/src/client/components/settings/categories/mcp-settings/TransportSection.tsx +101 -0
- package/src/client/components/workspace/browser-panel/EngineNotice.test.tsx +109 -0
- package/src/client/components/workspace/browser-panel/EngineNotice.tsx +112 -0
- package/src/client/components/workspace/browser-panel/index.tsx +45 -12
- package/src/client/components/workspace/chat-timeline/chat-input/AccessDropdown.test.ts +63 -0
- package/src/client/components/workspace/chat-timeline/chat-input/AccessDropdown.tsx +18 -6
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/chat-input/access-levels.ts +39 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Eval.test.tsx +13 -7
- package/src/client/components/workspace/editor/plugin-rail.test.tsx +6 -1
- package/src/client/components/workspace/terminal-panel/scroll-hold.test.ts +20 -5
- package/src/client/data/settings/mcp.ts +4 -2
- package/src/client/data/settings/omp-schema.json +22 -2
- package/src/client/hooks/browser/use-browser-engine.ts +99 -0
- package/src/client/hooks/chat/context/mcp.ts +159 -0
- package/src/client/hooks/chat/timeline/access-mode.ts +45 -15
- package/src/client/hooks/chat/timeline/index.ts +7 -3
- package/src/client/hooks/chat/timeline/timeline-mode-state.test.ts +33 -4
- package/src/client/hooks/ui/ui-listeners.test.ts +13 -18
- package/src/server/lib/browser/engine.test.ts +118 -0
- package/src/server/lib/browser/engine.ts +102 -0
- package/src/server/lib/db/schema.ts +4 -0
- package/src/server/lib/fs/toolchain-path.test.ts +87 -0
- package/src/server/lib/fs/toolchain-path.ts +49 -0
- package/src/server/lib/harness/acp/protocol.ts +9 -1
- package/src/server/lib/harness/auto-probe.server.ts +3 -2
- package/src/server/lib/harness/launch-table.ts +3 -2
- package/src/server/lib/harness/spawn.server.ts +5 -1
- package/src/server/lib/harness/update-queue.server.ts +2 -1
- package/src/server/lib/harness/update-state.server.ts +6 -2
- package/src/server/lib/mcp/probe.server.ts +71 -0
- package/src/server/lib/mcp/registry.server.ts +195 -46
- package/src/server/lib/mcp/registry.test.ts +76 -4
- package/src/server/lib/mcp/schema.server.ts +35 -0
- package/src/server/lib/mcp/session-mcp.test.ts +164 -0
- package/src/server/lib/mcp/session-overlay.server.ts +152 -0
- package/src/server/lib/mcp/session-state.server.ts +75 -0
- package/src/server/lib/mcp/store.server.ts +6 -1
- package/src/server/lib/omp/config/config-cli.ts +4 -0
- package/src/server/lib/omp/config/mcp-and-cli.test.ts +12 -183
- package/src/server/lib/omp/config/mcp-config.test.ts +277 -0
- package/src/server/lib/omp/config/mcp-shared.ts +36 -0
- package/src/server/lib/omp/config/mcp-test-protocol.ts +89 -0
- package/src/server/lib/omp/config/mcp-test-remote.ts +167 -0
- package/src/server/lib/omp/config/mcp-test.ts +21 -123
- package/src/server/lib/omp/config/mcp-write.ts +179 -0
- package/src/server/lib/omp/config/mcp.ts +138 -118
- package/src/server/lib/omp/core/cli.ts +4 -14
- package/src/server/lib/omp/rpc/manager.ts +12 -17
- package/src/server/lib/omp/rpc/reload-mcp.ts +39 -0
- package/src/server/lib/omp/rpc/session-registry.ts +6 -2
- package/src/server/lib/omp/rpc/spawn-mcp.ts +43 -0
- package/src/server/lib/omp/session/delete.server.ts +7 -0
- package/src/server/lib/plugins/mcp.server.ts +2 -2
- package/src/server/lib/realtime/topics/workspace.server.test.ts +44 -0
- package/src/server/lib/realtime/topics/workspace.server.ts +3 -2
- package/src/server/routes/browser/engine.test.ts +70 -0
- package/src/server/routes/browser/engine.ts +51 -0
- package/src/server/routes/browser/index.ts +5 -0
- package/src/server/routes/fs/git.ts +4 -3
- package/src/server/routes/harness/versions.test.ts +5 -0
- package/src/server/routes/sessions/index.ts +7 -0
- package/src/server/routes/sessions/mcp.test.ts +154 -0
- package/src/server/routes/sessions/mcp.ts +202 -0
- package/src/server/routes/settings/mcp-test.ts +5 -4
- package/src/server/routes/settings/mcp.test.ts +42 -1
- package/src/server/routes/settings/mcp.ts +80 -24
- package/src/shared/lib/code/highlight-memo.test.ts +18 -0
- package/src/shared/lib/code/highlight-memo.ts +46 -17
- package/src/shared/lib/mcp/import.ts +112 -0
- package/src/shared/lib/mcp/item.ts +61 -0
- package/src/shared/lib/mcp/key-value.ts +37 -0
- package/src/shared/lib/mcp/mcp-lib.test.ts +119 -0
- package/src/shared/lib/mcp/status.test.ts +36 -0
- package/src/shared/lib/mcp/status.ts +38 -0
- package/src/shared/lib/models/client.ts +27 -6
- package/src/shared/lib/models/provider/models.test.ts +31 -0
- package/src/shared/lib/omp/config/access-mode.test.ts +73 -0
- package/src/shared/lib/omp/config/access-mode.ts +49 -0
- package/src/shared/lib/workspace/right-panels.ts +13 -0
- package/src/shared/lib/workspace/workspace-modules.test.ts +3 -1
- package/src/shared/types/browser.ts +21 -0
- package/src/shared/types/settings/mcp.ts +73 -4
- package/src/test-support/pristine-globals.test.ts +53 -0
- package/src/test-support/pristine-globals.ts +6 -1
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "stats",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.1",
|
|
4
4
|
"private": true,
|
|
5
5
|
"description": "CPU and RAM used by the omp stack — Kabmo, every omp child, the daemons and the shells.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"kabmo": {
|
|
8
8
|
"id": "stats",
|
|
9
9
|
"name": "Stats",
|
|
10
|
-
"version": "0.5.
|
|
10
|
+
"version": "0.5.1",
|
|
11
11
|
"description": "CPU and RAM used by the omp stack — Kabmo, every omp child, the daemons and the shells.",
|
|
12
12
|
"app": "dist/app.js",
|
|
13
13
|
"server": "dist/server.js",
|
|
@@ -76,7 +76,13 @@ describe('procProbe against this machine', () => {
|
|
|
76
76
|
expect(self?.rss).toBeGreaterThan(1024 * 1024);
|
|
77
77
|
const bunRss = process.memoryUsage().rss;
|
|
78
78
|
expect(self!.rss).toBeGreaterThan(bunRss * 0.5);
|
|
79
|
-
|
|
79
|
+
// 3×, not 2×: the two figures are not the same accounting. Bun's `rss`
|
|
80
|
+
// counts resident pages its own way and the kernel counts shared ones once,
|
|
81
|
+
// so a full `bun test` run measured the probe at 175.9 MB against 174.4 MB
|
|
82
|
+
// — a 0.9% overshoot that failed a 2× ceiling while both numbers were
|
|
83
|
+
// right. The PRECISION lives in the `ps` case below (a 25% band); this one
|
|
84
|
+
// only has to catch a units or offset error, which is off by ≥100×.
|
|
85
|
+
expect(self!.rss).toBeLessThan(bunRss * 3);
|
|
80
86
|
expect(self?.argv?.[0]).toContain('bun');
|
|
81
87
|
});
|
|
82
88
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kabmo-labs/kabmo",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.31.0",
|
|
4
4
|
"description": "Web console and diagnostic workbench for AI coding agents: Elysia + Preact on Bun.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Wijanarko Putra Rajeb <wijanarko.rajeb@gmail.com>",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"@codemirror/view": "6.43.15",
|
|
79
79
|
"@dskripchenko/drawio": "^0.1.0",
|
|
80
80
|
"@fontsource/fira-code": "^5.3.0",
|
|
81
|
-
"@kabmo-labs/kabmo-sdk": "0.
|
|
81
|
+
"@kabmo-labs/kabmo-sdk": "0.3.0",
|
|
82
82
|
"@kabmo-labs/kabmo-ui": "0.0.2",
|
|
83
83
|
"@shikijs/langs": "^4.4.3",
|
|
84
84
|
"@shikijs/themes": "^4.4.3",
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The MCP half of the context popover: the servers this session has, each with
|
|
8
|
+
* a switch that changes it for THIS session only, and an info control that
|
|
9
|
+
* runs a real handshake and states the result.
|
|
10
|
+
*
|
|
11
|
+
* The status is a PROBE, never a guess: omp publishes no MCP state over RPC, so
|
|
12
|
+
* "active" means the handshake answered and listed tools. The probe starts a
|
|
13
|
+
* second instance of the server, which is why it runs on the info control and
|
|
14
|
+
* not on mount.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
import { useState } from 'preact/hooks';
|
|
18
|
+
import { Info } from 'lucide-preact';
|
|
19
|
+
import { useSessionMcp } from '@/client/hooks/chat/context/mcp';
|
|
20
|
+
import { CHECKBOX_CLASS } from '@/client/components/common/checkbox/style';
|
|
21
|
+
import { mcpServerStatus, type McpServerStatus } from '@/shared/lib/mcp/status';
|
|
22
|
+
import type { SessionMcpServer } from '@/shared/types';
|
|
23
|
+
|
|
24
|
+
interface McpSectionProps {
|
|
25
|
+
sessionId: string | null;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
const STATUS_ICON_CLASS: Record<McpServerStatus, string> = {
|
|
29
|
+
active: 'text-success',
|
|
30
|
+
error: 'text-error',
|
|
31
|
+
checking: 'text-warning',
|
|
32
|
+
disabled: 'text-error',
|
|
33
|
+
unknown: 'text-warning',
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
function statusDetail(server: SessionMcpServer, status: McpServerStatus): string {
|
|
37
|
+
switch (status) {
|
|
38
|
+
case 'active':
|
|
39
|
+
return `Connected — ${server.probe?.toolCount ?? 0} tool${server.probe?.toolCount === 1 ? '' : 's'} in ${server.probe?.durationMs ?? 0}ms.`;
|
|
40
|
+
case 'error':
|
|
41
|
+
return `Failed — ${server.probe?.error ?? 'the handshake did not answer'}.`;
|
|
42
|
+
case 'checking':
|
|
43
|
+
return 'Checking the connection…';
|
|
44
|
+
case 'disabled':
|
|
45
|
+
return 'Disabled for this session.';
|
|
46
|
+
default:
|
|
47
|
+
return 'Not checked yet — click the icon to test the connection.';
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
export function McpSection({ sessionId }: McpSectionProps) {
|
|
52
|
+
const { servers, delivery, loading, error, pending, checking, toggle, probe } = useSessionMcp(sessionId);
|
|
53
|
+
const [expanded, setExpanded] = useState<string | null>(null);
|
|
54
|
+
const enabledCount = servers.filter((server) => server.enabled).length;
|
|
55
|
+
|
|
56
|
+
return (
|
|
57
|
+
<div className="pt-2 mt-2 border-t border-ink/10">
|
|
58
|
+
<div className="font-semibold text-ink font-sans pb-1.5 flex items-center justify-between">
|
|
59
|
+
<span>MCP</span>
|
|
60
|
+
{servers.length > 0 && (
|
|
61
|
+
<span className="text-[10px] text-ink/50 font-mono">
|
|
62
|
+
{enabledCount}/{servers.length}
|
|
63
|
+
</span>
|
|
64
|
+
)}
|
|
65
|
+
</div>
|
|
66
|
+
|
|
67
|
+
{loading && <div className="text-[11px] text-ink/50 italic font-sans">Loading…</div>}
|
|
68
|
+
{error && <div className="text-[11px] text-error font-sans">{error}</div>}
|
|
69
|
+
{!loading && !error && servers.length === 0 && (
|
|
70
|
+
<div className="text-[11px] text-ink/50 italic font-sans">No MCP servers</div>
|
|
71
|
+
)}
|
|
72
|
+
|
|
73
|
+
{servers.length > 0 && (
|
|
74
|
+
<ul className="space-y-0.5">
|
|
75
|
+
{servers.map((server) => {
|
|
76
|
+
const status = mcpServerStatus({
|
|
77
|
+
enabled: server.enabled,
|
|
78
|
+
checking: checking === server.name,
|
|
79
|
+
probe: server.probe,
|
|
80
|
+
});
|
|
81
|
+
return (
|
|
82
|
+
<li key={server.name}>
|
|
83
|
+
<div className="flex items-center gap-2 py-0.5 rounded hover:bg-ink/5">
|
|
84
|
+
<label
|
|
85
|
+
className="flex items-center gap-2 min-w-0 flex-1 cursor-pointer"
|
|
86
|
+
title={`${server.name} (${server.source}, ${server.transport})`}
|
|
87
|
+
>
|
|
88
|
+
<input
|
|
89
|
+
type="checkbox"
|
|
90
|
+
checked={server.enabled}
|
|
91
|
+
disabled={pending === server.name}
|
|
92
|
+
onChange={(event) => void toggle(server.name, event.currentTarget.checked)}
|
|
93
|
+
aria-label={`${server.enabled ? 'Disable' : 'Enable'} ${server.name} for this session`}
|
|
94
|
+
className={`${CHECKBOX_CLASS} size-3.5 flex-shrink-0`}
|
|
95
|
+
/>
|
|
96
|
+
<span
|
|
97
|
+
className={`truncate font-sans ${server.enabled ? 'text-ink/80' : 'text-ink/40 line-through'}`}
|
|
98
|
+
>
|
|
99
|
+
{server.name}
|
|
100
|
+
</span>
|
|
101
|
+
</label>
|
|
102
|
+
<span className="text-[9px] uppercase tracking-wide text-ink/40 flex-shrink-0">
|
|
103
|
+
{server.transport}
|
|
104
|
+
</span>
|
|
105
|
+
<button
|
|
106
|
+
type="button"
|
|
107
|
+
onClick={() => {
|
|
108
|
+
setExpanded((current) => (current === server.name ? null : server.name));
|
|
109
|
+
if (server.enabled && checking !== server.name) void probe(server.name);
|
|
110
|
+
}}
|
|
111
|
+
className={`flex-shrink-0 cursor-pointer ${STATUS_ICON_CLASS[status]}`}
|
|
112
|
+
title={statusDetail(server, status)}
|
|
113
|
+
aria-label={`${server.name} status: ${status}`}
|
|
114
|
+
aria-expanded={expanded === server.name}
|
|
115
|
+
>
|
|
116
|
+
<Info size={12} />
|
|
117
|
+
</button>
|
|
118
|
+
</div>
|
|
119
|
+
{expanded === server.name && (
|
|
120
|
+
<div className="pl-5 pb-1 text-[10px] text-ink/60 font-sans">{statusDetail(server, status)}</div>
|
|
121
|
+
)}
|
|
122
|
+
</li>
|
|
123
|
+
);
|
|
124
|
+
})}
|
|
125
|
+
</ul>
|
|
126
|
+
)}
|
|
127
|
+
|
|
128
|
+
{delivery === 'omp-config' && servers.length > 0 && (
|
|
129
|
+
<div className="pt-1.5 text-[10px] text-ink/40 font-sans">Applies to this session only.</div>
|
|
130
|
+
)}
|
|
131
|
+
</div>
|
|
132
|
+
);
|
|
133
|
+
}
|
|
@@ -43,11 +43,17 @@
|
|
|
43
43
|
* and the green arc is too narrow for one value to clear 3:1 against both.
|
|
44
44
|
*
|
|
45
45
|
* So the weight follows the arc. While an arc is drawn the track steps back to
|
|
46
|
-
* `/
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
* the
|
|
50
|
-
*
|
|
46
|
+
* `/25`. The objective is the ARC's contrast, not the track's: the arc is the
|
|
47
|
+
* information, the track is the ground it is read against, so the rung is the
|
|
48
|
+
* lightest one that still reads as a ring. `/35` — the previous value — was
|
|
49
|
+
* chosen to maximise the WORSE of (track vs paper, track vs arc), which kept
|
|
50
|
+
* the track visible but left the arc at **2.31:1** on `paper`: the same
|
|
51
|
+
* "terlalu gelap, hijau ndak kelihatan" report, one rung later. `/25` lifts the
|
|
52
|
+
* arc to **2.98:1** on `paper` (worst light 2.58:1 on `flexoki-light`, worst
|
|
53
|
+
* dark 2.21:1 on `fields-of-the-shire-dark`) while the track still reads as a
|
|
54
|
+
* ring — 1.73:1 on `paper`, 1.38:1 worst case on `solarized-light`. `/20` buys
|
|
55
|
+
* the arc another 0.37:1 but drops the track under 1.5:1 on 25 of the 63
|
|
56
|
+
* palettes, which is a ring that looks like a floating arc.
|
|
51
57
|
*/
|
|
52
58
|
|
|
53
59
|
import { CONTEXT_BAND_TONES, contextRingGeometry, contextUsageBand } from '@/shared/lib/chat/context/usage';
|
|
@@ -56,7 +62,7 @@ import { CONTEXT_BAND_TONES, contextRingGeometry, contextUsageBand } from '@/sha
|
|
|
56
62
|
const EMPTY_TRACK = 'text-ink/75';
|
|
57
63
|
|
|
58
64
|
/** The track under an arc: quiet enough that the band colour stays the signal. */
|
|
59
|
-
const FILLED_TRACK = 'text-ink/
|
|
65
|
+
const FILLED_TRACK = 'text-ink/25';
|
|
60
66
|
|
|
61
67
|
interface ContextRingProps {
|
|
62
68
|
percent: number;
|
|
@@ -94,6 +94,15 @@ function trigger(): HTMLElement {
|
|
|
94
94
|
return container.querySelector('button[aria-label="Context usage"]') as HTMLElement;
|
|
95
95
|
}
|
|
96
96
|
|
|
97
|
+
/**
|
|
98
|
+
* The popover, which lives in `document.body` — `AnchoredMenu` portals it there
|
|
99
|
+
* so the header's `z-20` stacking context cannot trap it under the timeline's
|
|
100
|
+
* floating controls. Querying `container` would find nothing.
|
|
101
|
+
*/
|
|
102
|
+
function dialog(): HTMLElement | null {
|
|
103
|
+
return document.querySelector('[role="dialog"][aria-label="Context usage"]');
|
|
104
|
+
}
|
|
105
|
+
|
|
97
106
|
async function mount(snapshot: SessionContextTelemetry): Promise<void> {
|
|
98
107
|
telemetry = snapshot;
|
|
99
108
|
// `/api/models` is cached for 60s in MODULE state, shared by every suite in
|
|
@@ -169,7 +178,9 @@ describe('ContextUsageButton', () => {
|
|
|
169
178
|
// dark mode (1.39:1 on the glass chrome), so it takes `/75` — the first rung
|
|
170
179
|
// clearing 3:1 on all 63 palettes. At `/75` a FILLED ring's track sat on the
|
|
171
180
|
// arc's own luminance (1.04:1 worst case on light), which is "warna hijau
|
|
172
|
-
// ndak kelihatan", so it steps back to `/
|
|
181
|
+
// ndak kelihatan", so it steps back to `/25` once there is an arc to read:
|
|
182
|
+
// the arc is the information, and `/25` is the lightest rung that still
|
|
183
|
+
// reads as a ring (2.98:1 arc on `paper`, 1.73:1 track on `paper`).
|
|
173
184
|
await mount(telemetryAt(0));
|
|
174
185
|
expect(container.querySelectorAll('svg circle')[0].getAttribute('class')).toBe('text-ink/75');
|
|
175
186
|
|
|
@@ -177,27 +188,27 @@ describe('ContextUsageButton', () => {
|
|
|
177
188
|
resetRealtimeClient();
|
|
178
189
|
server.stop();
|
|
179
190
|
await mount(telemetryAt(42));
|
|
180
|
-
expect(container.querySelectorAll('svg circle')[0].getAttribute('class')).toBe('text-ink/
|
|
191
|
+
expect(container.querySelectorAll('svg circle')[0].getAttribute('class')).toBe('text-ink/25');
|
|
181
192
|
});
|
|
182
193
|
|
|
183
194
|
test('the popover prints the session numbers, and Escape closes it', async () => {
|
|
184
195
|
await mount(telemetryAt(42));
|
|
185
|
-
expect(
|
|
196
|
+
expect(dialog()).toBeNull();
|
|
186
197
|
|
|
187
198
|
await act(async () => {
|
|
188
199
|
trigger().click();
|
|
189
200
|
});
|
|
190
|
-
const
|
|
191
|
-
expect(
|
|
192
|
-
expect(
|
|
193
|
-
expect(
|
|
194
|
-
expect(
|
|
195
|
-
expect(
|
|
201
|
+
const panel = dialog();
|
|
202
|
+
expect(panel).not.toBeNull();
|
|
203
|
+
expect(panel?.textContent).toContain('Kenari');
|
|
204
|
+
expect(panel?.textContent).toContain('DeepSeek V4-1-Flash');
|
|
205
|
+
expect(panel?.textContent).toContain('42%');
|
|
206
|
+
expect(panel?.textContent).toContain('$0.02');
|
|
196
207
|
|
|
197
208
|
await act(async () => {
|
|
198
209
|
document.dispatchEvent(new window.KeyboardEvent('keydown', { key: 'Escape' }));
|
|
199
210
|
});
|
|
200
|
-
expect(
|
|
211
|
+
expect(dialog()).toBeNull();
|
|
201
212
|
});
|
|
202
213
|
|
|
203
214
|
test('a session with no turn says so instead of printing zeros', async () => {
|
|
@@ -206,8 +217,8 @@ describe('ContextUsageButton', () => {
|
|
|
206
217
|
await act(async () => {
|
|
207
218
|
trigger().click();
|
|
208
219
|
});
|
|
209
|
-
const
|
|
210
|
-
expect(
|
|
211
|
-
expect(
|
|
220
|
+
const panel = dialog();
|
|
221
|
+
expect(panel?.textContent).toContain('Session not started');
|
|
222
|
+
expect(panel?.textContent).not.toContain('Cost:');
|
|
212
223
|
});
|
|
213
224
|
});
|
|
@@ -17,11 +17,22 @@
|
|
|
17
17
|
* The popover is pinned to the viewport on the phone and anchored under the
|
|
18
18
|
* trigger on the desktop; that is the only difference between the two, and it is
|
|
19
19
|
* a prop rather than two components.
|
|
20
|
+
*
|
|
21
|
+
* The panel is drawn by `common/anchored-menu/` — portalled into `document.body`
|
|
22
|
+
* at `z-[70]`. It used to be a `fixed z-50` child of the header, and BOTH headers
|
|
23
|
+
* are flex items at `z-20`: a `z-50` inside that stacking context is still
|
|
24
|
+
* `z-20` against its siblings, so the phone's floating "jump to your message"
|
|
25
|
+
* button (a `z-20` later in the DOM, sitting exactly where this panel opens)
|
|
26
|
+
* painted over the panel's header and first rows. Raising the panel's own number
|
|
27
|
+
* cannot help; the number that decides is the ANCESTOR's. Same defect, same
|
|
28
|
+
* remedy, as `common/server-control/Panel.tsx`.
|
|
20
29
|
*/
|
|
21
30
|
|
|
22
|
-
import {
|
|
31
|
+
import { useCallback, useMemo, useRef, useState } from 'preact/hooks';
|
|
23
32
|
import type { TargetedMouseEvent } from 'preact';
|
|
24
|
-
import {
|
|
33
|
+
import { AnchoredMenu } from '@/client/components/common/anchored-menu';
|
|
34
|
+
import { anchorRectOf } from '@/shared/lib/ui/menu-anchor';
|
|
35
|
+
import { mobileOverlayStyle } from '@/shared/lib/ui/mobile-overlay';
|
|
25
36
|
import { useSessionContextTelemetry } from '@/client/hooks/chat/context/telemetry';
|
|
26
37
|
import { useModelNames } from '@/client/hooks/models/use-model-names';
|
|
27
38
|
import { useProviderNames } from '@/client/hooks/models/use-provider-names';
|
|
@@ -29,6 +40,7 @@ import { providerLabel } from '@/shared/lib/models/provider/label';
|
|
|
29
40
|
import { formatCompactTokens } from '@/shared/lib/format/number';
|
|
30
41
|
import { CONTEXT_BAND_TONES, contextUsageBand } from '@/shared/lib/chat/context/usage';
|
|
31
42
|
import { ContextRing } from '@/client/components/common/context-usage-button/Ring';
|
|
43
|
+
import { McpSection } from '@/client/components/common/context-usage-button/McpSection';
|
|
32
44
|
import { CONTROL_BOX } from '@/client/lib/ui/control-plate';
|
|
33
45
|
|
|
34
46
|
interface ContextUsageButtonProps {
|
|
@@ -40,19 +52,10 @@ interface ContextUsageButtonProps {
|
|
|
40
52
|
export function ContextUsageButton({ sessionId, layout = 'desktop' }: ContextUsageButtonProps) {
|
|
41
53
|
const { telemetry, percent } = useSessionContextTelemetry(sessionId);
|
|
42
54
|
const [open, setOpen] = useState(false);
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
// that can only be dismissed by clicking elsewhere is a trap on a keyboard.
|
|
48
|
-
useEffect(() => {
|
|
49
|
-
if (!open) return;
|
|
50
|
-
const onKeyDown = (event: globalThis.KeyboardEvent) => {
|
|
51
|
-
if (event.key === 'Escape') setOpen(false);
|
|
52
|
-
};
|
|
53
|
-
document.addEventListener('keydown', onKeyDown);
|
|
54
|
-
return () => document.removeEventListener('keydown', onKeyDown);
|
|
55
|
-
}, [open]);
|
|
55
|
+
// The desktop panel hangs off the trigger's measured rectangle; the phone's is
|
|
56
|
+
// pinned to the viewport by `mobileOverlayStyle`, so it passes no anchor.
|
|
57
|
+
const triggerRef = useRef<HTMLButtonElement>(null);
|
|
58
|
+
const close = useCallback(() => setOpen(false), []);
|
|
56
59
|
|
|
57
60
|
// The telemetry reports the model as `provider/modelId` (omp's own selector).
|
|
58
61
|
// Split once here so the popover prints the provider and the model on separate
|
|
@@ -78,8 +81,9 @@ export function ContextUsageButton({ sessionId, layout = 'desktop' }: ContextUsa
|
|
|
78
81
|
: `${CONTROL_BOX.desktop} hover:bg-ink/10 transition-colors cursor-pointer`;
|
|
79
82
|
|
|
80
83
|
return (
|
|
81
|
-
|
|
84
|
+
<>
|
|
82
85
|
<button
|
|
86
|
+
ref={triggerRef}
|
|
83
87
|
type="button"
|
|
84
88
|
onClick={(event: TargetedMouseEvent<HTMLElement>) => {
|
|
85
89
|
event.stopPropagation();
|
|
@@ -97,23 +101,13 @@ export function ContextUsageButton({ sessionId, layout = 'desktop' }: ContextUsa
|
|
|
97
101
|
</button>
|
|
98
102
|
|
|
99
103
|
{open && (
|
|
100
|
-
<
|
|
104
|
+
<AnchoredMenu
|
|
105
|
+
anchor={layout === 'desktop' && triggerRef.current ? anchorRectOf(triggerRef.current) : null}
|
|
106
|
+
viewportStyle={layout === 'mobile' ? mobileOverlayStyle() : undefined}
|
|
101
107
|
role="dialog"
|
|
102
|
-
|
|
103
|
-
className={
|
|
104
|
-
|
|
105
|
-
? 'glass-popover fixed z-50 bg-paper border border-ink/20 rounded-xl shadow-xl p-3 text-xs font-mono'
|
|
106
|
-
: 'glass-popover absolute right-0 top-full z-50 mt-2 w-56 bg-paper border border-ink/20 rounded-xl shadow-xl p-3 text-xs font-mono'
|
|
107
|
-
}
|
|
108
|
-
style={
|
|
109
|
-
layout === 'mobile'
|
|
110
|
-
? {
|
|
111
|
-
top: 'calc(3.5rem + env(safe-area-inset-top, 0px) + 0.375rem)',
|
|
112
|
-
right: 'max(0.75rem, env(safe-area-inset-right, 0px))',
|
|
113
|
-
width: '14rem',
|
|
114
|
-
}
|
|
115
|
-
: undefined
|
|
116
|
-
}
|
|
108
|
+
ariaLabel="Context usage"
|
|
109
|
+
className={`bg-paper border border-ink/20 rounded-xl shadow-xl p-3 text-xs font-mono ${layout === 'desktop' ? 'w-72' : ''}`}
|
|
110
|
+
onClose={close}
|
|
117
111
|
>
|
|
118
112
|
<div className="font-semibold text-ink font-sans pb-1.5 border-b border-ink/10 flex items-center justify-between">
|
|
119
113
|
<span>Context</span>
|
|
@@ -155,8 +149,12 @@ export function ContextUsageButton({ sessionId, layout = 'desktop' }: ContextUsa
|
|
|
155
149
|
)}
|
|
156
150
|
</div>
|
|
157
151
|
)}
|
|
158
|
-
|
|
152
|
+
{/* The session's MCP servers, below the context numbers: one popover
|
|
153
|
+
for "what this chat is running with", and the switch is per
|
|
154
|
+
session because the list is a spawn property. */}
|
|
155
|
+
<McpSection sessionId={sessionId} />
|
|
156
|
+
</AnchoredMenu>
|
|
159
157
|
)}
|
|
160
|
-
|
|
158
|
+
</>
|
|
161
159
|
);
|
|
162
160
|
}
|
|
@@ -70,10 +70,14 @@ export function TrailingSlot({ timeAgo, timeTitle, onOpenMenu, menuOpen = false,
|
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
return (
|
|
73
|
-
|
|
73
|
+
// The box is as wide as the age, never a fixed 32px: `12 Sep` is 36px at
|
|
74
|
+
// 10px mono, and a fixed box wrapped it into two lines (`12` / `Sep`).
|
|
75
|
+
// `min-w-8` keeps the 22px trigger's box inside the column, and the age
|
|
76
|
+
// stays in flow so the title truncates before it instead of under it.
|
|
77
|
+
<span className="relative ml-2 flex h-4 min-w-8 shrink-0 items-center justify-end pr-1">
|
|
74
78
|
{timeAgo && (
|
|
75
79
|
<span
|
|
76
|
-
className="
|
|
80
|
+
className="whitespace-nowrap font-mono text-[10px] leading-none text-ink/40 transition-opacity group-hover/item:opacity-0 group-focus-within/item:opacity-0"
|
|
77
81
|
title={timeTitle ?? undefined}
|
|
78
82
|
>
|
|
79
83
|
{timeAgo}
|
|
@@ -138,6 +138,19 @@ describe('modern session row', () => {
|
|
|
138
138
|
expect(age?.textContent).toBe('3w');
|
|
139
139
|
});
|
|
140
140
|
|
|
141
|
+
test('a dated age stays on one line and the column grows to fit it', async () => {
|
|
142
|
+
// `12 Sep` is 36px at 10px mono. The old fixed `w-8` box (32px) wrapped it
|
|
143
|
+
// into `12` / `Sep`; the age must never wrap, and the box must be able to
|
|
144
|
+
// grow past the trigger's 22px while still reserving it.
|
|
145
|
+
const el = await mount({ timeAgo: '12 Sep', onRename: () => {} });
|
|
146
|
+
const age = el.querySelector('span.font-mono');
|
|
147
|
+
expect(age?.textContent).toBe('12 Sep');
|
|
148
|
+
expect(age?.className ?? '').toContain('whitespace-nowrap');
|
|
149
|
+
const box = age?.parentElement;
|
|
150
|
+
expect(box?.className ?? '').toContain('min-w-8');
|
|
151
|
+
expect(box?.className.split(/\s+/)).not.toContain('w-8');
|
|
152
|
+
});
|
|
153
|
+
|
|
141
154
|
test('batch mode swaps the status slot for the checkbox', async () => {
|
|
142
155
|
const el = await mount({ selectable: true, selected: true, status: 'stream' });
|
|
143
156
|
expect(el.querySelector('input[type="checkbox"]')).not.toBeNull();
|
|
@@ -17,6 +17,7 @@ import { useSidebarData } from '@/client/hooks/chat/omp/session-list';
|
|
|
17
17
|
import { MIN_LEFT_PANEL_WIDTH } from '@/shared/lib/workspace/sidebar-width';
|
|
18
18
|
import { MIN_LEFT_DOCK_PLUGIN_WIDTH } from '@/shared/lib/workspace/left-dock-width';
|
|
19
19
|
import { SESSIONS_VIEW_ID } from '@/shared/lib/workspace/left-dock';
|
|
20
|
+
import { DEFAULT_RIGHT_PANEL_TYPE } from '@/shared/lib/workspace/right-panels';
|
|
20
21
|
import { useOpenPanelRequest } from '@/client/hooks/workspace/open-panel';
|
|
21
22
|
import { useLeftDock, useLeftDockWidth } from '@/client/hooks/workspace/left-dock';
|
|
22
23
|
import { useEditorViewLayout } from '@/client/hooks/workspace/editor-view';
|
|
@@ -40,7 +41,10 @@ interface DesktopLayoutProps {
|
|
|
40
41
|
export function DesktopLayout({ sessionId, onSwitchToMobile, appSettings = {} }: DesktopLayoutProps) {
|
|
41
42
|
const { folders, isMock } = useSidebarData();
|
|
42
43
|
const [showRightPanel, setShowRightPanel] = useSessionState<boolean>('layout.showRightPanel', appSettings.showRightPanel ?? true);
|
|
43
|
-
|
|
44
|
+
// A new session opens Files. Deliberately NOT `appSettings.activeRightPanel`:
|
|
45
|
+
// pre-per-session builds stored that key globally, so reading it back made
|
|
46
|
+
// every new chat open whichever panel was last picked in any other session.
|
|
47
|
+
const [activeRightPanel, setActiveRightPanel] = useSessionState<string>('layout.activeRightPanel', DEFAULT_RIGHT_PANEL_TYPE);
|
|
44
48
|
const [showLeftPanel, setShowLeftPanel] = useSessionState<boolean>('layout.showLeftPanel', appSettings.showLeftPanel ?? true);
|
|
45
49
|
const [activeLeftView, setActiveLeftView] = useSessionState<string>('layout.activeLeftPanel', SESSIONS_VIEW_ID);
|
|
46
50
|
// Which plugin panel, if any, owns the editor column. Per session, like every
|
|
@@ -8,6 +8,7 @@ import { useSharedSessionState } from '@/client/hooks/workspace/session-state';
|
|
|
8
8
|
import { useLeftDock } from '@/client/hooks/workspace/left-dock';
|
|
9
9
|
import { SESSIONS_VIEW_ID } from '@/shared/lib/workspace/left-dock';
|
|
10
10
|
import { phoneRightPanels } from '@/shared/lib/workspace/mobile-dock';
|
|
11
|
+
import { DEFAULT_RIGHT_PANEL_TYPE } from '@/shared/lib/workspace/right-panels';
|
|
11
12
|
import { PanelChips } from '@/client/components/mobile/panel-chips';
|
|
12
13
|
import { titlebarPaddingLeft, titlebarPaddingRight } from '@/shared/lib/ui/titlebar';
|
|
13
14
|
import { dragRegionProps, titlebarInsetLeft } from '@/client/lib/desktop/titlebar';
|
|
@@ -46,7 +47,7 @@ export function MobileRightSidebar({
|
|
|
46
47
|
// back on the Search view re-ran a query that can hold thousands of hits, and
|
|
47
48
|
// the user never asked for a search. Restoring the tab they left also keeps
|
|
48
49
|
// the phone and the desktop on the same view.
|
|
49
|
-
const [activeTab, setActiveTab] = useSharedSessionState<string>('layout.mobileRightPanel',
|
|
50
|
+
const [activeTab, setActiveTab] = useSharedSessionState<string>('layout.mobileRightPanel', DEFAULT_RIGHT_PANEL_TYPE);
|
|
50
51
|
// ONE catalog, the same one the desktop bars read, and deliberately `all`:
|
|
51
52
|
// a phone has ONE drawer, so a plugin panel the user placed on the left must
|
|
52
53
|
// stay reachable here — reading only the right column would make placing a
|
|
@@ -64,16 +64,23 @@ export const McpSettings: FunctionComponent<McpSettingsProps> = () => {
|
|
|
64
64
|
},
|
|
65
65
|
});
|
|
66
66
|
|
|
67
|
-
const
|
|
67
|
+
const handleImportServers = async (imported: McpServerItem[]): Promise<WriteOutcome> => {
|
|
68
|
+
for (const server of imported) {
|
|
69
|
+
const outcome = await save(server);
|
|
70
|
+
if (!outcome.ok) return outcome;
|
|
71
|
+
}
|
|
72
|
+
return { ok: true };
|
|
73
|
+
};
|
|
68
74
|
|
|
69
75
|
const emptyServerTemplate: McpServerItem = {
|
|
70
76
|
id: `new-${Date.now()}`,
|
|
71
77
|
name: 'new-mcp-server',
|
|
72
78
|
scope: 'every-project',
|
|
73
79
|
enabled: true,
|
|
74
|
-
|
|
80
|
+
transport: 'stdio',
|
|
75
81
|
commandArgs: ['bunx', '@modelcontextprotocol/server-everything'],
|
|
76
82
|
envVars: [],
|
|
83
|
+
headers: [],
|
|
77
84
|
status: 'active',
|
|
78
85
|
};
|
|
79
86
|
|
|
@@ -135,7 +142,7 @@ export const McpSettings: FunctionComponent<McpSettingsProps> = () => {
|
|
|
135
142
|
<McpImportModal
|
|
136
143
|
isOpen={isImportModalOpen}
|
|
137
144
|
onClose={() => setIsImportModalOpen(false)}
|
|
138
|
-
onImport={
|
|
145
|
+
onImport={handleImportServers}
|
|
139
146
|
/>
|
|
140
147
|
</div>
|
|
141
148
|
);
|