@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
|
@@ -21,6 +21,7 @@ import fs from 'fs';
|
|
|
21
21
|
import path from 'path';
|
|
22
22
|
import { readFile } from '@/server/routes/fs/read';
|
|
23
23
|
import { EDITOR_MAX_FILE_BYTES, PDF_MAX_FILE_BYTES } from '@/shared/lib/fs/file-kind';
|
|
24
|
+
import { formatBytes } from '@/shared/lib/format/number';
|
|
24
25
|
|
|
25
26
|
const DIR = path.join(process.cwd(), 'tmp-read-gate');
|
|
26
27
|
|
|
@@ -88,16 +89,23 @@ describe('fs read gate', () => {
|
|
|
88
89
|
|
|
89
90
|
expect(status).toBe(415);
|
|
90
91
|
expect(body.kind).toBe('too-large');
|
|
91
|
-
|
|
92
|
+
// Derived from the constant, not spelled out: the sentence and the gate must
|
|
93
|
+
// name the same number, and a literal here would pass while they drifted.
|
|
94
|
+
expect(body.error).toContain(formatBytes(EDITOR_MAX_FILE_BYTES));
|
|
92
95
|
});
|
|
93
96
|
|
|
94
97
|
// A PDF is streamed to Chrome's own viewer through `/api/fs/raw`, so the text
|
|
95
|
-
// ceiling
|
|
96
|
-
//
|
|
97
|
-
//
|
|
98
|
-
// "
|
|
99
|
-
|
|
100
|
-
|
|
98
|
+
// ceiling has no bearing on it — the route must point at the raw route rather
|
|
99
|
+
// than refuse it. Refusing it was the bug: the size test ran before the
|
|
100
|
+
// document branch, so a 6 MB PDF was answered "larger than the 5.00 MB the
|
|
101
|
+
// editor opens". 6 MB is the size that was over the old text ceiling and is
|
|
102
|
+
// still a perfectly ordinary PDF.
|
|
103
|
+
//
|
|
104
|
+
// It is written at 6 MB rather than at `EDITOR_MAX_FILE_BYTES + 1` because the
|
|
105
|
+
// two ceilings are independent: the text one is now ABOVE the PDF one, so
|
|
106
|
+
// "past text, under PDF" is no longer a size that exists.
|
|
107
|
+
test('a PDF past the old text ceiling is still served by the raw route', async () => {
|
|
108
|
+
write('report.pdf', new Uint8Array(6 * 1024 * 1024).fill(0x25));
|
|
101
109
|
const { status, body } = await read('report.pdf');
|
|
102
110
|
|
|
103
111
|
expect(status).toBe(400);
|
|
@@ -105,6 +113,15 @@ describe('fs read gate', () => {
|
|
|
105
113
|
expect(body.kind).toBeUndefined();
|
|
106
114
|
});
|
|
107
115
|
|
|
116
|
+
test('a PDF past its own ceiling is refused before the document branch', async () => {
|
|
117
|
+
write('enormous.pdf', new Uint8Array(PDF_MAX_FILE_BYTES + 1).fill(0x25));
|
|
118
|
+
const { status, body } = await read('enormous.pdf');
|
|
119
|
+
|
|
120
|
+
expect(status).toBe(415);
|
|
121
|
+
expect(body.kind).toBe('too-large');
|
|
122
|
+
expect(body.error).toContain(formatBytes(PDF_MAX_FILE_BYTES));
|
|
123
|
+
});
|
|
124
|
+
|
|
108
125
|
test('a PDF past the PDF ceiling is refused for size, naming 30 MB', async () => {
|
|
109
126
|
write('huge.pdf', new Uint8Array(PDF_MAX_FILE_BYTES + 1).fill(0x25));
|
|
110
127
|
const { status, body } = await read('huge.pdf');
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
import { json, type LoaderFunctionArgs } from '@/server/lib/remix-compat';
|
|
7
7
|
import { listDirectoryEntries } from '@/server/lib/fs/listing';
|
|
8
8
|
import { errorResponse } from '@/server/lib/route-adapter';
|
|
9
|
+
import { stableMtime } from '@/server/lib/fs/write-conflict';
|
|
9
10
|
import { homedir } from 'os';
|
|
10
11
|
import { dirname, isAbsolute, join, resolve } from 'path';
|
|
11
12
|
import fs from 'fs';
|
|
@@ -278,7 +279,11 @@ export async function readFile({ request }: LoaderFunctionArgs) {
|
|
|
278
279
|
}
|
|
279
280
|
|
|
280
281
|
const content = await file.text();
|
|
281
|
-
|
|
282
|
+
// The mtime travels with the bytes: the save path sends it back as
|
|
283
|
+
// `baseMtime`, and the server refuses a write whose base is no longer what is
|
|
284
|
+
// on disk. A buffer with no base (a handle-backed file, an older client) still
|
|
285
|
+
// writes unconditionally — see `save-file.ts`.
|
|
286
|
+
return json({ content, mtimeMs: stableMtime(stat.mtimeMs) });
|
|
282
287
|
} catch (error) {
|
|
283
288
|
return errorResponse(error);
|
|
284
289
|
}
|
|
@@ -20,7 +20,8 @@ import fs from 'fs';
|
|
|
20
20
|
import path from 'path';
|
|
21
21
|
import { testPosix } from '@/test-support/platform';
|
|
22
22
|
import { resolveFileScope } from '@/server/routes/fs/scope';
|
|
23
|
-
import { DOCUMENT_MAX_FILE_BYTES, PDF_MAX_FILE_BYTES } from '@/shared/lib/fs/file-kind';
|
|
23
|
+
import { DOCUMENT_MAX_FILE_BYTES, EDITOR_MAX_FILE_BYTES, PDF_MAX_FILE_BYTES } from '@/shared/lib/fs/file-kind';
|
|
24
|
+
import { formatBytes } from '@/shared/lib/format/number';
|
|
24
25
|
|
|
25
26
|
const APP = process.cwd();
|
|
26
27
|
const DIR = path.join(APP, 'tmp-scope-probe');
|
|
@@ -158,14 +159,18 @@ describe('fs scope route', () => {
|
|
|
158
159
|
expect(body.error).toContain('20.00 MB');
|
|
159
160
|
});
|
|
160
161
|
|
|
161
|
-
// Plain text keeps the text ceiling
|
|
162
|
-
// life of the tab
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
expect(status).toBe(200);
|
|
168
|
-
expect(body.kind).toBe('
|
|
169
|
-
|
|
162
|
+
// Plain text keeps the text ceiling, which is its own number: the buffer is
|
|
163
|
+
// held for the life of the tab and re-posted on every save, where a document
|
|
164
|
+
// is converted once. 6 MB used to be over it; it is a normal generated file
|
|
165
|
+
// and must open.
|
|
166
|
+
test('a text file over the text ceiling is refused, and one under it is not', async () => {
|
|
167
|
+
const ok = await scope(write('big.log', new Uint8Array(6 * 1024 * 1024).fill(0x61)));
|
|
168
|
+
expect(ok.status).toBe(200);
|
|
169
|
+
expect(ok.body.kind).toBe('text');
|
|
170
|
+
|
|
171
|
+
const over = await scope(write('huge.log', new Uint8Array(EDITOR_MAX_FILE_BYTES + 1).fill(0x61)));
|
|
172
|
+
expect(over.status).toBe(200);
|
|
173
|
+
expect(over.body.kind).toBe('too-large');
|
|
174
|
+
expect(over.body.error).toContain(formatBytes(EDITOR_MAX_FILE_BYTES));
|
|
170
175
|
});
|
|
171
176
|
});
|
|
@@ -26,25 +26,14 @@
|
|
|
26
26
|
import { json, type LoaderFunctionArgs } from '@/server/lib/remix-compat';
|
|
27
27
|
import { resolveScopeForAbsolutePath } from '@/server/lib/fs/root';
|
|
28
28
|
import { BINARY_SNIFF_BYTES, classifyEditorFile, unsupportedEditorMessage } from '@/shared/lib/fs/file-kind';
|
|
29
|
+
import { pathFromFileUrl } from '@/shared/lib/fs/file-url';
|
|
29
30
|
import fs from 'fs';
|
|
30
31
|
import path from 'path';
|
|
31
32
|
|
|
32
|
-
/**
|
|
33
|
-
* A `file://` URL to the path it names.
|
|
34
|
-
*
|
|
35
|
-
* The pathname is percent-encoded (a space is `%20`, and a Finder drop of
|
|
36
|
-
* `My Notes.md` is exactly that), so decoding is not optional. `decodeURIComponent`
|
|
37
|
-
* can throw on a malformed escape, which is answered as "not a path" rather
|
|
38
|
-
* than surfacing as a 500.
|
|
39
|
-
*/
|
|
33
|
+
/** A `file://` URL to the path it names; see `pathFromFileUrl` for the rules. */
|
|
40
34
|
function pathFromReference(reference: string): string | null {
|
|
41
35
|
if (!/^file:\/\//i.test(reference)) return reference;
|
|
42
|
-
|
|
43
|
-
const url = new URL(reference);
|
|
44
|
-
return decodeURIComponent(url.pathname);
|
|
45
|
-
} catch {
|
|
46
|
-
return null;
|
|
47
|
-
}
|
|
36
|
+
return pathFromFileUrl(reference);
|
|
48
37
|
}
|
|
49
38
|
|
|
50
39
|
export async function resolveFileScope({ request }: LoaderFunctionArgs) {
|
|
@@ -12,11 +12,16 @@ import { fetchShellRelease, type ShellRelease } from '@/server/lib/updates/shell
|
|
|
12
12
|
*
|
|
13
13
|
* A failed probe is a valid answer (`url: null`), never a 500: the sidebar's job
|
|
14
14
|
* is to omit a button it cannot back with a link.
|
|
15
|
+
*
|
|
16
|
+
* PUBLIC, unlike its siblings: the Android shell asks this from native code
|
|
17
|
+
* (`AppUpdateCheck`), which has no session cookie, and its "Check for update"
|
|
18
|
+
* button is for a shell too stale to load the console. See `PUBLIC_EXACT` in
|
|
19
|
+
* `lib/auth/guard.ts`.
|
|
15
20
|
*/
|
|
16
21
|
export async function loader() {
|
|
17
22
|
const release: ShellRelease | null = await fetchShellRelease('android');
|
|
18
23
|
return json(
|
|
19
|
-
release ?? { url: null, latest: null, releaseUrl: null },
|
|
24
|
+
release ?? { url: null, latest: null, releaseUrl: null, direct: false },
|
|
20
25
|
{ headers: NO_STORE_HEADERS },
|
|
21
26
|
);
|
|
22
27
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { json, NO_STORE_HEADERS } from '@/server/lib/remix-compat';
|
|
2
2
|
import { fetchShellRelease, type ShellRelease } from '@/server/lib/updates/shell-release';
|
|
3
3
|
import { isDesktopShellKind, type DesktopShellKind } from '@/shared/lib/updates/shell-ua';
|
|
4
|
+
import { parseShellArch, type ShellArch } from '@/shared/lib/updates/shell-arch';
|
|
4
5
|
|
|
5
6
|
/**
|
|
6
|
-
* GET /api/updates/desktop?kind=macos|windows|linux
|
|
7
|
+
* GET /api/updates/desktop?kind=macos|windows|linux[&arch=arm64|x64]
|
|
7
8
|
*
|
|
8
9
|
* ONE route with an explicit `kind`, unlike the mobile pair's two routes, and
|
|
9
10
|
* the difference is deliberate. `?kind` here is REQUIRED and refused when it is
|
|
@@ -11,17 +12,29 @@ import { isDesktopShellKind, type DesktopShellKind } from '@/shared/lib/updates/
|
|
|
11
12
|
* the mobile pair's split exists precisely because a defaulted parameter would
|
|
12
13
|
* have made "the newest shell" mean Android without anyone saying so.
|
|
13
14
|
*
|
|
15
|
+
* ## `arch` is what makes the offer installable
|
|
16
|
+
*
|
|
14
17
|
* Only an INSTALLED desktop shell asks for this — the page reports its own
|
|
15
18
|
* version over the shell bridge (`__kabmoDesktop.shellVersion`), because a
|
|
16
|
-
* desktop app carries no User-Agent token.
|
|
17
|
-
* RELEASE PAGE
|
|
18
|
-
*
|
|
19
|
+
* desktop app carries no User-Agent token. Without `arch` the answer is the
|
|
20
|
+
* RELEASE PAGE: every desktop artifact is per-architecture, and a console served
|
|
21
|
+
* to another machine cannot guess which one this window runs on.
|
|
22
|
+
*
|
|
23
|
+
* WITH `arch` the answer is that machine's own installer, and `direct: true`
|
|
24
|
+
* says so — which is what lets the sidebar offer an in-app update instead of a
|
|
25
|
+
* link. The shell still verifies the bytes before installing them; this route
|
|
26
|
+
* only decides WHICH file, never whether it is trusted.
|
|
27
|
+
*
|
|
28
|
+
* An `arch` that names nothing this product publishes is a REFUSAL rather than a
|
|
29
|
+
* silent fallback: a caller that asked for a build we do not make should be told,
|
|
30
|
+
* not handed the other architecture's installer.
|
|
19
31
|
*
|
|
20
32
|
* A failed probe is a valid answer (`url: null`), never a 500: the sidebar's job
|
|
21
33
|
* is to omit a button it cannot back with a link.
|
|
22
34
|
*/
|
|
23
35
|
export async function loader({ request }: { request: Request }) {
|
|
24
|
-
const
|
|
36
|
+
const params = new URL(request.url).searchParams;
|
|
37
|
+
const kind = params.get('kind');
|
|
25
38
|
if (!isDesktopShellKind(kind ?? '')) {
|
|
26
39
|
return json(
|
|
27
40
|
{ error: 'kind must be one of macos, windows, linux' },
|
|
@@ -29,9 +42,18 @@ export async function loader({ request }: { request: Request }) {
|
|
|
29
42
|
);
|
|
30
43
|
}
|
|
31
44
|
|
|
32
|
-
const
|
|
45
|
+
const requested = params.get('arch');
|
|
46
|
+
const arch: ShellArch | null = requested ? parseShellArch(requested) : null;
|
|
47
|
+
if (requested && !arch) {
|
|
48
|
+
return json(
|
|
49
|
+
{ error: 'arch must be one of arm64, x64' },
|
|
50
|
+
{ status: 400, headers: NO_STORE_HEADERS },
|
|
51
|
+
);
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
const release: ShellRelease | null = await fetchShellRelease(kind as DesktopShellKind, fetch, arch);
|
|
33
55
|
return json(
|
|
34
|
-
release ?? { url: null, latest: null, releaseUrl: null },
|
|
56
|
+
release ?? { url: null, latest: null, releaseUrl: null, direct: false },
|
|
35
57
|
{ headers: NO_STORE_HEADERS },
|
|
36
58
|
);
|
|
37
59
|
}
|
|
@@ -16,11 +16,15 @@ import { fetchShellRelease, type ShellRelease } from '@/server/lib/updates/shell
|
|
|
16
16
|
*
|
|
17
17
|
* A failed probe is a valid answer (`url: null`), never a 500: the sidebar's job
|
|
18
18
|
* is to omit a button it cannot back with a link.
|
|
19
|
+
*
|
|
20
|
+
* PUBLIC, for the same reason as `/api/updates/android`: the installed shell
|
|
21
|
+
* asks it from native code with no session cookie, and the check has to work
|
|
22
|
+
* before the console can load.
|
|
19
23
|
*/
|
|
20
24
|
export async function loader() {
|
|
21
25
|
const release: ShellRelease | null = await fetchShellRelease('ios');
|
|
22
26
|
return json(
|
|
23
|
-
release ?? { url: null, latest: null, releaseUrl: null },
|
|
27
|
+
release ?? { url: null, latest: null, releaseUrl: null, direct: false },
|
|
24
28
|
{ headers: NO_STORE_HEADERS },
|
|
25
29
|
);
|
|
26
30
|
}
|
|
@@ -26,7 +26,7 @@ import { scanSessionInfoCached } from '@/server/lib/omp/session/files';
|
|
|
26
26
|
import { canonicalPath } from '@/server/lib/fs/canonical';
|
|
27
27
|
import { worktreeIdentityFor, listWorktreeRows } from '@/server/lib/db/worktree-registry.server';
|
|
28
28
|
import { dirtyCount, commitsAheadOf } from '@/server/lib/fs/worktree/remove';
|
|
29
|
-
import { listWorktrees } from '@/server/lib/fs/worktree/list';
|
|
29
|
+
import { listWorktrees, isWorkTree } from '@/server/lib/fs/worktree/list';
|
|
30
30
|
import {
|
|
31
31
|
defaultWorktreeRoot,
|
|
32
32
|
resolveConfiguredWorktreeRoot,
|
|
@@ -49,6 +49,16 @@ export async function loader({ request }: LoaderFunctionArgs) {
|
|
|
49
49
|
try {
|
|
50
50
|
const db = await getDb();
|
|
51
51
|
const primaryRoot = await resolveProjectRoot(root);
|
|
52
|
+
// "This folder is not a Git repository" is an ANSWER, not a failure. The
|
|
53
|
+
// payload has carried `isRepo` for exactly this, and a plain directory (a
|
|
54
|
+
// notes folder bound as a workspace) must read as "no worktrees here" —
|
|
55
|
+
// a 500 would make the composer report a broken feature for a folder that
|
|
56
|
+
// simply has nothing to offer. The probe runs before the identity read,
|
|
57
|
+
// which is what throws for a directory with no root commit.
|
|
58
|
+
if (!(await isWorkTree(primaryRoot))) {
|
|
59
|
+
const empty: WorktreeListPayload = { worktrees: [], base: '', isRepo: false };
|
|
60
|
+
return json(empty);
|
|
61
|
+
}
|
|
52
62
|
const settings = await readWorktreeSettings();
|
|
53
63
|
const projectId = await resolveProjectId(primaryRoot, (candidate) => worktreeIdentityFor(db, candidate));
|
|
54
64
|
const base = resolveConfiguredWorktreeRoot(settings.directory, primaryRoot)
|
|
@@ -163,6 +163,23 @@ describe('GET /api/worktrees', () => {
|
|
|
163
163
|
expect(primary.dirty).toBe(0);
|
|
164
164
|
});
|
|
165
165
|
|
|
166
|
+
test('a folder that is not a repository answers isRepo:false, not a failure', async () => {
|
|
167
|
+
// A notes folder bound as a workspace: it can never hold a worktree, and
|
|
168
|
+
// the composer must read that as "no control here" rather than as a broken
|
|
169
|
+
// feature. The route used to 500 here, because the identity read throws for
|
|
170
|
+
// a directory with no root commit.
|
|
171
|
+
const plain = join(workRoot, 'plain-notes');
|
|
172
|
+
mkdirSync(plain, { recursive: true });
|
|
173
|
+
writeFileSync(join(plain, 'todo.md'), '- buy milk\n');
|
|
174
|
+
const db = await getDb();
|
|
175
|
+
await db.run('INSERT INTO workspace_folders (name, project_path) VALUES (?, ?)', ['plain', plain]);
|
|
176
|
+
|
|
177
|
+
const { status, body } = await call(listLoader, `http://localhost/api/worktrees?root=${encodeURIComponent(plain)}`);
|
|
178
|
+
expect(status).toBe(200);
|
|
179
|
+
expect(body.isRepo).toBe(false);
|
|
180
|
+
expect(worktreesOf(body)).toEqual([]);
|
|
181
|
+
});
|
|
182
|
+
|
|
166
183
|
test('counts a session running in a worktree that lives OUTSIDE the repository', async () => {
|
|
167
184
|
const created = await call(createAction, base(), {
|
|
168
185
|
method: 'POST',
|
|
@@ -55,6 +55,8 @@ function makeCallbacks(overrides: Partial<OmpAgentCallbacksDeps> = {}): OmpAgent
|
|
|
55
55
|
appSettings: {},
|
|
56
56
|
enqueueExtensionDialog: () => {},
|
|
57
57
|
withdrawExtensionDialog: () => {},
|
|
58
|
+
reloadMessages: () => {},
|
|
59
|
+
needsReloadRef: { current: false },
|
|
58
60
|
...overrides,
|
|
59
61
|
};
|
|
60
62
|
return createOmpAgentCallbacks(deps);
|
|
@@ -133,6 +135,40 @@ describe('createOmpAgentCallbacks run boundaries', () => {
|
|
|
133
135
|
expect(verbs).toEqual(['Thinking']);
|
|
134
136
|
});
|
|
135
137
|
|
|
138
|
+
test('a run that lost frames re-reads its transcript when it settles', () => {
|
|
139
|
+
// A reconnect while the run was STILL streaming cannot reload: its rows are
|
|
140
|
+
// the stream's, and replacing them mid-turn is the lagging-snapshot bug.
|
|
141
|
+
// But the segments that finished during the outage have no other way back —
|
|
142
|
+
// their `message_end` went into the dead socket, and `agent_end` only
|
|
143
|
+
// materializes turns that stopped abnormally. So the loss is remembered and
|
|
144
|
+
// the read happens at the settle.
|
|
145
|
+
const reads: number[] = [];
|
|
146
|
+
const needsReloadRef = { current: true };
|
|
147
|
+
const callbacks = recordingCallbacks({
|
|
148
|
+
reloadMessages: () => { reads.push(1); },
|
|
149
|
+
needsReloadRef,
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
callbacks.onAgentEnd?.({});
|
|
153
|
+
|
|
154
|
+
expect(reads.length).toBe(1);
|
|
155
|
+
// Consumed: a later run end must not re-read a transcript nothing lost.
|
|
156
|
+
expect(needsReloadRef.current).toBe(false);
|
|
157
|
+
callbacks.onAgentEnd?.({});
|
|
158
|
+
expect(reads.length).toBe(1);
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
test('an ordinary run end does NOT re-read the transcript', () => {
|
|
162
|
+
// The read is a full parse of the session JSONL; a run that never lost a
|
|
163
|
+
// frame must not pay it.
|
|
164
|
+
const reads: number[] = [];
|
|
165
|
+
const callbacks = recordingCallbacks({ reloadMessages: () => { reads.push(1); } });
|
|
166
|
+
|
|
167
|
+
callbacks.onAgentEnd?.({});
|
|
168
|
+
|
|
169
|
+
expect(reads).toEqual([]);
|
|
170
|
+
});
|
|
171
|
+
|
|
136
172
|
test('a real omp frame sequence drives the boundary once per run', () => {
|
|
137
173
|
const callbacks = recordingCallbacks();
|
|
138
174
|
const deps = makeFoldDeps(callbacks);
|
|
@@ -51,6 +51,14 @@ export interface OmpAgentCallbacksDeps {
|
|
|
51
51
|
enqueueExtensionDialog: (request: ExtensionUiDialogRequest) => void;
|
|
52
52
|
/** Drop a queued request omp withdrew (`method: 'cancel'`). */
|
|
53
53
|
withdrawExtensionDialog: (targetId: string) => void;
|
|
54
|
+
/** Re-read the committed transcript (see `lost-run.ts`). Used at `agent_end`
|
|
55
|
+
* when frames were lost mid-run: the segments that finished during the
|
|
56
|
+
* outage have no other way back. */
|
|
57
|
+
reloadMessages: () => void;
|
|
58
|
+
/** Set when a run lost frames while STILL STREAMING. Its earlier segments can
|
|
59
|
+
* only be recovered by a full read, which is safe only once the run is over —
|
|
60
|
+
* so the read happens here, at the settle. */
|
|
61
|
+
needsReloadRef: { current: boolean };
|
|
54
62
|
}
|
|
55
63
|
|
|
56
64
|
export function createOmpAgentCallbacks(deps: OmpAgentCallbacksDeps): OmpAgentCallbacks {
|
|
@@ -70,6 +78,8 @@ export function createOmpAgentCallbacks(deps: OmpAgentCallbacksDeps): OmpAgentCa
|
|
|
70
78
|
appSettings,
|
|
71
79
|
enqueueExtensionDialog,
|
|
72
80
|
withdrawExtensionDialog,
|
|
81
|
+
reloadMessages,
|
|
82
|
+
needsReloadRef,
|
|
73
83
|
} = deps;
|
|
74
84
|
|
|
75
85
|
bindStreamingCoalescer(setLocalMessages, () => scrollToBottom('smooth'));
|
|
@@ -245,6 +255,14 @@ export function createOmpAgentCallbacks(deps: OmpAgentCallbacksDeps): OmpAgentCa
|
|
|
245
255
|
// placeholder until the realtime scan surfaces the row.
|
|
246
256
|
const sid = adoptedSessionIdRef.current ?? sessionIdRef.current;
|
|
247
257
|
if (sid) refreshSessionMeta(sid);
|
|
258
|
+
// A run that lost frames while still streaming: its earlier segments (a
|
|
259
|
+
// tool card, a thinking block, an earlier answer) have no other way back.
|
|
260
|
+
// Read now — the run is over, so a full transcript read cannot clobber a
|
|
261
|
+
// live row — and `reloadMessages` retries while omp has not flushed.
|
|
262
|
+
if (needsReloadRef.current) {
|
|
263
|
+
needsReloadRef.current = false;
|
|
264
|
+
reloadMessages();
|
|
265
|
+
}
|
|
248
266
|
},
|
|
249
267
|
onModelChanged: () => {
|
|
250
268
|
// omp's model_changed frame carries no payload — re-read the session
|
|
@@ -56,6 +56,8 @@ function deps(overrides: Partial<OmpAgentCallbacksDeps> = {}): OmpAgentCallbacks
|
|
|
56
56
|
appSettings: {},
|
|
57
57
|
enqueueExtensionDialog: () => {},
|
|
58
58
|
withdrawExtensionDialog: () => {},
|
|
59
|
+
reloadMessages: () => {},
|
|
60
|
+
needsReloadRef: { current: false },
|
|
59
61
|
...overrides,
|
|
60
62
|
};
|
|
61
63
|
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The comment tokens `toggleComment` reads out of `languageData`.
|
|
8
|
+
*
|
|
9
|
+
* A wrong token is not a cosmetic bug: `//` inserted into YAML is a syntax
|
|
10
|
+
* error, and a `//` inserted into CSS comments out nothing while breaking the
|
|
11
|
+
* rule it was added to. The three shapes are asserted, plus the default that
|
|
12
|
+
* every C-family grammar relies on.
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
import { describe, expect, test } from 'bun:test';
|
|
16
|
+
|
|
17
|
+
import { commentSyntaxFor } from '@/shared/lib/code/editor/comment-syntax';
|
|
18
|
+
|
|
19
|
+
describe('commentSyntaxFor', () => {
|
|
20
|
+
test('defaults to a line comment for the C-family', () => {
|
|
21
|
+
expect(commentSyntaxFor('typescript')).toEqual({ line: '//' });
|
|
22
|
+
expect(commentSyntaxFor('rust')).toEqual({ line: '//' });
|
|
23
|
+
expect(commentSyntaxFor('not-a-language')).toEqual({ line: '//' });
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
test('names the languages whose line comment is not `//`', () => {
|
|
27
|
+
expect(commentSyntaxFor('python')).toEqual({ line: '#' });
|
|
28
|
+
expect(commentSyntaxFor('yaml')).toEqual({ line: '#' });
|
|
29
|
+
expect(commentSyntaxFor('sql')).toEqual({ line: '--' });
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
test('wraps the languages that have only block comments', () => {
|
|
33
|
+
expect(commentSyntaxFor('css')).toEqual({ block: ['/*', '*/'] });
|
|
34
|
+
expect(commentSyntaxFor('html')).toEqual({ block: ['<!--', '-->'] });
|
|
35
|
+
expect(commentSyntaxFor('markdown')).toEqual({ block: ['<!--', '-->'] });
|
|
36
|
+
});
|
|
37
|
+
});
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* How each language writes a line comment.
|
|
8
|
+
*
|
|
9
|
+
* The only thing the editor still needs from the old text-command layer:
|
|
10
|
+
* CodeMirror's `toggleComment` reads its tokens out of the `languageData` facet
|
|
11
|
+
* and needs no syntax tree, so this table IS the whole of the comment feature.
|
|
12
|
+
* Everything else the old module did (line moves, duplicates, deletes, inserts,
|
|
13
|
+
* indent, occurrences, edit replication) is a CM6 command now.
|
|
14
|
+
*
|
|
15
|
+
* The default is `//`, which is right for every C-family grammar. The exceptions
|
|
16
|
+
* are the ones a wrong token would visibly break — `#` in YAML is a syntax
|
|
17
|
+
* error, not a comment — and a language that has ONLY block comments gets the
|
|
18
|
+
* wrapper, because a `//` inserted into CSS comments out nothing and breaks the
|
|
19
|
+
* rule it was added to.
|
|
20
|
+
*/
|
|
21
|
+
|
|
22
|
+
/** A line-comment syntax: a prefix per line, or a wrapper for block-only languages. */
|
|
23
|
+
export type CommentSyntax = { line: string } | { block: readonly [string, string] };
|
|
24
|
+
|
|
25
|
+
const COMMENT_SYNTAX: Record<string, CommentSyntax> = {
|
|
26
|
+
python: { line: '#' },
|
|
27
|
+
bash: { line: '#' },
|
|
28
|
+
yaml: { line: '#' },
|
|
29
|
+
toml: { line: '#' },
|
|
30
|
+
ruby: { line: '#' },
|
|
31
|
+
perl: { line: '#' },
|
|
32
|
+
r: { line: '#' },
|
|
33
|
+
makefile: { line: '#' },
|
|
34
|
+
dockerfile: { line: '#' },
|
|
35
|
+
ini: { line: '#' },
|
|
36
|
+
properties: { line: '#' },
|
|
37
|
+
elixir: { line: '#' },
|
|
38
|
+
graphql: { line: '#' },
|
|
39
|
+
nix: { line: '#' },
|
|
40
|
+
sql: { line: '--' },
|
|
41
|
+
lua: { line: '--' },
|
|
42
|
+
haskell: { line: '--' },
|
|
43
|
+
css: { block: ['/*', '*/'] },
|
|
44
|
+
scss: { block: ['/*', '*/'] },
|
|
45
|
+
less: { block: ['/*', '*/'] },
|
|
46
|
+
sass: { block: ['/*', '*/'] },
|
|
47
|
+
stylus: { block: ['/*', '*/'] },
|
|
48
|
+
html: { block: ['<!--', '-->'] },
|
|
49
|
+
xml: { block: ['<!--', '-->'] },
|
|
50
|
+
markdown: { block: ['<!--', '-->'] },
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
export function commentSyntaxFor(language: string): CommentSyntax {
|
|
54
|
+
return COMMENT_SYNTAX[language] ?? { line: '//' };
|
|
55
|
+
}
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Replacement expansion: what one match becomes, and how a template is read.
|
|
8
|
+
*
|
|
9
|
+
* Each rule is asserted against the engine's own `String.replace` where one
|
|
10
|
+
* exists, because the search panel's replace PREVIEW and the write that lands
|
|
11
|
+
* must agree — a preview that painted `$1` over a file that would receive the
|
|
12
|
+
* captured group is exactly the drift this covers.
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
import { describe, expect, test } from 'bun:test';
|
|
16
|
+
|
|
17
|
+
import {
|
|
18
|
+
expandReplacement,
|
|
19
|
+
replaceAllMatches,
|
|
20
|
+
replaceMatch,
|
|
21
|
+
} from '@/shared/lib/code/editor/find-replace';
|
|
22
|
+
import type { FindOptions } from '@/shared/lib/code/editor/find-scan';
|
|
23
|
+
import { findMatches } from '@/shared/lib/code/editor/find-scan';
|
|
24
|
+
|
|
25
|
+
const PLAIN: FindOptions = { matchCase: false, wholeWord: false, isRegex: false, inSelection: false };
|
|
26
|
+
|
|
27
|
+
describe('replaceMatch', () => {
|
|
28
|
+
test('literal replacement inserts the field verbatim, dollar signs included', () => {
|
|
29
|
+
const text = 'const a = 1;';
|
|
30
|
+
const result = replaceMatch(text, { start: 6, end: 7 }, 'a', '$&x', PLAIN);
|
|
31
|
+
expect(result?.text).toBe('const $&x = 1;');
|
|
32
|
+
expect(result?.caret).toBe(6 + 3);
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
test('regex replacement expands capture groups like String.replace', () => {
|
|
36
|
+
const text = 'key = value';
|
|
37
|
+
const result = replaceMatch(text, { start: 6, end: 11 }, '(\\w+)', '[$1]', { ...PLAIN, isRegex: true });
|
|
38
|
+
expect(result?.text).toBe('key = [value]');
|
|
39
|
+
expect(result?.caret).toBe(13);
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
test('refuses a match that is no longer at its offset', () => {
|
|
43
|
+
expect(replaceMatch('abc', { start: 5, end: 7 }, 'a', 'z', PLAIN)).toBeNull();
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
describe('replaceAllMatches', () => {
|
|
48
|
+
test('literal replace-all rewrites every occurrence', () => {
|
|
49
|
+
expect(replaceAllMatches('a a a', 'a', 'b', PLAIN)).toBe('b b b');
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
test('regex replace-all agrees with the engine', () => {
|
|
53
|
+
const text = 'foo1 bar2';
|
|
54
|
+
const options: FindOptions = { ...PLAIN, isRegex: true };
|
|
55
|
+
expect(replaceAllMatches(text, '([a-z]+)(\\d)', '$2-$1', options)).toBe(text.replace(/([a-z]+)(\d)/g, '$2-$1'));
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
test('whole-word replace-all leaves substrings alone', () => {
|
|
59
|
+
expect(replaceAllMatches('cat category', 'cat', 'dog', { ...PLAIN, wholeWord: true })).toBe('dog category');
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
test('returns null for an unusable query', () => {
|
|
63
|
+
expect(replaceAllMatches('abc', '(', 'x', { ...PLAIN, isRegex: true })).toBeNull();
|
|
64
|
+
expect(replaceAllMatches('abc', '', 'x', PLAIN)).toBeNull();
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* The write path and the match list must be the SAME answer.
|
|
70
|
+
*
|
|
71
|
+
* They were not, and every case below was silent: the scan runs through
|
|
72
|
+
* CodeMirror's `RegExpCursor` (`gm` + `u`) while the replacement compiled the
|
|
73
|
+
* query itself (`g`/`gi`), so the count in the widget and the bytes written
|
|
74
|
+
* disagreed about anchors, unicode property escapes and which escapes are even
|
|
75
|
+
* legal. `find-scan.ts` now states the flags once (`BASE_FLAGS`), and these
|
|
76
|
+
* assert the two ends together rather than one engine in isolation.
|
|
77
|
+
*/
|
|
78
|
+
describe('the write path agrees with the scan', () => {
|
|
79
|
+
const REGEX: FindOptions = { ...PLAIN, isRegex: true };
|
|
80
|
+
|
|
81
|
+
test('an anchored pattern rewrites every line the scan counted', () => {
|
|
82
|
+
const text = 'foo\nbar\nfoo';
|
|
83
|
+
expect(findMatches(text, '^foo', REGEX).matches).toHaveLength(2);
|
|
84
|
+
expect(replaceAllMatches(text, '^foo', 'X', REGEX)).toBe('X\nbar\nX');
|
|
85
|
+
|
|
86
|
+
expect(findMatches(text, 'foo$', REGEX).matches).toHaveLength(2);
|
|
87
|
+
expect(replaceAllMatches(text, 'foo$', 'X', REGEX)).toBe('X\nbar\nX');
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
test('a unicode property escape finds AND replaces', () => {
|
|
91
|
+
const text = 'a1 b2';
|
|
92
|
+
expect(findMatches(text, '\\p{L}\\d', REGEX).matches).toHaveLength(2);
|
|
93
|
+
expect(replaceAllMatches(text, '\\p{L}\\d', 'X', REGEX)).toBe('X X');
|
|
94
|
+
expect(replaceMatch(text, { start: 0, end: 2 }, '\\p{L}\\d', 'X', REGEX)?.text).toBe('X b2');
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
test('an escape the scan calls invalid is refused by the write too', () => {
|
|
98
|
+
// `\-` is a legal identity escape without `u` and a syntax error with it.
|
|
99
|
+
expect(findMatches('a-b', '\\-', REGEX).invalid).toBe(true);
|
|
100
|
+
expect(replaceAllMatches('a-b', '\\-', 'X', REGEX)).toBeNull();
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
test('a zero-width match is replaced by nothing, exactly as it is uncounted', () => {
|
|
104
|
+
// The widget says "No results" for `^`; inserting at every line start under
|
|
105
|
+
// it was the write contradicting the count it was shown beside.
|
|
106
|
+
expect(findMatches('a\nb', '^', REGEX).matches).toEqual([]);
|
|
107
|
+
expect(replaceAllMatches('a\nb', '^', 'X', REGEX)).toBe('a\nb');
|
|
108
|
+
expect(replaceAllMatches('abc', 'x*', 'X', REGEX)).toBe('abc');
|
|
109
|
+
});
|
|
110
|
+
});
|
|
111
|
+
|
|
112
|
+
describe('expandReplacement', () => {
|
|
113
|
+
/** Indexed by group number, `[0]` unused — the shape `groupsOf` produces. */
|
|
114
|
+
const groups = { full: 'ab12', numbered: [undefined, 'a', 'b'] as const, named: { tail: '12' } };
|
|
115
|
+
|
|
116
|
+
test('expands $&, $1 and $<name>', () => {
|
|
117
|
+
expect(expandReplacement('$&|$1|$2|$<tail>', groups)).toBe('ab12|a|b|12');
|
|
118
|
+
});
|
|
119
|
+
|
|
120
|
+
test('$$ is a literal dollar and an unknown group is empty', () => {
|
|
121
|
+
expect(expandReplacement('$$$9', groups)).toBe('$');
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
test('a missing two-digit group falls back to the one-digit group plus the digit', () => {
|
|
125
|
+
// The engine's own reading of `$12` with two groups: `$1` then a literal `2`.
|
|
126
|
+
expect('x'.replace(/(x)/, '$12')).toBe('x2');
|
|
127
|
+
expect(expandReplacement('$12', groups)).toBe('a2');
|
|
128
|
+
});
|
|
129
|
+
|
|
130
|
+
test('a template without a dollar is returned as-is', () => {
|
|
131
|
+
expect(expandReplacement('plain', groups)).toBe('plain');
|
|
132
|
+
});
|
|
133
|
+
});
|
|
134
|
+
|