@kabmo-labs/kabmo 0.27.0 → 0.28.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 +495 -467
- package/dist/client/static/js/index-81f7berm.css +1 -0
- package/dist/client/static/js/{index-e3qh2yps.js → index-xzvyrxya.js} +795 -795
- package/marketplace/plugins/command-runner/package.json +3 -17
- package/marketplace/plugins/command-runner/settings-schema.json +14 -0
- package/marketplace/plugins/git-forge/README.md +17 -7
- package/marketplace/plugins/git-forge/package.json +4 -30
- package/marketplace/plugins/git-forge/panel.css +16 -0
- package/marketplace/plugins/git-forge/settings-schema.json +27 -0
- package/marketplace/plugins/git-forge/src/panel/Badge.tsx +35 -22
- package/marketplace/plugins/git-forge/src/panel/Change.tsx +20 -24
- package/marketplace/plugins/git-forge/src/panel/CiBadge.tsx +16 -7
- package/marketplace/plugins/git-forge/src/panel/Credential.tsx +31 -26
- package/marketplace/plugins/git-forge/src/panel/Glyph.tsx +18 -2
- package/marketplace/plugins/git-forge/src/panel/Header.tsx +160 -96
- package/marketplace/plugins/git-forge/src/panel/ItemView.tsx +60 -44
- package/marketplace/plugins/git-forge/src/panel/List.tsx +150 -22
- package/marketplace/plugins/git-forge/src/panel/Row.tsx +11 -5
- package/marketplace/plugins/git-forge/src/panel/Sidebar.tsx +17 -15
- package/marketplace/plugins/git-forge/src/panel/Write.tsx +84 -61
- package/marketplace/plugins/git-forge/src/panel/format.test.ts +99 -0
- package/marketplace/plugins/git-forge/src/panel/format.ts +59 -16
- package/marketplace/plugins/git-forge/src/panel/index.test.tsx +109 -5
- package/marketplace/plugins/git-forge/src/panel/index.tsx +37 -4
- package/marketplace/plugins/git-forge/src/panel/use-forge.ts +17 -0
- package/marketplace/plugins/git-forge/src/panel/write.test.tsx +31 -0
- package/marketplace/plugins/session-info/package.json +2 -10
- package/marketplace/plugins/session-info/settings-schema.json +8 -0
- package/marketplace/plugins/stats/README.md +17 -5
- package/marketplace/plugins/stats/package.json +3 -23
- package/marketplace/plugins/stats/settings-schema.json +20 -0
- package/marketplace/plugins/stats/src/app.tsx +1 -1
- package/marketplace/plugins/stats/src/groups.test.ts +46 -1
- package/marketplace/plugins/stats/src/groups.ts +22 -11
- package/marketplace/plugins/stats/src/harness-leases.test.ts +84 -0
- package/marketplace/plugins/stats/src/harness-leases.ts +132 -0
- package/marketplace/plugins/stats/src/labels.test.ts +54 -1
- package/marketplace/plugins/stats/src/labels.ts +33 -7
- package/marketplace/plugins/stats/src/sampler.test.ts +61 -0
- package/marketplace/plugins/stats/src/sampler.ts +39 -5
- package/marketplace/plugins/stats/src/snapshot.ts +6 -0
- package/package.json +2 -2
- package/src/client/components/common/harness-glyph/index.tsx +18 -1
- package/src/client/components/common/session-actions-menu/index.test.tsx +106 -0
- package/src/client/components/common/session-actions-menu/index.tsx +43 -1
- package/src/client/components/common/session-row/TrailingSlot.tsx +9 -4
- package/src/client/components/common/session-row/index.tsx +4 -0
- package/src/client/components/common/session-row/session-row.test.tsx +6 -0
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +2 -1
- package/src/client/components/layout/session-sidebar/SessionItem.tsx +9 -1
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +2 -1
- package/src/client/components/layout/session-sidebar/scheduler-modal/ModelFields.tsx +202 -0
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskForm.tsx +80 -19
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskList.tsx +23 -3
- package/src/client/components/layout/session-sidebar/scheduler-modal/index.tsx +3 -0
- package/src/client/components/mobile/mobile-right-sidebar/EditorSurface.tsx +156 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +41 -86
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +2 -1
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.test.ts +6 -0
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.tsx +9 -1
- package/src/client/components/settings/Modal.tsx +6 -2
- package/src/client/components/settings/Sidebar.tsx +30 -3
- package/src/client/components/settings/categories/HarnessSettings.tsx +11 -7
- package/src/client/components/settings/categories/NotificationSettings.test.tsx +40 -15
- package/src/client/components/settings/categories/NotificationSettings.tsx +142 -64
- package/src/client/components/settings/categories/PanelPluginSettings.tsx +1 -1
- package/src/client/components/settings/categories/harness-settings/CustomHarnessForm.tsx +186 -0
- package/src/client/components/settings/categories/panel-plugins/InstalledList.tsx +11 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.test.tsx +1 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.tsx +15 -1
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.test.tsx +165 -0
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.tsx +260 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.fork.test.ts +24 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.tsx +8 -4
- package/src/client/components/workspace/chat-timeline/ComposerDock.tsx +34 -0
- package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +3 -2
- package/src/client/components/workspace/chat-timeline/MessageItem.fork.test.ts +80 -0
- package/src/client/components/workspace/chat-timeline/MessageItem.tsx +9 -3
- package/src/client/components/workspace/chat-timeline/MessageList.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/RunFooter.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/TimelineBody.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/chat-input/ComposerRows.tsx +8 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.test.tsx +9 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.tsx +4 -1
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +24 -0
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.tsx +13 -20
- package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +2 -0
- package/src/client/components/workspace/chat-timeline/chat-input/props.ts +5 -5
- package/src/client/components/workspace/chat-timeline/index.tsx +11 -5
- package/src/client/components/workspace/chat-timeline/target-picker/DraftTargetRow.tsx +1 -9
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.test.tsx +101 -0
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.tsx +2 -2
- package/src/client/components/workspace/editor/FilePane.tsx +9 -4
- package/src/client/components/workspace/editor/Notices.tsx +2 -2
- package/src/client/components/workspace/editor/Pane.tsx +2 -2
- package/src/client/components/workspace/editor/Toolbar.tsx +16 -10
- package/src/client/components/workspace/editor/index.tsx +6 -10
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +4 -3
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +23 -14
- package/src/client/components/workspace/terminal-panel/RealtimeTerminalView.tsx +9 -1
- package/src/client/components/workspace/terminal-panel/focus.test.ts +70 -0
- package/src/client/components/workspace/terminal-panel/focus.ts +46 -0
- package/src/client/components/workspace/terminal-panel/index.tsx +14 -1
- package/src/client/components/workspace/terminal-panel/mount.ts +17 -9
- package/src/client/components/workspace/terminal-panel/scroll-hold.test.ts +158 -0
- package/src/client/components/workspace/terminal-panel/scroll-hold.ts +136 -0
- package/src/client/hooks/chat/composer/use-draft.ts +45 -1
- package/src/client/hooks/chat/omp/pending-sessions.waiting.test.ts +11 -10
- package/src/client/hooks/chat/omp/pending-waiting.ts +15 -7
- package/src/client/hooks/chat/omp/prompt-send.test.ts +11 -0
- package/src/client/hooks/chat/omp/prompt-send.ts +3 -0
- package/src/client/hooks/chat/timeline/actions.ts +4 -4
- package/src/client/hooks/chat/timeline/composer-modes.ts +13 -2
- package/src/client/hooks/chat/timeline/fork-open.ts +52 -0
- package/src/client/hooks/chat/timeline/index.ts +5 -2
- package/src/client/hooks/chat/timeline/mode-availability.ts +7 -0
- package/src/client/hooks/chat/timeline/modes-contract.ts +6 -0
- package/src/client/hooks/chat/timeline/modes-hydrate.ts +93 -0
- package/src/client/hooks/chat/timeline/modes.ts +32 -52
- package/src/client/hooks/chat/timeline/new-chat-open.ts +7 -6
- package/src/client/hooks/chat/timeline/new-chat.ts +10 -1
- package/src/client/hooks/chat/timeline/pending-dispatch.ts +4 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.test.ts +136 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.ts +69 -0
- package/src/client/hooks/chat/timeline/pending-warmup.test.ts +147 -0
- package/src/client/hooks/chat/timeline/pending-warmup.ts +62 -0
- package/src/client/hooks/chat/timeline/run-identity.test.ts +12 -0
- package/src/client/hooks/chat/timeline/run-identity.ts +4 -1
- package/src/client/hooks/chat/timeline/send-props.ts +2 -0
- package/src/client/hooks/chat/timeline/send-steer.test.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test-util.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test.ts +1 -0
- package/src/client/hooks/chat/timeline/session-harness.ts +4 -0
- package/src/client/hooks/chat/timeline/use-fork-session.ts +9 -22
- package/src/client/hooks/chat/waiting/cancel.ts +13 -6
- package/src/client/hooks/chat/waiting/choice.ts +13 -16
- package/src/client/hooks/chat/waiting/composer-wait.ts +70 -0
- package/src/client/hooks/chat/waiting/dispatch.ts +48 -28
- package/src/client/hooks/chat/waiting/held.ts +37 -13
- package/src/client/hooks/chat/waiting/hold.test.ts +22 -0
- package/src/client/hooks/chat/waiting/hold.ts +20 -11
- package/src/client/hooks/chat/waiting/restore.test.ts +69 -0
- package/src/client/hooks/chat/waiting/restore.ts +34 -0
- package/src/client/hooks/chat/waiting/store.ts +9 -3
- package/src/client/hooks/editor/file-editor-types.ts +21 -12
- package/src/client/hooks/editor/save-file.test.ts +1 -1
- package/src/client/hooks/editor/save-file.ts +35 -8
- package/src/client/hooks/editor/target-key.ts +17 -0
- package/src/client/hooks/editor/use-disk-digest.test.ts +82 -0
- package/src/client/hooks/editor/use-disk-digest.ts +164 -0
- package/src/client/hooks/editor/use-disk-sync.ts +212 -0
- package/src/client/hooks/editor/use-file-cache.ts +113 -0
- package/src/client/hooks/editor/use-file-editor.test.ts +90 -0
- package/src/client/hooks/editor/use-file-editor.ts +90 -52
- package/src/client/hooks/editor/use-file-read.ts +24 -10
- package/src/client/hooks/editor/use-file-writes.ts +4 -4
- package/src/client/hooks/models/harness-catalog.ts +15 -0
- package/src/client/hooks/ui/notifications.ts +17 -8
- package/src/client/hooks/workspace/panel-registry.ts +1 -1
- package/src/client/hooks/workspace/scheduled-tasks.ts +26 -11
- package/src/client/lib/notifications/os.test.ts +1 -30
- package/src/client/lib/notifications/os.ts +0 -15
- package/src/client/lib/notifications/platform.test.ts +68 -0
- package/src/client/lib/notifications/platform.ts +36 -0
- package/src/server/index.ts +7 -0
- package/src/server/lib/harness/acp/client.ts +81 -87
- package/src/server/lib/harness/acp/prewarm.server.ts +237 -0
- package/src/server/lib/harness/acp/prewarm.test.ts +171 -0
- package/src/server/lib/harness/acp/prompt.test.ts +70 -1
- package/src/server/lib/harness/acp/prompt.ts +32 -1
- package/src/server/lib/harness/acp/protocol.ts +23 -0
- package/src/server/lib/harness/acp/session-handshake.test.ts +26 -0
- package/src/server/lib/harness/acp/session-handshake.ts +22 -20
- package/src/server/lib/harness/acp/session-options.ts +16 -0
- package/src/server/lib/harness/acp/session-process.ts +43 -0
- package/src/server/lib/harness/acp/session.ts +11 -12
- package/src/server/lib/harness/acp/stdio.ts +129 -0
- package/src/server/lib/harness/acp/verbs.test.ts +97 -0
- package/src/server/lib/harness/acp/verbs.ts +16 -6
- package/src/server/lib/harness/auto-probe.server.ts +4 -3
- package/src/server/lib/harness/capabilities.ts +8 -0
- package/src/server/lib/harness/config.server.ts +3 -2
- package/src/server/lib/harness/custom.server.ts +209 -0
- package/src/server/lib/harness/launch.ts +6 -1
- package/src/server/lib/harness/register.server.ts +8 -1
- package/src/server/lib/harness/schema.server.ts +21 -0
- package/src/server/lib/harness/session-lease.server.test.ts +99 -0
- package/src/server/lib/harness/session-lease.server.ts +193 -0
- package/src/server/lib/harness/session-store.server.test.ts +8 -8
- package/src/server/lib/harness/session-store.server.ts +25 -4
- package/src/server/lib/harness/session-title.server.ts +12 -2
- package/src/server/lib/harness/spawn.server.ts +123 -20
- package/src/server/lib/harness/update-queue.server.ts +3 -3
- package/src/server/lib/lifecycle/after-listen.ts +12 -1
- package/src/server/lib/lifecycle/paths.ts +19 -1
- package/src/server/lib/mcp/registry.server.ts +155 -0
- package/src/server/lib/mcp/registry.test.ts +169 -0
- package/src/server/lib/mcp/store.server.ts +38 -0
- package/src/server/lib/omp/rpc/frame-fold-contract.ts +59 -0
- package/src/server/lib/omp/rpc/frame-fold-frames.test.ts +64 -1
- package/src/server/lib/omp/rpc/frame-fold-host.test-util.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold.test.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold.ts +6 -45
- package/src/server/lib/omp/rpc/prewarm-pool.ts +19 -5
- package/src/server/lib/omp/rpc/run-model.test.ts +116 -0
- package/src/server/lib/omp/rpc/run-model.ts +4 -2
- package/src/server/lib/omp/session/sidebar-data.harness.test.ts +6 -3
- package/src/server/lib/omp/session/standby.server.ts +13 -2
- package/src/server/lib/panels/manifest.test.ts +47 -1
- package/src/server/lib/panels/manifest.ts +19 -0
- package/src/server/lib/panels/registry.server.ts +19 -2
- package/src/server/lib/panels/scan.server.ts +26 -2
- package/src/server/lib/panels/settings-schema.server.ts +72 -0
- package/src/server/lib/plugins/background.server.ts +21 -3
- package/src/server/lib/plugins/background.test.ts +13 -0
- package/src/server/lib/plugins/loader.server.ts +35 -51
- package/src/server/lib/plugins/mcp.server.ts +100 -0
- package/src/server/lib/plugins/mcp.test.ts +75 -0
- package/src/server/lib/plugins/schedule-runner.server.ts +153 -0
- package/src/server/lib/plugins/schedule-runner.test.ts +186 -0
- package/src/server/lib/plugins/schedule-store.server.ts +107 -0
- package/src/server/lib/plugins/schema.server.ts +8 -0
- package/src/server/lib/plugins/settings.server.ts +56 -19
- package/src/server/lib/plugins/shutdown.server.ts +58 -0
- package/src/server/lib/plugins/shutdown.test.ts +28 -3
- package/src/server/lib/realtime/topics/global.server.ts +5 -1
- package/src/server/lib/schedule/rows.server.ts +9 -0
- package/src/server/lib/schedule/runtime.server.test.ts +91 -0
- package/src/server/lib/schedule/runtime.server.ts +101 -23
- package/src/server/lib/schedule/schema.server.ts +15 -0
- package/src/server/lib/schedule/store.server.test.ts +34 -0
- package/src/server/lib/schedule/store.server.ts +33 -9
- package/src/server/lib/sessions/fork.server.test.ts +47 -0
- package/src/server/lib/sessions/fork.server.ts +17 -1
- package/src/server/lib/sessions/spawn.server.ts +2 -2
- package/src/server/lib/waiting/runtime.server.test.ts +48 -0
- package/src/server/lib/waiting/runtime.server.ts +22 -0
- package/src/server/lib/waiting/schema.server.ts +8 -0
- package/src/server/lib/waiting/store.server.test.ts +14 -0
- package/src/server/lib/waiting/store.server.ts +6 -2
- package/src/server/routes/agent/command-resume.test.ts +9 -4
- package/src/server/routes/agent/new-mode.test.ts +40 -0
- package/src/server/routes/agent/new.ts +31 -10
- package/src/server/routes/agent/prewarm.ts +48 -7
- package/src/server/routes/fs/action.ts +9 -1
- package/src/server/routes/fs/digest.test.ts +100 -0
- package/src/server/routes/fs/digest.ts +106 -0
- package/src/server/routes/fs/index.ts +2 -0
- package/src/server/routes/fs/read.ts +6 -1
- package/src/server/routes/harness/custom.test.ts +131 -0
- package/src/server/routes/harness/import-action.ts +2 -2
- package/src/server/routes/harness/root.ts +41 -8
- package/src/server/routes/harness/update.ts +2 -2
- package/src/server/routes/panels/bindings.ts +2 -0
- package/src/server/routes/panels/settings.test.ts +165 -0
- package/src/server/routes/panels/settings.ts +106 -0
- package/src/server/routes/schedule/body.ts +14 -0
- package/src/server/routes/schedule/index.ts +28 -4
- package/src/server/routes/settings/mcp.ts +9 -26
- package/src/server/routes/waiting/index.ts +21 -2
- package/src/server/routes/waiting/routes.test.ts +21 -0
- package/src/shared/lib/chat/composer/delegation.ts +3 -3
- package/src/shared/lib/chat/timeline/fork-anchor.test.ts +97 -0
- package/src/shared/lib/chat/timeline/fork-anchor.ts +47 -0
- package/src/shared/lib/fs/content-hash.ts +29 -0
- package/src/shared/lib/harness/catalog.ts +48 -6
- package/src/shared/lib/harness/fork.ts +60 -0
- package/src/shared/lib/harness/mcp-facts.test.ts +30 -0
- package/src/shared/lib/harness/mcp-facts.ts +65 -0
- package/src/shared/lib/harness/menu.test.ts +16 -1
- package/src/shared/lib/harness/menu.ts +2 -2
- package/src/shared/lib/harness/rewind.ts +6 -6
- package/src/shared/lib/harness/session-modes.ts +31 -0
- package/src/shared/lib/harness/transcript.test.ts +29 -0
- package/src/shared/lib/harness/transcript.ts +19 -0
- package/src/shared/lib/notifications/settings.test.ts +21 -0
- package/src/shared/lib/notifications/settings.ts +24 -0
- package/src/shared/lib/omp/session/prewarm.test.ts +28 -4
- package/src/shared/lib/omp/session/prewarm.ts +25 -6
- package/src/shared/lib/omp/session/stream-state.server.test.ts +25 -0
- package/src/shared/lib/omp/session/stream-state.server.ts +8 -4
- package/src/shared/lib/panels/capabilities.test.ts +1 -1
- package/src/shared/lib/panels/capabilities.ts +3 -0
- package/src/shared/lib/plugins/settings.ts +22 -0
- package/src/shared/lib/schedule/parse.test.ts +48 -0
- package/src/shared/lib/schedule/parse.ts +69 -45
- package/src/shared/lib/schedule/timezone.ts +128 -0
- package/src/shared/lib/settings/defaults.ts +2 -0
- package/src/shared/lib/workspace/refresh-cadence.test.ts +25 -1
- package/src/shared/lib/workspace/relative-time.ts +16 -0
- package/src/shared/types/harness.ts +7 -0
- package/src/shared/types/omp/agent.ts +6 -0
- package/src/shared/types/panels-registry.ts +3 -3
- package/src/shared/types/panels.ts +4 -2
- package/src/shared/types/schedule.ts +13 -0
- package/src/shared/types/settings/state.ts +12 -1
- package/src/shared/types/waiting.ts +9 -0
- package/src/test-support/file-editor.test-util.ts +70 -5
- package/dist/client/static/js/index-32rpkj6b.css +0 -1
- package/src/client/hooks/editor/use-external-change-notice.ts +0 -71
- package/src/client/hooks/editor/use-external-change.test.ts +0 -88
- package/src/client/hooks/editor/use-external-change.ts +0 -146
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The `get_state` probe that keeps the run row's model true.
|
|
8
|
+
*
|
|
9
|
+
* The repair half is what these cases pin: a live row can exist with no pair at
|
|
10
|
+
* all, and a wrapper that already knew the pair used to skip the write — the
|
|
11
|
+
* docked indicator then read `Loading…` for the whole answer.
|
|
12
|
+
*/
|
|
13
|
+
|
|
14
|
+
import { afterEach, beforeEach, describe, expect, test } from 'bun:test';
|
|
15
|
+
|
|
16
|
+
import { syncRunModel, type RunModelHost } from '@/server/lib/omp/rpc/run-model';
|
|
17
|
+
import type { RpcProcess } from '@/server/lib/omp/rpc/process';
|
|
18
|
+
import type { RpcSessionState } from '@/server/lib/omp/rpc/constants';
|
|
19
|
+
import { onRealtimeSignal } from '@/server/lib/realtime/signals.server';
|
|
20
|
+
import { isolateDb, releaseDb } from '@/test-support/isolated-db';
|
|
21
|
+
import { loadStreamStates, markStreamStatus } from '@/shared/lib/omp/session/stream-state.server';
|
|
22
|
+
|
|
23
|
+
/** A host whose probe answers with the given state, or rejects. */
|
|
24
|
+
function makeHost(
|
|
25
|
+
answer: RpcSessionState | Error,
|
|
26
|
+
runModel: RunModelHost['runModel'] = null,
|
|
27
|
+
): RunModelHost {
|
|
28
|
+
return {
|
|
29
|
+
sessionId: 's1',
|
|
30
|
+
runModel,
|
|
31
|
+
proc: {
|
|
32
|
+
sendCommand: async () => {
|
|
33
|
+
if (answer instanceof Error) throw answer;
|
|
34
|
+
return answer;
|
|
35
|
+
},
|
|
36
|
+
} as unknown as RpcProcess,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function state(model?: { provider: string; id: string }): RpcSessionState {
|
|
41
|
+
return {
|
|
42
|
+
sessionId: 's1',
|
|
43
|
+
sessionFile: '/tmp/s.jsonl',
|
|
44
|
+
isStreaming: true,
|
|
45
|
+
isSettled: false,
|
|
46
|
+
isCompacting: false,
|
|
47
|
+
...(model ? { model } : {}),
|
|
48
|
+
} as RpcSessionState;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* Flush the probe's fire-and-forget chain to completion.
|
|
53
|
+
*
|
|
54
|
+
* A database round trip is the ordering point: a write the probe queued ahead
|
|
55
|
+
* of this read has landed by the time it resolves, so the assertions below are
|
|
56
|
+
* about the write, not about how long the event loop took.
|
|
57
|
+
*/
|
|
58
|
+
async function settleProbe(): Promise<void> {
|
|
59
|
+
for (let round = 0; round < 3; round += 1) await loadStreamStates();
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
beforeEach(async () => {
|
|
63
|
+
await isolateDb();
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
afterEach(async () => {
|
|
67
|
+
await releaseDb();
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
describe('syncRunModel repairs the live row', () => {
|
|
71
|
+
test('fills a row that carries no model, even when the wrapper already knew the pair', async () => {
|
|
72
|
+
await markStreamStatus('s1', 'stream');
|
|
73
|
+
const host = makeHost(state({ provider: 'anthropic', id: 'claude' }), {
|
|
74
|
+
provider: 'anthropic',
|
|
75
|
+
modelId: 'claude',
|
|
76
|
+
});
|
|
77
|
+
// The repair is a change, so the row write raises `stream-status` after the
|
|
78
|
+
// UPDATE lands — the completion event to await.
|
|
79
|
+
const { promise, resolve } = Promise.withResolvers<void>();
|
|
80
|
+
const off = onRealtimeSignal((event) => {
|
|
81
|
+
if (event.signal === 'stream-status') resolve();
|
|
82
|
+
});
|
|
83
|
+
try {
|
|
84
|
+
syncRunModel(host);
|
|
85
|
+
await promise;
|
|
86
|
+
} finally {
|
|
87
|
+
off();
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
expect((await loadStreamStates()).s1).toEqual({
|
|
91
|
+
status: 'stream',
|
|
92
|
+
model: { provider: 'anthropic', modelId: 'claude' },
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
test('leaves a terminal row alone', async () => {
|
|
97
|
+
await markStreamStatus('s1', 'finish');
|
|
98
|
+
syncRunModel(makeHost(state({ provider: 'anthropic', id: 'claude' })));
|
|
99
|
+
await settleProbe();
|
|
100
|
+
|
|
101
|
+
// The fallback probe fires on the run's last frame too; it must not name a
|
|
102
|
+
// model on a badge that means "the run is over".
|
|
103
|
+
expect((await loadStreamStates()).s1).toEqual({ status: 'finish' });
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
test('keeps the last known pair when the probe fails', async () => {
|
|
107
|
+
await markStreamStatus('s1', 'stream', { provider: 'openai', modelId: 'gpt-5' });
|
|
108
|
+
syncRunModel(makeHost(new Error('timeout')));
|
|
109
|
+
await settleProbe();
|
|
110
|
+
|
|
111
|
+
expect((await loadStreamStates()).s1).toEqual({
|
|
112
|
+
status: 'stream',
|
|
113
|
+
model: { provider: 'openai', modelId: 'gpt-5' },
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
});
|
|
@@ -40,6 +40,9 @@ export interface RunModelHost {
|
|
|
40
40
|
*
|
|
41
41
|
* The write is deliberately live-only (`markStreamModel`): a fallback landing
|
|
42
42
|
* on the run's last frame must not resurrect a `stream` row.
|
|
43
|
+
*
|
|
44
|
+
* Written on EVERY probe, not only when the pair moved: a live row can carry no
|
|
45
|
+
* model at all, and skipping the write left the indicator on `Loading…`.
|
|
43
46
|
*/
|
|
44
47
|
export function syncRunModel(host: RunModelHost): void {
|
|
45
48
|
void host.proc
|
|
@@ -47,9 +50,8 @@ export function syncRunModel(host: RunModelHost): void {
|
|
|
47
50
|
.then((state) => {
|
|
48
51
|
if (!state.model) return;
|
|
49
52
|
const next = { provider: state.model.provider, modelId: state.model.id };
|
|
50
|
-
const changed = host.runModel?.provider !== next.provider || host.runModel?.modelId !== next.modelId;
|
|
51
53
|
host.runModel = next;
|
|
52
|
-
if (
|
|
54
|
+
if (host.sessionId) void markStreamModel(host.sessionId, next);
|
|
53
55
|
})
|
|
54
56
|
.catch(() => {
|
|
55
57
|
// A state read that fails (destroyed child, timeout) leaves the last
|
|
@@ -232,7 +232,7 @@ describe('a sidebar row names its harness', () => {
|
|
|
232
232
|
expect(sessions.map((entry) => String(entry.id))).not.toContain('ses_elsewhere');
|
|
233
233
|
});
|
|
234
234
|
|
|
235
|
-
test('a harness this build no longer knows
|
|
235
|
+
test('a harness this build no longer knows keeps its id, and draws no mark', async () => {
|
|
236
236
|
const folderId = await registerFolder(project);
|
|
237
237
|
await saveHarnessSession({
|
|
238
238
|
sessionId: 'ses_gone', harness: 'some-future-agent', agentSessionId: 'ses_gone', cwd: project,
|
|
@@ -241,7 +241,10 @@ describe('a sidebar row names its harness', () => {
|
|
|
241
241
|
const sessions = await folderSessions(folderId);
|
|
242
242
|
const row = sessions.find((entry) => String(entry.id) === 'ses_gone');
|
|
243
243
|
expect(row).toBeDefined();
|
|
244
|
-
//
|
|
245
|
-
|
|
244
|
+
// The ID is kept: a user-added harness has no static descriptor, and a
|
|
245
|
+
// removed one never will — dropping it would rewrite the chat to `omp-rpc`
|
|
246
|
+
// and resume it against the wrong agent. The MARK is what stays absent:
|
|
247
|
+
// `HarnessGlyph` renders nothing when no descriptor exists.
|
|
248
|
+
expect(row?.harness).toBe('some-future-agent');
|
|
246
249
|
});
|
|
247
250
|
});
|
|
@@ -35,6 +35,7 @@
|
|
|
35
35
|
*/
|
|
36
36
|
|
|
37
37
|
import { restartPrewarmedSessions } from '@/server/lib/omp/rpc/prewarm-pool';
|
|
38
|
+
import { restartPrewarmedAcpSessions } from '@/server/lib/harness/acp/prewarm.server';
|
|
38
39
|
import { restartUtilityProcesses } from '@/server/lib/omp/rpc/utility';
|
|
39
40
|
import { invalidateSkillCache } from '@/server/lib/omp/config/skills';
|
|
40
41
|
import { invalidateOmpCliCache } from '@/server/lib/omp/core/cli';
|
|
@@ -52,6 +53,9 @@ export interface StandbyRecycleReport {
|
|
|
52
53
|
export interface StandbyDeps {
|
|
53
54
|
restartUtility: () => Promise<number>;
|
|
54
55
|
restartPrewarmed: () => Promise<number>;
|
|
56
|
+
/** Unclaimed ACP agents warmed for a pending chat. Optional so a caller that
|
|
57
|
+
* only knows the omp pools (and the tests) need not supply it. */
|
|
58
|
+
restartAcpPrewarmed?: () => Promise<number>;
|
|
55
59
|
/** Drop the caches that were built FROM a process or from the omp binary. */
|
|
56
60
|
invalidateCaches: () => void;
|
|
57
61
|
}
|
|
@@ -84,7 +88,7 @@ export function createStandbyRecycler(deps: StandbyDeps): StandbyRecycler {
|
|
|
84
88
|
// Both pools are independent, and a failure in one must not skip the other:
|
|
85
89
|
// a pool that refuses to dispose is still better reported than silently
|
|
86
90
|
// leaving the other stale.
|
|
87
|
-
const [utility,
|
|
91
|
+
const [utility, ompPrewarmed, acpPrewarmed] = await Promise.all([
|
|
88
92
|
deps.restartUtility().catch((error) => {
|
|
89
93
|
console.error(`Failed to recycle utility omp processes: ${error instanceof Error ? error.message : String(error)}`);
|
|
90
94
|
return 0;
|
|
@@ -93,9 +97,15 @@ export function createStandbyRecycler(deps: StandbyDeps): StandbyRecycler {
|
|
|
93
97
|
console.error(`Failed to recycle prewarmed omp processes: ${error instanceof Error ? error.message : String(error)}`);
|
|
94
98
|
return 0;
|
|
95
99
|
}),
|
|
100
|
+
(deps.restartAcpPrewarmed?.() ?? Promise.resolve(0)).catch((error) => {
|
|
101
|
+
console.error(`Failed to recycle prewarmed ACP agents: ${error instanceof Error ? error.message : String(error)}`);
|
|
102
|
+
return 0;
|
|
103
|
+
}),
|
|
96
104
|
]);
|
|
97
105
|
deps.invalidateCaches();
|
|
98
|
-
|
|
106
|
+
// Both prewarm pools are "a process nobody has claimed yet", which is what
|
|
107
|
+
// the report's one number means.
|
|
108
|
+
return { utility, prewarmed: ompPrewarmed + acpPrewarmed };
|
|
99
109
|
}
|
|
100
110
|
|
|
101
111
|
function recycle(): Promise<StandbyRecycleReport> {
|
|
@@ -112,6 +122,7 @@ export function createStandbyRecycler(deps: StandbyDeps): StandbyRecycler {
|
|
|
112
122
|
const serverRecycler = createStandbyRecycler({
|
|
113
123
|
restartUtility: restartUtilityProcesses,
|
|
114
124
|
restartPrewarmed: restartPrewarmedSessions,
|
|
125
|
+
restartAcpPrewarmed: restartPrewarmedAcpSessions,
|
|
115
126
|
invalidateCaches: invalidateProcessDerivedCaches,
|
|
116
127
|
});
|
|
117
128
|
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
|
|
19
19
|
import { test, expect, describe } from 'bun:test';
|
|
20
|
-
import { toManifest, toMarketplaceCatalog } from '@/server/lib/panels/manifest';
|
|
20
|
+
import { toManifest, toMarketplaceCatalog, toSettingsSchema } from '@/server/lib/panels/manifest';
|
|
21
21
|
|
|
22
22
|
const ROOT = '/market/plugins/demo';
|
|
23
23
|
|
|
@@ -282,3 +282,49 @@ describe('toMarketplaceCatalog', () => {
|
|
|
282
282
|
expect(toMarketplaceCatalog(null, ROOT)).toMatchObject({ error: expect.stringContaining('not an object') });
|
|
283
283
|
});
|
|
284
284
|
});
|
|
285
|
+
|
|
286
|
+
describe('toSettingsSchema', () => {
|
|
287
|
+
test('accepts a map of definitions and keeps every rendered field', () => {
|
|
288
|
+
expect(
|
|
289
|
+
toSettingsSchema({
|
|
290
|
+
note: { type: 'string', label: 'Note', description: 'Shown above the box', default: 'hi' },
|
|
291
|
+
token: { type: 'string', label: 'Token', secret: true },
|
|
292
|
+
retries: { type: 'number', label: 'Retries', default: 3 },
|
|
293
|
+
verbose: { type: 'boolean', label: 'Verbose', default: false },
|
|
294
|
+
}),
|
|
295
|
+
).toEqual({
|
|
296
|
+
value: {
|
|
297
|
+
note: { type: 'string', label: 'Note', description: 'Shown above the box', default: 'hi' },
|
|
298
|
+
token: { type: 'string', label: 'Token', secret: true },
|
|
299
|
+
retries: { type: 'number', label: 'Retries', default: 3 },
|
|
300
|
+
verbose: { type: 'boolean', label: 'Verbose', default: false },
|
|
301
|
+
},
|
|
302
|
+
});
|
|
303
|
+
});
|
|
304
|
+
|
|
305
|
+
test('an empty object is a valid schema, not a refusal', () => {
|
|
306
|
+
expect(toSettingsSchema({})).toEqual({ value: {} });
|
|
307
|
+
});
|
|
308
|
+
|
|
309
|
+
test('refuses a type the host cannot render', () => {
|
|
310
|
+
expect(toSettingsSchema({ mode: { type: 'select', label: 'Mode' } })).toMatchObject({
|
|
311
|
+
error: expect.stringContaining('unknown type'),
|
|
312
|
+
});
|
|
313
|
+
});
|
|
314
|
+
|
|
315
|
+
test('refuses a definition with no label, and a non-object body', () => {
|
|
316
|
+
expect(toSettingsSchema({ mode: { type: 'string' } })).toMatchObject({
|
|
317
|
+
error: expect.stringContaining('no label'),
|
|
318
|
+
});
|
|
319
|
+
expect(toSettingsSchema([])).toMatchObject({ error: expect.stringContaining('not an object') });
|
|
320
|
+
});
|
|
321
|
+
|
|
322
|
+
test('refuses a default of the wrong shape and a non-boolean secret', () => {
|
|
323
|
+
expect(toSettingsSchema({ note: { type: 'string', label: 'Note', default: {} } })).toMatchObject({
|
|
324
|
+
error: expect.stringContaining('invalid default'),
|
|
325
|
+
});
|
|
326
|
+
expect(toSettingsSchema({ note: { type: 'string', label: 'Note', secret: 'yes' } })).toMatchObject({
|
|
327
|
+
error: expect.stringContaining('invalid secret'),
|
|
328
|
+
});
|
|
329
|
+
});
|
|
330
|
+
});
|
|
@@ -218,6 +218,25 @@ function isSettingType(value: unknown): value is PluginSettingDefinition['type']
|
|
|
218
218
|
return value === 'string' || value === 'number' || value === 'boolean';
|
|
219
219
|
}
|
|
220
220
|
|
|
221
|
+
/**
|
|
222
|
+
* Validate a standalone `settings-schema.json` body.
|
|
223
|
+
*
|
|
224
|
+
* The file is the canonical declaration: a map of setting name → definition,
|
|
225
|
+
* the same shape the manifest's `settings` key accepts. It is read without the
|
|
226
|
+
* plugin running, which is what lets a switched-off plugin still show its form.
|
|
227
|
+
*
|
|
228
|
+
* An empty object is a valid schema — a plugin may ship the file before it has
|
|
229
|
+
* any setting, and a form with nothing to draw is better than refusing the
|
|
230
|
+
* plugin for a file whose only job is to say "none yet".
|
|
231
|
+
*/
|
|
232
|
+
export function toSettingsSchema(
|
|
233
|
+
raw: unknown,
|
|
234
|
+
): { value: Record<string, PluginSettingDefinition> } | { error: string } {
|
|
235
|
+
const parsed = toSettings(raw);
|
|
236
|
+
if ('error' in parsed) return parsed;
|
|
237
|
+
return { value: parsed.value ?? {} };
|
|
238
|
+
}
|
|
239
|
+
|
|
221
240
|
/**
|
|
222
241
|
* Validate `settings`: an optional map of setting name → definition.
|
|
223
242
|
*
|
|
@@ -61,7 +61,7 @@ export function getMarketplaceCatalogPath(): string {
|
|
|
61
61
|
/**
|
|
62
62
|
* The STORE: the marketplace bundled with the package.
|
|
63
63
|
*
|
|
64
|
-
* Read-only and never copied. The bundled plugins are what the
|
|
64
|
+
* Read-only and never copied. The bundled plugins are what the Plugins Kabmo
|
|
65
65
|
* pane offers to install — an offer, not an install — so nothing here is
|
|
66
66
|
* scanned as a contribution and nothing here is built. Installing one copies
|
|
67
67
|
* its directory into the working marketplace and builds it there, exactly as a
|
|
@@ -91,6 +91,8 @@ const SCAN_CACHE_TTL_MS = 5_000;
|
|
|
91
91
|
*/
|
|
92
92
|
interface PanelScan extends PanelRegistryPayload {
|
|
93
93
|
dirs: Record<string, string>;
|
|
94
|
+
/** Every parsed plugin's directory, including disabled and unbuilt ones. */
|
|
95
|
+
pluginDirs: Record<string, string>;
|
|
94
96
|
}
|
|
95
97
|
|
|
96
98
|
declare global {
|
|
@@ -116,6 +118,7 @@ async function runPanelScan(): Promise<PanelScan> {
|
|
|
116
118
|
autoUpdate: false,
|
|
117
119
|
syncBlocked: {},
|
|
118
120
|
dirs: {},
|
|
121
|
+
pluginDirs: {},
|
|
119
122
|
};
|
|
120
123
|
|
|
121
124
|
// Rejections are tagged with the marketplace id so the pane groups by a value
|
|
@@ -173,6 +176,7 @@ async function runPanelScan(): Promise<PanelScan> {
|
|
|
173
176
|
scan.plugins = scanned.pluginStatus;
|
|
174
177
|
scan.panels = scanned.panels;
|
|
175
178
|
scan.dirs = scanned.dirs;
|
|
179
|
+
scan.pluginDirs = scanned.pluginDirs;
|
|
176
180
|
scan.errors.push(...scanned.errors);
|
|
177
181
|
|
|
178
182
|
// The status cache is read BEFORE the offers are folded in, because a git
|
|
@@ -205,7 +209,7 @@ async function cachedScan(): Promise<PanelScan> {
|
|
|
205
209
|
|
|
206
210
|
/** The client payload: the marketplace, its panels, and its rejections. */
|
|
207
211
|
export async function discoverPanelPlugins(): Promise<PanelRegistryPayload> {
|
|
208
|
-
const { dirs: _dirs, ...payload } = await cachedScan();
|
|
212
|
+
const { dirs: _dirs, pluginDirs: _pluginDirs, ...payload } = await cachedScan();
|
|
209
213
|
return payload;
|
|
210
214
|
}
|
|
211
215
|
|
|
@@ -238,3 +242,16 @@ export async function findPluginDir(pluginName: string): Promise<string | undefi
|
|
|
238
242
|
}
|
|
239
243
|
return undefined;
|
|
240
244
|
}
|
|
245
|
+
|
|
246
|
+
/**
|
|
247
|
+
* The directory of an INSTALLED plugin, addressed by its manifest id.
|
|
248
|
+
*
|
|
249
|
+
* Unlike `findPluginDir` this answers for a plugin that is disabled or unbuilt:
|
|
250
|
+
* its settings are still declared and its stored values still exist, so the
|
|
251
|
+
* settings route must reach the directory without the bundle being servable.
|
|
252
|
+
* The bundled store is deliberately not searched — a store offer has no install
|
|
253
|
+
* and therefore no settings to edit.
|
|
254
|
+
*/
|
|
255
|
+
export async function findInstalledPluginDir(pluginId: string): Promise<string | undefined> {
|
|
256
|
+
return (await cachedScan()).pluginDirs[pluginId];
|
|
257
|
+
}
|
|
@@ -27,6 +27,7 @@ import { pathExists } from '@/server/lib/omp/core/paths';
|
|
|
27
27
|
import { pluginEnablementKey } from '@/shared/lib/workspace/panel-ids';
|
|
28
28
|
import { readPluginManifest, subdirectories } from '@/server/lib/panels/files.server';
|
|
29
29
|
import { toManifest } from '@/server/lib/panels/manifest';
|
|
30
|
+
import { pluginSettingsDefinitions } from '@/server/lib/panels/settings-schema.server';
|
|
30
31
|
import { bundleUrl, cssUrl, iconUrl, readmeUrlFor } from '@/server/lib/panels/assets.server';
|
|
31
32
|
import { readGitOrigin } from '@/server/lib/panels/git-clone.server';
|
|
32
33
|
import { describeIncompatibility, type RunningVersions } from '@/server/lib/panels/compat.server';
|
|
@@ -39,6 +40,17 @@ export interface ScannedPlugins {
|
|
|
39
40
|
panels: PanelRegistryEntry[];
|
|
40
41
|
/** Plugin id → its directory, for the asset routes. */
|
|
41
42
|
dirs: Record<string, string>;
|
|
43
|
+
/**
|
|
44
|
+
* Plugin id → its directory, for EVERY plugin whose manifest parsed — even
|
|
45
|
+
* one that is disabled or unbuilt.
|
|
46
|
+
*
|
|
47
|
+
* `dirs` is the asset routes' root and must stay limited to what is servable.
|
|
48
|
+
* The settings route is the opposite case: a switched-off plugin still owns
|
|
49
|
+
* its declared settings and its stored values, and its form has to open
|
|
50
|
+
* without the bundle running. Keeping the two maps apart is what stops
|
|
51
|
+
* disabled plugin CODE from being reachable while its CONFIG stays editable.
|
|
52
|
+
*/
|
|
53
|
+
pluginDirs: Record<string, string>;
|
|
42
54
|
errors: PanelPluginError[];
|
|
43
55
|
}
|
|
44
56
|
|
|
@@ -57,7 +69,7 @@ export async function scanInstalledPlugins(options: {
|
|
|
57
69
|
marketplace: string;
|
|
58
70
|
}): Promise<ScannedPlugins> {
|
|
59
71
|
const { pluginsRoot, disabled, running, marketplace } = options;
|
|
60
|
-
const scanned: ScannedPlugins = { pluginStatus: [], panels: [], dirs: {}, errors: [] };
|
|
72
|
+
const scanned: ScannedPlugins = { pluginStatus: [], panels: [], dirs: {}, pluginDirs: {}, errors: [] };
|
|
61
73
|
const fail = (dir: string, reason: string) =>
|
|
62
74
|
scanned.errors.push({ dir, reason, marketplace });
|
|
63
75
|
|
|
@@ -75,6 +87,15 @@ export async function scanInstalledPlugins(options: {
|
|
|
75
87
|
continue;
|
|
76
88
|
}
|
|
77
89
|
|
|
90
|
+
// A settings-schema file that exists but cannot be read is the same class of
|
|
91
|
+
// fault as a malformed manifest: the plugin SAID it has settings, and a form
|
|
92
|
+
// drawn from half of them would write values its own contract rejects.
|
|
93
|
+
const settings = await pluginSettingsDefinitions(pluginDir, manifest);
|
|
94
|
+
if ('error' in settings) {
|
|
95
|
+
fail(pluginDir, settings.error);
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
|
|
78
99
|
// Refused BEFORE it is admitted: an incompatible plugin must contribute
|
|
79
100
|
// nothing — no panel, no bundle, no directory for the route to resolve.
|
|
80
101
|
// The reason names both sides, because the pane's only repair is the author
|
|
@@ -84,6 +105,9 @@ export async function scanInstalledPlugins(options: {
|
|
|
84
105
|
fail(pluginDir, refusal);
|
|
85
106
|
continue;
|
|
86
107
|
}
|
|
108
|
+
// Admitted, so its settings are reachable even when it is switched off or
|
|
109
|
+
// unbuilt — the form is drawn from the file, not from the plugin's code.
|
|
110
|
+
scanned.pluginDirs[manifest.id] = pluginDir;
|
|
87
111
|
|
|
88
112
|
// A plugin is served from its build output, so every entry its manifest
|
|
89
113
|
// declares must already exist. A plugin whose build has not run is reported
|
|
@@ -122,7 +146,7 @@ export async function scanInstalledPlugins(options: {
|
|
|
122
146
|
bundled: false,
|
|
123
147
|
origin: gitOrigin ? 'git' : 'local',
|
|
124
148
|
gitOrigin,
|
|
125
|
-
settingsCount: Object.keys(
|
|
149
|
+
settingsCount: Object.keys(settings.definitions).length,
|
|
126
150
|
...(manifest.description ? { description: manifest.description } : {}),
|
|
127
151
|
...(manifest.author ? { author: manifest.author } : {}),
|
|
128
152
|
...(manifest.homepage ? { homepage: manifest.homepage } : {}),
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* A plugin's declared settings, read from its `settings-schema.json`.
|
|
8
|
+
*
|
|
9
|
+
* The schema is a FILE rather than a key in the manifest because it is the
|
|
10
|
+
* plugin's whole configuration contract: a form the host renders, the rules the
|
|
11
|
+
* host validates a write against, and the defaults a switched-off plugin still
|
|
12
|
+
* reports. Keeping it beside the manifest means a plugin can ship settings
|
|
13
|
+
* without a manifest edit, and a reader can find the contract without knowing
|
|
14
|
+
* which of the two manifest spellings (`kabmo.json` or `package.json`'s `kabmo`
|
|
15
|
+
* key) the plugin used.
|
|
16
|
+
*
|
|
17
|
+
* The file is OPTIONAL. A plugin with no settings ships no file, and the host
|
|
18
|
+
* draws no settings button — "no settings" and "settings that failed to parse"
|
|
19
|
+
* must not look alike, which is why an unreadable or invalid file is an error
|
|
20
|
+
* rather than an empty form.
|
|
21
|
+
*
|
|
22
|
+
* The manifest's inline `settings` key is still read when the file is absent:
|
|
23
|
+
* plugins written before the file existed keep their form, and the file wins
|
|
24
|
+
* when both are present so there is one answer per plugin.
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
import { join } from 'path';
|
|
28
|
+
import type { PanelPluginManifest } from '@/shared/types';
|
|
29
|
+
import type { PluginSettingDefinition } from '@kabmo-labs/kabmo-sdk';
|
|
30
|
+
import { readJsonBody, readPluginManifest } from '@/server/lib/panels/files.server';
|
|
31
|
+
import { toManifest, toSettingsSchema } from '@/server/lib/panels/manifest';
|
|
32
|
+
|
|
33
|
+
/** The file a plugin ships to declare its settings. */
|
|
34
|
+
export const SETTINGS_SCHEMA_FILE = 'settings-schema.json';
|
|
35
|
+
|
|
36
|
+
export type SettingsSchemaRead =
|
|
37
|
+
| { kind: 'none' }
|
|
38
|
+
| { kind: 'error'; reason: string }
|
|
39
|
+
| { kind: 'schema'; value: Record<string, PluginSettingDefinition> };
|
|
40
|
+
|
|
41
|
+
/** Read and validate `settings-schema.json` from a plugin directory. */
|
|
42
|
+
export async function readSettingsSchemaFile(dir: string): Promise<SettingsSchemaRead> {
|
|
43
|
+
const read = await readJsonBody(join(dir, SETTINGS_SCHEMA_FILE));
|
|
44
|
+
if (read.kind === 'none') return { kind: 'none' };
|
|
45
|
+
if (read.kind === 'unreadable') return { kind: 'error', reason: `${SETTINGS_SCHEMA_FILE} is not valid JSON` };
|
|
46
|
+
const parsed = toSettingsSchema(read.value);
|
|
47
|
+
if ('error' in parsed) return { kind: 'error', reason: parsed.error };
|
|
48
|
+
return { kind: 'schema', value: parsed.value };
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* The definitions a plugin's settings form and API use.
|
|
53
|
+
*
|
|
54
|
+
* `manifest` is passed by a caller that already parsed it (the loader and the
|
|
55
|
+
* scan), so the file is read once per plugin rather than once per consumer.
|
|
56
|
+
*/
|
|
57
|
+
export async function pluginSettingsDefinitions(
|
|
58
|
+
dir: string,
|
|
59
|
+
manifest?: PanelPluginManifest,
|
|
60
|
+
): Promise<{ definitions: Record<string, PluginSettingDefinition> } | { error: string }> {
|
|
61
|
+
const schema = await readSettingsSchemaFile(dir);
|
|
62
|
+
if (schema.kind === 'error') return { error: schema.reason };
|
|
63
|
+
if (schema.kind === 'schema') return { definitions: schema.value };
|
|
64
|
+
|
|
65
|
+
if (manifest) return { definitions: manifest.settings ?? {} };
|
|
66
|
+
|
|
67
|
+
const read = await readPluginManifest(dir);
|
|
68
|
+
if (read.kind !== 'manifest') return { definitions: {} };
|
|
69
|
+
const parsed = toManifest(read.value, dir);
|
|
70
|
+
if ('error' in parsed) return { definitions: {} };
|
|
71
|
+
return { definitions: parsed.settings ?? {} };
|
|
72
|
+
}
|
|
@@ -68,8 +68,18 @@ function resolveKind(spec: string, now: number): { kind: ScheduleKind; nextRunAt
|
|
|
68
68
|
return { error: `"${spec}" is neither an interval (5m, 1h30m) nor a 5-field cron expression` };
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
-
/**
|
|
72
|
-
|
|
71
|
+
/**
|
|
72
|
+
* The API one plugin is handed at load, plus what it declared.
|
|
73
|
+
*
|
|
74
|
+
* `stored` is the next fire already on disk for this plugin. A schedule that
|
|
75
|
+
* has one keeps it, so a restart does not restart its countdown; a schedule
|
|
76
|
+
* with none starts from `now`.
|
|
77
|
+
*/
|
|
78
|
+
export function createPluginBackground(
|
|
79
|
+
pluginId: string,
|
|
80
|
+
now = Date.now(),
|
|
81
|
+
stored: ReadonlyMap<string, number> = new Map(),
|
|
82
|
+
): {
|
|
73
83
|
api: PluginBackgroundApi;
|
|
74
84
|
handle: PluginBackgroundHandle;
|
|
75
85
|
} {
|
|
@@ -103,7 +113,15 @@ export function createPluginBackground(pluginId: string, now = Date.now()): {
|
|
|
103
113
|
if (typeof run !== 'function') throw new Error(`schedule "${id}" has no run()`);
|
|
104
114
|
const resolved = resolveKind(spec, now);
|
|
105
115
|
if ('error' in resolved) throw new Error(`schedule "${id}": ${resolved.error}`);
|
|
106
|
-
|
|
116
|
+
const persisted = stored.get(id);
|
|
117
|
+
handle.schedules.push({
|
|
118
|
+
pluginId,
|
|
119
|
+
id,
|
|
120
|
+
kind: resolved.kind,
|
|
121
|
+
spec,
|
|
122
|
+
run,
|
|
123
|
+
nextRunAt: persisted ?? resolved.nextRunAt,
|
|
124
|
+
});
|
|
107
125
|
},
|
|
108
126
|
};
|
|
109
127
|
return { api, handle };
|
|
@@ -77,6 +77,19 @@ describe('background', () => {
|
|
|
77
77
|
expect(() => api.service('broken', { start: () => { throw new Error('no start'); } })).toThrow('no start');
|
|
78
78
|
});
|
|
79
79
|
|
|
80
|
+
test('a stored fire time is adopted instead of restarting the countdown', () => {
|
|
81
|
+
const stored = new Map([['refresh', 9_000_000]]);
|
|
82
|
+
const { api, handle } = createPluginBackground('alpha', 1_000, stored);
|
|
83
|
+
api.schedule('refresh', '5m', () => {});
|
|
84
|
+
expect(handle.schedules[0]?.nextRunAt).toBe(9_000_000);
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
test('a schedule with no stored time starts from now', () => {
|
|
88
|
+
const { api, handle } = createPluginBackground('alpha', 1_000, new Map());
|
|
89
|
+
api.schedule('refresh', '5m', () => {});
|
|
90
|
+
expect(handle.schedules[0]?.nextRunAt).toBe(1_000 + 300_000);
|
|
91
|
+
});
|
|
92
|
+
|
|
80
93
|
test('a schedule resolves its next fire with Kabmo own grammar', () => {
|
|
81
94
|
const { api, handle } = createPluginBackground('alpha', 1_000_000);
|
|
82
95
|
api.schedule('sweep', '5m', () => {});
|