@kabmo-labs/kabmo 0.27.0 → 0.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +495 -467
- package/dist/client/static/js/index-81f7berm.css +1 -0
- package/dist/client/static/js/{index-e3qh2yps.js → index-xzvyrxya.js} +795 -795
- package/marketplace/plugins/command-runner/package.json +3 -17
- package/marketplace/plugins/command-runner/settings-schema.json +14 -0
- package/marketplace/plugins/git-forge/README.md +17 -7
- package/marketplace/plugins/git-forge/package.json +4 -30
- package/marketplace/plugins/git-forge/panel.css +16 -0
- package/marketplace/plugins/git-forge/settings-schema.json +27 -0
- package/marketplace/plugins/git-forge/src/panel/Badge.tsx +35 -22
- package/marketplace/plugins/git-forge/src/panel/Change.tsx +20 -24
- package/marketplace/plugins/git-forge/src/panel/CiBadge.tsx +16 -7
- package/marketplace/plugins/git-forge/src/panel/Credential.tsx +31 -26
- package/marketplace/plugins/git-forge/src/panel/Glyph.tsx +18 -2
- package/marketplace/plugins/git-forge/src/panel/Header.tsx +160 -96
- package/marketplace/plugins/git-forge/src/panel/ItemView.tsx +60 -44
- package/marketplace/plugins/git-forge/src/panel/List.tsx +150 -22
- package/marketplace/plugins/git-forge/src/panel/Row.tsx +11 -5
- package/marketplace/plugins/git-forge/src/panel/Sidebar.tsx +17 -15
- package/marketplace/plugins/git-forge/src/panel/Write.tsx +84 -61
- package/marketplace/plugins/git-forge/src/panel/format.test.ts +99 -0
- package/marketplace/plugins/git-forge/src/panel/format.ts +59 -16
- package/marketplace/plugins/git-forge/src/panel/index.test.tsx +109 -5
- package/marketplace/plugins/git-forge/src/panel/index.tsx +37 -4
- package/marketplace/plugins/git-forge/src/panel/use-forge.ts +17 -0
- package/marketplace/plugins/git-forge/src/panel/write.test.tsx +31 -0
- package/marketplace/plugins/session-info/package.json +2 -10
- package/marketplace/plugins/session-info/settings-schema.json +8 -0
- package/marketplace/plugins/stats/README.md +17 -5
- package/marketplace/plugins/stats/package.json +3 -23
- package/marketplace/plugins/stats/settings-schema.json +20 -0
- package/marketplace/plugins/stats/src/app.tsx +1 -1
- package/marketplace/plugins/stats/src/groups.test.ts +46 -1
- package/marketplace/plugins/stats/src/groups.ts +22 -11
- package/marketplace/plugins/stats/src/harness-leases.test.ts +84 -0
- package/marketplace/plugins/stats/src/harness-leases.ts +132 -0
- package/marketplace/plugins/stats/src/labels.test.ts +54 -1
- package/marketplace/plugins/stats/src/labels.ts +33 -7
- package/marketplace/plugins/stats/src/sampler.test.ts +61 -0
- package/marketplace/plugins/stats/src/sampler.ts +39 -5
- package/marketplace/plugins/stats/src/snapshot.ts +6 -0
- package/package.json +2 -2
- package/src/client/components/common/harness-glyph/index.tsx +18 -1
- package/src/client/components/common/session-actions-menu/index.test.tsx +106 -0
- package/src/client/components/common/session-actions-menu/index.tsx +43 -1
- package/src/client/components/common/session-row/TrailingSlot.tsx +9 -4
- package/src/client/components/common/session-row/index.tsx +4 -0
- package/src/client/components/common/session-row/session-row.test.tsx +6 -0
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +2 -1
- package/src/client/components/layout/session-sidebar/SessionItem.tsx +9 -1
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +2 -1
- package/src/client/components/layout/session-sidebar/scheduler-modal/ModelFields.tsx +202 -0
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskForm.tsx +80 -19
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskList.tsx +23 -3
- package/src/client/components/layout/session-sidebar/scheduler-modal/index.tsx +3 -0
- package/src/client/components/mobile/mobile-right-sidebar/EditorSurface.tsx +156 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +41 -86
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +2 -1
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.test.ts +6 -0
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.tsx +9 -1
- package/src/client/components/settings/Modal.tsx +6 -2
- package/src/client/components/settings/Sidebar.tsx +30 -3
- package/src/client/components/settings/categories/HarnessSettings.tsx +11 -7
- package/src/client/components/settings/categories/NotificationSettings.test.tsx +40 -15
- package/src/client/components/settings/categories/NotificationSettings.tsx +142 -64
- package/src/client/components/settings/categories/PanelPluginSettings.tsx +1 -1
- package/src/client/components/settings/categories/harness-settings/CustomHarnessForm.tsx +186 -0
- package/src/client/components/settings/categories/panel-plugins/InstalledList.tsx +11 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.test.tsx +1 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.tsx +15 -1
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.test.tsx +165 -0
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.tsx +260 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.fork.test.ts +24 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.tsx +8 -4
- package/src/client/components/workspace/chat-timeline/ComposerDock.tsx +34 -0
- package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +3 -2
- package/src/client/components/workspace/chat-timeline/MessageItem.fork.test.ts +80 -0
- package/src/client/components/workspace/chat-timeline/MessageItem.tsx +9 -3
- package/src/client/components/workspace/chat-timeline/MessageList.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/RunFooter.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/TimelineBody.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/chat-input/ComposerRows.tsx +8 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.test.tsx +9 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.tsx +4 -1
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +24 -0
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.tsx +13 -20
- package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +2 -0
- package/src/client/components/workspace/chat-timeline/chat-input/props.ts +5 -5
- package/src/client/components/workspace/chat-timeline/index.tsx +11 -5
- package/src/client/components/workspace/chat-timeline/target-picker/DraftTargetRow.tsx +1 -9
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.test.tsx +101 -0
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.tsx +2 -2
- package/src/client/components/workspace/editor/FilePane.tsx +9 -4
- package/src/client/components/workspace/editor/Notices.tsx +2 -2
- package/src/client/components/workspace/editor/Pane.tsx +2 -2
- package/src/client/components/workspace/editor/Toolbar.tsx +16 -10
- package/src/client/components/workspace/editor/index.tsx +6 -10
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +4 -3
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +23 -14
- package/src/client/components/workspace/terminal-panel/RealtimeTerminalView.tsx +9 -1
- package/src/client/components/workspace/terminal-panel/focus.test.ts +70 -0
- package/src/client/components/workspace/terminal-panel/focus.ts +46 -0
- package/src/client/components/workspace/terminal-panel/index.tsx +14 -1
- package/src/client/components/workspace/terminal-panel/mount.ts +17 -9
- package/src/client/components/workspace/terminal-panel/scroll-hold.test.ts +158 -0
- package/src/client/components/workspace/terminal-panel/scroll-hold.ts +136 -0
- package/src/client/hooks/chat/composer/use-draft.ts +45 -1
- package/src/client/hooks/chat/omp/pending-sessions.waiting.test.ts +11 -10
- package/src/client/hooks/chat/omp/pending-waiting.ts +15 -7
- package/src/client/hooks/chat/omp/prompt-send.test.ts +11 -0
- package/src/client/hooks/chat/omp/prompt-send.ts +3 -0
- package/src/client/hooks/chat/timeline/actions.ts +4 -4
- package/src/client/hooks/chat/timeline/composer-modes.ts +13 -2
- package/src/client/hooks/chat/timeline/fork-open.ts +52 -0
- package/src/client/hooks/chat/timeline/index.ts +5 -2
- package/src/client/hooks/chat/timeline/mode-availability.ts +7 -0
- package/src/client/hooks/chat/timeline/modes-contract.ts +6 -0
- package/src/client/hooks/chat/timeline/modes-hydrate.ts +93 -0
- package/src/client/hooks/chat/timeline/modes.ts +32 -52
- package/src/client/hooks/chat/timeline/new-chat-open.ts +7 -6
- package/src/client/hooks/chat/timeline/new-chat.ts +10 -1
- package/src/client/hooks/chat/timeline/pending-dispatch.ts +4 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.test.ts +136 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.ts +69 -0
- package/src/client/hooks/chat/timeline/pending-warmup.test.ts +147 -0
- package/src/client/hooks/chat/timeline/pending-warmup.ts +62 -0
- package/src/client/hooks/chat/timeline/run-identity.test.ts +12 -0
- package/src/client/hooks/chat/timeline/run-identity.ts +4 -1
- package/src/client/hooks/chat/timeline/send-props.ts +2 -0
- package/src/client/hooks/chat/timeline/send-steer.test.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test-util.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test.ts +1 -0
- package/src/client/hooks/chat/timeline/session-harness.ts +4 -0
- package/src/client/hooks/chat/timeline/use-fork-session.ts +9 -22
- package/src/client/hooks/chat/waiting/cancel.ts +13 -6
- package/src/client/hooks/chat/waiting/choice.ts +13 -16
- package/src/client/hooks/chat/waiting/composer-wait.ts +70 -0
- package/src/client/hooks/chat/waiting/dispatch.ts +48 -28
- package/src/client/hooks/chat/waiting/held.ts +37 -13
- package/src/client/hooks/chat/waiting/hold.test.ts +22 -0
- package/src/client/hooks/chat/waiting/hold.ts +20 -11
- package/src/client/hooks/chat/waiting/restore.test.ts +69 -0
- package/src/client/hooks/chat/waiting/restore.ts +34 -0
- package/src/client/hooks/chat/waiting/store.ts +9 -3
- package/src/client/hooks/editor/file-editor-types.ts +21 -12
- package/src/client/hooks/editor/save-file.test.ts +1 -1
- package/src/client/hooks/editor/save-file.ts +35 -8
- package/src/client/hooks/editor/target-key.ts +17 -0
- package/src/client/hooks/editor/use-disk-digest.test.ts +82 -0
- package/src/client/hooks/editor/use-disk-digest.ts +164 -0
- package/src/client/hooks/editor/use-disk-sync.ts +212 -0
- package/src/client/hooks/editor/use-file-cache.ts +113 -0
- package/src/client/hooks/editor/use-file-editor.test.ts +90 -0
- package/src/client/hooks/editor/use-file-editor.ts +90 -52
- package/src/client/hooks/editor/use-file-read.ts +24 -10
- package/src/client/hooks/editor/use-file-writes.ts +4 -4
- package/src/client/hooks/models/harness-catalog.ts +15 -0
- package/src/client/hooks/ui/notifications.ts +17 -8
- package/src/client/hooks/workspace/panel-registry.ts +1 -1
- package/src/client/hooks/workspace/scheduled-tasks.ts +26 -11
- package/src/client/lib/notifications/os.test.ts +1 -30
- package/src/client/lib/notifications/os.ts +0 -15
- package/src/client/lib/notifications/platform.test.ts +68 -0
- package/src/client/lib/notifications/platform.ts +36 -0
- package/src/server/index.ts +7 -0
- package/src/server/lib/harness/acp/client.ts +81 -87
- package/src/server/lib/harness/acp/prewarm.server.ts +237 -0
- package/src/server/lib/harness/acp/prewarm.test.ts +171 -0
- package/src/server/lib/harness/acp/prompt.test.ts +70 -1
- package/src/server/lib/harness/acp/prompt.ts +32 -1
- package/src/server/lib/harness/acp/protocol.ts +23 -0
- package/src/server/lib/harness/acp/session-handshake.test.ts +26 -0
- package/src/server/lib/harness/acp/session-handshake.ts +22 -20
- package/src/server/lib/harness/acp/session-options.ts +16 -0
- package/src/server/lib/harness/acp/session-process.ts +43 -0
- package/src/server/lib/harness/acp/session.ts +11 -12
- package/src/server/lib/harness/acp/stdio.ts +129 -0
- package/src/server/lib/harness/acp/verbs.test.ts +97 -0
- package/src/server/lib/harness/acp/verbs.ts +16 -6
- package/src/server/lib/harness/auto-probe.server.ts +4 -3
- package/src/server/lib/harness/capabilities.ts +8 -0
- package/src/server/lib/harness/config.server.ts +3 -2
- package/src/server/lib/harness/custom.server.ts +209 -0
- package/src/server/lib/harness/launch.ts +6 -1
- package/src/server/lib/harness/register.server.ts +8 -1
- package/src/server/lib/harness/schema.server.ts +21 -0
- package/src/server/lib/harness/session-lease.server.test.ts +99 -0
- package/src/server/lib/harness/session-lease.server.ts +193 -0
- package/src/server/lib/harness/session-store.server.test.ts +8 -8
- package/src/server/lib/harness/session-store.server.ts +25 -4
- package/src/server/lib/harness/session-title.server.ts +12 -2
- package/src/server/lib/harness/spawn.server.ts +123 -20
- package/src/server/lib/harness/update-queue.server.ts +3 -3
- package/src/server/lib/lifecycle/after-listen.ts +12 -1
- package/src/server/lib/lifecycle/paths.ts +19 -1
- package/src/server/lib/mcp/registry.server.ts +155 -0
- package/src/server/lib/mcp/registry.test.ts +169 -0
- package/src/server/lib/mcp/store.server.ts +38 -0
- package/src/server/lib/omp/rpc/frame-fold-contract.ts +59 -0
- package/src/server/lib/omp/rpc/frame-fold-frames.test.ts +64 -1
- package/src/server/lib/omp/rpc/frame-fold-host.test-util.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold.test.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold.ts +6 -45
- package/src/server/lib/omp/rpc/prewarm-pool.ts +19 -5
- package/src/server/lib/omp/rpc/run-model.test.ts +116 -0
- package/src/server/lib/omp/rpc/run-model.ts +4 -2
- package/src/server/lib/omp/session/sidebar-data.harness.test.ts +6 -3
- package/src/server/lib/omp/session/standby.server.ts +13 -2
- package/src/server/lib/panels/manifest.test.ts +47 -1
- package/src/server/lib/panels/manifest.ts +19 -0
- package/src/server/lib/panels/registry.server.ts +19 -2
- package/src/server/lib/panels/scan.server.ts +26 -2
- package/src/server/lib/panels/settings-schema.server.ts +72 -0
- package/src/server/lib/plugins/background.server.ts +21 -3
- package/src/server/lib/plugins/background.test.ts +13 -0
- package/src/server/lib/plugins/loader.server.ts +35 -51
- package/src/server/lib/plugins/mcp.server.ts +100 -0
- package/src/server/lib/plugins/mcp.test.ts +75 -0
- package/src/server/lib/plugins/schedule-runner.server.ts +153 -0
- package/src/server/lib/plugins/schedule-runner.test.ts +186 -0
- package/src/server/lib/plugins/schedule-store.server.ts +107 -0
- package/src/server/lib/plugins/schema.server.ts +8 -0
- package/src/server/lib/plugins/settings.server.ts +56 -19
- package/src/server/lib/plugins/shutdown.server.ts +58 -0
- package/src/server/lib/plugins/shutdown.test.ts +28 -3
- package/src/server/lib/realtime/topics/global.server.ts +5 -1
- package/src/server/lib/schedule/rows.server.ts +9 -0
- package/src/server/lib/schedule/runtime.server.test.ts +91 -0
- package/src/server/lib/schedule/runtime.server.ts +101 -23
- package/src/server/lib/schedule/schema.server.ts +15 -0
- package/src/server/lib/schedule/store.server.test.ts +34 -0
- package/src/server/lib/schedule/store.server.ts +33 -9
- package/src/server/lib/sessions/fork.server.test.ts +47 -0
- package/src/server/lib/sessions/fork.server.ts +17 -1
- package/src/server/lib/sessions/spawn.server.ts +2 -2
- package/src/server/lib/waiting/runtime.server.test.ts +48 -0
- package/src/server/lib/waiting/runtime.server.ts +22 -0
- package/src/server/lib/waiting/schema.server.ts +8 -0
- package/src/server/lib/waiting/store.server.test.ts +14 -0
- package/src/server/lib/waiting/store.server.ts +6 -2
- package/src/server/routes/agent/command-resume.test.ts +9 -4
- package/src/server/routes/agent/new-mode.test.ts +40 -0
- package/src/server/routes/agent/new.ts +31 -10
- package/src/server/routes/agent/prewarm.ts +48 -7
- package/src/server/routes/fs/action.ts +9 -1
- package/src/server/routes/fs/digest.test.ts +100 -0
- package/src/server/routes/fs/digest.ts +106 -0
- package/src/server/routes/fs/index.ts +2 -0
- package/src/server/routes/fs/read.ts +6 -1
- package/src/server/routes/harness/custom.test.ts +131 -0
- package/src/server/routes/harness/import-action.ts +2 -2
- package/src/server/routes/harness/root.ts +41 -8
- package/src/server/routes/harness/update.ts +2 -2
- package/src/server/routes/panels/bindings.ts +2 -0
- package/src/server/routes/panels/settings.test.ts +165 -0
- package/src/server/routes/panels/settings.ts +106 -0
- package/src/server/routes/schedule/body.ts +14 -0
- package/src/server/routes/schedule/index.ts +28 -4
- package/src/server/routes/settings/mcp.ts +9 -26
- package/src/server/routes/waiting/index.ts +21 -2
- package/src/server/routes/waiting/routes.test.ts +21 -0
- package/src/shared/lib/chat/composer/delegation.ts +3 -3
- package/src/shared/lib/chat/timeline/fork-anchor.test.ts +97 -0
- package/src/shared/lib/chat/timeline/fork-anchor.ts +47 -0
- package/src/shared/lib/fs/content-hash.ts +29 -0
- package/src/shared/lib/harness/catalog.ts +48 -6
- package/src/shared/lib/harness/fork.ts +60 -0
- package/src/shared/lib/harness/mcp-facts.test.ts +30 -0
- package/src/shared/lib/harness/mcp-facts.ts +65 -0
- package/src/shared/lib/harness/menu.test.ts +16 -1
- package/src/shared/lib/harness/menu.ts +2 -2
- package/src/shared/lib/harness/rewind.ts +6 -6
- package/src/shared/lib/harness/session-modes.ts +31 -0
- package/src/shared/lib/harness/transcript.test.ts +29 -0
- package/src/shared/lib/harness/transcript.ts +19 -0
- package/src/shared/lib/notifications/settings.test.ts +21 -0
- package/src/shared/lib/notifications/settings.ts +24 -0
- package/src/shared/lib/omp/session/prewarm.test.ts +28 -4
- package/src/shared/lib/omp/session/prewarm.ts +25 -6
- package/src/shared/lib/omp/session/stream-state.server.test.ts +25 -0
- package/src/shared/lib/omp/session/stream-state.server.ts +8 -4
- package/src/shared/lib/panels/capabilities.test.ts +1 -1
- package/src/shared/lib/panels/capabilities.ts +3 -0
- package/src/shared/lib/plugins/settings.ts +22 -0
- package/src/shared/lib/schedule/parse.test.ts +48 -0
- package/src/shared/lib/schedule/parse.ts +69 -45
- package/src/shared/lib/schedule/timezone.ts +128 -0
- package/src/shared/lib/settings/defaults.ts +2 -0
- package/src/shared/lib/workspace/refresh-cadence.test.ts +25 -1
- package/src/shared/lib/workspace/relative-time.ts +16 -0
- package/src/shared/types/harness.ts +7 -0
- package/src/shared/types/omp/agent.ts +6 -0
- package/src/shared/types/panels-registry.ts +3 -3
- package/src/shared/types/panels.ts +4 -2
- package/src/shared/types/schedule.ts +13 -0
- package/src/shared/types/settings/state.ts +12 -1
- package/src/shared/types/waiting.ts +9 -0
- package/src/test-support/file-editor.test-util.ts +70 -5
- package/dist/client/static/js/index-32rpkj6b.css +0 -1
- package/src/client/hooks/editor/use-external-change-notice.ts +0 -71
- package/src/client/hooks/editor/use-external-change.test.ts +0 -88
- package/src/client/hooks/editor/use-external-change.ts +0 -146
|
@@ -41,6 +41,8 @@ import { isPendingSessionId } from '@/shared/lib/omp/session/default-title';
|
|
|
41
41
|
import { isModeMarker } from '@/shared/lib/omp/mode/constants';
|
|
42
42
|
import type { ArmedGoal, GoalAction } from '@/shared/lib/omp/mode/actions';
|
|
43
43
|
import { modeAvailability, type ModeCapabilities } from '@/client/hooks/chat/timeline/mode-availability';
|
|
44
|
+
import { usePendingSessionMode } from '@/client/hooks/chat/timeline/pending-session-mode';
|
|
45
|
+
import { useSessionModesHydration } from '@/client/hooks/chat/timeline/modes-hydrate';
|
|
44
46
|
|
|
45
47
|
import type { ChatTimelineModes } from '@/client/hooks/chat/timeline/modes-contract';
|
|
46
48
|
|
|
@@ -68,6 +70,9 @@ export function useChatTimelineModes(
|
|
|
68
70
|
const [sessionMode, setSessionMode] = useState<SessionModeState | null>(null);
|
|
69
71
|
const sessionModeRef = useRef<SessionModeState | null>(null);
|
|
70
72
|
sessionModeRef.current = sessionMode;
|
|
73
|
+
// The ladder and the pick for a chat that has not spawned yet, from its
|
|
74
|
+
// harness probe — see `pending-session-mode.ts`.
|
|
75
|
+
const pendingSession = usePendingSessionMode(sessionId, capabilities);
|
|
71
76
|
const [goal, setGoalState] = useState(false);
|
|
72
77
|
const [goalRecord, setGoalRecord] = useState<GoalRecord | null>(null);
|
|
73
78
|
const [goalContinuation, setGoalContinuation] = useState<GoalContinuation | null>(null);
|
|
@@ -90,55 +95,19 @@ export function useChatTimelineModes(
|
|
|
90
95
|
// updater that React may run twice.
|
|
91
96
|
const goalIdRef = useRef<string | null>(null);
|
|
92
97
|
|
|
93
|
-
// Hydrate from the session's own record
|
|
94
|
-
//
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
setSessionMode(null);
|
|
107
|
-
setGoalState(false);
|
|
108
|
-
setGoalRecord(null);
|
|
109
|
-
setGoalContinuation(null);
|
|
110
|
-
setGoalEvaluating(false);
|
|
111
|
-
goalIdRef.current = null;
|
|
112
|
-
// The pending selection is spent at the spawn that adopts a real id: this
|
|
113
|
-
// hook is now rendering the CHILD's modes, and a stale ref would re-apply
|
|
114
|
-
// the pending chat's picks to an unrelated later spawn.
|
|
115
|
-
if (!isPendingSessionId(current)) spawnSelectionRef.current = null;
|
|
116
|
-
if (!current) return;
|
|
117
|
-
// A pending `new-…` id has no session file, so the route can only answer
|
|
118
|
-
// 404. Skipped rather than fetched-and-ignored: the read is what a network
|
|
119
|
-
// panel shows, and a request whose only possible outcome is a 404 is noise.
|
|
120
|
-
if (isPendingSessionId(current)) return;
|
|
121
|
-
let cancelled = false;
|
|
122
|
-
fetch(`/api/sessions/${encodeURIComponent(current)}/modes`)
|
|
123
|
-
.then((res) => (res.ok ? (res.json() as Promise<ModesResponse>) : null))
|
|
124
|
-
.then((data) => {
|
|
125
|
-
if (cancelled || !data?.modes) return;
|
|
126
|
-
setPlanState(data.modes.plan === true);
|
|
127
|
-
setSessionMode(data.modes.mode ?? null);
|
|
128
|
-
setGoalState(data.modes.goal === true);
|
|
129
|
-
setGoalRecord(data.modes.goalRecord ?? null);
|
|
130
|
-
// The loop's last verdict rides the same record, so a reload shows
|
|
131
|
-
// "stopped at N turns" (and its Resume) instead of an active-looking
|
|
132
|
-
// goal the child has already given up on. A verdict never reported is
|
|
133
|
-
// null: the child's own counter cannot be reconstructed from a file.
|
|
134
|
-
setGoalContinuation(data.modes.goalContinuation ?? null);
|
|
135
|
-
goalIdRef.current = data.modes.goalRecord?.id ?? null;
|
|
136
|
-
})
|
|
137
|
-
.catch(() => {});
|
|
138
|
-
return () => {
|
|
139
|
-
cancelled = true;
|
|
140
|
-
};
|
|
141
|
-
}, [sessionId]);
|
|
98
|
+
// Hydrate from the session's own record; the reset-before-read rule lives in
|
|
99
|
+
// `modes-hydrate.ts`.
|
|
100
|
+
useSessionModesHydration({
|
|
101
|
+
sessionId,
|
|
102
|
+
spawnSelectionRef,
|
|
103
|
+
goalIdRef,
|
|
104
|
+
setPlan: setPlanState,
|
|
105
|
+
setMode: setSessionMode,
|
|
106
|
+
setGoal: setGoalState,
|
|
107
|
+
setGoalRecord,
|
|
108
|
+
setGoalContinuation,
|
|
109
|
+
setGoalEvaluating,
|
|
110
|
+
});
|
|
142
111
|
|
|
143
112
|
// An agent can move its own mode/config (`mode_changed`/`config_changed`).
|
|
144
113
|
// The frame carries no full list, so re-read the authoritative selector.
|
|
@@ -236,7 +205,17 @@ export function useChatTimelineModes(
|
|
|
236
205
|
const onSelectSessionMode = useCallback(async (value: string) => {
|
|
237
206
|
const current = sessionModeRef.current;
|
|
238
207
|
const session = sessionRef.current;
|
|
239
|
-
if (!
|
|
208
|
+
if (!session) return;
|
|
209
|
+
// A pending chat has no child: the pick is held for the spawn, the same seam
|
|
210
|
+
// the model and harness picks use. POSTing it answered 404 and dropped the
|
|
211
|
+
// click, which is why the control read as inert before the first prompt.
|
|
212
|
+
if (isPendingSessionId(session)) {
|
|
213
|
+
pendingSession.select(value);
|
|
214
|
+
setPlanState(value === 'plan');
|
|
215
|
+
setError(null);
|
|
216
|
+
return;
|
|
217
|
+
}
|
|
218
|
+
if (!current || current.currentValue === value) return;
|
|
240
219
|
setSessionMode({ ...current, currentValue: value });
|
|
241
220
|
setPlanState(value === 'plan');
|
|
242
221
|
setPending(true);
|
|
@@ -248,7 +227,7 @@ export function useChatTimelineModes(
|
|
|
248
227
|
setPlanState(current.currentValue === 'plan');
|
|
249
228
|
setError(result.error ?? 'Mode change failed');
|
|
250
229
|
}
|
|
251
|
-
}, []);
|
|
230
|
+
}, [pendingSession.select]);
|
|
252
231
|
|
|
253
232
|
const runGoalAction = useMemo(
|
|
254
233
|
() => createGoalAction({
|
|
@@ -327,8 +306,9 @@ export function useChatTimelineModes(
|
|
|
327
306
|
pending,
|
|
328
307
|
planAvailable: available.plan && !goal,
|
|
329
308
|
goalAvailable: available.goal,
|
|
330
|
-
sessionMode,
|
|
309
|
+
sessionMode: sessionMode ?? pendingSession.mode,
|
|
331
310
|
onSelectSessionMode,
|
|
311
|
+
pendingAgentModeRef: pendingSession.spawnRef,
|
|
332
312
|
error,
|
|
333
313
|
clearError,
|
|
334
314
|
spawnSelectionRef,
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
* The folder resolution mirrors `useNewChatSubmit` — the active session's
|
|
16
16
|
* folder, else the composer's pick — because a prewarm in a different cwd is a
|
|
17
17
|
* process the send never claims, which costs a spawn AND a kill. The HARNESS is
|
|
18
|
-
* the second half of that rule:
|
|
19
|
-
*
|
|
18
|
+
* the second half of that rule: a card opened from an ACP chat stays on that
|
|
19
|
+
* agent, so the agent warmed here is the one that agent — not omp's default.
|
|
20
20
|
*/
|
|
21
21
|
|
|
22
22
|
import { useCallback, useState } from 'preact/hooks';
|
|
@@ -59,10 +59,11 @@ export function useNewChatOpen({ folders, sessionId, selectedFolderId, harness }
|
|
|
59
59
|
const open = useCallback((next: string, rows?: Attachment[]) => {
|
|
60
60
|
const folderId = activeProjectForSession(folders, sessionId).folder?.id ?? selectedFolderId ?? undefined;
|
|
61
61
|
const cwd = spawnCwdForNewSession(folders, sessionId, folderId);
|
|
62
|
-
//
|
|
63
|
-
//
|
|
64
|
-
//
|
|
65
|
-
|
|
62
|
+
// Warm the agent the card will spawn on. A card opened from an ACP chat now
|
|
63
|
+
// warms THAT agent — it used to be skipped entirely, because the only pool
|
|
64
|
+
// was omp's and warming omp for a `claude` chat started a child the send
|
|
65
|
+
// never claimed.
|
|
66
|
+
if (cwd) triggerSessionPrewarm(cwd, { harness: harness ?? 'omp-rpc' });
|
|
66
67
|
setContent(next);
|
|
67
68
|
setAttachments(rows ?? []);
|
|
68
69
|
setOpenedHarness(harness);
|
|
@@ -26,7 +26,8 @@ import type { Dispatch, SetStateAction } from 'preact/compat';
|
|
|
26
26
|
import type { Attachment, ChatMessageData, PromptDispatchResult, WorkspaceFolderData } from '@/shared/types';
|
|
27
27
|
import type { SetSearchParams } from '@/client/lib/router/search-params';
|
|
28
28
|
import { activeProjectForSession } from '@/shared/lib/workspace/active-project';
|
|
29
|
-
import { startPendingSession } from '@/client/hooks/chat/omp/pending-sessions';
|
|
29
|
+
import { startPendingSession, patchPendingEntry } from '@/client/hooks/chat/omp/pending-sessions';
|
|
30
|
+
import { setHarnessPick } from '@/client/hooks/chat/timeline/session-harness';
|
|
30
31
|
|
|
31
32
|
export interface NewChatSubmitDeps {
|
|
32
33
|
/** Session the dialog was opened from — the scope this send must NOT use. */
|
|
@@ -71,6 +72,14 @@ export function useNewChatSubmit(
|
|
|
71
72
|
// sidebar/navbar show a default title immediately, and the row survives the
|
|
72
73
|
// `new-…` → omp-UUID switch when the first send spawns.
|
|
73
74
|
const pendingId = startPendingSession(activeProjectForSession(folders, sessionId).folder?.id ?? selectedFolderId);
|
|
75
|
+
// The card's agent becomes the PENDING chat's agent now, not at the send:
|
|
76
|
+
// the composer's mode surface and the prewarm both read the pick, and a
|
|
77
|
+
// harness that only appears when the prompt lands showed omp's toggles over
|
|
78
|
+
// an agent that was about to run `claude`.
|
|
79
|
+
if (harness) {
|
|
80
|
+
setHarnessPick(pendingId, harness);
|
|
81
|
+
patchPendingEntry(pendingId, (current) => ({ ...current, harness }));
|
|
82
|
+
}
|
|
74
83
|
parkedRef.current = { pendingId, text, attachments, ...(harness ? { harness } : {}) };
|
|
75
84
|
setSearchParams((prev) => {
|
|
76
85
|
const next = new URLSearchParams(prev);
|
|
@@ -41,6 +41,7 @@ type PendingDispatchDeps = Pick<
|
|
|
41
41
|
| 'pendingComposerModelRef'
|
|
42
42
|
| 'pendingThinkingLevelRef'
|
|
43
43
|
| 'pendingHarnessRef'
|
|
44
|
+
| 'pendingAgentModeRef'
|
|
44
45
|
| 'accessModeRef'
|
|
45
46
|
| 'spawnSelectionRef'
|
|
46
47
|
| 'goalArmRef'
|
|
@@ -254,6 +255,7 @@ export async function dispatchPendingChat(
|
|
|
254
255
|
|
|
255
256
|
// Top-level pending chat: the existing `/api/agent/new` spawn.
|
|
256
257
|
const spawnModes = deps.spawnSelectionRef.current;
|
|
258
|
+
const spawnSessionMode = deps.pendingAgentModeRef.current;
|
|
257
259
|
const armed = deps.goalArmRef.current;
|
|
258
260
|
const spawned = await deps.ompAgent.sendNewPrompt(
|
|
259
261
|
input.promptText,
|
|
@@ -264,6 +266,7 @@ export async function dispatchPendingChat(
|
|
|
264
266
|
thinkingLevel: composerThinking,
|
|
265
267
|
accessMode: deps.accessModeRef.current,
|
|
266
268
|
modes: spawnModes,
|
|
269
|
+
...(spawnSessionMode ? { sessionMode: spawnSessionMode } : {}),
|
|
267
270
|
...((input.options?.harness ?? deps.pendingHarnessRef.current)
|
|
268
271
|
? { harness: input.options?.harness ?? deps.pendingHarnessRef.current }
|
|
269
272
|
: {}),
|
|
@@ -278,6 +281,7 @@ export async function dispatchPendingChat(
|
|
|
278
281
|
// reported as the agent running the chat.
|
|
279
282
|
recordSpawnHarness(session.sessionId, session.harness ?? 'omp-rpc');
|
|
280
283
|
deps.spawnSelectionRef.current = null;
|
|
284
|
+
deps.pendingAgentModeRef.current = null;
|
|
281
285
|
deps.adoptedSessionIdRef.current = session.sessionId;
|
|
282
286
|
// The pending row moves with the id; without this it vanished the moment
|
|
283
287
|
// the URL stopped naming the pending id.
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The mode control on a chat that has NOT spawned yet.
|
|
8
|
+
*
|
|
9
|
+
* The reported defect this pins: picking an ACP harness from the model dropdown
|
|
10
|
+
* changed the picker's list but left the composer's mode surface on the previous
|
|
11
|
+
* agent — and a pick pressed there was POSTed to a session that does not exist,
|
|
12
|
+
* so it silently did nothing. Two halves must hold:
|
|
13
|
+
*
|
|
14
|
+
* - the LADDER comes from the picked harness's probe, before any session;
|
|
15
|
+
* - the PICK is recorded for the spawn (the send path reads the ref) and
|
|
16
|
+
* draws itself, never sent to `/api/agent/new-…`.
|
|
17
|
+
*/
|
|
18
|
+
|
|
19
|
+
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test } from 'bun:test';
|
|
20
|
+
import { Window } from 'happy-dom';
|
|
21
|
+
import { h, render } from 'preact';
|
|
22
|
+
import { act } from 'preact/test-utils';
|
|
23
|
+
|
|
24
|
+
import { pendingSessionMode } from '@/shared/lib/harness/session-modes';
|
|
25
|
+
import { useChatTimelineModes } from '@/client/hooks/chat/timeline/modes';
|
|
26
|
+
import { installDomGlobals, restoreDomGlobals } from '@/test-support/pristine-globals';
|
|
27
|
+
import type { ChatTimelineModes } from '@/client/hooks/chat/timeline/modes-contract';
|
|
28
|
+
|
|
29
|
+
const LADDER = [
|
|
30
|
+
{ value: 'ask', name: 'Ask' },
|
|
31
|
+
{ value: 'code', name: 'Code' },
|
|
32
|
+
{ value: 'architect', name: 'Architect' },
|
|
33
|
+
];
|
|
34
|
+
|
|
35
|
+
let container: HTMLElement;
|
|
36
|
+
const mounted: { value: ChatTimelineModes | null } = { value: null };
|
|
37
|
+
const requests: Array<{ url: string; method: string }> = [];
|
|
38
|
+
|
|
39
|
+
beforeAll(() => {
|
|
40
|
+
installDomGlobals(new Window({ url: 'http://localhost' }));
|
|
41
|
+
globalThis.fetch = ((input: unknown, init?: { method?: string }) => {
|
|
42
|
+
requests.push({ url: String(input), method: init?.method ?? 'GET' });
|
|
43
|
+
return Promise.resolve(new Response('{}', { status: 200 }));
|
|
44
|
+
}) as unknown as typeof fetch;
|
|
45
|
+
});
|
|
46
|
+
afterAll(() => restoreDomGlobals());
|
|
47
|
+
|
|
48
|
+
beforeEach(() => {
|
|
49
|
+
mounted.value = null;
|
|
50
|
+
requests.length = 0;
|
|
51
|
+
container = document.body.appendChild(document.createElement('div'));
|
|
52
|
+
});
|
|
53
|
+
afterEach(() => {
|
|
54
|
+
render(null, container);
|
|
55
|
+
container.remove();
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
/** Render the real hook for one chat and one probe ladder. */
|
|
59
|
+
async function mount(sessionId: string, modeChoices = LADDER): Promise<ChatTimelineModes> {
|
|
60
|
+
function Inner() {
|
|
61
|
+
mounted.value = useChatTimelineModes(sessionId, { harness: 'claude', modeChoices });
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
await act(async () => {
|
|
65
|
+
render(h(Inner, {}), container);
|
|
66
|
+
});
|
|
67
|
+
for (let i = 0; i < 5; i += 1) await act(async () => {});
|
|
68
|
+
return mounted.value as ChatTimelineModes;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
describe('pendingSessionMode', () => {
|
|
72
|
+
test('an empty ladder is nothing to choose from', () => {
|
|
73
|
+
expect(pendingSessionMode(undefined, 'code')).toBeNull();
|
|
74
|
+
expect(pendingSessionMode({ choices: [] }, 'code')).toBeNull();
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
test('an unknown current is EMPTY, never the first advertised value', () => {
|
|
78
|
+
// Drawing `ask` as current would claim a selection the agent never made; the
|
|
79
|
+
// spawn sends nothing and the agent keeps its own default.
|
|
80
|
+
expect(pendingSessionMode({ choices: LADDER }, null)).toEqual({ currentValue: '', values: LADDER });
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
test("the probe's own current values stands until the operator picks", () => {
|
|
84
|
+
expect(pendingSessionMode({ choices: LADDER, current: 'code' }, null)?.currentValue).toBe('code');
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
test('a pick wins, and a value the agent does not offer is ignored', () => {
|
|
88
|
+
expect(pendingSessionMode({ choices: LADDER, current: 'code' }, 'architect')?.currentValue).toBe('architect');
|
|
89
|
+
// A stale pick from another agent's ladder must not be sent to this one.
|
|
90
|
+
expect(pendingSessionMode({ choices: LADDER, current: 'code' }, 'bypass')?.currentValue).toBe('code');
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
describe('useChatTimelineModes on a pending chat', () => {
|
|
95
|
+
test('draws the picked agent ladder before any session exists', async () => {
|
|
96
|
+
const modes = await mount('new-1');
|
|
97
|
+
expect(modes.sessionMode?.values.map((choice) => choice.value)).toEqual(['ask', 'code', 'architect']);
|
|
98
|
+
// A pending chat has no record to read.
|
|
99
|
+
expect(requests.filter((request) => request.url.includes('/modes'))).toHaveLength(0);
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
test('records the pick for the spawn instead of POSTing it', async () => {
|
|
103
|
+
const modes = await mount('new-1');
|
|
104
|
+
await act(async () => modes.onSelectSessionMode?.('architect'));
|
|
105
|
+
const after = mounted.value as ChatTimelineModes;
|
|
106
|
+
expect(after.sessionMode?.currentValue).toBe('architect');
|
|
107
|
+
// The send path reads this ref; the server has heard nothing, because
|
|
108
|
+
// `/api/agent/new-1` answers 404 and the click would silently vanish.
|
|
109
|
+
expect(after.pendingAgentModeRef.current).toBe('architect');
|
|
110
|
+
expect(requests.filter((request) => request.method === 'POST')).toHaveLength(0);
|
|
111
|
+
});
|
|
112
|
+
|
|
113
|
+
test('a pick does not follow the user to another pending chat', async () => {
|
|
114
|
+
const first = await mount('new-1');
|
|
115
|
+
await act(async () => first.onSelectSessionMode?.('code'));
|
|
116
|
+
const other = await mount('new-2');
|
|
117
|
+
expect(other.sessionMode?.currentValue).toBe('');
|
|
118
|
+
expect(other.pendingAgentModeRef.current).toBeNull();
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
test('a different agent ladder drops the pick, because it never offered it', async () => {
|
|
122
|
+
const first = await mount('new-1');
|
|
123
|
+
await act(async () => first.onSelectSessionMode?.('architect'));
|
|
124
|
+
const swapped = await mount('new-1', [{ value: 'ask', name: 'Ask' }, { value: 'code', name: 'Code' }]);
|
|
125
|
+
expect(swapped.sessionMode?.currentValue).toBe('');
|
|
126
|
+
expect(swapped.pendingAgentModeRef.current).toBeNull();
|
|
127
|
+
});
|
|
128
|
+
|
|
129
|
+
test('a spawned chat draws the LIVE selector, not the probe', async () => {
|
|
130
|
+
// `sess-1` is not pending: the mode surface comes from the session's own
|
|
131
|
+
// record (the route answers {}), so a probe ladder must not stand in for it.
|
|
132
|
+
const modes = await mount('sess-1');
|
|
133
|
+
expect(modes.sessionMode).toBeNull();
|
|
134
|
+
expect(modes.pendingAgentModeRef.current).toBeNull();
|
|
135
|
+
});
|
|
136
|
+
});
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The ACP mode a chat with NO session can still choose.
|
|
8
|
+
*
|
|
9
|
+
* A pending `new-…` chat has no child to command, so the composer's mode
|
|
10
|
+
* control used to be empty until the first prompt spawned — picking a harness
|
|
11
|
+
* from the dropdown changed the model list but left the mode surface on the
|
|
12
|
+
* previous agent's (or on nothing at all). The harness PROBE already publishes
|
|
13
|
+
* the agent's ladder, so the control can be drawn and the pick recorded before
|
|
14
|
+
* the spawn exists; the pick then rides the spawn exactly as the model and
|
|
15
|
+
* harness picks do (`SpawnOptions.sessionMode`).
|
|
16
|
+
*
|
|
17
|
+
* Split from `modes.ts` for the repo's per-file ceiling, and the seam is real:
|
|
18
|
+
* this is the only state that exists BEFORE a session does.
|
|
19
|
+
*/
|
|
20
|
+
|
|
21
|
+
import { useCallback, useEffect, useRef, useState } from 'preact/hooks';
|
|
22
|
+
import { isPendingSessionId } from '@/shared/lib/omp/session/default-title';
|
|
23
|
+
import { pendingSessionMode, type SessionModeState } from '@/shared/lib/harness/session-modes';
|
|
24
|
+
import type { ModeCapabilities } from '@/client/hooks/chat/timeline/mode-availability';
|
|
25
|
+
|
|
26
|
+
export interface PendingSessionMode {
|
|
27
|
+
/** The selector to draw, or null when the agent publishes no ladder. */
|
|
28
|
+
mode: SessionModeState | null;
|
|
29
|
+
/** Record a pick. There is no child to command, so it is held for the spawn. */
|
|
30
|
+
select: (value: string) => void;
|
|
31
|
+
/** The value the spawn must request, read by the send path. */
|
|
32
|
+
spawnRef: { current: string | null };
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export function usePendingSessionMode(
|
|
36
|
+
sessionId: string | null,
|
|
37
|
+
capabilities: ModeCapabilities,
|
|
38
|
+
): PendingSessionMode {
|
|
39
|
+
const [picked, setPicked] = useState<string | null>(null);
|
|
40
|
+
const spawnRef = useRef<string | null>(null);
|
|
41
|
+
const ladder = capabilities.modeChoices;
|
|
42
|
+
// The value the spawn must request: the operator's pick, but only while the
|
|
43
|
+
// CURRENT agent still offers it. Derived at render (the same pattern the mode
|
|
44
|
+
// toggles use for their own mirrors) so the ref can never hold a value this
|
|
45
|
+
// agent does not take, not even for the render before an effect would clear it.
|
|
46
|
+
const offered = picked && ladder?.some((choice) => choice.value === picked) ? picked : null;
|
|
47
|
+
spawnRef.current = isPendingSessionId(sessionId) ? offered : null;
|
|
48
|
+
// A different agent's ladder is a different choice: a pick made on one is not
|
|
49
|
+
// a pick on the other. Keyed by the chat too, so a pick does not follow the
|
|
50
|
+
// user to another pending chat.
|
|
51
|
+
const ladderKey = `${sessionId ?? ''}\u0000${(ladder ?? []).map((choice) => choice.value).join(',')}`;
|
|
52
|
+
useEffect(() => {
|
|
53
|
+
setPicked(null);
|
|
54
|
+
}, [ladderKey]);
|
|
55
|
+
|
|
56
|
+
const select = useCallback((value: string) => {
|
|
57
|
+
setPicked(value);
|
|
58
|
+
}, []);
|
|
59
|
+
|
|
60
|
+
const mode = isPendingSessionId(sessionId)
|
|
61
|
+
? pendingSessionMode(
|
|
62
|
+
ladder && ladder.length > 0
|
|
63
|
+
? { choices: ladder, ...(capabilities.modeCurrent ? { current: capabilities.modeCurrent } : {}) }
|
|
64
|
+
: undefined,
|
|
65
|
+
offered,
|
|
66
|
+
)
|
|
67
|
+
: null;
|
|
68
|
+
return { mode, select, spawnRef };
|
|
69
|
+
}
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The pending chat's warm: WHAT it warms, WHEN it re-fires, and what it leaves
|
|
8
|
+
* alone.
|
|
9
|
+
*
|
|
10
|
+
* Three rules, each one a measured cost when it is dropped:
|
|
11
|
+
*
|
|
12
|
+
* - the HARNESS rides the request, because a pending chat on an ACP agent must
|
|
13
|
+
* warm that agent (the pool is chosen server-side by this field);
|
|
14
|
+
* - the cwd is the SEND path's cwd (worktree pick, then the folder's project
|
|
15
|
+
* path), because a warm child in another directory is a spawn AND a kill;
|
|
16
|
+
* - a render that changed none of those facts fires nothing, because the
|
|
17
|
+
* composer re-renders on every keystroke.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test } from 'bun:test';
|
|
21
|
+
import { Window } from 'happy-dom';
|
|
22
|
+
import { h, render } from 'preact';
|
|
23
|
+
import { useState } from 'preact/hooks';
|
|
24
|
+
import { act } from 'preact/test-utils';
|
|
25
|
+
|
|
26
|
+
import { usePendingWarmup, type PendingWarmupInput } from '@/client/hooks/chat/timeline/pending-warmup';
|
|
27
|
+
import { installDomGlobals, restoreDomGlobals } from '@/test-support/pristine-globals';
|
|
28
|
+
import { primeKabmoSettings } from '@/shared/lib/settings/client';
|
|
29
|
+
import type { WorkspaceFolderData } from '@/shared/types';
|
|
30
|
+
|
|
31
|
+
let container: HTMLElement;
|
|
32
|
+
const calls: Array<Record<string, unknown>> = [];
|
|
33
|
+
|
|
34
|
+
beforeAll(() => {
|
|
35
|
+
installDomGlobals(new Window({ url: 'http://localhost' }));
|
|
36
|
+
globalThis.fetch = ((input: unknown, init?: { body?: string }) => {
|
|
37
|
+
if (String(input).endsWith('/api/agent/prewarm')) calls.push(JSON.parse(String(init?.body)) as Record<string, unknown>);
|
|
38
|
+
return Promise.resolve(new Response('{}', { status: 200 }));
|
|
39
|
+
}) as unknown as typeof fetch;
|
|
40
|
+
});
|
|
41
|
+
afterAll(() => restoreDomGlobals());
|
|
42
|
+
|
|
43
|
+
beforeEach(() => {
|
|
44
|
+
calls.length = 0;
|
|
45
|
+
container = document.body.appendChild(document.createElement('div'));
|
|
46
|
+
// A settings snapshot, so the access pick is a stated constant.
|
|
47
|
+
primeKabmoSettings({ omp_access_mode: 'yolo' });
|
|
48
|
+
});
|
|
49
|
+
afterEach(() => {
|
|
50
|
+
render(null, container);
|
|
51
|
+
container.remove();
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
const FOLDERS = [
|
|
55
|
+
{ id: 1, name: 'ws', project_path: '/work/alpha' },
|
|
56
|
+
{ id: 2, name: 'no-project', project_path: null },
|
|
57
|
+
] as unknown as WorkspaceFolderData[];
|
|
58
|
+
|
|
59
|
+
async function mount(input: Partial<PendingWarmupInput> = {}) {
|
|
60
|
+
function Probe() {
|
|
61
|
+
usePendingWarmup({
|
|
62
|
+
sessionId: 'new-1',
|
|
63
|
+
folders: FOLDERS,
|
|
64
|
+
selectedFolderId: 1,
|
|
65
|
+
worktreePath: null,
|
|
66
|
+
harness: undefined,
|
|
67
|
+
plan: false,
|
|
68
|
+
...input,
|
|
69
|
+
});
|
|
70
|
+
return null;
|
|
71
|
+
}
|
|
72
|
+
await act(async () => {
|
|
73
|
+
render(h(Probe, {}), container);
|
|
74
|
+
});
|
|
75
|
+
// The trigger is fire-and-forget; one microtask turn lands the request.
|
|
76
|
+
await act(async () => {});
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
describe('usePendingWarmup', () => {
|
|
80
|
+
test('warms the selected folder in omp’s pool by default', async () => {
|
|
81
|
+
await mount();
|
|
82
|
+
expect(calls).toEqual([
|
|
83
|
+
{ cwd: '/work/alpha', harness: 'omp-rpc', accessMode: 'yolo', modes: { plan: false, goal: false } },
|
|
84
|
+
]);
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
test('an ACP pick names its harness, so that agent is the one booted', async () => {
|
|
88
|
+
await mount({ harness: 'claude' });
|
|
89
|
+
expect(calls).toEqual([
|
|
90
|
+
{ cwd: '/work/alpha', harness: 'claude', accessMode: 'yolo', modes: { plan: false, goal: false } },
|
|
91
|
+
]);
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
test('a Plan pick rides the warm, because omp reads it at start', async () => {
|
|
95
|
+
await mount({ plan: true });
|
|
96
|
+
expect(calls).toEqual([
|
|
97
|
+
{ cwd: '/work/alpha', harness: 'omp-rpc', accessMode: 'yolo', modes: { plan: true, goal: false } },
|
|
98
|
+
]);
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
test('the worktree pick wins over the folder, exactly as the send resolves it', async () => {
|
|
102
|
+
await mount({ worktreePath: '/work/alpha-wt/feature' });
|
|
103
|
+
expect(calls[0]?.cwd).toBe('/work/alpha-wt/feature');
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
test('a folder with no project path warms its own directory', async () => {
|
|
107
|
+
await mount({ selectedFolderId: 2 });
|
|
108
|
+
expect(calls[0]?.cwd).toBe('no-project');
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
test('a spawned chat warms nothing — there is no boot left to hide', async () => {
|
|
112
|
+
await mount({ sessionId: 'sess-1' });
|
|
113
|
+
expect(calls).toEqual([]);
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
test('a re-render that moved nothing fires no second prewarm', async () => {
|
|
117
|
+
// A keystroke in the composer re-renders this hook; a second request would
|
|
118
|
+
// be a `POST /api/agent/prewarm` per character typed.
|
|
119
|
+
let rerender: () => void = () => {};
|
|
120
|
+
function Probe() {
|
|
121
|
+
const [, setTick] = useState(0);
|
|
122
|
+
rerender = () => setTick((tick) => tick + 1);
|
|
123
|
+
usePendingWarmup({
|
|
124
|
+
sessionId: 'new-1',
|
|
125
|
+
folders: FOLDERS,
|
|
126
|
+
selectedFolderId: 1,
|
|
127
|
+
worktreePath: null,
|
|
128
|
+
harness: undefined,
|
|
129
|
+
plan: false,
|
|
130
|
+
});
|
|
131
|
+
return null;
|
|
132
|
+
}
|
|
133
|
+
await act(async () => {
|
|
134
|
+
render(h(Probe, {}), container);
|
|
135
|
+
});
|
|
136
|
+
await act(async () => {
|
|
137
|
+
rerender();
|
|
138
|
+
});
|
|
139
|
+
expect(calls).toHaveLength(1);
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
test('a harness change re-fires, because a different agent is a different child', async () => {
|
|
143
|
+
await mount({ harness: 'omp-rpc' });
|
|
144
|
+
await mount({ harness: 'codex' });
|
|
145
|
+
expect(calls.map((call) => call.harness)).toEqual(['omp-rpc', 'codex']);
|
|
146
|
+
});
|
|
147
|
+
});
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Warm the agent a PENDING chat will spawn on, and re-warm it when a pick that
|
|
8
|
+
* decides the boot moves.
|
|
9
|
+
*
|
|
10
|
+
* The sidebar's New Session click already warms omp's RPC child, but it cannot
|
|
11
|
+
* know which agent the chat will end up on: the harness is picked in the
|
|
12
|
+
* composer, and a Plan pick changes the environment omp's child must start
|
|
13
|
+
* with. Both are known here, and both are known BEFORE the first prompt — so
|
|
14
|
+
* the boot happens while the prompt is being written instead of after it.
|
|
15
|
+
*
|
|
16
|
+
* One effect keyed by the facts that decide WHICH process is warmed. The server
|
|
17
|
+
* recycles an entry that can no longer serve the request (a different approval
|
|
18
|
+
* mode or mode selection for omp; a different harness for ACP), so a re-fire is
|
|
19
|
+
* a replacement, not a second process.
|
|
20
|
+
*/
|
|
21
|
+
|
|
22
|
+
import { useEffect } from 'preact/hooks';
|
|
23
|
+
import { isPendingSessionId } from '@/shared/lib/omp/session/default-title';
|
|
24
|
+
import { triggerSessionPrewarm } from '@/shared/lib/omp/session/prewarm';
|
|
25
|
+
import type { WorkspaceFolderData } from '@/shared/types';
|
|
26
|
+
|
|
27
|
+
export interface PendingWarmupInput {
|
|
28
|
+
sessionId: string | null;
|
|
29
|
+
folders: WorkspaceFolderData[];
|
|
30
|
+
selectedFolderId: number | null;
|
|
31
|
+
/** The worktree the draft picked, when it did — the spawn's real cwd. */
|
|
32
|
+
worktreePath: string | null;
|
|
33
|
+
/** The harness the chat will spawn on; absent means omp's RPC transport. */
|
|
34
|
+
harness: string | undefined;
|
|
35
|
+
/** The pending chat's Plan pick, which omp's child reads at start. */
|
|
36
|
+
plan: boolean;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export function usePendingWarmup({
|
|
40
|
+
sessionId,
|
|
41
|
+
folders,
|
|
42
|
+
selectedFolderId,
|
|
43
|
+
worktreePath,
|
|
44
|
+
harness,
|
|
45
|
+
plan,
|
|
46
|
+
}: PendingWarmupInput): void {
|
|
47
|
+
// The send path's own rule (`dispatchPendingChat`), read off the SAME field:
|
|
48
|
+
// the worktree pick wins, then the selected folder's project path. Resolving
|
|
49
|
+
// it any other way warms a process in a cwd the send never claims — a spawn
|
|
50
|
+
// AND a kill for nothing.
|
|
51
|
+
const pending = isPendingSessionId(sessionId);
|
|
52
|
+
const folder = folders.find((row) => String(row.id) === String(selectedFolderId));
|
|
53
|
+
const cwd = pending ? worktreePath ?? folder?.project_path ?? folder?.name ?? null : null;
|
|
54
|
+
const key = `${cwd ?? ''}\u0000${harness ?? 'omp-rpc'}\u0000${plan ? 'plan' : ''}`;
|
|
55
|
+
useEffect(() => {
|
|
56
|
+
if (!cwd) return;
|
|
57
|
+
triggerSessionPrewarm(cwd, { harness: harness ?? 'omp-rpc', modes: { plan, goal: false } });
|
|
58
|
+
// `key` carries every input; a re-render that changed none of them must not
|
|
59
|
+
// fire another prewarm.
|
|
60
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
61
|
+
}, [key]);
|
|
62
|
+
}
|
|
@@ -40,6 +40,18 @@ describe('runIdentityFor', () => {
|
|
|
40
40
|
expect(identity).toEqual({ sessionProvider: 'p', sessionModelName: 'served' });
|
|
41
41
|
});
|
|
42
42
|
|
|
43
|
+
test('a live run whose row carries no model still names the session model', () => {
|
|
44
|
+
// A `stream` row written by a frame has no pair; the metadata still names
|
|
45
|
+
// the run, and discarding it read `Loading…` for the whole answer.
|
|
46
|
+
const identity = runIdentityFor({
|
|
47
|
+
folders: [folder({ id: 's1', streamStatus: 'stream', runModel: null })],
|
|
48
|
+
sessionId: 's1',
|
|
49
|
+
sessionData: { model: { provider: 'p', modelId: 'known' } },
|
|
50
|
+
modelNames: { known: 'Known' },
|
|
51
|
+
});
|
|
52
|
+
expect(identity).toEqual({ sessionProvider: 'p', sessionModelName: 'Known' });
|
|
53
|
+
});
|
|
54
|
+
|
|
43
55
|
test('falls back to the run row when the session metadata has no model', () => {
|
|
44
56
|
const identity = runIdentityFor({
|
|
45
57
|
folders: [folder({ id: 's1', streamStatus: 'finish', runModel: { provider: 'p', modelId: 'last' } })],
|
|
@@ -39,10 +39,13 @@ export function runIdentityFor(input: RunIdentityInput): RunIdentity {
|
|
|
39
39
|
// never reached it, so the footer and the composer kept naming the first
|
|
40
40
|
// model the chat ever picked. An idle chat reads the session's own metadata,
|
|
41
41
|
// which `/api/chat/:id` re-reads from the live agent on a `model_changed`.
|
|
42
|
+
//
|
|
43
|
+
// A live row is preferred, not trusted blindly: a row written by a frame can
|
|
44
|
+
// carry no pair, and the session metadata then names the run instead.
|
|
42
45
|
const liveRun = sidebar?.streamStatus === 'stream';
|
|
43
46
|
const fallback = sessionData?.model;
|
|
44
47
|
const fallbackModel = typeof fallback === 'object' ? fallback : null;
|
|
45
|
-
const chosen = liveRun ? runModel : (fallbackModel ?? runModel);
|
|
48
|
+
const chosen = liveRun ? (runModel ?? fallbackModel) : (fallbackModel ?? runModel);
|
|
46
49
|
return {
|
|
47
50
|
sessionProvider: chosen?.provider,
|
|
48
51
|
sessionModelName: chosen?.modelId
|