@kabmo-labs/kabmo 0.28.0 → 0.30.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/bunfig.toml +6 -0
- package/dist/client/index.html +2 -2
- package/dist/client/index.js +481 -472
- package/dist/client/static/js/{index-xzvyrxya.js → index-5vjbp04s.js} +1193 -1049
- package/dist/client/static/js/index-naa91727.css +1 -0
- package/dist/client/static/{manifest-q6h8k9e0.webmanifest → manifest-vdvdqpre.webmanifest} +1 -0
- package/package.json +3 -2
- package/public/manifest.webmanifest +1 -0
- package/src/client/components/common/ComposerTextarea.test.tsx +109 -0
- package/src/client/components/common/ComposerTextarea.tsx +6 -0
- package/src/client/components/common/ReloadPageButton.test.tsx +14 -0
- package/src/client/components/common/ReloadPageButton.tsx +11 -2
- package/src/client/components/common/diagram-viewer/read-block.test.ts +71 -0
- package/src/client/components/common/diagram-viewer/read-block.ts +40 -16
- package/src/client/components/common/file-icon/index.tsx +7 -1
- package/src/client/components/common/harness-glyph/brands.ts +7 -1
- package/src/client/components/common/image-viewer/index.tsx +37 -165
- package/src/client/components/common/picker-search/index.tsx +70 -0
- package/src/client/components/common/search-select/index.tsx +2 -7
- package/src/client/components/common/zoom-pan-stage/index.tsx +258 -0
- package/src/client/components/common/zoom-pan-stage/zoom-pan-stage.test.tsx +87 -0
- package/src/client/components/layout/session-sidebar/ClassicView.tsx +1 -1
- package/src/client/components/layout/session-sidebar/SessionListNotice.tsx +7 -3
- package/src/client/components/layout/session-sidebar/about-modal/HarnessRow.tsx +4 -1
- package/src/client/components/layout/session-sidebar/about-modal/HarnessTable.tsx +12 -1
- package/src/client/components/layout/session-sidebar/about-modal/UpdateLogLine.test.tsx +82 -0
- package/src/client/components/layout/session-sidebar/about-modal/UpdateLogLine.tsx +23 -3
- package/src/client/components/layout/session-sidebar/about-modal/index.tsx +1 -0
- package/src/client/components/layout/session-sidebar/modern/index.tsx +1 -1
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskList.tsx +6 -4
- package/src/client/components/layout/session-sidebar/session-list-states.test.tsx +8 -0
- package/src/client/components/mobile/mobile-right-sidebar/EditorSurface.tsx +25 -0
- package/src/client/components/mobile/mobile-session-sidebar/ClassicDrawer.tsx +1 -1
- package/src/client/components/settings/Sidebar.tsx +6 -8
- package/src/client/components/settings/categories/HarnessSettings.tsx +4 -2
- package/src/client/components/settings/categories/PanelPluginSettings.tsx +2 -2
- package/src/client/components/settings/categories/PluginSettings.tsx +1 -1
- package/src/client/components/settings/categories/harness-settings/ConfigForm.tsx +3 -6
- package/src/client/components/settings/categories/panel-plugins/GitFreshness.test.tsx +36 -0
- package/src/client/components/settings/categories/panel-plugins/Section.tsx +1 -3
- package/src/client/components/settings/categories/panel-plugins/Toolbar.tsx +18 -4
- package/src/client/components/settings/categories/plugin-settings/MarketplacePane.tsx +64 -61
- package/src/client/components/settings/categories/plugin-settings/SidebarList.tsx +15 -4
- package/src/client/components/settings/groups.test.tsx +2 -2
- package/src/client/components/workspace/chat-timeline/IrcNotice.test.tsx +55 -0
- package/src/client/components/workspace/chat-timeline/IrcNotice.tsx +71 -0
- package/src/client/components/workspace/chat-timeline/MessageItem.tsx +4 -1
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.test.ts +19 -0
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +8 -3
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.search.test.tsx +72 -0
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.tsx +42 -15
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.test.tsx +28 -0
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.tsx +28 -10
- package/src/client/components/workspace/chat-timeline/target-picker/WorkspacePicker.test.tsx +47 -1
- package/src/client/components/workspace/chat-timeline/target-picker/WorkspacePicker.tsx +55 -5
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Wait.tsx +3 -2
- package/src/client/components/workspace/editor/FilePane.tsx +32 -0
- package/src/client/components/workspace/editor/Toolbar.tsx +4 -0
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +1 -0
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +5 -2
- package/src/client/components/workspace/editor/viewers/CsvGrid.tsx +52 -5
- package/src/client/components/workspace/editor/viewers/DataGrid.tsx +227 -41
- package/src/client/components/workspace/editor/viewers/DrawioView.tsx +93 -0
- package/src/client/components/workspace/editor/viewers/GridRow.tsx +91 -0
- package/src/client/components/workspace/editor/viewers/GridToolbar.tsx +53 -0
- package/src/client/components/workspace/editor/viewers/SheetView.tsx +152 -57
- package/src/client/components/workspace/editor/viewers/dispatch.tsx +42 -9
- package/src/client/components/workspace/editor/viewers/drawio-pages.test.ts +80 -0
- package/src/client/components/workspace/editor/viewers/drawio-pages.ts +63 -0
- package/src/client/components/workspace/editor/viewers/grid.test.ts +296 -0
- package/src/client/components/workspace/editor/viewers/use-cell-edit.ts +64 -0
- package/src/client/components/workspace/editor/viewers/use-grid-interaction.ts +216 -0
- package/src/client/components/workspace/editor/viewers/viewers.test.ts +47 -2
- package/src/client/components/workspace/editor/viewers/workbook.ts +149 -0
- package/src/client/components/workspace/file-explorer/ArchiveModals.tsx +262 -0
- package/src/client/components/workspace/file-explorer/ContextMenu.tsx +30 -6
- package/src/client/components/workspace/file-explorer/Modals.tsx +8 -3
- package/src/client/components/workspace/file-explorer/RootOverlays.tsx +60 -0
- package/src/client/components/workspace/file-explorer/RowLabel.tsx +6 -2
- package/src/client/components/workspace/file-explorer/TreeItem.tsx +39 -49
- package/src/client/components/workspace/file-explorer/TreeItemModals.tsx +80 -0
- package/src/client/components/workspace/file-explorer/index.tsx +53 -29
- package/src/client/components/workspace/file-explorer/selection.test.tsx +109 -0
- package/src/client/data/settings/omp-schema.json +169 -22
- package/src/client/glass-palette.test.ts +72 -0
- package/src/client/glass.css +39 -14
- package/src/client/glass.test.ts +28 -67
- package/src/client/hooks/chat/composer/history.test.ts +267 -0
- package/src/client/hooks/chat/composer/history.ts +146 -0
- package/src/client/hooks/chat/timeline/ask-frames.test.ts +54 -0
- package/src/client/hooks/chat/timeline/ask-frames.ts +29 -1
- package/src/client/hooks/chat/timeline/timeline-rail.test.ts +34 -2
- package/src/client/hooks/chat/timeline/user-turns.ts +31 -2
- package/src/client/hooks/editor/file-editor-types.ts +15 -0
- package/src/client/hooks/editor/save-bytes.ts +79 -0
- package/src/client/hooks/editor/use-dirty-tracking.test.ts +73 -0
- package/src/client/hooks/editor/use-dirty-tracking.ts +96 -0
- package/src/client/hooks/editor/use-file-cache.ts +1 -0
- package/src/client/hooks/editor/use-file-editor.test.ts +30 -0
- package/src/client/hooks/editor/use-file-editor.ts +20 -17
- package/src/client/hooks/editor/use-file-read.ts +21 -2
- package/src/client/hooks/editor/use-grid-selection.ts +160 -0
- package/src/client/hooks/models/use-harness-update.test.ts +35 -2
- package/src/client/hooks/models/use-harness-update.ts +49 -10
- package/src/client/hooks/workspace/diff-file.test.ts +72 -0
- package/src/client/hooks/workspace/diff-file.ts +12 -6
- package/src/client/hooks/workspace/file-archive.ts +220 -0
- package/src/client/hooks/workspace/file-clipboard.test.ts +4 -4
- package/src/client/hooks/workspace/file-clipboard.ts +37 -26
- package/src/client/hooks/workspace/file-selection.test.ts +67 -0
- package/src/client/hooks/workspace/file-selection.ts +156 -0
- package/src/client/hooks/workspace/file-tree-actions-clipboard.test.ts +5 -5
- package/src/client/hooks/workspace/file-tree-actions.ts +36 -8
- package/src/client/lib/editor/workbook-drafts.ts +42 -0
- package/src/client/lib/launch/file-handlers.ts +2 -2
- package/src/client/lib/scrollbar-activity.test.ts +21 -88
- package/src/client/lib/scrollbar-activity.ts +71 -73
- package/src/client/lib/scrollbar-events.ts +143 -0
- package/src/client/lib/scrollbar-input.test.ts +126 -0
- package/src/client/lib/scrollbar-probe.test-util.ts +107 -0
- package/src/client/tailwind.css +32 -1
- package/src/server/db.server.test.ts +50 -1
- package/src/server/db.server.ts +36 -3
- package/src/server/lib/chat/prompt-history.server.test.ts +92 -0
- package/src/server/lib/chat/prompt-history.server.ts +65 -0
- package/src/server/lib/chat/schema.server.ts +35 -0
- package/src/server/lib/db/schema.ts +3 -0
- package/src/server/lib/fs/archive.test.ts +198 -0
- package/src/server/lib/fs/archive.ts +278 -0
- package/src/server/lib/fs/git-diff.test.ts +26 -1
- package/src/server/lib/fs/git-diff.ts +43 -15
- package/src/server/lib/harness/launch-table.ts +19 -0
- package/src/server/lib/harness/provider-entry.ts +1 -1
- package/src/server/lib/harness/provider-file.server.ts +1 -1
- package/src/server/lib/harness/provider-sources.server.ts +2 -1
- package/src/server/lib/harness/provider-write.server.ts +2 -1
- package/src/server/lib/harness/update-job-store.ts +12 -0
- package/src/server/lib/harness/update-queue.server.ts +15 -10
- package/src/server/lib/omp/rpc/frame-fold-signals.test.ts +5 -1
- package/src/server/lib/omp/rpc/frame-fold.test.ts +5 -1
- package/src/server/lib/omp/rpc/lifecycle.test.ts +4 -0
- package/src/server/lib/omp/session/auto-title.server.test.ts +4 -0
- package/src/server/lib/omp/session/delete.server.ts +1 -0
- package/src/server/lib/omp/session/goal-driver.test.ts +5 -1
- package/src/server/lib/omp/session/goal-settings.test.ts +5 -1
- package/src/server/lib/panels/auto-update.server.test.ts +5 -2
- package/src/server/lib/panels/git-update.server.test.ts +5 -2
- package/src/server/lib/panels/install.server.test.ts +5 -2
- package/src/server/lib/panels/remove.server.test.ts +5 -2
- package/src/server/routes/agent/command.ts +11 -0
- package/src/server/routes/agent/new.ts +5 -0
- package/src/server/routes/chat/index.ts +5 -0
- package/src/server/routes/chat/prompt-history.test.ts +67 -0
- package/src/server/routes/chat/prompt-history.ts +31 -0
- package/src/server/routes/chat/stream.test.ts +21 -0
- package/src/server/routes/chat/stream.ts +5 -0
- package/src/server/routes/fs/action-archive.test.ts +128 -0
- package/src/server/routes/fs/action-bulk.ts +106 -0
- package/src/server/routes/fs/action-save-bytes.test.ts +59 -0
- package/src/server/routes/fs/action-transfer.test.ts +26 -0
- package/src/server/routes/fs/action.ts +91 -11
- package/src/server/routes/fs/archive.ts +20 -0
- package/src/server/routes/fs/grant.test.ts +5 -2
- package/src/server/routes/fs/index.ts +2 -0
- package/src/server/routes/fs/scope.test.ts +6 -2
- package/src/server/routes/harness/import-action.ts +1 -1
- package/src/server/routes/harness/root.ts +6 -1
- package/src/server/routes/harness/summary.test.ts +50 -0
- package/src/server/routes/harness/update-status.ts +41 -2
- package/src/server/routes/harness/update.test.ts +56 -2
- package/src/server/routes/sessions/delete.test.ts +4 -0
- package/src/shared/lib/chat/ask-form/index.ts +39 -31
- package/src/shared/lib/chat/ask-form/labels.ts +46 -0
- package/src/shared/lib/chat/ask-form/tokens.ts +11 -2
- package/src/shared/lib/chat/ask-form.test.ts +57 -0
- package/src/shared/lib/chat/ask-questions.ts +31 -0
- package/src/shared/lib/chat/composer/history.test.ts +67 -0
- package/src/shared/lib/chat/composer/history.ts +61 -0
- package/src/shared/lib/chat/irc-notice.ts +42 -0
- package/src/shared/lib/chat/timeline/fork-anchor.test.ts +2 -0
- package/src/shared/lib/chat/todo/parser.ts +6 -4
- package/src/shared/lib/fs/archive.test.ts +101 -0
- package/src/shared/lib/fs/archive.ts +191 -0
- package/src/shared/lib/fs/clipboard.test.ts +32 -7
- package/src/shared/lib/fs/clipboard.ts +59 -14
- package/src/shared/lib/fs/csv.test.ts +50 -0
- package/src/shared/lib/fs/csv.ts +40 -0
- package/src/shared/lib/fs/document-kind.test.ts +13 -6
- package/src/shared/lib/fs/document-kind.ts +18 -6
- package/src/shared/lib/fs/file-kind-classify.test.ts +4 -0
- package/src/shared/lib/fs/file-kind.test.ts +2 -7
- package/src/shared/lib/fs/file-kind.ts +4 -2
- package/src/shared/lib/fs/grid-edit.test.ts +24 -0
- package/src/shared/lib/fs/grid-edit.ts +29 -0
- package/src/shared/lib/fs/grid-selection.test.ts +137 -0
- package/src/shared/lib/fs/grid-selection.ts +138 -0
- package/src/shared/lib/harness/brand-color.ts +5 -0
- package/src/shared/lib/harness/catalog.test.ts +22 -0
- package/src/shared/lib/harness/catalog.ts +12 -1
- package/src/shared/lib/harness/config-fields.test.ts +25 -0
- package/src/shared/lib/harness/config-fields.ts +33 -3
- package/src/shared/lib/harness/dialects.ts +1 -1
- package/src/shared/lib/harness/mcp-facts.ts +4 -0
- package/src/shared/lib/harness/provider-contracts.ts +109 -0
- package/src/shared/lib/harness/provider-facts.test.ts +2 -1
- package/src/shared/lib/harness/provider-facts.ts +24 -115
- package/src/shared/lib/harness/provider-lookup.ts +37 -0
- package/src/shared/lib/harness/providers.ts +2 -1
- package/src/shared/lib/harness/updates.ts +10 -0
- package/src/shared/lib/icons/tint-hues.generated.ts +14 -13
- package/src/shared/lib/omp/session/mapper.test.ts +31 -0
- package/src/shared/lib/omp/session/mapper.ts +17 -0
- package/src/shared/lib/omp/session/messages-map-notice.test.ts +68 -0
- package/src/shared/lib/omp/session/messages-map.test.ts +1 -35
- package/src/shared/lib/omp/session/messages-map.ts +17 -0
- package/src/shared/lib/omp/session/wait.ts +10 -1
- package/src/shared/lib/settings/sections.ts +8 -4
- package/src/shared/lib/ui/picker-filter.test.ts +23 -0
- package/src/shared/lib/ui/picker-filter.ts +20 -0
- package/src/shared/types/chat.ts +4 -0
- package/src/shared/types/harness.ts +5 -1
- package/src/shared/types/omp/session.ts +18 -0
- package/src/shared/types/settings/state.ts +6 -6
- package/src/shared/types/todo.ts +3 -1
- package/src/test-support/file-actions.test-util.ts +4 -0
- package/src/test-support/file-archive.test-util.ts +41 -0
- package/src/test-support/file-clipboard.test-util.ts +9 -6
- package/src/test-support/file-editor.test-util.ts +3 -2
- package/src/test-support/glass-css.ts +30 -0
- package/src/test-support/harness-table.test-util.ts +2 -0
- package/src/test-support/preload.ts +46 -0
- package/dist/client/static/js/index-81f7berm.css +0 -1
|
@@ -214,6 +214,25 @@ describe('composer toolbar action pair', () => {
|
|
|
214
214
|
expect(stop.className).not.toContain('border-');
|
|
215
215
|
expect(submit.className).not.toContain('bg-ink');
|
|
216
216
|
});
|
|
217
|
+
|
|
218
|
+
test('paints the pair in the palette ink under monochrome', async () => {
|
|
219
|
+
const el = await mount({ isGenerating: true, onStop: () => {} });
|
|
220
|
+
const stop = el.querySelector(stops) as HTMLButtonElement;
|
|
221
|
+
const submit = el.querySelector(send) as HTMLButtonElement;
|
|
222
|
+
// The signal fills above are the COLOUR mode's statement. Monochrome is the
|
|
223
|
+
// default and it removes chroma, so the stylesheet overrides both fills for
|
|
224
|
+
// this marker class; without it the window keeps two saturated buttons.
|
|
225
|
+
expect(stop.className.split(/\s+/)).toContain('composer-action');
|
|
226
|
+
expect(submit.className.split(/\s+/)).toContain('composer-action');
|
|
227
|
+
|
|
228
|
+
const css = await Bun.file(new URL('../../../../tailwind.css', import.meta.url)).text();
|
|
229
|
+
const start = css.indexOf(':root:not([data-icon-style="color"]) .composer-action {');
|
|
230
|
+
expect(start).toBeGreaterThan(-1);
|
|
231
|
+
const block = css.slice(start, css.indexOf(':root:not([data-icon-style="color"]) .composer-action:hover', start));
|
|
232
|
+
expect(block).toContain('background-color: var(--theme-ink);');
|
|
233
|
+
// A disabled Send must not re-state the colour fill on hover.
|
|
234
|
+
expect(css).toContain(':root:not([data-icon-style="color"]) .composer-action:hover:not(:disabled) {');
|
|
235
|
+
});
|
|
217
236
|
});
|
|
218
237
|
|
|
219
238
|
/**
|
|
@@ -270,6 +270,10 @@ export function ComposerToolbar({
|
|
|
270
270
|
the pair then read as one primary and one ghost when the two do
|
|
271
271
|
different things.
|
|
272
272
|
|
|
273
|
+
Monochrome has no hue to say that with, so `.composer-action` paints
|
|
274
|
+
BOTH controls in the palette ink there and the glyph carries the
|
|
275
|
+
difference (see tailwind.css). The colour mode is unchanged.
|
|
276
|
+
|
|
273
277
|
The fill is `bg-error-text`, NOT `bg-error`: the `-text` token is
|
|
274
278
|
the palette's own red solved until it clears 4.5:1 against paper
|
|
275
279
|
and canvas, so the button is a visible shape on all 63 palettes
|
|
@@ -287,7 +291,7 @@ export function ComposerToolbar({
|
|
|
287
291
|
<button
|
|
288
292
|
type="button"
|
|
289
293
|
onClick={onStop}
|
|
290
|
-
className={`${ACTION_BASE} ${actionSize} bg-error-text text-canvas shadow-xs hover:bg-error-text-hover`}
|
|
294
|
+
className={`${ACTION_BASE} ${actionSize} composer-action bg-error-text text-canvas shadow-xs hover:bg-error-text-hover`}
|
|
291
295
|
title="Stop generation"
|
|
292
296
|
aria-label="Stop generation"
|
|
293
297
|
>
|
|
@@ -298,7 +302,8 @@ export function ComposerToolbar({
|
|
|
298
302
|
{/* Send is the BLUE half of the pair, and the one that must stay
|
|
299
303
|
findable at rest: a run is started from here and stopped from the
|
|
300
304
|
red control beside it, so the two states are told apart by hue
|
|
301
|
-
before the glyph is read.
|
|
305
|
+
before the glyph is read — in the colour mode. Monochrome paints
|
|
306
|
+
both in ink (`.composer-action`, tailwind.css).
|
|
302
307
|
|
|
303
308
|
`bg-info-text` for the same reason Stop uses `bg-error-text`: it is
|
|
304
309
|
the palette's blue solved to 4.5:1 against paper and canvas, so the
|
|
@@ -313,7 +318,7 @@ export function ComposerToolbar({
|
|
|
313
318
|
type="button"
|
|
314
319
|
onClick={onSend}
|
|
315
320
|
disabled={sendDisabled}
|
|
316
|
-
className={`${ACTION_BASE} ${actionSize} bg-info-text text-canvas shadow-xs hover:bg-info-text-hover hover:shadow-sm disabled:opacity-40 disabled:cursor-not-allowed disabled:shadow-none disabled:hover:bg-info-text`}
|
|
321
|
+
className={`${ACTION_BASE} ${actionSize} composer-action bg-info-text text-canvas shadow-xs hover:bg-info-text-hover hover:shadow-sm disabled:opacity-40 disabled:cursor-not-allowed disabled:shadow-none disabled:hover:bg-info-text`}
|
|
317
322
|
title={chatInFlight ? 'Queue follow-up message' : 'Send message'}
|
|
318
323
|
aria-label={chatInFlight ? 'Queue follow-up message' : 'Send message'}
|
|
319
324
|
>
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The "wait for session" popover, rendered: the search row narrows the running
|
|
8
|
+
* sessions and never offers a row the filter hid.
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'bun:test';
|
|
12
|
+
import { Window } from 'happy-dom';
|
|
13
|
+
import { h, render } from 'preact';
|
|
14
|
+
import { act } from 'preact/test-utils';
|
|
15
|
+
import { installDomGlobals, restoreDomGlobals } from '@/test-support/pristine-globals';
|
|
16
|
+
import { WaitingDependencyPicker } from '@/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker';
|
|
17
|
+
|
|
18
|
+
const candidates = [
|
|
19
|
+
{ id: 'sess-a', title: 'Refactor parser', folderName: 'alpha' },
|
|
20
|
+
{ id: 'sess-b', title: 'Build pipeline', folderName: 'beta' },
|
|
21
|
+
];
|
|
22
|
+
|
|
23
|
+
const mounted: HTMLElement[] = [];
|
|
24
|
+
|
|
25
|
+
beforeAll(() => {
|
|
26
|
+
installDomGlobals(new Window({ url: 'http://localhost' }));
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
afterEach(() => {
|
|
30
|
+
for (const host of mounted.splice(0)) {
|
|
31
|
+
render(null, host);
|
|
32
|
+
host.remove();
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
afterAll(() => {
|
|
37
|
+
restoreDomGlobals();
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
async function mount(node: h.JSX.Element): Promise<HTMLElement> {
|
|
41
|
+
const host = document.createElement('div');
|
|
42
|
+
document.body.appendChild(host);
|
|
43
|
+
await act(async () => {
|
|
44
|
+
render(node, host);
|
|
45
|
+
});
|
|
46
|
+
mounted.push(host);
|
|
47
|
+
return host;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
describe('WaitingDependencyPicker search', () => {
|
|
51
|
+
test('the search row narrows the running sessions on title and folder name', async () => {
|
|
52
|
+
const host = await mount(
|
|
53
|
+
h(WaitingDependencyPicker, { candidates, value: null, onChange: () => {} }),
|
|
54
|
+
);
|
|
55
|
+
|
|
56
|
+
await act(async () => {
|
|
57
|
+
(host.querySelector('[data-testid="wait-picker"]') as HTMLButtonElement).click();
|
|
58
|
+
});
|
|
59
|
+
const input = host.querySelector('input[aria-label="Search running sessions"]') as HTMLInputElement;
|
|
60
|
+
expect(input).not.toBeNull();
|
|
61
|
+
|
|
62
|
+
await act(async () => {
|
|
63
|
+
input.value = 'beta';
|
|
64
|
+
input.dispatchEvent(new Event('input', { bubbles: true }));
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
const ids = [...host.querySelectorAll('[data-testid="wait-candidate"]')].map((row) =>
|
|
68
|
+
row.getAttribute('data-session-id'),
|
|
69
|
+
);
|
|
70
|
+
expect(ids).toEqual(['sess-b']);
|
|
71
|
+
});
|
|
72
|
+
});
|
package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.tsx
CHANGED
|
@@ -21,9 +21,11 @@
|
|
|
21
21
|
* immediately.
|
|
22
22
|
*/
|
|
23
23
|
|
|
24
|
-
import { useCallback, useRef, useState } from 'preact/hooks';
|
|
24
|
+
import { useCallback, useMemo, useRef, useState } from 'preact/hooks';
|
|
25
25
|
import { Hourglass, ChevronDown, Check, X } from 'lucide-preact';
|
|
26
26
|
import { useOnClickOutside } from '@/client/hooks/ui/on-click-outside';
|
|
27
|
+
import { PickerSearch } from '@/client/components/common/picker-search';
|
|
28
|
+
import { matchesPickerQuery } from '@/shared/lib/ui/picker-filter';
|
|
27
29
|
import type { WorkspaceFolderData } from '@/shared/types';
|
|
28
30
|
|
|
29
31
|
export interface WaitingCandidate {
|
|
@@ -87,13 +89,21 @@ export function WaitingDependencyPicker({
|
|
|
87
89
|
compactLabel = false,
|
|
88
90
|
}: WaitingDependencyPickerProps) {
|
|
89
91
|
const [open, setOpen] = useState(false);
|
|
92
|
+
const [query, setQuery] = useState('');
|
|
90
93
|
const ref = useRef<HTMLDivElement>(null);
|
|
91
94
|
// A stable handler: the hook re-registers its document listeners whenever the
|
|
92
95
|
// callback identity changes, and an inline arrow would do that on every
|
|
93
96
|
// render — including every stream-status frame.
|
|
94
|
-
const close = useCallback(() =>
|
|
97
|
+
const close = useCallback(() => {
|
|
98
|
+
setOpen(false);
|
|
99
|
+
setQuery('');
|
|
100
|
+
}, []);
|
|
95
101
|
useOnClickOutside(ref, close);
|
|
96
102
|
const unavailable = candidates.length === 0;
|
|
103
|
+
const visible = useMemo(
|
|
104
|
+
() => candidates.filter((candidate) => matchesPickerQuery(`${candidate.title} ${candidate.folderName}`, query)),
|
|
105
|
+
[candidates, query],
|
|
106
|
+
);
|
|
97
107
|
|
|
98
108
|
return (
|
|
99
109
|
<div className="relative shrink-0" ref={ref}>
|
|
@@ -120,7 +130,7 @@ export function WaitingDependencyPicker({
|
|
|
120
130
|
</button>
|
|
121
131
|
|
|
122
132
|
{open && (
|
|
123
|
-
<div className="glass-popover absolute bottom-full left-0 mb-1.5 w-
|
|
133
|
+
<div className="glass-popover absolute bottom-full left-0 mb-1.5 w-max min-w-[16rem] max-w-[calc(100vw-5rem)] bg-paper border border-ink/10 rounded-lg shadow-lg z-50 flex flex-col overflow-hidden text-xs py-1">
|
|
124
134
|
<div className="flex items-center justify-between px-3 py-1.5 border-b border-ink/5">
|
|
125
135
|
<span className="text-[10px] uppercase tracking-wider text-ink/40 font-semibold">Wait for session</span>
|
|
126
136
|
{value && (
|
|
@@ -128,7 +138,7 @@ export function WaitingDependencyPicker({
|
|
|
128
138
|
type="button"
|
|
129
139
|
onClick={() => {
|
|
130
140
|
onChange(null);
|
|
131
|
-
|
|
141
|
+
close();
|
|
132
142
|
}}
|
|
133
143
|
title="Send without waiting"
|
|
134
144
|
aria-label="Send without waiting"
|
|
@@ -138,11 +148,16 @@ export function WaitingDependencyPicker({
|
|
|
138
148
|
</button>
|
|
139
149
|
)}
|
|
140
150
|
</div>
|
|
151
|
+
{!unavailable && (
|
|
152
|
+
<PickerSearch value={query} onChange={setQuery} ariaLabel="Search running sessions" placeholder="Search sessions…" />
|
|
153
|
+
)}
|
|
141
154
|
<div className="max-h-56 scrollbar-overlay-container py-1">
|
|
142
155
|
{unavailable ? (
|
|
143
156
|
<div className="px-3 py-2 text-ink/40 italic">No session is running right now</div>
|
|
157
|
+
) : visible.length === 0 ? (
|
|
158
|
+
<div className="px-3 py-2 text-ink/40 italic">No match for “{query.trim()}”</div>
|
|
144
159
|
) : (
|
|
145
|
-
|
|
160
|
+
visible.map((candidate) => {
|
|
146
161
|
const selected = value?.id === candidate.id;
|
|
147
162
|
return (
|
|
148
163
|
<button
|
|
@@ -152,20 +167,32 @@ export function WaitingDependencyPicker({
|
|
|
152
167
|
data-session-id={candidate.id}
|
|
153
168
|
onClick={() => {
|
|
154
169
|
onChange(selected ? null : candidate);
|
|
155
|
-
|
|
170
|
+
close();
|
|
156
171
|
}}
|
|
157
|
-
className={`w-full text-left px-3 py-1.5 flex items-center
|
|
172
|
+
className={`w-full text-left px-3 py-1.5 flex items-center gap-2 transition-colors cursor-pointer ${
|
|
158
173
|
selected ? 'bg-ink/10 text-ink font-semibold' : 'text-muted hover:bg-ink/5 hover:text-ink'
|
|
159
174
|
}`}
|
|
160
175
|
>
|
|
161
|
-
<
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
176
|
+
<Hourglass size={12} className={selected ? 'text-ink shrink-0' : 'text-ink/50 shrink-0'} />
|
|
177
|
+
<span className="min-w-0 max-w-[15rem] flex-1 truncate font-medium">{candidate.title}</span>
|
|
178
|
+
{candidate.folderName && (
|
|
179
|
+
// The folder is the DISAMBIGUATOR between two sessions
|
|
180
|
+
// with the same title, so it is pinned to the row's RIGHT
|
|
181
|
+
// edge where the column can be scanned, and the popover is
|
|
182
|
+
// sized to it (`w-max`) so the title is the item that
|
|
183
|
+
// yields. It only ellipsises once the panel hits its
|
|
184
|
+
// viewport cap, where truncation beats overflowing.
|
|
185
|
+
<span
|
|
186
|
+
title={candidate.folderName}
|
|
187
|
+
className="ml-auto min-w-0 truncate text-[10px] text-ink/40"
|
|
188
|
+
>
|
|
189
|
+
{candidate.folderName}
|
|
190
|
+
</span>
|
|
191
|
+
)}
|
|
192
|
+
{/* A fixed slot, not a conditional glyph: a selected row
|
|
193
|
+
would otherwise shift every folder label 20px left of
|
|
194
|
+
the column the other rows sit in. */}
|
|
195
|
+
<span className="w-3 shrink-0">{selected && <Check size={12} className="text-ink" />}</span>
|
|
169
196
|
</button>
|
|
170
197
|
);
|
|
171
198
|
})
|
package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.test.tsx
CHANGED
|
@@ -29,6 +29,11 @@ const folders = [
|
|
|
29
29
|
name: 'kabmo',
|
|
30
30
|
sessions: [{ id: 'a', folder_id: 1, title: 'Alpha' }],
|
|
31
31
|
},
|
|
32
|
+
{
|
|
33
|
+
id: 2,
|
|
34
|
+
name: 'notes',
|
|
35
|
+
sessions: [{ id: 'b', folder_id: 2, title: 'Build pipeline' }],
|
|
36
|
+
},
|
|
32
37
|
] as unknown as WorkspaceFolderData[];
|
|
33
38
|
|
|
34
39
|
const mounted: HTMLElement[] = [];
|
|
@@ -69,6 +74,29 @@ describe('ParentSessionPicker', () => {
|
|
|
69
74
|
expect(trigger?.querySelector('.lucide-git-branch')).toBeNull();
|
|
70
75
|
});
|
|
71
76
|
|
|
77
|
+
test('the search row narrows the sessions on title and folder name', async () => {
|
|
78
|
+
const host = await mount(
|
|
79
|
+
h(ParentSessionPicker, { folders, sessionId: null, value: null, onChange: () => {} }),
|
|
80
|
+
);
|
|
81
|
+
|
|
82
|
+
await act(async () => {
|
|
83
|
+
(host.querySelector('[data-testid="parent-session-picker"]') as HTMLButtonElement).click();
|
|
84
|
+
});
|
|
85
|
+
const input = host.querySelector('input[aria-label="Search parent session"]') as HTMLInputElement;
|
|
86
|
+
expect(input).not.toBeNull();
|
|
87
|
+
await act(async () => {
|
|
88
|
+
input.value = 'pipeline';
|
|
89
|
+
input.dispatchEvent(new Event('input', { bubbles: true }));
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
const ids = [...host.querySelectorAll('[data-testid="parent-candidate"]')].map((row) =>
|
|
93
|
+
row.getAttribute('data-session-id'),
|
|
94
|
+
);
|
|
95
|
+
expect(ids).toEqual(['b']);
|
|
96
|
+
// "No parent" is an action, not a search result: it survives the filter.
|
|
97
|
+
expect(host.querySelector('[data-testid="parent-candidate-none"]')).not.toBeNull();
|
|
98
|
+
});
|
|
99
|
+
|
|
72
100
|
test('choosing a session reports it, and "No parent" clears the pick', async () => {
|
|
73
101
|
const seen: (string | null)[] = [];
|
|
74
102
|
const host = await mount(
|
|
@@ -18,6 +18,8 @@
|
|
|
18
18
|
import { useCallback, useMemo, useRef, useState } from 'preact/hooks';
|
|
19
19
|
import { Check, ChevronDown, GitFork, X } from 'lucide-preact';
|
|
20
20
|
import { useOnClickOutside } from '@/client/hooks/ui/on-click-outside';
|
|
21
|
+
import { PickerSearch } from '@/client/components/common/picker-search';
|
|
22
|
+
import { matchesPickerQuery } from '@/shared/lib/ui/picker-filter';
|
|
21
23
|
import type { WorkspaceFolderData } from '@/shared/types';
|
|
22
24
|
|
|
23
25
|
export interface ParentSessionOption {
|
|
@@ -72,10 +74,18 @@ export function ParentSessionPicker({
|
|
|
72
74
|
allowNone = true,
|
|
73
75
|
}: ParentSessionPickerProps) {
|
|
74
76
|
const [open, setOpen] = useState(false);
|
|
77
|
+
const [query, setQuery] = useState('');
|
|
75
78
|
const ref = useRef<HTMLDivElement>(null);
|
|
76
|
-
const close = useCallback(() =>
|
|
79
|
+
const close = useCallback(() => {
|
|
80
|
+
setOpen(false);
|
|
81
|
+
setQuery('');
|
|
82
|
+
}, []);
|
|
77
83
|
useOnClickOutside(ref, close);
|
|
78
84
|
const options = useMemo(() => parentSessionOptions(folders, sessionId), [folders, sessionId]);
|
|
85
|
+
const visible = useMemo(
|
|
86
|
+
() => options.filter((option) => matchesPickerQuery(`${option.title} ${option.folderName}`, query)),
|
|
87
|
+
[options, query],
|
|
88
|
+
);
|
|
79
89
|
const selected = value ? options.find((option) => option.id === value) : undefined;
|
|
80
90
|
const triggerLabel = selected ? selected.title : value ? value : `${label}: none`;
|
|
81
91
|
|
|
@@ -101,7 +111,7 @@ export function ParentSessionPicker({
|
|
|
101
111
|
</button>
|
|
102
112
|
|
|
103
113
|
{open && (
|
|
104
|
-
<div className="glass-popover absolute bottom-full left-0 mb-1.5 w-
|
|
114
|
+
<div className="glass-popover absolute bottom-full left-0 mb-1.5 w-max min-w-[16rem] max-w-[calc(100vw-5rem)] bg-paper border border-ink/10 rounded-lg shadow-lg z-50 flex flex-col overflow-hidden text-xs py-1">
|
|
105
115
|
<div className="flex items-center justify-between px-3 py-1.5 border-b border-ink/5">
|
|
106
116
|
<span className="text-[10px] uppercase tracking-wider text-ink/40 font-semibold">
|
|
107
117
|
{label}
|
|
@@ -111,7 +121,7 @@ export function ParentSessionPicker({
|
|
|
111
121
|
type="button"
|
|
112
122
|
onClick={() => {
|
|
113
123
|
onChange(null);
|
|
114
|
-
|
|
124
|
+
close();
|
|
115
125
|
}}
|
|
116
126
|
title="Start a top-level chat"
|
|
117
127
|
aria-label="Clear parent session"
|
|
@@ -121,6 +131,7 @@ export function ParentSessionPicker({
|
|
|
121
131
|
</button>
|
|
122
132
|
)}
|
|
123
133
|
</div>
|
|
134
|
+
<PickerSearch value={query} onChange={setQuery} ariaLabel={`Search ${label.toLowerCase()}`} placeholder="Search sessions…" />
|
|
124
135
|
<div className="max-h-64 scrollbar-overlay-container py-1">
|
|
125
136
|
{allowNone && (
|
|
126
137
|
<button
|
|
@@ -128,7 +139,7 @@ export function ParentSessionPicker({
|
|
|
128
139
|
data-testid="parent-candidate-none"
|
|
129
140
|
onClick={() => {
|
|
130
141
|
onChange(null);
|
|
131
|
-
|
|
142
|
+
close();
|
|
132
143
|
}}
|
|
133
144
|
className={`w-full flex items-center gap-2 px-3 py-1.5 text-left transition-colors cursor-pointer hover:bg-ink/5 ${
|
|
134
145
|
value ? 'text-ink/70' : 'text-ink font-medium'
|
|
@@ -138,7 +149,7 @@ export function ParentSessionPicker({
|
|
|
138
149
|
<span className="min-w-0 flex-1 truncate">No parent (top-level chat)</span>
|
|
139
150
|
</button>
|
|
140
151
|
)}
|
|
141
|
-
{
|
|
152
|
+
{visible.map((option) => {
|
|
142
153
|
const active = option.id === value;
|
|
143
154
|
return (
|
|
144
155
|
<button
|
|
@@ -148,23 +159,30 @@ export function ParentSessionPicker({
|
|
|
148
159
|
data-session-id={option.id}
|
|
149
160
|
onClick={() => {
|
|
150
161
|
onChange(option.id);
|
|
151
|
-
|
|
162
|
+
close();
|
|
152
163
|
}}
|
|
153
164
|
className={`w-full flex items-center gap-2 px-3 py-1.5 text-left transition-colors cursor-pointer hover:bg-ink/5 ${
|
|
154
165
|
active ? 'text-ink font-medium' : 'text-ink/70'
|
|
155
166
|
}`}
|
|
156
167
|
>
|
|
157
168
|
<span className="w-3 shrink-0">{active && <Check size={11} />}</span>
|
|
158
|
-
<span className="min-w-0 flex-1 truncate">{option.title}</span>
|
|
159
|
-
|
|
169
|
+
<span className="max-w-[18rem] min-w-0 flex-1 truncate">{option.title}</span>
|
|
170
|
+
{/* Same rule as the wait picker: the folder is the
|
|
171
|
+
disambiguator between two sessions called "Fix build", so
|
|
172
|
+
it is pinned to the row's RIGHT edge and the panel is
|
|
173
|
+
sized to it. Truncation is the fallback at the viewport
|
|
174
|
+
cap, where the title has already yielded. */}
|
|
175
|
+
<span title={option.folderName} className="ml-auto min-w-0 truncate text-[10px] text-ink/40">
|
|
160
176
|
{option.folderName}
|
|
161
177
|
</span>
|
|
162
178
|
</button>
|
|
163
179
|
);
|
|
164
180
|
})}
|
|
165
|
-
{options.length === 0
|
|
181
|
+
{options.length === 0 ? (
|
|
166
182
|
<div className="px-3 py-2 text-ink/40 italic">No sessions to parent under yet</div>
|
|
167
|
-
)
|
|
183
|
+
) : visible.length === 0 ? (
|
|
184
|
+
<div className="px-3 py-2 text-ink/40 italic">No match for “{query.trim()}”</div>
|
|
185
|
+
) : null}
|
|
168
186
|
</div>
|
|
169
187
|
</div>
|
|
170
188
|
)}
|
package/src/client/components/workspace/chat-timeline/target-picker/WorkspacePicker.test.tsx
CHANGED
|
@@ -24,7 +24,7 @@ import { installDomGlobals, restoreDomGlobals } from '@/test-support/pristine-gl
|
|
|
24
24
|
import { WorkspacePicker, workspaceLabel } from '@/client/components/workspace/chat-timeline/target-picker/WorkspacePicker';
|
|
25
25
|
import type { WorkspaceFolderData } from '@/shared/types';
|
|
26
26
|
|
|
27
|
-
const folder = (id: number, name: string): WorkspaceFolderData => ({
|
|
27
|
+
const folder = (id: number, name: string, icon?: string): WorkspaceFolderData => ({
|
|
28
28
|
id,
|
|
29
29
|
name,
|
|
30
30
|
project_path: `/repo/${name}`,
|
|
@@ -32,6 +32,7 @@ const folder = (id: number, name: string): WorkspaceFolderData => ({
|
|
|
32
32
|
hasMore: false,
|
|
33
33
|
totalSessions: 0,
|
|
34
34
|
sessions: [],
|
|
35
|
+
...(icon ? { icon } : {}),
|
|
35
36
|
});
|
|
36
37
|
|
|
37
38
|
const mounted: HTMLElement[] = [];
|
|
@@ -99,6 +100,51 @@ describe('WorkspacePicker', () => {
|
|
|
99
100
|
expect(text).not.toContain('Worktrees');
|
|
100
101
|
});
|
|
101
102
|
|
|
103
|
+
test('the search row narrows the list to the matching workspace', async () => {
|
|
104
|
+
const host = await mount(
|
|
105
|
+
h(WorkspacePicker, {
|
|
106
|
+
folders: [folder(1, 'kabmo'), folder(2, 'notes')],
|
|
107
|
+
selectedFolderId: 1,
|
|
108
|
+
setSelectedFolderId: () => {},
|
|
109
|
+
}),
|
|
110
|
+
);
|
|
111
|
+
|
|
112
|
+
await act(async () => {
|
|
113
|
+
(host.querySelector('button') as HTMLButtonElement).click();
|
|
114
|
+
});
|
|
115
|
+
const input = host.querySelector('input[aria-label="Search workspaces"]') as HTMLInputElement;
|
|
116
|
+
expect(input).not.toBeNull();
|
|
117
|
+
await act(async () => {
|
|
118
|
+
input.value = 'note';
|
|
119
|
+
input.dispatchEvent(new Event('input', { bubbles: true }));
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
const rows = [...host.querySelectorAll('[role="menuitemradio"]')] as HTMLButtonElement[];
|
|
123
|
+
expect(rows.map((row) => row.textContent?.trim())).toEqual(['notes']);
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
test('the trigger and the rows carry the project icon, not a generic folder', async () => {
|
|
127
|
+
const host = await mount(
|
|
128
|
+
h(WorkspacePicker, {
|
|
129
|
+
folders: [folder(1, 'kabmo', 'code'), folder(2, 'notes')],
|
|
130
|
+
selectedFolderId: 1,
|
|
131
|
+
setSelectedFolderId: () => {},
|
|
132
|
+
}),
|
|
133
|
+
);
|
|
134
|
+
|
|
135
|
+
const trigger = host.querySelector('button[aria-label^="Workspace:"]') as HTMLButtonElement;
|
|
136
|
+
expect(trigger.querySelector('.lucide-code-2')).not.toBeNull();
|
|
137
|
+
expect(trigger.querySelector('.lucide-folder')).toBeNull();
|
|
138
|
+
|
|
139
|
+
await act(async () => {
|
|
140
|
+
trigger.click();
|
|
141
|
+
});
|
|
142
|
+
const rows = [...host.querySelectorAll('[role="menuitemradio"]')] as HTMLButtonElement[];
|
|
143
|
+
expect(rows[0]?.querySelector('.lucide-code-2')).not.toBeNull();
|
|
144
|
+
// A workspace with no icon keeps the default folder mark.
|
|
145
|
+
expect(rows[1]?.querySelector('.lucide-folder')).not.toBeNull();
|
|
146
|
+
});
|
|
147
|
+
|
|
102
148
|
test('choosing a folder clears the worktree pick', async () => {
|
|
103
149
|
// A record rather than two locals: a value assigned inside a callback is
|
|
104
150
|
// still narrowed to its initializer by control-flow analysis, so `picked`
|
|
@@ -16,11 +16,20 @@
|
|
|
16
16
|
*
|
|
17
17
|
* Picking a folder CLEARS the worktree pick: a checkout of the previous project
|
|
18
18
|
* names a path that does not exist under the new one.
|
|
19
|
+
*
|
|
20
|
+
* The mark is the PROJECT's own icon (`getProjectIcon`), not a generic folder:
|
|
21
|
+
* the sidebar header, the settings list and this trigger all name the same
|
|
22
|
+
* workspace, and a folder glyph here made the picker look like a different
|
|
23
|
+
* object from the row the user clicked to get here.
|
|
19
24
|
*/
|
|
20
25
|
|
|
21
|
-
import { useRef, useState } from 'preact/hooks';
|
|
26
|
+
import { useMemo, useRef, useState } from 'preact/hooks';
|
|
22
27
|
import { Check, ChevronDown, Folder } from 'lucide-preact';
|
|
23
28
|
import { useOnClickOutside } from '@/client/hooks/ui/on-click-outside';
|
|
29
|
+
import { PickerSearch } from '@/client/components/common/picker-search';
|
|
30
|
+
import { getProjectIcon } from '@/shared/lib/workspace/project-icon';
|
|
31
|
+
import { projectAccentStyle } from '@/shared/lib/workspace/project-accent';
|
|
32
|
+
import { matchesPickerQuery } from '@/shared/lib/ui/picker-filter';
|
|
24
33
|
import type { WorkspaceFolderData } from '@/shared/types';
|
|
25
34
|
|
|
26
35
|
export interface WorkspacePickerProps {
|
|
@@ -37,6 +46,29 @@ export function workspaceLabel(folders: WorkspaceFolderData[], selectedFolderId:
|
|
|
37
46
|
return folder?.name ?? 'Select Workspace Context';
|
|
38
47
|
}
|
|
39
48
|
|
|
49
|
+
/** The project's mark, exactly as the sidebar header draws it. */
|
|
50
|
+
function WorkspaceMark({ folder, size }: { folder?: WorkspaceFolderData; size: number }) {
|
|
51
|
+
if (folder?.customIconUrl) {
|
|
52
|
+
return (
|
|
53
|
+
<img
|
|
54
|
+
src={folder.customIconUrl}
|
|
55
|
+
alt=""
|
|
56
|
+
className="shrink-0 rounded-xs object-contain"
|
|
57
|
+
style={{ width: size, height: size }}
|
|
58
|
+
referrerPolicy="no-referrer"
|
|
59
|
+
/>
|
|
60
|
+
);
|
|
61
|
+
}
|
|
62
|
+
const Icon = getProjectIcon(folder?.icon);
|
|
63
|
+
return (
|
|
64
|
+
<Icon
|
|
65
|
+
size={size}
|
|
66
|
+
className="project-accent-mark shrink-0 text-ink/70"
|
|
67
|
+
style={projectAccentStyle(folder?.accentColor || undefined) as unknown as Record<string, string>}
|
|
68
|
+
/>
|
|
69
|
+
);
|
|
70
|
+
}
|
|
71
|
+
|
|
40
72
|
export function WorkspacePicker({
|
|
41
73
|
folders,
|
|
42
74
|
selectedFolderId,
|
|
@@ -44,8 +76,18 @@ export function WorkspacePicker({
|
|
|
44
76
|
onClearWorktree,
|
|
45
77
|
}: WorkspacePickerProps) {
|
|
46
78
|
const [open, setOpen] = useState(false);
|
|
79
|
+
const [query, setQuery] = useState('');
|
|
47
80
|
const containerRef = useRef<HTMLDivElement>(null);
|
|
48
|
-
useOnClickOutside(containerRef, () =>
|
|
81
|
+
useOnClickOutside(containerRef, () => {
|
|
82
|
+
setOpen(false);
|
|
83
|
+
setQuery('');
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
const selected = folders.find((candidate) => String(candidate.id) === String(selectedFolderId));
|
|
87
|
+
const visible = useMemo(
|
|
88
|
+
() => folders.filter((folder) => matchesPickerQuery(`${folder.name} ${folder.project_path ?? ''}`, query)),
|
|
89
|
+
[folders, query],
|
|
90
|
+
);
|
|
49
91
|
|
|
50
92
|
const pick = (folder: WorkspaceFolderData) => {
|
|
51
93
|
setSelectedFolderId(folder.id);
|
|
@@ -54,6 +96,7 @@ export function WorkspacePicker({
|
|
|
54
96
|
// cannot resolve.
|
|
55
97
|
onClearWorktree?.();
|
|
56
98
|
setOpen(false);
|
|
99
|
+
setQuery('');
|
|
57
100
|
};
|
|
58
101
|
|
|
59
102
|
const label = workspaceLabel(folders, selectedFolderId);
|
|
@@ -70,7 +113,11 @@ export function WorkspacePicker({
|
|
|
70
113
|
onClick={() => setOpen((value) => !value)}
|
|
71
114
|
className="tap-chip group flex items-center space-x-1.5 px-1.5 py-1 rounded-md text-xs font-medium text-muted hover:text-ink hover:bg-ink/5 focus-visible:bg-ink/5 transition-all cursor-pointer select-none"
|
|
72
115
|
>
|
|
73
|
-
|
|
116
|
+
{selected ? (
|
|
117
|
+
<WorkspaceMark folder={selected} size={13} />
|
|
118
|
+
) : (
|
|
119
|
+
<Folder size={13} className="text-ink/50 group-hover:text-ink/80 transition-colors flex-shrink-0" />
|
|
120
|
+
)}
|
|
74
121
|
<span className="max-w-[260px] truncate tracking-tight">{label}</span>
|
|
75
122
|
<ChevronDown
|
|
76
123
|
size={13}
|
|
@@ -86,11 +133,14 @@ export function WorkspacePicker({
|
|
|
86
133
|
<div className="px-3 py-1.5 text-[10px] uppercase tracking-wider text-ink/40 font-semibold border-b border-ink/5">
|
|
87
134
|
Target Workspace
|
|
88
135
|
</div>
|
|
136
|
+
<PickerSearch value={query} onChange={setQuery} ariaLabel="Search workspaces" placeholder="Search workspaces…" />
|
|
89
137
|
<div className="max-h-56 scrollbar-overlay-container py-1">
|
|
90
138
|
{folders.length === 0 ? (
|
|
91
139
|
<div className="px-3 py-2 text-ink/40 italic">No workspaces available</div>
|
|
140
|
+
) : visible.length === 0 ? (
|
|
141
|
+
<div className="px-3 py-2 text-ink/40 italic">No match for “{query.trim()}”</div>
|
|
92
142
|
) : (
|
|
93
|
-
|
|
143
|
+
visible.map((folder) => {
|
|
94
144
|
const active = String(selectedFolderId) === String(folder.id);
|
|
95
145
|
return (
|
|
96
146
|
<button
|
|
@@ -104,7 +154,7 @@ export function WorkspacePicker({
|
|
|
104
154
|
}`}
|
|
105
155
|
>
|
|
106
156
|
<span className="flex items-center space-x-2 truncate pr-2">
|
|
107
|
-
<
|
|
157
|
+
<WorkspaceMark folder={folder} size={12} />
|
|
108
158
|
<span className="truncate font-medium">{folder.name}</span>
|
|
109
159
|
</span>
|
|
110
160
|
{active && <Check size={12} className="text-ink flex-shrink-0" />}
|
|
@@ -228,8 +228,9 @@ export function Wait({ tool }: { tool: ToolCallData }) {
|
|
|
228
228
|
</div>
|
|
229
229
|
</div>
|
|
230
230
|
|
|
231
|
-
{/* The messages that ended the wait
|
|
232
|
-
|
|
231
|
+
{/* The messages that ended the wait, oldest first — omp 18.17.0–18.18.6
|
|
232
|
+
results only. Since 18.18.9 the message is its own `irc:incoming`
|
|
233
|
+
turn (`IrcNotice`), and the wait carries `interrupted` instead. */}
|
|
233
234
|
{view.waited.length > 0 && (
|
|
234
235
|
<div className="overflow-hidden rounded-lg border border-ink/8 bg-paper px-3 py-2">
|
|
235
236
|
<div className="flex items-center gap-1.5 text-[10px] font-semibold uppercase tracking-[0.14em] text-ink/40">
|