@kabmo-labs/kabmo 0.16.0 → 0.17.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.
Files changed (131) hide show
  1. package/README.md +2 -2
  2. package/dist/client/index.html +1 -1
  3. package/dist/client/index.js +417 -417
  4. package/dist/client/static/js/index-3ve31rzx.css +1 -0
  5. package/dist/client/static/js/{index-cpydmygd.js → index-rerjq5th.js} +839 -837
  6. package/package.json +1 -1
  7. package/src/client/components/common/code-surface/bracket-guide.test.ts +2 -2
  8. package/src/client/components/common/code-surface/bracket-guide.ts +2 -2
  9. package/src/client/components/common/code-surface/conflict-markers.ts +5 -5
  10. package/src/client/components/common/code-surface/extensions.ts +7 -4
  11. package/src/client/components/common/code-surface/theme.ts +34 -9
  12. package/src/client/components/common/code-surface/whitespace.test.ts +223 -0
  13. package/src/client/components/common/code-surface/whitespace.ts +140 -0
  14. package/src/client/components/common/{server-switcher/index.tsx → server-control/Panel.tsx} +73 -35
  15. package/src/client/components/common/{server-switcher → server-control}/index.test.tsx +98 -37
  16. package/src/client/components/common/server-control/index.tsx +118 -0
  17. package/src/client/components/layout/desktop-layout/TopNavbar.tsx +8 -50
  18. package/src/client/components/mobile/mobile-main-view/Header.tsx +6 -12
  19. package/src/client/components/mobile/mobile-session-sidebar/Header.tsx +41 -13
  20. package/src/client/components/settings/Modal.tsx +9 -3
  21. package/src/client/components/settings/ProjectSelectorDropdown.tsx +19 -9
  22. package/src/client/components/settings/categories/AgentSettings.tsx +27 -6
  23. package/src/client/components/settings/categories/ProjectSettings.tsx +122 -156
  24. package/src/client/components/settings/categories/SkillCatalogSettings.tsx +220 -260
  25. package/src/client/components/settings/categories/SkillSettings.tsx +6 -3
  26. package/src/client/components/settings/categories/agent-settings/SidebarList.tsx +5 -0
  27. package/src/client/components/settings/categories/project-settings/AccentPalette.test.tsx +189 -0
  28. package/src/client/components/settings/categories/project-settings/AccentPalette.tsx +156 -24
  29. package/src/client/components/settings/categories/project-settings/AddProjectModal.tsx +175 -0
  30. package/src/client/components/settings/categories/project-settings/DeleteProjectModal.tsx +107 -0
  31. package/src/client/components/settings/categories/project-settings/DetailsForm.tsx +40 -24
  32. package/src/client/components/settings/categories/project-settings/DetailsHeader.tsx +17 -7
  33. package/src/client/components/settings/categories/project-settings/IconGrid.tsx +164 -69
  34. package/src/client/components/settings/categories/project-settings/ModelDropdown.test.tsx +122 -0
  35. package/src/client/components/settings/categories/project-settings/ModelDropdown.tsx +124 -53
  36. package/src/client/components/settings/categories/project-settings/NameInput.tsx +57 -11
  37. package/src/client/components/settings/categories/project-settings/PathField.tsx +122 -0
  38. package/src/client/components/settings/categories/project-settings/SidebarList.tsx +100 -59
  39. package/src/client/components/settings/categories/skill-catalog/GitImportPanel.tsx +253 -0
  40. package/src/client/components/settings/categories/skill-catalog/SkillCard.tsx +89 -0
  41. package/src/client/components/settings/categories/skill-catalog/SourceRail.tsx +122 -0
  42. package/src/client/components/settings/categories/skill-catalog/catalog-ui.test.tsx +179 -0
  43. package/src/client/components/settings/categories/skill-settings/DetailHeader.tsx +208 -0
  44. package/src/client/components/settings/categories/skill-settings/DetailPane.tsx +137 -232
  45. package/src/client/components/settings/categories/skill-settings/InstructionsEditor.tsx +84 -0
  46. package/src/client/components/settings/categories/skill-settings/SidebarList.tsx +123 -87
  47. package/src/client/components/settings/categories/skill-settings/pane.test.tsx +179 -0
  48. package/src/client/components/settings/categories/skill-settings/row-meta.ts +58 -0
  49. package/src/client/components/workspace/chat-timeline/index.tsx +6 -1
  50. package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Proc.test.ts +46 -0
  51. package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Proc.tsx +15 -6
  52. package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Wait.test.ts +29 -0
  53. package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Wait.tsx +11 -3
  54. package/src/client/components/workspace/chat-timeline/tool-renderers/shared/card-header.test.ts +24 -1
  55. package/src/client/components/workspace/chat-timeline/tool-renderers/shared/card-header.ts +6 -2
  56. package/src/client/components/workspace/editor/viewers/SvgPreview.tsx +18 -2
  57. package/src/client/components/workspace/editor/viewers/viewers.test.ts +39 -0
  58. package/src/client/components/workspace/file-explorer/ContextMenu.tsx +18 -5
  59. package/src/client/components/workspace/file-explorer/Modals.tsx +15 -1
  60. package/src/client/components/workspace/file-explorer/RowLabel.tsx +68 -0
  61. package/src/client/components/workspace/file-explorer/TreeItem.tsx +47 -57
  62. package/src/client/components/workspace/file-explorer/collapsed-chain.test.ts +167 -0
  63. package/src/client/components/workspace/file-explorer/drag-props.ts +42 -0
  64. package/src/client/components/workspace/file-explorer/drag.test.ts +43 -0
  65. package/src/client/components/workspace/file-explorer/index.tsx +21 -20
  66. package/src/client/data/settings/omp-schema.json +91 -4
  67. package/src/client/data/settings/project.ts +9 -28
  68. package/src/client/data/settings/skill.ts +6 -32
  69. package/src/client/hooks/chat/timeline/pending-model.ts +28 -0
  70. package/src/client/hooks/settings/projects/index.ts +294 -0
  71. package/src/client/hooks/settings/projects.test.ts +237 -0
  72. package/src/client/hooks/settings/skill-catalog.ts +101 -9
  73. package/src/client/hooks/settings/skill-git-import.ts +153 -0
  74. package/src/client/hooks/shell/servers.test.ts +166 -0
  75. package/src/client/hooks/{desktop → shell}/servers.ts +17 -14
  76. package/src/client/hooks/ui/updates/shell-download.ts +1 -1
  77. package/src/client/hooks/ui/updates/shell-update.ts +2 -6
  78. package/src/client/hooks/workspace/file-row-drag.ts +41 -0
  79. package/src/client/hooks/workspace/file-tree-actions.ts +25 -1
  80. package/src/client/hooks/workspace/file-tree-edits.ts +23 -6
  81. package/src/client/hooks/workspace/root-drop-target.ts +77 -0
  82. package/src/client/hooks/workspace/unfolded-chains.ts +165 -0
  83. package/src/client/lib/desktop/dropped-paths.ts +1 -1
  84. package/src/client/lib/desktop/titlebar.test.ts +12 -3
  85. package/src/client/lib/desktop/titlebar.ts +1 -1
  86. package/src/client/lib/shell/desktop.ts +117 -0
  87. package/src/client/lib/shell/servers.ts +75 -0
  88. package/src/client/lib/shell/transport.ts +216 -0
  89. package/src/client/main.tsx +9 -0
  90. package/src/server/lib/fs/git-merge-conflict.test.ts +14 -1
  91. package/src/server/lib/omp/config/skill-sources.ts +49 -0
  92. package/src/server/lib/omp/config/skills-git-install.ts +155 -0
  93. package/src/server/lib/omp/config/skills-git-repo.ts +288 -0
  94. package/src/server/lib/omp/config/skills-git.test.ts +220 -0
  95. package/src/server/lib/workspace/project-model.server.test.ts +102 -0
  96. package/src/server/lib/workspace/project-model.server.ts +47 -0
  97. package/src/server/lib/workspace/project-patch.server.ts +156 -0
  98. package/src/server/routes/agent/new.ts +8 -1
  99. package/src/server/routes/settings/agents.ts +19 -7
  100. package/src/server/routes/settings/projects.ts +53 -19
  101. package/src/server/routes/settings/settings-projects-routes.test.ts +214 -0
  102. package/src/server/routes/settings/settings-store-routes.test.ts +5 -2
  103. package/src/server/routes/settings/skills-catalog-actions.ts +195 -0
  104. package/src/server/routes/settings/skills.test.ts +225 -0
  105. package/src/server/routes/settings/skills.ts +18 -15
  106. package/src/shared/lib/fs/folder-chain.test.ts +81 -1
  107. package/src/shared/lib/fs/folder-chain.ts +84 -0
  108. package/src/shared/lib/omp/config/schema.test.ts +35 -0
  109. package/src/shared/lib/omp/session/job-progress.test.ts +37 -1
  110. package/src/shared/lib/omp/session/job-progress.ts +31 -0
  111. package/src/shared/lib/omp/session/proc.ts +5 -0
  112. package/src/shared/lib/omp/session/wait.ts +5 -0
  113. package/src/shared/lib/ui/mobile-overlay.ts +61 -0
  114. package/src/shared/lib/ui/svg-scope.test.ts +97 -0
  115. package/src/shared/lib/ui/svg-scope.ts +134 -0
  116. package/src/shared/lib/workspace/project-accent.test.ts +69 -0
  117. package/src/shared/lib/workspace/project-accent.ts +63 -0
  118. package/src/shared/lib/workspace/project-icon.ts +40 -0
  119. package/src/shared/lib/workspace/project-model.test.ts +79 -0
  120. package/src/shared/lib/workspace/project-model.ts +64 -0
  121. package/src/shared/types/settings/skill.ts +53 -3
  122. package/src/test-support/file-explorer-disk.test-util.ts +25 -1
  123. package/src/test-support/file-explorer-drag.test-util.ts +88 -0
  124. package/src/test-support/file-explorer.test-util.ts +47 -47
  125. package/dist/client/static/js/index-fjnq2z2d.css +0 -1
  126. package/src/client/components/common/code-surface/indent-guide.ts +0 -104
  127. package/src/client/components/settings/categories/skill-catalog/AddSourceModal.tsx +0 -133
  128. package/src/client/hooks/desktop/servers.test.ts +0 -73
  129. package/src/client/lib/desktop/bridge.ts +0 -203
  130. package/src/shared/lib/code/editor/indent-guide-rule.test.ts +0 -65
  131. package/src/shared/lib/code/editor/indent-guide-rule.ts +0 -47
