@kabmo-labs/kabmo 0.26.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 +502 -474
- package/dist/client/static/js/index-81f7berm.css +1 -0
- package/dist/client/static/js/{index-95b3n20k.js → index-xzvyrxya.js} +799 -799
- 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/Toast.test.tsx +28 -2
- package/src/client/components/common/Toast.tsx +21 -9
- 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/desktop-layout/LeftColumn.tsx +2 -1
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +4 -2
- package/src/client/components/layout/session-sidebar/SessionItem.tsx +9 -1
- package/src/client/components/layout/session-sidebar/SessionList.tsx +2 -1
- package/src/client/components/layout/session-sidebar/about-modal/UpdateSection.tsx +3 -2
- package/src/client/components/layout/session-sidebar/about-modal/index.tsx +2 -1
- package/src/client/components/layout/session-sidebar/modern/RevealRow.tsx +56 -0
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +12 -29
- package/src/client/components/layout/session-sidebar/modern/reveal-row.test.tsx +104 -0
- 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 +5 -1
- package/src/client/components/layout/session-sidebar/variant-props.ts +2 -1
- package/src/client/components/mobile/SessionSidebar.tsx +2 -1
- 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/ClassicDrawer.tsx +2 -1
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +4 -2
- package/src/client/components/mobile/mobile-session-sidebar/List.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 +7 -3
- 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/settings/categories/project-settings/WorktreeSettings.tsx +2 -1
- package/src/client/components/settings/categories/usage-settings/LimitsSection.tsx +39 -19
- package/src/client/components/settings/categories/usage-settings/ProviderDetail.tsx +1 -0
- package/src/client/components/settings/categories/usage-settings/limit-groups.test.ts +94 -0
- package/src/client/components/settings/categories/usage-settings/limit-groups.ts +118 -0
- package/src/client/components/settings/categories/usage-settings/limits-section.test.tsx +118 -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 +61 -56
- 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/PendingChatView.tsx +11 -1
- package/src/client/components/workspace/chat-timeline/PendingTranscript.tsx +130 -0
- 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/fork-preview.test.tsx +141 -0
- package/src/client/components/workspace/chat-timeline/index.tsx +17 -6
- package/src/client/components/workspace/chat-timeline/target-picker/DraftTargetRow.tsx +3 -10
- 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/chat-timeline/target-picker/WorktreePicker.tsx +5 -4
- 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/git-panel/index.tsx +2 -2
- package/src/client/components/workspace/terminal-panel/RealtimeTerminalView.tsx +17 -6
- 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 +17 -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/omp/session-list.tsx +5 -0
- package/src/client/hooks/chat/omp/sidebar-reload.test.ts +85 -0
- package/src/client/hooks/chat/omp/sidebar-reload.ts +30 -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/fork-preview.test.ts +148 -0
- package/src/client/hooks/chat/timeline/fork-preview.ts +104 -0
- package/src/client/hooks/chat/timeline/fork-send.test.ts +139 -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-branch.ts +9 -0
- package/src/client/hooks/chat/timeline/pending-dispatch.ts +53 -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/stop-with-queue.ts +1 -1
- package/src/client/hooks/chat/timeline/use-fork-session.ts +9 -22
- package/src/client/hooks/chat/waiting/cancel.ts +15 -7
- 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 +50 -29
- package/src/client/hooks/chat/waiting/held.ts +38 -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/settings/providers/actions.ts +3 -2
- package/src/client/hooks/settings/providers/messages.ts +9 -7
- package/src/client/hooks/settings/providers/model-actions.ts +2 -1
- package/src/client/hooks/ui/editor-error-toast.ts +2 -1
- package/src/client/hooks/ui/notifications.ts +17 -8
- package/src/client/hooks/workspace/batch-archive.test.ts +2 -2
- package/src/client/hooks/workspace/batch-archive.ts +4 -2
- package/src/client/hooks/workspace/git-action-outcome.ts +4 -3
- package/src/client/hooks/workspace/navbar-session-actions.ts +2 -1
- package/src/client/hooks/workspace/panel-registry.ts +1 -1
- package/src/client/hooks/workspace/scheduled-tasks.ts +26 -11
- package/src/client/hooks/workspace/session-actions.test.ts +2 -1
- package/src/client/hooks/workspace/session-actions.ts +2 -1
- package/src/client/hooks/workspace/terminal/connection.test.ts +63 -0
- package/src/client/hooks/workspace/terminal/connection.ts +47 -0
- package/src/client/hooks/workspace/terminal/index.ts +35 -4
- package/src/client/hooks/workspace/workspace-folder-actions.ts +2 -1
- 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/usage/report.server.ts +57 -0
- 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/chat/timeline/fork-preview.test.ts +62 -0
- package/src/shared/lib/chat/timeline/fork-preview.ts +36 -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/ui/toast-duration.test.ts +25 -1
- package/src/shared/lib/ui/toast-duration.ts +22 -4
- package/src/shared/lib/workspace/refresh-cadence.test.ts +25 -1
- package/src/shared/lib/workspace/relative-time.ts +16 -0
- package/src/shared/lib/workspace/session-state/store.ts +4 -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-p2yw9ywf.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,97 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The wire shape of the ACP verbs Kabmo sends. `session/fork` is the one with
|
|
8
|
+
* two optional payloads: zcode's checkpoint `target` and the AIR fork point in
|
|
9
|
+
* `_meta` — an agent that does not read a key ignores it, so the shape is the
|
|
10
|
+
* only thing that can be wrong here.
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
import { describe, expect, test } from 'bun:test';
|
|
14
|
+
import { forkSession, loadSession, newSession, resumeSession } from '@/server/lib/harness/acp/verbs';
|
|
15
|
+
|
|
16
|
+
function recorder() {
|
|
17
|
+
const calls: Array<{ method: string; params: unknown }> = [];
|
|
18
|
+
const invoke = async <T>(method: string, params: unknown): Promise<T> => {
|
|
19
|
+
calls.push({ method, params });
|
|
20
|
+
return { sessionId: 'forked' } as T;
|
|
21
|
+
};
|
|
22
|
+
return { calls, invoke };
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
describe('forkSession verb', () => {
|
|
26
|
+
test('a plain fork sends only the session, cwd and servers', async () => {
|
|
27
|
+
const { calls, invoke } = recorder();
|
|
28
|
+
await forkSession(invoke, 'src', '/tmp/project', 1000);
|
|
29
|
+
expect(calls).toEqual([
|
|
30
|
+
{ method: 'session/fork', params: { sessionId: 'src', cwd: '/tmp/project', mcpServers: [] } },
|
|
31
|
+
]);
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
test('a fork point rides as the request _meta', async () => {
|
|
35
|
+
const { calls, invoke } = recorder();
|
|
36
|
+
const meta = { jetbrains: { air: { fork: { version: 1, messageId: 'a2' } } } };
|
|
37
|
+
await forkSession(invoke, 'src', '/tmp/project', 1000, undefined, meta);
|
|
38
|
+
expect(calls).toEqual([
|
|
39
|
+
{
|
|
40
|
+
method: 'session/fork',
|
|
41
|
+
params: { sessionId: 'src', cwd: '/tmp/project', mcpServers: [], _meta: meta },
|
|
42
|
+
},
|
|
43
|
+
]);
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
test('a checkpoint target and a fork point travel together', async () => {
|
|
47
|
+
const { calls, invoke } = recorder();
|
|
48
|
+
const meta = { jetbrains: { air: { fork: { version: 1, messageId: 'a2' } } } };
|
|
49
|
+
await forkSession(invoke, 'src', '/tmp/project', 1000, { kind: 'latestCheckpoint' }, meta);
|
|
50
|
+
expect(calls).toEqual([
|
|
51
|
+
{
|
|
52
|
+
method: 'session/fork',
|
|
53
|
+
params: {
|
|
54
|
+
sessionId: 'src',
|
|
55
|
+
cwd: '/tmp/project',
|
|
56
|
+
mcpServers: [],
|
|
57
|
+
target: { kind: 'latestCheckpoint' },
|
|
58
|
+
_meta: meta,
|
|
59
|
+
},
|
|
60
|
+
},
|
|
61
|
+
]);
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
describe('MCP servers on the session verbs', () => {
|
|
66
|
+
const servers = [{ name: 'notes', command: 'npx', args: ['-y', 'notes'], env: [] }];
|
|
67
|
+
|
|
68
|
+
test('session/new carries the list', async () => {
|
|
69
|
+
const { calls, invoke } = recorder();
|
|
70
|
+
await newSession(invoke, '/tmp/project', 1000, 1, servers);
|
|
71
|
+
expect(calls).toEqual([{ method: 'session/new', params: { cwd: '/tmp/project', mcpServers: servers } }]);
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
test('session/load carries the list', async () => {
|
|
75
|
+
const { calls, invoke } = recorder();
|
|
76
|
+
await loadSession(invoke, 'agent-1', '/tmp/project', 1000, servers);
|
|
77
|
+
expect(calls).toEqual([
|
|
78
|
+
{ method: 'session/load', params: { sessionId: 'agent-1', cwd: '/tmp/project', mcpServers: servers } },
|
|
79
|
+
]);
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
test('session/resume carries the list', async () => {
|
|
83
|
+
const { calls, invoke } = recorder();
|
|
84
|
+
await resumeSession(invoke, 'agent-1', '/tmp/project', 1000, 1, servers);
|
|
85
|
+
expect(calls).toEqual([
|
|
86
|
+
{ method: 'session/resume', params: { sessionId: 'agent-1', cwd: '/tmp/project', mcpServers: servers } },
|
|
87
|
+
]);
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
test('session/fork carries the list', async () => {
|
|
91
|
+
const { calls, invoke } = recorder();
|
|
92
|
+
await forkSession(invoke, 'src', '/tmp/project', 1000, undefined, undefined, servers);
|
|
93
|
+
expect(calls).toEqual([
|
|
94
|
+
{ method: 'session/fork', params: { sessionId: 'src', cwd: '/tmp/project', mcpServers: servers } },
|
|
95
|
+
]);
|
|
96
|
+
});
|
|
97
|
+
});
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* `session/prompt` answer (`stopReason: "cancelled"`).
|
|
17
17
|
*/
|
|
18
18
|
|
|
19
|
-
import type { AcpSessionInfo, AcpSessionNewResult } from '@/server/lib/harness/acp/protocol';
|
|
19
|
+
import type { AcpMcpServer, AcpSessionInfo, AcpSessionNewResult } from '@/server/lib/harness/acp/protocol';
|
|
20
20
|
import { normalizeConfigOptions, normalizeSessionResult } from '@/server/lib/harness/acp/v2';
|
|
21
21
|
|
|
22
22
|
/** One request/response round trip against an ACP agent. Implemented by
|
|
@@ -33,13 +33,20 @@ export async function newSession(
|
|
|
33
33
|
cwd: string,
|
|
34
34
|
timeoutMs = 120_000,
|
|
35
35
|
dialect: AcpDialect = 1,
|
|
36
|
+
mcpServers: AcpMcpServer[] = [],
|
|
36
37
|
): Promise<AcpSessionNewResult> {
|
|
37
|
-
const result = await invoke<Record<string, unknown>>('session/new', { cwd, mcpServers
|
|
38
|
+
const result = await invoke<Record<string, unknown>>('session/new', { cwd, mcpServers }, timeoutMs);
|
|
38
39
|
return dialect === 2 ? normalizeSessionResult(result) : (result as unknown as AcpSessionNewResult);
|
|
39
40
|
}
|
|
40
41
|
|
|
41
|
-
export async function loadSession(
|
|
42
|
-
|
|
42
|
+
export async function loadSession(
|
|
43
|
+
invoke: AcpInvoke,
|
|
44
|
+
sessionId: string,
|
|
45
|
+
cwd: string,
|
|
46
|
+
timeoutMs = 120_000,
|
|
47
|
+
mcpServers: AcpMcpServer[] = [],
|
|
48
|
+
): Promise<unknown> {
|
|
49
|
+
return invoke('session/load', { sessionId, cwd, mcpServers }, timeoutMs);
|
|
43
50
|
}
|
|
44
51
|
|
|
45
52
|
export async function resumeSession(
|
|
@@ -48,8 +55,9 @@ export async function resumeSession(
|
|
|
48
55
|
cwd: string,
|
|
49
56
|
timeoutMs = 120_000,
|
|
50
57
|
dialect: AcpDialect = 1,
|
|
58
|
+
mcpServers: AcpMcpServer[] = [],
|
|
51
59
|
): Promise<unknown> {
|
|
52
|
-
const result = await invoke<Record<string, unknown>>('session/resume', { sessionId, cwd, mcpServers
|
|
60
|
+
const result = await invoke<Record<string, unknown>>('session/resume', { sessionId, cwd, mcpServers }, timeoutMs);
|
|
53
61
|
return dialect === 2 ? normalizeSessionResult(result) : result;
|
|
54
62
|
}
|
|
55
63
|
|
|
@@ -59,10 +67,12 @@ export async function forkSession(
|
|
|
59
67
|
cwd: string,
|
|
60
68
|
timeoutMs = 120_000,
|
|
61
69
|
target?: Record<string, unknown>,
|
|
70
|
+
meta?: Record<string, unknown>,
|
|
71
|
+
mcpServers: AcpMcpServer[] = [],
|
|
62
72
|
): Promise<AcpSessionNewResult> {
|
|
63
73
|
return invoke<AcpSessionNewResult>(
|
|
64
74
|
'session/fork',
|
|
65
|
-
{ sessionId, cwd, mcpServers
|
|
75
|
+
{ sessionId, cwd, mcpServers, ...(target ? { target } : {}), ...(meta ? { _meta: meta } : {}) },
|
|
66
76
|
timeoutMs,
|
|
67
77
|
);
|
|
68
78
|
}
|
|
@@ -43,9 +43,10 @@ import type { HarnessConfig } from '@/shared/lib/harness/config';
|
|
|
43
43
|
import { loadDisabledHarnesses } from '@/server/lib/harness/enabled.server';
|
|
44
44
|
import { blockedProbe, probeHarness } from '@/server/lib/harness/launch';
|
|
45
45
|
import { HARNESS_LAUNCH, harnessRequirementMet, type HarnessLaunch } from '@/server/lib/harness/launch-table';
|
|
46
|
+
import { customLaunch } from '@/server/lib/harness/custom.server';
|
|
46
47
|
import { resolveOmpBin } from '@/server/lib/omp/core/cli';
|
|
47
48
|
import { rememberProbe } from '@/server/lib/harness/probe-cache.server';
|
|
48
|
-
import {
|
|
49
|
+
import { harnessDescriptor, harnessIds, type HarnessId } from '@/shared/lib/harness/catalog';
|
|
49
50
|
import { harnessEnabled } from '@/shared/lib/harness/enabled';
|
|
50
51
|
|
|
51
52
|
declare global {
|
|
@@ -64,7 +65,7 @@ declare global {
|
|
|
64
65
|
*/
|
|
65
66
|
export function commandAvailable(id: HarnessId, config?: HarnessConfig): boolean {
|
|
66
67
|
if (id === 'omp-acp') return Boolean(resolveOmpBin());
|
|
67
|
-
let launch: HarnessLaunch | undefined = HARNESS_LAUNCH[id];
|
|
68
|
+
let launch: HarnessLaunch | undefined = HARNESS_LAUNCH[id] ?? customLaunch(id);
|
|
68
69
|
if (config) {
|
|
69
70
|
try {
|
|
70
71
|
const configured = launchFromConfig(id, config);
|
|
@@ -113,7 +114,7 @@ export interface AutoProbeOptions {
|
|
|
113
114
|
export async function autoProbeTargets(
|
|
114
115
|
options: Pick<AutoProbeOptions, 'ids' | 'available'> = {},
|
|
115
116
|
): Promise<HarnessId[]> {
|
|
116
|
-
const ids = options.ids ??
|
|
117
|
+
const ids = options.ids ?? harnessIds();
|
|
117
118
|
const available = options.available ?? commandAvailable;
|
|
118
119
|
const disabled = await loadDisabledHarnesses();
|
|
119
120
|
const targets: HarnessId[] = [];
|
|
@@ -63,5 +63,13 @@ export interface HarnessProbe {
|
|
|
63
63
|
models: { value: string; name: string }[];
|
|
64
64
|
thinking: { value: string; name: string }[];
|
|
65
65
|
modes: { value: string; name: string }[];
|
|
66
|
+
/**
|
|
67
|
+
* The mode the agent was in when it answered `session/new`, when it said.
|
|
68
|
+
*
|
|
69
|
+
* The composer's mode control on a chat that has not spawned yet has no live
|
|
70
|
+
* session to ask, and `modes` alone says nothing about which one is current —
|
|
71
|
+
* showing the first as current would be a guess the agent never made.
|
|
72
|
+
*/
|
|
73
|
+
currentMode?: string;
|
|
66
74
|
probedAt: number;
|
|
67
75
|
}
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
import { getDb } from '@/server/db.server';
|
|
18
18
|
import { readSettingsJson, writeSettingsJson } from '@/server/lib/db/settings-store';
|
|
19
19
|
import { HARNESS_LAUNCH, type HarnessLaunch } from '@/server/lib/harness/launch-table';
|
|
20
|
+
import { customLaunch } from '@/server/lib/harness/custom.server';
|
|
20
21
|
import {
|
|
21
22
|
harnessConfigKey,
|
|
22
23
|
isHarnessConfigured,
|
|
@@ -60,7 +61,7 @@ export function probeInvalidatedBy(previous: HarnessConfig, next: HarnessConfig)
|
|
|
60
61
|
/** The launch shape an override produces from the table entry, or null when the
|
|
61
62
|
* config says nothing about launching. Pure, so the merge is testable. */
|
|
62
63
|
export function launchFromConfig(id: HarnessId, config: HarnessConfig): HarnessLaunch | null {
|
|
63
|
-
const base = HARNESS_LAUNCH[id];
|
|
64
|
+
const base = HARNESS_LAUNCH[id] ?? customLaunch(id);
|
|
64
65
|
if (!base) return null;
|
|
65
66
|
const command = splitCommand(config.command);
|
|
66
67
|
const { env: parsedEnv, invalid } = parseEnvLines(config.env);
|
|
@@ -89,7 +90,7 @@ export function resolveLaunch(id: HarnessId, config: HarnessConfig): HarnessLaun
|
|
|
89
90
|
if (harnessDescriptor(id)?.builtIn) {
|
|
90
91
|
throw new Error(`${id} is built in and is not launched`);
|
|
91
92
|
}
|
|
92
|
-
if (!HARNESS_LAUNCH[id]) {
|
|
93
|
+
if (!HARNESS_LAUNCH[id] && !customLaunch(id)) {
|
|
93
94
|
throw new Error(`No launch command is configured for ${id}`);
|
|
94
95
|
}
|
|
95
96
|
const launch = launchFromConfig(id, config);
|
|
@@ -0,0 +1,209 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Harnesses the user adds, on top of the ones this build ships.
|
|
8
|
+
*
|
|
9
|
+
* The ACP transport is already harness-agnostic: a launch line is a command
|
|
10
|
+
* vector, the handshake is generic, and the settings page reads `/api/harness`
|
|
11
|
+
* rather than a static list. What was missing was a place to PUT a definition
|
|
12
|
+
* and a registry the synchronous call sites (`harnessDescriptor`,
|
|
13
|
+
* `resolveLaunch`, `commandAvailable`) can read.
|
|
14
|
+
*
|
|
15
|
+
* The registry is process-wide and anchored on `globalThis` for the reason every
|
|
16
|
+
* other one here is: `bun --hot` re-evaluates this module while the descriptors
|
|
17
|
+
* it registered are still in use, and a module-level map would come back empty.
|
|
18
|
+
*
|
|
19
|
+
* A custom harness is ACP by definition — the add form offers no other
|
|
20
|
+
* transport — so its descriptor is `transport: 'acp'`, `glyph: 'custom'`, and
|
|
21
|
+
* its launch line is the command the user typed. Nothing here spawns anything;
|
|
22
|
+
* the existing probe and spawn paths do, once `resolveLaunch` can see the row.
|
|
23
|
+
*/
|
|
24
|
+
|
|
25
|
+
import { getDb } from '@/server/db.server';
|
|
26
|
+
import { forgetProbe } from '@/server/lib/harness/probe-cache.server';
|
|
27
|
+
import { readSettingsJson, writeSettingsJson } from '@/server/lib/db/settings-store';
|
|
28
|
+
import { HARNESS_DISABLED_KEY } from '@/shared/lib/harness/enabled';
|
|
29
|
+
import { harnessConfigKey, parseEnvLines, splitCommand } from '@/shared/lib/harness/config';
|
|
30
|
+
import {
|
|
31
|
+
HARNESS_CATALOG,
|
|
32
|
+
isBuiltinHarness,
|
|
33
|
+
registerHarnessDescriptors,
|
|
34
|
+
type HarnessDescriptor,
|
|
35
|
+
} from '@/shared/lib/harness/catalog';
|
|
36
|
+
import type { HarnessLaunch } from '@/server/lib/harness/launch-table';
|
|
37
|
+
|
|
38
|
+
/** One user-added harness, as stored. */
|
|
39
|
+
export interface CustomHarness {
|
|
40
|
+
id: string;
|
|
41
|
+
label: string;
|
|
42
|
+
/** The letter the UI draws when there is no vendor mark. */
|
|
43
|
+
initial: string;
|
|
44
|
+
/** Space-separated launch command, e.g. `npx -y my-agent acp`. */
|
|
45
|
+
command: string;
|
|
46
|
+
/** `KEY=VALUE` lines, one per line. */
|
|
47
|
+
env: string;
|
|
48
|
+
note: string;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
export interface CustomHarnessInput {
|
|
52
|
+
id?: unknown;
|
|
53
|
+
label?: unknown;
|
|
54
|
+
initial?: unknown;
|
|
55
|
+
command?: unknown;
|
|
56
|
+
env?: unknown;
|
|
57
|
+
note?: unknown;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** Lowercase, digits and dashes: the id reaches a settings key and a URL. */
|
|
61
|
+
const ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,31}$/;
|
|
62
|
+
const MAX_LABEL = 40;
|
|
63
|
+
const MAX_NOTE = 200;
|
|
64
|
+
|
|
65
|
+
declare global {
|
|
66
|
+
// eslint-disable-next-line no-var
|
|
67
|
+
var __kabmoCustomHarnesses: Map<string, CustomHarness> | undefined;
|
|
68
|
+
// eslint-disable-next-line no-var
|
|
69
|
+
var __kabmoCustomHarnessesLoaded: boolean | undefined;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
function registry(): Map<string, CustomHarness> {
|
|
73
|
+
return (globalThis.__kabmoCustomHarnesses ??= new Map());
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function text(value: unknown): string {
|
|
77
|
+
return typeof value === 'string' ? value.trim() : '';
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* Validate one definition.
|
|
82
|
+
*
|
|
83
|
+
* Refuses by name rather than coercing: a command that is empty, an id that
|
|
84
|
+
* collides with a built-in, or an env line that is not `KEY=VALUE` would
|
|
85
|
+
* otherwise be stored and then fail at spawn with a message about something
|
|
86
|
+
* else.
|
|
87
|
+
*/
|
|
88
|
+
export function validateCustomHarness(
|
|
89
|
+
input: CustomHarnessInput,
|
|
90
|
+
): { ok: true; value: CustomHarness } | { ok: false; error: string } {
|
|
91
|
+
const id = text(input.id).toLowerCase();
|
|
92
|
+
if (!ID_PATTERN.test(id)) {
|
|
93
|
+
return { ok: false, error: 'id must be 1–32 lowercase letters, digits or dashes' };
|
|
94
|
+
}
|
|
95
|
+
if (isBuiltinHarness(id) || (HARNESS_CATALOG as Record<string, HarnessDescriptor | undefined>)[id]) {
|
|
96
|
+
return { ok: false, error: `"${id}" is a harness this build already ships` };
|
|
97
|
+
}
|
|
98
|
+
const label = text(input.label) || id;
|
|
99
|
+
if (label.length > MAX_LABEL) return { ok: false, error: `label must be at most ${MAX_LABEL} characters` };
|
|
100
|
+
const command = text(input.command);
|
|
101
|
+
if (splitCommand(command).length === 0) return { ok: false, error: 'command is required' };
|
|
102
|
+
const env = typeof input.env === 'string' ? input.env : '';
|
|
103
|
+
const parsedEnv = parseEnvLines(env);
|
|
104
|
+
if (parsedEnv.invalid.length > 0) {
|
|
105
|
+
return { ok: false, error: `invalid env line${parsedEnv.invalid.length === 1 ? '' : 's'}: ${parsedEnv.invalid.join(', ')}` };
|
|
106
|
+
}
|
|
107
|
+
const note = text(input.note);
|
|
108
|
+
if (note.length > MAX_NOTE) return { ok: false, error: `note must be at most ${MAX_NOTE} characters` };
|
|
109
|
+
const initial = (text(input.initial) || label.charAt(0) || '?').slice(0, 2);
|
|
110
|
+
return { ok: true, value: { id, label, initial, command, env, note } };
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
/** The descriptor the shared catalog registers for one row. */
|
|
114
|
+
function descriptorOf(harness: CustomHarness): HarnessDescriptor {
|
|
115
|
+
return { id: harness.id, label: harness.label, initial: harness.initial, transport: 'acp', glyph: 'custom' };
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/** Re-read every row and publish it to the shared catalog. */
|
|
119
|
+
export async function refreshCustomHarnesses(): Promise<void> {
|
|
120
|
+
const db = await getDb();
|
|
121
|
+
const rows = await db.all<{
|
|
122
|
+
id: string;
|
|
123
|
+
label: string;
|
|
124
|
+
initial: string;
|
|
125
|
+
command: string;
|
|
126
|
+
env: string;
|
|
127
|
+
note: string;
|
|
128
|
+
}>('SELECT id, label, initial, command, env, note FROM custom_harnesses ORDER BY created_at ASC');
|
|
129
|
+
const next = new Map<string, CustomHarness>();
|
|
130
|
+
for (const row of rows) next.set(row.id, { ...row });
|
|
131
|
+
globalThis.__kabmoCustomHarnesses = next;
|
|
132
|
+
globalThis.__kabmoCustomHarnessesLoaded = true;
|
|
133
|
+
registerHarnessDescriptors([...next.values()].map(descriptorOf));
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/** Load once per process; a write calls `refreshCustomHarnesses` itself. */
|
|
137
|
+
export async function ensureCustomHarnesses(): Promise<void> {
|
|
138
|
+
if (globalThis.__kabmoCustomHarnessesLoaded) return;
|
|
139
|
+
await refreshCustomHarnesses();
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/** Every custom harness, in creation order. */
|
|
143
|
+
export async function listCustomHarnesses(): Promise<CustomHarness[]> {
|
|
144
|
+
await ensureCustomHarnesses();
|
|
145
|
+
return [...registry().values()];
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
/** One custom harness, or undefined. Synchronous: the launch path needs it. */
|
|
149
|
+
export function customHarness(id: string | null | undefined): CustomHarness | undefined {
|
|
150
|
+
return id ? registry().get(id) : undefined;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
/** The launch line a custom harness contributes, or undefined. */
|
|
154
|
+
export function customLaunch(id: string | null | undefined): HarnessLaunch | undefined {
|
|
155
|
+
const harness = customHarness(id);
|
|
156
|
+
if (!harness) return undefined;
|
|
157
|
+
const { env } = parseEnvLines(harness.env);
|
|
158
|
+
return {
|
|
159
|
+
id: harness.id,
|
|
160
|
+
command: splitCommand(harness.command),
|
|
161
|
+
...(Object.keys(env).length > 0 ? { env } : {}),
|
|
162
|
+
note: harness.note || 'A harness you added.',
|
|
163
|
+
};
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
/** Create or replace one definition, then republish the catalog. */
|
|
167
|
+
export async function saveCustomHarness(input: CustomHarnessInput): Promise<CustomHarness> {
|
|
168
|
+
const checked = validateCustomHarness(input);
|
|
169
|
+
if (!checked.ok) throw new Error(checked.error);
|
|
170
|
+
const db = await getDb();
|
|
171
|
+
await db.run(
|
|
172
|
+
`INSERT INTO custom_harnesses (id, label, initial, command, env, note, created_at)
|
|
173
|
+
VALUES (?, ?, ?, ?, ?, ?, ?)
|
|
174
|
+
ON CONFLICT(id) DO UPDATE SET
|
|
175
|
+
label = excluded.label,
|
|
176
|
+
initial = excluded.initial,
|
|
177
|
+
command = excluded.command,
|
|
178
|
+
env = excluded.env,
|
|
179
|
+
note = excluded.note`,
|
|
180
|
+
[checked.value.id, checked.value.label, checked.value.initial, checked.value.command, checked.value.env, checked.value.note, Date.now()],
|
|
181
|
+
);
|
|
182
|
+
// The launch line may have changed, so the last probe no longer describes it.
|
|
183
|
+
await forgetProbe(checked.value.id);
|
|
184
|
+
await refreshCustomHarnesses();
|
|
185
|
+
return checked.value;
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
/**
|
|
189
|
+
* Remove one definition and every per-harness row it owned.
|
|
190
|
+
*
|
|
191
|
+
* Sessions are NOT deleted: a chat that ran on this harness keeps its
|
|
192
|
+
* `harness_sessions` row, and `resolveSessionRef` reports the id so the resume
|
|
193
|
+
* path can refuse in words ("this harness is no longer registered") instead of
|
|
194
|
+
* silently pretending the chat ran on omp.
|
|
195
|
+
*/
|
|
196
|
+
export async function removeCustomHarness(id: string): Promise<void> {
|
|
197
|
+
const db = await getDb();
|
|
198
|
+
await db.run('DELETE FROM custom_harnesses WHERE id = ?', [id]);
|
|
199
|
+
await db.run('DELETE FROM app_settings WHERE key = ?', [harnessConfigKey(id)]);
|
|
200
|
+
await db.run('DELETE FROM harness_probes WHERE harness = ?', [id]);
|
|
201
|
+
await forgetProbe(id);
|
|
202
|
+
const disabled = await readSettingsJson<unknown>(db, HARNESS_DISABLED_KEY, []);
|
|
203
|
+
if (Array.isArray(disabled) && disabled.includes(id)) {
|
|
204
|
+
const next = disabled.filter((entry) => entry !== id);
|
|
205
|
+
if (next.length === 0) await db.run('DELETE FROM app_settings WHERE key = ?', [HARNESS_DISABLED_KEY]);
|
|
206
|
+
else await writeSettingsJson(db, HARNESS_DISABLED_KEY, next);
|
|
207
|
+
}
|
|
208
|
+
await refreshCustomHarnesses();
|
|
209
|
+
}
|
|
@@ -187,12 +187,17 @@ export async function probeHarness(
|
|
|
187
187
|
agentProcess.newSession(dir, timeoutMs),
|
|
188
188
|
);
|
|
189
189
|
const options = session.configOptions ?? [];
|
|
190
|
+
const modeSelector = configByCategory(options, 'mode');
|
|
191
|
+
const currentMode = typeof modeSelector?.currentValue === 'string'
|
|
192
|
+
? modeSelector.currentValue
|
|
193
|
+
: session.modes?.currentModeId;
|
|
190
194
|
return {
|
|
191
195
|
harness: id,
|
|
192
196
|
capabilities: capabilitiesFrom(init, options, observed),
|
|
193
197
|
models: selectValues(configByCategory(options, 'model')),
|
|
194
198
|
thinking: selectValues(configByCategory(options, 'thought_level')),
|
|
195
|
-
modes: selectValues(
|
|
199
|
+
modes: selectValues(modeSelector),
|
|
200
|
+
...(currentMode ? { currentMode } : {}),
|
|
196
201
|
probedAt: Date.now(),
|
|
197
202
|
};
|
|
198
203
|
} catch (error) {
|
|
@@ -17,7 +17,11 @@
|
|
|
17
17
|
import type { HarnessSession } from '@/server/lib/harness/session';
|
|
18
18
|
|
|
19
19
|
/** Pulled from the omp registry module so there is one map, not two. */
|
|
20
|
-
export function registerAcpSession(
|
|
20
|
+
export function registerAcpSession(
|
|
21
|
+
session: HarnessSession,
|
|
22
|
+
requestedId: string,
|
|
23
|
+
onDestroy?: () => void,
|
|
24
|
+
): void {
|
|
21
25
|
// Imported lazily: `session-registry` imports the omp manager, which imports
|
|
22
26
|
// this file's neighbours, and a top-level import would close that cycle.
|
|
23
27
|
const registry = liveRegistry();
|
|
@@ -26,6 +30,9 @@ export function registerAcpSession(session: HarnessSession, requestedId: string)
|
|
|
26
30
|
session.onDestroy(() => {
|
|
27
31
|
if (registry.get(session.sessionId) === session) registry.delete(session.sessionId);
|
|
28
32
|
if (registry.get(requestedId) === session) registry.delete(requestedId);
|
|
33
|
+
// The caller's cleanup rides the SAME hook: `onDestroy` holds one callback,
|
|
34
|
+
// so a second registration would replace this one rather than add to it.
|
|
35
|
+
onDestroy?.();
|
|
29
36
|
});
|
|
30
37
|
}
|
|
31
38
|
|
|
@@ -115,9 +115,30 @@ const HARNESS_USAGE_STATE_SQL = `
|
|
|
115
115
|
);
|
|
116
116
|
`;
|
|
117
117
|
|
|
118
|
+
/**
|
|
119
|
+
* Harnesses the USER added, as opposed to the ones this build ships.
|
|
120
|
+
*
|
|
121
|
+
* A row is the whole definition: the launch line, the label and the initial the
|
|
122
|
+
* UI draws. Kept in a table rather than `app_settings` because the roster is
|
|
123
|
+
* read on every catalog answer and written one row at a time — the same reason
|
|
124
|
+
* `harness_sessions` is a table.
|
|
125
|
+
*/
|
|
126
|
+
const CUSTOM_HARNESSES_SQL = `
|
|
127
|
+
CREATE TABLE IF NOT EXISTS custom_harnesses (
|
|
128
|
+
id TEXT PRIMARY KEY,
|
|
129
|
+
label TEXT NOT NULL,
|
|
130
|
+
initial TEXT NOT NULL,
|
|
131
|
+
command TEXT NOT NULL,
|
|
132
|
+
env TEXT NOT NULL DEFAULT '',
|
|
133
|
+
note TEXT NOT NULL DEFAULT '',
|
|
134
|
+
created_at INTEGER NOT NULL
|
|
135
|
+
);
|
|
136
|
+
`;
|
|
137
|
+
|
|
118
138
|
/** Idempotent: created on every database open, like every other feature table. */
|
|
119
139
|
export async function ensureHarnessSchema(db: DbClient): Promise<void> {
|
|
120
140
|
await db.exec(HARNESS_SESSIONS_SQL);
|
|
141
|
+
await db.exec(CUSTOM_HARNESSES_SQL);
|
|
121
142
|
await db.exec(HARNESS_PROBES_SQL);
|
|
122
143
|
await db.exec(HARNESS_GOAL_STATE_SQL);
|
|
123
144
|
await db.exec(HARNESS_USAGE_STATE_SQL);
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The lease the Stats panel reads to name an ACP chat.
|
|
8
|
+
*
|
|
9
|
+
* The two rules pinned here are the ones a reader cannot recover from a wrong
|
|
10
|
+
* file: `startedAt` must survive the handshake (a claimed prewarm did not
|
|
11
|
+
* restart), and a title update must reach the file the panel reads rather than
|
|
12
|
+
* only the database it cannot.
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
import { afterEach, beforeEach, describe, expect, test } from 'bun:test';
|
|
16
|
+
import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
|
|
17
|
+
import { tmpdir } from 'node:os';
|
|
18
|
+
import { join } from 'node:path';
|
|
19
|
+
|
|
20
|
+
import { getHarnessLeasePath } from '@/server/lib/lifecycle/paths';
|
|
21
|
+
import {
|
|
22
|
+
noteHarnessLease,
|
|
23
|
+
pruneHarnessLeases,
|
|
24
|
+
removeHarnessLease,
|
|
25
|
+
updateHarnessLeaseTitle,
|
|
26
|
+
} from '@/server/lib/harness/session-lease.server';
|
|
27
|
+
|
|
28
|
+
let dir = '';
|
|
29
|
+
let originalDataDir: string | undefined;
|
|
30
|
+
|
|
31
|
+
beforeEach(() => {
|
|
32
|
+
originalDataDir = Bun.env.KABMO_DATA_DIR;
|
|
33
|
+
dir = mkdtempSync(join(tmpdir(), 'kabmo-harness-lease-'));
|
|
34
|
+
Bun.env.KABMO_DATA_DIR = dir;
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
afterEach(() => {
|
|
38
|
+
if (originalDataDir === undefined) delete Bun.env.KABMO_DATA_DIR;
|
|
39
|
+
else Bun.env.KABMO_DATA_DIR = originalDataDir;
|
|
40
|
+
rmSync(dir, { recursive: true, force: true });
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
function lease(pid: number): Record<string, unknown> {
|
|
44
|
+
return JSON.parse(readFileSync(getHarnessLeasePath(pid), 'utf8')) as Record<string, unknown>;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
describe('harness session lease', () => {
|
|
48
|
+
test('a spawn writes the catalog label and the spawn time', () => {
|
|
49
|
+
noteHarnessLease({ pid: 4242, harness: 'claude', cwd: '/p', state: 'starting' });
|
|
50
|
+
const record = lease(4242);
|
|
51
|
+
expect(record.label).toBe('claude');
|
|
52
|
+
expect(record.state).toBe('starting');
|
|
53
|
+
expect(record.sessionId).toBe('');
|
|
54
|
+
expect(record.startedAt).toBeGreaterThan(0);
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
test('the handshake keeps the spawn time and records the session', () => {
|
|
58
|
+
noteHarnessLease({ pid: 4243, harness: 'opencode', cwd: '/p', state: 'starting' });
|
|
59
|
+
const spawnedAt = lease(4243).startedAt;
|
|
60
|
+
noteHarnessLease({
|
|
61
|
+
pid: 4243,
|
|
62
|
+
harness: 'opencode',
|
|
63
|
+
cwd: '/p',
|
|
64
|
+
state: 'session',
|
|
65
|
+
sessionId: 'sess-1',
|
|
66
|
+
title: 'Fix it',
|
|
67
|
+
});
|
|
68
|
+
const record = lease(4243);
|
|
69
|
+
expect(record.startedAt).toBe(spawnedAt);
|
|
70
|
+
expect(record.state).toBe('session');
|
|
71
|
+
expect(record.sessionId).toBe('sess-1');
|
|
72
|
+
expect(record.title).toBe('Fix it');
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
test('a title update rewrites the lease that owns the session', () => {
|
|
76
|
+
noteHarnessLease({ pid: 4244, harness: 'codex', cwd: '/p', state: 'session', sessionId: 'sess-2' });
|
|
77
|
+
updateHarnessLeaseTitle('sess-2', 'Rename me');
|
|
78
|
+
expect(lease(4244).title).toBe('Rename me');
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
test('a title for a session with no lease is a no-op', () => {
|
|
82
|
+
expect(() => updateHarnessLeaseTitle('nobody', 'x')).not.toThrow();
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
test('removing a lease deletes the file', () => {
|
|
86
|
+
noteHarnessLease({ pid: 4245, harness: 'pi', cwd: '/p', state: 'prewarm' });
|
|
87
|
+
removeHarnessLease(4245);
|
|
88
|
+
expect(existsSync(getHarnessLeasePath(4245))).toBe(false);
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
test('pruning drops a dead pid and keeps a live one', () => {
|
|
92
|
+
noteHarnessLease({ pid: process.pid, harness: 'claude', cwd: '/p', state: 'session', sessionId: 'sess-live' });
|
|
93
|
+
const deadPid = 2_147_483_647;
|
|
94
|
+
writeFileSync(getHarnessLeasePath(deadPid), JSON.stringify({ pid: deadPid }));
|
|
95
|
+
expect(pruneHarnessLeases()).toBe(1);
|
|
96
|
+
expect(existsSync(getHarnessLeasePath(process.pid))).toBe(true);
|
|
97
|
+
expect(existsSync(getHarnessLeasePath(deadPid))).toBe(false);
|
|
98
|
+
});
|
|
99
|
+
});
|