@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
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { json } from '@/server/lib/remix-compat';
|
|
18
18
|
import type { ActionFunctionArgs } from '@/server/lib/remix-compat';
|
|
19
19
|
import { methodNotAllowed } from '@/server/lib/route-adapter';
|
|
20
|
-
import {
|
|
20
|
+
import { removeSessionTree } from '@/server/lib/omp/session/delete-flow.server';
|
|
21
21
|
|
|
22
22
|
export async function deleteSession({ request, params }: ActionFunctionArgs) {
|
|
23
23
|
if (request.method !== 'DELETE') {
|
|
@@ -27,7 +27,8 @@ export async function deleteSession({ request, params }: ActionFunctionArgs) {
|
|
|
27
27
|
const sessionId = params.sessionId;
|
|
28
28
|
if (!sessionId) return json({ error: 'Missing session id' }, { status: 400 });
|
|
29
29
|
|
|
30
|
-
const
|
|
30
|
+
const tree = await removeSessionTree(sessionId);
|
|
31
|
+
const result = tree.result;
|
|
31
32
|
if (!result.ok) {
|
|
32
33
|
return json(
|
|
33
34
|
{ error: result.error, code: result.code },
|
|
@@ -38,6 +39,7 @@ export async function deleteSession({ request, params }: ActionFunctionArgs) {
|
|
|
38
39
|
return json({
|
|
39
40
|
success: true,
|
|
40
41
|
sessionId,
|
|
42
|
+
removedDependents: tree.removedDependents,
|
|
41
43
|
fileRemoved: result.fileRemoved,
|
|
42
44
|
artifactsRemoved: result.artifactsRemoved,
|
|
43
45
|
btwTopicsRemoved: result.btwTopicsRemoved,
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* POST /api/sessions/:sessionId/fork — branch a session at an anchor.
|
|
8
|
+
*
|
|
9
|
+
* Mounted under the same `:sessionId` position as the folder loader, so the
|
|
10
|
+
* parameter keeps that name; the suffix is what makes the route distinct.
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
import { json } from '@/server/lib/remix-compat';
|
|
14
|
+
import type { ActionFunctionArgs } from '@/server/lib/remix-compat';
|
|
15
|
+
import { methodNotAllowed, parseJsonBody } from '@/server/lib/route-adapter';
|
|
16
|
+
import { emitRealtimeSignal } from '@/server/lib/realtime/signals.server';
|
|
17
|
+
import {
|
|
18
|
+
SessionForkError,
|
|
19
|
+
forkSession,
|
|
20
|
+
} from '@/server/lib/sessions/fork.server';
|
|
21
|
+
|
|
22
|
+
interface ForkBody {
|
|
23
|
+
anchorEntryId?: unknown;
|
|
24
|
+
prompt?: unknown;
|
|
25
|
+
title?: unknown;
|
|
26
|
+
cwd?: unknown;
|
|
27
|
+
visibility?: unknown;
|
|
28
|
+
lifecycleOwnerSessionId?: unknown;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function readString(value: unknown): string | null {
|
|
32
|
+
return typeof value === 'string' && value.trim() ? value.trim() : null;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export async function forkSessionRoute({ request, params }: ActionFunctionArgs) {
|
|
36
|
+
if (request.method !== 'POST') return methodNotAllowed({ request, params });
|
|
37
|
+
const sourceSessionId = params.sessionId;
|
|
38
|
+
if (!sourceSessionId) return json({ error: 'Missing session id' }, { status: 400 });
|
|
39
|
+
|
|
40
|
+
const parsed = await parseJsonBody<ForkBody>(request);
|
|
41
|
+
if (!parsed.ok) return json({ error: 'Invalid JSON body' }, { status: 400 });
|
|
42
|
+
const visibility = parsed.body.visibility;
|
|
43
|
+
if (visibility !== undefined && visibility !== 'visible' && visibility !== 'hidden') {
|
|
44
|
+
return json({ error: 'visibility must be "visible" or "hidden"' }, { status: 400 });
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
try {
|
|
48
|
+
const result = await forkSession({
|
|
49
|
+
sourceSessionId,
|
|
50
|
+
anchorEntryId: readString(parsed.body.anchorEntryId),
|
|
51
|
+
prompt: readString(parsed.body.prompt),
|
|
52
|
+
title: readString(parsed.body.title),
|
|
53
|
+
cwd: readString(parsed.body.cwd),
|
|
54
|
+
...(visibility ? { visibility: visibility as 'visible' | 'hidden' } : {}),
|
|
55
|
+
lifecycleOwnerSessionId: readString(parsed.body.lifecycleOwnerSessionId),
|
|
56
|
+
});
|
|
57
|
+
emitRealtimeSignal('sidebar-structure');
|
|
58
|
+
return json(result, { status: 201 });
|
|
59
|
+
} catch (error) {
|
|
60
|
+
if (error instanceof SessionForkError) {
|
|
61
|
+
const status =
|
|
62
|
+
error.code === 'source_not_found'
|
|
63
|
+
? 404
|
|
64
|
+
: error.code === 'source_archived' || error.code === 'fork_requires_checkpoint'
|
|
65
|
+
? 409
|
|
66
|
+
: 400;
|
|
67
|
+
return json({ error: error.message, code: error.code }, { status });
|
|
68
|
+
}
|
|
69
|
+
return json(
|
|
70
|
+
{ error: error instanceof Error ? error.message : 'Could not fork the session' },
|
|
71
|
+
{ status: 500 },
|
|
72
|
+
);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
@@ -16,9 +16,16 @@ import { cancelSubagent, steerSubagent } from '@/server/routes/sessions/subagent
|
|
|
16
16
|
import { deleteSession } from '@/server/routes/sessions/delete';
|
|
17
17
|
import { batchDeleteSessions } from '@/server/routes/sessions/batch-delete';
|
|
18
18
|
import { batchArchiveSessions } from '@/server/routes/sessions/batch-archive';
|
|
19
|
+
import { spawnSession } from '@/server/routes/sessions/spawn';
|
|
20
|
+
import { getSessionRelations, updateSessionParent } from '@/server/routes/sessions/relations';
|
|
21
|
+
import { forkSessionRoute } from '@/server/routes/sessions/fork';
|
|
22
|
+
import { getSessionAnswer } from '@/server/routes/sessions/answer';
|
|
19
23
|
|
|
20
24
|
export const sessionsBindings: HandlerBinding[] = [
|
|
21
25
|
...bindingsFor(sessionsList, '/api/sessions/list'),
|
|
26
|
+
// Static before the `:sessionId` routes, for the same reason batch-delete is:
|
|
27
|
+
// a parameter route winning the match answers 405.
|
|
28
|
+
{ method: 'POST', path: '/api/sessions/spawn', handler: spawnSession },
|
|
22
29
|
// Registered BEFORE the `:sessionId` routes: the segment is static, and the
|
|
23
30
|
// batch route is POST while `:sessionId` answers DELETE, so an id route
|
|
24
31
|
// winning the match would turn every batch into a 405.
|
|
@@ -27,6 +34,13 @@ export const sessionsBindings: HandlerBinding[] = [
|
|
|
27
34
|
// `:sessionId` routes for the same reason as batch-delete.
|
|
28
35
|
{ method: 'POST', path: '/api/sessions/batch-archive', handler: batchArchiveSessions },
|
|
29
36
|
...bindingsFor(sessionsFolder, '/api/sessions/:sessionId'),
|
|
37
|
+
// The tree around one session. Both are static suffixes under the same
|
|
38
|
+
// `:sessionId` position, whose name must stay `sessionId` — Elysia requires
|
|
39
|
+
// one parameter name per position across every `/api/sessions/*` route.
|
|
40
|
+
{ method: 'GET', path: '/api/sessions/:sessionId/relations', handler: getSessionRelations },
|
|
41
|
+
{ method: 'POST', path: '/api/sessions/:sessionId/parent', handler: updateSessionParent },
|
|
42
|
+
{ method: 'POST', path: '/api/sessions/:sessionId/fork', handler: forkSessionRoute },
|
|
43
|
+
{ method: 'GET', path: '/api/sessions/:sessionId/answer', handler: getSessionAnswer },
|
|
30
44
|
// DELETE-only on the same path the folder loader answers GET on: mounting it
|
|
31
45
|
// through `actionBindings` would register a 405 GET fallback that Elysia
|
|
32
46
|
// applies after the loader, replacing the workspace listing with it.
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The tree around one session: its parent, children, forks and cleanup owner.
|
|
8
|
+
*
|
|
9
|
+
* A fork is deliberately NOT in `children`: it is a source-derived session and
|
|
10
|
+
* stays silent, so listing it under the parent edge would promise a
|
|
11
|
+
* notification that never comes. The info panel draws it from `forks`.
|
|
12
|
+
*/
|
|
13
|
+
|
|
14
|
+
import { json } from '@/server/lib/remix-compat';
|
|
15
|
+
import type { ActionFunctionArgs, LoaderFunctionArgs } from '@/server/lib/remix-compat';
|
|
16
|
+
import { methodNotAllowed, parseJsonBody } from '@/server/lib/route-adapter';
|
|
17
|
+
import { emitRealtimeSignal } from '@/server/lib/realtime/signals.server';
|
|
18
|
+
import { SessionRelationError } from '@/server/lib/sessions/relation-types';
|
|
19
|
+
import {
|
|
20
|
+
getSessionRelation,
|
|
21
|
+
listChildRelations,
|
|
22
|
+
listForkRelations,
|
|
23
|
+
listOwnedRelations,
|
|
24
|
+
setSessionParent,
|
|
25
|
+
} from '@/server/lib/sessions/relations.server';
|
|
26
|
+
|
|
27
|
+
export async function getSessionRelations({ request, params }: LoaderFunctionArgs) {
|
|
28
|
+
if (request.method !== 'GET') return methodNotAllowed({ request, params });
|
|
29
|
+
const sessionId = params.sessionId;
|
|
30
|
+
if (!sessionId) return json({ error: 'Missing session id' }, { status: 400 });
|
|
31
|
+
|
|
32
|
+
const [relation, children, forks, owned] = await Promise.all([
|
|
33
|
+
getSessionRelation(sessionId),
|
|
34
|
+
listChildRelations(sessionId),
|
|
35
|
+
listForkRelations(sessionId),
|
|
36
|
+
listOwnedRelations(sessionId),
|
|
37
|
+
]);
|
|
38
|
+
return json({
|
|
39
|
+
sessionId,
|
|
40
|
+
parent: relation?.parentSessionId ? { sessionId: relation.parentSessionId } : null,
|
|
41
|
+
parentNotifications: relation?.parentNotifications ?? 'auto',
|
|
42
|
+
visibility: relation?.visibility ?? 'visible',
|
|
43
|
+
origin: relation?.originKind
|
|
44
|
+
? { kind: relation.originKind, sourceSessionId: relation.sourceSessionId }
|
|
45
|
+
: null,
|
|
46
|
+
children: children.map((row) => ({
|
|
47
|
+
sessionId: row.sessionId,
|
|
48
|
+
visibility: row.visibility,
|
|
49
|
+
parentNotifications: row.parentNotifications,
|
|
50
|
+
depth: row.depth,
|
|
51
|
+
})),
|
|
52
|
+
forks: forks.map((row) => ({ sessionId: row.sessionId, visibility: row.visibility })),
|
|
53
|
+
lifecycleOwner: relation?.lifecycleOwnerSessionId
|
|
54
|
+
? { sessionId: relation.lifecycleOwnerSessionId }
|
|
55
|
+
: null,
|
|
56
|
+
owned: owned.map((row) => ({ sessionId: row.sessionId })),
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export async function updateSessionParent({ request, params }: ActionFunctionArgs) {
|
|
61
|
+
if (request.method !== 'POST') return methodNotAllowed({ request, params });
|
|
62
|
+
const sessionId = params.sessionId;
|
|
63
|
+
if (!sessionId) return json({ error: 'Missing session id' }, { status: 400 });
|
|
64
|
+
|
|
65
|
+
const parsed = await parseJsonBody<{ parentSessionId?: unknown }>(request);
|
|
66
|
+
if (!parsed.ok) return json({ error: 'Invalid JSON body' }, { status: 400 });
|
|
67
|
+
const raw = parsed.body.parentSessionId;
|
|
68
|
+
if (raw !== null && typeof raw !== 'string') {
|
|
69
|
+
return json({ error: 'parentSessionId must be a string or null' }, { status: 400 });
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
try {
|
|
73
|
+
const relation = await setSessionParent(sessionId, raw);
|
|
74
|
+
emitRealtimeSignal('sidebar-structure');
|
|
75
|
+
return json({ ok: true, parentSessionId: relation.parentSessionId, depth: relation.depth });
|
|
76
|
+
} catch (error) {
|
|
77
|
+
if (error instanceof SessionRelationError) {
|
|
78
|
+
return json({ error: error.message, code: error.code }, { status: 409 });
|
|
79
|
+
}
|
|
80
|
+
return json(
|
|
81
|
+
{ error: error instanceof Error ? error.message : 'Could not reparent the session' },
|
|
82
|
+
{ status: 500 },
|
|
83
|
+
);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
@@ -19,6 +19,7 @@ import { loadAcpGoalState } from '@/server/lib/harness/acp/acp-goal-state.server
|
|
|
19
19
|
import { asHarnessSession } from '@/server/lib/harness/registry';
|
|
20
20
|
import { applyHarnessMode } from '@/server/routes/agent/harness-command';
|
|
21
21
|
import { emitRealtimeSignal } from '@/server/lib/realtime/signals.server';
|
|
22
|
+
import { archiveDependents } from '@/server/lib/sessions/lifecycle.server';
|
|
22
23
|
|
|
23
24
|
/**
|
|
24
25
|
* GET /api/sessions/:sessionId/modes — the plan/goal mode selection.
|
|
@@ -125,6 +126,9 @@ export async function archiveSession({ request, params }: ActionFunctionArgs) {
|
|
|
125
126
|
'INSERT OR IGNORE INTO archived_sessions (session_id) VALUES (?)',
|
|
126
127
|
[sessionId],
|
|
127
128
|
);
|
|
129
|
+
// An owner takes its tree with it: sidebar children and cleanup dependents
|
|
130
|
+
// are archived and stopped; unarchiving this row does not bring them back.
|
|
131
|
+
await archiveDependents(sessionId);
|
|
128
132
|
} else {
|
|
129
133
|
await db.run('DELETE FROM archived_sessions WHERE session_id = ?', [sessionId]);
|
|
130
134
|
}
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* POST /api/sessions/spawn — create a session under a parent.
|
|
8
|
+
*
|
|
9
|
+
* Static path, registered before the `:sessionId` routes for the same reason
|
|
10
|
+
* `/api/sessions/batch-archive` is: a parameter route winning the match would
|
|
11
|
+
* answer 405 and hide the real path.
|
|
12
|
+
*
|
|
13
|
+
* The handler owns validation and status mapping only. Everything that decides
|
|
14
|
+
* where the child runs, what it inherits and whether the tree allows it lives in
|
|
15
|
+
* `spawn.server.ts`, because the agent CLI calls the same service.
|
|
16
|
+
*/
|
|
17
|
+
|
|
18
|
+
import { json } from '@/server/lib/remix-compat';
|
|
19
|
+
import type { ActionFunctionArgs } from '@/server/lib/remix-compat';
|
|
20
|
+
import { methodNotAllowed, parseJsonBody } from '@/server/lib/route-adapter';
|
|
21
|
+
import { emitRealtimeSignal } from '@/server/lib/realtime/signals.server';
|
|
22
|
+
import {
|
|
23
|
+
SessionSpawnError,
|
|
24
|
+
spawnChildSession,
|
|
25
|
+
type SpawnChildSessionInput,
|
|
26
|
+
} from '@/server/lib/sessions/spawn.server';
|
|
27
|
+
import { bearerToken, verifyAgentToken } from '@/server/lib/sessions/agent-token.server';
|
|
28
|
+
|
|
29
|
+
type Visibility = 'visible' | 'hidden';
|
|
30
|
+
type ParentNotifications = 'auto' | 'stuck' | 'off';
|
|
31
|
+
|
|
32
|
+
interface SpawnBody {
|
|
33
|
+
parentSessionId?: unknown;
|
|
34
|
+
/** The CLI's `--parent-self`: resolve the parent from the bearer token. */
|
|
35
|
+
parentSelf?: unknown;
|
|
36
|
+
harness?: unknown;
|
|
37
|
+
cwd?: unknown;
|
|
38
|
+
prompt?: unknown;
|
|
39
|
+
model?: unknown;
|
|
40
|
+
thinkingLevel?: unknown;
|
|
41
|
+
lifecycleOwnerSessionId?: unknown;
|
|
42
|
+
visibility?: unknown;
|
|
43
|
+
parentNotifications?: unknown;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
function readModel(value: unknown): SpawnChildSessionInput['model'] {
|
|
47
|
+
if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
|
|
48
|
+
const record = value as Record<string, unknown>;
|
|
49
|
+
return typeof record.provider === 'string' && typeof record.modelId === 'string'
|
|
50
|
+
? { provider: record.provider, modelId: record.modelId }
|
|
51
|
+
: null;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
function readString(value: unknown): string | null {
|
|
55
|
+
return typeof value === 'string' && value.trim() ? value.trim() : null;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
function statusFor(code: SessionSpawnError['code']): number {
|
|
59
|
+
switch (code) {
|
|
60
|
+
case 'parent_not_found':
|
|
61
|
+
return 404;
|
|
62
|
+
case 'parent_archived':
|
|
63
|
+
case 'parent_folder_mismatch':
|
|
64
|
+
return 409;
|
|
65
|
+
default:
|
|
66
|
+
return 400;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
export async function spawnSession({ request }: ActionFunctionArgs) {
|
|
71
|
+
if (request.method !== 'POST') {
|
|
72
|
+
return methodNotAllowed({ request, params: {} });
|
|
73
|
+
}
|
|
74
|
+
const parsed = await parseJsonBody<SpawnBody>(request);
|
|
75
|
+
if (!parsed.ok) return json({ error: 'Invalid JSON body' }, { status: 400 });
|
|
76
|
+
|
|
77
|
+
const prompt = readString(parsed.body.prompt);
|
|
78
|
+
if (!prompt) return json({ error: 'prompt is required' }, { status: 400 });
|
|
79
|
+
|
|
80
|
+
// An agent may only spawn under itself. The token is the identity (there is
|
|
81
|
+
// no cookie in a subprocess); `--parent-self` is how the CLI asks for it.
|
|
82
|
+
const tokenSession = verifyAgentToken(bearerToken(request));
|
|
83
|
+
let parentSessionId = readString(parsed.body.parentSessionId);
|
|
84
|
+
if (parsed.body.parentSelf === true) {
|
|
85
|
+
if (!tokenSession) {
|
|
86
|
+
return json({ error: 'parentSelf requires an agent token', code: 'agent_token_required' }, { status: 401 });
|
|
87
|
+
}
|
|
88
|
+
parentSessionId = tokenSession;
|
|
89
|
+
}
|
|
90
|
+
if (tokenSession && parentSessionId !== tokenSession) {
|
|
91
|
+
return json(
|
|
92
|
+
{ error: 'An agent may only spawn under its own session', code: 'agent_scope' },
|
|
93
|
+
{ status: 403 },
|
|
94
|
+
);
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
const visibility = parsed.body.visibility;
|
|
98
|
+
if (visibility !== undefined && visibility !== 'visible' && visibility !== 'hidden') {
|
|
99
|
+
return json({ error: 'visibility must be "visible" or "hidden"' }, { status: 400 });
|
|
100
|
+
}
|
|
101
|
+
const notifications = parsed.body.parentNotifications;
|
|
102
|
+
if (
|
|
103
|
+
notifications !== undefined &&
|
|
104
|
+
notifications !== 'auto' &&
|
|
105
|
+
notifications !== 'stuck' &&
|
|
106
|
+
notifications !== 'off'
|
|
107
|
+
) {
|
|
108
|
+
return json({ error: 'parentNotifications must be auto, stuck or off' }, { status: 400 });
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
try {
|
|
112
|
+
const result = await spawnChildSession({
|
|
113
|
+
parentSessionId,
|
|
114
|
+
harness: readString(parsed.body.harness),
|
|
115
|
+
cwd: readString(parsed.body.cwd),
|
|
116
|
+
prompt,
|
|
117
|
+
model: readModel(parsed.body.model),
|
|
118
|
+
thinkingLevel: readString(parsed.body.thinkingLevel),
|
|
119
|
+
lifecycleOwnerSessionId: readString(parsed.body.lifecycleOwnerSessionId),
|
|
120
|
+
...(visibility ? { visibility: visibility as Visibility } : {}),
|
|
121
|
+
...(notifications ? { parentNotifications: notifications as ParentNotifications } : {}),
|
|
122
|
+
});
|
|
123
|
+
emitRealtimeSignal('sidebar-structure');
|
|
124
|
+
return json(result, { status: 201 });
|
|
125
|
+
} catch (error) {
|
|
126
|
+
if (error instanceof SessionSpawnError) {
|
|
127
|
+
return json({ error: error.message, code: error.code }, { status: statusFor(error.code) });
|
|
128
|
+
}
|
|
129
|
+
return json(
|
|
130
|
+
{ error: error instanceof Error ? error.message : 'Could not spawn the session' },
|
|
131
|
+
{ status: 500 },
|
|
132
|
+
);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
@@ -3,7 +3,7 @@ import type { ActionFunctionArgs } from '@/server/lib/remix-compat';
|
|
|
3
3
|
import { methodNotAllowed } from '@/server/lib/route-adapter';
|
|
4
4
|
import { isMockMode } from '@/server/mock.server';
|
|
5
5
|
import { writeModelOverride, type ReasoningEffort } from '@/server/lib/omp/config/model-overrides';
|
|
6
|
-
import {
|
|
6
|
+
import { refreshModelRegistryAfterWrite } from '@/server/lib/models/registry-refresh.server';
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* PUT /api/settings/model-override — the per-model knobs omp actually honours.
|
|
@@ -61,7 +61,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
|
|
|
61
61
|
if (isMockMode()) return json({ success: true, written: false, isMock: true });
|
|
62
62
|
|
|
63
63
|
const result = await writeModelOverride({ provider, modelId, maxTokens, reasoningEffort });
|
|
64
|
-
|
|
64
|
+
// A per-model override changes the registry's row metadata, not which models
|
|
65
|
+
// exist — so the readers are recycled, but a stored probe stays valid and
|
|
66
|
+
// the ACP picker does not blank out for an answer that did not change.
|
|
67
|
+
if (result.written) await refreshModelRegistryAfterWrite({ probes: false });
|
|
65
68
|
return json({ success: result.written, ...result });
|
|
66
69
|
} catch (error) {
|
|
67
70
|
return json({ error: error instanceof Error ? error.message : String(error) }, { status: 400 });
|
|
@@ -36,7 +36,7 @@ import {
|
|
|
36
36
|
isProviderAuthMode,
|
|
37
37
|
isProviderDiscoveryType,
|
|
38
38
|
} from '@/shared/lib/models/provider/dialect';
|
|
39
|
-
import {
|
|
39
|
+
import { refreshModelRegistryAfterWrite } from '@/server/lib/models/registry-refresh.server';
|
|
40
40
|
|
|
41
41
|
/**
|
|
42
42
|
* The discovery block from the client: a type plus the knobs that type accepts.
|
|
@@ -100,7 +100,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
|
|
|
100
100
|
if (isMockMode()) return json({ success: true, written: false, isMock: true, changed: [] });
|
|
101
101
|
|
|
102
102
|
const result = await updateOmpProviderEntry(slug, patch);
|
|
103
|
-
if (result.written)
|
|
103
|
+
if (result.written) await refreshModelRegistryAfterWrite({ reprobe: true });
|
|
104
104
|
return json({ success: result.written, ...result }, { status: result.written ? 200 : 400 });
|
|
105
105
|
} catch (error) {
|
|
106
106
|
return json({ error: error instanceof Error ? error.message : String(error) }, { status: 400 });
|
|
@@ -6,7 +6,7 @@ import { upsertOmpProviderModels } from '@/server/lib/omp/config/providers';
|
|
|
6
6
|
import { manualModelSeed } from '@/server/lib/omp/config/provider-seeds';
|
|
7
7
|
import { readNativeProviders } from '@/server/lib/omp/config/models-config';
|
|
8
8
|
import { isProviderAuthMode, isProviderThinkingEffort, modelKindOf } from '@/shared/lib/models/provider/dialect';
|
|
9
|
-
import {
|
|
9
|
+
import { refreshModelRegistryAfterWrite } from '@/server/lib/models/registry-refresh.server';
|
|
10
10
|
|
|
11
11
|
/**
|
|
12
12
|
* POST /api/settings/provider-model — register ONE model by hand.
|
|
@@ -92,7 +92,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
|
|
|
92
92
|
overrideOnly: false,
|
|
93
93
|
models: [seed],
|
|
94
94
|
});
|
|
95
|
-
if (result.written)
|
|
95
|
+
if (result.written) await refreshModelRegistryAfterWrite({ reprobe: true });
|
|
96
96
|
|
|
97
97
|
return json({
|
|
98
98
|
success: result.written || alreadyKnown,
|
|
@@ -3,7 +3,7 @@ import type { ActionFunctionArgs } from '@/server/lib/remix-compat';
|
|
|
3
3
|
import { isMockMode } from '@/server/mock.server';
|
|
4
4
|
import { upsertOmpProviderModels } from '@/server/lib/omp/config/providers';
|
|
5
5
|
import { readOmpProviderApiKey } from '@/server/lib/omp/core/auth-credentials';
|
|
6
|
-
import {
|
|
6
|
+
import { refreshModelRegistryAfterWrite } from '@/server/lib/models/registry-refresh.server';
|
|
7
7
|
import {
|
|
8
8
|
enrichFromCatalog,
|
|
9
9
|
fetchRemoteModels,
|
|
@@ -161,7 +161,7 @@ export async function action({ request }: ActionFunctionArgs) {
|
|
|
161
161
|
...(body.replaceModels === true ? { replaceModels: true } : {}),
|
|
162
162
|
models: enriched.map(toOmpSeed),
|
|
163
163
|
});
|
|
164
|
-
if (upsert.written)
|
|
164
|
+
if (upsert.written) await refreshModelRegistryAfterWrite({ reprobe: true });
|
|
165
165
|
omp = {
|
|
166
166
|
written: upsert.written,
|
|
167
167
|
addedCount: upsert.addedModels.length,
|
|
@@ -31,7 +31,7 @@ import { getDb } from '@/server/db.server';
|
|
|
31
31
|
import { refreshModelCatalog } from '@/server/lib/models/catalog.server';
|
|
32
32
|
import { mergeProviders, PROVIDERS_SETTINGS_KEY } from '@/server/lib/models/provider-registry.server';
|
|
33
33
|
import { readSettingsJson } from '@/server/lib/db/settings-store';
|
|
34
|
-
import {
|
|
34
|
+
import { refreshModelRegistryAfterWrite } from '@/server/lib/models/registry-refresh.server';
|
|
35
35
|
import type { ProviderItem } from '@/shared/types';
|
|
36
36
|
|
|
37
37
|
async function readOverlay(): Promise<ProviderItem[]> {
|
|
@@ -63,9 +63,11 @@ export async function action({ request, params }: ActionFunctionArgs) {
|
|
|
63
63
|
if (!result.ok) {
|
|
64
64
|
return json({ success: false, ...result }, { status: 502 });
|
|
65
65
|
}
|
|
66
|
-
// Every listing that moved means the registry did too —
|
|
67
|
-
//
|
|
68
|
-
|
|
66
|
+
// Every listing that moved means the registry did too — recycle the pooled
|
|
67
|
+
// omp child (it caches the catalog it spawned with) and drop the probes that
|
|
68
|
+
// measured the old one, so the chat picker and the role dropdowns see the new
|
|
69
|
+
// rows immediately.
|
|
70
|
+
await refreshModelRegistryAfterWrite({ reprobe: true });
|
|
69
71
|
const merged = await mergeProviders(await readOverlay());
|
|
70
72
|
const changed = slug ? result.changed.filter((entry) => entry.slug === slug) : result.changed;
|
|
71
73
|
return json({
|
|
@@ -10,6 +10,7 @@ import { disableNativeProvider, enableNativeProvider } from '@/server/lib/omp/co
|
|
|
10
10
|
import { removeOmpProvider } from '@/server/lib/omp/config/providers';
|
|
11
11
|
import { PROVIDERS_SETTINGS_KEY as SETTINGS_KEY, deduplicateProviderItems, mergeProviders } from '@/server/lib/models/provider-registry.server';
|
|
12
12
|
import { invalidateModelsCaches } from '@/shared/lib/models/server-cache';
|
|
13
|
+
import { refreshModelRegistryAfterWrite } from '@/server/lib/models/registry-refresh.server';
|
|
13
14
|
|
|
14
15
|
const providersStore = createSettingsListStore<ProviderItem>({
|
|
15
16
|
key: SETTINGS_KEY,
|
|
@@ -173,7 +174,8 @@ export async function action({ request, params }: ActionFunctionArgs) {
|
|
|
173
174
|
});
|
|
174
175
|
}
|
|
175
176
|
}
|
|
176
|
-
|
|
177
|
+
if (removedFromOmp) await refreshModelRegistryAfterWrite({ reprobe: true });
|
|
178
|
+
else invalidateModelsCaches();
|
|
177
179
|
const after = await mergeProviders(list);
|
|
178
180
|
return json({ success: true, providers: after.providers, removedFromOmp, modelsRemoved });
|
|
179
181
|
}
|
|
@@ -31,6 +31,8 @@ import fs from 'fs';
|
|
|
31
31
|
import os from 'os';
|
|
32
32
|
import path from 'path';
|
|
33
33
|
import { parse as parseYaml } from 'yaml';
|
|
34
|
+
import { closeDb } from '@/server/db.server';
|
|
35
|
+
import { removeDir } from '@/test-support/remove-dir';
|
|
34
36
|
import { action as modelOverrideAction } from '@/server/routes/settings/model-override';
|
|
35
37
|
import { action as ompConfigAction, loader as ompConfigLoader } from '@/server/routes/settings/omp-config';
|
|
36
38
|
import { action as providerModelAction } from '@/server/routes/settings/provider-model';
|
|
@@ -58,12 +60,18 @@ afterEach(() => {
|
|
|
58
60
|
fs.rmSync(MODELS_YML, { force: true });
|
|
59
61
|
});
|
|
60
62
|
|
|
61
|
-
afterAll(() => {
|
|
63
|
+
afterAll(async () => {
|
|
64
|
+
// CLOSE the handle, then remove through `removeDir`. A bare `rmSync` with
|
|
65
|
+
// `force: true` reads as infallible and is not: on Windows an open
|
|
66
|
+
// `bun:sqlite` connection holds the temp tree and the delete fails with
|
|
67
|
+
// EBUSY, which reports from an `afterAll` as an unhandled error naming a line
|
|
68
|
+
// nobody can act on. Measured on the Windows gate.
|
|
69
|
+
await closeDb();
|
|
62
70
|
delete Bun.env.PI_CODING_AGENT_DIR;
|
|
63
71
|
delete Bun.env.KABMO_DB_PATH;
|
|
64
72
|
delete Bun.env.SYNC_WORKSPACE;
|
|
65
73
|
delete Bun.env.MOCK;
|
|
66
|
-
|
|
74
|
+
removeDir(ROOT);
|
|
67
75
|
});
|
|
68
76
|
|
|
69
77
|
type Handler = (args: never) => unknown;
|
|
@@ -31,7 +31,7 @@ import {
|
|
|
31
31
|
writeTerminalInput,
|
|
32
32
|
} from '@/server/lib/terminal/runtime.server';
|
|
33
33
|
import { TerminalRuntimeError, type TerminalViewer } from '@/server/lib/terminal/session.server';
|
|
34
|
-
import { frameAccepted } from '@/server/lib/terminal/send-result';
|
|
34
|
+
import { asBinaryFrame, frameAccepted } from '@/server/lib/terminal/send-result';
|
|
35
35
|
import {
|
|
36
36
|
decodeClientFrame,
|
|
37
37
|
encodeServerFrame,
|
|
@@ -71,8 +71,8 @@ export const terminalWsRoutes = new Elysia({ prefix: '/api/terminal' }).ws('/:te
|
|
|
71
71
|
// Only `0` is a drop; `-1` means "queued, draining". See
|
|
72
72
|
// `send-result.ts` for the measured contract — reading `-1` as
|
|
73
73
|
// failure closed healthy viewers at the first burst, and reading
|
|
74
|
-
// `0` as success left
|
|
75
|
-
return frameAccepted(ws.send(frame));
|
|
74
|
+
// `0` as success left the panel attached to a stream with a hole.
|
|
75
|
+
return frameAccepted(ws.send(asBinaryFrame(frame)));
|
|
76
76
|
} catch {
|
|
77
77
|
// Socket closed mid-send; the close handler detaches.
|
|
78
78
|
return false;
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The field drafts `ask-form/index.ts` collects while walking a form, and the
|
|
8
|
+
* turn from drafts to the questions the card draws.
|
|
9
|
+
*
|
|
10
|
+
* The question precedence is omp's `fieldQuestions`: the control's own label,
|
|
11
|
+
* else the text block right before it, else its `<fieldset>` legend, else a lone
|
|
12
|
+
* option's label, else the control name. A radio/checkbox group of two or more
|
|
13
|
+
* also gains the `Other (type your own)` row omp's fallback appends, because the
|
|
14
|
+
* card previews the rows the user will actually be offered.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
import type { AskOption, AskQuestion } from '@/shared/lib/chat/ask-form/types';
|
|
18
|
+
import { oneLine } from '@/shared/lib/chat/ask-form/tokens';
|
|
19
|
+
|
|
20
|
+
/** The "Other" row omp's field-by-field fallback appends to a choice list. */
|
|
21
|
+
const OTHER_LABEL = 'Other (type your own)';
|
|
22
|
+
const OTHER_IN_OPTIONS = /^\s*other\b/i;
|
|
23
|
+
|
|
24
|
+
export interface DraftOption {
|
|
25
|
+
value: string;
|
|
26
|
+
label: string;
|
|
27
|
+
checked: boolean;
|
|
28
|
+
disabled: boolean;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export interface DraftField {
|
|
32
|
+
name: string;
|
|
33
|
+
kind: 'choice' | 'text';
|
|
34
|
+
multi: boolean;
|
|
35
|
+
select: boolean;
|
|
36
|
+
label: string;
|
|
37
|
+
options: DraftOption[];
|
|
38
|
+
/** Text field only. */
|
|
39
|
+
value: string;
|
|
40
|
+
multiline: boolean;
|
|
41
|
+
/** Caption in force when the field appeared, and its section's legend. */
|
|
42
|
+
caption: string;
|
|
43
|
+
section: string;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** Named fields, in document order, as the questions the card renders. */
|
|
47
|
+
export function toQuestions(fields: DraftField[]): AskQuestion[] {
|
|
48
|
+
const questions: AskQuestion[] = [];
|
|
49
|
+
for (const field of fields) {
|
|
50
|
+
if (!field.name) continue;
|
|
51
|
+
const lone = field.kind === 'choice' && field.options.length === 1 ? oneLine(field.options[0].label) : '';
|
|
52
|
+
const question = oneLine(field.label) || field.caption || field.section || lone || field.name;
|
|
53
|
+
const options: AskOption[] = field.options.map((option) => ({
|
|
54
|
+
label: option.label || option.value,
|
|
55
|
+
value: option.value,
|
|
56
|
+
}));
|
|
57
|
+
if (
|
|
58
|
+
field.kind === 'choice' &&
|
|
59
|
+
!field.select &&
|
|
60
|
+
field.options.length >= 2 &&
|
|
61
|
+
!field.options.some((option) => OTHER_IN_OPTIONS.test(option.label))
|
|
62
|
+
) {
|
|
63
|
+
options.push({ label: OTHER_LABEL });
|
|
64
|
+
}
|
|
65
|
+
const checked = field.options.findIndex((option) => option.checked);
|
|
66
|
+
questions.push({
|
|
67
|
+
id: field.name,
|
|
68
|
+
question,
|
|
69
|
+
options,
|
|
70
|
+
multi: field.multi,
|
|
71
|
+
kind: field.kind,
|
|
72
|
+
recommended: field.kind === 'choice' && !field.multi && checked >= 0 ? checked : undefined,
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
return questions;
|
|
76
|
+
}
|