@kabmo-labs/kabmo 0.26.0 → 0.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +502 -474
- package/dist/client/static/js/index-81f7berm.css +1 -0
- package/dist/client/static/js/{index-95b3n20k.js → index-xzvyrxya.js} +799 -799
- package/marketplace/plugins/command-runner/package.json +3 -17
- package/marketplace/plugins/command-runner/settings-schema.json +14 -0
- package/marketplace/plugins/git-forge/README.md +17 -7
- package/marketplace/plugins/git-forge/package.json +4 -30
- package/marketplace/plugins/git-forge/panel.css +16 -0
- package/marketplace/plugins/git-forge/settings-schema.json +27 -0
- package/marketplace/plugins/git-forge/src/panel/Badge.tsx +35 -22
- package/marketplace/plugins/git-forge/src/panel/Change.tsx +20 -24
- package/marketplace/plugins/git-forge/src/panel/CiBadge.tsx +16 -7
- package/marketplace/plugins/git-forge/src/panel/Credential.tsx +31 -26
- package/marketplace/plugins/git-forge/src/panel/Glyph.tsx +18 -2
- package/marketplace/plugins/git-forge/src/panel/Header.tsx +160 -96
- package/marketplace/plugins/git-forge/src/panel/ItemView.tsx +60 -44
- package/marketplace/plugins/git-forge/src/panel/List.tsx +150 -22
- package/marketplace/plugins/git-forge/src/panel/Row.tsx +11 -5
- package/marketplace/plugins/git-forge/src/panel/Sidebar.tsx +17 -15
- package/marketplace/plugins/git-forge/src/panel/Write.tsx +84 -61
- package/marketplace/plugins/git-forge/src/panel/format.test.ts +99 -0
- package/marketplace/plugins/git-forge/src/panel/format.ts +59 -16
- package/marketplace/plugins/git-forge/src/panel/index.test.tsx +109 -5
- package/marketplace/plugins/git-forge/src/panel/index.tsx +37 -4
- package/marketplace/plugins/git-forge/src/panel/use-forge.ts +17 -0
- package/marketplace/plugins/git-forge/src/panel/write.test.tsx +31 -0
- package/marketplace/plugins/session-info/package.json +2 -10
- package/marketplace/plugins/session-info/settings-schema.json +8 -0
- package/marketplace/plugins/stats/README.md +17 -5
- package/marketplace/plugins/stats/package.json +3 -23
- package/marketplace/plugins/stats/settings-schema.json +20 -0
- package/marketplace/plugins/stats/src/app.tsx +1 -1
- package/marketplace/plugins/stats/src/groups.test.ts +46 -1
- package/marketplace/plugins/stats/src/groups.ts +22 -11
- package/marketplace/plugins/stats/src/harness-leases.test.ts +84 -0
- package/marketplace/plugins/stats/src/harness-leases.ts +132 -0
- package/marketplace/plugins/stats/src/labels.test.ts +54 -1
- package/marketplace/plugins/stats/src/labels.ts +33 -7
- package/marketplace/plugins/stats/src/sampler.test.ts +61 -0
- package/marketplace/plugins/stats/src/sampler.ts +39 -5
- package/marketplace/plugins/stats/src/snapshot.ts +6 -0
- package/package.json +2 -2
- package/src/client/components/common/Toast.test.tsx +28 -2
- package/src/client/components/common/Toast.tsx +21 -9
- package/src/client/components/common/harness-glyph/index.tsx +18 -1
- package/src/client/components/common/session-actions-menu/index.test.tsx +106 -0
- package/src/client/components/common/session-actions-menu/index.tsx +43 -1
- package/src/client/components/common/session-row/TrailingSlot.tsx +9 -4
- package/src/client/components/common/session-row/index.tsx +4 -0
- package/src/client/components/common/session-row/session-row.test.tsx +6 -0
- package/src/client/components/layout/desktop-layout/LeftColumn.tsx +2 -1
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +4 -2
- package/src/client/components/layout/session-sidebar/SessionItem.tsx +9 -1
- package/src/client/components/layout/session-sidebar/SessionList.tsx +2 -1
- package/src/client/components/layout/session-sidebar/about-modal/UpdateSection.tsx +3 -2
- package/src/client/components/layout/session-sidebar/about-modal/index.tsx +2 -1
- package/src/client/components/layout/session-sidebar/modern/RevealRow.tsx +56 -0
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +12 -29
- package/src/client/components/layout/session-sidebar/modern/reveal-row.test.tsx +104 -0
- package/src/client/components/layout/session-sidebar/scheduler-modal/ModelFields.tsx +202 -0
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskForm.tsx +80 -19
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskList.tsx +23 -3
- package/src/client/components/layout/session-sidebar/scheduler-modal/index.tsx +5 -1
- package/src/client/components/layout/session-sidebar/variant-props.ts +2 -1
- package/src/client/components/mobile/SessionSidebar.tsx +2 -1
- package/src/client/components/mobile/mobile-right-sidebar/EditorSurface.tsx +156 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +41 -86
- package/src/client/components/mobile/mobile-session-sidebar/ClassicDrawer.tsx +2 -1
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +4 -2
- package/src/client/components/mobile/mobile-session-sidebar/List.tsx +2 -1
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.test.ts +6 -0
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.tsx +9 -1
- package/src/client/components/settings/Modal.tsx +7 -3
- package/src/client/components/settings/Sidebar.tsx +30 -3
- package/src/client/components/settings/categories/HarnessSettings.tsx +11 -7
- package/src/client/components/settings/categories/NotificationSettings.test.tsx +40 -15
- package/src/client/components/settings/categories/NotificationSettings.tsx +142 -64
- package/src/client/components/settings/categories/PanelPluginSettings.tsx +1 -1
- package/src/client/components/settings/categories/harness-settings/CustomHarnessForm.tsx +186 -0
- package/src/client/components/settings/categories/panel-plugins/InstalledList.tsx +11 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.test.tsx +1 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.tsx +15 -1
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.test.tsx +165 -0
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.tsx +260 -0
- package/src/client/components/settings/categories/project-settings/WorktreeSettings.tsx +2 -1
- package/src/client/components/settings/categories/usage-settings/LimitsSection.tsx +39 -19
- package/src/client/components/settings/categories/usage-settings/ProviderDetail.tsx +1 -0
- package/src/client/components/settings/categories/usage-settings/limit-groups.test.ts +94 -0
- package/src/client/components/settings/categories/usage-settings/limit-groups.ts +118 -0
- package/src/client/components/settings/categories/usage-settings/limits-section.test.tsx +118 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.fork.test.ts +24 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.tsx +8 -4
- package/src/client/components/workspace/chat-timeline/ComposerDock.tsx +34 -0
- package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +61 -56
- package/src/client/components/workspace/chat-timeline/MessageItem.fork.test.ts +80 -0
- package/src/client/components/workspace/chat-timeline/MessageItem.tsx +9 -3
- package/src/client/components/workspace/chat-timeline/MessageList.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/PendingChatView.tsx +11 -1
- package/src/client/components/workspace/chat-timeline/PendingTranscript.tsx +130 -0
- package/src/client/components/workspace/chat-timeline/RunFooter.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/TimelineBody.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/chat-input/ComposerRows.tsx +8 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.test.tsx +9 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.tsx +4 -1
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +24 -0
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.tsx +13 -20
- package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +2 -0
- package/src/client/components/workspace/chat-timeline/chat-input/props.ts +5 -5
- package/src/client/components/workspace/chat-timeline/fork-preview.test.tsx +141 -0
- package/src/client/components/workspace/chat-timeline/index.tsx +17 -6
- package/src/client/components/workspace/chat-timeline/target-picker/DraftTargetRow.tsx +3 -10
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.test.tsx +101 -0
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.tsx +2 -2
- package/src/client/components/workspace/chat-timeline/target-picker/WorktreePicker.tsx +5 -4
- package/src/client/components/workspace/editor/FilePane.tsx +9 -4
- package/src/client/components/workspace/editor/Notices.tsx +2 -2
- package/src/client/components/workspace/editor/Pane.tsx +2 -2
- package/src/client/components/workspace/editor/Toolbar.tsx +16 -10
- package/src/client/components/workspace/editor/index.tsx +6 -10
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +4 -3
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +23 -14
- package/src/client/components/workspace/git-panel/index.tsx +2 -2
- package/src/client/components/workspace/terminal-panel/RealtimeTerminalView.tsx +17 -6
- package/src/client/components/workspace/terminal-panel/focus.test.ts +70 -0
- package/src/client/components/workspace/terminal-panel/focus.ts +46 -0
- package/src/client/components/workspace/terminal-panel/index.tsx +17 -1
- package/src/client/components/workspace/terminal-panel/mount.ts +17 -9
- package/src/client/components/workspace/terminal-panel/scroll-hold.test.ts +158 -0
- package/src/client/components/workspace/terminal-panel/scroll-hold.ts +136 -0
- package/src/client/hooks/chat/composer/use-draft.ts +45 -1
- package/src/client/hooks/chat/omp/pending-sessions.waiting.test.ts +11 -10
- package/src/client/hooks/chat/omp/pending-waiting.ts +15 -7
- package/src/client/hooks/chat/omp/prompt-send.test.ts +11 -0
- package/src/client/hooks/chat/omp/prompt-send.ts +3 -0
- package/src/client/hooks/chat/omp/session-list.tsx +5 -0
- package/src/client/hooks/chat/omp/sidebar-reload.test.ts +85 -0
- package/src/client/hooks/chat/omp/sidebar-reload.ts +30 -0
- package/src/client/hooks/chat/timeline/actions.ts +4 -4
- package/src/client/hooks/chat/timeline/composer-modes.ts +13 -2
- package/src/client/hooks/chat/timeline/fork-open.ts +52 -0
- package/src/client/hooks/chat/timeline/fork-preview.test.ts +148 -0
- package/src/client/hooks/chat/timeline/fork-preview.ts +104 -0
- package/src/client/hooks/chat/timeline/fork-send.test.ts +139 -0
- package/src/client/hooks/chat/timeline/index.ts +5 -2
- package/src/client/hooks/chat/timeline/mode-availability.ts +7 -0
- package/src/client/hooks/chat/timeline/modes-contract.ts +6 -0
- package/src/client/hooks/chat/timeline/modes-hydrate.ts +93 -0
- package/src/client/hooks/chat/timeline/modes.ts +32 -52
- package/src/client/hooks/chat/timeline/new-chat-open.ts +7 -6
- package/src/client/hooks/chat/timeline/new-chat.ts +10 -1
- package/src/client/hooks/chat/timeline/pending-branch.ts +9 -0
- package/src/client/hooks/chat/timeline/pending-dispatch.ts +53 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.test.ts +136 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.ts +69 -0
- package/src/client/hooks/chat/timeline/pending-warmup.test.ts +147 -0
- package/src/client/hooks/chat/timeline/pending-warmup.ts +62 -0
- package/src/client/hooks/chat/timeline/run-identity.test.ts +12 -0
- package/src/client/hooks/chat/timeline/run-identity.ts +4 -1
- package/src/client/hooks/chat/timeline/send-props.ts +2 -0
- package/src/client/hooks/chat/timeline/send-steer.test.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test-util.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test.ts +1 -0
- package/src/client/hooks/chat/timeline/session-harness.ts +4 -0
- package/src/client/hooks/chat/timeline/stop-with-queue.ts +1 -1
- package/src/client/hooks/chat/timeline/use-fork-session.ts +9 -22
- package/src/client/hooks/chat/waiting/cancel.ts +15 -7
- package/src/client/hooks/chat/waiting/choice.ts +13 -16
- package/src/client/hooks/chat/waiting/composer-wait.ts +70 -0
- package/src/client/hooks/chat/waiting/dispatch.ts +50 -29
- package/src/client/hooks/chat/waiting/held.ts +38 -13
- package/src/client/hooks/chat/waiting/hold.test.ts +22 -0
- package/src/client/hooks/chat/waiting/hold.ts +20 -11
- package/src/client/hooks/chat/waiting/restore.test.ts +69 -0
- package/src/client/hooks/chat/waiting/restore.ts +34 -0
- package/src/client/hooks/chat/waiting/store.ts +9 -3
- package/src/client/hooks/editor/file-editor-types.ts +21 -12
- package/src/client/hooks/editor/save-file.test.ts +1 -1
- package/src/client/hooks/editor/save-file.ts +35 -8
- package/src/client/hooks/editor/target-key.ts +17 -0
- package/src/client/hooks/editor/use-disk-digest.test.ts +82 -0
- package/src/client/hooks/editor/use-disk-digest.ts +164 -0
- package/src/client/hooks/editor/use-disk-sync.ts +212 -0
- package/src/client/hooks/editor/use-file-cache.ts +113 -0
- package/src/client/hooks/editor/use-file-editor.test.ts +90 -0
- package/src/client/hooks/editor/use-file-editor.ts +90 -52
- package/src/client/hooks/editor/use-file-read.ts +24 -10
- package/src/client/hooks/editor/use-file-writes.ts +4 -4
- package/src/client/hooks/models/harness-catalog.ts +15 -0
- package/src/client/hooks/settings/providers/actions.ts +3 -2
- package/src/client/hooks/settings/providers/messages.ts +9 -7
- package/src/client/hooks/settings/providers/model-actions.ts +2 -1
- package/src/client/hooks/ui/editor-error-toast.ts +2 -1
- package/src/client/hooks/ui/notifications.ts +17 -8
- package/src/client/hooks/workspace/batch-archive.test.ts +2 -2
- package/src/client/hooks/workspace/batch-archive.ts +4 -2
- package/src/client/hooks/workspace/git-action-outcome.ts +4 -3
- package/src/client/hooks/workspace/navbar-session-actions.ts +2 -1
- package/src/client/hooks/workspace/panel-registry.ts +1 -1
- package/src/client/hooks/workspace/scheduled-tasks.ts +26 -11
- package/src/client/hooks/workspace/session-actions.test.ts +2 -1
- package/src/client/hooks/workspace/session-actions.ts +2 -1
- package/src/client/hooks/workspace/terminal/connection.test.ts +63 -0
- package/src/client/hooks/workspace/terminal/connection.ts +47 -0
- package/src/client/hooks/workspace/terminal/index.ts +35 -4
- package/src/client/hooks/workspace/workspace-folder-actions.ts +2 -1
- package/src/client/lib/notifications/os.test.ts +1 -30
- package/src/client/lib/notifications/os.ts +0 -15
- package/src/client/lib/notifications/platform.test.ts +68 -0
- package/src/client/lib/notifications/platform.ts +36 -0
- package/src/server/index.ts +7 -0
- package/src/server/lib/harness/acp/client.ts +81 -87
- package/src/server/lib/harness/acp/prewarm.server.ts +237 -0
- package/src/server/lib/harness/acp/prewarm.test.ts +171 -0
- package/src/server/lib/harness/acp/prompt.test.ts +70 -1
- package/src/server/lib/harness/acp/prompt.ts +32 -1
- package/src/server/lib/harness/acp/protocol.ts +23 -0
- package/src/server/lib/harness/acp/session-handshake.test.ts +26 -0
- package/src/server/lib/harness/acp/session-handshake.ts +22 -20
- package/src/server/lib/harness/acp/session-options.ts +16 -0
- package/src/server/lib/harness/acp/session-process.ts +43 -0
- package/src/server/lib/harness/acp/session.ts +11 -12
- package/src/server/lib/harness/acp/stdio.ts +129 -0
- package/src/server/lib/harness/acp/verbs.test.ts +97 -0
- package/src/server/lib/harness/acp/verbs.ts +16 -6
- package/src/server/lib/harness/auto-probe.server.ts +4 -3
- package/src/server/lib/harness/capabilities.ts +8 -0
- package/src/server/lib/harness/config.server.ts +3 -2
- package/src/server/lib/harness/custom.server.ts +209 -0
- package/src/server/lib/harness/launch.ts +6 -1
- package/src/server/lib/harness/register.server.ts +8 -1
- package/src/server/lib/harness/schema.server.ts +21 -0
- package/src/server/lib/harness/session-lease.server.test.ts +99 -0
- package/src/server/lib/harness/session-lease.server.ts +193 -0
- package/src/server/lib/harness/session-store.server.test.ts +8 -8
- package/src/server/lib/harness/session-store.server.ts +25 -4
- package/src/server/lib/harness/session-title.server.ts +12 -2
- package/src/server/lib/harness/spawn.server.ts +123 -20
- package/src/server/lib/harness/update-queue.server.ts +3 -3
- package/src/server/lib/lifecycle/after-listen.ts +12 -1
- package/src/server/lib/lifecycle/paths.ts +19 -1
- package/src/server/lib/mcp/registry.server.ts +155 -0
- package/src/server/lib/mcp/registry.test.ts +169 -0
- package/src/server/lib/mcp/store.server.ts +38 -0
- package/src/server/lib/omp/rpc/frame-fold-contract.ts +59 -0
- package/src/server/lib/omp/rpc/frame-fold-frames.test.ts +64 -1
- package/src/server/lib/omp/rpc/frame-fold-host.test-util.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold.test.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold.ts +6 -45
- package/src/server/lib/omp/rpc/prewarm-pool.ts +19 -5
- package/src/server/lib/omp/rpc/run-model.test.ts +116 -0
- package/src/server/lib/omp/rpc/run-model.ts +4 -2
- package/src/server/lib/omp/session/sidebar-data.harness.test.ts +6 -3
- package/src/server/lib/omp/session/standby.server.ts +13 -2
- package/src/server/lib/panels/manifest.test.ts +47 -1
- package/src/server/lib/panels/manifest.ts +19 -0
- package/src/server/lib/panels/registry.server.ts +19 -2
- package/src/server/lib/panels/scan.server.ts +26 -2
- package/src/server/lib/panels/settings-schema.server.ts +72 -0
- package/src/server/lib/plugins/background.server.ts +21 -3
- package/src/server/lib/plugins/background.test.ts +13 -0
- package/src/server/lib/plugins/loader.server.ts +35 -51
- package/src/server/lib/plugins/mcp.server.ts +100 -0
- package/src/server/lib/plugins/mcp.test.ts +75 -0
- package/src/server/lib/plugins/schedule-runner.server.ts +153 -0
- package/src/server/lib/plugins/schedule-runner.test.ts +186 -0
- package/src/server/lib/plugins/schedule-store.server.ts +107 -0
- package/src/server/lib/plugins/schema.server.ts +8 -0
- package/src/server/lib/plugins/settings.server.ts +56 -19
- package/src/server/lib/plugins/shutdown.server.ts +58 -0
- package/src/server/lib/plugins/shutdown.test.ts +28 -3
- package/src/server/lib/realtime/topics/global.server.ts +5 -1
- package/src/server/lib/schedule/rows.server.ts +9 -0
- package/src/server/lib/schedule/runtime.server.test.ts +91 -0
- package/src/server/lib/schedule/runtime.server.ts +101 -23
- package/src/server/lib/schedule/schema.server.ts +15 -0
- package/src/server/lib/schedule/store.server.test.ts +34 -0
- package/src/server/lib/schedule/store.server.ts +33 -9
- package/src/server/lib/sessions/fork.server.test.ts +47 -0
- package/src/server/lib/sessions/fork.server.ts +17 -1
- package/src/server/lib/sessions/spawn.server.ts +2 -2
- package/src/server/lib/usage/report.server.ts +57 -0
- package/src/server/lib/waiting/runtime.server.test.ts +48 -0
- package/src/server/lib/waiting/runtime.server.ts +22 -0
- package/src/server/lib/waiting/schema.server.ts +8 -0
- package/src/server/lib/waiting/store.server.test.ts +14 -0
- package/src/server/lib/waiting/store.server.ts +6 -2
- package/src/server/routes/agent/command-resume.test.ts +9 -4
- package/src/server/routes/agent/new-mode.test.ts +40 -0
- package/src/server/routes/agent/new.ts +31 -10
- package/src/server/routes/agent/prewarm.ts +48 -7
- package/src/server/routes/fs/action.ts +9 -1
- package/src/server/routes/fs/digest.test.ts +100 -0
- package/src/server/routes/fs/digest.ts +106 -0
- package/src/server/routes/fs/index.ts +2 -0
- package/src/server/routes/fs/read.ts +6 -1
- package/src/server/routes/harness/custom.test.ts +131 -0
- package/src/server/routes/harness/import-action.ts +2 -2
- package/src/server/routes/harness/root.ts +41 -8
- package/src/server/routes/harness/update.ts +2 -2
- package/src/server/routes/panels/bindings.ts +2 -0
- package/src/server/routes/panels/settings.test.ts +165 -0
- package/src/server/routes/panels/settings.ts +106 -0
- package/src/server/routes/schedule/body.ts +14 -0
- package/src/server/routes/schedule/index.ts +28 -4
- package/src/server/routes/settings/mcp.ts +9 -26
- package/src/server/routes/waiting/index.ts +21 -2
- package/src/server/routes/waiting/routes.test.ts +21 -0
- package/src/shared/lib/chat/composer/delegation.ts +3 -3
- package/src/shared/lib/chat/timeline/fork-anchor.test.ts +97 -0
- package/src/shared/lib/chat/timeline/fork-anchor.ts +47 -0
- package/src/shared/lib/chat/timeline/fork-preview.test.ts +62 -0
- package/src/shared/lib/chat/timeline/fork-preview.ts +36 -0
- package/src/shared/lib/fs/content-hash.ts +29 -0
- package/src/shared/lib/harness/catalog.ts +48 -6
- package/src/shared/lib/harness/fork.ts +60 -0
- package/src/shared/lib/harness/mcp-facts.test.ts +30 -0
- package/src/shared/lib/harness/mcp-facts.ts +65 -0
- package/src/shared/lib/harness/menu.test.ts +16 -1
- package/src/shared/lib/harness/menu.ts +2 -2
- package/src/shared/lib/harness/rewind.ts +6 -6
- package/src/shared/lib/harness/session-modes.ts +31 -0
- package/src/shared/lib/harness/transcript.test.ts +29 -0
- package/src/shared/lib/harness/transcript.ts +19 -0
- package/src/shared/lib/notifications/settings.test.ts +21 -0
- package/src/shared/lib/notifications/settings.ts +24 -0
- package/src/shared/lib/omp/session/prewarm.test.ts +28 -4
- package/src/shared/lib/omp/session/prewarm.ts +25 -6
- package/src/shared/lib/omp/session/stream-state.server.test.ts +25 -0
- package/src/shared/lib/omp/session/stream-state.server.ts +8 -4
- package/src/shared/lib/panels/capabilities.test.ts +1 -1
- package/src/shared/lib/panels/capabilities.ts +3 -0
- package/src/shared/lib/plugins/settings.ts +22 -0
- package/src/shared/lib/schedule/parse.test.ts +48 -0
- package/src/shared/lib/schedule/parse.ts +69 -45
- package/src/shared/lib/schedule/timezone.ts +128 -0
- package/src/shared/lib/settings/defaults.ts +2 -0
- package/src/shared/lib/ui/toast-duration.test.ts +25 -1
- package/src/shared/lib/ui/toast-duration.ts +22 -4
- package/src/shared/lib/workspace/refresh-cadence.test.ts +25 -1
- package/src/shared/lib/workspace/relative-time.ts +16 -0
- package/src/shared/lib/workspace/session-state/store.ts +4 -0
- package/src/shared/types/harness.ts +7 -0
- package/src/shared/types/omp/agent.ts +6 -0
- package/src/shared/types/panels-registry.ts +3 -3
- package/src/shared/types/panels.ts +4 -2
- package/src/shared/types/schedule.ts +13 -0
- package/src/shared/types/settings/state.ts +12 -1
- package/src/shared/types/waiting.ts +9 -0
- package/src/test-support/file-editor.test-util.ts +70 -5
- package/dist/client/static/js/index-p2yw9ywf.css +0 -1
- package/src/client/hooks/editor/use-external-change-notice.ts +0 -71
- package/src/client/hooks/editor/use-external-change.test.ts +0 -88
- package/src/client/hooks/editor/use-external-change.ts +0 -146
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* A focus request that lands before the terminal exists.
|
|
8
|
+
*
|
|
9
|
+
* The panel opens its shell with `term.focus()` at the moment it becomes
|
|
10
|
+
* visible, while ghostty-web is still being imported; without the latch that
|
|
11
|
+
* request was a no-op and the first command of a freshly opened panel went
|
|
12
|
+
* nowhere. Measured on the assembled product: the panel was open, the grid was
|
|
13
|
+
* live, and typing produced no frames until the canvas was clicked.
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
import { describe, expect, test } from 'bun:test';
|
|
17
|
+
import { createFocusLatch } from '@/client/components/workspace/terminal-panel/focus';
|
|
18
|
+
|
|
19
|
+
describe('createFocusLatch', () => {
|
|
20
|
+
test('serves a request made before the terminal mounted', () => {
|
|
21
|
+
const latch = createFocusLatch();
|
|
22
|
+
let focused = 0;
|
|
23
|
+
|
|
24
|
+
latch.request();
|
|
25
|
+
expect(focused).toBe(0);
|
|
26
|
+
|
|
27
|
+
latch.attach(() => {
|
|
28
|
+
focused += 1;
|
|
29
|
+
});
|
|
30
|
+
expect(focused).toBe(1);
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
test('serves a pending request only once', () => {
|
|
34
|
+
const latch = createFocusLatch();
|
|
35
|
+
let focused = 0;
|
|
36
|
+
const focus = () => {
|
|
37
|
+
focused += 1;
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
latch.request();
|
|
41
|
+
latch.attach(focus);
|
|
42
|
+
latch.attach(focus);
|
|
43
|
+
expect(focused).toBe(1);
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
test('focuses immediately once a terminal is attached', () => {
|
|
47
|
+
const latch = createFocusLatch();
|
|
48
|
+
let focused = 0;
|
|
49
|
+
latch.attach(() => {
|
|
50
|
+
focused += 1;
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
latch.request();
|
|
54
|
+
latch.request();
|
|
55
|
+
expect(focused).toBe(2);
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
test('drops the target and the pending request on detach', () => {
|
|
59
|
+
const latch = createFocusLatch();
|
|
60
|
+
let focused = 0;
|
|
61
|
+
const focus = () => {
|
|
62
|
+
focused += 1;
|
|
63
|
+
};
|
|
64
|
+
|
|
65
|
+
latch.attach(focus);
|
|
66
|
+
latch.detach();
|
|
67
|
+
latch.request();
|
|
68
|
+
expect(focused).toBe(0);
|
|
69
|
+
});
|
|
70
|
+
});
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* A focus request the terminal could not serve yet.
|
|
8
|
+
*
|
|
9
|
+
* The panel asks for focus the moment it becomes the visible view, but the
|
|
10
|
+
* element that takes focus is created by `mountTerminal`, whose ghostty-web
|
|
11
|
+
* import resolves asynchronously. A request that lands inside that window used
|
|
12
|
+
* to be dropped: the keystrokes of a freshly opened panel went to whatever had
|
|
13
|
+
* focus before, and the user's only workaround was clicking the canvas first.
|
|
14
|
+
* The latch keeps the request until a terminal exists, then serves it once.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
export interface FocusLatch {
|
|
18
|
+
/** Ask the current terminal for focus; remembered while there is none. */
|
|
19
|
+
request: () => void;
|
|
20
|
+
/** The terminal exists now; serve a pending request and route later ones. */
|
|
21
|
+
attach: (focus: () => void) => void;
|
|
22
|
+
/** Forget the terminal — a pending request must not revive a disposed one. */
|
|
23
|
+
detach: () => void;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export function createFocusLatch(): FocusLatch {
|
|
27
|
+
let target: (() => void) | null = null;
|
|
28
|
+
let pending = false;
|
|
29
|
+
|
|
30
|
+
return {
|
|
31
|
+
request() {
|
|
32
|
+
if (target) target();
|
|
33
|
+
else pending = true;
|
|
34
|
+
},
|
|
35
|
+
attach(focus) {
|
|
36
|
+
target = focus;
|
|
37
|
+
if (!pending) return;
|
|
38
|
+
pending = false;
|
|
39
|
+
focus();
|
|
40
|
+
},
|
|
41
|
+
detach() {
|
|
42
|
+
target = null;
|
|
43
|
+
pending = false;
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useCallback, useRef, useState } from 'preact/hooks';
|
|
1
|
+
import { useCallback, useEffect, useRef, useState } from 'preact/hooks';
|
|
2
2
|
import { useTerminal } from '@/client/hooks/workspace/terminal';
|
|
3
3
|
import { useRepoList, useRepoScope } from '@/client/hooks/workspace/repo-scope';
|
|
4
4
|
import { useTheme } from '@/client/hooks/ui/theme';
|
|
@@ -53,6 +53,19 @@ export function TerminalPanel({ className = '', enabled = true, rootPath, showHe
|
|
|
53
53
|
terminalRef.current?.write(bytes);
|
|
54
54
|
}, []);
|
|
55
55
|
|
|
56
|
+
/**
|
|
57
|
+
* Opening the panel IS the intent to type, so focus follows the view becoming
|
|
58
|
+
* visible: a terminal that needs a click before it accepts keystrokes is a
|
|
59
|
+
* terminal that swallowed the first command. `active` is "selected AND the
|
|
60
|
+
* column is open" (see `PanelBodyProps`), so a collapsed column or another
|
|
61
|
+
* view on screen never points focus here, and the request survives the
|
|
62
|
+
* renderer's async mount (`focus.ts`).
|
|
63
|
+
*/
|
|
64
|
+
useEffect(() => {
|
|
65
|
+
if (!active || !enabled) return;
|
|
66
|
+
terminalRef.current?.focus();
|
|
67
|
+
}, [active, enabled]);
|
|
68
|
+
|
|
56
69
|
const handleReplay = useCallback((bytes: Uint8Array, frame: { replayCols: number; replayRows: number }) => {
|
|
57
70
|
terminalRef.current?.writeReplay(bytes, frame.replayCols, frame.replayRows);
|
|
58
71
|
}, []);
|
|
@@ -72,6 +85,9 @@ export function TerminalPanel({ className = '', enabled = true, rootPath, showHe
|
|
|
72
85
|
restart,
|
|
73
86
|
reattach,
|
|
74
87
|
} = useTerminal({
|
|
88
|
+
// "Open" is this panel being selected with its column shown; the view is
|
|
89
|
+
// mounted even when hidden, so mounting alone must never start a shell.
|
|
90
|
+
visible: active && enabled,
|
|
75
91
|
root: enabled ? rootPath : undefined,
|
|
76
92
|
repo: activeRepo,
|
|
77
93
|
theme: isDark ? 'dark' : 'light',
|
|
@@ -47,6 +47,7 @@ import {
|
|
|
47
47
|
import { installFullWidthFit } from '@/client/components/workspace/terminal-panel/fit';
|
|
48
48
|
import { createGridAnnouncer } from '@/client/components/workspace/terminal-panel/grid';
|
|
49
49
|
import { attachTouchScroll, handleKeyNavigation } from '@/client/components/workspace/terminal-panel/navigation';
|
|
50
|
+
import { holdAcrossWrite, watchPointerPress } from '@/client/components/workspace/terminal-panel/scroll-hold';
|
|
50
51
|
import {
|
|
51
52
|
getTerminalTheme,
|
|
52
53
|
TERMINAL_FONT_FAMILY,
|
|
@@ -111,10 +112,9 @@ export async function mountTerminal(
|
|
|
111
112
|
): Promise<TerminalMount | null> {
|
|
112
113
|
// One dynamic import, and the WASM module is loaded once per page. Fonts are
|
|
113
114
|
// fetched in parallel: the renderer measures its cell box at `open()`, and a
|
|
114
|
-
// face that lands after that is repaired by `watchTerminalFonts`.
|
|
115
|
-
//
|
|
116
|
-
//
|
|
117
|
-
// initial client bundle for every page.
|
|
115
|
+
// face that lands after that is repaired by `watchTerminalFonts`. Dynamic on
|
|
116
|
+
// purpose: ghostty-web and its ~424 KB WASM are only needed once the panel is
|
|
117
|
+
// opened, so a static import would put them in every page's initial bundle.
|
|
118
118
|
const module = await import('ghostty-web');
|
|
119
119
|
const [ghostty] = await Promise.all([module.Ghostty.load(), waitForTerminalFonts()]);
|
|
120
120
|
if (isCancelled()) return null;
|
|
@@ -248,13 +248,16 @@ export async function mountTerminal(
|
|
|
248
248
|
const grid = createGridAnnouncer({
|
|
249
249
|
current: () => current?.term,
|
|
250
250
|
fit: safeFit,
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
251
|
+
// Focus is NOT taken here: the panel asks for it when it becomes the
|
|
252
|
+
// visible view (`focus.ts`), and a terminal that grabs focus 120ms after
|
|
253
|
+
// the grid settles would steal it back from whatever the user clicked in
|
|
254
|
+
// the meantime.
|
|
255
|
+
onReady: callbacks.onReady,
|
|
255
256
|
onGridChange: callbacks.onGridChange,
|
|
256
257
|
});
|
|
257
258
|
|
|
259
|
+
const pointer = watchPointerPress(container);
|
|
260
|
+
|
|
258
261
|
current = create(currentThemeId);
|
|
259
262
|
safeFit();
|
|
260
263
|
grid.schedule();
|
|
@@ -293,7 +296,11 @@ export async function mountTerminal(
|
|
|
293
296
|
|
|
294
297
|
return {
|
|
295
298
|
write(bytes: Uint8Array) {
|
|
296
|
-
current?.term
|
|
299
|
+
const term = current?.term;
|
|
300
|
+
if (!term) return;
|
|
301
|
+
// ghostty-web snaps the viewport to the bottom on every write; see
|
|
302
|
+
// `scroll-hold.ts` for why that made a stream impossible to select from.
|
|
303
|
+
holdAcrossWrite(term, pointer, () => term.write(bytes));
|
|
297
304
|
},
|
|
298
305
|
writeReplay,
|
|
299
306
|
reset() {
|
|
@@ -333,6 +340,7 @@ export async function mountTerminal(
|
|
|
333
340
|
grid.dispose();
|
|
334
341
|
stopFontWatch();
|
|
335
342
|
touch();
|
|
343
|
+
pointer.stop();
|
|
336
344
|
resizeObserver.disconnect();
|
|
337
345
|
disposeInstance(current);
|
|
338
346
|
current = null;
|
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The viewport a write must leave behind.
|
|
8
|
+
*
|
|
9
|
+
* ghostty-web's `writeInternal` ends with `viewportY !== 0 && scrollToBottom()`,
|
|
10
|
+
* so every PTY chunk re-anchors the view to the live end. Measured on the
|
|
11
|
+
* assembled panel before this module existed: a wheel-up during a `tail -F`
|
|
12
|
+
* stream was undone by the next chunk (the "Latest" button never appeared), and
|
|
13
|
+
* a two-row drag during a 100 lines/s stream copied twelve lines because the
|
|
14
|
+
* content moved between the press and the release.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
import { describe, expect, test } from 'bun:test';
|
|
18
|
+
import {
|
|
19
|
+
heldTop,
|
|
20
|
+
holdAcrossWrite,
|
|
21
|
+
viewportYForTop,
|
|
22
|
+
watchPointerPress,
|
|
23
|
+
type HoldableViewport,
|
|
24
|
+
} from '@/client/components/workspace/terminal-panel/scroll-hold';
|
|
25
|
+
|
|
26
|
+
/** A viewport whose scrollback grows by `appended` lines on every write. */
|
|
27
|
+
function fakeViewport(options: { scrollback: number; viewportY: number; appended: number; hasSelection?: boolean }) {
|
|
28
|
+
const state = {
|
|
29
|
+
scrollback: options.scrollback,
|
|
30
|
+
viewportY: options.viewportY,
|
|
31
|
+
hasSelection: options.hasSelection ?? false,
|
|
32
|
+
scrollCalls: [] as number[],
|
|
33
|
+
};
|
|
34
|
+
const viewport: HoldableViewport = {
|
|
35
|
+
getScrollbackLength: () => state.scrollback,
|
|
36
|
+
getViewportY: () => state.viewportY,
|
|
37
|
+
hasSelection: () => state.hasSelection,
|
|
38
|
+
scrollLines: (amount) => {
|
|
39
|
+
state.scrollCalls.push(amount);
|
|
40
|
+
state.viewportY = Math.max(0, Math.min(state.scrollback, state.viewportY - amount));
|
|
41
|
+
},
|
|
42
|
+
};
|
|
43
|
+
const write = () => {
|
|
44
|
+
state.scrollback += options.appended;
|
|
45
|
+
// The library's own snap, which the hold has to undo.
|
|
46
|
+
state.viewportY = 0;
|
|
47
|
+
};
|
|
48
|
+
return { viewport, state, write };
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
describe('heldTop', () => {
|
|
52
|
+
test('follows output when the reader is at the bottom with nothing selected', () => {
|
|
53
|
+
expect(heldTop({ scrollback: 500, viewportY: 0, hasSelection: false, pointerHeld: false })).toBeNull();
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
test('holds the absolute row the reader scrolled to', () => {
|
|
57
|
+
expect(heldTop({ scrollback: 500, viewportY: 120, hasSelection: false, pointerHeld: false })).toBe(380);
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
test('holds while a selection exists, even at the bottom', () => {
|
|
61
|
+
expect(heldTop({ scrollback: 500, viewportY: 0, hasSelection: true, pointerHeld: false })).toBe(500);
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
test('holds from the press, before the engine has a selection', () => {
|
|
65
|
+
expect(heldTop({ scrollback: 500, viewportY: 0, hasSelection: false, pointerHeld: true })).toBe(500);
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
describe('viewportYForTop', () => {
|
|
70
|
+
test('turns the held row back into a distance from the bottom', () => {
|
|
71
|
+
expect(viewportYForTop({ scrollback: 620, top: 380 })).toBe(240);
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
test('reports the bottom as null, so no scroll is issued', () => {
|
|
75
|
+
expect(viewportYForTop({ scrollback: 500, top: 500 })).toBeNull();
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
describe('holdAcrossWrite', () => {
|
|
80
|
+
test('keeps the same content on screen as a stream appends lines', () => {
|
|
81
|
+
const { viewport, state, write } = fakeViewport({ scrollback: 500, viewportY: 120, appended: 3 });
|
|
82
|
+
holdAcrossWrite(viewport, { pointerHeld: false }, write);
|
|
83
|
+
// The top row (380) is still the top row: 503 - 380 = 123, and the snap to
|
|
84
|
+
// zero is undone in one scroll call.
|
|
85
|
+
expect(state.viewportY).toBe(123);
|
|
86
|
+
expect(state.scrollCalls).toEqual([-123]);
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
test('lets ordinary output scroll when nothing holds the view', () => {
|
|
90
|
+
const { viewport, state, write } = fakeViewport({ scrollback: 500, viewportY: 0, appended: 3 });
|
|
91
|
+
holdAcrossWrite(viewport, { pointerHeld: false }, write);
|
|
92
|
+
expect(state.viewportY).toBe(0);
|
|
93
|
+
expect(state.scrollCalls).toEqual([]);
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
test('holds a selection at the bottom, so a copy is not scrolled away', () => {
|
|
97
|
+
const { viewport, state, write } = fakeViewport({ scrollback: 500, viewportY: 0, appended: 2, hasSelection: true });
|
|
98
|
+
holdAcrossWrite(viewport, { pointerHeld: false }, write);
|
|
99
|
+
expect(state.viewportY).toBe(2);
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
test('holds from the press, before the drag threshold is met', () => {
|
|
103
|
+
const { viewport, state, write } = fakeViewport({ scrollback: 500, viewportY: 0, appended: 4 });
|
|
104
|
+
holdAcrossWrite(viewport, { pointerHeld: true }, write);
|
|
105
|
+
expect(state.viewportY).toBe(4);
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
test('a released press with no selection follows output again', () => {
|
|
109
|
+
const { viewport, state, write } = fakeViewport({ scrollback: 500, viewportY: 0, appended: 4 });
|
|
110
|
+
holdAcrossWrite(viewport, { pointerHeld: false }, write);
|
|
111
|
+
expect(state.viewportY).toBe(0);
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
test('a disposed terminal does not throw out of the write path', () => {
|
|
115
|
+
const viewport: HoldableViewport = {
|
|
116
|
+
getScrollbackLength: () => 500,
|
|
117
|
+
getViewportY: () => 120,
|
|
118
|
+
hasSelection: () => false,
|
|
119
|
+
scrollLines: () => {
|
|
120
|
+
throw new Error('Terminal not open');
|
|
121
|
+
},
|
|
122
|
+
};
|
|
123
|
+
expect(() => holdAcrossWrite(viewport, { pointerHeld: false }, () => {})).not.toThrow();
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
describe('watchPointerPress', () => {
|
|
128
|
+
/** A container that is an event target but not a DOM element — all the watcher touches. */
|
|
129
|
+
const container = () => new EventTarget() as unknown as HTMLElement;
|
|
130
|
+
|
|
131
|
+
test('holds from the press and lets go on release', () => {
|
|
132
|
+
const element = container();
|
|
133
|
+
const watch = watchPointerPress(element);
|
|
134
|
+
expect(watch.pointerHeld).toBe(false);
|
|
135
|
+
element.dispatchEvent(new Event('pointerdown'));
|
|
136
|
+
expect(watch.pointerHeld).toBe(true);
|
|
137
|
+
globalThis.dispatchEvent(new Event('pointerup'));
|
|
138
|
+
expect(watch.pointerHeld).toBe(false);
|
|
139
|
+
watch.stop();
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
test('a cancelled gesture ends the hold, not a stuck viewport', () => {
|
|
143
|
+
const element = container();
|
|
144
|
+
const watch = watchPointerPress(element);
|
|
145
|
+
element.dispatchEvent(new Event('pointerdown'));
|
|
146
|
+
globalThis.dispatchEvent(new Event('pointercancel'));
|
|
147
|
+
expect(watch.pointerHeld).toBe(false);
|
|
148
|
+
watch.stop();
|
|
149
|
+
});
|
|
150
|
+
|
|
151
|
+
test('stop() detaches, so a disposed mount cannot hold a later one', () => {
|
|
152
|
+
const element = container();
|
|
153
|
+
const watch = watchPointerPress(element);
|
|
154
|
+
watch.stop();
|
|
155
|
+
element.dispatchEvent(new Event('pointerdown'));
|
|
156
|
+
expect(watch.pointerHeld).toBe(false);
|
|
157
|
+
});
|
|
158
|
+
});
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* What a write must do to the viewport it inherited.
|
|
8
|
+
*
|
|
9
|
+
* ghostty-web's `writeInternal` ends with `viewportY !== 0 && scrollToBottom()`,
|
|
10
|
+
* so EVERY chunk of PTY output re-anchors the view to the live end. A stream
|
|
11
|
+
* (`tail -F`, a build log, `yes`) therefore cannot be read or selected at all:
|
|
12
|
+
* a wheel-up was undone by the next chunk, and a drag that started on a line
|
|
13
|
+
* ended on whatever had scrolled under the pointer by the release — measured on
|
|
14
|
+
* the assembled panel, a two-row drag during a 100 lines/s stream copied twelve
|
|
15
|
+
* lines.
|
|
16
|
+
*
|
|
17
|
+
* Three states hold the view, each for its own measured failure:
|
|
18
|
+
*
|
|
19
|
+
* - **Scrolled back** (`viewportY > 0`): nothing above the live line could be
|
|
20
|
+
* read while output kept arriving.
|
|
21
|
+
* - **Pointer down**: a copy starts with a press, and the engine's own
|
|
22
|
+
* selection does not exist until the drag passes its 0.5-cell threshold, so
|
|
23
|
+
* the rows move out from under the gesture before there is anything to hold.
|
|
24
|
+
* - **Selection exists**: a selection outlives the drag (drag, release, read,
|
|
25
|
+
* press ⌘C), and output arriving in that window used to scroll it away
|
|
26
|
+
* before the copy ran.
|
|
27
|
+
*
|
|
28
|
+
* Everything else follows the live output, which is what a terminal does.
|
|
29
|
+
*
|
|
30
|
+
* The hold is stated as an ABSOLUTE buffer row, not as a distance from the
|
|
31
|
+
* bottom: as lines are appended the same content must stay on screen, so the
|
|
32
|
+
* distance from the bottom has to grow with the scrollback. `heldTop` captures
|
|
33
|
+
* that row before a write and `viewportYForTop` turns it back into a
|
|
34
|
+
* `viewportY` after it. The write is synchronous, so the restore lands before
|
|
35
|
+
* the next paint — the library's own snap is never shown.
|
|
36
|
+
*/
|
|
37
|
+
|
|
38
|
+
/** The absolute buffer row at the top of the viewport, or null when the view follows output. */
|
|
39
|
+
export function heldTop(input: {
|
|
40
|
+
scrollback: number;
|
|
41
|
+
viewportY: number;
|
|
42
|
+
hasSelection: boolean;
|
|
43
|
+
pointerHeld: boolean;
|
|
44
|
+
}): number | null {
|
|
45
|
+
if (input.viewportY <= 0 && !input.hasSelection && !input.pointerHeld) return null;
|
|
46
|
+
return input.scrollback - input.viewportY;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/** The `viewportY` that puts `top` back at the top of the viewport, or null at the bottom. */
|
|
50
|
+
export function viewportYForTop(input: { scrollback: number; top: number }): number | null {
|
|
51
|
+
const viewportY = input.scrollback - input.top;
|
|
52
|
+
return viewportY > 0 ? viewportY : null;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/**
|
|
56
|
+
* The viewport methods the hold reads and drives.
|
|
57
|
+
*
|
|
58
|
+
* Narrow on purpose: `scrollLines` is how the library's own scroll path is
|
|
59
|
+
* driven — it clamps, fires `onScroll` (which is what keeps the "Latest" button
|
|
60
|
+
* honest) and repaints — while assigning `viewportY` directly skips all three.
|
|
61
|
+
*/
|
|
62
|
+
export interface HoldableViewport {
|
|
63
|
+
getScrollbackLength: () => number;
|
|
64
|
+
getViewportY: () => number;
|
|
65
|
+
hasSelection: () => boolean;
|
|
66
|
+
scrollLines: (amount: number) => void;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* Watch the press that starts a selection.
|
|
71
|
+
*
|
|
72
|
+
* `pointerdown` in the CAPTURE phase on the container: ghostty-web's selection
|
|
73
|
+
* manager attaches its own mousedown and stops propagation once its scrollbar
|
|
74
|
+
* wins, and the hold has to start at the press — before the engine's own
|
|
75
|
+
* selection exists, because its drag threshold (half a cell) leaves a window in
|
|
76
|
+
* which a stream has already moved the rows out from under the gesture.
|
|
77
|
+
*
|
|
78
|
+
* Release is watched on the WINDOW: a drag that ends outside the panel (over the
|
|
79
|
+
* sidebar, or off the app) must end the hold too, or output stops following
|
|
80
|
+
* forever.
|
|
81
|
+
*
|
|
82
|
+
* Returns the state the write path reads, plus its own teardown.
|
|
83
|
+
*/
|
|
84
|
+
export function watchPointerPress(container: HTMLElement): { pointerHeld: boolean; stop: () => void } {
|
|
85
|
+
const state = { pointerHeld: false };
|
|
86
|
+
const press = (): void => {
|
|
87
|
+
state.pointerHeld = true;
|
|
88
|
+
};
|
|
89
|
+
const release = (): void => {
|
|
90
|
+
state.pointerHeld = false;
|
|
91
|
+
};
|
|
92
|
+
container.addEventListener('pointerdown', press, true);
|
|
93
|
+
globalThis.addEventListener('pointerup', release);
|
|
94
|
+
globalThis.addEventListener('pointercancel', release);
|
|
95
|
+
return {
|
|
96
|
+
get pointerHeld() {
|
|
97
|
+
return state.pointerHeld;
|
|
98
|
+
},
|
|
99
|
+
stop() {
|
|
100
|
+
container.removeEventListener('pointerdown', press, true);
|
|
101
|
+
globalThis.removeEventListener('pointerup', release);
|
|
102
|
+
globalThis.removeEventListener('pointercancel', release);
|
|
103
|
+
},
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
/**
|
|
108
|
+
* Run `write`, then put the viewport back where the reader left it.
|
|
109
|
+
*
|
|
110
|
+
* A no-op when nothing holds the view, so ordinary output still scrolls the way
|
|
111
|
+
* a terminal should.
|
|
112
|
+
*/
|
|
113
|
+
export function holdAcrossWrite(
|
|
114
|
+
viewport: HoldableViewport,
|
|
115
|
+
state: { pointerHeld: boolean },
|
|
116
|
+
write: () => void,
|
|
117
|
+
): void {
|
|
118
|
+
const top = heldTop({
|
|
119
|
+
scrollback: viewport.getScrollbackLength(),
|
|
120
|
+
viewportY: viewport.getViewportY(),
|
|
121
|
+
hasSelection: viewport.hasSelection(),
|
|
122
|
+
pointerHeld: state.pointerHeld,
|
|
123
|
+
});
|
|
124
|
+
write();
|
|
125
|
+
if (top === null) return;
|
|
126
|
+
const target = viewportYForTop({ scrollback: viewport.getScrollbackLength(), top });
|
|
127
|
+
if (target === null) return;
|
|
128
|
+
const delta = target - viewport.getViewportY();
|
|
129
|
+
if (delta === 0) return;
|
|
130
|
+
try {
|
|
131
|
+
// Positive `amount` scrolls toward the top, so a positive delta moves back.
|
|
132
|
+
viewport.scrollLines(-delta);
|
|
133
|
+
} catch {
|
|
134
|
+
// A disposed terminal has no wasm buffer; the next mount starts at the bottom.
|
|
135
|
+
}
|
|
136
|
+
}
|
|
@@ -23,9 +23,12 @@
|
|
|
23
23
|
* with no chat named, it is kept for this page session only.
|
|
24
24
|
*/
|
|
25
25
|
|
|
26
|
-
import { useState } from 'preact/hooks';
|
|
26
|
+
import { useEffect, useRef, useState } from 'preact/hooks';
|
|
27
27
|
import { useSearchParams } from '@/client/lib/router/search-params';
|
|
28
28
|
import { useSessionState } from '@/client/hooks/workspace/session-state';
|
|
29
|
+
import { useSessionStateContext } from '@/client/hooks/workspace/session-state/context';
|
|
30
|
+
import { subscribeSessionKey } from '@/shared/lib/workspace/session-state/listeners';
|
|
31
|
+
import { getSessionValue } from '@/shared/lib/workspace/session-state/store';
|
|
29
32
|
import { useBrowserPageContextInsert } from '@/client/hooks/chat/composer/browser-context';
|
|
30
33
|
import { useReviewIncludeInsert } from '@/client/hooks/chat/composer/review-context';
|
|
31
34
|
import { CHAT_DRAFT_ATTACHMENTS_KEY, CHAT_DRAFT_KEY } from '@/shared/lib/chat/composer/draft';
|
|
@@ -50,6 +53,47 @@ export function useComposerDraft(): ComposerDraftState {
|
|
|
50
53
|
const [storedAttachments, setStoredAttachments] = useSessionState<Attachment[]>(CHAT_DRAFT_ATTACHMENTS_KEY, []);
|
|
51
54
|
const [landingText, setLandingText] = useState('');
|
|
52
55
|
const [landingAttachments, setLandingAttachments] = useState<Attachment[]>([]);
|
|
56
|
+
const { sessionId } = useSessionStateContext();
|
|
57
|
+
|
|
58
|
+
// The draft is normally private to this composer, but a CANCELLED held prompt
|
|
59
|
+
// is written back into this very slot by another module (the sidebar's cancel,
|
|
60
|
+
// the waiting dispatcher's failure path). Without this follow, the text lands
|
|
61
|
+
// in the store and the mounted box — the one the user is looking at — keeps
|
|
62
|
+
// rendering its empty copy.
|
|
63
|
+
//
|
|
64
|
+
// `applied` is not bookkeeping: `setStoredText` writes the store, which
|
|
65
|
+
// notifies this very listener. Comparing against the last value applied (and
|
|
66
|
+
// recording it BEFORE the setters run) is what makes the write converge
|
|
67
|
+
// instead of recursing.
|
|
68
|
+
const appliedRef = useRef({ text: storedText, attachments: storedAttachments });
|
|
69
|
+
appliedRef.current = { text: storedText, attachments: storedAttachments };
|
|
70
|
+
// Set while this listener is writing the value it just read: the setters
|
|
71
|
+
// persist, which notifies this same listener. Re-entering there is how the
|
|
72
|
+
// first version recursed until the stack ran out.
|
|
73
|
+
const applyingRef = useRef(false);
|
|
74
|
+
useEffect(() => {
|
|
75
|
+
if (!scoped) return;
|
|
76
|
+
const follow = () => {
|
|
77
|
+
if (applyingRef.current) return;
|
|
78
|
+
const text = getSessionValue<string>(sessionId, CHAT_DRAFT_KEY) ?? '';
|
|
79
|
+
const attachments = getSessionValue<Attachment[]>(sessionId, CHAT_DRAFT_ATTACHMENTS_KEY) ?? [];
|
|
80
|
+
if (text === appliedRef.current.text && attachments === appliedRef.current.attachments) return;
|
|
81
|
+
appliedRef.current = { text, attachments };
|
|
82
|
+
applyingRef.current = true;
|
|
83
|
+
setStoredText(text);
|
|
84
|
+
setStoredAttachments(attachments);
|
|
85
|
+
applyingRef.current = false;
|
|
86
|
+
};
|
|
87
|
+
const offText = subscribeSessionKey(sessionId, CHAT_DRAFT_KEY, follow);
|
|
88
|
+
const offAttachments = subscribeSessionKey(sessionId, CHAT_DRAFT_ATTACHMENTS_KEY, follow);
|
|
89
|
+
return () => {
|
|
90
|
+
offText();
|
|
91
|
+
offAttachments();
|
|
92
|
+
};
|
|
93
|
+
// The two setters are state setters from `useSessionState`; re-subscribing
|
|
94
|
+
// on their identity would tear down the listeners on every render.
|
|
95
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
96
|
+
}, [sessionId, scoped]);
|
|
53
97
|
|
|
54
98
|
const inputValue = scoped ? storedText : landingText;
|
|
55
99
|
const setInputValue = scoped ? setStoredText : setLandingText;
|
|
@@ -24,9 +24,9 @@ import {
|
|
|
24
24
|
} from '@/client/hooks/chat/omp/pending-sessions';
|
|
25
25
|
import {
|
|
26
26
|
clearPendingSessionWaiting,
|
|
27
|
+
markPendingSessionDraft,
|
|
27
28
|
markPendingSessionWaiting,
|
|
28
29
|
pendingSessionWait,
|
|
29
|
-
releasePendingSessionByWait,
|
|
30
30
|
} from '@/client/hooks/chat/omp/pending-waiting';
|
|
31
31
|
|
|
32
32
|
afterEach(() => {
|
|
@@ -66,16 +66,17 @@ describe('pending session waiting state', () => {
|
|
|
66
66
|
expect(listPendingSessions().map((entry) => entry.id)).toContain(id);
|
|
67
67
|
});
|
|
68
68
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
69
|
+
// Cancelling keeps the chat: the prompt's text is written back into that
|
|
70
|
+
// chat's composer, so the row the user returns to must still exist — and it
|
|
71
|
+
// must survive the settle pass that a SENT prompt would expire, because it is
|
|
72
|
+
// an unsent draft again.
|
|
73
|
+
test('a cancelled wait becomes an unsent draft that keeps its row', () => {
|
|
74
|
+
const id = startPendingSession(1);
|
|
75
|
+
markPendingSessionWaiting(id, { waitId: 'wait-1', dependsOn: 'sess-a', dependsOnTitle: 'A' });
|
|
74
76
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
expect(
|
|
78
|
-
expect(ids).toContain(second);
|
|
77
|
+
markPendingSessionDraft(id);
|
|
78
|
+
expect(pendingSessionWait(id)).toBeNull();
|
|
79
|
+
expect(listPendingSessions().find((entry) => entry.id === id)?.sentAt).toBeNull();
|
|
79
80
|
});
|
|
80
81
|
|
|
81
82
|
// The wait ends where the spawn answers: the new row is a real session from
|
|
@@ -35,14 +35,22 @@ export function clearPendingSessionWaiting(id: string): void {
|
|
|
35
35
|
patchPendingEntry(id, (entry) => (entry.waiting ? { ...entry, waiting: undefined } : entry));
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
+
/**
|
|
39
|
+
* The wait was cancelled (or failed) and its text is back in the composer.
|
|
40
|
+
*
|
|
41
|
+
* `sentAt` is cleared with the cue: the entry is an UNSENT draft again, so the
|
|
42
|
+
* reconcile pass keeps it while that draft exists instead of expiring it on the
|
|
43
|
+
* sent-prompt settle window and taking the restored text's row away.
|
|
44
|
+
*/
|
|
45
|
+
export function markPendingSessionDraft(id: string): void {
|
|
46
|
+
patchPendingEntry(id, (entry) => (
|
|
47
|
+
entry.waiting || entry.sentAt !== null
|
|
48
|
+
? { ...entry, waiting: undefined, sentAt: null }
|
|
49
|
+
: entry
|
|
50
|
+
));
|
|
51
|
+
}
|
|
52
|
+
|
|
38
53
|
/** The waiting half of one entry, or null when the row is not waiting. */
|
|
39
54
|
export function pendingSessionWait(id: string): PendingWait | null {
|
|
40
55
|
return listPendingSessions().find((entry) => entry.id === id)?.waiting ?? null;
|
|
41
56
|
}
|
|
42
|
-
|
|
43
|
-
/** Drop the entry whose prompt was held by `waitId` (the wait was cancelled). */
|
|
44
|
-
export function releasePendingSessionByWait(waitId: string): void {
|
|
45
|
-
for (const entry of listPendingSessions()) {
|
|
46
|
-
if (entry.waiting?.waitId === waitId) patchPendingEntry(entry.id, () => null);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
@@ -271,6 +271,17 @@ describe('useOmpPromptSender.sendNewPrompt', () => {
|
|
|
271
271
|
expect(probe.connected).toEqual(['omp-9']);
|
|
272
272
|
});
|
|
273
273
|
|
|
274
|
+
test('sends the ACP mode pick on the spawn body', async () => {
|
|
275
|
+
// The composer's pending chat has no session to command, so a mode picked on
|
|
276
|
+
// it can only travel here; dropping it started the chat in the agent's
|
|
277
|
+
// default mode while the chip named the operator's pick.
|
|
278
|
+
const requests = installFetch({ [NEW]: { body: { success: true, sessionId: 'acp-1', harness: 'claude' } } });
|
|
279
|
+
const probe = mountSender(null);
|
|
280
|
+
await probe.sender().sendNewPrompt('first', '/w', undefined, { harness: 'claude', sessionMode: 'architect' });
|
|
281
|
+
|
|
282
|
+
expect(requests[0].body).toMatchObject({ harness: 'claude', sessionMode: 'architect' });
|
|
283
|
+
});
|
|
284
|
+
|
|
274
285
|
test('omits every unset pick so a bare spawn behaves as before', async () => {
|
|
275
286
|
const requests = installFetch({ [NEW]: { body: { success: true, sessionId: 'omp-1' } } });
|
|
276
287
|
const probe = mountSender(null);
|
|
@@ -141,6 +141,9 @@ export function useOmpPromptSender(deps: OmpPromptSenderDeps): OmpPromptSender {
|
|
|
141
141
|
// Plan/goal picks from the pending view. Omitted when the user made
|
|
142
142
|
// none, so a spawn with no selection behaves exactly as before.
|
|
143
143
|
...(composerOptions?.modes ? { modes: composerOptions.modes } : {}),
|
|
144
|
+
// The ACP ladder pick from the same view — the agent's own vocabulary,
|
|
145
|
+
// applied by the route as a config write after `session/new`.
|
|
146
|
+
...(composerOptions?.sessionMode ? { sessionMode: composerOptions.sessionMode } : {}),
|
|
144
147
|
...(composerOptions?.harness ? { harness: composerOptions.harness } : {}),
|
|
145
148
|
}),
|
|
146
149
|
});
|