@kabmo-labs/kabmo 0.17.0 → 0.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +538 -457
- package/dist/client/static/js/index-hp75vsv9.css +1 -0
- package/dist/client/static/js/{index-rerjq5th.js → index-tc09dtca.js} +823 -814
- package/package.json +1 -1
- package/src/client/components/common/MarkdownRenderer.tsx +136 -89
- package/src/client/components/common/anchored-menu/index.test.tsx +141 -0
- package/src/client/components/common/anchored-menu/index.tsx +143 -0
- package/src/client/components/common/markdown-review/ReviewPopover.tsx +144 -0
- package/src/client/components/common/markdown-review/ReviewSummary.tsx +108 -0
- package/src/client/components/common/markdown-review/index.tsx +129 -0
- package/src/client/components/common/server-control/Panel.tsx +33 -23
- package/src/client/components/common/server-control/index.test.tsx +11 -5
- package/src/client/components/common/server-control/index.tsx +10 -8
- package/src/client/components/layout/session-sidebar/CategoryHeader.tsx +42 -21
- package/src/client/components/layout/session-sidebar/CategoryHeader.worktree.test.tsx +36 -17
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +8 -7
- package/src/client/components/layout/session-sidebar/about-modal/NotesDialog.tsx +94 -0
- package/src/client/components/layout/session-sidebar/about-modal/VersionLine.test.tsx +68 -0
- package/src/client/components/layout/session-sidebar/about-modal/VersionLine.tsx +36 -0
- package/src/client/components/layout/session-sidebar/about-modal/index.tsx +57 -34
- package/src/client/components/layout/session-sidebar/modern/WorkspaceHeader.tsx +28 -10
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +7 -6
- package/src/client/components/layout/session-sidebar/modern/workspace-header.test.tsx +1 -1
- package/src/client/components/layout/update-popup/ReleaseNotes.tsx +8 -3
- package/src/client/components/layout/update-popup/index.tsx +5 -1
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +13 -15
- package/src/client/components/mobile/mobile-right-sidebar/Header.tsx +23 -1
- package/src/client/components/mobile/mobile-right-sidebar/MissingFileBanner.tsx +30 -0
- package/src/client/components/mobile/mobile-right-sidebar/PreviewScroller.tsx +18 -2
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +22 -67
- package/src/client/components/mobile/mobile-session-sidebar/ItemMenu.tsx +110 -0
- package/src/client/components/settings/SettingsSidebarList.tsx +20 -0
- package/src/client/components/settings/categories/AgentSettings.tsx +23 -50
- package/src/client/components/settings/categories/CommandSettings.tsx +2 -2
- package/src/client/components/settings/categories/McpSettings.tsx +4 -21
- package/src/client/components/settings/categories/OmpSettings.tsx +147 -194
- package/src/client/components/settings/categories/SkillSettings.tsx +2 -2
- package/src/client/components/settings/categories/TokenUsageSettings.tsx +211 -229
- package/src/client/components/settings/categories/agent-settings/DetailPane.tsx +229 -237
- package/src/client/components/settings/categories/agent-settings/ModelPicker.tsx +71 -0
- package/src/client/components/settings/categories/agent-settings/SidebarList.tsx +9 -2
- package/src/client/components/settings/categories/agent-settings/levels.ts +38 -0
- package/src/client/components/settings/categories/behavior-settings/Editor.tsx +27 -7
- package/src/client/components/settings/categories/chat-settings/ToolRenderSection.tsx +23 -5
- package/src/client/components/settings/categories/command-settings/DetailPane.tsx +75 -33
- package/src/client/components/settings/categories/command-settings/SidebarList.tsx +7 -0
- package/src/client/components/settings/categories/mcp-settings/DetailPane.tsx +91 -76
- package/src/client/components/settings/categories/mcp-settings/EnvVarsSection.tsx +83 -0
- package/src/client/components/settings/categories/mcp-settings/ImportModal.tsx +26 -13
- package/src/client/components/settings/categories/mcp-settings/SidebarList.tsx +20 -0
- package/src/client/components/settings/categories/omp-settings/ConfigTabs.tsx +97 -36
- package/src/client/components/settings/categories/omp-settings/EngineHeader.tsx +151 -0
- package/src/client/components/settings/categories/omp-settings/ExtensionsPanel.tsx +68 -32
- package/src/client/components/settings/categories/omp-settings/OrderedChips.tsx +119 -0
- package/src/client/components/settings/categories/omp-settings/PresetBar.tsx +14 -7
- package/src/client/components/settings/categories/omp-settings/RoleEditor.tsx +15 -6
- package/src/client/components/settings/categories/omp-settings/RowEditor.tsx +165 -226
- package/src/client/components/settings/categories/omp-settings/types.ts +28 -0
- package/src/client/components/settings/categories/skill-settings/DetailHeader.tsx +35 -7
- package/src/client/components/settings/categories/skill-settings/DetailPane.tsx +34 -14
- package/src/client/components/settings/categories/skill-settings/SidebarList.tsx +21 -0
- package/src/client/components/settings/categories/skill-settings/pane.test.tsx +15 -6
- package/src/client/components/settings/categories/token-usage-settings/Breakdown.tsx +242 -102
- package/src/client/components/settings/categories/token-usage-settings/Chart.tsx +130 -56
- package/src/client/components/settings/categories/token-usage-settings/Controls.tsx +135 -0
- package/src/client/components/settings/categories/token-usage-settings/MetricsGrid.tsx +55 -33
- package/src/client/components/settings/categories/token-usage-settings/Provenance.tsx +59 -0
- package/src/client/components/settings/categories/token-usage-settings/panel.test.tsx +239 -0
- package/src/client/components/workspace/browser-panel/Screencast.test.ts +1 -0
- package/src/client/components/workspace/browser-panel/Screencast.tsx +17 -22
- package/src/client/components/workspace/browser-panel/TabStrip.test.tsx +158 -0
- package/src/client/components/workspace/browser-panel/TabStrip.tsx +90 -0
- package/src/client/components/workspace/browser-panel/index.tsx +50 -4
- package/src/client/components/workspace/browser-toolbar/index.tsx +41 -1
- package/src/client/components/workspace/chat-timeline/ThinkingSection.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/ToolCallingSection.tsx +2 -0
- package/src/client/components/workspace/chat-timeline/block-chrome.test.tsx +13 -2
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Bash.test.ts +88 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Bash.tsx +24 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Read.test.ts +34 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Read.tsx +5 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/ArtifactChip.tsx +7 -6
- package/src/client/components/workspace/chat-timeline/tool-renderers/styles/Tui.test.tsx +237 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/styles/Tui.tsx +191 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/styles/styles.test.tsx +1 -1
- package/src/client/components/workspace/diff-panel/MergeDiffView.tsx +21 -7
- package/src/client/components/workspace/diff-panel/changes.test.ts +51 -0
- package/src/client/components/workspace/diff-panel/changes.ts +28 -12
- package/src/client/components/workspace/diff-panel/merge.test.ts +28 -0
- package/src/client/components/workspace/diff-panel/merge.ts +21 -1
- package/src/client/components/workspace/editor/Body.tsx +7 -0
- package/src/client/components/workspace/editor/FileDocument.tsx +15 -21
- package/src/client/components/workspace/editor/FilePane.tsx +12 -0
- package/src/client/components/workspace/editor/PreviewPane.tsx +70 -0
- package/src/client/components/workspace/editor/Toolbar.tsx +17 -1
- package/src/client/components/workspace/editor/index.tsx +25 -22
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +14 -0
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +12 -86
- package/src/client/components/workspace/editor/toolbar-toggle.tsx +53 -0
- package/src/client/components/workspace/editor/toolbar-write-clusters.tsx +112 -0
- package/src/client/components/workspace/git-panel/commit-modal.test.ts +5 -3
- package/src/client/components/workspace/user-browser-panel/AddressBar.tsx +5 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateBar.test.tsx +201 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateBar.tsx +112 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateLayer.test.tsx +225 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateLayer.tsx +217 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateTarget.tsx +99 -0
- package/src/client/components/workspace/user-browser-panel/Frame.tsx +30 -1
- package/src/client/components/workspace/user-browser-panel/index.tsx +81 -2
- package/src/client/data/agent-data/builtin.ts +0 -10
- package/src/client/data/agent-data/orchestrator.ts +0 -45
- package/src/client/data/agent-data/specialist.ts +0 -100
- package/src/client/data/mock/token-usage.ts +170 -120
- package/src/client/data/settings/omp-schema.json +33 -1
- package/src/client/hooks/browser/use-annotate.test.ts +143 -0
- package/src/client/hooks/browser/use-annotate.ts +98 -0
- package/src/client/hooks/browser/use-close-tab.test.ts +148 -0
- package/src/client/hooks/browser/use-close-tab.ts +67 -0
- package/src/client/hooks/browser/use-screencast.ts +13 -1
- package/src/client/hooks/chat/composer/browser-context.test.ts +117 -0
- package/src/client/hooks/chat/composer/browser-context.ts +40 -16
- package/src/client/hooks/chat/composer/items.test.ts +1 -1
- package/src/client/hooks/chat/composer/review-context.ts +38 -0
- package/src/client/hooks/chat/composer/use-draft.test.ts +132 -0
- package/src/client/hooks/chat/composer/use-draft.ts +31 -2
- package/src/client/hooks/chat/timeline/row-window.test.ts +15 -2
- package/src/client/hooks/editor/use-document-annotations.ts +124 -0
- package/src/client/hooks/editor/use-editor-panel-ui.ts +52 -0
- package/src/client/hooks/editor/use-file-review-mode.ts +35 -0
- package/src/client/hooks/editor/use-preview-review.ts +148 -0
- package/src/client/hooks/settings/agents.ts +149 -0
- package/src/client/hooks/settings/crud-list.test.ts +28 -6
- package/src/client/hooks/settings/crud-list.ts +96 -57
- package/src/client/hooks/settings/omp-config.ts +164 -0
- package/src/client/hooks/settings/useTokenUsage.ts +125 -0
- package/src/client/hooks/settings/write-feedback.test.ts +104 -0
- package/src/client/hooks/settings/write-feedback.ts +63 -0
- package/src/client/hooks/ui/markdown-hydration.ts +125 -0
- package/src/client/hooks/ui/updates/index.test.ts +100 -1
- package/src/client/hooks/ui/updates/index.ts +50 -0
- package/src/client/hooks/ui/updates/notes.test.ts +138 -0
- package/src/client/hooks/ui/updates/notes.ts +57 -0
- package/src/client/lib/browser/element-at.test.ts +229 -0
- package/src/client/lib/browser/element-at.ts +139 -0
- package/src/client/lib/review/client.ts +73 -0
- package/src/client/lib/router/search-params.ts +42 -20
- package/src/client/tailwind.css +65 -0
- package/src/server/lib/btw/lifecycle.server.ts +2 -2
- package/src/server/lib/db/schema.ts +7 -0
- package/src/server/lib/db/seed-terminal.test.ts +4 -0
- package/src/server/lib/omp/config/agent-definitions.test.ts +273 -0
- package/src/server/lib/omp/config/agents.ts +231 -61
- package/src/server/lib/omp/config/definitions.test.ts +9 -105
- package/src/server/lib/omp/config/extensions.ts +16 -7
- package/src/server/lib/omp/config/omp-config-files.test.ts +27 -0
- package/src/server/lib/omp/rpc/constants.test.ts +11 -0
- package/src/server/lib/omp/rpc/constants.ts +15 -0
- package/src/server/lib/omp/rpc/process.ts +11 -14
- package/src/server/lib/omp/rpc/session-commands.ts +6 -3
- package/src/server/lib/omp/rpc/utility-agent-dir.test.ts +134 -0
- package/src/server/lib/omp/rpc/utility-agent-dir.ts +138 -0
- package/src/server/lib/omp/rpc/utility.ts +12 -0
- package/src/server/lib/review/schema.server.ts +45 -0
- package/src/server/lib/review/store.server.ts +138 -0
- package/src/server/lib/terminal/attach-replay.test.ts +132 -0
- package/src/server/lib/terminal/output.test.ts +166 -0
- package/src/server/lib/terminal/output.ts +104 -0
- package/src/server/lib/terminal/runtime.server.ts +5 -0
- package/src/server/lib/terminal/send-result.test.ts +33 -0
- package/src/server/lib/terminal/send-result.ts +32 -0
- package/src/server/lib/terminal/session.server.ts +45 -11
- package/src/server/lib/terminal/store-liveness.test.ts +4 -0
- package/src/server/lib/updates/active-notes.test.ts +149 -0
- package/src/server/lib/updates/active-notes.ts +75 -0
- package/src/server/lib/updates/changelog-file.ts +42 -11
- package/src/server/lib/updates/changelog.test.ts +15 -1
- package/src/server/lib/updates/omp.ts +42 -15
- package/src/server/lib/updates/release-url.ts +27 -1
- package/src/server/lib/usage/index-parse.test.ts +200 -0
- package/src/server/lib/usage/index-parse.ts +178 -0
- package/src/server/lib/usage/index-query.server.ts +248 -0
- package/src/server/lib/usage/index-scan.server.ts +343 -0
- package/src/server/lib/usage/index-schema.server.ts +82 -0
- package/src/server/lib/usage/index.test.ts +234 -0
- package/src/server/lib/usage/providers.server.ts +4 -53
- package/src/server/routes/browser/index.ts +3 -0
- package/src/server/routes/browser/stream.ts +31 -2
- package/src/server/routes/browser/tabs.test.ts +94 -0
- package/src/server/routes/browser/tabs.ts +85 -0
- package/src/server/routes/index.ts +2 -0
- package/src/server/routes/review/bindings.ts +11 -0
- package/src/server/routes/review/index.ts +127 -0
- package/src/server/routes/review/routes.test.ts +191 -0
- package/src/server/routes/settings/agents.test.ts +180 -0
- package/src/server/routes/settings/agents.ts +95 -102
- package/src/server/routes/settings/mcp.test.ts +135 -0
- package/src/server/routes/settings/mcp.ts +14 -6
- package/src/server/routes/settings/settings-store-routes.test.ts +6 -113
- package/src/server/routes/telemetry/tokens.test.ts +145 -0
- package/src/server/routes/telemetry/tokens.ts +70 -149
- package/src/server/routes/terminal/ws.ts +6 -5
- package/src/server/routes/updates/index.ts +2 -0
- package/src/server/routes/updates/notes.ts +34 -0
- package/src/server/routes/updates/routes.test.ts +49 -0
- package/src/shared/lib/browser/annotate.test.ts +283 -0
- package/src/shared/lib/browser/annotate.ts +231 -0
- package/src/shared/lib/browser/browser-viewer.test.ts +26 -4
- package/src/shared/lib/browser/frame-gate.test.ts +91 -0
- package/src/shared/lib/browser/frame-gate.ts +69 -0
- package/src/shared/lib/browser/frame-params.test.ts +43 -0
- package/src/shared/lib/browser/frame-params.ts +60 -0
- package/src/shared/lib/browser/frame-pipeline.test.ts +132 -0
- package/src/shared/lib/browser/frame-pipeline.ts +80 -0
- package/src/shared/lib/browser/page-context.ts +60 -4
- package/src/shared/lib/browser/snapshot.test.ts +115 -0
- package/src/shared/lib/browser/snapshot.ts +112 -0
- package/src/shared/lib/browser/tab-close.test.ts +74 -0
- package/src/shared/lib/browser/tab-close.ts +77 -0
- package/src/shared/lib/browser/viewer.ts +45 -26
- package/src/shared/lib/chat/timeline/block-chrome.ts +19 -0
- package/src/shared/lib/chat/timeline/tool-render-mode.ts +17 -4
- package/src/shared/lib/chat/tool/artifact.ts +55 -20
- package/src/shared/lib/chat/tool/bash-facts.ts +96 -0
- package/src/shared/lib/chat/tool/minimized.test.ts +98 -0
- package/src/shared/lib/chat/tool/minimized.ts +64 -0
- package/src/shared/lib/chat/tool/summary.test.ts +28 -8
- package/src/shared/lib/chat/tool/summary.ts +3 -32
- package/src/shared/lib/markdown/blocks/anchor.ts +63 -0
- package/src/shared/lib/markdown/blocks/blocks.test.ts +141 -0
- package/src/shared/lib/markdown/blocks/renderer.ts +120 -0
- package/src/shared/lib/markdown/blocks/scan.ts +100 -0
- package/src/shared/lib/markdown/blocks/types.ts +62 -0
- package/src/shared/lib/markdown/marked.ts +58 -147
- package/src/shared/lib/markdown/math-extensions.ts +168 -0
- package/src/shared/lib/markdown/review/prompt.ts +77 -0
- package/src/shared/lib/markdown/review/reconcile.ts +55 -0
- package/src/shared/lib/markdown/review/review.test.ts +96 -0
- package/src/shared/lib/markdown/xml-sections.test.ts +140 -0
- package/src/shared/lib/markdown/xml-sections.ts +139 -0
- package/src/shared/lib/models/provider/label.ts +57 -0
- package/src/shared/lib/omp/config/agent-file.test.ts +54 -0
- package/src/shared/lib/omp/config/agent-file.ts +43 -0
- package/src/shared/lib/omp/config/row-value.test.ts +95 -0
- package/src/shared/lib/omp/config/row-value.ts +97 -0
- package/src/shared/lib/omp/config/schema.test.ts +31 -0
- package/src/shared/lib/omp/config/schema.ts +6 -0
- package/src/shared/lib/omp/rpc/frame.test.ts +48 -47
- package/src/shared/lib/omp/rpc/frame.ts +49 -40
- package/src/shared/lib/ui/menu-anchor.test.ts +69 -0
- package/src/shared/lib/ui/menu-anchor.ts +89 -0
- package/src/shared/lib/usage/breakdown.test.ts +197 -0
- package/src/shared/lib/usage/breakdown.ts +241 -0
- package/src/shared/lib/usage/range.test.ts +204 -0
- package/src/shared/lib/usage/range.ts +240 -0
- package/src/shared/lib/usage/view.test.ts +85 -0
- package/src/shared/lib/usage/view.ts +74 -0
- package/src/shared/types/browser.ts +78 -0
- package/src/shared/types/index.ts +1 -0
- package/src/shared/types/settings/agent.ts +28 -6
- package/src/shared/types/settings/state.ts +4 -3
- package/src/shared/types/settings/write.ts +6 -0
- package/src/shared/types/tokenUsage.ts +128 -21
- package/src/shared/types/updates.ts +20 -0
- package/dist/client/static/js/index-3ve31rzx.css +0 -1
- package/src/server/lib/omp/session/usage/aggregate-shaping.test.ts +0 -149
- package/src/server/lib/omp/session/usage/aggregate.test.ts +0 -243
- package/src/server/lib/omp/session/usage/aggregate.ts +0 -330
- package/src/server/lib/omp/session/usage/shaping.ts +0 -130
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The review surface's state for one previewed document: which block the judge
|
|
8
|
+
* panel is open on, and the stored marks with their block identities.
|
|
9
|
+
*
|
|
10
|
+
* Whether the mode is ON is the editor panel's state (`useFileReviewMode`) — this
|
|
11
|
+
* hook only answers "what happens while it is on", so the toolbar button and the
|
|
12
|
+
* surface cannot disagree about it.
|
|
13
|
+
*
|
|
14
|
+
* ## Blocks come from the RENDER, never from the file
|
|
15
|
+
*
|
|
16
|
+
* The caller stores them from `MarkdownRenderer`'s `onBlocks`. That list is what
|
|
17
|
+
* is actually on screen: a document the markdown healer cut short, or one a
|
|
18
|
+
* plugin's directive replaced, renders fewer (or different) blocks than it has
|
|
19
|
+
* paragraphs, and a mark must only ever attach to a block a reader can click.
|
|
20
|
+
*/
|
|
21
|
+
|
|
22
|
+
import { useCallback, useMemo, useState } from 'preact/hooks';
|
|
23
|
+
|
|
24
|
+
import { useDocumentAnnotations } from '@/client/hooks/editor/use-document-annotations';
|
|
25
|
+
import { reconcileAnnotations, tallyAnnotations } from '@/shared/lib/markdown/review/reconcile';
|
|
26
|
+
import { emitReviewBlock, formatReviewBlock } from '@/shared/lib/markdown/review/prompt';
|
|
27
|
+
import type { BlockVerdict, DocumentAnnotation, MdBlock, ReviewTarget } from '@/shared/lib/markdown/blocks/types';
|
|
28
|
+
|
|
29
|
+
export interface UsePreviewReviewOptions {
|
|
30
|
+
file: { name: string; path: string; root?: string | null; repo?: string | null };
|
|
31
|
+
/** Review mode, owned by the editor's toolbar. */
|
|
32
|
+
active: boolean;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export interface PreviewReviewState {
|
|
36
|
+
/** Verdicts the renderer paints, keyed by block key. */
|
|
37
|
+
marks: ReadonlyMap<string, BlockVerdict>;
|
|
38
|
+
/** The block the judge panel is open on. */
|
|
39
|
+
selected: string | null;
|
|
40
|
+
selectedBlock: MdBlock | null;
|
|
41
|
+
selectedAnnotation: DocumentAnnotation | null;
|
|
42
|
+
/** Where that block was on screen when it was picked (the panel anchors there). */
|
|
43
|
+
anchor: { top: number; left: number } | null;
|
|
44
|
+
/** Stored marks whose block is no longer rendered — shown, never dropped. */
|
|
45
|
+
outdated: DocumentAnnotation[];
|
|
46
|
+
counts: { good: number; needsWork: number };
|
|
47
|
+
loading: boolean;
|
|
48
|
+
error: string | null;
|
|
49
|
+
/** The render reports what it produced. */
|
|
50
|
+
setBlocks: (blocks: MdBlock[]) => void;
|
|
51
|
+
pick: (block: MdBlock, rect: DOMRect) => void;
|
|
52
|
+
close: () => void;
|
|
53
|
+
save: (input: { block: MdBlock; verdict: BlockVerdict; note: string }) => void;
|
|
54
|
+
remove: (id: string) => void;
|
|
55
|
+
/** Put the review in the composer draft. False when there is nothing to send. */
|
|
56
|
+
send: () => boolean;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
export function usePreviewReview({ file, active }: UsePreviewReviewOptions): PreviewReviewState {
|
|
60
|
+
const [blocks, setBlocksState] = useState<MdBlock[]>([]);
|
|
61
|
+
const [selected, setSelected] = useState<string | null>(null);
|
|
62
|
+
const [anchor, setAnchor] = useState<{ top: number; left: number } | null>(null);
|
|
63
|
+
|
|
64
|
+
// Primitives, not the object: a caller builds `file` inline.
|
|
65
|
+
const target = useMemo<ReviewTarget>(
|
|
66
|
+
() => ({ path: file.path, root: file.root ?? null, repo: file.repo ?? null }),
|
|
67
|
+
[file.path, file.root, file.repo],
|
|
68
|
+
);
|
|
69
|
+
const { annotations, loading, error, save, remove } = useDocumentAnnotations(target, active);
|
|
70
|
+
|
|
71
|
+
const { attached, outdated } = useMemo(
|
|
72
|
+
() => reconcileAnnotations(blocks, annotations),
|
|
73
|
+
[blocks, annotations],
|
|
74
|
+
);
|
|
75
|
+
const marks = useMemo(
|
|
76
|
+
() => new Map([...attached.values()].map((row) => [row.blockKey, row.verdict])),
|
|
77
|
+
[attached],
|
|
78
|
+
);
|
|
79
|
+
const counts = useMemo(() => tallyAnnotations(attached), [attached]);
|
|
80
|
+
const selectedBlock = useMemo(
|
|
81
|
+
() => (selected ? blocks.find((block) => block.key === selected) ?? null : null),
|
|
82
|
+
[blocks, selected],
|
|
83
|
+
);
|
|
84
|
+
|
|
85
|
+
const setBlocks = useCallback((next: MdBlock[]) => {
|
|
86
|
+
// The render hands back fresh objects every parse; comparing identity would
|
|
87
|
+
// store a new list on every keystroke for a document that did not change.
|
|
88
|
+
setBlocksState((previous) => sameBlockKeys(previous, next) ? previous : next);
|
|
89
|
+
}, []);
|
|
90
|
+
|
|
91
|
+
const pick = useCallback((block: MdBlock, rect: DOMRect) => {
|
|
92
|
+
setSelected(block.key);
|
|
93
|
+
// `fixed` coordinates: the judge panel is drawn where the block WAS. It
|
|
94
|
+
// closes on scroll instead of tracking, because a rendered document
|
|
95
|
+
// rehydrates (mermaid, math, directives) and every one of those moves blocks.
|
|
96
|
+
setAnchor({ top: rect.bottom + 6, left: Math.max(8, rect.left) });
|
|
97
|
+
}, []);
|
|
98
|
+
|
|
99
|
+
const close = useCallback(() => {
|
|
100
|
+
setSelected(null);
|
|
101
|
+
setAnchor(null);
|
|
102
|
+
}, []);
|
|
103
|
+
|
|
104
|
+
const saveBlock = useCallback<PreviewReviewState['save']>(
|
|
105
|
+
({ block, verdict, note }) => {
|
|
106
|
+
void save({
|
|
107
|
+
blockKey: block.key,
|
|
108
|
+
lineStart: block.lineStart,
|
|
109
|
+
lineEnd: block.lineEnd,
|
|
110
|
+
verdict,
|
|
111
|
+
note,
|
|
112
|
+
quote: block.quote,
|
|
113
|
+
});
|
|
114
|
+
},
|
|
115
|
+
[save],
|
|
116
|
+
);
|
|
117
|
+
|
|
118
|
+
const send = useCallback(() => {
|
|
119
|
+
const block = formatReviewBlock({ path: file.path, annotations: [...attached.values()] });
|
|
120
|
+
if (!block) return false;
|
|
121
|
+
emitReviewBlock(block);
|
|
122
|
+
return true;
|
|
123
|
+
}, [attached, file.path]);
|
|
124
|
+
|
|
125
|
+
return {
|
|
126
|
+
marks,
|
|
127
|
+
selected,
|
|
128
|
+
selectedBlock,
|
|
129
|
+
selectedAnnotation: selectedBlock ? attached.get(selectedBlock.key) ?? null : null,
|
|
130
|
+
anchor,
|
|
131
|
+
outdated,
|
|
132
|
+
counts,
|
|
133
|
+
loading,
|
|
134
|
+
error,
|
|
135
|
+
setBlocks,
|
|
136
|
+
pick,
|
|
137
|
+
close,
|
|
138
|
+
save: saveBlock,
|
|
139
|
+
remove: (id) => void remove(id),
|
|
140
|
+
send,
|
|
141
|
+
};
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
/** Same block list? Keys alone: the text a block shows is already in the HTML. */
|
|
145
|
+
function sameBlockKeys(left: readonly MdBlock[], right: readonly MdBlock[]): boolean {
|
|
146
|
+
if (left.length !== right.length) return false;
|
|
147
|
+
return left.every((block, index) => block.key === right[index]?.key);
|
|
148
|
+
}
|
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The Agents panel's list, over omp's own agent definition files.
|
|
8
|
+
*
|
|
9
|
+
* `GET /api/settings/agents` lists what `discoverNativeAgents` finds (user root
|
|
10
|
+
* plus the selected workspace's `.omp/agents`), and every write posts a
|
|
11
|
+
* `write`/`delete` action that lands in a markdown file — the only place omp
|
|
12
|
+
* reads agents from. Each write answers with the re-read list, which is adopted
|
|
13
|
+
* verbatim so the panel shows the files that exist rather than a draft that was
|
|
14
|
+
* never saved.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
import { useCallback, useEffect, useState } from 'preact/hooks';
|
|
18
|
+
import type { AgentItem, WriteOutcome } from '@/shared/types';
|
|
19
|
+
|
|
20
|
+
export interface AgentsController {
|
|
21
|
+
agents: AgentItem[];
|
|
22
|
+
selectedId: string | null;
|
|
23
|
+
selected: AgentItem | undefined;
|
|
24
|
+
isLoading: boolean;
|
|
25
|
+
/** Why the list could not be read, or null. */
|
|
26
|
+
loadError: string | null;
|
|
27
|
+
reload: () => void;
|
|
28
|
+
select: (id: string) => void;
|
|
29
|
+
/**
|
|
30
|
+
* Write one definition. `previousFileName` is the file the open definition
|
|
31
|
+
* was read from, which a rename replaces instead of leaving two copies.
|
|
32
|
+
*/
|
|
33
|
+
save: (agent: AgentItem, previousFileName?: string | null) => Promise<WriteOutcome>;
|
|
34
|
+
remove: (agent: AgentItem) => Promise<WriteOutcome>;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function readAgents(data: unknown): AgentItem[] | null {
|
|
38
|
+
if (typeof data !== 'object' || data === null || !('agents' in data)) return null;
|
|
39
|
+
return Array.isArray(data.agents) ? (data.agents as AgentItem[]) : null;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function readError(data: unknown): string | undefined {
|
|
43
|
+
if (typeof data !== 'object' || data === null || !('error' in data)) return undefined;
|
|
44
|
+
return typeof data.error === 'string' ? data.error : undefined;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export function useAgents(query: string): AgentsController {
|
|
48
|
+
const [agents, setAgents] = useState<AgentItem[]>([]);
|
|
49
|
+
const [selectedId, setSelectedId] = useState<string | null>(null);
|
|
50
|
+
const [isLoading, setIsLoading] = useState(true);
|
|
51
|
+
const [loadError, setLoadError] = useState<string | null>(null);
|
|
52
|
+
const [nonce, setNonce] = useState(0);
|
|
53
|
+
|
|
54
|
+
useEffect(() => {
|
|
55
|
+
let active = true;
|
|
56
|
+
setIsLoading(true);
|
|
57
|
+
fetch(`/api/settings/agents${query}`)
|
|
58
|
+
.then(async (res) => {
|
|
59
|
+
const data: unknown = await res.json().catch(() => null);
|
|
60
|
+
if (!res.ok) throw new Error(readError(data) ?? `GET /api/settings/agents answered ${res.status}`);
|
|
61
|
+
return data;
|
|
62
|
+
})
|
|
63
|
+
.then((data) => {
|
|
64
|
+
if (!active) return;
|
|
65
|
+
const list = readAgents(data) ?? [];
|
|
66
|
+
setAgents(list);
|
|
67
|
+
setLoadError(null);
|
|
68
|
+
setSelectedId((prev) => (list.some((agent) => agent.id === prev) ? prev : (list[0]?.id ?? null)));
|
|
69
|
+
})
|
|
70
|
+
.catch((err) => {
|
|
71
|
+
if (!active) return;
|
|
72
|
+
console.error('Failed to load agents:', err);
|
|
73
|
+
setLoadError(err instanceof Error ? err.message : String(err));
|
|
74
|
+
})
|
|
75
|
+
.finally(() => {
|
|
76
|
+
if (active) setIsLoading(false);
|
|
77
|
+
});
|
|
78
|
+
return () => {
|
|
79
|
+
active = false;
|
|
80
|
+
};
|
|
81
|
+
}, [query, nonce]);
|
|
82
|
+
|
|
83
|
+
const reload = useCallback(() => setNonce((n) => n + 1), []);
|
|
84
|
+
const select = useCallback((id: string) => setSelectedId(id), []);
|
|
85
|
+
|
|
86
|
+
const write = useCallback(async (body: Record<string, unknown>): Promise<WriteOutcome> => {
|
|
87
|
+
try {
|
|
88
|
+
const res = await fetch('/api/settings/agents', {
|
|
89
|
+
method: 'POST',
|
|
90
|
+
headers: { 'Content-Type': 'application/json' },
|
|
91
|
+
body: JSON.stringify(body),
|
|
92
|
+
});
|
|
93
|
+
const data: unknown = await res.json().catch(() => null);
|
|
94
|
+
const error = readError(data) ?? (res.ok ? undefined : `The write answered ${res.status}`);
|
|
95
|
+
if (error) return { ok: false, error };
|
|
96
|
+
const list = readAgents(data);
|
|
97
|
+
if (list) {
|
|
98
|
+
setAgents(list);
|
|
99
|
+
const written = body.fileName;
|
|
100
|
+
const match = typeof written === 'string'
|
|
101
|
+
? list.find((agent) => agent.fileName === written)
|
|
102
|
+
: undefined;
|
|
103
|
+
if (match) setSelectedId(match.id);
|
|
104
|
+
}
|
|
105
|
+
return { ok: true };
|
|
106
|
+
} catch (err) {
|
|
107
|
+
return { ok: false, error: err instanceof Error ? err.message : String(err) };
|
|
108
|
+
}
|
|
109
|
+
}, []);
|
|
110
|
+
|
|
111
|
+
const save = useCallback((agent: AgentItem, previousFileName?: string | null) => {
|
|
112
|
+
const fileName = agent.name.trim();
|
|
113
|
+
return write({
|
|
114
|
+
type: 'write',
|
|
115
|
+
fileName,
|
|
116
|
+
name: agent.name,
|
|
117
|
+
description: agent.description,
|
|
118
|
+
...(agent.model ? { model: agent.model } : {}),
|
|
119
|
+
...(agent.thinkingLevel ? { thinkingLevel: agent.thinkingLevel } : {}),
|
|
120
|
+
// `tools: undefined` leaves the file's own allowlist untouched.
|
|
121
|
+
...(agent.tools ? { tools: agent.tools } : {}),
|
|
122
|
+
...(agent.spawns ? { spawns: agent.spawns } : {}),
|
|
123
|
+
systemPrompt: agent.systemPrompt,
|
|
124
|
+
...(previousFileName && previousFileName !== fileName ? { previousFileName } : {}),
|
|
125
|
+
});
|
|
126
|
+
}, [write]);
|
|
127
|
+
|
|
128
|
+
const remove = useCallback(async (agent: AgentItem): Promise<WriteOutcome> => {
|
|
129
|
+
if (!agent.fileName) return { ok: false, error: 'This agent has no definition file to delete.' };
|
|
130
|
+
const outcome = await write({ type: 'delete', fileName: agent.fileName });
|
|
131
|
+
if (outcome.ok) {
|
|
132
|
+
setSelectedId((current) => (current === agent.id ? null : current));
|
|
133
|
+
setAgents((prev) => prev.filter((item) => item.id !== agent.id));
|
|
134
|
+
}
|
|
135
|
+
return outcome;
|
|
136
|
+
}, [write]);
|
|
137
|
+
|
|
138
|
+
return {
|
|
139
|
+
agents,
|
|
140
|
+
selectedId,
|
|
141
|
+
selected: agents.find((agent) => agent.id === selectedId),
|
|
142
|
+
isLoading,
|
|
143
|
+
loadError,
|
|
144
|
+
reload,
|
|
145
|
+
select,
|
|
146
|
+
save,
|
|
147
|
+
remove,
|
|
148
|
+
};
|
|
149
|
+
}
|
|
@@ -22,6 +22,7 @@ import { Window } from 'happy-dom';
|
|
|
22
22
|
import { h, render } from 'preact';
|
|
23
23
|
import { act } from 'preact/test-utils';
|
|
24
24
|
import { useCrudList, type CrudListConfig, type CrudListController } from '@/client/hooks/settings/crud-list';
|
|
25
|
+
import type { WriteOutcome } from '@/shared/types';
|
|
25
26
|
|
|
26
27
|
const DOM_GLOBALS = ['window', 'document', 'navigator', 'Node', 'Element', 'HTMLElement', 'Event', 'CustomEvent'] as const;
|
|
27
28
|
/** The runner's own globals, restored on teardown so later files still have them. */
|
|
@@ -198,14 +199,18 @@ describe('useCrudList save', () => {
|
|
|
198
199
|
expect(controller?.items.map((row) => row.id)).toEqual(['z']);
|
|
199
200
|
});
|
|
200
201
|
|
|
201
|
-
test('
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
respond = (_url, init) => ((init?.method ?? 'GET') === 'GET'
|
|
202
|
+
test('a refusal returns its sentence and touches nothing', async () => {
|
|
203
|
+
// The panes report `outcome.error`; a swallowed refusal used to paint
|
|
204
|
+
// "Saved successfully" over a row the server had rejected.
|
|
205
|
+
config = baseConfig();
|
|
206
|
+
respond = (_url, init) => ((init?.method ?? 'GET') === 'GET'
|
|
207
|
+
? json({ things: [{ id: 'a' }] })
|
|
208
|
+
: json({ error: 'A saved thing needs a name' }, 400));
|
|
206
209
|
await mount(h(CrudProbe, {}));
|
|
207
210
|
await flush(() => controller?.startCreate());
|
|
208
|
-
|
|
211
|
+
const outcomes: WriteOutcome[] = [];
|
|
212
|
+
await flush(() => { void controller?.save({ id: 'b' }).then((result) => outcomes.push(result)); });
|
|
213
|
+
expect(outcomes[0]).toEqual({ ok: false, error: 'A saved thing needs a name' });
|
|
209
214
|
expect(controller?.items.map((row) => row.id)).toEqual(['a']);
|
|
210
215
|
// The refusal returns before any of the success bookkeeping, so the create
|
|
211
216
|
// draft is still open for the user to retry or abandon.
|
|
@@ -213,6 +218,23 @@ describe('useCrudList save', () => {
|
|
|
213
218
|
expect(controller?.selectedId).toBeNull();
|
|
214
219
|
});
|
|
215
220
|
|
|
221
|
+
test('a write that lands reports ok', async () => {
|
|
222
|
+
config = baseConfig();
|
|
223
|
+
await mount(h(CrudProbe, {}));
|
|
224
|
+
await flush(() => controller?.select('a'));
|
|
225
|
+
const outcomes: WriteOutcome[] = [];
|
|
226
|
+
await flush(() => { void controller?.save({ id: 'a', name: 'renamed' }).then((result) => outcomes.push(result)); });
|
|
227
|
+
expect(outcomes[0]).toEqual({ ok: true });
|
|
228
|
+
});
|
|
229
|
+
|
|
230
|
+
test('a failed list read is reported instead of reading as an empty list', async () => {
|
|
231
|
+
config = baseConfig();
|
|
232
|
+
respond = () => json({ error: 'the agent directory is unreadable' }, 500);
|
|
233
|
+
await mount(h(CrudProbe, {}));
|
|
234
|
+
expect(controller?.loadError).toBe('the agent directory is unreadable');
|
|
235
|
+
expect(controller?.items).toEqual([]);
|
|
236
|
+
});
|
|
237
|
+
|
|
216
238
|
test('serverListOnly never upserts optimistically', async () => {
|
|
217
239
|
config = baseConfig({ serverListOnly: true });
|
|
218
240
|
await mount(h(CrudProbe, {}));
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { useEffect, useState } from 'preact/hooks';
|
|
1
|
+
import { useCallback, useEffect, useState } from 'preact/hooks';
|
|
2
2
|
import { invalidateComposerCache } from '@/shared/lib/chat/composer/client';
|
|
3
|
+
import type { WriteOutcome } from '@/shared/types';
|
|
3
4
|
|
|
4
5
|
export interface CrudListMessages {
|
|
5
6
|
load: string;
|
|
@@ -42,10 +43,6 @@ export interface CrudListConfig<T extends { id: string }, D = T> {
|
|
|
42
43
|
deleteFromResponse?: boolean;
|
|
43
44
|
/** When false, `selected` is undefined if no id matches. Defaults true. */
|
|
44
45
|
fallbackToFirst?: boolean;
|
|
45
|
-
/** Return true to abort save on a payload error (log inside the callback). */
|
|
46
|
-
isSaveError?: (data: unknown) => boolean;
|
|
47
|
-
/** Return true to abort delete on a payload error (log inside the callback). */
|
|
48
|
-
isDeleteError?: (data: unknown) => boolean;
|
|
49
46
|
}
|
|
50
47
|
|
|
51
48
|
export interface CrudListController<T extends { id: string }, D = T> {
|
|
@@ -54,10 +51,15 @@ export interface CrudListController<T extends { id: string }, D = T> {
|
|
|
54
51
|
selected: T | undefined;
|
|
55
52
|
isCreatingNew: boolean;
|
|
56
53
|
isLoading: boolean;
|
|
54
|
+
/** Why the list could not be read, or null. A failed read is never an empty list. */
|
|
55
|
+
loadError: string | null;
|
|
56
|
+
/** Re-run the list read (after a save that the server answered differently). */
|
|
57
|
+
reload: () => void;
|
|
57
58
|
select: (id: string) => void;
|
|
58
59
|
startCreate: () => void;
|
|
59
|
-
|
|
60
|
-
|
|
60
|
+
/** Resolves with the server's answer; the caller reports it. */
|
|
61
|
+
save: (draft: D) => Promise<WriteOutcome>;
|
|
62
|
+
remove: (id: string) => Promise<WriteOutcome>;
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
function defaultReadList<T>(listKey: string) {
|
|
@@ -67,6 +69,13 @@ function defaultReadList<T>(listKey: string) {
|
|
|
67
69
|
};
|
|
68
70
|
}
|
|
69
71
|
|
|
72
|
+
/** The refusal sentence a payload carries, when it carries one. */
|
|
73
|
+
function payloadError(data: unknown): string | null {
|
|
74
|
+
if (typeof data !== 'object' || data === null || !('error' in data)) return null;
|
|
75
|
+
const error = data.error;
|
|
76
|
+
return typeof error === 'string' && error.trim() ? error : null;
|
|
77
|
+
}
|
|
78
|
+
|
|
70
79
|
/** Shared load/save/delete + selection controller for the settings CRUD screens. */
|
|
71
80
|
export function useCrudList<T extends { id: string }, D = T>(
|
|
72
81
|
config: CrudListConfig<T, D>,
|
|
@@ -76,35 +85,51 @@ export function useCrudList<T extends { id: string }, D = T>(
|
|
|
76
85
|
const [selectedId, setSelectedId] = useState<string | null>(null);
|
|
77
86
|
const [isCreatingNew, setIsCreatingNew] = useState(false);
|
|
78
87
|
const [isLoading, setIsLoading] = useState(true);
|
|
88
|
+
const [loadError, setLoadError] = useState<string | null>(null);
|
|
89
|
+
const [loadNonce, setLoadNonce] = useState(0);
|
|
79
90
|
|
|
80
91
|
const readList = config.readList ?? defaultReadList<T>(listKey);
|
|
81
92
|
|
|
82
93
|
useEffect(() => {
|
|
83
94
|
let active = true;
|
|
95
|
+
setIsLoading(true);
|
|
84
96
|
fetch(`${endpoint}${query ?? ''}`)
|
|
85
|
-
.then((res) =>
|
|
97
|
+
.then(async (res) => {
|
|
98
|
+
const data: unknown = await res.json().catch(() => null);
|
|
99
|
+
if (!res.ok) throw new Error(payloadError(data) ?? `GET ${endpoint} answered ${res.status}`);
|
|
100
|
+
return data;
|
|
101
|
+
})
|
|
86
102
|
.then((data) => {
|
|
87
103
|
if (!active) return;
|
|
88
104
|
const list = readList(data) ?? [];
|
|
89
105
|
setItems(list);
|
|
106
|
+
setLoadError(null);
|
|
90
107
|
setSelectedId((prev) =>
|
|
91
108
|
config.resolveOnLoad ? config.resolveOnLoad(prev, list) : list.length > 0 ? list[0].id : null,
|
|
92
109
|
);
|
|
93
110
|
})
|
|
94
|
-
.catch((err) =>
|
|
111
|
+
.catch((err) => {
|
|
112
|
+
if (!active) return;
|
|
113
|
+
// Reported, never swallowed into an empty list: "no agents" and "the
|
|
114
|
+
// read failed" are different facts and the panel says which it is.
|
|
115
|
+
console.error(messages.load, err);
|
|
116
|
+
setLoadError(err instanceof Error ? err.message : String(err));
|
|
117
|
+
})
|
|
95
118
|
.finally(() => {
|
|
96
119
|
if (active) setIsLoading(false);
|
|
97
120
|
});
|
|
98
121
|
return () => {
|
|
99
122
|
active = false;
|
|
100
123
|
};
|
|
101
|
-
}, [endpoint, query]);
|
|
124
|
+
}, [endpoint, query, loadNonce]);
|
|
102
125
|
|
|
103
126
|
const selected =
|
|
104
127
|
config.fallbackToFirst === false
|
|
105
128
|
? items.find((item) => item.id === selectedId)
|
|
106
129
|
: items.find((item) => item.id === selectedId) ?? items[0];
|
|
107
130
|
|
|
131
|
+
const reload = useCallback(() => setLoadNonce((n) => n + 1), []);
|
|
132
|
+
|
|
108
133
|
const select = (id: string) => {
|
|
109
134
|
setIsCreatingNew(false);
|
|
110
135
|
setSelectedId(id);
|
|
@@ -115,62 +140,74 @@ export function useCrudList<T extends { id: string }, D = T>(
|
|
|
115
140
|
setSelectedId(null);
|
|
116
141
|
};
|
|
117
142
|
|
|
118
|
-
const save = (draft: D) => {
|
|
143
|
+
const save = async (draft: D): Promise<WriteOutcome> => {
|
|
119
144
|
const target = isCreatingNew
|
|
120
145
|
? config.buildNew(draft)
|
|
121
146
|
: config.buildUpdate(draft, selected, selectedId);
|
|
122
147
|
const body = config.buildBody ? config.buildBody(target) : { [config.bodyKey]: target };
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
.
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
+
try {
|
|
149
|
+
const res = await fetch(endpoint, {
|
|
150
|
+
method: 'POST',
|
|
151
|
+
headers: { 'Content-Type': 'application/json' },
|
|
152
|
+
body: JSON.stringify(body),
|
|
153
|
+
});
|
|
154
|
+
const data: unknown = await res.json().catch(() => null);
|
|
155
|
+
const error = payloadError(data) ?? (res.ok ? null : `POST ${endpoint} answered ${res.status}`);
|
|
156
|
+
if (error) {
|
|
157
|
+
console.error(messages.save, error);
|
|
158
|
+
return { ok: false, error };
|
|
159
|
+
}
|
|
160
|
+
const list = readList(data);
|
|
161
|
+
if (list) {
|
|
162
|
+
setItems(list);
|
|
163
|
+
} else if (!config.serverListOnly) {
|
|
164
|
+
setItems((prev) => {
|
|
165
|
+
const exists = prev.some((item) => item.id === target.id);
|
|
166
|
+
return exists
|
|
167
|
+
? prev.map((item) => (item.id === target.id ? target : item))
|
|
168
|
+
: [...prev, target];
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
const nextId = config.resolveOnSave ? config.resolveOnSave(target, list) : target.id;
|
|
172
|
+
if (nextId !== undefined) setSelectedId(nextId);
|
|
173
|
+
setIsCreatingNew(false);
|
|
174
|
+
if (cacheKey) invalidateComposerCache(cacheKey);
|
|
175
|
+
return { ok: true };
|
|
176
|
+
} catch (err) {
|
|
177
|
+
console.error(messages.save, err);
|
|
178
|
+
return { ok: false, error: err instanceof Error ? err.message : String(err) };
|
|
179
|
+
}
|
|
148
180
|
};
|
|
149
181
|
|
|
150
|
-
const remove = (id: string) => {
|
|
182
|
+
const remove = async (id: string): Promise<WriteOutcome> => {
|
|
151
183
|
const deleteQuery = config.buildDeleteQuery
|
|
152
184
|
? config.buildDeleteQuery(id)
|
|
153
185
|
: `?id=${encodeURIComponent(id)}`;
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
.
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
186
|
+
try {
|
|
187
|
+
const res = await fetch(`${endpoint}${deleteQuery}`, { method: 'DELETE' });
|
|
188
|
+
const data: unknown = await res.json().catch(() => null);
|
|
189
|
+
const error = payloadError(data) ?? (res.ok ? null : `DELETE ${endpoint} answered ${res.status}`);
|
|
190
|
+
if (error) {
|
|
191
|
+
console.error(messages.delete, error);
|
|
192
|
+
return { ok: false, error };
|
|
193
|
+
}
|
|
194
|
+
if (cacheKey) invalidateComposerCache(cacheKey);
|
|
195
|
+
if (config.deleteFromResponse) {
|
|
196
|
+
const list = readList(data) ?? items.filter((item) => item.id !== id);
|
|
197
|
+
setItems(list);
|
|
198
|
+
if (selectedId === id) setSelectedId(list[0]?.id ?? null);
|
|
199
|
+
} else {
|
|
200
|
+
const reloadRes = await fetch(`${endpoint}${query ?? ''}`);
|
|
201
|
+
const reloadData: unknown = await reloadRes.json().catch(() => null);
|
|
202
|
+
const next = readList(reloadData) ?? [];
|
|
203
|
+
setItems(next);
|
|
204
|
+
if (selectedId === id) setSelectedId(next[0]?.id || null);
|
|
205
|
+
}
|
|
206
|
+
return { ok: true };
|
|
207
|
+
} catch (err) {
|
|
208
|
+
console.error(messages.delete, err);
|
|
209
|
+
return { ok: false, error: err instanceof Error ? err.message : String(err) };
|
|
210
|
+
}
|
|
174
211
|
};
|
|
175
212
|
|
|
176
213
|
return {
|
|
@@ -179,6 +216,8 @@ export function useCrudList<T extends { id: string }, D = T>(
|
|
|
179
216
|
selected,
|
|
180
217
|
isCreatingNew,
|
|
181
218
|
isLoading,
|
|
219
|
+
loadError,
|
|
220
|
+
reload,
|
|
182
221
|
select,
|
|
183
222
|
startCreate,
|
|
184
223
|
save,
|