@kabmo-labs/kabmo 0.8.0 → 0.10.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/README.md +52 -0
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +336 -336
- package/dist/client/static/js/index-18xe7655.css +1 -0
- package/dist/client/static/js/{index-qwpvd9fv.js → index-nxpe7835.js} +933 -898
- package/package.json +11 -1
- package/src/client/components/common/code-surface/bracket-guide.test.ts +249 -0
- package/src/client/components/common/code-surface/bracket-guide.ts +131 -0
- package/src/client/components/common/code-surface/documents.test.ts +122 -0
- package/src/client/components/common/code-surface/documents.ts +286 -0
- package/src/client/components/common/code-surface/extensions.test.ts +115 -0
- package/src/client/components/common/code-surface/extensions.ts +295 -0
- package/src/client/components/common/code-surface/fold-stack.test.ts +218 -0
- package/src/client/components/common/code-surface/fold.test.ts +148 -0
- package/src/client/components/common/code-surface/fold.ts +118 -0
- package/src/client/components/common/code-surface/handle.ts +102 -0
- package/src/client/components/common/code-surface/indent-guide.ts +104 -0
- package/src/client/components/common/code-surface/indent.test.ts +239 -0
- package/src/client/components/common/code-surface/indent.ts +124 -0
- package/src/client/components/common/code-surface/index.tsx +283 -314
- package/src/client/components/common/code-surface/keymap.test.ts +133 -0
- package/src/client/components/common/code-surface/keymap.ts +256 -0
- package/src/client/components/common/code-surface/line-commands.test.ts +90 -0
- package/src/client/components/common/code-surface/line-commands.ts +103 -0
- package/src/client/components/common/code-surface/marks.ts +74 -0
- package/src/client/components/common/code-surface/props.ts +87 -0
- package/src/client/components/common/code-surface/shiki.ts +234 -0
- package/src/client/components/common/code-surface/stream-language.test.ts +118 -0
- package/src/client/components/common/code-surface/stream-language.ts +123 -0
- package/src/client/components/common/code-surface/sync.test.ts +185 -0
- package/src/client/components/common/code-surface/sync.ts +58 -0
- package/src/client/components/common/code-surface/theme.test.ts +237 -0
- package/src/client/components/common/code-surface/theme.ts +224 -0
- package/src/client/components/common/code-surface/typing.test.ts +97 -0
- package/src/client/components/common/code-surface/typing.ts +111 -0
- package/src/client/components/common/editor-view-buttons/index.test.tsx +148 -0
- package/src/client/components/common/editor-view-buttons/index.tsx +109 -0
- package/src/client/components/common/shell-update-button/Modal.tsx +163 -0
- package/src/client/components/common/shell-update-button/index.test.tsx +251 -0
- package/src/client/components/common/shell-update-button/index.tsx +125 -0
- package/src/client/components/common/toolbar-row/index.test.tsx +215 -0
- package/src/client/components/common/toolbar-row/index.tsx +260 -0
- package/src/client/components/layout/desktop-layout/WorkspacePanels.tsx +58 -78
- package/src/client/components/layout/desktop-layout/index.tsx +65 -67
- package/src/client/components/layout/desktop-layout/resizer/index.tsx +6 -3
- package/src/client/components/layout/session-sidebar/Footer.tsx +8 -15
- package/src/client/components/mobile/LayoutWrapper.tsx +1 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullDiff.tsx +3 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +98 -71
- package/src/client/components/mobile/mobile-right-sidebar/Header.tsx +20 -1
- package/src/client/components/mobile/mobile-right-sidebar/OutlineButton.test.tsx +137 -0
- package/src/client/components/mobile/mobile-right-sidebar/OutlineButton.tsx +14 -3
- package/src/client/components/mobile/mobile-right-sidebar/editor-props.ts +25 -0
- package/src/client/components/mobile/mobile-session-sidebar/Footer.tsx +9 -21
- package/src/client/components/settings/Modal.tsx +8 -0
- package/src/client/components/settings/categories/AppearanceSettings.tsx +9 -0
- package/src/client/components/settings/categories/appearance-settings/EditorIndentSection.tsx +87 -0
- package/src/client/components/settings/categories/appearance-settings/EditorThemeSection.test.tsx +167 -0
- package/src/client/components/settings/categories/appearance-settings/EditorThemeSection.tsx +184 -0
- package/src/client/components/settings/categories/appearance-settings/EditorTypingSection.tsx +99 -0
- package/src/client/components/settings/categories/project-settings/WorktreeSettings.tsx +8 -2
- package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +16 -8
- package/src/client/components/workspace/chat-timeline/SystemNotice.tsx +9 -4
- package/src/client/components/workspace/chat-timeline/TaskResultContent.tsx +9 -7
- package/src/client/components/workspace/chat-timeline/chat-input/expansion.ts +9 -4
- package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +15 -11
- package/src/client/components/workspace/chat-timeline/chat-input/stretch-send.test.tsx +165 -0
- package/src/client/components/workspace/chat-timeline/target-picker/WorkspacePicker.test.tsx +132 -0
- package/src/client/components/workspace/chat-timeline/target-picker/WorkspacePicker.tsx +120 -0
- package/src/client/components/workspace/chat-timeline/target-picker/WorktreePicker.test.tsx +319 -0
- package/src/client/components/workspace/chat-timeline/target-picker/WorktreePicker.tsx +285 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/index.test.ts +2 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/hashline-patch/index.tsx +34 -29
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/AstEdit.tsx +11 -9
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Bash.tsx +10 -7
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Edit.tsx +25 -8
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Eval.tsx +8 -11
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/FileMatches.test.ts +114 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/FileMatches.tsx +111 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Read.tsx +7 -7
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/SearchTool.tsx +9 -59
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/ArtifactBody.tsx +2 -7
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/DiffView.test.ts +43 -30
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/DiffView.tsx +49 -32
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/ExcerptCode.tsx +8 -8
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/HighlightedCode.tsx +35 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/JsonCodeBlock.tsx +4 -4
- package/src/client/components/workspace/diff-panel/MergeDiffView.tsx +179 -0
- package/src/client/components/workspace/diff-panel/ThemedMergeDiffView.tsx +24 -0
- package/src/client/components/workspace/diff-panel/Toolbar.tsx +224 -186
- package/src/client/components/workspace/diff-panel/ToolbarSegments.tsx +98 -0
- package/src/client/components/workspace/diff-panel/index.tsx +76 -145
- package/src/client/components/workspace/diff-panel/merge.ts +315 -0
- package/src/client/components/workspace/editor/Body.tsx +28 -7
- package/src/client/components/workspace/editor/CommandPalette.tsx +6 -6
- package/src/client/components/workspace/editor/ConflictStrip.tsx +77 -0
- package/src/client/components/workspace/editor/Dialogs.tsx +53 -0
- package/src/client/components/workspace/editor/EmptyEditor.tsx +23 -0
- package/src/client/components/workspace/editor/ExternalChangeStrip.tsx +61 -0
- package/src/client/components/workspace/editor/FileDocument.tsx +146 -63
- package/src/client/components/workspace/editor/FilePane.tsx +47 -7
- package/src/client/components/workspace/editor/FindWidget.test.ts +9 -5
- package/src/client/components/workspace/editor/FindWidget.tsx +36 -2
- package/src/client/components/workspace/editor/GoToLineModal.tsx +123 -0
- package/src/client/components/workspace/editor/Notices.tsx +71 -0
- package/src/client/components/workspace/editor/Pane.tsx +118 -0
- package/src/client/components/workspace/editor/PluginColumn.tsx +32 -0
- package/src/client/components/workspace/editor/QuickOpenModal.tsx +146 -0
- package/src/client/components/workspace/editor/SaveAsModal.tsx +175 -0
- package/src/client/components/workspace/editor/SplitColumn.tsx +98 -0
- package/src/client/components/workspace/editor/SplitPane.tsx +57 -0
- package/src/client/components/workspace/editor/StatusBar.tsx +106 -0
- package/src/client/components/workspace/editor/TabContextMenu.tsx +75 -0
- package/src/client/components/workspace/editor/Tabs.tsx +195 -18
- package/src/client/components/workspace/editor/Toolbar.tsx +110 -140
- package/src/client/components/workspace/editor/index.tsx +201 -193
- package/src/client/components/workspace/editor/props.ts +64 -0
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +300 -0
- package/src/client/components/workspace/file-explorer/Modals.tsx +14 -1
- package/src/client/components/workspace/file-explorer/OutlineSection.test.tsx +18 -0
- package/src/client/components/workspace/file-explorer/OutlineSection.tsx +10 -3
- package/src/client/components/workspace/file-explorer/TreeItem.tsx +2 -1
- package/src/client/components/workspace/file-explorer/clipboard.test.ts +3 -1
- package/src/client/components/workspace/file-explorer/index.test.ts +61 -0
- package/src/client/components/workspace/file-explorer/index.tsx +10 -48
- package/src/client/components/workspace/file-explorer/local-edit.test.ts +8 -3
- package/src/client/components/workspace/search-panel/Body.tsx +7 -2
- package/src/client/components/workspace/worktree-modal/index.test.tsx +118 -0
- package/src/client/hooks/chat/composer/file-drop.ts +22 -37
- package/src/client/hooks/chat/composer/pipeline.test.ts +76 -0
- package/src/client/hooks/chat/composer/pipeline.ts +12 -1
- package/src/client/hooks/chat/omp/reconnect.test.ts +338 -0
- package/src/client/hooks/chat/omp/reconnect.ts +187 -0
- package/src/client/hooks/chat/omp/run-liveness.test.ts +71 -0
- package/src/client/hooks/chat/omp/run-liveness.ts +65 -0
- package/src/client/hooks/chat/omp/session-list.activity.test.ts +114 -0
- package/src/client/hooks/chat/omp/session-list.test-util.ts +164 -0
- package/src/client/hooks/chat/omp/session-list.test.ts +30 -150
- package/src/client/hooks/chat/omp/session-list.tsx +69 -9
- package/src/client/hooks/chat/timeline/generating.ts +19 -2
- package/src/client/hooks/chat/timeline/index.ts +19 -24
- package/src/client/hooks/chat/timeline/lost-run.test.ts +329 -0
- package/src/client/hooks/chat/timeline/lost-run.ts +177 -0
- package/src/client/hooks/chat/timeline/session-load.test-util.ts +205 -0
- package/src/client/hooks/chat/timeline/session-load.test.ts +61 -162
- package/src/client/hooks/chat/timeline/session-load.ts +69 -37
- package/src/client/hooks/chat/timeline/session-switch.test.ts +65 -0
- package/src/client/hooks/chat/timeline/session-switch.ts +63 -0
- package/src/client/hooks/code/deferred-highlight.test.ts +182 -0
- package/src/client/hooks/code/deferred-highlight.ts +129 -0
- package/src/client/hooks/editor/caret-position.test.ts +58 -0
- package/src/client/hooks/editor/caret-position.ts +48 -0
- package/src/client/hooks/editor/file-editor-types.ts +200 -0
- package/src/client/hooks/editor/find-history.test.ts +132 -0
- package/src/client/hooks/editor/find-history.ts +46 -0
- package/src/client/hooks/editor/find-selection-range.test.ts +100 -0
- package/src/client/hooks/editor/find-selection-range.ts +49 -0
- package/src/client/hooks/editor/find-state.ts +14 -1
- package/src/client/hooks/editor/font.test.ts +0 -93
- package/src/client/hooks/editor/indent-settings.test.ts +104 -0
- package/src/client/hooks/editor/indent-settings.ts +88 -0
- package/src/client/hooks/editor/quick-open.test.ts +141 -0
- package/src/client/hooks/editor/quick-open.ts +127 -0
- package/src/client/hooks/editor/save-as.test.ts +156 -0
- package/src/client/hooks/editor/save-as.ts +122 -0
- package/src/client/hooks/editor/save-file.test.ts +179 -0
- package/src/client/hooks/editor/save-file.ts +73 -28
- package/src/client/hooks/editor/theme.test.ts +206 -0
- package/src/client/hooks/editor/theme.ts +82 -0
- package/src/client/hooks/editor/typing-settings.test.ts +73 -0
- package/src/client/hooks/editor/typing-settings.ts +65 -0
- package/src/client/hooks/editor/use-close-guard.ts +98 -0
- package/src/client/hooks/editor/use-editor-drop-overlay.test.ts +159 -0
- package/src/client/hooks/editor/use-editor-drop.shell.test.ts +224 -0
- package/src/client/hooks/editor/use-editor-drop.test.ts +101 -0
- package/src/client/hooks/editor/use-editor-drop.ts +120 -77
- package/src/client/hooks/editor/use-editor-find.test.ts +2 -2
- package/src/client/hooks/editor/use-editor-find.ts +45 -10
- package/src/client/hooks/editor/use-editor-panel-keys.ts +152 -0
- package/src/client/hooks/editor/use-editor-tab-state.ts +71 -0
- package/src/client/hooks/editor/use-external-change-notice.ts +71 -0
- package/src/client/hooks/editor/use-external-change.test.ts +88 -0
- package/src/client/hooks/editor/use-external-change.ts +146 -0
- package/src/client/hooks/editor/use-file-editor.ts +83 -116
- package/src/client/hooks/editor/use-file-read.ts +16 -8
- package/src/client/hooks/editor/use-file-writes.ts +28 -3
- package/src/client/hooks/editor/use-mobile-editor-find.ts +69 -0
- package/src/client/hooks/editor/use-mobile-reveal.ts +53 -0
- package/src/client/hooks/editor/use-outline-view.test.ts +182 -0
- package/src/client/hooks/editor/use-outline-view.ts +94 -7
- package/src/client/hooks/editor/use-scroll-restore.test.ts +55 -2
- package/src/client/hooks/editor/use-scroll-restore.ts +124 -4
- package/src/client/hooks/editor/use-search-reveal-jump.ts +57 -0
- package/src/client/hooks/editor/use-search-reveal.ts +1 -1
- package/src/client/hooks/editor/use-split-editor.test.tsx +169 -0
- package/src/client/hooks/editor/use-split-editor.ts +91 -0
- package/src/client/hooks/editor/use-unload-guard.tsx +117 -0
- package/src/client/hooks/editor/use-write-conflict.test.ts +164 -0
- package/src/client/hooks/editor/use-write-conflict.ts +152 -0
- package/src/client/hooks/editor/wheel-zoom.test.ts +141 -0
- package/src/client/hooks/editor/wheel-zoom.ts +96 -0
- package/src/client/hooks/ui/drag-presence.test.ts +193 -0
- package/src/client/hooks/ui/drag-presence.ts +108 -0
- package/src/client/hooks/ui/settings-modal.test.ts +115 -0
- package/src/client/hooks/ui/settings-modal.ts +56 -0
- package/src/client/hooks/ui/updates/shell-download.test.ts +2 -0
- package/src/client/hooks/ui/updates/shell-download.ts +55 -14
- package/src/client/hooks/ui/updates/shell-offer.test.ts +26 -0
- package/src/client/hooks/ui/updates/shell-update.test.ts +140 -0
- package/src/client/hooks/ui/updates/shell-update.ts +119 -0
- package/src/client/hooks/workspace/diff-file.ts +29 -10
- package/src/client/hooks/workspace/diff-git-actions.ts +147 -0
- package/src/client/hooks/workspace/editor-view.ts +61 -0
- package/src/client/hooks/workspace/file-listing.ts +36 -24
- package/src/client/hooks/workspace/file-tabs.test.ts +152 -5
- package/src/client/hooks/workspace/file-tabs.ts +70 -11
- package/src/client/hooks/workspace/file-tree-edits.ts +103 -0
- package/src/client/hooks/workspace/navbar-session-actions.ts +72 -0
- package/src/client/hooks/workspace/worktree/index.ts +20 -5
- package/src/client/lib/desktop/bridge.ts +45 -0
- package/src/client/lib/desktop/dropped-paths.ts +83 -0
- package/src/client/lib/editor/tab-menu.test.ts +127 -0
- package/src/client/lib/editor/tab-menu.ts +127 -0
- package/src/client/lib/editor-dirty-tabs.test.ts +102 -0
- package/src/client/lib/editor-dirty-tabs.ts +103 -0
- package/src/client/lib/native/resume.test.ts +66 -0
- package/src/client/lib/native/resume.ts +42 -0
- package/src/client/lib/search-reveal.ts +1 -1
- package/src/client/main.tsx +13 -1
- package/src/client/tailwind.css +75 -8
- package/src/server/lib/auth/guard.test.ts +28 -0
- package/src/server/lib/auth/guard.ts +10 -0
- package/src/server/lib/bundler/css.test.ts +31 -0
- package/src/server/lib/fs/listing.test.ts +81 -16
- package/src/server/lib/fs/listing.ts +72 -5
- package/src/server/lib/fs/worktree/create.ts +2 -3
- package/src/server/lib/fs/worktree/list.ts +13 -0
- package/src/server/lib/fs/worktree/remove.ts +3 -3
- package/src/server/lib/fs/write-conflict.test.ts +68 -0
- package/src/server/lib/fs/write-conflict.ts +84 -0
- package/src/server/lib/lifecycle/claim-port.test.ts +156 -0
- package/src/server/lib/lifecycle/port-guard.test.ts +20 -164
- package/src/server/lib/lifecycle/port-guard.ts +39 -7
- package/src/server/lib/lifecycle/probe-health.test.ts +166 -0
- package/src/server/lib/lifecycle/probe.test.ts +77 -164
- package/src/server/lib/lifecycle/probe.ts +121 -13
- package/src/server/lib/omp/rpc/frame-fold-signals.test.ts +112 -0
- package/src/server/lib/omp/rpc/frame-fold.ts +10 -5
- package/src/server/lib/omp/session/sidebar-activity.server.test.ts +162 -0
- package/src/server/lib/omp/session/sidebar-activity.server.ts +70 -0
- package/src/server/lib/omp/session/telemetry/compute.ts +13 -1
- package/src/server/lib/omp/session/telemetry.test.ts +33 -0
- package/src/server/lib/realtime/signals.server.ts +10 -0
- package/src/server/lib/realtime/topics/catalog.server.ts +4 -1
- package/src/server/lib/realtime/topics.server.ts +16 -0
- package/src/server/lib/updates/shell-assets.ts +94 -3
- package/src/server/lib/updates/shell-cache.ts +105 -0
- package/src/server/lib/updates/shell-pages.test.ts +33 -2
- package/src/server/lib/updates/shell-pages.ts +17 -5
- package/src/server/lib/updates/shell-release-desktop.test.ts +166 -0
- package/src/server/lib/updates/shell-release.test.ts +10 -27
- package/src/server/lib/updates/shell-release.ts +107 -111
- package/src/server/routes/fs/action-save-as.test.ts +82 -0
- package/src/server/routes/fs/action.test.ts +82 -0
- package/src/server/routes/fs/action.ts +54 -1
- package/src/server/routes/fs/exists.ts +11 -1
- package/src/server/routes/fs/git-merge.test.ts +11 -1
- package/src/server/routes/fs/read.test.ts +24 -7
- package/src/server/routes/fs/read.ts +6 -1
- package/src/server/routes/fs/scope.test.ts +15 -10
- package/src/server/routes/fs/scope.ts +3 -14
- package/src/server/routes/updates/android.ts +6 -1
- package/src/server/routes/updates/desktop.ts +29 -7
- package/src/server/routes/updates/ios.ts +5 -1
- package/src/server/routes/worktrees/list.ts +11 -1
- package/src/server/routes/worktrees/routes.test.ts +17 -0
- package/src/shared/lib/chat/timeline/omp-callbacks.test.ts +36 -0
- package/src/shared/lib/chat/timeline/omp-callbacks.ts +18 -0
- package/src/shared/lib/chat/timeline/run-signals.test.ts +2 -0
- package/src/shared/lib/code/editor/comment-syntax.test.ts +37 -0
- package/src/shared/lib/code/editor/comment-syntax.ts +55 -0
- package/src/shared/lib/code/editor/find-replace.test.ts +134 -0
- package/src/shared/lib/code/editor/{find.ts → find-replace.ts} +23 -107
- package/src/shared/lib/code/editor/{find.test.ts → find-scan.test.ts} +20 -74
- package/src/shared/lib/code/editor/find-scan.ts +198 -0
- package/src/shared/lib/code/editor/find-selection.test.ts +56 -0
- package/src/shared/lib/code/editor/indent-guide-rule.test.ts +65 -0
- package/src/shared/lib/code/editor/indent-guide-rule.ts +47 -0
- package/src/shared/lib/code/editor/indent-rules.test.ts +219 -0
- package/src/shared/lib/code/editor/indent-rules.ts +198 -0
- package/src/shared/lib/code/editor/keymap.test.ts +23 -0
- package/src/shared/lib/code/editor/keymap.ts +43 -6
- package/src/shared/lib/code/editor/lines.test.ts +7 -55
- package/src/shared/lib/code/editor/lines.ts +8 -48
- package/src/shared/lib/code/editor/marks.test.ts +4 -5
- package/src/shared/lib/code/editor/marks.ts +13 -25
- package/src/shared/lib/code/editor/palette.test.ts +25 -2
- package/src/shared/lib/code/editor/palette.ts +10 -0
- package/src/shared/lib/code/editor/stream-modes.ts +225 -0
- package/src/shared/lib/code/editor/theme-loader.ts +97 -0
- package/src/shared/lib/code/editor/themes.generated.ts +156 -0
- package/src/shared/lib/code/editor/themes.test.ts +165 -0
- package/src/shared/lib/code/editor/themes.ts +165 -0
- package/src/shared/lib/code/highlight-memo.test.ts +103 -0
- package/src/shared/lib/code/highlight-memo.ts +149 -0
- package/src/shared/lib/code/highlighter-warmup.ts +112 -0
- package/src/shared/lib/code/highlighter.ts +3 -1
- package/src/shared/lib/code/idle.ts +37 -0
- package/src/shared/lib/code/outline/rows.test.ts +96 -0
- package/src/shared/lib/code/outline/rows.ts +94 -0
- package/src/shared/lib/code/syntax-highlight.test.ts +2 -80
- package/src/shared/lib/code/syntax-highlight.ts +2 -3
- package/src/shared/lib/fs/file-kind-classify.test.ts +25 -11
- package/src/shared/lib/fs/file-kind.ts +47 -13
- package/src/shared/lib/fs/file-tree.test.ts +41 -0
- package/src/shared/lib/fs/file-tree.ts +126 -34
- package/src/shared/lib/fs/file-url.test.ts +52 -0
- package/src/shared/lib/fs/file-url.ts +37 -0
- package/src/shared/lib/fs/folder-chain.test.ts +87 -0
- package/src/shared/lib/fs/folder-chain.ts +91 -0
- package/src/shared/lib/fs/fs-helpers.test.ts +4 -50
- package/src/shared/lib/fs/patch-sides.test.ts +114 -0
- package/src/shared/lib/fs/patch-sides.ts +139 -0
- package/src/shared/lib/realtime/connection.test.ts +5 -1
- package/src/shared/lib/realtime/connection.ts +25 -119
- package/src/shared/lib/realtime/frozen-recovery.test.ts +93 -0
- package/src/shared/lib/realtime/protocol.ts +16 -0
- package/src/shared/lib/realtime/resume.ts +223 -0
- package/src/shared/lib/realtime/state.ts +22 -0
- package/src/shared/lib/realtime/watchdog-wiring.test.ts +224 -0
- package/src/shared/lib/realtime/watchdog.test.ts +99 -0
- package/src/shared/lib/realtime/watchdog.ts +72 -0
- package/src/shared/lib/ui/toolbar-overflow.test.ts +83 -0
- package/src/shared/lib/ui/toolbar-overflow.ts +86 -0
- package/src/shared/lib/updates/shell-arch.ts +54 -0
- package/src/shared/lib/updates/shell-ua.ts +4 -4
- package/src/shared/lib/workspace/editor-view-mode.test.ts +70 -0
- package/src/shared/lib/workspace/editor-view-mode.ts +48 -0
- package/src/shared/lib/workspace/panel-widths.test.ts +30 -0
- package/src/shared/lib/workspace/panel-widths.ts +25 -5
- package/src/shared/lib/workspace/session-state/cache.ts +159 -0
- package/src/shared/lib/workspace/session-state/harness.test-util.ts +55 -0
- package/src/shared/lib/workspace/session-state/merge.ts +100 -0
- package/src/shared/lib/workspace/session-state/store-load.test.ts +206 -0
- package/src/shared/lib/workspace/session-state/store.test.ts +17 -139
- package/src/shared/lib/workspace/session-state/store.ts +92 -130
- package/src/shared/lib/workspace/split-editor.test.ts +104 -0
- package/src/shared/lib/workspace/split-editor.ts +129 -0
- package/src/shared/lib/workspace/workspace-panel-widths.ts +124 -0
- package/src/shared/types/realtime.ts +29 -0
- package/src/shared/types/settings/state.ts +10 -0
- package/src/test-support/file-explorer-disk.test-util.ts +30 -3
- package/src/test-support/loopback.ts +183 -0
- package/src/test-support/pristine-globals.ts +7 -0
- package/dist/client/static/js/index-gtbpewr7.css +0 -1
- package/src/client/components/common/code-editor/handler.test.ts +0 -274
- package/src/client/components/common/code-editor/handler.ts +0 -175
- package/src/client/components/common/code-editor/index.tsx +0 -314
- package/src/client/components/common/code-surface/measure.ts +0 -148
- package/src/client/components/workspace/chat-timeline/target-picker/index.test.tsx +0 -227
- package/src/client/components/workspace/chat-timeline/target-picker/index.tsx +0 -260
- package/src/client/components/workspace/diff-panel/SplitView.tsx +0 -209
- package/src/client/components/workspace/diff-panel/UnifiedView.tsx +0 -150
- package/src/client/hooks/editor/scroll-container.test.ts +0 -102
- package/src/client/hooks/editor/scroll-container.ts +0 -26
- package/src/client/hooks/editor/use-code-window.ts +0 -100
- package/src/client/hooks/editor/use-editor-history.test.ts +0 -216
- package/src/client/hooks/editor/use-editor-history.ts +0 -134
- package/src/client/hooks/editor/use-occurrences.test.ts +0 -236
- package/src/client/hooks/editor/use-occurrences.ts +0 -98
- package/src/shared/lib/code/editor/commands.test.ts +0 -155
- package/src/shared/lib/code/editor/commands.ts +0 -260
- package/src/shared/lib/code/editor/edits.test.ts +0 -100
- package/src/shared/lib/code/editor/edits.ts +0 -122
- package/src/shared/lib/code/editor/history.test.ts +0 -118
- package/src/shared/lib/code/editor/history.ts +0 -101
- package/src/shared/lib/code/editor/layers.test.ts +0 -77
- package/src/shared/lib/code/editor/layers.ts +0 -67
- package/src/shared/lib/code/editor/line-edits.test.ts +0 -131
- package/src/shared/lib/code/editor/line-edits.ts +0 -159
- package/src/shared/lib/code/editor/occurrences.test.ts +0 -117
- package/src/shared/lib/code/editor/occurrences.ts +0 -111
- package/src/shared/lib/code/editor/reset-css.test.ts +0 -35
- package/src/shared/lib/code/editor/reset-css.ts +0 -32
- package/src/shared/lib/code/editor/text-commands.test.ts +0 -178
- package/src/shared/lib/code/editor/text-commands.ts +0 -154
- package/src/shared/lib/code/lazy-window.test.ts +0 -161
- package/src/shared/lib/code/lazy-window.ts +0 -156
- package/src/shared/lib/code/windowed-highlight.ts +0 -114
- package/src/shared/lib/fs/diff-parser.test.ts +0 -116
- package/src/shared/lib/fs/diff-parser.ts +0 -213
|
@@ -12,8 +12,13 @@
|
|
|
12
12
|
* filter at all: every entry is listed, and the `ignored` flag (one
|
|
13
13
|
* `git check-ignore` per listing) is what marks the untracked ones for dimming.
|
|
14
14
|
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
15
|
+
* The other half is the COLLAPSE: a folder holding exactly one folder and
|
|
16
|
+
* nothing else becomes one row naming the whole chain, which is what keeps a
|
|
17
|
+
* Java package tree (`com/java/app/package`) from spending four rows to reach
|
|
18
|
+
* the files inside it.
|
|
19
|
+
*
|
|
20
|
+
* Driven against a real temp directory, because the listing stats every entry,
|
|
21
|
+
* walks every single-child chain and asks git about it.
|
|
17
22
|
*/
|
|
18
23
|
|
|
19
24
|
import { afterEach, describe, expect, test } from 'bun:test';
|
|
@@ -48,9 +53,11 @@ describe('listDirectoryEntries', () => {
|
|
|
48
53
|
expect(names).toContain('dist');
|
|
49
54
|
expect(names).toContain('build');
|
|
50
55
|
expect(names).toContain('src');
|
|
51
|
-
// No name table: the panel must be able to reach anything on disk.
|
|
52
|
-
|
|
53
|
-
|
|
56
|
+
// No name table: the panel must be able to reach anything on disk. A
|
|
57
|
+
// dependency folder is a single-child chain on its own, so it is listed by
|
|
58
|
+
// the chain it collapses to — `node_modules/preact`, not `node_modules`.
|
|
59
|
+
expect(names).toContain('node_modules/preact');
|
|
60
|
+
expect(names).toContain('.git/objects');
|
|
54
61
|
});
|
|
55
62
|
|
|
56
63
|
test('a nested dist is listed where it lives, not filtered by name', async () => {
|
|
@@ -58,17 +65,14 @@ describe('listDirectoryEntries', () => {
|
|
|
58
65
|
mkdirs(root, ['packages/android/dist', 'packages/core']);
|
|
59
66
|
|
|
60
67
|
const packages = await listDirectoryEntries(path.join(root, 'packages'), root);
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
expect(
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
// backslash — left the whole listing un-dimmed there. This assertion is the
|
|
70
|
-
// guard; it is what failed on the Windows CI leg.
|
|
71
|
-
expect(android[0]!.path).toBe('packages/android/dist');
|
|
68
|
+
// `android` holds nothing but `dist`, so the two collapse into one row —
|
|
69
|
+
// and the path still names the deepest directory, which is the one whose
|
|
70
|
+
// contents the row expands into.
|
|
71
|
+
expect(packages.map((entry) => entry.name)).toEqual(['android/dist', 'core']);
|
|
72
|
+
expect(packages[0]!.path).toBe('packages/android/dist');
|
|
73
|
+
|
|
74
|
+
const dist = await listDirectoryEntries(path.join(root, 'packages/android/dist'), root);
|
|
75
|
+
expect(dist).toEqual([]);
|
|
72
76
|
});
|
|
73
77
|
|
|
74
78
|
test('folders sort before files, and dot-entries are listed', async () => {
|
|
@@ -84,3 +88,64 @@ describe('listDirectoryEntries', () => {
|
|
|
84
88
|
expect(names).toEqual(['zebra', '.env', 'alpha.txt']);
|
|
85
89
|
});
|
|
86
90
|
});
|
|
91
|
+
|
|
92
|
+
describe('single-child chains', () => {
|
|
93
|
+
test('a package tree collapses into one row naming the whole chain', async () => {
|
|
94
|
+
const root = makeRoot();
|
|
95
|
+
fs.mkdirSync(path.join(root, 'com/java/app/package'), { recursive: true });
|
|
96
|
+
fs.writeFileSync(path.join(root, 'com/java/app/package/Main.java'), 'class Main {}\n');
|
|
97
|
+
|
|
98
|
+
const entries = await listDirectoryEntries(root, root);
|
|
99
|
+
|
|
100
|
+
expect(entries).toHaveLength(1);
|
|
101
|
+
expect(entries[0]!.name).toBe('com/java/app/package');
|
|
102
|
+
expect(entries[0]!.path).toBe('com/java/app/package');
|
|
103
|
+
expect(entries[0]!.id).toBe('com/java/app/package');
|
|
104
|
+
expect(entries[0]!.type).toBe('folder');
|
|
105
|
+
// The chain's own levels are never listed, so the panel reads one directory
|
|
106
|
+
// to show the row and one more when it expands.
|
|
107
|
+
const inner = await listDirectoryEntries(path.join(root, 'com/java/app/package'), root);
|
|
108
|
+
expect(inner.map((entry) => entry.name)).toEqual(['Main.java']);
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
test('a chain stops at the first level that holds a file', async () => {
|
|
112
|
+
const root = makeRoot();
|
|
113
|
+
fs.mkdirSync(path.join(root, 'a/b/c'), { recursive: true });
|
|
114
|
+
fs.writeFileSync(path.join(root, 'a/b/README.md'), 'x\n');
|
|
115
|
+
|
|
116
|
+
const entries = await listDirectoryEntries(root, root);
|
|
117
|
+
|
|
118
|
+
// `a` holds nothing but `b`, so the walk continues; `b` holds a folder AND a
|
|
119
|
+
// file, so it is where the chain ends.
|
|
120
|
+
expect(entries.map((entry) => entry.name)).toEqual(['a/b']);
|
|
121
|
+
const insideB = await listDirectoryEntries(path.join(root, 'a/b'), root);
|
|
122
|
+
expect(insideB.map((entry) => entry.name)).toEqual(['c', 'README.md']);
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
test('two folders never collapse, and neither does an empty one', async () => {
|
|
126
|
+
const root = makeRoot();
|
|
127
|
+
mkdirs(root, ['pair/one', 'pair/two', 'empty']);
|
|
128
|
+
|
|
129
|
+
const entries = await listDirectoryEntries(root, root);
|
|
130
|
+
|
|
131
|
+
expect(entries.map((entry) => entry.name)).toEqual(['empty', 'pair']);
|
|
132
|
+
const pair = await listDirectoryEntries(path.join(root, 'pair'), root);
|
|
133
|
+
expect(pair.map((entry) => entry.name)).toEqual(['one', 'two']);
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
test('a git-ignored chain is dimmed from its deepest directory', async () => {
|
|
137
|
+
const root = makeRoot();
|
|
138
|
+
fs.mkdirSync(path.join(root, 'a/b/c'), { recursive: true });
|
|
139
|
+
fs.writeFileSync(path.join(root, 'a/b/c/f.txt'), 'x\n');
|
|
140
|
+
fs.writeFileSync(path.join(root, '.gitignore'), 'a/\n');
|
|
141
|
+
Bun.spawnSync({ cmd: ['git', 'init', '-q'], cwd: root });
|
|
142
|
+
|
|
143
|
+
const entries = await listDirectoryEntries(root, root);
|
|
144
|
+
|
|
145
|
+
const row = entries.find((entry) => entry.path === 'a/b/c');
|
|
146
|
+
expect(row?.name).toBe('a/b/c');
|
|
147
|
+
// A rule matching an OUTER level of the chain answers for the deepest one
|
|
148
|
+
// too (verified against `git check-ignore`), which is the path the row names.
|
|
149
|
+
expect(row?.ignored).toBe(true);
|
|
150
|
+
});
|
|
151
|
+
});
|
|
@@ -27,6 +27,46 @@ export interface DirectoryEntry {
|
|
|
27
27
|
ignored: boolean;
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
+
/** How deep a collapsed chain may go before the listing stops walking. */
|
|
31
|
+
const MAX_CHAIN_DEPTH = 32;
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* The segments a single-child folder chain runs through, starting at `dir`.
|
|
35
|
+
*
|
|
36
|
+
* A row per directory level spends a row on each level of a package tree, and
|
|
37
|
+
* the reader scrolls through `com`, `java`, `app`, `package` to reach the four
|
|
38
|
+
* files inside. Every editor collapses that, so the listing does too: the row
|
|
39
|
+
* names the whole chain and expands into the DEEPEST directory's contents.
|
|
40
|
+
*
|
|
41
|
+
* Stops at the first directory that holds anything other than exactly one
|
|
42
|
+
* FOLDER — a file, two entries, or nothing at all ends the chain, so a folder
|
|
43
|
+
* of files never folds. The last directory's own contents are a later read, and
|
|
44
|
+
* probing one level past what the row displays would stat a directory nothing
|
|
45
|
+
* shows.
|
|
46
|
+
*/
|
|
47
|
+
async function folderChain(dir: string): Promise<string[]> {
|
|
48
|
+
const segments = [path.basename(dir)];
|
|
49
|
+
let current = dir;
|
|
50
|
+
for (let depth = 1; depth < MAX_CHAIN_DEPTH; depth += 1) {
|
|
51
|
+
let entries: string[];
|
|
52
|
+
try {
|
|
53
|
+
entries = await fs.promises.readdir(current);
|
|
54
|
+
} catch {
|
|
55
|
+
return segments;
|
|
56
|
+
}
|
|
57
|
+
if (entries.length !== 1) return segments;
|
|
58
|
+
const child = path.join(current, entries[0]!);
|
|
59
|
+
try {
|
|
60
|
+
if (!(await Bun.file(child).stat()).isDirectory()) return segments;
|
|
61
|
+
} catch {
|
|
62
|
+
return segments; // unreadable / broken symlink — the row ends here
|
|
63
|
+
}
|
|
64
|
+
segments.push(entries[0]!);
|
|
65
|
+
current = child;
|
|
66
|
+
}
|
|
67
|
+
return segments;
|
|
68
|
+
}
|
|
69
|
+
|
|
30
70
|
/**
|
|
31
71
|
* Read one directory, folders first then files, each marked ignored or not.
|
|
32
72
|
*
|
|
@@ -38,6 +78,14 @@ export interface DirectoryEntry {
|
|
|
38
78
|
* which dims the row via `git check-ignore` instead of deleting it — and a tree
|
|
39
79
|
* that is expensive to expand costs nothing until someone expands it, because
|
|
40
80
|
* children are lazy.
|
|
81
|
+
*
|
|
82
|
+
* A folder holding exactly one folder and nothing else is COLLAPSED into one
|
|
83
|
+
* row naming the chain (`folderChain`). Its `path` is the DEEPEST directory —
|
|
84
|
+
* the one whose contents the row will show, and the one the panel opens,
|
|
85
|
+
* renames and drops on — while `name` is the whole chain relative to the
|
|
86
|
+
* directory being listed, so the row still reads as a path. The client's local
|
|
87
|
+
* edits fold by the same rule (`foldSingleChildFolders`, `lib/fs/file-tree.ts`);
|
|
88
|
+
* two spellings of it is how a create would draw a tree the next read undoes.
|
|
41
89
|
*/
|
|
42
90
|
export async function listDirectoryEntries(dirPath: string, rootPath: string): Promise<DirectoryEntry[]> {
|
|
43
91
|
const listed = (await fs.promises.readdir(dirPath))
|
|
@@ -53,22 +101,41 @@ export async function listDirectoryEntries(dirPath: string, rootPath: string): P
|
|
|
53
101
|
return { child, full, rel };
|
|
54
102
|
});
|
|
55
103
|
|
|
56
|
-
const ignored = await collectIgnoredPaths(rootPath, listed.map((entry) => entry.rel));
|
|
57
|
-
|
|
58
104
|
const mapped = await Promise.all(listed.map(async ({ child, full, rel }): Promise<DirectoryEntry | null> => {
|
|
59
105
|
try {
|
|
60
106
|
const st = await Bun.file(full).stat();
|
|
61
|
-
const isIgnored = ignored.has(rel);
|
|
62
107
|
if (st.isDirectory()) {
|
|
63
|
-
|
|
108
|
+
const chain = await folderChain(full);
|
|
109
|
+
if (chain.length > 1) {
|
|
110
|
+
const collapsedPath = `${rel}/${chain.slice(1).join('/')}`;
|
|
111
|
+
return {
|
|
112
|
+
id: collapsedPath,
|
|
113
|
+
name: chain.join('/'),
|
|
114
|
+
type: 'folder',
|
|
115
|
+
path: collapsedPath,
|
|
116
|
+
children: null,
|
|
117
|
+
is_expanded: 0,
|
|
118
|
+
ignored: false,
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
return { id: rel, name: child, type: 'folder', path: rel, children: null, is_expanded: 0, ignored: false };
|
|
64
122
|
}
|
|
65
|
-
return { id: rel, name: child, type: 'file', path: rel, ignored:
|
|
123
|
+
return { id: rel, name: child, type: 'file', path: rel, ignored: false };
|
|
66
124
|
} catch {
|
|
67
125
|
return null; // unreadable entry / broken symlink — skip
|
|
68
126
|
}
|
|
69
127
|
}));
|
|
70
128
|
|
|
71
129
|
const result = mapped.filter((entry): entry is DirectoryEntry => entry !== null);
|
|
130
|
+
// One `git check-ignore` for the whole listing. A collapsed row is asked about
|
|
131
|
+
// its DEEPEST directory: that is the path the row names, and a rule matching
|
|
132
|
+
// any level of the chain matches it too (verified — `.gitignore` holding `a/`
|
|
133
|
+
// answers for `a`, `a/b` and `a/b/c` alike), so no level is left un-asked.
|
|
134
|
+
const ignored = await collectIgnoredPaths(rootPath, result.map((entry) => entry.path));
|
|
135
|
+
for (const entry of result) {
|
|
136
|
+
if (ignored.has(entry.path)) entry.ignored = true;
|
|
137
|
+
}
|
|
138
|
+
|
|
72
139
|
result.sort((a, b) => {
|
|
73
140
|
if (a.type === 'folder' && b.type === 'file') return -1;
|
|
74
141
|
if (a.type === 'file' && b.type === 'folder') return 1;
|
|
@@ -45,7 +45,7 @@ import {
|
|
|
45
45
|
resolveConfiguredWorktreeRoot,
|
|
46
46
|
resolveTargetDirectory,
|
|
47
47
|
} from '@/server/lib/fs/worktree/location';
|
|
48
|
-
import { findBranchInUse, refExists } from '@/server/lib/fs/worktree/list';
|
|
48
|
+
import { findBranchInUse, isWorkTree, refExists } from '@/server/lib/fs/worktree/list';
|
|
49
49
|
import { resolveProjectId } from '@/server/lib/fs/worktree/project-id';
|
|
50
50
|
|
|
51
51
|
/**
|
|
@@ -113,8 +113,7 @@ export async function planWorktree(
|
|
|
113
113
|
deps: Pick<CreateWorktreeDeps, 'identityFor' | 'dataDir' | 'configuredDirectory'>,
|
|
114
114
|
): Promise<{ primaryRoot: string; projectId: string; root: string; name: string; directory: string; branch: string; startRef: string }> {
|
|
115
115
|
const projectPath = path.resolve(input.projectPath);
|
|
116
|
-
|
|
117
|
-
if (insideWorkTree.exitCode !== 0 || insideWorkTree.stdout.trim() !== 'true') {
|
|
116
|
+
if (!(await isWorkTree(projectPath))) {
|
|
118
117
|
throw new WorktreeError('not_a_repo', 'This folder is not a Git repository.');
|
|
119
118
|
}
|
|
120
119
|
|
|
@@ -116,6 +116,19 @@ export async function listWorktrees(cwd: string): Promise<WorktreeEntry[]> {
|
|
|
116
116
|
return entries;
|
|
117
117
|
}
|
|
118
118
|
|
|
119
|
+
/**
|
|
120
|
+
* Whether `cwd` is inside a work tree at all.
|
|
121
|
+
*
|
|
122
|
+
* The check a plain directory fails, and the one every caller here needs before
|
|
123
|
+
* it may talk about worktrees: `git worktree list` in a non-repository exits
|
|
124
|
+
* non-zero, so without this a notes folder bound as a workspace reads as a
|
|
125
|
+
* BROKEN repository rather than as one that has none.
|
|
126
|
+
*/
|
|
127
|
+
export async function isWorkTree(cwd: string): Promise<boolean> {
|
|
128
|
+
const probe = await runGit(['rev-parse', '--is-inside-work-tree'], { cwd });
|
|
129
|
+
return probe.exitCode === 0 && probe.stdout.trim() === 'true';
|
|
130
|
+
}
|
|
131
|
+
|
|
119
132
|
/** Whether `branch` is checked out in any worktree of this repository, and where. */
|
|
120
133
|
export async function findBranchInUse(cwd: string, branch: string): Promise<{ path: string } | null> {
|
|
121
134
|
const entries = await listWorktrees(cwd);
|
|
@@ -23,7 +23,7 @@ import { canonicalPath, pathHolds } from '@/server/lib/fs/canonical';
|
|
|
23
23
|
import { runGit } from '@/server/lib/fs/git-run';
|
|
24
24
|
import { resolveProjectRoot } from '@/server/lib/omp/core/worktree';
|
|
25
25
|
import { WorktreeError } from '@/server/lib/fs/worktree/errors';
|
|
26
|
-
import { listWorktrees } from '@/server/lib/fs/worktree/list';
|
|
26
|
+
import { isWorkTree, listWorktrees } from '@/server/lib/fs/worktree/list';
|
|
27
27
|
|
|
28
28
|
/** Changed + untracked count in `directory`; 0 when git cannot answer. */
|
|
29
29
|
export async function dirtyCount(directory: string): Promise<number> {
|
|
@@ -85,8 +85,8 @@ export async function removeWorktree(
|
|
|
85
85
|
const requested = path.resolve(input.worktreePath);
|
|
86
86
|
const insideManagedRoot = input.managedRoot ? await pathHolds(input.managedRoot, requested) : false;
|
|
87
87
|
|
|
88
|
-
const insideWorkTree = await
|
|
89
|
-
if (insideWorkTree
|
|
88
|
+
const insideWorkTree = await isWorkTree(input.projectPath);
|
|
89
|
+
if (!insideWorkTree) {
|
|
90
90
|
throw new WorktreeError('not_a_repo', 'This folder is not a Git repository.');
|
|
91
91
|
}
|
|
92
92
|
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The write-conflict rules, as a pure function plus its request parser.
|
|
8
|
+
*
|
|
9
|
+
* Three branches that all look alike in a handler, and each is a different
|
|
10
|
+
* decision:
|
|
11
|
+
*
|
|
12
|
+
* - no base → no expectation (a handle-backed file, an older client);
|
|
13
|
+
* - the file is gone → not a conflict (recreating it is `confirmSaveMissing`'s
|
|
14
|
+
* decision, already made by the caller);
|
|
15
|
+
* - the mtime moved → a conflict, carrying the CURRENT value so the client can
|
|
16
|
+
* offer Reload/Keep instead of reporting a failure.
|
|
17
|
+
*/
|
|
18
|
+
|
|
19
|
+
import { describe, expect, test } from 'bun:test';
|
|
20
|
+
|
|
21
|
+
import { checkWriteConflict, parseBaseMtime } from '@/server/lib/fs/write-conflict';
|
|
22
|
+
|
|
23
|
+
/** A stat that answers `mtimeMs` for one path, or null when it is gone. */
|
|
24
|
+
function statOf(mtimeMs: number | null) {
|
|
25
|
+
return async () => (mtimeMs === null ? null : { mtimeMs });
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
describe('checkWriteConflict', () => {
|
|
29
|
+
test('no base means no expectation — the write proceeds', async () => {
|
|
30
|
+
expect(await checkWriteConflict('/a.ts', undefined, statOf(5))).toEqual({ write: true, diskMtimeMs: null });
|
|
31
|
+
expect(await checkWriteConflict('/a.ts', null, statOf(5))).toEqual({ write: true, diskMtimeMs: null });
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
test('a matching mtime writes', async () => {
|
|
35
|
+
expect(await checkWriteConflict('/a.ts', 5, statOf(5))).toEqual({ write: true, diskMtimeMs: 5 });
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
test('a moved mtime is a conflict, and the verdict carries what is there now', async () => {
|
|
39
|
+
expect(await checkWriteConflict('/a.ts', 5, statOf(9))).toEqual({ write: false, diskMtimeMs: 9 });
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
test('a file that is gone is not a conflict — recreating it is the caller’s decision', async () => {
|
|
43
|
+
expect(await checkWriteConflict('/a.ts', 5, statOf(null))).toEqual({ write: true, diskMtimeMs: null });
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
test('the comparison is exact: a one-millisecond move is a conflict', async () => {
|
|
47
|
+
expect(await checkWriteConflict('/a.ts', 5, statOf(6))).toEqual({ write: false, diskMtimeMs: 6 });
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
describe('parseBaseMtime', () => {
|
|
52
|
+
test('a numeric field parses', () => {
|
|
53
|
+
expect(parseBaseMtime('1700000000123')).toBe(1_700_000_000_123);
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
test('an absent, empty or malformed field is "no expectation", never a refusal', () => {
|
|
57
|
+
// Refusing a legitimate save over a parsing detail is the failure this
|
|
58
|
+
// tolerance exists to prevent.
|
|
59
|
+
expect(parseBaseMtime(null)).toBeUndefined();
|
|
60
|
+
expect(parseBaseMtime('')).toBeUndefined();
|
|
61
|
+
expect(parseBaseMtime('abc')).toBeUndefined();
|
|
62
|
+
expect(parseBaseMtime('NaN')).toBeUndefined();
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
test('a File entry is not a mtime', () => {
|
|
66
|
+
expect(parseBaseMtime(new File(['x'], 'a.txt'))).toBeUndefined();
|
|
67
|
+
});
|
|
68
|
+
});
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The save path's conflict check, as one testable function.
|
|
8
|
+
*
|
|
9
|
+
* Kept out of `action.ts` because it is the only part of that handler with a rule
|
|
10
|
+
* worth pinning, and because the rule has three branches that all look alike in a
|
|
11
|
+
* handler:
|
|
12
|
+
*
|
|
13
|
+
* - **No `baseMtime` → no expectation.** A handle-backed file has no server path
|
|
14
|
+
* and an older client sends nothing; both must write unconditionally, which is
|
|
15
|
+
* the contract this feature is layered onto rather than replaces.
|
|
16
|
+
* - **A missing file is not a conflict.** `confirmSaveMissing` is what allows
|
|
17
|
+
* recreating a deleted file, and there is no mtime to disagree with.
|
|
18
|
+
* - **A moved mtime IS a conflict**, and the verdict carries the CURRENT value so
|
|
19
|
+
* the client can offer Reload/Keep instead of reporting a failure.
|
|
20
|
+
*
|
|
21
|
+
* ## The comparison is exact, and its one blind spot is a millisecond
|
|
22
|
+
*
|
|
23
|
+
* An editor writes whole files, so a moved mtime is a real change. The blind spot is
|
|
24
|
+
* two writes inside the SAME millisecond: the filesystem's `mtimeMs` does not move,
|
|
25
|
+
* so the guard cannot tell them apart. Measured on this filesystem — two
|
|
26
|
+
* `writeFileSync` calls in a row leave the value identical. That is accepted rather
|
|
27
|
+
* than papered over with a tolerance, which would widen the hole instead of closing
|
|
28
|
+
* it; a content hash would close it and cost a full read per save, which is the wrong
|
|
29
|
+
* trade for a guard whose job is the common case (a tool call, another tab, a
|
|
30
|
+
* `git checkout` — all of which take far longer than a millisecond).
|
|
31
|
+
*/
|
|
32
|
+
|
|
33
|
+
/** What the file on disk says about the buffer's base. */
|
|
34
|
+
export interface ConflictVerdict {
|
|
35
|
+
/** The save may proceed. */
|
|
36
|
+
write: boolean;
|
|
37
|
+
/** The mtime on disk right now; `null` when the file is gone. */
|
|
38
|
+
diskMtimeMs: number | null;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/**
|
|
42
|
+
* An mtime rounded to a whole millisecond.
|
|
43
|
+
*
|
|
44
|
+
* Load-bearing, and measured: `node:fs`' `statSync` and `Bun.file().stat()` disagree
|
|
45
|
+
* on the FRACTIONAL part of `mtimeMs` for the same file, so a comparison of the raw
|
|
46
|
+
* values answers "conflict" for a file nobody touched — a save loop the user can never
|
|
47
|
+
* get out of. Whole milliseconds are what both agree on, and what survives a JSON
|
|
48
|
+
* round trip exactly.
|
|
49
|
+
*/
|
|
50
|
+
export function stableMtime(mtimeMs: number): number {
|
|
51
|
+
return Math.round(mtimeMs);
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* Whether a save may proceed, given the buffer's base mtime.
|
|
56
|
+
*
|
|
57
|
+
* `baseMtimeMs` is `undefined`/`null` when the caller has no expectation — that is
|
|
58
|
+
* the "write unconditionally" case, not an error.
|
|
59
|
+
*/
|
|
60
|
+
export async function checkWriteConflict(
|
|
61
|
+
fullPath: string,
|
|
62
|
+
baseMtimeMs: number | null | undefined,
|
|
63
|
+
stat: (path: string) => Promise<{ mtimeMs: number } | null>,
|
|
64
|
+
): Promise<ConflictVerdict> {
|
|
65
|
+
if (typeof baseMtimeMs !== 'number') return { write: true, diskMtimeMs: null };
|
|
66
|
+
const current = await stat(fullPath);
|
|
67
|
+
// The file is gone: recreating it is `confirmSaveMissing`'s decision, which the
|
|
68
|
+
// caller has already made by the time it gets here.
|
|
69
|
+
if (!current) return { write: true, diskMtimeMs: null };
|
|
70
|
+
const disk = stableMtime(current.mtimeMs);
|
|
71
|
+
return { write: disk === stableMtime(baseMtimeMs), diskMtimeMs: disk };
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* The `baseMtime` a save request carries, or `undefined`.
|
|
76
|
+
*
|
|
77
|
+
* A missing field and a malformed one are the same answer — "no expectation" —
|
|
78
|
+
* because the alternative is refusing a legitimate save over a parsing detail.
|
|
79
|
+
*/
|
|
80
|
+
export function parseBaseMtime(raw: FormDataEntryValue | null): number | undefined {
|
|
81
|
+
if (typeof raw !== 'string' || raw === '') return undefined;
|
|
82
|
+
const value = Number(raw);
|
|
83
|
+
return Number.isFinite(value) ? value : undefined;
|
|
84
|
+
}
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* `claimPort` — the bind decision, and its whole value is in the failure path:
|
|
8
|
+
* a starter that loses must fail with a message that names the real situation
|
|
9
|
+
* instead of a bare `EADDRINUSE`.
|
|
10
|
+
*
|
|
11
|
+
* The cases drive real listeners on OS-assigned ports, because the question is
|
|
12
|
+
* about sockets. One of them is the reported bug: `localhost` stands for two
|
|
13
|
+
* addresses, the guard asked about only the one Bun would bind, and a stale
|
|
14
|
+
* instance kept the other — two servers on one port, and a browser landing on
|
|
15
|
+
* whichever family it resolved.
|
|
16
|
+
*/
|
|
17
|
+
|
|
18
|
+
import { afterEach, beforeEach, describe, expect, test } from 'bun:test';
|
|
19
|
+
import fs from 'node:fs';
|
|
20
|
+
import os from 'node:os';
|
|
21
|
+
import path from 'node:path';
|
|
22
|
+
import { testPosix } from '@/test-support/platform';
|
|
23
|
+
|
|
24
|
+
import { claimPort, PortInUseError } from '@/server/lib/lifecycle/port-guard';
|
|
25
|
+
import { createLoopbackHarness, ipv6Loopback, realFetch } from '@/test-support/loopback';
|
|
26
|
+
|
|
27
|
+
const harness = createLoopbackHarness();
|
|
28
|
+
const { occupy, occupyAt, freePort, freePortBothFamilies, livePid, spawnChamberHolder } = harness;
|
|
29
|
+
|
|
30
|
+
let tempDir: string;
|
|
31
|
+
let originalDataDir: string | undefined;
|
|
32
|
+
|
|
33
|
+
beforeEach(() => {
|
|
34
|
+
// The instance record and the port lock both live under the data directory;
|
|
35
|
+
// pointing it at a temp dir keeps a test from reading (or writing) the real
|
|
36
|
+
// `~/.kabmo/run`.
|
|
37
|
+
originalDataDir = Bun.env.KABMO_DATA_DIR;
|
|
38
|
+
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'kabmo-test-claim-port-'));
|
|
39
|
+
Bun.env.KABMO_DATA_DIR = tempDir;
|
|
40
|
+
globalThis.fetch = realFetch;
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
afterEach(async () => {
|
|
44
|
+
await harness.dispose();
|
|
45
|
+
if (originalDataDir === undefined) delete Bun.env.KABMO_DATA_DIR;
|
|
46
|
+
else Bun.env.KABMO_DATA_DIR = originalDataDir;
|
|
47
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
describe('claimPort', () => {
|
|
51
|
+
test('binds a free port through the injected listen', async () => {
|
|
52
|
+
const port = await freePort();
|
|
53
|
+
let binds = 0;
|
|
54
|
+
|
|
55
|
+
await claimPort({ port, host: '127.0.0.1', listen: async () => { binds += 1; } });
|
|
56
|
+
|
|
57
|
+
expect(binds).toBe(1);
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
test('re-binds when the occupant is this very process', async () => {
|
|
61
|
+
// `bun run --hot` re-evaluates the entry inside the running process, so the
|
|
62
|
+
// port is held by us and Bun swaps the handler on the next listen. Killing
|
|
63
|
+
// the dev loop on every save is the failure this prevents.
|
|
64
|
+
const { port } = occupy(() => Response.json({ service: 'kabmo', pid: process.pid }));
|
|
65
|
+
let binds = 0;
|
|
66
|
+
|
|
67
|
+
await claimPort({ port, host: '127.0.0.1', listen: async () => { binds += 1; } });
|
|
68
|
+
|
|
69
|
+
expect(binds).toBe(1);
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
testPosix('names a Kabmo occupant held by another process', async () => {
|
|
73
|
+
const holder = await spawnChamberHolder();
|
|
74
|
+
const { port } = occupy(() => Response.json({ service: 'kabmo', pid: holder.pid, version: '9.9.9' }));
|
|
75
|
+
let binds = 0;
|
|
76
|
+
|
|
77
|
+
const error = await claimPort({ port, host: '127.0.0.1', listen: async () => { binds += 1; } })
|
|
78
|
+
.then(() => null, (thrown: unknown) => thrown);
|
|
79
|
+
|
|
80
|
+
expect(error).toBeInstanceOf(PortInUseError);
|
|
81
|
+
const message = (error as Error).message;
|
|
82
|
+
expect(message).toContain(`Port ${port} is already served by Kabmo`);
|
|
83
|
+
expect(message).toContain(`pid ${holder.pid}`);
|
|
84
|
+
expect(message).toContain('v9.9.9');
|
|
85
|
+
expect(message).toContain('Nothing was stopped');
|
|
86
|
+
// A starting instance never binds over an identified one.
|
|
87
|
+
expect(binds).toBe(0);
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
test('names a foreign listener as not Kabmo, without a bind error', async () => {
|
|
91
|
+
// Nothing answers `/api/health` and nothing identifies itself, so the probe
|
|
92
|
+
// fails first and `listen` is never attempted.
|
|
93
|
+
const { port } = occupy(() => new Response('not kabmo'));
|
|
94
|
+
let binds = 0;
|
|
95
|
+
|
|
96
|
+
const error = await claimPort({ port, host: '127.0.0.1', listen: async () => { binds += 1; } })
|
|
97
|
+
.then(() => null, (thrown: unknown) => thrown);
|
|
98
|
+
|
|
99
|
+
expect(error).toBeInstanceOf(PortInUseError);
|
|
100
|
+
const message = (error as Error).message;
|
|
101
|
+
expect(message).toContain(`Port ${port} is in use by another process`);
|
|
102
|
+
expect(message).toContain(`lsof -nP -iTCP:${port} -sTCP:LISTEN`);
|
|
103
|
+
expect(message).not.toContain('Bind error');
|
|
104
|
+
expect(binds).toBe(0);
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
test.skipIf(!ipv6Loopback)('refuses a name whose OTHER address is held', async () => {
|
|
108
|
+
// The reported bug: a stale instance held `127.0.0.1:3000`, `bun run dev`
|
|
109
|
+
// probed only `localhost`'s other family (`::1`), found it free, and bound
|
|
110
|
+
// it. Two servers, one port, and a browser landing on whichever family it
|
|
111
|
+
// resolved — the stale one, serving a different data mode.
|
|
112
|
+
const port = await freePortBothFamilies();
|
|
113
|
+
// A listener reporting OUR pid is read as this process re-binding, so the
|
|
114
|
+
// occupant has to name another live process to be refused.
|
|
115
|
+
const holder = await livePid();
|
|
116
|
+
const held = occupyAt(port, '127.0.0.1', () => Response.json({ service: 'kabmo', pid: holder }));
|
|
117
|
+
let binds = 0;
|
|
118
|
+
|
|
119
|
+
const error = await claimPort({ port, host: 'localhost', listen: async () => { binds += 1; } })
|
|
120
|
+
.then(() => null, (thrown: unknown) => thrown);
|
|
121
|
+
|
|
122
|
+
expect(error).toBeInstanceOf(PortInUseError);
|
|
123
|
+
const message = (error as Error).message;
|
|
124
|
+
expect(message).toContain(`Port ${port} is already served by Kabmo`);
|
|
125
|
+
// The address clause is the actionable half: `lsof` lists both sockets, so
|
|
126
|
+
// a bare "port busy" does not say which one has to be freed.
|
|
127
|
+
expect(message).toContain('on 127.0.0.1');
|
|
128
|
+
expect(binds).toBe(0);
|
|
129
|
+
|
|
130
|
+
held.stop(true);
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
test.skipIf(!ipv6Loopback)('binds a name whose addresses are both free', async () => {
|
|
134
|
+
const port = await freePortBothFamilies();
|
|
135
|
+
let binds = 0;
|
|
136
|
+
|
|
137
|
+
await claimPort({ port, host: 'localhost', listen: async () => { binds += 1; } });
|
|
138
|
+
|
|
139
|
+
expect(binds).toBe(1);
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
test('carries the bind error when the port looked free', async () => {
|
|
143
|
+
// The probe is only a short-circuit; when `listen` fails anyway, the real
|
|
144
|
+
// reason must survive into the error rather than being replaced by a guess.
|
|
145
|
+
const port = await freePort();
|
|
146
|
+
|
|
147
|
+
const error = await claimPort({
|
|
148
|
+
port,
|
|
149
|
+
host: '127.0.0.1',
|
|
150
|
+
listen: async () => { throw new Error('EADDRINUSE: address already in use'); },
|
|
151
|
+
}).then(() => null, (thrown: unknown) => thrown);
|
|
152
|
+
|
|
153
|
+
expect(error).toBeInstanceOf(PortInUseError);
|
|
154
|
+
expect((error as Error).message).toContain('Bind error: EADDRINUSE: address already in use');
|
|
155
|
+
});
|
|
156
|
+
});
|