@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
|
@@ -75,14 +75,18 @@ interface EditorToolbarProps {
|
|
|
75
75
|
onCopy: () => void;
|
|
76
76
|
onDownload: () => void;
|
|
77
77
|
/**
|
|
78
|
-
*
|
|
78
|
+
* Re-read the file from disk.
|
|
79
79
|
*
|
|
80
|
-
* Destructive, so it is never pinned and never in the
|
|
81
|
-
* toolbar of icon-only buttons must not be able to lose an
|
|
80
|
+
* Destructive when the buffer has edits, so it is never pinned and never in the
|
|
81
|
+
* row: a mis-click on a toolbar of icon-only buttons must not be able to lose an
|
|
82
|
+
* edit. A clean buffer reloads without losing anything, which is why the control
|
|
83
|
+
* is offered for it too — it is the manual counterpart of the auto-refresh.
|
|
82
84
|
*/
|
|
83
|
-
|
|
84
|
-
/**
|
|
85
|
-
|
|
85
|
+
onReload: () => void;
|
|
86
|
+
/** False when the tab names no file on disk (an attachment, a device file). */
|
|
87
|
+
canReload: boolean;
|
|
88
|
+
/** The buffer has edits, so Reload discards them — the title says so. */
|
|
89
|
+
reloadDiscardsEdits: boolean;
|
|
86
90
|
/** Write the buffer to a NEW path; the original tab stays open. */
|
|
87
91
|
onSaveAs: () => void;
|
|
88
92
|
onToggleMaximize: () => void;
|
|
@@ -123,8 +127,9 @@ export function EditorToolbar({
|
|
|
123
127
|
onZoomOut,
|
|
124
128
|
onCopy,
|
|
125
129
|
onDownload,
|
|
126
|
-
|
|
127
|
-
|
|
130
|
+
onReload,
|
|
131
|
+
canReload,
|
|
132
|
+
reloadDiscardsEdits,
|
|
128
133
|
onSaveAs,
|
|
129
134
|
onToggleMaximize,
|
|
130
135
|
}: EditorToolbarProps) {
|
|
@@ -197,7 +202,8 @@ export function EditorToolbar({
|
|
|
197
202
|
copied,
|
|
198
203
|
isMaximized,
|
|
199
204
|
saveDisabled,
|
|
200
|
-
|
|
205
|
+
canReload,
|
|
206
|
+
reloadDiscardsEdits,
|
|
201
207
|
saveButton,
|
|
202
208
|
maximizeButton,
|
|
203
209
|
viewModeButtons: <EditorViewButtons size={14} />,
|
|
@@ -223,7 +229,7 @@ export function EditorToolbar({
|
|
|
223
229
|
onZoomOut,
|
|
224
230
|
onCopy,
|
|
225
231
|
onDownload,
|
|
226
|
-
|
|
232
|
+
onReload,
|
|
227
233
|
onSaveAs,
|
|
228
234
|
onToggleMaximize,
|
|
229
235
|
onSave,
|
|
@@ -24,7 +24,6 @@ import { retainDirtyTabs } from '@/client/lib/editor-dirty-tabs';
|
|
|
24
24
|
import { EditorPane } from '@/client/components/workspace/editor/Pane';
|
|
25
25
|
import { SplitColumn } from '@/client/components/workspace/editor/SplitColumn';
|
|
26
26
|
import { useSplitEditor } from '@/client/hooks/editor/use-split-editor';
|
|
27
|
-
import { useExternalChangeNotice } from '@/client/hooks/editor/use-external-change-notice';
|
|
28
27
|
import { useEditorPanelKeys } from '@/client/hooks/editor/use-editor-panel-keys';
|
|
29
28
|
import { useCloseGuard } from '@/client/hooks/editor/use-close-guard';
|
|
30
29
|
import { useFileReviewMode } from '@/client/hooks/editor/use-file-review-mode';
|
|
@@ -102,14 +101,11 @@ export function Editor({
|
|
|
102
101
|
// view, and the resolver is cheap when no plugin contributed one.
|
|
103
102
|
const pluginFileView = usePluginFileView({ path: activeFile?.path ?? '', content: editor.content, language: editor.language });
|
|
104
103
|
|
|
105
|
-
// The disk-change strip and its answer
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
revision: refreshKey,
|
|
111
|
-
adoptDiskMtime: editor.adoptDiskMtime,
|
|
112
|
-
});
|
|
104
|
+
// The disk-change strip and its answer. The verdict is the editor's own: the
|
|
105
|
+
// watcher compares CONTENT hashes, so a file rewritten with the same bytes (a
|
|
106
|
+
// `touch`, a no-op formatter, a checkout of the revision already open) never
|
|
107
|
+
// raises a strip, and a real change does even when the mtime did not move.
|
|
108
|
+
const externalChange = editor.diskChange;
|
|
113
109
|
|
|
114
110
|
// Built after the editor: the guard writes through `editor.saveNow`.
|
|
115
111
|
const closeGuard = useCloseGuard({
|
|
@@ -319,7 +315,7 @@ export function Editor({
|
|
|
319
315
|
externalChange={externalChange}
|
|
320
316
|
conflict={editor.conflict}
|
|
321
317
|
onReload={editor.resolveConflictByReload}
|
|
322
|
-
onKeepMine={keepMineAgainstDisk}
|
|
318
|
+
onKeepMine={editor.keepMineAgainstDisk}
|
|
323
319
|
body={<EditorBody {...bodyProps} />}
|
|
324
320
|
saveAsOpen={panelUi.saveAsOpen}
|
|
325
321
|
onSaveAsClose={() => panelUi.setSaveAsOpen(false)}
|
|
@@ -48,8 +48,9 @@ function state(): ToolbarState {
|
|
|
48
48
|
onZoomIn: noop,
|
|
49
49
|
onZoomOut: noop,
|
|
50
50
|
onSaveAs: noop,
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
canReload: false,
|
|
52
|
+
reloadDiscardsEdits: false,
|
|
53
|
+
onReload: noop,
|
|
53
54
|
copyLabel: 'Copy content',
|
|
54
55
|
onCopy: noop,
|
|
55
56
|
onDownload: noop,
|
|
@@ -68,7 +69,7 @@ describe('buildEditorClusters order', () => {
|
|
|
68
69
|
const ids = buildEditorClusters(state()).map((cluster) => cluster.id);
|
|
69
70
|
const saveAs = ids.indexOf('save-as');
|
|
70
71
|
expect(saveAs).toBeGreaterThan(ids.indexOf('save'));
|
|
71
|
-
for (const aid of ['blame', 'zoom', 'copy', '
|
|
72
|
+
for (const aid of ['blame', 'zoom', 'copy', 'reload']) {
|
|
72
73
|
expect(saveAs).toBeLessThan(ids.indexOf(aid));
|
|
73
74
|
}
|
|
74
75
|
});
|
|
@@ -19,8 +19,9 @@
|
|
|
19
19
|
* to a screen reader. **Pinning is not the visual order**: `pinned` marks what a
|
|
20
20
|
* narrow panel must not bury, and the row is placed in the order a reader looks.
|
|
21
21
|
*
|
|
22
|
-
* **
|
|
23
|
-
* the row, and a `⋯` menu is exactly the friction a
|
|
22
|
+
* **Reload is deliberately never pinned.** With a dirty buffer it is the only
|
|
23
|
+
* destructive control in the row, and a `⋯` menu is exactly the friction a
|
|
24
|
+
* destructive action should have; a clean buffer reloads without losing anything.
|
|
24
25
|
*/
|
|
25
26
|
|
|
26
27
|
import type { ComponentChildren } from 'preact';
|
|
@@ -30,7 +31,7 @@ import {
|
|
|
30
31
|
GitCommitVertical,
|
|
31
32
|
Maximize,
|
|
32
33
|
Minimize,
|
|
33
|
-
|
|
34
|
+
RefreshCw,
|
|
34
35
|
Search,
|
|
35
36
|
WrapText,
|
|
36
37
|
ZoomIn,
|
|
@@ -61,7 +62,9 @@ export interface ToolbarState {
|
|
|
61
62
|
copied: boolean;
|
|
62
63
|
isMaximized: boolean;
|
|
63
64
|
saveDisabled: boolean;
|
|
64
|
-
|
|
65
|
+
canReload: boolean;
|
|
66
|
+
/** The buffer has edits, so Reload discards them — the title says so. */
|
|
67
|
+
reloadDiscardsEdits: boolean;
|
|
65
68
|
saveButton: ComponentChildren;
|
|
66
69
|
previewLabel: string;
|
|
67
70
|
findLabel: string;
|
|
@@ -77,7 +80,7 @@ export interface ToolbarState {
|
|
|
77
80
|
onZoomOut: () => void;
|
|
78
81
|
onCopy: () => void;
|
|
79
82
|
onDownload: () => void;
|
|
80
|
-
|
|
83
|
+
onReload: () => void;
|
|
81
84
|
onSaveAs: () => void;
|
|
82
85
|
onToggleMaximize: () => void;
|
|
83
86
|
onSave: () => void;
|
|
@@ -179,22 +182,28 @@ export function buildEditorClusters(state: ToolbarState): ToolbarCluster[] {
|
|
|
179
182
|
),
|
|
180
183
|
});
|
|
181
184
|
clusters.push({
|
|
182
|
-
id: '
|
|
183
|
-
// Never `pinned`: it is the one destructive control in
|
|
184
|
-
// exactly the friction it should have.
|
|
185
|
+
id: 'reload',
|
|
186
|
+
// Never `pinned`: with a dirty buffer it is the one destructive control in
|
|
187
|
+
// the row, and a menu is exactly the friction it should have.
|
|
185
188
|
actions: [
|
|
186
|
-
{ label: '
|
|
189
|
+
{ label: 'Reload from disk', icon: RefreshCw, onSelect: state.onReload, disabled: !state.canReload },
|
|
187
190
|
],
|
|
188
191
|
children: (
|
|
189
192
|
<button
|
|
190
193
|
type="button"
|
|
191
|
-
onClick={state.
|
|
192
|
-
disabled={!state.
|
|
194
|
+
onClick={state.onReload}
|
|
195
|
+
disabled={!state.canReload}
|
|
193
196
|
className={`${ACTION_CLASS} hover:bg-ink/5 hover:text-ink`}
|
|
194
|
-
title={
|
|
195
|
-
|
|
197
|
+
title={
|
|
198
|
+
!state.canReload
|
|
199
|
+
? 'Nothing to reload — this tab has no file on disk'
|
|
200
|
+
: state.reloadDiscardsEdits
|
|
201
|
+
? 'Discard my changes and reload from disk'
|
|
202
|
+
: 'Reload from disk'
|
|
203
|
+
}
|
|
204
|
+
aria-label="Reload from disk"
|
|
196
205
|
>
|
|
197
|
-
<
|
|
206
|
+
<RefreshCw size={14} />
|
|
198
207
|
</button>
|
|
199
208
|
),
|
|
200
209
|
});
|
|
@@ -3,6 +3,7 @@ import { forwardRef } from 'preact/compat';
|
|
|
3
3
|
import { ArrowDown } from 'lucide-preact';
|
|
4
4
|
import { useTheme } from '@/client/hooks/ui/theme';
|
|
5
5
|
import { mountTerminal, type TerminalMount } from '@/client/components/workspace/terminal-panel/mount';
|
|
6
|
+
import { createFocusLatch, type FocusLatch } from '@/client/components/workspace/terminal-panel/focus';
|
|
6
7
|
|
|
7
8
|
export interface RealtimeTerminalHandle {
|
|
8
9
|
/** Raw PTY output. Bytes, not text: the WASM parser reassembles them. */
|
|
@@ -63,6 +64,11 @@ export const RealtimeTerminalView = forwardRef<RealtimeTerminalHandle, RealtimeT
|
|
|
63
64
|
const containerRef = useRef<HTMLDivElement>(null);
|
|
64
65
|
const mountRef = useRef<TerminalMount | null>(null);
|
|
65
66
|
const [isScrolledUp, setIsScrolledUp] = useState(false);
|
|
67
|
+
// The renderer is imported asynchronously, so a focus request can arrive
|
|
68
|
+
// before there is a terminal to take it; the latch holds it until then.
|
|
69
|
+
const focusLatchRef = useRef<FocusLatch | null>(null);
|
|
70
|
+
if (!focusLatchRef.current) focusLatchRef.current = createFocusLatch();
|
|
71
|
+
const focusLatch = focusLatchRef.current;
|
|
66
72
|
|
|
67
73
|
const inputRef = useRef(onInput);
|
|
68
74
|
inputRef.current = onInput;
|
|
@@ -101,7 +107,7 @@ export const RealtimeTerminalView = forwardRef<RealtimeTerminalHandle, RealtimeT
|
|
|
101
107
|
mountRef.current?.reset();
|
|
102
108
|
},
|
|
103
109
|
focus() {
|
|
104
|
-
|
|
110
|
+
focusLatch.request();
|
|
105
111
|
},
|
|
106
112
|
applicationCursorKeys() {
|
|
107
113
|
return mountRef.current?.applicationCursorKeys() ?? false;
|
|
@@ -147,10 +153,12 @@ export const RealtimeTerminalView = forwardRef<RealtimeTerminalHandle, RealtimeT
|
|
|
147
153
|
// E2E types into the terminal's hidden input. The renderer creates it
|
|
148
154
|
// inside `open`, so the hook cannot be written on the JSX element.
|
|
149
155
|
container.querySelector('textarea')?.setAttribute('data-terminal-input', '');
|
|
156
|
+
focusLatch.attach(() => mountRef.current?.focus());
|
|
150
157
|
});
|
|
151
158
|
|
|
152
159
|
return () => {
|
|
153
160
|
cancelled = true;
|
|
161
|
+
focusLatch.detach();
|
|
154
162
|
mountRef.current?.dispose();
|
|
155
163
|
mountRef.current = null;
|
|
156
164
|
};
|
|
@@ -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
|
}, []);
|
|
@@ -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
|
+
});
|