@@ -0,0 +1,294 @@
1
+ /**
2
+ * @license
3
+ * SPDX-License-Identifier: MIT
4
+ */
5
+
6
+ /**
7
+ * The Projects pane's state: the folder list, one save path, and the failures
8
+ * it has to report.
9
+ *
10
+ * The pane used to write on every keystroke and drop every failure into
11
+ * `console.error`, so a refused rename (a duplicate name, an unbound path) left
12
+ * the form showing the new value while the server kept the old one, and the
13
+ * next refresh silently reverted it. Here a save is one request per committed
14
+ * field, the server's own copy of the row is merged back (it trims names and
15
+ * expands `~`), and a refusal is reported AND rolled back.
16
+ *
17
+ * The list is also re-read from the `sidebar` topic: another tab, the sidebar
18
+ * menu and this pane all write the same rows, and one signal is what keeps the
19
+ * three from disagreeing.
20
+ */
21
+
22
+ import { useCallback, useEffect, useMemo, useRef, useState } from 'preact/hooks';
23
+ import type { AccentColorOption, ProjectConfigItem } from '@/shared/types';
24
+ import { useModelsCatalog } from '@/client/hooks/models/use-models-catalog';
25
+ import { useSidebarData } from '@/client/hooks/chat/omp/session-list';
26
+ import { isRecord } from '@/shared/lib/util/guards';
27
+
28
+ export interface ProjectModelChoice {
29
+ provider: string;
30
+ id: string;
31
+ name: string;
32
+ }
33
+
34
+ export interface ProjectSettingsState {
35
+ projects: ProjectConfigItem[];
36
+ selected: ProjectConfigItem | null;
37
+ selectedId: string;
38
+ select: (id: string) => void;
39
+ accentColorOptions: AccentColorOption[];
40
+ /** Live catalog for the "Defaults for new chats" picker. */
41
+ models: ProjectModelChoice[];
42
+ isLoading: boolean;
43
+ /** Why the list could not be read, or null. */
44
+ loadError: string | null;
45
+ /** Reload the list from the server. */
46
+ refresh: () => Promise<void>;
47
+ /**
48
+ * Commit one field. Resolves `true` when the server holds the new value; the
49
+ * list is reverted and `onError` called otherwise.
50
+ */
51
+ updateField: <K extends keyof ProjectConfigItem>(
52
+ project: ProjectConfigItem,
53
+ field: K,
54
+ value: ProjectConfigItem[K],
55
+ ) => Promise<boolean>;
56
+ /**
57
+ Commit SEVERAL fields as one write.
58
+ *
59
+ The icon is two facts (`icon` + `customIconUrl`) and they must land together:
60
+ sent as two PATCHes they race, and whichever response arrives last decides the
61
+ row — measured as an uploaded image that saved and then reverted, because the
62
+ `icon: 'custom'` write was answered by a row still holding the old URL.
63
+ */
64
+ updateFields: (
65
+ project: ProjectConfigItem,
66
+ fields: Partial<ProjectConfigItem>,
67
+ ) => Promise<boolean>;
68
+ isAdding: boolean;
69
+ addProject: (input: { name: string; path: string }) => Promise<void>;
70
+ isDeleting: boolean;
71
+ deleteProject: (project: ProjectConfigItem) => Promise<void>;
72
+ onError: (message: string) => void;
73
+ }
74
+
75
+ const NO_SELECTION = '';
76
+
77
+ function isProject(value: unknown): value is ProjectConfigItem {
78
+ if (!isRecord(value)) return false;
79
+ return typeof value.id === 'string'
80
+ && typeof value.name === 'string'
81
+ && typeof value.path === 'string';
82
+ }
83
+
84
+ function isAccentOption(value: unknown): value is AccentColorOption {
85
+ if (!isRecord(value)) return false;
86
+ return typeof value.label === 'string' && typeof value.value === 'string' && typeof value.bgHex === 'string';
87
+ }
88
+
89
+ /** Merge a saved row back into the list; unknown ids are appended. */
90
+ function mergeProject(list: ProjectConfigItem[], saved: ProjectConfigItem): ProjectConfigItem[] {
91
+ const known = list.some((row) => row.id === saved.id);
92
+ return known ? list.map((row) => (row.id === saved.id ? saved : row)) : [...list, saved];
93
+ }
94
+
95
+ export function useProjectSettings(onError: (message: string) => void): ProjectSettingsState {
96
+ const [projects, setProjects] = useState<ProjectConfigItem[]>([]);
97
+ const [accentColorOptions, setAccentColorOptions] = useState<AccentColorOption[]>([]);
98
+ const [selectedId, setSelectedId] = useState<string>(NO_SELECTION);
99
+ const [isLoading, setIsLoading] = useState(true);
100
+ const [loadError, setLoadError] = useState<string | null>(null);
101
+ const [isAdding, setIsAdding] = useState(false);
102
+ const [isDeleting, setIsDeleting] = useState(false);
103
+
104
+ const onErrorRef = useRef(onError);
105
+ onErrorRef.current = onError;
106
+
107
+ const applyPayload = useCallback((data: unknown) => {
108
+ if (!isRecord(data)) return;
109
+ const rows = Array.isArray(data.projects) ? data.projects.filter(isProject) : null;
110
+ if (rows) {
111
+ setProjects(rows);
112
+ setSelectedId((current) =>
113
+ rows.some((row) => row.id === current) ? current : rows[0]?.id ?? NO_SELECTION,
114
+ );
115
+ }
116
+ if (Array.isArray(data.accentColorOptions)) {
117
+ setAccentColorOptions(data.accentColorOptions.filter(isAccentOption));
118
+ }
119
+ }, []);
120
+
121
+ const refresh = useCallback(async () => {
122
+ try {
123
+ const response = await fetch('/api/settings/projects');
124
+ const data: unknown = await response.json();
125
+ if (!response.ok) {
126
+ const reason = isRecord(data) && typeof data.error === 'string' ? data.error : `HTTP ${response.status}`;
127
+ setLoadError(reason);
128
+ return;
129
+ }
130
+ setLoadError(null);
131
+ applyPayload(data);
132
+ } catch (error) {
133
+ setLoadError(error instanceof Error ? error.message : String(error));
134
+ }
135
+ }, [applyPayload]);
136
+
137
+ useEffect(() => {
138
+ let active = true;
139
+ void (async () => {
140
+ await refresh();
141
+ if (active) setIsLoading(false);
142
+ })();
143
+ return () => {
144
+ active = false;
145
+ };
146
+ }, [refresh]);
147
+
148
+ // One signal for every writer of these rows (this pane, the sidebar menu,
149
+ // another tab). Keyed on the folder facts the pane renders, so an unrelated
150
+ // sidebar republish does not refetch.
151
+ const sidebarFolders = useSidebarData().folders;
152
+ const refreshKey = useMemo(
153
+ () => sidebarFolders
154
+ .map((folder) => `${folder.id}:${folder.name}:${folder.model ?? ''}:${folder.icon ?? ''}:${folder.accentColor ?? ''}:${folder.project_path ?? ''}:${folder.isPinned ? 1 : 0}`)
155
+ .join('|'),
156
+ [sidebarFolders],
157
+ );
158
+ useEffect(() => {
159
+ if (!refreshKey) return;
160
+ void refresh();
161
+ }, [refreshKey, refresh]);
162
+
163
+ /** One PATCH for a set of fields, with the row reverted if the server refuses. */
164
+ const saveFields = useCallback(async (
165
+ project: ProjectConfigItem,
166
+ fields: Partial<ProjectConfigItem>,
167
+ ): Promise<boolean> => {
168
+ if (project.folderId === undefined) {
169
+ onErrorRef.current('This project has no workspace row to save to.');
170
+ return false;
171
+ }
172
+ const previous = projects;
173
+ setProjects((current) => current.map((row) => (
174
+ row.id === project.id ? { ...row, ...fields } : row
175
+ )));
176
+ // An explicit `undefined` is how the pane clears a field (the custom icon),
177
+ // and the patch parser reads `null` as "unset".
178
+ const wire: Record<string, unknown> = { folderId: project.folderId };
179
+ for (const [key, value] of Object.entries(fields)) {
180
+ wire[key] = value === undefined ? null : value;
181
+ }
182
+ try {
183
+ const response = await fetch('/api/settings/projects', {
184
+ method: 'PATCH',
185
+ headers: { 'Content-Type': 'application/json' },
186
+ body: JSON.stringify({ project: wire }),
187
+ });
188
+ const data: unknown = await response.json().catch(() => null);
189
+ if (!response.ok) {
190
+ const reason = isRecord(data) && typeof data.error === 'string' ? data.error : `HTTP ${response.status}`;
191
+ throw new Error(reason);
192
+ }
193
+ // The server's row is authoritative (trimmed name, expanded path). A
194
+ // payload without one keeps the optimistic value rather than blanking it.
195
+ const saved = isRecord(data) && isProject(data.project) ? data.project : null;
196
+ if (saved) setProjects((current) => mergeProject(current, saved));
197
+ return true;
198
+ } catch (error) {
199
+ setProjects(previous);
200
+ onErrorRef.current(error instanceof Error ? error.message : String(error));
201
+ return false;
202
+ }
203
+ }, [projects]);
204
+
205
+ const updateField = useCallback(<K extends keyof ProjectConfigItem>(
206
+ project: ProjectConfigItem,
207
+ field: K,
208
+ value: ProjectConfigItem[K],
209
+ ): Promise<boolean> => saveFields(project, { [field]: value } as Partial<ProjectConfigItem>), [saveFields]);
210
+
211
+ const updateFields = useCallback(
212
+ (project: ProjectConfigItem, fields: Partial<ProjectConfigItem>): Promise<boolean> =>
213
+ saveFields(project, fields),
214
+ [saveFields],
215
+ );
216
+
217
+ const addProject = useCallback(async (input: { name: string; path: string }) => {
218
+ setIsAdding(true);
219
+ try {
220
+ const response = await fetch('/api/folders', {
221
+ method: 'POST',
222
+ headers: { 'Content-Type': 'application/json' },
223
+ body: JSON.stringify({ name: input.name, path: input.path }),
224
+ });
225
+ const data: unknown = await response.json().catch(() => null);
226
+ const folder = isRecord(data) ? data.folder : null;
227
+ const createdId = isRecord(folder) && typeof folder.id === 'number' ? folder.id : null;
228
+ if (!response.ok || !isRecord(data) || data.success !== true || createdId === null) {
229
+ const reason = isRecord(data) && typeof data.error === 'string' ? data.error : `HTTP ${response.status}`;
230
+ throw new Error(reason);
231
+ }
232
+ await refresh();
233
+ setSelectedId(`folder-${createdId}`);
234
+ } catch (error) {
235
+ onErrorRef.current(error instanceof Error ? error.message : String(error));
236
+ throw error;
237
+ } finally {
238
+ setIsAdding(false);
239
+ }
240
+ }, [refresh]);
241
+
242
+ const deleteProject = useCallback(async (project: ProjectConfigItem) => {
243
+ setIsDeleting(true);
244
+ try {
245
+ const response = await fetch(`/api/settings/projects?id=${encodeURIComponent(project.id)}`, {
246
+ method: 'DELETE',
247
+ });
248
+ const data: unknown = await response.json().catch(() => null);
249
+ if (!response.ok || !isRecord(data) || data.success !== true) {
250
+ const reason = isRecord(data) && typeof data.error === 'string' ? data.error : `HTTP ${response.status}`;
251
+ throw new Error(reason);
252
+ }
253
+ setProjects((current) => {
254
+ const remaining = current.filter((row) => row.id !== project.id);
255
+ setSelectedId((id) => (id === project.id ? remaining[0]?.id ?? NO_SELECTION : id));
256
+ return remaining;
257
+ });
258
+ } catch (error) {
259
+ onErrorRef.current(error instanceof Error ? error.message : String(error));
260
+ throw error;
261
+ } finally {
262
+ setIsDeleting(false);
263
+ }
264
+ }, []);
265
+
266
+ // One catalog subscription for the whole pane. A failed read leaves the
267
+ // picker empty, which is the honest state: no model can be offered.
268
+ const models = useModelsCatalog((data) => (
269
+ Array.isArray(data.modelList) && data.modelList.length > 0
270
+ ? data.modelList.map((entry) => ({ provider: entry.provider, id: entry.id, name: entry.name || entry.id }))
271
+ : undefined
272
+ )) ?? [];
273
+
274
+ const selected = projects.find((row) => row.id === selectedId) ?? projects[0] ?? null;
275
+
276
+ return {
277
+ projects,
278
+ selected,
279
+ selectedId: selected?.id ?? NO_SELECTION,
280
+ select: setSelectedId,
281
+ accentColorOptions,
282
+ models,
283
+ isLoading,
284
+ loadError,
285
+ refresh,
286
+ updateField,
287
+ updateFields,
288
+ isAdding,
289
+ addProject,
290
+ isDeleting,
291
+ deleteProject,
292
+ onError,
293
+ };
294
+ }
@@ -0,0 +1,237 @@
1
+ /**
2
+ * @license
3
+ * SPDX-License-Identifier: MIT
4
+ */
5
+
6
+ /**
7
+ * The Projects pane's state machine.
8
+ *
9
+ * The pane's failures used to be invisible: a save went out on every keystroke
10
+ * and a refused one was logged and forgotten, so the form showed a value the
11
+ * server never accepted until the next refresh silently reverted it. These
12
+ * cases pin what a user observes instead — the row reverts, the reason is
13
+ * reported, the server's own copy of the row wins, and a failed LIST is named
14
+ * rather than drawn as "no projects".
15
+ */
16
+
17
+ import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test } from 'bun:test';
18
+ import { Window } from 'happy-dom';
19
+ import { h, render } from 'preact';
20
+ import { act } from 'preact/test-utils';
21
+
22
+ import { useProjectSettings, type ProjectSettingsState } from '@/client/hooks/settings/projects';
23
+ import type { ProjectConfigItem } from '@/shared/types';
24
+ import { installDomGlobals, restoreDomGlobals } from '@/test-support/pristine-globals';
25
+
26
+ let container: HTMLElement;
27
+ let state: ProjectSettingsState | null = null;
28
+ let errors: string[] = [];
29
+ let requests: Array<{ url: string; method: string; body: string }> = [];
30
+ let respond: (url: string, init?: RequestInit) => Response;
31
+
32
+ const realFetch = Bun.fetch;
33
+
34
+ function json(value: unknown, status = 200): Response {
35
+ return new Response(JSON.stringify(value), { status, headers: { 'content-type': 'application/json' } });
36
+ }
37
+
38
+ function project(overrides: Partial<ProjectConfigItem> = {}): ProjectConfigItem {
39
+ return {
40
+ id: 'folder-1',
41
+ folderId: 1,
42
+ name: 'kabmo',
43
+ path: '/work/kabmo',
44
+ model: 'Not selected',
45
+ accentColor: '',
46
+ icon: 'default',
47
+ isPinned: false,
48
+ isExpanded: true,
49
+ ...overrides,
50
+ };
51
+ }
52
+
53
+ function Probe() {
54
+ state = useProjectSettings((message) => errors.push(message));
55
+ return null;
56
+ }
57
+
58
+ async function mount(): Promise<void> {
59
+ if (container) render(null, container);
60
+ container = document.body.appendChild(document.createElement('div'));
61
+ await act(async () => {
62
+ render(h(Probe, {}), container);
63
+ });
64
+ await flush();
65
+ }
66
+
67
+ async function flush(): Promise<void> {
68
+ for (let i = 0; i < 8; i += 1) await act(async () => {});
69
+ }
70
+
71
+ beforeAll(() => {
72
+ installDomGlobals(new Window({ url: 'http://localhost' }));
73
+ globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => {
74
+ const url = String(input);
75
+ requests.push({
76
+ url,
77
+ method: init?.method ?? 'GET',
78
+ body: typeof init?.body === 'string' ? init.body : '',
79
+ });
80
+ return respond(url, init);
81
+ }) as typeof fetch;
82
+ });
83
+
84
+ beforeEach(() => {
85
+ requests = [];
86
+ errors = [];
87
+ state = null;
88
+ respond = (url) => {
89
+ if (url.startsWith('/api/models')) return json({ models: {}, modelList: [], defaultModel: null, thinkingLevels: {} });
90
+ return json({ projects: [project()], accentColorOptions: [] });
91
+ };
92
+ });
93
+
94
+ afterEach(() => {
95
+ if (container) render(null, container);
96
+ container?.remove();
97
+ });
98
+
99
+ afterAll(() => {
100
+ globalThis.fetch = realFetch;
101
+ restoreDomGlobals();
102
+ });
103
+
104
+ describe('useProjectSettings', () => {
105
+ test('loads the list and selects the first project', async () => {
106
+ await mount();
107
+ expect(state?.projects.map((row) => row.id)).toEqual(['folder-1']);
108
+ expect(state?.selected?.name).toBe('kabmo');
109
+ expect(state?.isLoading).toBe(false);
110
+ });
111
+
112
+ test('a refused save reverts the row and reports the reason', async () => {
113
+ await mount();
114
+ respond = () => json({ error: 'A workspace named "kabmo" already exists', code: 'duplicate_name' }, 409);
115
+
116
+ const outcome: { accepted: boolean | null } = { accepted: null };
117
+ await act(async () => {
118
+ outcome.accepted = await state!.updateField(state!.selected!, 'name', 'Taken');
119
+ });
120
+
121
+ expect(outcome.accepted).toBe(false);
122
+ expect(state?.selected?.name).toBe('kabmo');
123
+ expect(errors).toEqual(['A workspace named "kabmo" already exists']);
124
+ });
125
+
126
+ test('an accepted save adopts the server row, not the typed one', async () => {
127
+ await mount();
128
+ respond = (_url, init) => {
129
+ if ((init?.method ?? 'GET') === 'GET') return json({ projects: [project()], accentColorOptions: [] });
130
+ // The server trims and expands: the pane must show what was stored.
131
+ return json({ success: true, changed: true, project: project({ name: 'Trimmed' }) });
132
+ };
133
+
134
+ await act(async () => {
135
+ await state!.updateField(state!.selected!, 'name', ' Trimmed ');
136
+ });
137
+ await flush();
138
+ expect(state?.selected?.name).toBe('Trimmed');
139
+ });
140
+
141
+ test('a failed list read is named instead of rendering as an empty list', async () => {
142
+ respond = () => json({ error: 'database is locked', projects: [] }, 500);
143
+ await mount();
144
+ expect(state?.loadError).toBe('database is locked');
145
+ expect(state?.projects).toEqual([]);
146
+ });
147
+
148
+ test('adding a project creates with the given name and directory, then selects it', async () => {
149
+ await mount();
150
+ respond = (url, init) => {
151
+ if (url === '/api/folders' && init?.method === 'POST') return json({ success: true, folder: { id: 9 } });
152
+ if (url.startsWith('/api/settings/projects')) {
153
+ return json({ projects: [project(), project({ id: 'folder-9', folderId: 9, name: 'new' })], accentColorOptions: [] });
154
+ }
155
+ return json({ modelList: [] });
156
+ };
157
+
158
+ await act(async () => {
159
+ await state!.addProject({ name: 'new', path: '/work/new' });
160
+ });
161
+ await flush();
162
+
163
+ const post = requests.find((request) => request.url === '/api/folders' && request.method === 'POST');
164
+ expect(post?.body).toBe(JSON.stringify({ name: 'new', path: '/work/new' }));
165
+ expect(state?.selectedId).toBe('folder-9');
166
+ // The plus button used to create an UNBOUND folder with a generated name.
167
+ expect(post?.body).not.toContain('Project ');
168
+ });
169
+
170
+ test('a refused creation reports the server sentence and rethrows to the dialog', async () => {
171
+ await mount();
172
+ respond = () => json({ error: 'A workspace with this name already exists', code: 'duplicate_name' }, 400);
173
+
174
+ const failure: { error: Error | null } = { error: null };
175
+ await act(async () => {
176
+ try {
177
+ await state!.addProject({ name: 'kabmo', path: '' });
178
+ } catch (error) {
179
+ failure.error = error as Error;
180
+ }
181
+ });
182
+
183
+ expect(failure.error?.message).toBe('A workspace with this name already exists');
184
+ expect(errors).toEqual(['A workspace with this name already exists']);
185
+ });
186
+
187
+ test('the icon and its image travel as ONE write', async () => {
188
+ await mount();
189
+ respond = (_url, init) => {
190
+ if ((init?.method ?? 'GET') === 'GET') return json({ projects: [project()], accentColorOptions: [] });
191
+ return json({
192
+ success: true,
193
+ changed: true,
194
+ project: project({ icon: 'custom', customIconUrl: 'data:image/png;base64,AAA' }),
195
+ });
196
+ };
197
+
198
+ await act(async () => {
199
+ await state!.updateFields(state!.selected!, {
200
+ customIconUrl: 'data:image/png;base64,AAA',
201
+ icon: 'custom',
202
+ });
203
+ });
204
+ await flush();
205
+
206
+ // Two PATCHes race and the slower response wins — the uploaded icon then
207
+ // reverted on screen. One request carries both fields.
208
+ const patches = requests.filter((request) => request.method === 'PATCH');
209
+ expect(patches).toHaveLength(1);
210
+ expect(JSON.parse(patches[0].body)).toEqual({
211
+ project: { folderId: 1, customIconUrl: 'data:image/png;base64,AAA', icon: 'custom' },
212
+ });
213
+ expect(state?.selected?.customIconUrl).toBe('data:image/png;base64,AAA');
214
+ expect(state?.selected?.icon).toBe('custom');
215
+ });
216
+
217
+ test('clearing the custom icon sends null, and the row follows the server', async () => {
218
+ await mount();
219
+ respond = (_url, init) => {
220
+ if ((init?.method ?? 'GET') === 'GET') {
221
+ return json({ projects: [project({ icon: 'custom', customIconUrl: 'data:image/png;base64,AAA' })], accentColorOptions: [] });
222
+ }
223
+ return json({ success: true, changed: true, project: project({ icon: 'default' }) });
224
+ };
225
+
226
+ await act(async () => {
227
+ await state!.updateFields(state!.selected!, { customIconUrl: undefined, icon: 'default' });
228
+ });
229
+ await flush();
230
+
231
+ const patch = requests.find((request) => request.method === 'PATCH');
232
+ expect(JSON.parse(patch?.body ?? '{}')).toEqual({
233
+ project: { folderId: 1, customIconUrl: null, icon: 'default' },
234
+ });
235
+ expect(state?.selected?.customIconUrl).toBeUndefined();
236
+ });
237
+ });
@@ -1,37 +1,129 @@
1
1
  import { useCallback, useEffect, useState } from 'preact/hooks';
