@kabmo-labs/kabmo 0.27.0 → 0.29.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/bunfig.toml +6 -0
- package/dist/client/index.html +2 -2
- package/dist/client/index.js +530 -493
- package/dist/client/static/js/{index-e3qh2yps.js → index-43z47ngg.js} +1178 -1034
- package/dist/client/static/js/index-naa91727.css +1 -0
- package/dist/client/static/{manifest-q6h8k9e0.webmanifest → manifest-vdvdqpre.webmanifest} +1 -0
- package/marketplace/plugins/command-runner/package.json +3 -17
- package/marketplace/plugins/command-runner/settings-schema.json +14 -0
- package/marketplace/plugins/git-forge/README.md +17 -7
- package/marketplace/plugins/git-forge/package.json +4 -30
- package/marketplace/plugins/git-forge/panel.css +16 -0
- package/marketplace/plugins/git-forge/settings-schema.json +27 -0
- package/marketplace/plugins/git-forge/src/panel/Badge.tsx +35 -22
- package/marketplace/plugins/git-forge/src/panel/Change.tsx +20 -24
- package/marketplace/plugins/git-forge/src/panel/CiBadge.tsx +16 -7
- package/marketplace/plugins/git-forge/src/panel/Credential.tsx +31 -26
- package/marketplace/plugins/git-forge/src/panel/Glyph.tsx +18 -2
- package/marketplace/plugins/git-forge/src/panel/Header.tsx +160 -96
- package/marketplace/plugins/git-forge/src/panel/ItemView.tsx +60 -44
- package/marketplace/plugins/git-forge/src/panel/List.tsx +150 -22
- package/marketplace/plugins/git-forge/src/panel/Row.tsx +11 -5
- package/marketplace/plugins/git-forge/src/panel/Sidebar.tsx +17 -15
- package/marketplace/plugins/git-forge/src/panel/Write.tsx +84 -61
- package/marketplace/plugins/git-forge/src/panel/format.test.ts +99 -0
- package/marketplace/plugins/git-forge/src/panel/format.ts +59 -16
- package/marketplace/plugins/git-forge/src/panel/index.test.tsx +109 -5
- package/marketplace/plugins/git-forge/src/panel/index.tsx +37 -4
- package/marketplace/plugins/git-forge/src/panel/use-forge.ts +17 -0
- package/marketplace/plugins/git-forge/src/panel/write.test.tsx +31 -0
- package/marketplace/plugins/session-info/package.json +2 -10
- package/marketplace/plugins/session-info/settings-schema.json +8 -0
- package/marketplace/plugins/stats/README.md +17 -5
- package/marketplace/plugins/stats/package.json +3 -23
- package/marketplace/plugins/stats/settings-schema.json +20 -0
- package/marketplace/plugins/stats/src/app.tsx +1 -1
- package/marketplace/plugins/stats/src/groups.test.ts +46 -1
- package/marketplace/plugins/stats/src/groups.ts +22 -11
- package/marketplace/plugins/stats/src/harness-leases.test.ts +84 -0
- package/marketplace/plugins/stats/src/harness-leases.ts +132 -0
- package/marketplace/plugins/stats/src/labels.test.ts +54 -1
- package/marketplace/plugins/stats/src/labels.ts +33 -7
- package/marketplace/plugins/stats/src/sampler.test.ts +61 -0
- package/marketplace/plugins/stats/src/sampler.ts +39 -5
- package/marketplace/plugins/stats/src/snapshot.ts +6 -0
- package/package.json +4 -3
- package/public/manifest.webmanifest +1 -0
- package/src/client/components/common/ComposerTextarea.test.tsx +109 -0
- package/src/client/components/common/ComposerTextarea.tsx +6 -0
- package/src/client/components/common/ReloadPageButton.test.tsx +14 -0
- package/src/client/components/common/ReloadPageButton.tsx +11 -2
- package/src/client/components/common/diagram-viewer/read-block.test.ts +71 -0
- package/src/client/components/common/diagram-viewer/read-block.ts +40 -16
- package/src/client/components/common/file-icon/index.tsx +7 -1
- package/src/client/components/common/harness-glyph/brands.ts +7 -1
- package/src/client/components/common/harness-glyph/index.tsx +18 -1
- package/src/client/components/common/image-viewer/index.tsx +37 -165
- package/src/client/components/common/picker-search/index.tsx +70 -0
- package/src/client/components/common/search-select/index.tsx +2 -7
- package/src/client/components/common/session-actions-menu/index.test.tsx +106 -0
- package/src/client/components/common/session-actions-menu/index.tsx +43 -1
- package/src/client/components/common/session-row/TrailingSlot.tsx +9 -4
- package/src/client/components/common/session-row/index.tsx +4 -0
- package/src/client/components/common/session-row/session-row.test.tsx +6 -0
- package/src/client/components/common/zoom-pan-stage/index.tsx +258 -0
- package/src/client/components/common/zoom-pan-stage/zoom-pan-stage.test.tsx +87 -0
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +2 -1
- package/src/client/components/layout/session-sidebar/ClassicView.tsx +1 -1
- package/src/client/components/layout/session-sidebar/SessionItem.tsx +9 -1
- package/src/client/components/layout/session-sidebar/SessionListNotice.tsx +7 -3
- package/src/client/components/layout/session-sidebar/about-modal/HarnessRow.tsx +4 -1
- package/src/client/components/layout/session-sidebar/about-modal/HarnessTable.tsx +12 -1
- package/src/client/components/layout/session-sidebar/about-modal/UpdateLogLine.test.tsx +82 -0
- package/src/client/components/layout/session-sidebar/about-modal/UpdateLogLine.tsx +23 -3
- package/src/client/components/layout/session-sidebar/about-modal/index.tsx +1 -0
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +2 -1
- package/src/client/components/layout/session-sidebar/modern/index.tsx +1 -1
- package/src/client/components/layout/session-sidebar/scheduler-modal/ModelFields.tsx +202 -0
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskForm.tsx +80 -19
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskList.tsx +29 -7
- package/src/client/components/layout/session-sidebar/scheduler-modal/index.tsx +3 -0
- package/src/client/components/layout/session-sidebar/session-list-states.test.tsx +8 -0
- package/src/client/components/mobile/mobile-right-sidebar/EditorSurface.tsx +181 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +41 -86
- package/src/client/components/mobile/mobile-session-sidebar/ClassicDrawer.tsx +1 -1
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +2 -1
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.test.ts +6 -0
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.tsx +9 -1
- package/src/client/components/settings/Modal.tsx +6 -2
- package/src/client/components/settings/Sidebar.tsx +32 -7
- package/src/client/components/settings/categories/HarnessSettings.tsx +15 -9
- package/src/client/components/settings/categories/NotificationSettings.test.tsx +40 -15
- package/src/client/components/settings/categories/NotificationSettings.tsx +142 -64
- package/src/client/components/settings/categories/PanelPluginSettings.tsx +3 -3
- package/src/client/components/settings/categories/PluginSettings.tsx +1 -1
- package/src/client/components/settings/categories/harness-settings/ConfigForm.tsx +3 -6
- package/src/client/components/settings/categories/harness-settings/CustomHarnessForm.tsx +186 -0
- package/src/client/components/settings/categories/panel-plugins/GitFreshness.test.tsx +36 -0
- package/src/client/components/settings/categories/panel-plugins/InstalledList.tsx +11 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.test.tsx +1 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.tsx +15 -1
- package/src/client/components/settings/categories/panel-plugins/Section.tsx +1 -3
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.test.tsx +165 -0
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.tsx +260 -0
- package/src/client/components/settings/categories/panel-plugins/Toolbar.tsx +18 -4
- package/src/client/components/settings/categories/plugin-settings/MarketplacePane.tsx +64 -61
- package/src/client/components/settings/categories/plugin-settings/SidebarList.tsx +15 -4
- package/src/client/components/settings/groups.test.tsx +2 -2
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.fork.test.ts +24 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.tsx +8 -4
- package/src/client/components/workspace/chat-timeline/ComposerDock.tsx +34 -0
- package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +3 -2
- package/src/client/components/workspace/chat-timeline/IrcNotice.test.tsx +55 -0
- package/src/client/components/workspace/chat-timeline/IrcNotice.tsx +71 -0
- package/src/client/components/workspace/chat-timeline/MessageItem.fork.test.ts +80 -0
- package/src/client/components/workspace/chat-timeline/MessageItem.tsx +13 -4
- package/src/client/components/workspace/chat-timeline/MessageList.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/RunFooter.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/TimelineBody.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/chat-input/ComposerRows.tsx +8 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.test.tsx +9 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.tsx +4 -1
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.test.ts +19 -0
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +32 -3
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.search.test.tsx +72 -0
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.tsx +53 -33
- package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +2 -0
- package/src/client/components/workspace/chat-timeline/chat-input/props.ts +5 -5
- package/src/client/components/workspace/chat-timeline/index.tsx +11 -5
- package/src/client/components/workspace/chat-timeline/target-picker/DraftTargetRow.tsx +1 -9
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.test.tsx +129 -0
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.tsx +30 -12
- package/src/client/components/workspace/chat-timeline/target-picker/WorkspacePicker.test.tsx +47 -1
- package/src/client/components/workspace/chat-timeline/target-picker/WorkspacePicker.tsx +55 -5
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Wait.tsx +3 -2
- package/src/client/components/workspace/editor/FilePane.tsx +41 -4
- package/src/client/components/workspace/editor/Notices.tsx +2 -2
- package/src/client/components/workspace/editor/Pane.tsx +2 -2
- package/src/client/components/workspace/editor/Toolbar.tsx +20 -10
- package/src/client/components/workspace/editor/index.tsx +6 -10
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +5 -3
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +26 -14
- package/src/client/components/workspace/editor/viewers/CsvGrid.tsx +52 -5
- package/src/client/components/workspace/editor/viewers/DataGrid.tsx +227 -41
- package/src/client/components/workspace/editor/viewers/DrawioView.tsx +93 -0
- package/src/client/components/workspace/editor/viewers/GridRow.tsx +91 -0
- package/src/client/components/workspace/editor/viewers/GridToolbar.tsx +53 -0
- package/src/client/components/workspace/editor/viewers/SheetView.tsx +152 -57
- package/src/client/components/workspace/editor/viewers/dispatch.tsx +42 -9
- package/src/client/components/workspace/editor/viewers/drawio-pages.test.ts +80 -0
- package/src/client/components/workspace/editor/viewers/drawio-pages.ts +63 -0
- package/src/client/components/workspace/editor/viewers/grid.test.ts +296 -0
- package/src/client/components/workspace/editor/viewers/use-cell-edit.ts +64 -0
- package/src/client/components/workspace/editor/viewers/use-grid-interaction.ts +216 -0
- package/src/client/components/workspace/editor/viewers/viewers.test.ts +47 -2
- package/src/client/components/workspace/editor/viewers/workbook.ts +149 -0
- package/src/client/components/workspace/file-explorer/ArchiveModals.tsx +262 -0
- package/src/client/components/workspace/file-explorer/ContextMenu.tsx +30 -6
- package/src/client/components/workspace/file-explorer/Modals.tsx +8 -3
- package/src/client/components/workspace/file-explorer/RootOverlays.tsx +60 -0
- package/src/client/components/workspace/file-explorer/RowLabel.tsx +6 -2
- package/src/client/components/workspace/file-explorer/TreeItem.tsx +39 -49
- package/src/client/components/workspace/file-explorer/TreeItemModals.tsx +80 -0
- package/src/client/components/workspace/file-explorer/index.tsx +53 -29
- package/src/client/components/workspace/file-explorer/selection.test.tsx +109 -0
- package/src/client/components/workspace/terminal-panel/RealtimeTerminalView.tsx +9 -1
- package/src/client/components/workspace/terminal-panel/focus.test.ts +70 -0
- package/src/client/components/workspace/terminal-panel/focus.ts +46 -0
- package/src/client/components/workspace/terminal-panel/index.tsx +14 -1
- package/src/client/components/workspace/terminal-panel/mount.ts +17 -9
- package/src/client/components/workspace/terminal-panel/scroll-hold.test.ts +158 -0
- package/src/client/components/workspace/terminal-panel/scroll-hold.ts +136 -0
- package/src/client/data/settings/omp-schema.json +169 -22
- package/src/client/glass.css +39 -14
- package/src/client/glass.test.ts +37 -0
- package/src/client/hooks/chat/composer/history.test.ts +267 -0
- package/src/client/hooks/chat/composer/history.ts +146 -0
- package/src/client/hooks/chat/composer/use-draft.ts +45 -1
- package/src/client/hooks/chat/omp/pending-sessions.waiting.test.ts +11 -10
- package/src/client/hooks/chat/omp/pending-waiting.ts +15 -7
- package/src/client/hooks/chat/omp/prompt-send.test.ts +11 -0
- package/src/client/hooks/chat/omp/prompt-send.ts +3 -0
- package/src/client/hooks/chat/timeline/actions.ts +4 -4
- package/src/client/hooks/chat/timeline/ask-frames.test.ts +54 -0
- package/src/client/hooks/chat/timeline/ask-frames.ts +29 -1
- package/src/client/hooks/chat/timeline/composer-modes.ts +13 -2
- package/src/client/hooks/chat/timeline/fork-open.ts +52 -0
- package/src/client/hooks/chat/timeline/index.ts +5 -2
- package/src/client/hooks/chat/timeline/mode-availability.ts +7 -0
- package/src/client/hooks/chat/timeline/modes-contract.ts +6 -0
- package/src/client/hooks/chat/timeline/modes-hydrate.ts +93 -0
- package/src/client/hooks/chat/timeline/modes.ts +32 -52
- package/src/client/hooks/chat/timeline/new-chat-open.ts +7 -6
- package/src/client/hooks/chat/timeline/new-chat.ts +10 -1
- package/src/client/hooks/chat/timeline/pending-dispatch.ts +4 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.test.ts +136 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.ts +69 -0
- package/src/client/hooks/chat/timeline/pending-warmup.test.ts +147 -0
- package/src/client/hooks/chat/timeline/pending-warmup.ts +62 -0
- package/src/client/hooks/chat/timeline/run-identity.test.ts +12 -0
- package/src/client/hooks/chat/timeline/run-identity.ts +4 -1
- package/src/client/hooks/chat/timeline/send-props.ts +2 -0
- package/src/client/hooks/chat/timeline/send-steer.test.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test-util.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test.ts +1 -0
- package/src/client/hooks/chat/timeline/session-harness.ts +4 -0
- package/src/client/hooks/chat/timeline/timeline-rail.test.ts +34 -2
- package/src/client/hooks/chat/timeline/use-fork-session.ts +9 -22
- package/src/client/hooks/chat/timeline/user-turns.ts +31 -2
- package/src/client/hooks/chat/waiting/cancel.ts +13 -6
- package/src/client/hooks/chat/waiting/choice.ts +13 -16
- package/src/client/hooks/chat/waiting/composer-wait.ts +70 -0
- package/src/client/hooks/chat/waiting/dispatch.ts +48 -28
- package/src/client/hooks/chat/waiting/held.ts +37 -13
- package/src/client/hooks/chat/waiting/hold.test.ts +22 -0
- package/src/client/hooks/chat/waiting/hold.ts +20 -11
- package/src/client/hooks/chat/waiting/restore.test.ts +69 -0
- package/src/client/hooks/chat/waiting/restore.ts +34 -0
- package/src/client/hooks/chat/waiting/store.ts +9 -3
- package/src/client/hooks/editor/file-editor-types.ts +36 -12
- package/src/client/hooks/editor/save-bytes.ts +79 -0
- package/src/client/hooks/editor/save-file.test.ts +1 -1
- package/src/client/hooks/editor/save-file.ts +35 -8
- package/src/client/hooks/editor/target-key.ts +17 -0
- package/src/client/hooks/editor/use-disk-digest.test.ts +82 -0
- package/src/client/hooks/editor/use-disk-digest.ts +164 -0
- package/src/client/hooks/editor/use-disk-sync.ts +212 -0
- package/src/client/hooks/editor/use-file-cache.ts +113 -0
- package/src/client/hooks/editor/use-file-editor.test.ts +120 -0
- package/src/client/hooks/editor/use-file-editor.ts +143 -57
- package/src/client/hooks/editor/use-file-read.ts +45 -12
- package/src/client/hooks/editor/use-file-writes.ts +4 -4
- package/src/client/hooks/editor/use-grid-selection.ts +160 -0
- package/src/client/hooks/models/harness-catalog.ts +15 -0
- package/src/client/hooks/models/use-harness-update.test.ts +35 -2
- package/src/client/hooks/models/use-harness-update.ts +49 -10
- package/src/client/hooks/ui/notifications.ts +17 -8
- package/src/client/hooks/workspace/diff-file.test.ts +72 -0
- package/src/client/hooks/workspace/diff-file.ts +12 -6
- package/src/client/hooks/workspace/file-archive.ts +220 -0
- package/src/client/hooks/workspace/file-clipboard.test.ts +4 -4
- package/src/client/hooks/workspace/file-clipboard.ts +37 -26
- package/src/client/hooks/workspace/file-selection.test.ts +67 -0
- package/src/client/hooks/workspace/file-selection.ts +156 -0
- package/src/client/hooks/workspace/file-tree-actions-clipboard.test.ts +5 -5
- package/src/client/hooks/workspace/file-tree-actions.ts +36 -8
- package/src/client/hooks/workspace/panel-registry.ts +1 -1
- package/src/client/hooks/workspace/scheduled-tasks.ts +26 -11
- package/src/client/lib/editor/workbook-drafts.ts +42 -0
- package/src/client/lib/launch/file-handlers.ts +2 -2
- package/src/client/lib/notifications/os.test.ts +1 -30
- package/src/client/lib/notifications/os.ts +0 -15
- package/src/client/lib/notifications/platform.test.ts +68 -0
- package/src/client/lib/notifications/platform.ts +36 -0
- package/src/client/lib/scrollbar-activity.test.ts +21 -88
- package/src/client/lib/scrollbar-activity.ts +71 -73
- package/src/client/lib/scrollbar-events.ts +143 -0
- package/src/client/lib/scrollbar-input.test.ts +126 -0
- package/src/client/lib/scrollbar-probe.test-util.ts +107 -0
- package/src/client/tailwind.css +32 -1
- package/src/server/db.server.test.ts +50 -1
- package/src/server/db.server.ts +36 -3
- package/src/server/index.ts +7 -0
- package/src/server/lib/chat/prompt-history.server.test.ts +92 -0
- package/src/server/lib/chat/prompt-history.server.ts +65 -0
- package/src/server/lib/chat/schema.server.ts +35 -0
- package/src/server/lib/db/schema.ts +3 -0
- package/src/server/lib/fs/archive.test.ts +139 -0
- package/src/server/lib/fs/archive.ts +259 -0
- package/src/server/lib/fs/git-diff.test.ts +26 -1
- package/src/server/lib/fs/git-diff.ts +43 -15
- package/src/server/lib/harness/acp/client.ts +81 -87
- package/src/server/lib/harness/acp/prewarm.server.ts +237 -0
- package/src/server/lib/harness/acp/prewarm.test.ts +171 -0
- package/src/server/lib/harness/acp/prompt.test.ts +70 -1
- package/src/server/lib/harness/acp/prompt.ts +32 -1
- package/src/server/lib/harness/acp/protocol.ts +23 -0
- package/src/server/lib/harness/acp/session-handshake.test.ts +26 -0
- package/src/server/lib/harness/acp/session-handshake.ts +22 -20
- package/src/server/lib/harness/acp/session-options.ts +16 -0
- package/src/server/lib/harness/acp/session-process.ts +43 -0
- package/src/server/lib/harness/acp/session.ts +11 -12
- package/src/server/lib/harness/acp/stdio.ts +129 -0
- package/src/server/lib/harness/acp/verbs.test.ts +97 -0
- package/src/server/lib/harness/acp/verbs.ts +16 -6
- package/src/server/lib/harness/auto-probe.server.ts +4 -3
- package/src/server/lib/harness/capabilities.ts +8 -0
- package/src/server/lib/harness/config.server.ts +3 -2
- package/src/server/lib/harness/custom.server.ts +209 -0
- package/src/server/lib/harness/launch-table.ts +19 -0
- package/src/server/lib/harness/launch.ts +6 -1
- package/src/server/lib/harness/provider-entry.ts +1 -1
- package/src/server/lib/harness/provider-file.server.ts +1 -1
- package/src/server/lib/harness/provider-sources.server.ts +2 -1
- package/src/server/lib/harness/provider-write.server.ts +2 -1
- package/src/server/lib/harness/register.server.ts +8 -1
- package/src/server/lib/harness/schema.server.ts +21 -0
- package/src/server/lib/harness/session-lease.server.test.ts +99 -0
- package/src/server/lib/harness/session-lease.server.ts +193 -0
- package/src/server/lib/harness/session-store.server.test.ts +8 -8
- package/src/server/lib/harness/session-store.server.ts +25 -4
- package/src/server/lib/harness/session-title.server.ts +12 -2
- package/src/server/lib/harness/spawn.server.ts +123 -20
- package/src/server/lib/harness/update-job-store.ts +12 -0
- package/src/server/lib/harness/update-queue.server.ts +18 -13
- package/src/server/lib/lifecycle/after-listen.ts +12 -1
- package/src/server/lib/lifecycle/paths.ts +19 -1
- package/src/server/lib/mcp/registry.server.ts +155 -0
- package/src/server/lib/mcp/registry.test.ts +169 -0
- package/src/server/lib/mcp/store.server.ts +38 -0
- package/src/server/lib/omp/rpc/frame-fold-contract.ts +59 -0
- package/src/server/lib/omp/rpc/frame-fold-frames.test.ts +64 -1
- package/src/server/lib/omp/rpc/frame-fold-host.test-util.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold-signals.test.ts +5 -1
- package/src/server/lib/omp/rpc/frame-fold.test.ts +7 -2
- package/src/server/lib/omp/rpc/frame-fold.ts +6 -45
- package/src/server/lib/omp/rpc/lifecycle.test.ts +4 -0
- package/src/server/lib/omp/rpc/prewarm-pool.ts +19 -5
- package/src/server/lib/omp/rpc/run-model.test.ts +116 -0
- package/src/server/lib/omp/rpc/run-model.ts +4 -2
- package/src/server/lib/omp/session/auto-title.server.test.ts +4 -0
- package/src/server/lib/omp/session/delete.server.ts +1 -0
- package/src/server/lib/omp/session/goal-driver.test.ts +5 -1
- package/src/server/lib/omp/session/goal-settings.test.ts +5 -1
- package/src/server/lib/omp/session/sidebar-data.harness.test.ts +6 -3
- package/src/server/lib/omp/session/standby.server.ts +13 -2
- package/src/server/lib/panels/auto-update.server.test.ts +5 -2
- package/src/server/lib/panels/git-update.server.test.ts +5 -2
- package/src/server/lib/panels/install.server.test.ts +5 -2
- package/src/server/lib/panels/manifest.test.ts +47 -1
- package/src/server/lib/panels/manifest.ts +19 -0
- package/src/server/lib/panels/registry.server.ts +19 -2
- package/src/server/lib/panels/remove.server.test.ts +5 -2
- package/src/server/lib/panels/scan.server.ts +26 -2
- package/src/server/lib/panels/settings-schema.server.ts +72 -0
- package/src/server/lib/plugins/background.server.ts +21 -3
- package/src/server/lib/plugins/background.test.ts +13 -0
- package/src/server/lib/plugins/loader.server.ts +35 -51
- package/src/server/lib/plugins/mcp.server.ts +100 -0
- package/src/server/lib/plugins/mcp.test.ts +75 -0
- package/src/server/lib/plugins/schedule-runner.server.ts +153 -0
- package/src/server/lib/plugins/schedule-runner.test.ts +186 -0
- package/src/server/lib/plugins/schedule-store.server.ts +107 -0
- package/src/server/lib/plugins/schema.server.ts +8 -0
- package/src/server/lib/plugins/settings.server.ts +56 -19
- package/src/server/lib/plugins/shutdown.server.ts +58 -0
- package/src/server/lib/plugins/shutdown.test.ts +28 -3
- package/src/server/lib/realtime/topics/global.server.ts +5 -1
- package/src/server/lib/schedule/rows.server.ts +9 -0
- package/src/server/lib/schedule/runtime.server.test.ts +91 -0
- package/src/server/lib/schedule/runtime.server.ts +101 -23
- package/src/server/lib/schedule/schema.server.ts +15 -0
- package/src/server/lib/schedule/store.server.test.ts +34 -0
- package/src/server/lib/schedule/store.server.ts +33 -9
- package/src/server/lib/sessions/fork.server.test.ts +47 -0
- package/src/server/lib/sessions/fork.server.ts +17 -1
- package/src/server/lib/sessions/spawn.server.ts +2 -2
- package/src/server/lib/waiting/runtime.server.test.ts +48 -0
- package/src/server/lib/waiting/runtime.server.ts +22 -0
- package/src/server/lib/waiting/schema.server.ts +8 -0
- package/src/server/lib/waiting/store.server.test.ts +14 -0
- package/src/server/lib/waiting/store.server.ts +6 -2
- package/src/server/routes/agent/command-resume.test.ts +9 -4
- package/src/server/routes/agent/command.ts +11 -0
- package/src/server/routes/agent/new-mode.test.ts +40 -0
- package/src/server/routes/agent/new.ts +36 -10
- package/src/server/routes/agent/prewarm.ts +48 -7
- package/src/server/routes/chat/index.ts +5 -0
- package/src/server/routes/chat/prompt-history.test.ts +67 -0
- package/src/server/routes/chat/prompt-history.ts +31 -0
- package/src/server/routes/chat/stream.test.ts +21 -0
- package/src/server/routes/chat/stream.ts +5 -0
- package/src/server/routes/fs/action-archive.test.ts +128 -0
- package/src/server/routes/fs/action-bulk.ts +106 -0
- package/src/server/routes/fs/action-save-bytes.test.ts +59 -0
- package/src/server/routes/fs/action-transfer.test.ts +26 -0
- package/src/server/routes/fs/action.ts +100 -12
- package/src/server/routes/fs/archive.ts +20 -0
- package/src/server/routes/fs/digest.test.ts +100 -0
- package/src/server/routes/fs/digest.ts +106 -0
- package/src/server/routes/fs/grant.test.ts +5 -2
- package/src/server/routes/fs/index.ts +4 -0
- package/src/server/routes/fs/read.ts +6 -1
- package/src/server/routes/fs/scope.test.ts +6 -2
- package/src/server/routes/harness/custom.test.ts +131 -0
- package/src/server/routes/harness/import-action.ts +3 -3
- package/src/server/routes/harness/root.ts +47 -9
- package/src/server/routes/harness/summary.test.ts +50 -0
- package/src/server/routes/harness/update-status.ts +41 -2
- package/src/server/routes/harness/update.test.ts +56 -2
- package/src/server/routes/harness/update.ts +2 -2
- package/src/server/routes/panels/bindings.ts +2 -0
- package/src/server/routes/panels/settings.test.ts +165 -0
- package/src/server/routes/panels/settings.ts +106 -0
- package/src/server/routes/schedule/body.ts +14 -0
- package/src/server/routes/schedule/index.ts +28 -4
- package/src/server/routes/sessions/delete.test.ts +4 -0
- package/src/server/routes/settings/mcp.ts +9 -26
- package/src/server/routes/waiting/index.ts +21 -2
- package/src/server/routes/waiting/routes.test.ts +21 -0
- package/src/shared/lib/chat/ask-form/index.ts +39 -31
- package/src/shared/lib/chat/ask-form/labels.ts +46 -0
- package/src/shared/lib/chat/ask-form/tokens.ts +11 -2
- package/src/shared/lib/chat/ask-form.test.ts +57 -0
- package/src/shared/lib/chat/ask-questions.ts +31 -0
- package/src/shared/lib/chat/composer/delegation.ts +3 -3
- package/src/shared/lib/chat/composer/history.test.ts +67 -0
- package/src/shared/lib/chat/composer/history.ts +61 -0
- package/src/shared/lib/chat/irc-notice.ts +42 -0
- package/src/shared/lib/chat/timeline/fork-anchor.test.ts +99 -0
- package/src/shared/lib/chat/timeline/fork-anchor.ts +47 -0
- package/src/shared/lib/chat/todo/parser.ts +6 -4
- package/src/shared/lib/fs/archive.test.ts +101 -0
- package/src/shared/lib/fs/archive.ts +191 -0
- package/src/shared/lib/fs/clipboard.test.ts +32 -7
- package/src/shared/lib/fs/clipboard.ts +59 -14
- package/src/shared/lib/fs/content-hash.ts +29 -0
- package/src/shared/lib/fs/csv.test.ts +50 -0
- package/src/shared/lib/fs/csv.ts +40 -0
- package/src/shared/lib/fs/document-kind.test.ts +13 -6
- package/src/shared/lib/fs/document-kind.ts +18 -6
- package/src/shared/lib/fs/file-kind-classify.test.ts +4 -0
- package/src/shared/lib/fs/file-kind.test.ts +2 -7
- package/src/shared/lib/fs/file-kind.ts +4 -2
- package/src/shared/lib/fs/grid-edit.test.ts +24 -0
- package/src/shared/lib/fs/grid-edit.ts +29 -0
- package/src/shared/lib/fs/grid-selection.test.ts +137 -0
- package/src/shared/lib/fs/grid-selection.ts +138 -0
- package/src/shared/lib/harness/brand-color.ts +5 -0
- package/src/shared/lib/harness/catalog.test.ts +22 -0
- package/src/shared/lib/harness/catalog.ts +60 -7
- package/src/shared/lib/harness/config-fields.test.ts +25 -0
- package/src/shared/lib/harness/config-fields.ts +33 -3
- package/src/shared/lib/harness/dialects.ts +1 -1
- package/src/shared/lib/harness/fork.ts +60 -0
- package/src/shared/lib/harness/mcp-facts.test.ts +30 -0
- package/src/shared/lib/harness/mcp-facts.ts +69 -0
- package/src/shared/lib/harness/menu.test.ts +16 -1
- package/src/shared/lib/harness/menu.ts +2 -2
- package/src/shared/lib/harness/provider-contracts.ts +109 -0
- package/src/shared/lib/harness/provider-facts.test.ts +2 -1
- package/src/shared/lib/harness/provider-facts.ts +24 -115
- package/src/shared/lib/harness/provider-lookup.ts +37 -0
- package/src/shared/lib/harness/providers.ts +2 -1
- package/src/shared/lib/harness/rewind.ts +6 -6
- package/src/shared/lib/harness/session-modes.ts +31 -0
- package/src/shared/lib/harness/transcript.test.ts +29 -0
- package/src/shared/lib/harness/transcript.ts +19 -0
- package/src/shared/lib/harness/updates.ts +10 -0
- package/src/shared/lib/notifications/settings.test.ts +21 -0
- package/src/shared/lib/notifications/settings.ts +24 -0
- package/src/shared/lib/omp/session/mapper.test.ts +31 -0
- package/src/shared/lib/omp/session/mapper.ts +17 -0
- package/src/shared/lib/omp/session/messages-map-notice.test.ts +68 -0
- package/src/shared/lib/omp/session/messages-map.test.ts +1 -35
- package/src/shared/lib/omp/session/messages-map.ts +17 -0
- package/src/shared/lib/omp/session/prewarm.test.ts +28 -4
- package/src/shared/lib/omp/session/prewarm.ts +25 -6
- package/src/shared/lib/omp/session/stream-state.server.test.ts +25 -0
- package/src/shared/lib/omp/session/stream-state.server.ts +8 -4
- package/src/shared/lib/omp/session/wait.ts +10 -1
- package/src/shared/lib/panels/capabilities.test.ts +1 -1
- package/src/shared/lib/panels/capabilities.ts +3 -0
- package/src/shared/lib/plugins/settings.ts +22 -0
- package/src/shared/lib/schedule/parse.test.ts +48 -0
- package/src/shared/lib/schedule/parse.ts +69 -45
- package/src/shared/lib/schedule/timezone.ts +128 -0
- package/src/shared/lib/settings/defaults.ts +2 -0
- package/src/shared/lib/settings/sections.ts +8 -4
- package/src/shared/lib/ui/picker-filter.test.ts +23 -0
- package/src/shared/lib/ui/picker-filter.ts +20 -0
- package/src/shared/lib/workspace/refresh-cadence.test.ts +25 -1
- package/src/shared/lib/workspace/relative-time.ts +16 -0
- package/src/shared/types/chat.ts +4 -0
- package/src/shared/types/harness.ts +12 -1
- package/src/shared/types/omp/agent.ts +6 -0
- package/src/shared/types/omp/session.ts +18 -0
- package/src/shared/types/panels-registry.ts +3 -3
- package/src/shared/types/panels.ts +4 -2
- package/src/shared/types/schedule.ts +13 -0
- package/src/shared/types/settings/state.ts +18 -7
- package/src/shared/types/todo.ts +3 -1
- package/src/shared/types/waiting.ts +9 -0
- package/src/test-support/file-actions.test-util.ts +4 -0
- package/src/test-support/file-archive.test-util.ts +41 -0
- package/src/test-support/file-clipboard.test-util.ts +9 -6
- package/src/test-support/file-editor.test-util.ts +70 -5
- package/src/test-support/harness-table.test-util.ts +2 -0
- package/src/test-support/preload.ts +46 -0
- package/dist/client/static/js/index-32rpkj6b.css +0 -1
- package/src/client/hooks/editor/use-external-change-notice.ts +0 -71
- package/src/client/hooks/editor/use-external-change.test.ts +0 -88
- package/src/client/hooks/editor/use-external-change.ts +0 -146
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The ACP mode a chat with NO session can still choose.
|
|
8
|
+
*
|
|
9
|
+
* A pending `new-…` chat has no child to command, so the composer's mode
|
|
10
|
+
* control used to be empty until the first prompt spawned — picking a harness
|
|
11
|
+
* from the dropdown changed the model list but left the mode surface on the
|
|
12
|
+
* previous agent's (or on nothing at all). The harness PROBE already publishes
|
|
13
|
+
* the agent's ladder, so the control can be drawn and the pick recorded before
|
|
14
|
+
* the spawn exists; the pick then rides the spawn exactly as the model and
|
|
15
|
+
* harness picks do (`SpawnOptions.sessionMode`).
|
|
16
|
+
*
|
|
17
|
+
* Split from `modes.ts` for the repo's per-file ceiling, and the seam is real:
|
|
18
|
+
* this is the only state that exists BEFORE a session does.
|
|
19
|
+
*/
|
|
20
|
+
|
|
21
|
+
import { useCallback, useEffect, useRef, useState } from 'preact/hooks';
|
|
22
|
+
import { isPendingSessionId } from '@/shared/lib/omp/session/default-title';
|
|
23
|
+
import { pendingSessionMode, type SessionModeState } from '@/shared/lib/harness/session-modes';
|
|
24
|
+
import type { ModeCapabilities } from '@/client/hooks/chat/timeline/mode-availability';
|
|
25
|
+
|
|
26
|
+
export interface PendingSessionMode {
|
|
27
|
+
/** The selector to draw, or null when the agent publishes no ladder. */
|
|
28
|
+
mode: SessionModeState | null;
|
|
29
|
+
/** Record a pick. There is no child to command, so it is held for the spawn. */
|
|
30
|
+
select: (value: string) => void;
|
|
31
|
+
/** The value the spawn must request, read by the send path. */
|
|
32
|
+
spawnRef: { current: string | null };
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export function usePendingSessionMode(
|
|
36
|
+
sessionId: string | null,
|
|
37
|
+
capabilities: ModeCapabilities,
|
|
38
|
+
): PendingSessionMode {
|
|
39
|
+
const [picked, setPicked] = useState<string | null>(null);
|
|
40
|
+
const spawnRef = useRef<string | null>(null);
|
|
41
|
+
const ladder = capabilities.modeChoices;
|
|
42
|
+
// The value the spawn must request: the operator's pick, but only while the
|
|
43
|
+
// CURRENT agent still offers it. Derived at render (the same pattern the mode
|
|
44
|
+
// toggles use for their own mirrors) so the ref can never hold a value this
|
|
45
|
+
// agent does not take, not even for the render before an effect would clear it.
|
|
46
|
+
const offered = picked && ladder?.some((choice) => choice.value === picked) ? picked : null;
|
|
47
|
+
spawnRef.current = isPendingSessionId(sessionId) ? offered : null;
|
|
48
|
+
// A different agent's ladder is a different choice: a pick made on one is not
|
|
49
|
+
// a pick on the other. Keyed by the chat too, so a pick does not follow the
|
|
50
|
+
// user to another pending chat.
|
|
51
|
+
const ladderKey = `${sessionId ?? ''}\u0000${(ladder ?? []).map((choice) => choice.value).join(',')}`;
|
|
52
|
+
useEffect(() => {
|
|
53
|
+
setPicked(null);
|
|
54
|
+
}, [ladderKey]);
|
|
55
|
+
|
|
56
|
+
const select = useCallback((value: string) => {
|
|
57
|
+
setPicked(value);
|
|
58
|
+
}, []);
|
|
59
|
+
|
|
60
|
+
const mode = isPendingSessionId(sessionId)
|
|
61
|
+
? pendingSessionMode(
|
|
62
|
+
ladder && ladder.length > 0
|
|
63
|
+
? { choices: ladder, ...(capabilities.modeCurrent ? { current: capabilities.modeCurrent } : {}) }
|
|
64
|
+
: undefined,
|
|
65
|
+
offered,
|
|
66
|
+
)
|
|
67
|
+
: null;
|
|
68
|
+
return { mode, select, spawnRef };
|
|
69
|
+
}
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The pending chat's warm: WHAT it warms, WHEN it re-fires, and what it leaves
|
|
8
|
+
* alone.
|
|
9
|
+
*
|
|
10
|
+
* Three rules, each one a measured cost when it is dropped:
|
|
11
|
+
*
|
|
12
|
+
* - the HARNESS rides the request, because a pending chat on an ACP agent must
|
|
13
|
+
* warm that agent (the pool is chosen server-side by this field);
|
|
14
|
+
* - the cwd is the SEND path's cwd (worktree pick, then the folder's project
|
|
15
|
+
* path), because a warm child in another directory is a spawn AND a kill;
|
|
16
|
+
* - a render that changed none of those facts fires nothing, because the
|
|
17
|
+
* composer re-renders on every keystroke.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test } from 'bun:test';
|
|
21
|
+
import { Window } from 'happy-dom';
|
|
22
|
+
import { h, render } from 'preact';
|
|
23
|
+
import { useState } from 'preact/hooks';
|
|
24
|
+
import { act } from 'preact/test-utils';
|
|
25
|
+
|
|
26
|
+
import { usePendingWarmup, type PendingWarmupInput } from '@/client/hooks/chat/timeline/pending-warmup';
|
|
27
|
+
import { installDomGlobals, restoreDomGlobals } from '@/test-support/pristine-globals';
|
|
28
|
+
import { primeKabmoSettings } from '@/shared/lib/settings/client';
|
|
29
|
+
import type { WorkspaceFolderData } from '@/shared/types';
|
|
30
|
+
|
|
31
|
+
let container: HTMLElement;
|
|
32
|
+
const calls: Array<Record<string, unknown>> = [];
|
|
33
|
+
|
|
34
|
+
beforeAll(() => {
|
|
35
|
+
installDomGlobals(new Window({ url: 'http://localhost' }));
|
|
36
|
+
globalThis.fetch = ((input: unknown, init?: { body?: string }) => {
|
|
37
|
+
if (String(input).endsWith('/api/agent/prewarm')) calls.push(JSON.parse(String(init?.body)) as Record<string, unknown>);
|
|
38
|
+
return Promise.resolve(new Response('{}', { status: 200 }));
|
|
39
|
+
}) as unknown as typeof fetch;
|
|
40
|
+
});
|
|
41
|
+
afterAll(() => restoreDomGlobals());
|
|
42
|
+
|
|
43
|
+
beforeEach(() => {
|
|
44
|
+
calls.length = 0;
|
|
45
|
+
container = document.body.appendChild(document.createElement('div'));
|
|
46
|
+
// A settings snapshot, so the access pick is a stated constant.
|
|
47
|
+
primeKabmoSettings({ omp_access_mode: 'yolo' });
|
|
48
|
+
});
|
|
49
|
+
afterEach(() => {
|
|
50
|
+
render(null, container);
|
|
51
|
+
container.remove();
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
const FOLDERS = [
|
|
55
|
+
{ id: 1, name: 'ws', project_path: '/work/alpha' },
|
|
56
|
+
{ id: 2, name: 'no-project', project_path: null },
|
|
57
|
+
] as unknown as WorkspaceFolderData[];
|
|
58
|
+
|
|
59
|
+
async function mount(input: Partial<PendingWarmupInput> = {}) {
|
|
60
|
+
function Probe() {
|
|
61
|
+
usePendingWarmup({
|
|
62
|
+
sessionId: 'new-1',
|
|
63
|
+
folders: FOLDERS,
|
|
64
|
+
selectedFolderId: 1,
|
|
65
|
+
worktreePath: null,
|
|
66
|
+
harness: undefined,
|
|
67
|
+
plan: false,
|
|
68
|
+
...input,
|
|
69
|
+
});
|
|
70
|
+
return null;
|
|
71
|
+
}
|
|
72
|
+
await act(async () => {
|
|
73
|
+
render(h(Probe, {}), container);
|
|
74
|
+
});
|
|
75
|
+
// The trigger is fire-and-forget; one microtask turn lands the request.
|
|
76
|
+
await act(async () => {});
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
describe('usePendingWarmup', () => {
|
|
80
|
+
test('warms the selected folder in omp’s pool by default', async () => {
|
|
81
|
+
await mount();
|
|
82
|
+
expect(calls).toEqual([
|
|
83
|
+
{ cwd: '/work/alpha', harness: 'omp-rpc', accessMode: 'yolo', modes: { plan: false, goal: false } },
|
|
84
|
+
]);
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
test('an ACP pick names its harness, so that agent is the one booted', async () => {
|
|
88
|
+
await mount({ harness: 'claude' });
|
|
89
|
+
expect(calls).toEqual([
|
|
90
|
+
{ cwd: '/work/alpha', harness: 'claude', accessMode: 'yolo', modes: { plan: false, goal: false } },
|
|
91
|
+
]);
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
test('a Plan pick rides the warm, because omp reads it at start', async () => {
|
|
95
|
+
await mount({ plan: true });
|
|
96
|
+
expect(calls).toEqual([
|
|
97
|
+
{ cwd: '/work/alpha', harness: 'omp-rpc', accessMode: 'yolo', modes: { plan: true, goal: false } },
|
|
98
|
+
]);
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
test('the worktree pick wins over the folder, exactly as the send resolves it', async () => {
|
|
102
|
+
await mount({ worktreePath: '/work/alpha-wt/feature' });
|
|
103
|
+
expect(calls[0]?.cwd).toBe('/work/alpha-wt/feature');
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
test('a folder with no project path warms its own directory', async () => {
|
|
107
|
+
await mount({ selectedFolderId: 2 });
|
|
108
|
+
expect(calls[0]?.cwd).toBe('no-project');
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
test('a spawned chat warms nothing — there is no boot left to hide', async () => {
|
|
112
|
+
await mount({ sessionId: 'sess-1' });
|
|
113
|
+
expect(calls).toEqual([]);
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
test('a re-render that moved nothing fires no second prewarm', async () => {
|
|
117
|
+
// A keystroke in the composer re-renders this hook; a second request would
|
|
118
|
+
// be a `POST /api/agent/prewarm` per character typed.
|
|
119
|
+
let rerender: () => void = () => {};
|
|
120
|
+
function Probe() {
|
|
121
|
+
const [, setTick] = useState(0);
|
|
122
|
+
rerender = () => setTick((tick) => tick + 1);
|
|
123
|
+
usePendingWarmup({
|
|
124
|
+
sessionId: 'new-1',
|
|
125
|
+
folders: FOLDERS,
|
|
126
|
+
selectedFolderId: 1,
|
|
127
|
+
worktreePath: null,
|
|
128
|
+
harness: undefined,
|
|
129
|
+
plan: false,
|
|
130
|
+
});
|
|
131
|
+
return null;
|
|
132
|
+
}
|
|
133
|
+
await act(async () => {
|
|
134
|
+
render(h(Probe, {}), container);
|
|
135
|
+
});
|
|
136
|
+
await act(async () => {
|
|
137
|
+
rerender();
|
|
138
|
+
});
|
|
139
|
+
expect(calls).toHaveLength(1);
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
test('a harness change re-fires, because a different agent is a different child', async () => {
|
|
143
|
+
await mount({ harness: 'omp-rpc' });
|
|
144
|
+
await mount({ harness: 'codex' });
|
|
145
|
+
expect(calls.map((call) => call.harness)).toEqual(['omp-rpc', 'codex']);
|
|
146
|
+
});
|
|
147
|
+
});
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Warm the agent a PENDING chat will spawn on, and re-warm it when a pick that
|
|
8
|
+
* decides the boot moves.
|
|
9
|
+
*
|
|
10
|
+
* The sidebar's New Session click already warms omp's RPC child, but it cannot
|
|
11
|
+
* know which agent the chat will end up on: the harness is picked in the
|
|
12
|
+
* composer, and a Plan pick changes the environment omp's child must start
|
|
13
|
+
* with. Both are known here, and both are known BEFORE the first prompt — so
|
|
14
|
+
* the boot happens while the prompt is being written instead of after it.
|
|
15
|
+
*
|
|
16
|
+
* One effect keyed by the facts that decide WHICH process is warmed. The server
|
|
17
|
+
* recycles an entry that can no longer serve the request (a different approval
|
|
18
|
+
* mode or mode selection for omp; a different harness for ACP), so a re-fire is
|
|
19
|
+
* a replacement, not a second process.
|
|
20
|
+
*/
|
|
21
|
+
|
|
22
|
+
import { useEffect } from 'preact/hooks';
|
|
23
|
+
import { isPendingSessionId } from '@/shared/lib/omp/session/default-title';
|
|
24
|
+
import { triggerSessionPrewarm } from '@/shared/lib/omp/session/prewarm';
|
|
25
|
+
import type { WorkspaceFolderData } from '@/shared/types';
|
|
26
|
+
|
|
27
|
+
export interface PendingWarmupInput {
|
|
28
|
+
sessionId: string | null;
|
|
29
|
+
folders: WorkspaceFolderData[];
|
|
30
|
+
selectedFolderId: number | null;
|
|
31
|
+
/** The worktree the draft picked, when it did — the spawn's real cwd. */
|
|
32
|
+
worktreePath: string | null;
|
|
33
|
+
/** The harness the chat will spawn on; absent means omp's RPC transport. */
|
|
34
|
+
harness: string | undefined;
|
|
35
|
+
/** The pending chat's Plan pick, which omp's child reads at start. */
|
|
36
|
+
plan: boolean;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export function usePendingWarmup({
|
|
40
|
+
sessionId,
|
|
41
|
+
folders,
|
|
42
|
+
selectedFolderId,
|
|
43
|
+
worktreePath,
|
|
44
|
+
harness,
|
|
45
|
+
plan,
|
|
46
|
+
}: PendingWarmupInput): void {
|
|
47
|
+
// The send path's own rule (`dispatchPendingChat`), read off the SAME field:
|
|
48
|
+
// the worktree pick wins, then the selected folder's project path. Resolving
|
|
49
|
+
// it any other way warms a process in a cwd the send never claims — a spawn
|
|
50
|
+
// AND a kill for nothing.
|
|
51
|
+
const pending = isPendingSessionId(sessionId);
|
|
52
|
+
const folder = folders.find((row) => String(row.id) === String(selectedFolderId));
|
|
53
|
+
const cwd = pending ? worktreePath ?? folder?.project_path ?? folder?.name ?? null : null;
|
|
54
|
+
const key = `${cwd ?? ''}\u0000${harness ?? 'omp-rpc'}\u0000${plan ? 'plan' : ''}`;
|
|
55
|
+
useEffect(() => {
|
|
56
|
+
if (!cwd) return;
|
|
57
|
+
triggerSessionPrewarm(cwd, { harness: harness ?? 'omp-rpc', modes: { plan, goal: false } });
|
|
58
|
+
// `key` carries every input; a re-render that changed none of them must not
|
|
59
|
+
// fire another prewarm.
|
|
60
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
61
|
+
}, [key]);
|
|
62
|
+
}
|
|
@@ -40,6 +40,18 @@ describe('runIdentityFor', () => {
|
|
|
40
40
|
expect(identity).toEqual({ sessionProvider: 'p', sessionModelName: 'served' });
|
|
41
41
|
});
|
|
42
42
|
|
|
43
|
+
test('a live run whose row carries no model still names the session model', () => {
|
|
44
|
+
// A `stream` row written by a frame has no pair; the metadata still names
|
|
45
|
+
// the run, and discarding it read `Loading…` for the whole answer.
|
|
46
|
+
const identity = runIdentityFor({
|
|
47
|
+
folders: [folder({ id: 's1', streamStatus: 'stream', runModel: null })],
|
|
48
|
+
sessionId: 's1',
|
|
49
|
+
sessionData: { model: { provider: 'p', modelId: 'known' } },
|
|
50
|
+
modelNames: { known: 'Known' },
|
|
51
|
+
});
|
|
52
|
+
expect(identity).toEqual({ sessionProvider: 'p', sessionModelName: 'Known' });
|
|
53
|
+
});
|
|
54
|
+
|
|
43
55
|
test('falls back to the run row when the session metadata has no model', () => {
|
|
44
56
|
const identity = runIdentityFor({
|
|
45
57
|
folders: [folder({ id: 's1', streamStatus: 'finish', runModel: { provider: 'p', modelId: 'last' } })],
|
|
@@ -39,10 +39,13 @@ export function runIdentityFor(input: RunIdentityInput): RunIdentity {
|
|
|
39
39
|
// never reached it, so the footer and the composer kept naming the first
|
|
40
40
|
// model the chat ever picked. An idle chat reads the session's own metadata,
|
|
41
41
|
// which `/api/chat/:id` re-reads from the live agent on a `model_changed`.
|
|
42
|
+
//
|
|
43
|
+
// A live row is preferred, not trusted blindly: a row written by a frame can
|
|
44
|
+
// carry no pair, and the session metadata then names the run instead.
|
|
42
45
|
const liveRun = sidebar?.streamStatus === 'stream';
|
|
43
46
|
const fallback = sessionData?.model;
|
|
44
47
|
const fallbackModel = typeof fallback === 'object' ? fallback : null;
|
|
45
|
-
const chosen = liveRun ? runModel : (fallbackModel ?? runModel);
|
|
48
|
+
const chosen = liveRun ? (runModel ?? fallbackModel) : (fallbackModel ?? runModel);
|
|
46
49
|
return {
|
|
47
50
|
sessionProvider: chosen?.provider,
|
|
48
51
|
sessionModelName: chosen?.modelId
|
|
@@ -51,6 +51,8 @@ export interface ChatTimelineSendDeps {
|
|
|
51
51
|
pendingThinkingLevelRef: { current: string | null };
|
|
52
52
|
/** Harness picked on the pending `new-…` chat; rides the spawn. */
|
|
53
53
|
pendingHarnessRef: { current: string | null };
|
|
54
|
+
/** ACP mode picked on the pending `new-…` chat; rides the spawn. */
|
|
55
|
+
pendingAgentModeRef: { current: string | null };
|
|
54
56
|
/** Global access-control mode (persisted user preference), read at send time
|
|
55
57
|
* so the spawn-capable requests carry the latest value. */
|
|
56
58
|
accessModeRef: { current: ApprovalMode };
|
|
@@ -184,6 +184,7 @@ function makeSendHarness(options: {
|
|
|
184
184
|
pendingComposerModelRef: { current: null },
|
|
185
185
|
pendingThinkingLevelRef: { current: null },
|
|
186
186
|
pendingHarnessRef: { current: null },
|
|
187
|
+
pendingAgentModeRef: { current: null },
|
|
187
188
|
deferredComposerPickRef: options.deferredPick ?? { current: null },
|
|
188
189
|
accessModeRef: { current: 'always-ask' },
|
|
189
190
|
spawnSelectionRef,
|
|
@@ -255,6 +255,7 @@ export function makeSendHarness(options: {
|
|
|
255
255
|
pendingComposerModelRef: { current: null },
|
|
256
256
|
pendingThinkingLevelRef: { current: null },
|
|
257
257
|
pendingHarnessRef: { current: null },
|
|
258
|
+
pendingAgentModeRef: { current: null },
|
|
258
259
|
deferredComposerPickRef: (options.deferredPick ?? { current: null }) as ChatTimelineSendDeps['deferredComposerPickRef'],
|
|
259
260
|
accessModeRef: { current: 'always-ask' },
|
|
260
261
|
spawnSelectionRef,
|
|
@@ -189,6 +189,7 @@ function makeSendHarness(options: {
|
|
|
189
189
|
pendingComposerModelRef: { current: null },
|
|
190
190
|
pendingThinkingLevelRef: { current: null },
|
|
191
191
|
pendingHarnessRef: { current: null },
|
|
192
|
+
pendingAgentModeRef: { current: null },
|
|
192
193
|
deferredComposerPickRef: options.deferredPick ?? { current: null },
|
|
193
194
|
accessModeRef: { current: 'always-ask' },
|
|
194
195
|
spawnSelectionRef,
|
|
@@ -150,6 +150,10 @@ export function useSessionHarness(
|
|
|
150
150
|
const pick = useCallback((next: string) => {
|
|
151
151
|
// The ref is what the SEND path reads; the store is what every renderer
|
|
152
152
|
// reads. A pick that moved only one of them is the reported defect.
|
|
153
|
+
//
|
|
154
|
+
// The WARM of the picked agent is not fired here: `usePendingWarmup` owns it
|
|
155
|
+
// and re-fires on this store change, so there is one path that decides which
|
|
156
|
+
// process is warmed (and it resolves the cwd exactly as the send does).
|
|
153
157
|
pendingHarnessRef.current = next;
|
|
154
158
|
setHarnessPick(sessionId, next);
|
|
155
159
|
}, [pendingHarnessRef, sessionId]);
|
|
@@ -138,11 +138,43 @@ describe('useUserTurns', () => {
|
|
|
138
138
|
* entry pointed at a DOM id the reconciliation had already replaced. This is
|
|
139
139
|
* the duplicate a user sees right after sending a prompt.
|
|
140
140
|
*/
|
|
141
|
-
test('the same turn under its optimistic and echoed ids is listed once', async () => {
|
|
141
|
+
test('the same turn under its optimistic and echoed ids is listed once, under the mounted id', async () => {
|
|
142
142
|
const text = 'send this once';
|
|
143
143
|
committed = { turns: [{ id: 'omp-echo-id', index: 7, preview: text }] };
|
|
144
144
|
await open('s1', [userMessage('msg-1791000000000-user', text)]);
|
|
145
|
-
|
|
145
|
+
// The DOM row is still the optimistic bubble, so the tick has to name THAT
|
|
146
|
+
// id: the committed index names a node the timeline does not render until
|
|
147
|
+
// omp echoes the turn, and a jump to a missing id reveals nothing.
|
|
148
|
+
expect(rail?.turns.map((turn) => turn.id)).toEqual(['msg-1791000000000-user']);
|
|
149
|
+
expect(rail?.turns[0].index).toBe(7);
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
test('a jump on the paired entry reaches the mounted row instead of paging to a missing id', async () => {
|
|
153
|
+
const text = 'send this once';
|
|
154
|
+
committed = { turns: [{ id: 'prev-turn', index: 3, preview: 'earlier' }, { id: 'omp-echo-id', index: 7, preview: text }] };
|
|
155
|
+
await open('s1', [userMessage('prev-turn', 'earlier'), userMessage('msg-1791000000000-user', text)]);
|
|
156
|
+
let reached = false;
|
|
157
|
+
await act(async () => {
|
|
158
|
+
reached = await rail!.jumpToTurn(rail!.turns[1].id, rail!.turns[1].index);
|
|
159
|
+
});
|
|
160
|
+
expect(reached).toBe(true);
|
|
161
|
+
expect(revealed).toEqual(['msg-1791000000000-user']);
|
|
162
|
+
});
|
|
163
|
+
|
|
164
|
+
test('an older committed turn is not re-pointed at a newer live row with the same text', async () => {
|
|
165
|
+
const text = 'same text';
|
|
166
|
+
committed = {
|
|
167
|
+
turns: [
|
|
168
|
+
{ id: 'older-turn', index: 2, preview: text },
|
|
169
|
+
{ id: 'previous-turn', index: 8, preview: 'another prompt' },
|
|
170
|
+
],
|
|
171
|
+
};
|
|
172
|
+
await open('s1', [userMessage('previous-turn', 'another prompt'), userMessage('msg-1791000000000-user', text)]);
|
|
173
|
+
expect(rail?.turns.map((turn) => [turn.id, turn.index])).toEqual([
|
|
174
|
+
['older-turn', 2],
|
|
175
|
+
['previous-turn', 8],
|
|
176
|
+
['msg-1791000000000-user', -1],
|
|
177
|
+
]);
|
|
146
178
|
});
|
|
147
179
|
|
|
148
180
|
test('a genuinely new turn is still appended even when another shares a prefix', async () => {
|
|
@@ -15,43 +15,30 @@
|
|
|
15
15
|
|
|
16
16
|
import { useCallback } from 'preact/hooks';
|
|
17
17
|
import { useSearchParams } from '@/client/lib/router/search-params';
|
|
18
|
-
import {
|
|
19
|
-
import {
|
|
20
|
-
import { formatNewSessionTitle } from '@/shared/lib/omp/session/default-title';
|
|
18
|
+
import { forkAnchorFor, type ForkAnchorRole } from '@/shared/lib/chat/timeline/fork-anchor';
|
|
19
|
+
import { openForkSession } from '@/client/hooks/chat/timeline/fork-open';
|
|
21
20
|
import type { WorkspaceFolderData } from '@/shared/types';
|
|
22
21
|
|
|
23
22
|
export function useForkSession(
|
|
24
23
|
sessionId: string | null | undefined,
|
|
25
24
|
folders: WorkspaceFolderData[],
|
|
26
25
|
selectedFolderId: number | null,
|
|
27
|
-
): (messageId: string) => void {
|
|
26
|
+
): (messageId: string, role: ForkAnchorRole) => void {
|
|
28
27
|
const [, setSearchParams] = useSearchParams();
|
|
29
28
|
|
|
30
29
|
return useCallback(
|
|
31
|
-
(messageId: string) => {
|
|
30
|
+
(messageId: string, role: ForkAnchorRole) => {
|
|
32
31
|
if (!sessionId) return;
|
|
33
32
|
const source = folders
|
|
34
33
|
.flatMap((folder) => folder.sessions ?? [])
|
|
35
34
|
.find((session) => String(session.id) === sessionId);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
title: formatNewSessionTitle(new Date(), 'Fork'),
|
|
35
|
+
openForkSession({
|
|
36
|
+
sourceSessionId: String(sessionId),
|
|
39
37
|
...(source?.harness ? { harness: source.harness } : {}),
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
folderId: source?.folder_id ?? selectedFolderId ?? null,
|
|
39
|
+
anchorEntryId: forkAnchorFor(source?.harness, messageId, role),
|
|
40
|
+
setSearchParams,
|
|
42
41
|
});
|
|
43
|
-
// The picker's first tab is the source's agent; the fork cannot change
|
|
44
|
-
// provider because that agent owns the history being branched.
|
|
45
|
-
if (source?.harness) setHarnessPick(pendingId, source.harness);
|
|
46
|
-
setSearchParams((prev) => {
|
|
47
|
-
const next = new URLSearchParams(prev);
|
|
48
|
-
next.set('sessionId', pendingId);
|
|
49
|
-
next.set('forkFrom', String(sessionId));
|
|
50
|
-
next.set('forkAt', messageId);
|
|
51
|
-
next.delete('parentSessionId');
|
|
52
|
-
if (folderId !== null && folderId !== undefined) next.set('folderId', String(folderId));
|
|
53
|
-
return next;
|
|
54
|
-
}, { replace: true });
|
|
55
42
|
},
|
|
56
43
|
[sessionId, folders, selectedFolderId, setSearchParams],
|
|
57
44
|
);
|
|
@@ -140,17 +140,46 @@ export function useUserTurns(deps: UseUserTurnsDeps): UserTurnsState {
|
|
|
140
140
|
// `TURN_PREVIEW_CHARS`, so a real match is byte-identical, while a prefix
|
|
141
141
|
// test would swallow a genuine short prompt that opens with an earlier
|
|
142
142
|
// turn's words.
|
|
143
|
+
//
|
|
144
|
+
// The pair is also NEWER than every committed turn the client still has
|
|
145
|
+
// mounted. That is what makes the match the same turn rather than two
|
|
146
|
+
// prompts that happen to read alike: the entry this live row stands for was
|
|
147
|
+
// committed after everything on screen, so an older tick can never be
|
|
148
|
+
// re-pointed at it (which would strand the older turn).
|
|
149
|
+
const newestMountedCommitted = indexed.reduce(
|
|
150
|
+
(newest, turn) => (mountedIds.has(turn.id) ? Math.max(newest, turn.index) : newest),
|
|
151
|
+
-1,
|
|
152
|
+
);
|
|
143
153
|
const paired = new Set<string>();
|
|
154
|
+
// Committed entry id → the id its row is mounted under RIGHT NOW.
|
|
155
|
+
//
|
|
156
|
+
// The committed index names the id omp recorded, and the mounted row does
|
|
157
|
+
// not carry it yet: omp echoes the user turn LATE (after the assistant
|
|
158
|
+
// segment), and until that echo the bubble the composer mounted keeps its
|
|
159
|
+
// optimistic `msg-…-user` id. Listing the committed id named a DOM node
|
|
160
|
+
// that does not exist, so a rail click on the newest turn paged nowhere and
|
|
161
|
+
// then waited out the reveal's deadline — the reported "cannot jump to the
|
|
162
|
+
// message I just sent until I reload". The listing therefore takes the
|
|
163
|
+
// DOM id from the row it is already drawing, and keeps the entry's own
|
|
164
|
+
// index (the paging cursor). Once the echo reconciles, the ids agree and
|
|
165
|
+
// this map is empty.
|
|
166
|
+
const rowIdFor = new Map<string, string>();
|
|
144
167
|
const extra = mountedTurns.filter((turn) => {
|
|
145
168
|
if (knownIds.has(turn.id)) return false;
|
|
146
169
|
const match = orphanedCommitted.find(
|
|
147
|
-
(entry) => !paired.has(entry.id) && entry.preview === turn.preview,
|
|
170
|
+
(entry) => entry.index > newestMountedCommitted && !paired.has(entry.id) && entry.preview === turn.preview,
|
|
148
171
|
);
|
|
149
172
|
if (!match) return true;
|
|
150
173
|
paired.add(match.id);
|
|
174
|
+
rowIdFor.set(match.id, turn.id);
|
|
151
175
|
return false;
|
|
152
176
|
});
|
|
153
|
-
|
|
177
|
+
const listed = extra.length > 0 ? [...indexed, ...extra] : indexed;
|
|
178
|
+
if (rowIdFor.size === 0) return listed;
|
|
179
|
+
return listed.map((turn) => {
|
|
180
|
+
const rowId = rowIdFor.get(turn.id);
|
|
181
|
+
return rowId ? { ...turn, id: rowId } : turn;
|
|
182
|
+
});
|
|
154
183
|
}, [indexed, mountedTurns]);
|
|
155
184
|
|
|
156
185
|
const jump = async (id: string, index: number): Promise<boolean> => {
|
|
@@ -6,6 +6,12 @@
|
|
|
6
6
|
/**
|
|
7
7
|
* Dropping a held prompt from the row that shows it.
|
|
8
8
|
*
|
|
9
|
+
* Cancelling returns the prompt to the composer, never to nowhere: the send
|
|
10
|
+
* path cleared the draft when the row was created, so the row is the only copy
|
|
11
|
+
* of what the user wrote. The chat itself is KEPT (the pending entry is not
|
|
12
|
+
* released) — the text it was going to send is back in the box the user is
|
|
13
|
+
* looking at.
|
|
14
|
+
*
|
|
9
15
|
* A refusal is REPORTED: the only two refusals are "already sent" (the prompt
|
|
10
16
|
* is running now, so Stop the session instead) and "no longer there", and both
|
|
11
17
|
* leave the row on screen. Swallowing them would leave a row that looks stuck
|
|
@@ -14,7 +20,8 @@
|
|
|
14
20
|
|
|
15
21
|
import { useCallback } from 'preact/hooks';
|
|
16
22
|
import { cancelWaitingPromptRequest } from '@/client/hooks/chat/waiting/store';
|
|
17
|
-
import {
|
|
23
|
+
import { markPendingSessionDraft } from '@/client/hooks/chat/omp/pending-waiting';
|
|
24
|
+
import { restoreHeldDraft } from '@/client/hooks/chat/waiting/restore';
|
|
18
25
|
import type { ToastTone } from '@/shared/lib/ui/toast-duration';
|
|
19
26
|
|
|
20
27
|
export type CancelWait = (waitId: string) => void;
|
|
@@ -22,14 +29,14 @@ export type CancelWait = (waitId: string) => void;
|
|
|
22
29
|
export function useCancelWait(onNotice?: (message: string, type?: ToastTone) => void): CancelWait {
|
|
23
30
|
return useCallback((waitId: string) => {
|
|
24
31
|
void cancelWaitingPromptRequest(waitId).then((result) => {
|
|
25
|
-
if (!result.ok) {
|
|
32
|
+
if (!result.ok || !result.prompt) {
|
|
26
33
|
onNotice?.(result.error ?? 'Could not cancel the waiting prompt.', 'error');
|
|
27
34
|
return;
|
|
28
35
|
}
|
|
29
|
-
|
|
30
|
-
//
|
|
31
|
-
|
|
32
|
-
onNotice?.('Waiting prompt cancelled.', 'success');
|
|
36
|
+
restoreHeldDraft(result.prompt);
|
|
37
|
+
// The chat stays as an UNSENT draft carrying the restored text.
|
|
38
|
+
if (result.prompt.pendingId) markPendingSessionDraft(result.prompt.pendingId);
|
|
39
|
+
onNotice?.('Waiting prompt cancelled — your draft is back in the composer.', 'success');
|
|
33
40
|
});
|
|
34
41
|
}, [onNotice]);
|
|
35
42
|
}
|
|
@@ -6,17 +6,19 @@
|
|
|
6
6
|
/**
|
|
7
7
|
* The composer's "wait for session" pick, per chat.
|
|
8
8
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
9
|
+
* Applies to whatever this chat sends NEXT: the first prompt of a pending
|
|
10
|
+
* `new-…` chat, or a follow-up in a chat that already has a session. Held in
|
|
11
|
+
* the session's own UI state (`chat.waitingFor`) rather than in component
|
|
12
|
+
* state: the composer is remounted by a stretch, a tab switch and a reload, and
|
|
13
|
+
* a pick that evaporated with it would silently send the prompt immediately —
|
|
14
|
+
* the one outcome the user explicitly deferred.
|
|
13
15
|
*
|
|
14
16
|
* The ref is the other half, and it is not redundant: the send handler is
|
|
15
17
|
* created once per deps record, so reading the pick from render state there
|
|
16
18
|
* would dispatch with whatever it was when that closure was built.
|
|
17
19
|
*/
|
|
18
20
|
|
|
19
|
-
import { useCallback,
|
|
21
|
+
import { useCallback, useRef } from 'preact/hooks';
|
|
20
22
|
import { useSessionState } from '@/client/hooks/workspace/session-state';
|
|
21
23
|
import type { WaitingCandidate } from '@/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker';
|
|
22
24
|
|
|
@@ -27,21 +29,16 @@ export interface WaitingDependencyChoice {
|
|
|
27
29
|
clear: () => void;
|
|
28
30
|
}
|
|
29
31
|
|
|
30
|
-
export function useWaitingDependencyChoice(
|
|
32
|
+
export function useWaitingDependencyChoice(): WaitingDependencyChoice {
|
|
31
33
|
const [stored, setStored] = useSessionState<WaitingCandidate | null>('chat.waitingFor', null);
|
|
32
34
|
const ref = useRef<WaitingCandidate | null>(stored);
|
|
33
35
|
ref.current = stored;
|
|
34
36
|
|
|
35
|
-
// The pick belongs to
|
|
36
|
-
//
|
|
37
|
-
// cleared
|
|
38
|
-
//
|
|
39
|
-
//
|
|
40
|
-
const pending = Boolean(sessionId?.startsWith('new-'));
|
|
41
|
-
useEffect(() => {
|
|
42
|
-
if (!pending && stored !== null) setStored(null);
|
|
43
|
-
}, [pending, stored, setStored]);
|
|
44
|
-
|
|
37
|
+
// The pick belongs to THIS chat's next prompt, whatever the chat is: a pending
|
|
38
|
+
// `new-…` chat defers its first send, and a chat with an omp id defers a
|
|
39
|
+
// follow-up. It is cleared by the send that consumes it, never by the session
|
|
40
|
+
// id changing shape — that clearing was what confined the feature to a new
|
|
41
|
+
// chat's first prompt.
|
|
45
42
|
const set = useCallback((candidate: WaitingCandidate | null) => {
|
|
46
43
|
ref.current = candidate;
|
|
47
44
|
setStored(candidate);
|