@kabmo-labs/kabmo 0.23.0 → 0.25.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 +805 -736
- package/dist/client/static/js/index-bc9aa4mx.css +1 -0
- package/dist/client/static/js/{index-ph0q59rs.js → index-ga8cbpt4.js} +1071 -1171
- package/package.json +2 -4
- package/src/cli/lib/args.js +24 -1
- package/src/cli/lib/args.test.js +16 -0
- package/src/cli/lib/commands/session.js +233 -0
- package/src/cli/lib/commands/session.test.js +103 -0
- package/src/cli/main.js +1 -1
- package/src/client/components/common/ComposerPicker.tsx +3 -0
- package/src/client/components/common/Modal.tsx +2 -6
- package/src/client/components/common/code-surface/shiki.test.ts +82 -0
- package/src/client/components/common/code-surface/shiki.ts +28 -7
- package/src/client/components/common/session-actions-menu/NewChildSessionDialog.tsx +113 -0
- package/src/client/components/common/session-actions-menu/index.tsx +33 -2
- package/src/client/components/common/session-row/StatusSlot.tsx +4 -4
- package/src/client/components/common/session-row/index.tsx +27 -1
- package/src/client/components/layout/desktop-layout/WorkspacePanels.tsx +7 -1
- package/src/client/components/layout/desktop-layout/resizer/separator-drag.ts +3 -3
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +25 -12
- package/src/client/components/layout/session-sidebar/ChildSessionList.tsx +66 -0
- package/src/client/components/layout/session-sidebar/SessionItem.tsx +28 -3
- package/src/client/components/layout/session-sidebar/about-modal/HarnessTable.test.tsx +20 -0
- package/src/client/components/layout/session-sidebar/about-modal/HarnessTable.tsx +59 -12
- package/src/client/components/layout/session-sidebar/about-modal/HarnessTableLog.test.tsx +94 -0
- package/src/client/components/layout/session-sidebar/about-modal/UpdateLogDialog.test.tsx +130 -0
- package/src/client/components/layout/session-sidebar/about-modal/UpdateLogDialog.tsx +120 -0
- package/src/client/components/layout/session-sidebar/about-modal/UpdateLogLine.tsx +47 -0
- package/src/client/components/layout/session-sidebar/about-modal/index.test.tsx +122 -0
- package/src/client/components/layout/session-sidebar/about-modal/index.tsx +55 -46
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +18 -5
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +21 -4
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.tsx +27 -5
- package/src/client/components/settings/categories/harness-settings/EnvProviderForm.tsx +31 -0
- package/src/client/components/settings/categories/harness-settings/provider-panel.test.tsx +49 -0
- package/src/client/components/workspace/chat-timeline/ChatOverlays.tsx +5 -2
- package/src/client/components/workspace/chat-timeline/ComposerDock.tsx +64 -70
- package/src/client/components/workspace/chat-timeline/ComposerDockFrame.tsx +35 -0
- package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +135 -118
- package/src/client/components/workspace/chat-timeline/MessageItem.tsx +22 -1
- package/src/client/components/workspace/chat-timeline/MessageList.test.ts +14 -0
- package/src/client/components/workspace/chat-timeline/MessageList.tsx +4 -0
- package/src/client/components/workspace/chat-timeline/TimelineBody.tsx +3 -0
- package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +4 -3
- package/src/client/components/workspace/chat-timeline/composer-dock-frame.test.tsx +155 -0
- package/src/client/components/workspace/chat-timeline/index.tsx +5 -2
- package/src/client/components/workspace/chat-timeline/pending-harness.test.tsx +1 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/FrameControl.tsx +11 -20
- package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/GroupedAsk.tsx +1 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/QuestionBlock.tsx +1 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/drafts.ts +1 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/index.tsx +2 -1
- package/src/client/components/workspace/file-explorer/index.test.ts +25 -0
- package/src/client/components/workspace/file-explorer/index.tsx +9 -3
- package/src/client/components/workspace/model-dropdown/harness-models.test.ts +17 -0
- package/src/client/components/workspace/model-dropdown/harness-models.ts +33 -18
- package/src/client/components/workspace/model-dropdown/index.tsx +3 -3
- package/src/client/components/workspace/model-dropdown/popover-metrics.ts +4 -1
- package/src/client/components/workspace/terminal-panel/KeyBar.tsx +10 -8
- package/src/client/components/workspace/terminal-panel/{RealtimeXtermView.tsx → RealtimeTerminalView.tsx} +51 -58
- package/src/client/components/workspace/terminal-panel/fit.test.ts +37 -0
- package/src/client/components/workspace/terminal-panel/fit.ts +64 -0
- package/src/client/components/workspace/terminal-panel/fonts.test.ts +161 -0
- package/src/client/components/workspace/terminal-panel/fonts.ts +164 -0
- package/src/client/components/workspace/terminal-panel/grid.test.ts +52 -0
- package/src/client/components/workspace/terminal-panel/grid.ts +118 -0
- package/src/client/components/workspace/terminal-panel/index.tsx +25 -21
- package/src/client/components/workspace/terminal-panel/mount.ts +247 -223
- package/src/client/components/workspace/terminal-panel/navigation.test.ts +54 -0
- package/src/client/components/workspace/terminal-panel/navigation.ts +47 -0
- package/src/client/data/settings/omp-schema.json +5 -5
- package/src/client/data/theme/terminal.test.ts +25 -0
- package/src/client/data/theme/terminal.ts +96 -79
- package/src/client/hooks/chat/composer/items.test.ts +12 -26
- package/src/client/hooks/chat/composer/pick-mapping.test.ts +42 -0
- package/src/client/hooks/chat/omp/prompt-send.test.ts +7 -7
- package/src/client/hooks/chat/omp/prompt-send.ts +26 -14
- package/src/client/hooks/chat/timeline/actions.ts +2 -2
- package/src/client/hooks/chat/timeline/ask-frames.ts +5 -4
- package/src/client/hooks/chat/timeline/new-chat-open.test.ts +86 -0
- package/src/client/hooks/chat/timeline/new-chat-open.ts +23 -5
- package/src/client/hooks/chat/timeline/new-chat.test.ts +32 -4
- package/src/client/hooks/chat/timeline/new-chat.ts +18 -6
- package/src/client/hooks/chat/timeline/prompt-text.test.ts +34 -1
- package/src/client/hooks/chat/timeline/prompt-text.ts +47 -20
- package/src/client/hooks/chat/timeline/rewind-actions.test.ts +24 -1
- package/src/client/hooks/chat/timeline/rewind-actions.ts +15 -11
- package/src/client/hooks/chat/timeline/run-identity.test.ts +52 -0
- package/src/client/hooks/chat/timeline/run-identity.ts +23 -11
- package/src/client/hooks/chat/timeline/send-execute.test.ts +56 -0
- package/src/client/hooks/chat/timeline/send-helpers.ts +30 -1
- package/src/client/hooks/chat/timeline/send-props.ts +5 -3
- package/src/client/hooks/chat/timeline/send-steer.test.ts +4 -4
- package/src/client/hooks/chat/timeline/send.test-util.ts +8 -2
- package/src/client/hooks/chat/timeline/send.test.ts +4 -4
- package/src/client/hooks/chat/timeline/send.ts +59 -53
- package/src/client/hooks/chat/timeline/session-load.test-util.ts +6 -2
- package/src/client/hooks/chat/timeline/session-load.test.ts +31 -0
- package/src/client/hooks/chat/timeline/session-load.ts +6 -14
- package/src/client/hooks/chat/timeline/session-shapes.ts +32 -0
- package/src/client/hooks/chat/timeline/use-fork-session.ts +49 -0
- package/src/client/hooks/models/harness-catalog.ts +114 -0
- package/src/client/hooks/models/provider-writes.test.ts +81 -0
- package/src/client/hooks/models/provider-writes.ts +10 -3
- package/src/client/hooks/models/use-harness-update.test.ts +193 -0
- package/src/client/hooks/models/use-harness-update.ts +202 -0
- package/src/client/hooks/models/use-harnesses-controller.ts +57 -0
- package/src/client/hooks/models/use-harnesses-signal.test.ts +128 -0
- package/src/client/hooks/models/use-harnesses.test.ts +2 -1
- package/src/client/hooks/models/use-harnesses.ts +48 -114
- package/src/client/hooks/workspace/child-expansion.ts +33 -0
- package/src/client/hooks/workspace/terminal/index.ts +17 -3
- package/src/client/hooks/workspace/terminal/socket.ts +9 -4
- package/src/client/lib/session-tree.test.ts +50 -0
- package/src/client/lib/session-tree.ts +59 -0
- package/src/client/tailwind.css +26 -12
- package/src/server/index.ts +2 -0
- package/src/server/lib/auth/guard.ts +10 -0
- package/src/server/lib/btw/session-copy.server.ts +6 -44
- package/src/server/lib/btw/session-copy.test.ts +2 -1
- package/src/server/lib/db/schema.ts +4 -0
- package/src/server/lib/db/seed-terminal.test.ts +1 -1
- package/src/server/lib/db/seed.test.ts +1 -1
- package/src/server/lib/harness/acp/activation.test.ts +81 -0
- package/src/server/lib/harness/acp/activation.ts +72 -0
- package/src/server/lib/harness/acp/background-work.test.ts +262 -0
- package/src/server/lib/harness/acp/background-work.ts +320 -0
- package/src/server/lib/harness/acp/client.ts +2 -2
- package/src/server/lib/harness/acp/frames.test.ts +50 -1
- package/src/server/lib/harness/acp/frames.ts +17 -5
- package/src/server/lib/harness/acp/gateway-env.test.ts +64 -0
- package/src/server/lib/harness/acp/gateway-env.ts +70 -0
- package/src/server/lib/harness/acp/mapper.ts +6 -4
- package/src/server/lib/harness/acp/prompt.test.ts +20 -0
- package/src/server/lib/harness/acp/prompt.ts +19 -3
- package/src/server/lib/harness/acp/session-background.test.ts +129 -0
- package/src/server/lib/harness/acp/session-config.test.ts +73 -0
- package/src/server/lib/harness/acp/session-config.ts +87 -6
- package/src/server/lib/harness/acp/session-exit.ts +31 -0
- package/src/server/lib/harness/acp/session-handshake.test.ts +108 -0
- package/src/server/lib/harness/acp/session-handshake.ts +36 -3
- package/src/server/lib/harness/acp/session-idle.ts +51 -0
- package/src/server/lib/harness/acp/session-listeners.ts +31 -0
- package/src/server/lib/harness/acp/session-notifications.ts +19 -3
- package/src/server/lib/harness/acp/session-observers.test.ts +9 -0
- package/src/server/lib/harness/acp/session-options.ts +33 -0
- package/src/server/lib/harness/acp/session-reaper.test.ts +96 -0
- package/src/server/lib/harness/acp/session-requests.ts +47 -0
- package/src/server/lib/harness/acp/session-turns.ts +20 -5
- package/src/server/lib/harness/acp/session.test-util.ts +54 -3
- package/src/server/lib/harness/acp/session.test.ts +65 -3
- package/src/server/lib/harness/acp/session.ts +79 -79
- package/src/server/lib/harness/acp/turn.test.ts +81 -0
- package/src/server/lib/harness/acp/turn.ts +54 -13
- package/src/server/lib/harness/acp/verbs.ts +12 -2
- package/src/server/lib/harness/auto-probe.server.test.ts +121 -0
- package/src/server/lib/harness/auto-probe.server.ts +178 -0
- package/src/server/lib/harness/config.server.test.ts +1 -1
- package/src/server/lib/harness/config.server.ts +1 -1
- package/src/server/lib/harness/launch-table.ts +195 -0
- package/src/server/lib/harness/launch.test.ts +37 -0
- package/src/server/lib/harness/launch.ts +16 -116
- package/src/server/lib/harness/provider-entry.ts +32 -0
- package/src/server/lib/harness/provider-file.server.ts +3 -0
- package/src/server/lib/harness/provider-sources.server.test.ts +45 -0
- package/src/server/lib/harness/provider-sources.server.ts +26 -2
- package/src/server/lib/harness/provider-write.server.ts +21 -32
- package/src/server/lib/harness/provider-zcode.server.test.ts +270 -0
- package/src/server/lib/harness/provider-zcode.server.ts +324 -0
- package/src/server/lib/harness/spawn.server.ts +15 -2
- package/src/server/lib/harness/update-job-store.test.ts +126 -0
- package/src/server/lib/harness/update-job-store.ts +109 -0
- package/src/server/lib/harness/update-job.server.ts +203 -0
- package/src/server/lib/harness/update-state.server.ts +15 -20
- package/src/server/lib/harness/update-worker.test.ts +153 -0
- package/src/server/lib/harness/update-worker.ts +197 -0
- package/src/server/lib/lifecycle/after-listen.ts +7 -0
- package/src/server/lib/lifecycle/paths.ts +23 -0
- package/src/server/lib/models/registry-refresh.server.test.ts +87 -0
- package/src/server/lib/models/registry-refresh.server.ts +98 -0
- package/src/server/lib/omp/rpc/child-config.ts +5 -4
- package/src/server/lib/omp/rpc/constants.test.ts +2 -1
- package/src/server/lib/omp/rpc/forked-resume.test.ts +14 -3
- package/src/server/lib/omp/rpc/manager.ts +5 -5
- package/src/server/lib/omp/rpc/prewarm-pool.ts +12 -3
- package/src/server/lib/omp/rpc/session-registry.ts +14 -2
- package/src/server/lib/omp/rpc/terminal-settle.ts +53 -5
- package/src/server/lib/omp/session/delete-flow.server.ts +62 -8
- package/src/server/lib/omp/session/delete.server.ts +17 -0
- package/src/server/lib/omp/session/rewind-file.ts +39 -21
- package/src/server/lib/omp/session/sidebar-data.server.ts +6 -6
- package/src/server/lib/omp/session/transcript-copy.ts +123 -0
- package/src/server/lib/sessions/agent-token.server.test.ts +64 -0
- package/src/server/lib/sessions/agent-token.server.ts +134 -0
- package/src/server/lib/sessions/answers.server.test.ts +33 -0
- package/src/server/lib/sessions/answers.server.ts +37 -0
- package/src/server/lib/sessions/dispatch.server.test.ts +143 -0
- package/src/server/lib/sessions/dispatch.server.ts +128 -0
- package/src/server/lib/sessions/fork.server.test.ts +209 -0
- package/src/server/lib/sessions/fork.server.ts +304 -0
- package/src/server/lib/sessions/lifecycle.server.test.ts +75 -0
- package/src/server/lib/sessions/lifecycle.server.ts +71 -0
- package/src/server/lib/sessions/notify.server.test.ts +112 -0
- package/src/server/lib/sessions/notify.server.ts +212 -0
- package/src/server/lib/sessions/relation-types.ts +76 -0
- package/src/server/lib/sessions/relations.server.test.ts +207 -0
- package/src/server/lib/sessions/relations.server.ts +337 -0
- package/src/server/lib/sessions/resolve.server.ts +106 -0
- package/src/server/lib/sessions/schema.server.ts +82 -0
- package/src/server/lib/sessions/sidebar-relations.server.test.ts +61 -0
- package/src/server/lib/sessions/sidebar-relations.server.ts +47 -0
- package/src/server/lib/sessions/spawn.server.test.ts +196 -0
- package/src/server/lib/sessions/spawn.server.ts +310 -0
- package/src/server/lib/terminal/attach-replay.test.ts +2 -2
- package/src/server/lib/terminal/output.test.ts +2 -2
- package/src/server/lib/terminal/output.ts +1 -1
- package/src/server/lib/terminal/resize.test.ts +99 -0
- package/src/server/lib/terminal/runtime.server.ts +26 -6
- package/src/server/lib/terminal/send-result.test.ts +18 -1
- package/src/server/lib/terminal/send-result.ts +26 -2
- package/src/server/lib/terminal/session.server.ts +6 -6
- package/src/server/lib/usage/new-api.test.ts +92 -0
- package/src/server/lib/usage/new-api.ts +131 -0
- package/src/server/lib/usage/provider-endpoint.test.ts +106 -0
- package/src/server/lib/usage/provider-key.ts +33 -0
- package/src/server/lib/usage/providers.server.ts +10 -3
- package/src/server/lib/usage/vendor-balance.server.ts +4 -53
- package/src/server/lib/usage/vendor-http.ts +41 -0
- package/src/server/lib/usage/window.ts +55 -0
- package/src/server/routes/agent/command.ts +14 -1
- package/src/server/routes/agent/harness-command.ts +6 -0
- package/src/server/routes/agent/new.ts +15 -0
- package/src/server/routes/chat/rewind.test.ts +147 -0
- package/src/server/routes/chat/rewind.ts +29 -7
- package/src/server/routes/chat/session.test.ts +165 -10
- package/src/server/routes/chat/session.ts +60 -7
- package/src/server/routes/harness/add-provider.test.ts +9 -1
- package/src/server/routes/harness/import-action.ts +22 -4
- package/src/server/routes/harness/import.test.ts +1 -1
- package/src/server/routes/harness/index.ts +5 -1
- package/src/server/routes/harness/root.ts +8 -49
- package/src/server/routes/harness/toggle.test.ts +20 -0
- package/src/server/routes/harness/update-status.ts +26 -0
- package/src/server/routes/harness/update.test.ts +119 -0
- package/src/server/routes/harness/update.ts +67 -113
- package/src/server/routes/harness/versions.ts +5 -1
- package/src/server/routes/sessions/answer.ts +24 -0
- package/src/server/routes/sessions/batch-delete.ts +11 -5
- package/src/server/routes/sessions/delete-acp.test.ts +227 -0
- package/src/server/routes/sessions/delete.ts +4 -2
- package/src/server/routes/sessions/fork.ts +74 -0
- package/src/server/routes/sessions/index.ts +14 -0
- package/src/server/routes/sessions/relations.ts +85 -0
- package/src/server/routes/sessions/session.ts +4 -0
- package/src/server/routes/sessions/spawn.ts +134 -0
- package/src/server/routes/settings/model-override.ts +5 -2
- package/src/server/routes/settings/provider-entry.ts +2 -2
- package/src/server/routes/settings/provider-model.ts +2 -2
- package/src/server/routes/settings/provider-models.ts +2 -2
- package/src/server/routes/settings/provider-refresh.ts +6 -4
- package/src/server/routes/settings/providers.ts +3 -1
- package/src/server/routes/settings/settings-config-routes.test.ts +10 -2
- package/src/server/routes/terminal/ws.ts +3 -3
- package/src/shared/lib/chat/ask-form/fields.ts +76 -0
- package/src/shared/lib/chat/ask-form/index.ts +323 -0
- package/src/shared/lib/chat/ask-form/tokens.ts +199 -0
- package/src/shared/lib/chat/ask-form/types.ts +43 -0
- package/src/shared/lib/chat/ask-form.test.ts +137 -0
- package/src/shared/lib/chat/ask-questions.test.ts +65 -1
- package/src/shared/lib/chat/ask-questions.ts +51 -145
- package/src/shared/lib/chat/ask-results.ts +198 -0
- package/src/shared/lib/chat/composer/client.ts +31 -2
- package/src/shared/lib/chat/composer/delegation.test.ts +93 -0
- package/src/shared/lib/chat/composer/delegation.ts +206 -0
- package/src/shared/lib/chat/notice-text.ts +1 -1
- package/src/shared/lib/chat/timeline/omp-callbacks.ts +13 -1
- package/src/shared/lib/chat/timeline/prompt-error.test.ts +146 -0
- package/src/shared/lib/chat/timeline/prompt-error.ts +88 -0
- package/src/shared/lib/chat/tool/summary-wait.test.ts +11 -0
- package/src/shared/lib/code/ansi.ts +1 -1
- package/src/shared/lib/fonts/nerd-symbols.css +4 -3
- package/src/shared/lib/fonts/nerd-symbols.test.ts +9 -9
- package/src/shared/lib/harness/catalog.test.ts +1 -1
- package/src/shared/lib/harness/config-fields.test.ts +4 -0
- package/src/shared/lib/harness/config-fields.ts +19 -4
- package/src/shared/lib/harness/dialects.test.ts +8 -0
- package/src/shared/lib/harness/dialects.ts +12 -0
- package/src/shared/lib/harness/provider-facts.test.ts +59 -8
- package/src/shared/lib/harness/provider-facts.ts +46 -11
- package/src/shared/lib/harness/providers.ts +44 -1
- package/src/shared/lib/harness/rewind.ts +24 -0
- package/src/shared/lib/harness/update-job.ts +33 -0
- package/src/shared/lib/harness/update-plan.test.ts +69 -4
- package/src/shared/lib/harness/update-plan.ts +57 -9
- package/src/shared/lib/harness/updates.test.ts +22 -0
- package/src/shared/lib/harness/updates.ts +24 -1
- package/src/shared/lib/models/client.ts +10 -1
- package/src/shared/lib/omp/dialog-methods.ts +4 -3
- package/src/shared/lib/omp/session/wait-idle.test.ts +11 -0
- package/src/shared/lib/omp/session/wait-idle.ts +12 -2
- package/src/shared/lib/theme/catalog.test.ts +13 -9
- package/src/shared/lib/theme/color.test.ts +2 -2
- package/src/shared/lib/theme/color.ts +4 -4
- package/src/shared/lib/theme/css.ts +2 -0
- package/src/shared/lib/theme/ink-scale.ts +21 -1
- package/src/shared/lib/theme/theme.test.ts +26 -10
- package/src/shared/lib/ui/safe-area.test.ts +28 -0
- package/src/shared/lib/ui/safe-area.ts +42 -0
- package/src/shared/lib/workspace/terminal/input.test.ts +27 -0
- package/src/shared/lib/workspace/terminal/input.ts +33 -0
- package/src/shared/lib/workspace/terminal/keys.test.ts +1 -1
- package/src/shared/lib/workspace/terminal/keys.ts +7 -7
- package/src/shared/types/chat.ts +1 -1
- package/src/shared/types/harness-update.ts +65 -0
- package/src/shared/types/harness.ts +30 -4
- package/src/shared/types/omp/agent.ts +19 -2
- package/src/shared/types/workspace.ts +4 -0
- package/src/test-support/fake-omp-fork.ts +16 -2
- package/src/test-support/file-explorer-render.test-util.ts +37 -0
- package/src/test-support/file-explorer.test-util.ts +20 -18
- package/src/test-support/harness-table.test-util.ts +21 -4
- package/dist/client/static/js/index-jhmg4w91.css +0 -1
- package/src/client/components/workspace/terminal-panel/webgl.test.ts +0 -75
- package/src/client/components/workspace/terminal-panel/webgl.ts +0 -108
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* How one ACP session is spawned.
|
|
8
|
+
*
|
|
9
|
+
* Its own module because the type is the transport's spawn contract, read by
|
|
10
|
+
* `AcpSession` and handed to it by both callers (`spawn.server.ts` for a chat,
|
|
11
|
+
* `acp-audit.server.ts` for a disposable reader); keeping it in `session.ts`
|
|
12
|
+
* made that file carry a second responsibility past its size ceiling.
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
import type { ApprovalMode } from '@/shared/lib/omp/config/access-mode';
|
|
16
|
+
import type { HarnessId } from '@/shared/lib/harness/catalog';
|
|
17
|
+
|
|
18
|
+
export interface AcpSessionOptions {
|
|
19
|
+
harness: HarnessId;
|
|
20
|
+
command: string[];
|
|
21
|
+
env?: Record<string, string>;
|
|
22
|
+
/** Provider/model this session starts on, applied with
|
|
23
|
+
* `session/set_config_option` right after `session/new`. */
|
|
24
|
+
model?: { provider: string; modelId: string } | null;
|
|
25
|
+
thinkingLevel?: string | null;
|
|
26
|
+
mode?: string | null;
|
|
27
|
+
/** The composer's access pick. ACP has no spawn flag for it, so the session
|
|
28
|
+
* answers `session/request_permission` itself according to this tier. */
|
|
29
|
+
accessMode?: ApprovalMode | null;
|
|
30
|
+
/** Quiet window before the child is reclaimed; defaults to the omp window so
|
|
31
|
+
* both transports release an idle agent after the same time. */
|
|
32
|
+
idleDestroyMs?: number;
|
|
33
|
+
}
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The ACP idle reclaim.
|
|
8
|
+
*
|
|
9
|
+
* `omp acp` children used to outlive the tab that spawned them by hours: unlike
|
|
10
|
+
* the omp wrapper, this transport had no idle clock, and nothing else ends a
|
|
11
|
+
* child it is not actively driving. These cases pin the two halves of the fix —
|
|
12
|
+
* the decision (never reclaim a working or dialog-blocked session) and the
|
|
13
|
+
* wiring (commands and frames defer the deadline; a destroy stops it).
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
import { describe, expect, test } from 'bun:test';
|
|
17
|
+
|
|
18
|
+
import { reclaimIdleAcpSession } from '@/server/lib/harness/acp/session-idle';
|
|
19
|
+
import { UNPROBED_CAPABILITIES } from '@/server/lib/harness/capabilities';
|
|
20
|
+
import { mountSession, notify } from '@/server/lib/harness/acp/session.test-util';
|
|
21
|
+
|
|
22
|
+
describe('ACP idle reclaim decision', () => {
|
|
23
|
+
const restorable = { ...UNPROBED_CAPABILITIES, loadSession: true };
|
|
24
|
+
|
|
25
|
+
test('an idle restorable session is destroyed', () => {
|
|
26
|
+
let destroyed = 0;
|
|
27
|
+
const reclaimed = reclaimIdleAcpSession({
|
|
28
|
+
harness: 'claude',
|
|
29
|
+
capabilities: { ...restorable },
|
|
30
|
+
isBusy: () => false,
|
|
31
|
+
destroy: () => { destroyed += 1; },
|
|
32
|
+
});
|
|
33
|
+
expect(reclaimed).toBe(true);
|
|
34
|
+
expect(destroyed).toBe(1);
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
test('a busy session survives and the clock re-arms instead', () => {
|
|
38
|
+
let destroyed = 0;
|
|
39
|
+
const reclaimed = reclaimIdleAcpSession({
|
|
40
|
+
harness: 'claude',
|
|
41
|
+
capabilities: { ...restorable },
|
|
42
|
+
isBusy: () => true,
|
|
43
|
+
destroy: () => { destroyed += 1; },
|
|
44
|
+
});
|
|
45
|
+
// `false` is what makes `IdleReaper` re-arm from now: answering `true`
|
|
46
|
+
// would let it fire again on an unchanged session.
|
|
47
|
+
expect(reclaimed).toBe(false);
|
|
48
|
+
expect(destroyed).toBe(0);
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
test('an idle session whose agent cannot session/load is left alive', () => {
|
|
52
|
+
// There is no way back: `resumeRecordedHarnessSession` refuses to spawn a
|
|
53
|
+
// fresh agent under the chat's id, so reclaiming would strand the chat.
|
|
54
|
+
let destroyed = 0;
|
|
55
|
+
reclaimIdleAcpSession({
|
|
56
|
+
harness: 'dsh',
|
|
57
|
+
capabilities: { ...UNPROBED_CAPABILITIES, loadSession: false },
|
|
58
|
+
isBusy: () => false,
|
|
59
|
+
destroy: () => { destroyed += 1; },
|
|
60
|
+
});
|
|
61
|
+
expect(destroyed).toBe(0);
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
test('omp-acp is reclaimed even without loadSession, because its session file restores it', () => {
|
|
65
|
+
let destroyed = 0;
|
|
66
|
+
reclaimIdleAcpSession({
|
|
67
|
+
harness: 'omp-acp',
|
|
68
|
+
capabilities: { ...UNPROBED_CAPABILITIES, loadSession: false },
|
|
69
|
+
isBusy: () => false,
|
|
70
|
+
destroy: () => { destroyed += 1; },
|
|
71
|
+
});
|
|
72
|
+
expect(destroyed).toBe(1);
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
describe('ACP idle reclaim wiring', () => {
|
|
77
|
+
test('a dispatched command defers the deadline', async () => {
|
|
78
|
+
const { session, turn, idleResets } = mountSession();
|
|
79
|
+
expect(idleResets()).toBe(0);
|
|
80
|
+
await session.send({ type: 'get_state' });
|
|
81
|
+
expect(idleResets()).toBe(1);
|
|
82
|
+
turn.finish({ stopReason: 'end_turn' });
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
test('a frame defers the deadline', () => {
|
|
86
|
+
const { session, idleResets } = mountSession();
|
|
87
|
+
notify(session, { sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: 'hi' } });
|
|
88
|
+
expect(idleResets()).toBe(1);
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
test('destroy stops the clock', async () => {
|
|
92
|
+
const { session, idleStopped } = mountSession();
|
|
93
|
+
await session.destroyAndWait();
|
|
94
|
+
expect(idleStopped()).toBe(true);
|
|
95
|
+
});
|
|
96
|
+
});
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Agent→client requests for an ACP session.
|
|
8
|
+
*
|
|
9
|
+
* Every branch answers or refuses — an unanswered call parks the turn — and the
|
|
10
|
+
* approval branch is the same code the in-process tier uses, so a dialog and an
|
|
11
|
+
* auto-answer cannot disagree.
|
|
12
|
+
*/
|
|
13
|
+
|
|
14
|
+
import { answerPermissionRequest } from '@/server/lib/harness/acp/session-permissions';
|
|
15
|
+
import type { AcpId } from '@/server/lib/harness/acp/protocol';
|
|
16
|
+
import type { PendingPermissions } from '@/server/lib/harness/acp/permissions';
|
|
17
|
+
import type { AgentEvent } from '@/server/lib/omp/rpc/constants';
|
|
18
|
+
import type { ApprovalMode } from '@/shared/lib/omp/config/access-mode';
|
|
19
|
+
|
|
20
|
+
export interface AcpClientRequestHost {
|
|
21
|
+
sessionId: string;
|
|
22
|
+
accessMode: ApprovalMode;
|
|
23
|
+
permissions: PendingPermissions;
|
|
24
|
+
emit: (event: AgentEvent) => void;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export type AcpClientRequestAnswer =
|
|
28
|
+
| { answered: true; result: unknown }
|
|
29
|
+
| { answered: false; message: string }
|
|
30
|
+
| { answered: false; deferred: true };
|
|
31
|
+
|
|
32
|
+
export function handleAcpClientRequest(
|
|
33
|
+
host: AcpClientRequestHost,
|
|
34
|
+
id: AcpId,
|
|
35
|
+
method: string,
|
|
36
|
+
params: Record<string, unknown>,
|
|
37
|
+
): Promise<AcpClientRequestAnswer> {
|
|
38
|
+
if (method === 'session/request_permission') {
|
|
39
|
+
return answerPermissionRequest({
|
|
40
|
+
sessionId: host.sessionId,
|
|
41
|
+
accessMode: host.accessMode,
|
|
42
|
+
permissions: host.permissions,
|
|
43
|
+
emit: (event) => host.emit(event),
|
|
44
|
+
}, id, params);
|
|
45
|
+
}
|
|
46
|
+
return Promise.resolve({ answered: false, message: `Kabmo does not implement ${method}` });
|
|
47
|
+
}
|
|
@@ -37,7 +37,10 @@
|
|
|
37
37
|
import { scheduleQueueDelivery } from '@/server/lib/queue/delivery.server';
|
|
38
38
|
import { emitRealtimeSignal } from '@/server/lib/realtime/signals.server';
|
|
39
39
|
import { saveAcpUsage } from '@/server/lib/harness/acp/acp-telemetry.server';
|
|
40
|
-
import
|
|
40
|
+
import { lastAssistantText } from '@/server/lib/omp/session/goal-driver.server';
|
|
41
|
+
import { noteChildOutcome } from '@/server/lib/sessions/notify.server';
|
|
42
|
+
import { saveSessionAnswer } from '@/server/lib/sessions/answers.server';
|
|
43
|
+
import type { AcpTurns, AcpTurnEndInfo } from '@/server/lib/harness/acp/turn';
|
|
41
44
|
|
|
42
45
|
/** What a turn reads and moves on the session. */
|
|
43
46
|
export interface AcpTurnTarget {
|
|
@@ -70,10 +73,7 @@ export function beginAcpTurn(
|
|
|
70
73
|
}
|
|
71
74
|
|
|
72
75
|
/** Turn-end bookkeeping: the closed message, the badge, then the queue. */
|
|
73
|
-
export function settleAcpTurn(
|
|
74
|
-
target: AcpTurnTarget,
|
|
75
|
-
info: { stopReason?: string; closedMessage: boolean },
|
|
76
|
-
): void {
|
|
76
|
+
export function settleAcpTurn(target: AcpTurnTarget, info: AcpTurnEndInfo): void {
|
|
77
77
|
if (info.closedMessage) target.messageCount += 1;
|
|
78
78
|
// ACP has no transcript to re-read, so the last usage snapshot is what lets
|
|
79
79
|
// the Context ring answer after a reload or a restart.
|
|
@@ -91,5 +91,20 @@ export function settleAcpTurn(
|
|
|
91
91
|
// Todo/plan/telemetry panels read their own topics; without this signal an
|
|
92
92
|
// ACP turn's usage and titles never republished (the RPC settle path does it).
|
|
93
93
|
emitRealtimeSignal('session-data-dirty', target.sessionId);
|
|
94
|
+
const finalText = lastAssistantText([info.message]);
|
|
95
|
+
if (finalText) void saveSessionAnswer(target.sessionId, finalText).catch(() => {});
|
|
96
|
+
const status = info.cancelled === true
|
|
97
|
+
? 'interrupted'
|
|
98
|
+
: info.failed === true
|
|
99
|
+
? 'failed'
|
|
100
|
+
: 'completed';
|
|
101
|
+
void noteChildOutcome({
|
|
102
|
+
sessionId: target.sessionId,
|
|
103
|
+
status,
|
|
104
|
+
output: finalText,
|
|
105
|
+
...(status === 'failed' ? { failure: info.failure ?? 'The agent ended the turn without an answer' } : {}),
|
|
106
|
+
}).catch((error: unknown) => {
|
|
107
|
+
console.error('[sessions] could not record an ACP child outcome:', error);
|
|
108
|
+
});
|
|
94
109
|
scheduleQueueDelivery(target);
|
|
95
110
|
}
|
|
@@ -22,7 +22,9 @@ import { AcpSession } from '@/server/lib/harness/acp/session';
|
|
|
22
22
|
import { AcpUsageMeter } from '@/server/lib/harness/acp/session-usage';
|
|
23
23
|
import { AcpFrameMapper } from '@/server/lib/harness/acp/frames';
|
|
24
24
|
import { AcpTurns } from '@/server/lib/harness/acp/turn';
|
|
25
|
+
import { SessionListeners } from '@/server/lib/harness/acp/session-listeners';
|
|
25
26
|
import { PendingPermissions } from '@/server/lib/harness/acp/permissions';
|
|
27
|
+
import { stampMessageModel } from '@/server/lib/harness/acp/session-config';
|
|
26
28
|
import type { AgentEvent } from '@/server/lib/omp/rpc/constants';
|
|
27
29
|
|
|
28
30
|
export interface Turn {
|
|
@@ -45,6 +47,19 @@ export interface MountedSession {
|
|
|
45
47
|
turnEnds: () => number;
|
|
46
48
|
/** The durable run markers written for this session, in order. */
|
|
47
49
|
streamMarks: () => string[];
|
|
50
|
+
/** How many times a command or frame deferred the idle reclaim. */
|
|
51
|
+
idleResets: () => number;
|
|
52
|
+
/** Whether a destroy stopped the reclaim clock. */
|
|
53
|
+
idleStopped: () => boolean;
|
|
54
|
+
/** Swap the background probe the session drives with one a case controls. */
|
|
55
|
+
setBackground: (probe: BackgroundProbeStub) => void;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/** The slice of `AcpBackgroundProbe` a session calls. */
|
|
59
|
+
export interface BackgroundProbeStub {
|
|
60
|
+
start: (baseline: string) => void;
|
|
61
|
+
stop: () => void;
|
|
62
|
+
consume: (method: string, params: Record<string, unknown>) => boolean;
|
|
48
63
|
}
|
|
49
64
|
|
|
50
65
|
/** One in-flight `session/prompt` the stub can settle. */
|
|
@@ -68,6 +83,17 @@ export function mountSession(): MountedSession {
|
|
|
68
83
|
const session = Object.create(AcpSession.prototype) as AcpSession;
|
|
69
84
|
const mapper = new AcpFrameMapper();
|
|
70
85
|
let turnEndCount = 0;
|
|
86
|
+
let idleResets = 0;
|
|
87
|
+
let idleStopped = false;
|
|
88
|
+
const idle = {
|
|
89
|
+
timeoutMs: 0,
|
|
90
|
+
reset: () => {
|
|
91
|
+
idleResets += 1;
|
|
92
|
+
},
|
|
93
|
+
stop: () => {
|
|
94
|
+
idleStopped = true;
|
|
95
|
+
},
|
|
96
|
+
};
|
|
71
97
|
const proc = {
|
|
72
98
|
prompt: async (_message: string, _images: unknown) => {
|
|
73
99
|
const pending = Promise.withResolvers<unknown>();
|
|
@@ -77,6 +103,10 @@ export function mountSession(): MountedSession {
|
|
|
77
103
|
},
|
|
78
104
|
cancel: () => {},
|
|
79
105
|
abandonPrompt: () => calls.at(-1)?.resolve({ stopReason: 'cancelled' }),
|
|
106
|
+
// A config write; the default reply omits the list, which is the shape a
|
|
107
|
+
// harness that ignores the protocol's "complete list" rule returns.
|
|
108
|
+
setConfigOption: async (_sessionId: string, _configId: string, _value: string | boolean) => ({}),
|
|
109
|
+
dispose: async () => {},
|
|
80
110
|
isAlive: true,
|
|
81
111
|
};
|
|
82
112
|
const turns = new AcpTurns({
|
|
@@ -85,7 +115,7 @@ export function mountSession(): MountedSession {
|
|
|
85
115
|
cancelAgent: () => proc.cancel(),
|
|
86
116
|
abandonPrompt: () => proc.abandonPrompt(),
|
|
87
117
|
resetMapper: () => mapper.reset(),
|
|
88
|
-
closeMessage: () => mapper.closeMessage(),
|
|
118
|
+
closeMessage: () => mapper.closeMessage().map((event) => stampMessageModel(event, session.runModel)),
|
|
89
119
|
openCalls: () => mapper.openCalls(),
|
|
90
120
|
onTurnEnd: (info) => {
|
|
91
121
|
(session as unknown as { onTurnEnded: (info: { stopReason?: string; closedMessage: boolean }) => void })
|
|
@@ -94,6 +124,13 @@ export function mountSession(): MountedSession {
|
|
|
94
124
|
},
|
|
95
125
|
});
|
|
96
126
|
const marks: string[] = [];
|
|
127
|
+
const eventSink = new SessionListeners();
|
|
128
|
+
eventSink.add((event) => events.push(event));
|
|
129
|
+
let background: BackgroundProbeStub = {
|
|
130
|
+
start: () => {},
|
|
131
|
+
stop: () => {},
|
|
132
|
+
consume: () => false,
|
|
133
|
+
};
|
|
97
134
|
Object.assign(session as unknown as Record<string, unknown>, {
|
|
98
135
|
markStream: (status: string) => {
|
|
99
136
|
marks.push(status);
|
|
@@ -114,11 +151,25 @@ export function mountSession(): MountedSession {
|
|
|
114
151
|
assistantCount: 0,
|
|
115
152
|
usage: new AcpUsageMeter(),
|
|
116
153
|
runModel: null,
|
|
117
|
-
|
|
154
|
+
events: eventSink,
|
|
118
155
|
proc,
|
|
156
|
+
idle,
|
|
119
157
|
destroyed: false,
|
|
158
|
+
background,
|
|
120
159
|
});
|
|
121
|
-
return {
|
|
160
|
+
return {
|
|
161
|
+
session,
|
|
162
|
+
events,
|
|
163
|
+
turn,
|
|
164
|
+
turnEnds: () => turnEndCount,
|
|
165
|
+
streamMarks: () => marks,
|
|
166
|
+
idleResets: () => idleResets,
|
|
167
|
+
idleStopped: () => idleStopped,
|
|
168
|
+
setBackground: (probe) => {
|
|
169
|
+
background = probe;
|
|
170
|
+
Object.assign(session as unknown as Record<string, unknown>, { background: probe });
|
|
171
|
+
},
|
|
172
|
+
};
|
|
122
173
|
}
|
|
123
174
|
|
|
124
175
|
/** Push one `session/update` at the session, as the process would. */
|
|
@@ -13,7 +13,8 @@
|
|
|
13
13
|
|
|
14
14
|
import { afterEach, beforeEach, describe, expect, test } from 'bun:test';
|
|
15
15
|
import { isolateDb, releaseDb } from '@/test-support/isolated-db';
|
|
16
|
-
import { mountSession } from '@/server/lib/harness/acp/session.test-util';
|
|
16
|
+
import { mountSession, notify } from '@/server/lib/harness/acp/session.test-util';
|
|
17
|
+
import type { AcpConfigOption } from '@/server/lib/harness/acp/protocol';
|
|
17
18
|
|
|
18
19
|
// A prompt reaches the title writer (`harness/session-title.server.ts`), which
|
|
19
20
|
// opens the database. Isolate it: the handle is process-wide, and a suite that
|
|
@@ -52,13 +53,16 @@ describe('ACP prompt dispatch', () => {
|
|
|
52
53
|
expect(session.isPromptRunning).toBe(false);
|
|
53
54
|
});
|
|
54
55
|
|
|
55
|
-
test('a failed turn reports its error and still closes the turn', async () => {
|
|
56
|
+
test('a failed turn reports its error once, and still closes the turn', async () => {
|
|
56
57
|
const { session, events, turn } = mountSession();
|
|
57
58
|
await session.send({ type: 'prompt', message: 'hello' });
|
|
58
59
|
await turn.started;
|
|
59
60
|
turn.fail(new Error('agent exploded'));
|
|
60
61
|
for (let i = 0; i < 4; i += 1) await Promise.resolve();
|
|
61
|
-
|
|
62
|
+
const errors = events.filter((event) => event.type === 'prompt_error');
|
|
63
|
+
// The generic "no answer" verdict must not land on top of the agent's own
|
|
64
|
+
// reason: it was emitted SECOND, so the client kept the useless one.
|
|
65
|
+
expect(errors).toEqual([{ type: 'prompt_error', errorMessage: 'agent exploded' }]);
|
|
62
66
|
expect(session.isPromptRunning).toBe(false);
|
|
63
67
|
});
|
|
64
68
|
|
|
@@ -169,3 +173,61 @@ describe('ACP turn serialization', () => {
|
|
|
169
173
|
expect(session.isRunning()).toBe(false);
|
|
170
174
|
});
|
|
171
175
|
});
|
|
176
|
+
|
|
177
|
+
const modelOption = (currentValue: string, values: string[]): AcpConfigOption => ({
|
|
178
|
+
id: 'sel-model',
|
|
179
|
+
category: 'model',
|
|
180
|
+
type: 'select',
|
|
181
|
+
currentValue,
|
|
182
|
+
options: values.map((value) => ({ value })),
|
|
183
|
+
});
|
|
184
|
+
|
|
185
|
+
/**
|
|
186
|
+
* The footer and the sidebar name a chat by the model the live session is
|
|
187
|
+
* serving. An ACP model pick is a config write, not a respawn, so the identity
|
|
188
|
+
* has to travel three ways: the session's own `runModel`, a frame the client
|
|
189
|
+
* re-reads, and the model fields on the message itself.
|
|
190
|
+
*/
|
|
191
|
+
describe('ACP model identity', () => {
|
|
192
|
+
test('set_model without a reply list still renames the session and announces it', async () => {
|
|
193
|
+
const { session, events } = mountSession();
|
|
194
|
+
session.configOptions = [modelOption('p/old', ['p/old', 'p/new'])];
|
|
195
|
+
session.runModel = { provider: 'p', modelId: 'old' };
|
|
196
|
+
|
|
197
|
+
await session.send({ type: 'set_model', provider: 'p', modelId: 'new' });
|
|
198
|
+
|
|
199
|
+
expect(session.runModel).toEqual({ provider: 'p', modelId: 'new' });
|
|
200
|
+
expect(events.some((event) => event.type === 'model_changed')).toBe(true);
|
|
201
|
+
});
|
|
202
|
+
|
|
203
|
+
test('config_option_update adopts the agent’s list and announces it', () => {
|
|
204
|
+
const { session, events } = mountSession();
|
|
205
|
+
session.configOptions = [modelOption('p/old', ['p/old'])];
|
|
206
|
+
session.runModel = { provider: 'p', modelId: 'old' };
|
|
207
|
+
|
|
208
|
+
notify(session, { sessionUpdate: 'config_option_update', configOptions: [modelOption('p/next', ['p/old', 'p/next'])] });
|
|
209
|
+
|
|
210
|
+
expect(session.runModel).toEqual({ provider: 'p', modelId: 'next' });
|
|
211
|
+
expect(events.some((event) => event.type === 'model_changed')).toBe(true);
|
|
212
|
+
});
|
|
213
|
+
|
|
214
|
+
test('assistant frames carry the model that served them', async () => {
|
|
215
|
+
const { session, events, turn } = mountSession();
|
|
216
|
+
session.runModel = { provider: 'kenari', modelId: 'qwen3-8-27b:free' };
|
|
217
|
+
await session.send({ type: 'prompt', message: 'hi' });
|
|
218
|
+
await turn.started;
|
|
219
|
+
|
|
220
|
+
notify(session, { sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: 'hi' } });
|
|
221
|
+
expect(events.find((event) => event.type === 'message_update')?.message).toMatchObject({
|
|
222
|
+
model: 'qwen3-8-27b:free',
|
|
223
|
+
provider: 'kenari',
|
|
224
|
+
});
|
|
225
|
+
|
|
226
|
+
turn.finish({ stopReason: 'end_turn' });
|
|
227
|
+
for (let i = 0; i < 8; i += 1) await Promise.resolve();
|
|
228
|
+
expect(events.find((event) => event.type === 'message_end')?.message).toMatchObject({
|
|
229
|
+
model: 'qwen3-8-27b:free',
|
|
230
|
+
provider: 'kenari',
|
|
231
|
+
});
|
|
232
|
+
});
|
|
233
|
+
});
|