2
2
  import type { Dispatch, StateUpdater } from 'preact/hooks';
3
- import type { CatalogSkillItem, SkillCatalogSource, SkillItem } from '@/shared/types';
3
+ import type { CatalogSkillItem, GitSkillEntry, SkillCatalogSource, SkillItem } from '@/shared/types';
4
4
 
5
5
  export interface SkillCatalogData {
6
6
  sources: SkillCatalogSource[];
7
+ /** skills.sh results — the Browse tab's list. */
7
8
  catalogSkills: CatalogSkillItem[];
8
9
  userSkills: SkillItem[];
9
10
  setSources: Dispatch<StateUpdater<SkillCatalogSource[]>>;
10
11
  setUserSkills: Dispatch<StateUpdater<SkillItem[]>>;
11
12
  reload: () => Promise<void>;
13
+ /** Search skills.sh for real; the answer replaces `catalogSkills`. */
14
+ search: (query: string) => Promise<CatalogSkillItem[]>;
15
+ addSource: (repo: string, name?: string) => Promise<SkillCatalogSource>;
16
+ removeSource: (id: string) => Promise<void>;
17
+ /**
18
+ * Scan one source and store the real count. The answer also carries the
19
+ * repository's skills so a caller can install straight from the card.
20
+ */
21
+ scanSource: (id: string) => Promise<{ skills: GitSkillEntry[]; notes: string[] }>;
22
+ }
23
+
24
+ interface CatalogPayload {
25
+ catalogSources?: SkillCatalogSource[];
26
+ catalogSkills?: CatalogSkillItem[];
27
+ skills?: SkillItem[];
28
+ error?: string;
29
+ }
30
+
31
+ interface ScanPayload extends CatalogPayload {
32
+ repo?: string;
33
+ notes?: string[];
34
+ }
35
+
36
+ /** One POST to the skills endpoint; a payload error becomes a thrown Error. */
37
+ async function post(body: unknown): Promise<CatalogPayload> {
38
+ const response = await fetch('/api/settings/skills', {
39
+ method: 'POST',
40
+ headers: { 'Content-Type': 'application/json' },
41
+ body: JSON.stringify(body),
42
+ });
43
+ const data = (await response.json().catch(() => ({}))) as CatalogPayload;
44
+ if (!response.ok || data.error) throw new Error(data.error || `Request failed (${response.status})`);
45
+ return data;
12
46
  }
