@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,193 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The per-pid lease that tells the Stats panel which chat an ACP child is.
|
|
8
|
+
*
|
|
9
|
+
* omp's RPC hosts hold an OS `flock` on `~/.omp/run/session-owners/<id>.lock`,
|
|
10
|
+
* and the panel reads that descriptor to name a session. An ACP agent holds no
|
|
11
|
+
* such lease: its id lives in Kabmo's `harness_sessions` table and its
|
|
12
|
+
* transcript lives behind the agent, so a panel that only knew argv drew every
|
|
13
|
+
* `claude`/`codex`/`opencode` chat as a bare `npx` row inside Kabmo's own group
|
|
14
|
+
* — measured against the real launch table, 12 of the 13 ACP harnesses.
|
|
15
|
+
*
|
|
16
|
+
* This file is the missing fact, written by the process that owns it:
|
|
17
|
+
* `<data>/run/harness-sessions/<pid>.json`, one record per live ACP child.
|
|
18
|
+
*
|
|
19
|
+
* Three details are load-bearing:
|
|
20
|
+
*
|
|
21
|
+
* - **`startedAt` is the process's spawn time, not the write time.** The first
|
|
22
|
+
* write happens immediately after the spawn, so a reader can reject a
|
|
23
|
+
* recycled pid instead of naming a stranger's process after a chat. A
|
|
24
|
+
* claimed prewarm keeps the prewarm's `startedAt`, because the process did
|
|
25
|
+
* not restart when the chat adopted it.
|
|
26
|
+
* - **The record is a FILE, not a database row.** The reader is a plugin: its
|
|
27
|
+
* server half runs in this process but has no database handle, and opening a
|
|
28
|
+
* second one is forbidden. A file is the same channel omp's own lease and
|
|
29
|
+
* daemon registry already use.
|
|
30
|
+
* - **A write is atomic.** The panel samples once a second and may read while
|
|
31
|
+
* a title is being updated; a half-written JSON would drop the row back to
|
|
32
|
+
* `npx` for one tick.
|
|
33
|
+
*/
|
|
34
|
+
|
|
35
|
+
import fs from 'node:fs';
|
|
36
|
+
|
|
37
|
+
import { getHarnessLeaseDir, getHarnessLeasePath } from '@/server/lib/lifecycle/paths';
|
|
38
|
+
import { harnessDescriptor, type HarnessId } from '@/shared/lib/harness/catalog';
|
|
39
|
+
|
|
40
|
+
/** What the lease says the child is doing. */
|
|
41
|
+
export type HarnessLeaseState = 'starting' | 'session' | 'prewarm';
|
|
42
|
+
|
|
43
|
+
/** One live ACP child, as the Stats panel reads it. */
|
|
44
|
+
export interface HarnessLeaseRecord {
|
|
45
|
+
pid: number;
|
|
46
|
+
/** Kabmo's session id, empty until the handshake answers. */
|
|
47
|
+
sessionId: string;
|
|
48
|
+
harness: string;
|
|
49
|
+
/** The catalog's display label, so the panel needs no second table. */
|
|
50
|
+
label: string;
|
|
51
|
+
cwd: string;
|
|
52
|
+
state: HarnessLeaseState;
|
|
53
|
+
/** The process's spawn time (epoch ms), for the pid-reuse guard. */
|
|
54
|
+
startedAt: number;
|
|
55
|
+
/** The chat's name, empty until the first prompt or the agent names it. */
|
|
56
|
+
title: string;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
declare global {
|
|
60
|
+
// eslint-disable-next-line no-var
|
|
61
|
+
var __kabmoHarnessLeases: Map<string, number> | undefined;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/** session id → pid, so a title update can find the file to rewrite. */
|
|
65
|
+
function bySession(): Map<string, number> {
|
|
66
|
+
globalThis.__kabmoHarnessLeases ??= new Map();
|
|
67
|
+
return globalThis.__kabmoHarnessLeases;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function readLease(pid: number): HarnessLeaseRecord | null {
|
|
71
|
+
try {
|
|
72
|
+
const raw = JSON.parse(fs.readFileSync(getHarnessLeasePath(pid), 'utf8')) as unknown;
|
|
73
|
+
return raw && typeof raw === 'object' ? (raw as HarnessLeaseRecord) : null;
|
|
74
|
+
} catch {
|
|
75
|
+
// A missing or half-written file is a lease we do not have, which is the
|
|
76
|
+
// same outcome as a child that is not running.
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
function writeLease(record: HarnessLeaseRecord): void {
|
|
82
|
+
const file = getHarnessLeasePath(record.pid);
|
|
83
|
+
const tmp = `${file}.${process.pid}.tmp`;
|
|
84
|
+
try {
|
|
85
|
+
fs.writeFileSync(tmp, JSON.stringify(record), { mode: 0o600 });
|
|
86
|
+
fs.renameSync(tmp, file);
|
|
87
|
+
} catch (error) {
|
|
88
|
+
try {
|
|
89
|
+
fs.rmSync(tmp, { force: true });
|
|
90
|
+
} catch {
|
|
91
|
+
// The rename is what failed; a leftover temp file is pruned at boot.
|
|
92
|
+
}
|
|
93
|
+
console.error(`[harness] could not write the session lease for pid ${record.pid}:`, error);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/**
|
|
98
|
+
* Record (or update) the lease for one ACP child.
|
|
99
|
+
*
|
|
100
|
+
* Called twice per cold spawn — `starting` right after the process exists, then
|
|
101
|
+
* `session` once the handshake answers — and once per prewarm. A second call
|
|
102
|
+
* preserves the first call's `startedAt`, which is what makes the pid-reuse
|
|
103
|
+
* guard work for a prewarm claimed minutes later.
|
|
104
|
+
*/
|
|
105
|
+
export function noteHarnessLease(input: {
|
|
106
|
+
pid: number;
|
|
107
|
+
harness: HarnessId;
|
|
108
|
+
cwd: string;
|
|
109
|
+
state: HarnessLeaseState;
|
|
110
|
+
sessionId?: string;
|
|
111
|
+
title?: string;
|
|
112
|
+
}): void {
|
|
113
|
+
if (!Number.isInteger(input.pid) || input.pid <= 0) return;
|
|
114
|
+
const existing = readLease(input.pid);
|
|
115
|
+
const record: HarnessLeaseRecord = {
|
|
116
|
+
pid: input.pid,
|
|
117
|
+
sessionId: input.sessionId ?? existing?.sessionId ?? '',
|
|
118
|
+
harness: input.harness,
|
|
119
|
+
label: harnessDescriptor(input.harness)?.label ?? input.harness,
|
|
120
|
+
cwd: input.cwd,
|
|
121
|
+
state: input.state,
|
|
122
|
+
startedAt: existing?.startedAt ?? Date.now(),
|
|
123
|
+
title: input.title ?? existing?.title ?? '',
|
|
124
|
+
};
|
|
125
|
+
writeLease(record);
|
|
126
|
+
if (record.sessionId) bySession().set(record.sessionId, record.pid);
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* Rewrite the title of the lease that owns `sessionId`.
|
|
131
|
+
*
|
|
132
|
+
* A no-op for a session with no lease (an omp RPC chat, whose title lives in
|
|
133
|
+
* its transcript) and for a title that arrives before the spawn wrote one.
|
|
134
|
+
*/
|
|
135
|
+
export function updateHarnessLeaseTitle(sessionId: string, title: string): void {
|
|
136
|
+
const pid = bySession().get(sessionId);
|
|
137
|
+
if (!pid) return;
|
|
138
|
+
const record = readLease(pid);
|
|
139
|
+
if (!record) return;
|
|
140
|
+
writeLease({ ...record, title });
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
/** Forget one child: its process is gone, so its lease must not outlive it. */
|
|
144
|
+
export function removeHarnessLease(pid: number): void {
|
|
145
|
+
const record = readLease(pid);
|
|
146
|
+
if (record?.sessionId) bySession().delete(record.sessionId);
|
|
147
|
+
try {
|
|
148
|
+
fs.rmSync(getHarnessLeasePath(pid), { force: true });
|
|
149
|
+
} catch {
|
|
150
|
+
// A lease that cannot be removed is pruned at the next boot.
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
/** Whether a pid is still a live process (EPERM means it exists, owned by another user). */
|
|
155
|
+
function isAlive(pid: number): boolean {
|
|
156
|
+
try {
|
|
157
|
+
process.kill(pid, 0);
|
|
158
|
+
return true;
|
|
159
|
+
} catch (error) {
|
|
160
|
+
return (error as NodeJS.ErrnoException).code === 'EPERM';
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/**
|
|
165
|
+
* Drop the leases a crashed server left behind.
|
|
166
|
+
*
|
|
167
|
+
* The panel ignores a lease whose pid is not in its sweep, so a stale file is
|
|
168
|
+
* harmless to read — but one file per session ever spawned is unbounded growth,
|
|
169
|
+
* and a recycled pid is exactly what the `startedAt` guard exists to survive.
|
|
170
|
+
* Called once at boot, before any session can write a new one.
|
|
171
|
+
*/
|
|
172
|
+
export function pruneHarnessLeases(): number {
|
|
173
|
+
let names: string[];
|
|
174
|
+
try {
|
|
175
|
+
names = fs.readdirSync(getHarnessLeaseDir());
|
|
176
|
+
} catch {
|
|
177
|
+
return 0;
|
|
178
|
+
}
|
|
179
|
+
let removed = 0;
|
|
180
|
+
for (const name of names) {
|
|
181
|
+
const match = /^(\d+)\.json$/.exec(name);
|
|
182
|
+
if (!match) continue;
|
|
183
|
+
const pid = Number(match[1]);
|
|
184
|
+
if (isAlive(pid)) continue;
|
|
185
|
+
try {
|
|
186
|
+
fs.rmSync(getHarnessLeasePath(pid), { force: true });
|
|
187
|
+
removed += 1;
|
|
188
|
+
} catch {
|
|
189
|
+
// Another process may be pruning the same directory; the next boot retries.
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
return removed;
|
|
193
|
+
}
|
|
@@ -91,15 +91,15 @@ describe('harness session store', () => {
|
|
|
91
91
|
expect(await loadHarnessSession('never-spawned')).toBeNull();
|
|
92
92
|
});
|
|
93
93
|
|
|
94
|
-
test('a
|
|
95
|
-
// A row written by a newer build (an adapter since removed) would otherwise
|
|
96
|
-
// draw an empty box with no name.
|
|
94
|
+
test('a well-formed id is kept even without a descriptor, a malformed one is not', async () => {
|
|
97
95
|
expect(knownHarness('opencode', HARNESS_IDS)).toBe('opencode');
|
|
98
|
-
// A
|
|
99
|
-
//
|
|
100
|
-
//
|
|
101
|
-
|
|
102
|
-
expect(knownHarness('
|
|
96
|
+
// A user-added harness has no static descriptor, and a REMOVED one never
|
|
97
|
+
// will: dropping the id would rewrite the chat's harness to `omp-rpc` and
|
|
98
|
+
// resume it against the wrong agent. The id is kept; the launch path is what
|
|
99
|
+
// refuses in words.
|
|
100
|
+
expect(knownHarness('opencode2', HARNESS_IDS)).toBe('opencode2');
|
|
101
|
+
expect(knownHarness('some-future-agent', HARNESS_IDS)).toBe('some-future-agent');
|
|
102
|
+
expect(knownHarness('Not An Id', HARNESS_IDS)).toBeUndefined();
|
|
103
103
|
expect(knownHarness(undefined, HARNESS_IDS)).toBeUndefined();
|
|
104
104
|
});
|
|
105
105
|
|
|
@@ -182,6 +182,15 @@ export async function loadHarnessBySession(): Promise<Map<string, string>> {
|
|
|
182
182
|
return new Map(rows.map((row) => [row.session_id, row.harness]));
|
|
183
183
|
}
|
|
184
184
|
|
|
185
|
+
/** The stored name of a session, or '' when it has none yet. */
|
|
186
|
+
export async function loadHarnessSessionTitle(sessionId: string): Promise<string> {
|
|
187
|
+
const db = await getDb();
|
|
188
|
+
const row = (await db.get('SELECT title FROM harness_sessions WHERE session_id = ?', [sessionId])) as {
|
|
189
|
+
title: string | null;
|
|
190
|
+
} | null;
|
|
191
|
+
return row?.title ?? '';
|
|
192
|
+
}
|
|
193
|
+
|
|
185
194
|
/** The row for one session, or null. */
|
|
186
195
|
export async function loadHarnessSession(sessionId: string): Promise<HarnessSessionRecord | null> {
|
|
187
196
|
const db = await getDb();
|
|
@@ -198,9 +207,21 @@ export async function loadHarnessSession(sessionId: string): Promise<HarnessSess
|
|
|
198
207
|
};
|
|
199
208
|
}
|
|
200
209
|
|
|
201
|
-
/**
|
|
202
|
-
|
|
203
|
-
|
|
210
|
+
/** The shape every harness id has, built-in or user-added. */
|
|
211
|
+
const HARNESS_ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,31}$/;
|
|
212
|
+
|
|
213
|
+
/**
|
|
214
|
+
* Narrow a stored value to a harness id.
|
|
215
|
+
*
|
|
216
|
+
* A built-in is accepted by the caller's list; a WELL-FORMED id is accepted even
|
|
217
|
+
* when this process has no descriptor for it, because that is exactly the case a
|
|
218
|
+
* user-added harness produces after a restart (the registry loads asynchronously)
|
|
219
|
+
* and the case a REMOVED one produces forever. Dropping it would rewrite the
|
|
220
|
+
* chat's harness to `omp-rpc` — a wrong mark and a resume against the wrong
|
|
221
|
+
* agent. A malformed value is still refused.
|
|
222
|
+
*/
|
|
204
223
|
export function knownHarness(value: string | undefined, ids: readonly HarnessId[]): HarnessId | undefined {
|
|
205
|
-
|
|
224
|
+
if (!value) return undefined;
|
|
225
|
+
if ((ids as readonly string[]).includes(value)) return value as HarnessId;
|
|
226
|
+
return HARNESS_ID_PATTERN.test(value) ? (value as HarnessId) : undefined;
|
|
206
227
|
}
|
|
@@ -26,6 +26,7 @@
|
|
|
26
26
|
*/
|
|
27
27
|
|
|
28
28
|
import { emitRealtimeSignal } from '@/server/lib/realtime/signals.server';
|
|
29
|
+
import { updateHarnessLeaseTitle } from '@/server/lib/harness/session-lease.server';
|
|
29
30
|
import {
|
|
30
31
|
saveHarnessSessionTitle,
|
|
31
32
|
saveHarnessSessionTitleIfEmpty,
|
|
@@ -56,7 +57,13 @@ export async function notePromptTitle(sessionId: string, message: string): Promi
|
|
|
56
57
|
const title = titleFromPrompt(message);
|
|
57
58
|
if (!sessionId || !title) return false;
|
|
58
59
|
const written = await saveHarnessSessionTitleIfEmpty(sessionId, title).catch(() => false);
|
|
59
|
-
if (written)
|
|
60
|
+
if (written) {
|
|
61
|
+
// The Stats panel names a session from its lease, not from the database it
|
|
62
|
+
// cannot read; a title that only reached SQLite left the panel on
|
|
63
|
+
// `session <short>` for the life of the chat.
|
|
64
|
+
updateHarnessLeaseTitle(sessionId, title);
|
|
65
|
+
emitRealtimeSignal('sidebar-structure');
|
|
66
|
+
}
|
|
60
67
|
return written;
|
|
61
68
|
}
|
|
62
69
|
|
|
@@ -65,6 +72,9 @@ export async function noteAgentTitle(sessionId: string, title: string): Promise<
|
|
|
65
72
|
const next = title.trim();
|
|
66
73
|
if (!sessionId || !next) return false;
|
|
67
74
|
const written = await saveHarnessSessionTitle(sessionId, next).catch(() => false);
|
|
68
|
-
if (written)
|
|
75
|
+
if (written) {
|
|
76
|
+
updateHarnessLeaseTitle(sessionId, next);
|
|
77
|
+
emitRealtimeSignal('sidebar-structure');
|
|
78
|
+
}
|
|
69
79
|
return written;
|
|
70
80
|
}
|
|
@@ -12,21 +12,32 @@
|
|
|
12
12
|
* client keeps posting to the id it holds. `registerSpawnedSession` owns that
|
|
13
13
|
* rule; this module only supplies the driver.
|
|
14
14
|
*
|
|
15
|
-
* The model/thinking/mode picks ride the CONFIG WRITES after `session/new` —
|
|
16
|
-
* an environment variable — because ACP publishes them as selectors and the
|
|
17
|
-
* agent applies them to the session it just created.
|
|
15
|
+
* The model/thinking/mode picks ride the CONFIG WRITES after `session/new` —
|
|
16
|
+
* not an environment variable — because ACP publishes them as selectors and the
|
|
17
|
+
* agent applies them to the session it just created. That is also what lets a
|
|
18
|
+
* PREWARMED process (spawned and initialized before the picks were known) serve
|
|
19
|
+
* the request: the adopting session runs the same `session/new` and the same
|
|
20
|
+
* writes, minus the boot.
|
|
18
21
|
*/
|
|
19
22
|
|
|
20
23
|
import { AcpSession } from '@/server/lib/harness/acp/session';
|
|
24
|
+
import { claimPrewarmedAcpSession } from '@/server/lib/harness/acp/prewarm.server';
|
|
25
|
+
import { rememberAgentToken } from '@/server/lib/sessions/agent-token.server';
|
|
21
26
|
import { loadHarnessConfig, resolveLaunch } from '@/server/lib/harness/config.server';
|
|
22
27
|
import { sessionLaunchCommand } from '@/server/lib/harness/launch';
|
|
23
28
|
import { resolveDefaultModel, modelProvider } from '@/shared/lib/harness/config';
|
|
24
29
|
import { harnessProbeModels } from '@/server/lib/harness/probe-cache.server';
|
|
25
30
|
import { claimHarness } from '@/server/lib/harness/registry';
|
|
26
31
|
import { registerAcpSession } from '@/server/lib/harness/register.server';
|
|
27
|
-
import { saveHarnessSession } from '@/server/lib/harness/session-store.server';
|
|
32
|
+
import { loadHarnessSessionTitle, saveHarnessSession } from '@/server/lib/harness/session-store.server';
|
|
33
|
+
import { noteHarnessLease, removeHarnessLease } from '@/server/lib/harness/session-lease.server';
|
|
28
34
|
import { emitRealtimeSignal } from '@/server/lib/realtime/signals.server';
|
|
29
35
|
import { harnessDescriptor, type HarnessId } from '@/shared/lib/harness/catalog';
|
|
36
|
+
import { mcpDelivery } from '@/shared/lib/harness/mcp-facts';
|
|
37
|
+
import { mcpServersFor, toAcpMcpServers } from '@/server/lib/mcp/registry.server';
|
|
38
|
+
import { ensureCustomHarnesses } from '@/server/lib/harness/custom.server';
|
|
39
|
+
import type { HarnessConfig } from '@/shared/lib/harness/config';
|
|
40
|
+
import type { AcpProcess } from '@/server/lib/harness/acp/client';
|
|
30
41
|
import type { HarnessSession } from '@/server/lib/harness/session';
|
|
31
42
|
import type { SelectedModel } from '@/shared/types/models';
|
|
32
43
|
import type { ApprovalMode } from '@/shared/lib/omp/config/access-mode';
|
|
@@ -40,6 +51,9 @@ export interface AcpSpawnRequest {
|
|
|
40
51
|
/** Fork this agent session instead of starting a new one. Mutually exclusive
|
|
41
52
|
* with `resumeAgentSessionId`; the returned id is the child's own. */
|
|
42
53
|
forkAgentSessionId?: string;
|
|
54
|
+
/** `_meta` for `session/fork` — the fork point an agent extension reads
|
|
55
|
+
* (claude-agent-acp's AIR `fork`). Omitted forks the whole session. */
|
|
56
|
+
forkMeta?: Record<string, unknown>;
|
|
43
57
|
cwd: string;
|
|
44
58
|
model?: SelectedModel | null;
|
|
45
59
|
thinkingLevel?: string | null;
|
|
@@ -49,22 +63,58 @@ export interface AcpSpawnRequest {
|
|
|
49
63
|
accessMode?: ApprovalMode | null;
|
|
50
64
|
/** Extra environment for this child only (the agent token and server URL). */
|
|
51
65
|
env?: Record<string, string>;
|
|
66
|
+
/** A prewarmed (spawned + initialized) agent to adopt instead of spawning. */
|
|
67
|
+
process?: AcpProcess;
|
|
68
|
+
/**
|
|
69
|
+
* Adopt a prewarmed agent for this harness+cwd, when one is waiting.
|
|
70
|
+
*
|
|
71
|
+
* Opt-in rather than always: the prewarm belongs to the pending chat that
|
|
72
|
+
* triggered it (a New Chat click or a harness pick), and a child spawn or a
|
|
73
|
+
* resume must not consume it. Only a brand-new top-level chat claims.
|
|
74
|
+
*/
|
|
75
|
+
claimPrewarmed?: boolean;
|
|
52
76
|
}
|
|
53
77
|
|
|
54
78
|
export class HarnessNotLaunchableError extends Error {
|
|
55
79
|
constructor(harness: HarnessId, reason: string) {
|
|
56
|
-
super(
|
|
80
|
+
super(`${harnessDescriptor(harness)?.label ?? harness} cannot start: ${reason}`);
|
|
57
81
|
this.name = 'HarnessNotLaunchableError';
|
|
58
82
|
}
|
|
59
83
|
}
|
|
60
84
|
|
|
61
|
-
|
|
85
|
+
/** The model/thinking/mode a start would apply, resolved against what the agent
|
|
86
|
+
* published. Shared by the cold spawn and the claim, so a prewarmed session
|
|
87
|
+
* ends on exactly the picks a cold one would have started with. */
|
|
88
|
+
async function resolvePicks(
|
|
62
89
|
request: AcpSpawnRequest,
|
|
63
|
-
|
|
90
|
+
loaded?: HarnessConfig,
|
|
91
|
+
): Promise<{
|
|
92
|
+
model: SelectedModel | null;
|
|
93
|
+
thinking: string | null;
|
|
94
|
+
mode: string | null;
|
|
95
|
+
}> {
|
|
96
|
+
const configured = loaded ?? await loadHarnessConfig(request.harness);
|
|
97
|
+
const probedModels = await harnessProbeModels(request.harness);
|
|
98
|
+
const configuredDefault = resolveDefaultModel(configured, probedModels);
|
|
99
|
+
const model = request.model
|
|
100
|
+
?? (configuredDefault ? { provider: modelProvider(configuredDefault), modelId: configuredDefault } : null);
|
|
101
|
+
return {
|
|
102
|
+
model,
|
|
103
|
+
thinking: request.thinkingLevel ?? configured.thinking ?? null,
|
|
104
|
+
mode: request.mode ?? configured.mode ?? null,
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
export async function openAcpSession(
|
|
109
|
+
request: AcpSpawnRequest,
|
|
110
|
+
): Promise<{ session: AcpSession; realSessionId: string }> {
|
|
64
111
|
// The USER's launch line, merged over the build's table. A command override is
|
|
65
112
|
// the only way to start an agent installed outside PATH, and an env override is
|
|
66
113
|
// the only provider switch an ACP agent actually honours — Kabmo routes nothing
|
|
67
114
|
// model-side for these agents, so pretending to would be a wrong setting.
|
|
115
|
+
// A user-added harness lives in the database, and `resolveLaunch` is
|
|
116
|
+
// synchronous: load the registry before asking it for a launch line.
|
|
117
|
+
await ensureCustomHarnesses();
|
|
68
118
|
const configured = await loadHarnessConfig(request.harness);
|
|
69
119
|
let launch;
|
|
70
120
|
try {
|
|
@@ -76,14 +126,13 @@ export async function startAcpSession(
|
|
|
76
126
|
);
|
|
77
127
|
}
|
|
78
128
|
|
|
79
|
-
|
|
80
|
-
//
|
|
81
|
-
//
|
|
82
|
-
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
129
|
+
const picks = await resolvePicks(request, configured);
|
|
130
|
+
// The MCP list is read per SPAWN, not cached: a server added in Settings must
|
|
131
|
+
// reach the next chat without a restart. A harness whose delivery is a file
|
|
132
|
+
// (omp's RPC mode) is not an ACP session, so this branch is the ACP contract.
|
|
133
|
+
const mcpServers = mcpDelivery(request.harness) === 'acp'
|
|
134
|
+
? toAcpMcpServers(await mcpServersFor(request.cwd))
|
|
135
|
+
: [];
|
|
87
136
|
// Built here rather than behind a factory in the session module: this is the
|
|
88
137
|
// only place a session is constructed, and the handshake it runs (load vs
|
|
89
138
|
// new) is decided by the request this function already holds.
|
|
@@ -93,34 +142,85 @@ export async function startAcpSession(
|
|
|
93
142
|
harness: request.harness,
|
|
94
143
|
command: sessionLaunchCommand(request.harness, launch.command),
|
|
95
144
|
...(Object.keys(childEnv).length > 0 ? { env: childEnv } : {}),
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
145
|
+
...(request.process ? { process: request.process } : {}),
|
|
146
|
+
model: picks.model,
|
|
147
|
+
thinkingLevel: picks.thinking,
|
|
148
|
+
mode: picks.mode,
|
|
99
149
|
accessMode: request.accessMode ?? null,
|
|
150
|
+
mcpServers,
|
|
100
151
|
},
|
|
101
152
|
request.cwd,
|
|
102
153
|
);
|
|
154
|
+
// The lease is written BEFORE the handshake: the Stats panel samples once a
|
|
155
|
+
// second, and a child that exists but has no lease is drawn as a bare `npx`
|
|
156
|
+
// row inside Kabmo's own group. `startedAt` is therefore the spawn time, not
|
|
157
|
+
// the (possibly 80 s) handshake's end.
|
|
158
|
+
const pid = session.pid;
|
|
159
|
+
if (pid) noteHarnessLease({ pid, harness: request.harness, cwd: request.cwd, state: 'starting' });
|
|
103
160
|
let realSessionId: string;
|
|
104
161
|
try {
|
|
105
162
|
({ sessionId: realSessionId } = await session.start(
|
|
106
163
|
request.resumeAgentSessionId || undefined,
|
|
107
164
|
request.forkAgentSessionId,
|
|
165
|
+
request.forkMeta,
|
|
108
166
|
));
|
|
109
167
|
} catch (error) {
|
|
110
168
|
// A refused handshake (an agent that will not `session/load`, a launch line
|
|
111
169
|
// that cannot run) must not leave the child it just spawned running with
|
|
112
170
|
// nobody holding it: measured on a resume of a chat the agent no longer
|
|
113
171
|
// knew, the process stayed alive after the request answered an error.
|
|
172
|
+
if (pid) removeHarnessLease(pid);
|
|
114
173
|
await session.destroyAndWait().catch(() => {});
|
|
115
174
|
throw error;
|
|
116
175
|
}
|
|
117
176
|
if (!realSessionId) {
|
|
177
|
+
if (pid) removeHarnessLease(pid);
|
|
118
178
|
await session.destroyAndWait().catch(() => {});
|
|
119
179
|
throw new Error(`${request.harness} started a session without an id`);
|
|
120
180
|
}
|
|
181
|
+
if (pid) {
|
|
182
|
+
// A resumed chat already has a name in `harness_sessions`; the panel must
|
|
183
|
+
// show it on the first sample rather than `session <short>` until the next
|
|
184
|
+
// prompt. A new chat has no row yet, so the read answers ''.
|
|
185
|
+
const title = await loadHarnessSessionTitle(realSessionId).catch(() => '');
|
|
186
|
+
noteHarnessLease({
|
|
187
|
+
pid,
|
|
188
|
+
harness: request.harness,
|
|
189
|
+
cwd: request.cwd,
|
|
190
|
+
state: 'session',
|
|
191
|
+
sessionId: realSessionId,
|
|
192
|
+
title,
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
return { session, realSessionId };
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
export async function startAcpSession(
|
|
199
|
+
request: AcpSpawnRequest,
|
|
200
|
+
): Promise<{ session: HarnessSession; realSessionId: string; adopted: boolean }> {
|
|
201
|
+
const claimable = request.claimPrewarmed && !request.resumeAgentSessionId && !request.forkAgentSessionId;
|
|
202
|
+
// A warm agent skips the spawn AND the `initialize` handshake; `session/new`
|
|
203
|
+
// and the picks still run, in the same place a cold spawn runs them, so there
|
|
204
|
+
// is one definition of "the session a chat starts in".
|
|
205
|
+
const warm = claimable ? await claimPrewarmedAcpSession(request.harness, request.cwd) : null;
|
|
206
|
+
const { session, realSessionId } = await openAcpSession(
|
|
207
|
+
warm ? { ...request, process: warm.process } : request,
|
|
208
|
+
);
|
|
209
|
+
if (warm) {
|
|
210
|
+
// The process's environment already carries the credential minted at
|
|
211
|
+
// prewarm; recording a different one here would authenticate its callbacks
|
|
212
|
+
// against a token nobody holds.
|
|
213
|
+
await rememberAgentToken(realSessionId, warm.token).catch((cause: unknown) => {
|
|
214
|
+
console.error(`[harness] could not record the agent token for ${realSessionId}:`, cause);
|
|
215
|
+
});
|
|
216
|
+
}
|
|
121
217
|
|
|
122
218
|
claimHarness(session, request.harness);
|
|
123
|
-
|
|
219
|
+
// The lease is removed by the SAME destroy hook that unregisters the session:
|
|
220
|
+
// `onDestroy` is a single slot, so a second registration would silently
|
|
221
|
+
// replace the registry cleanup and leave a dead session answering for its id.
|
|
222
|
+
const pid = session.pid;
|
|
223
|
+
registerAcpSession(session, request.sessionId, pid ? () => removeHarnessLease(pid) : undefined);
|
|
124
224
|
// Record the ownership BEFORE the first frame is forwarded: the sidebar reads
|
|
125
225
|
// this table, not the live registry, so a row written late would draw the row
|
|
126
226
|
// as `omp` until the next folder load. A failed write must not kill a live
|
|
@@ -142,5 +242,8 @@ export async function startAcpSession(
|
|
|
142
242
|
// snapshot; the child exists now, so the topic must re-snapshot.
|
|
143
243
|
emitRealtimeSignal('session-attached', realSessionId);
|
|
144
244
|
if (request.sessionId !== realSessionId) emitRealtimeSignal('session-attached', request.sessionId);
|
|
145
|
-
|
|
245
|
+
// `adopted` is what tells the route NOT to record its own callback token: the
|
|
246
|
+
// claimed child's environment already carries the one minted when it warmed,
|
|
247
|
+
// and replacing it made every callback from that agent fail authentication.
|
|
248
|
+
return { session, realSessionId, adopted: warm !== null };
|
|
146
249
|
}
|
|
@@ -35,7 +35,7 @@ import { invalidateOmpCliCache } from '@/server/lib/omp/core/cli';
|
|
|
35
35
|
import { getHarnessUpdateStatusPath } from '@/server/lib/lifecycle/paths';
|
|
36
36
|
import { readUpdateJob, settleDeadJob, writeUpdateJob } from '@/server/lib/harness/update-job-store';
|
|
37
37
|
import { spawnUpdateWorker } from '@/server/lib/harness/update-spawn.server';
|
|
38
|
-
import { HARNESS_IDS, type HarnessId } from '@/shared/lib/harness/catalog';
|
|
38
|
+
import { HARNESS_IDS, isBuiltinHarness, type HarnessId } from '@/shared/lib/harness/catalog';
|
|
39
39
|
import { harnessUpdateFacts, type HarnessUpdateFacts } from '@/shared/lib/harness/updates';
|
|
40
40
|
import { repointAdapterLaunch, type HarnessUpdateStep } from '@/shared/lib/harness/update-plan';
|
|
41
41
|
import { jobMoving, jobQueued, jobRunning } from '@/shared/lib/harness/update-job';
|
|
@@ -162,7 +162,7 @@ async function probeAfterUpdate(
|
|
|
162
162
|
|
|
163
163
|
/** Run the probe for a settled record, once per run, in the background. */
|
|
164
164
|
function startProbe(job: HarnessUpdateJob, options: HarnessQueueOptions): void {
|
|
165
|
-
if (!
|
|
165
|
+
if (!isBuiltinHarness(job.harness)) return;
|
|
166
166
|
const key = `${job.harness}:${job.startedAt}`;
|
|
167
167
|
if (probing.has(key)) return;
|
|
168
168
|
probing.add(key);
|
|
@@ -178,7 +178,7 @@ async function applyFinishedJob(
|
|
|
178
178
|
// The record is a file, so its id is not proof of a catalog entry; an unknown
|
|
179
179
|
// one has no facts and nothing to repoint — it is still marked applied, so it
|
|
180
180
|
// is not re-applied on every tick.
|
|
181
|
-
const harness =
|
|
181
|
+
const harness = isBuiltinHarness(job.harness) ? job.harness : null;
|
|
182
182
|
const facts = harness ? harnessUpdateFacts(harness) : null;
|
|
183
183
|
let repointed: string | null = null;
|
|
184
184
|
|
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
|
|
21
21
|
import { getDb } from '@/server/db.server';
|
|
22
22
|
import { startHarnessAutoProbe } from '@/server/lib/harness/auto-probe.server';
|
|
23
|
+
import { ensureCustomHarnesses } from '@/server/lib/harness/custom.server';
|
|
23
24
|
import { pumpUpdateQueue } from '@/server/lib/harness/update-queue.server';
|
|
24
25
|
import { compactChatOverlayRows } from '@/server/lib/db/compact-chat-overlay';
|
|
25
26
|
import { packageDir } from '@/server/lib/fs/package-root';
|
|
@@ -28,7 +29,9 @@ import { installMemoryMaintenance, stopMemoryMaintenance } from '@/server/lib/li
|
|
|
28
29
|
import { syncDiscoveryRootsWatch, stopDiscoveryRootsWatch } from '@/server/lib/omp/config/roots-watch.server';
|
|
29
30
|
import { startPanelAutoUpdate } from '@/server/lib/panels/auto-update.server';
|
|
30
31
|
import { syncBundledPlugins } from '@/server/lib/panels/sync.server';
|
|
31
|
-
import {
|
|
32
|
+
import { loadPluginServers } from '@/server/lib/plugins/loader.server';
|
|
33
|
+
import { disposeAllPluginsOnShutdown } from '@/server/lib/plugins/shutdown.server';
|
|
34
|
+
import { startPluginScheduleRuntime, stopPluginScheduleRuntime } from '@/server/lib/plugins/schedule-runner.server';
|
|
32
35
|
import { startScheduleRuntime, stopScheduleRuntime } from '@/server/lib/schedule/runtime.server';
|
|
33
36
|
import { ensureTray } from '@/server/lib/tray/runtime.server';
|
|
34
37
|
import { startWaitingRuntime, stopWaitingRuntime } from '@/server/lib/waiting/runtime.server';
|
|
@@ -47,6 +50,11 @@ export interface AfterListenTarget {
|
|
|
47
50
|
*/
|
|
48
51
|
export async function runAfterListenTasks(target: AfterListenTarget): Promise<void> {
|
|
49
52
|
await compactChatOverlay();
|
|
53
|
+
// Before any probe or spawn: a user-added harness is a database row, and the
|
|
54
|
+
// launch resolver is synchronous.
|
|
55
|
+
await ensureCustomHarnesses().catch((error) => {
|
|
56
|
+
console.error('[harness] custom harnesses skipped:', error);
|
|
57
|
+
});
|
|
50
58
|
await watchDiscoveryRoots();
|
|
51
59
|
|
|
52
60
|
// The scheduled-task clock. Started after the listener is up and the watchers
|
|
@@ -62,6 +70,8 @@ export async function runAfterListenTasks(target: AfterListenTarget): Promise<vo
|
|
|
62
70
|
|
|
63
71
|
await syncBundledPluginsAndReport();
|
|
64
72
|
await loadPluginServerHalves();
|
|
73
|
+
// After the halves: a schedule exists only once its plugin's factory ran.
|
|
74
|
+
startPluginScheduleRuntime();
|
|
65
75
|
startPanelAutoUpdate();
|
|
66
76
|
startTray(target);
|
|
67
77
|
|
|
@@ -95,6 +105,7 @@ export function installShutdownHandlers(stopListener: () => void | Promise<void>
|
|
|
95
105
|
stopDiscoveryRootsWatch();
|
|
96
106
|
stopMemoryMaintenance();
|
|
97
107
|
stopScheduleRuntime();
|
|
108
|
+
stopPluginScheduleRuntime();
|
|
98
109
|
stopWaitingRuntime();
|
|
99
110
|
void stopListener();
|
|
100
111
|
// Plugins own children and listeners nothing else releases, and a detached
|
|
@@ -112,7 +112,25 @@ export function getLockPath(port: number | string): string {
|
|
|
112
112
|
}
|
|
113
113
|
|
|
114
114
|
/**
|
|
115
|
-
* `<data>/run/harness-
|
|
115
|
+
* `<data>/run/harness-sessions` — one lease per live ACP child, keyed by pid.
|
|
116
|
+
*
|
|
117
|
+
* The Stats panel reads this directory to name an ACP chat: an ACP agent holds
|
|
118
|
+
* no omp session lease, so without this file the panel can only see argv and
|
|
119
|
+
* draws every `claude`/`codex`/`opencode` chat as a bare `npx` row inside
|
|
120
|
+
* Kabmo's own group. See `harness/session-lease.server.ts`.
|
|
121
|
+
*/
|
|
122
|
+
export function getHarnessLeaseDir(): string {
|
|
123
|
+
const dir = path.join(getRunDir(), 'harness-sessions');
|
|
124
|
+
fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
125
|
+
return dir;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
/** `<data>/run/harness-sessions/<pid>.json` — the lease for one ACP child. */
|
|
129
|
+
export function getHarnessLeasePath(pid: number): string {
|
|
130
|
+
return path.join(getHarnessLeaseDir(), `${pid}.json`);
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
/** `<data>/run/harness-update.<id>.json` — the state of THAT harness's update:
|
|
116
134
|
* waiting in the queue, installing, or the last one that ran.
|
|
117
135
|
*
|
|
118
136
|
* On disk, not in memory, because the run outlives the request that started it:
|