13
47
 
14
48
  /**
15
- * Catalog dataset behind the skill catalog screen. The initial load and the
16
- * manual refresh hit the same endpoint and set the same three slices, so both
17
- * go through `reload`; each call site keeps its own toast/error handling.
49
+ * Catalog dataset behind the skill catalog screen.
50
+ *
51
+ * The initial load and the manual refresh hit the same endpoint and set the same
52
+ * three slices, so both go through `reload`; each call site keeps its own
53
+ * toast/error handling. The mutations answer the refreshed list, which is adopted
54
+ * verbatim — the server is the one that re-reads the stored sources.
18
55
  */
19
56
  export function useSkillCatalog(): SkillCatalogData {
20
57
  const [sources, setSources] = useState<SkillCatalogSource[]>([]);
21
58
  const [catalogSkills, setCatalogSkills] = useState<CatalogSkillItem[]>([]);
22
59
  const [userSkills, setUserSkills] = useState<SkillItem[]>([]);
23
60
 
61
+ const adopt = useCallback((data: CatalogPayload) => {
62
+ if (data.catalogSources) setSources(data.catalogSources);
63
+ if (data.catalogSkills) setCatalogSkills(data.catalogSkills);
64
+ if (data.skills) setUserSkills(data.skills);
65
+ }, []);
66
+
24
67
  const reload = useCallback(async () => {
25
68
  const res = await fetch('/api/settings/skills');
26
- const data = await res.json();
27
- if (data?.catalogSources) setSources(data.catalogSources);
28
- if (data?.catalogSkills) setCatalogSkills(data.catalogSkills);
29
- if (data?.skills) setUserSkills(data.skills);
69
+ adopt((await res.json()) as CatalogPayload);
70
+ }, [adopt]);
71
+
72
+ const search = useCallback(
73
+ async (query: string) => {
74
+ const trimmed = query.trim();
75
+ if (!trimmed) {
76
+ // An empty query restores the loader's own popular list rather than
77
+ // leaving the last search's rows on screen as if they were the catalog.
78
+ await reload();
79
+ return [];
80
+ }
81
+ const data = await post({ type: 'search_catalog', q: trimmed });
82
+ const results = data.catalogSkills ?? [];
83
+ setCatalogSkills(results);
84
+ return results;
85
+ },
86
+ [reload],
87
+ );
88
+
89
+ const addSource = useCallback(
90
+ async (repo: string, name?: string) => {
91
+ const data = await post({ type: 'add_source', repo, ...(name ? { name } : {}) });
92
+ adopt(data);
93
+ const added = data.catalogSources?.at(-1);
94
+ if (!added) throw new Error('The server stored the source but did not return it');
95
+ return added;
96
+ },
97
+ [adopt],
98
+ );
99
+
100
+ const removeSource = useCallback(
101
+ async (id: string) => {
102
+ adopt(await post({ type: 'remove_source', id }));
103
+ },
104
+ [adopt],
105
+ );
106
+
107
+ const scanSource = useCallback(async (id: string) => {
108
+ const data = (await post({ type: 'scan_source', id })) as ScanPayload & { skills?: GitSkillEntry[] };
109
+ if (data.catalogSources) setSources(data.catalogSources);
110
+ return { skills: data.skills ?? [], notes: data.notes ?? [] };
30
111
  }, []);
31
112
 
32
113
  useEffect(() => {
33
114
  reload().catch(console.error);
34
115
  }, [reload]);
35
116
 
36
- return { sources, catalogSkills, userSkills, setSources, setUserSkills, reload };
117
+ return {
118
+ sources,
119
+ catalogSkills,
120
+ userSkills,
121
+ setSources,
122
+ setUserSkills,
123
+ reload,
124
+ search,
125
+ addSource,
126
+ removeSource,
127
+ scanSource,
128
+ };
37
129
  }