@kabmo-labs/kabmo 0.27.0 → 0.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +495 -467
- package/dist/client/static/js/index-81f7berm.css +1 -0
- package/dist/client/static/js/{index-e3qh2yps.js → index-xzvyrxya.js} +795 -795
- package/marketplace/plugins/command-runner/package.json +3 -17
- package/marketplace/plugins/command-runner/settings-schema.json +14 -0
- package/marketplace/plugins/git-forge/README.md +17 -7
- package/marketplace/plugins/git-forge/package.json +4 -30
- package/marketplace/plugins/git-forge/panel.css +16 -0
- package/marketplace/plugins/git-forge/settings-schema.json +27 -0
- package/marketplace/plugins/git-forge/src/panel/Badge.tsx +35 -22
- package/marketplace/plugins/git-forge/src/panel/Change.tsx +20 -24
- package/marketplace/plugins/git-forge/src/panel/CiBadge.tsx +16 -7
- package/marketplace/plugins/git-forge/src/panel/Credential.tsx +31 -26
- package/marketplace/plugins/git-forge/src/panel/Glyph.tsx +18 -2
- package/marketplace/plugins/git-forge/src/panel/Header.tsx +160 -96
- package/marketplace/plugins/git-forge/src/panel/ItemView.tsx +60 -44
- package/marketplace/plugins/git-forge/src/panel/List.tsx +150 -22
- package/marketplace/plugins/git-forge/src/panel/Row.tsx +11 -5
- package/marketplace/plugins/git-forge/src/panel/Sidebar.tsx +17 -15
- package/marketplace/plugins/git-forge/src/panel/Write.tsx +84 -61
- package/marketplace/plugins/git-forge/src/panel/format.test.ts +99 -0
- package/marketplace/plugins/git-forge/src/panel/format.ts +59 -16
- package/marketplace/plugins/git-forge/src/panel/index.test.tsx +109 -5
- package/marketplace/plugins/git-forge/src/panel/index.tsx +37 -4
- package/marketplace/plugins/git-forge/src/panel/use-forge.ts +17 -0
- package/marketplace/plugins/git-forge/src/panel/write.test.tsx +31 -0
- package/marketplace/plugins/session-info/package.json +2 -10
- package/marketplace/plugins/session-info/settings-schema.json +8 -0
- package/marketplace/plugins/stats/README.md +17 -5
- package/marketplace/plugins/stats/package.json +3 -23
- package/marketplace/plugins/stats/settings-schema.json +20 -0
- package/marketplace/plugins/stats/src/app.tsx +1 -1
- package/marketplace/plugins/stats/src/groups.test.ts +46 -1
- package/marketplace/plugins/stats/src/groups.ts +22 -11
- package/marketplace/plugins/stats/src/harness-leases.test.ts +84 -0
- package/marketplace/plugins/stats/src/harness-leases.ts +132 -0
- package/marketplace/plugins/stats/src/labels.test.ts +54 -1
- package/marketplace/plugins/stats/src/labels.ts +33 -7
- package/marketplace/plugins/stats/src/sampler.test.ts +61 -0
- package/marketplace/plugins/stats/src/sampler.ts +39 -5
- package/marketplace/plugins/stats/src/snapshot.ts +6 -0
- package/package.json +2 -2
- package/src/client/components/common/harness-glyph/index.tsx +18 -1
- package/src/client/components/common/session-actions-menu/index.test.tsx +106 -0
- package/src/client/components/common/session-actions-menu/index.tsx +43 -1
- package/src/client/components/common/session-row/TrailingSlot.tsx +9 -4
- package/src/client/components/common/session-row/index.tsx +4 -0
- package/src/client/components/common/session-row/session-row.test.tsx +6 -0
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +2 -1
- package/src/client/components/layout/session-sidebar/SessionItem.tsx +9 -1
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +2 -1
- package/src/client/components/layout/session-sidebar/scheduler-modal/ModelFields.tsx +202 -0
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskForm.tsx +80 -19
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskList.tsx +23 -3
- package/src/client/components/layout/session-sidebar/scheduler-modal/index.tsx +3 -0
- package/src/client/components/mobile/mobile-right-sidebar/EditorSurface.tsx +156 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +41 -86
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +2 -1
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.test.ts +6 -0
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.tsx +9 -1
- package/src/client/components/settings/Modal.tsx +6 -2
- package/src/client/components/settings/Sidebar.tsx +30 -3
- package/src/client/components/settings/categories/HarnessSettings.tsx +11 -7
- package/src/client/components/settings/categories/NotificationSettings.test.tsx +40 -15
- package/src/client/components/settings/categories/NotificationSettings.tsx +142 -64
- package/src/client/components/settings/categories/PanelPluginSettings.tsx +1 -1
- package/src/client/components/settings/categories/harness-settings/CustomHarnessForm.tsx +186 -0
- package/src/client/components/settings/categories/panel-plugins/InstalledList.tsx +11 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.test.tsx +1 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.tsx +15 -1
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.test.tsx +165 -0
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.tsx +260 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.fork.test.ts +24 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.tsx +8 -4
- package/src/client/components/workspace/chat-timeline/ComposerDock.tsx +34 -0
- package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +3 -2
- package/src/client/components/workspace/chat-timeline/MessageItem.fork.test.ts +80 -0
- package/src/client/components/workspace/chat-timeline/MessageItem.tsx +9 -3
- package/src/client/components/workspace/chat-timeline/MessageList.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/RunFooter.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/TimelineBody.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/chat-input/ComposerRows.tsx +8 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.test.tsx +9 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.tsx +4 -1
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +24 -0
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.tsx +13 -20
- package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +2 -0
- package/src/client/components/workspace/chat-timeline/chat-input/props.ts +5 -5
- package/src/client/components/workspace/chat-timeline/index.tsx +11 -5
- package/src/client/components/workspace/chat-timeline/target-picker/DraftTargetRow.tsx +1 -9
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.test.tsx +101 -0
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.tsx +2 -2
- package/src/client/components/workspace/editor/FilePane.tsx +9 -4
- package/src/client/components/workspace/editor/Notices.tsx +2 -2
- package/src/client/components/workspace/editor/Pane.tsx +2 -2
- package/src/client/components/workspace/editor/Toolbar.tsx +16 -10
- package/src/client/components/workspace/editor/index.tsx +6 -10
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +4 -3
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +23 -14
- package/src/client/components/workspace/terminal-panel/RealtimeTerminalView.tsx +9 -1
- package/src/client/components/workspace/terminal-panel/focus.test.ts +70 -0
- package/src/client/components/workspace/terminal-panel/focus.ts +46 -0
- package/src/client/components/workspace/terminal-panel/index.tsx +14 -1
- package/src/client/components/workspace/terminal-panel/mount.ts +17 -9
- package/src/client/components/workspace/terminal-panel/scroll-hold.test.ts +158 -0
- package/src/client/components/workspace/terminal-panel/scroll-hold.ts +136 -0
- package/src/client/hooks/chat/composer/use-draft.ts +45 -1
- package/src/client/hooks/chat/omp/pending-sessions.waiting.test.ts +11 -10
- package/src/client/hooks/chat/omp/pending-waiting.ts +15 -7
- package/src/client/hooks/chat/omp/prompt-send.test.ts +11 -0
- package/src/client/hooks/chat/omp/prompt-send.ts +3 -0
- package/src/client/hooks/chat/timeline/actions.ts +4 -4
- package/src/client/hooks/chat/timeline/composer-modes.ts +13 -2
- package/src/client/hooks/chat/timeline/fork-open.ts +52 -0
- package/src/client/hooks/chat/timeline/index.ts +5 -2
- package/src/client/hooks/chat/timeline/mode-availability.ts +7 -0
- package/src/client/hooks/chat/timeline/modes-contract.ts +6 -0
- package/src/client/hooks/chat/timeline/modes-hydrate.ts +93 -0
- package/src/client/hooks/chat/timeline/modes.ts +32 -52
- package/src/client/hooks/chat/timeline/new-chat-open.ts +7 -6
- package/src/client/hooks/chat/timeline/new-chat.ts +10 -1
- package/src/client/hooks/chat/timeline/pending-dispatch.ts +4 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.test.ts +136 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.ts +69 -0
- package/src/client/hooks/chat/timeline/pending-warmup.test.ts +147 -0
- package/src/client/hooks/chat/timeline/pending-warmup.ts +62 -0
- package/src/client/hooks/chat/timeline/run-identity.test.ts +12 -0
- package/src/client/hooks/chat/timeline/run-identity.ts +4 -1
- package/src/client/hooks/chat/timeline/send-props.ts +2 -0
- package/src/client/hooks/chat/timeline/send-steer.test.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test-util.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test.ts +1 -0
- package/src/client/hooks/chat/timeline/session-harness.ts +4 -0
- package/src/client/hooks/chat/timeline/use-fork-session.ts +9 -22
- package/src/client/hooks/chat/waiting/cancel.ts +13 -6
- package/src/client/hooks/chat/waiting/choice.ts +13 -16
- package/src/client/hooks/chat/waiting/composer-wait.ts +70 -0
- package/src/client/hooks/chat/waiting/dispatch.ts +48 -28
- package/src/client/hooks/chat/waiting/held.ts +37 -13
- package/src/client/hooks/chat/waiting/hold.test.ts +22 -0
- package/src/client/hooks/chat/waiting/hold.ts +20 -11
- package/src/client/hooks/chat/waiting/restore.test.ts +69 -0
- package/src/client/hooks/chat/waiting/restore.ts +34 -0
- package/src/client/hooks/chat/waiting/store.ts +9 -3
- package/src/client/hooks/editor/file-editor-types.ts +21 -12
- package/src/client/hooks/editor/save-file.test.ts +1 -1
- package/src/client/hooks/editor/save-file.ts +35 -8
- package/src/client/hooks/editor/target-key.ts +17 -0
- package/src/client/hooks/editor/use-disk-digest.test.ts +82 -0
- package/src/client/hooks/editor/use-disk-digest.ts +164 -0
- package/src/client/hooks/editor/use-disk-sync.ts +212 -0
- package/src/client/hooks/editor/use-file-cache.ts +113 -0
- package/src/client/hooks/editor/use-file-editor.test.ts +90 -0
- package/src/client/hooks/editor/use-file-editor.ts +90 -52
- package/src/client/hooks/editor/use-file-read.ts +24 -10
- package/src/client/hooks/editor/use-file-writes.ts +4 -4
- package/src/client/hooks/models/harness-catalog.ts +15 -0
- package/src/client/hooks/ui/notifications.ts +17 -8
- package/src/client/hooks/workspace/panel-registry.ts +1 -1
- package/src/client/hooks/workspace/scheduled-tasks.ts +26 -11
- package/src/client/lib/notifications/os.test.ts +1 -30
- package/src/client/lib/notifications/os.ts +0 -15
- package/src/client/lib/notifications/platform.test.ts +68 -0
- package/src/client/lib/notifications/platform.ts +36 -0
- package/src/server/index.ts +7 -0
- package/src/server/lib/harness/acp/client.ts +81 -87
- package/src/server/lib/harness/acp/prewarm.server.ts +237 -0
- package/src/server/lib/harness/acp/prewarm.test.ts +171 -0
- package/src/server/lib/harness/acp/prompt.test.ts +70 -1
- package/src/server/lib/harness/acp/prompt.ts +32 -1
- package/src/server/lib/harness/acp/protocol.ts +23 -0
- package/src/server/lib/harness/acp/session-handshake.test.ts +26 -0
- package/src/server/lib/harness/acp/session-handshake.ts +22 -20
- package/src/server/lib/harness/acp/session-options.ts +16 -0
- package/src/server/lib/harness/acp/session-process.ts +43 -0
- package/src/server/lib/harness/acp/session.ts +11 -12
- package/src/server/lib/harness/acp/stdio.ts +129 -0
- package/src/server/lib/harness/acp/verbs.test.ts +97 -0
- package/src/server/lib/harness/acp/verbs.ts +16 -6
- package/src/server/lib/harness/auto-probe.server.ts +4 -3
- package/src/server/lib/harness/capabilities.ts +8 -0
- package/src/server/lib/harness/config.server.ts +3 -2
- package/src/server/lib/harness/custom.server.ts +209 -0
- package/src/server/lib/harness/launch.ts +6 -1
- package/src/server/lib/harness/register.server.ts +8 -1
- package/src/server/lib/harness/schema.server.ts +21 -0
- package/src/server/lib/harness/session-lease.server.test.ts +99 -0
- package/src/server/lib/harness/session-lease.server.ts +193 -0
- package/src/server/lib/harness/session-store.server.test.ts +8 -8
- package/src/server/lib/harness/session-store.server.ts +25 -4
- package/src/server/lib/harness/session-title.server.ts +12 -2
- package/src/server/lib/harness/spawn.server.ts +123 -20
- package/src/server/lib/harness/update-queue.server.ts +3 -3
- package/src/server/lib/lifecycle/after-listen.ts +12 -1
- package/src/server/lib/lifecycle/paths.ts +19 -1
- package/src/server/lib/mcp/registry.server.ts +155 -0
- package/src/server/lib/mcp/registry.test.ts +169 -0
- package/src/server/lib/mcp/store.server.ts +38 -0
- package/src/server/lib/omp/rpc/frame-fold-contract.ts +59 -0
- package/src/server/lib/omp/rpc/frame-fold-frames.test.ts +64 -1
- package/src/server/lib/omp/rpc/frame-fold-host.test-util.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold.test.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold.ts +6 -45
- package/src/server/lib/omp/rpc/prewarm-pool.ts +19 -5
- package/src/server/lib/omp/rpc/run-model.test.ts +116 -0
- package/src/server/lib/omp/rpc/run-model.ts +4 -2
- package/src/server/lib/omp/session/sidebar-data.harness.test.ts +6 -3
- package/src/server/lib/omp/session/standby.server.ts +13 -2
- package/src/server/lib/panels/manifest.test.ts +47 -1
- package/src/server/lib/panels/manifest.ts +19 -0
- package/src/server/lib/panels/registry.server.ts +19 -2
- package/src/server/lib/panels/scan.server.ts +26 -2
- package/src/server/lib/panels/settings-schema.server.ts +72 -0
- package/src/server/lib/plugins/background.server.ts +21 -3
- package/src/server/lib/plugins/background.test.ts +13 -0
- package/src/server/lib/plugins/loader.server.ts +35 -51
- package/src/server/lib/plugins/mcp.server.ts +100 -0
- package/src/server/lib/plugins/mcp.test.ts +75 -0
- package/src/server/lib/plugins/schedule-runner.server.ts +153 -0
- package/src/server/lib/plugins/schedule-runner.test.ts +186 -0
- package/src/server/lib/plugins/schedule-store.server.ts +107 -0
- package/src/server/lib/plugins/schema.server.ts +8 -0
- package/src/server/lib/plugins/settings.server.ts +56 -19
- package/src/server/lib/plugins/shutdown.server.ts +58 -0
- package/src/server/lib/plugins/shutdown.test.ts +28 -3
- package/src/server/lib/realtime/topics/global.server.ts +5 -1
- package/src/server/lib/schedule/rows.server.ts +9 -0
- package/src/server/lib/schedule/runtime.server.test.ts +91 -0
- package/src/server/lib/schedule/runtime.server.ts +101 -23
- package/src/server/lib/schedule/schema.server.ts +15 -0
- package/src/server/lib/schedule/store.server.test.ts +34 -0
- package/src/server/lib/schedule/store.server.ts +33 -9
- package/src/server/lib/sessions/fork.server.test.ts +47 -0
- package/src/server/lib/sessions/fork.server.ts +17 -1
- package/src/server/lib/sessions/spawn.server.ts +2 -2
- package/src/server/lib/waiting/runtime.server.test.ts +48 -0
- package/src/server/lib/waiting/runtime.server.ts +22 -0
- package/src/server/lib/waiting/schema.server.ts +8 -0
- package/src/server/lib/waiting/store.server.test.ts +14 -0
- package/src/server/lib/waiting/store.server.ts +6 -2
- package/src/server/routes/agent/command-resume.test.ts +9 -4
- package/src/server/routes/agent/new-mode.test.ts +40 -0
- package/src/server/routes/agent/new.ts +31 -10
- package/src/server/routes/agent/prewarm.ts +48 -7
- package/src/server/routes/fs/action.ts +9 -1
- package/src/server/routes/fs/digest.test.ts +100 -0
- package/src/server/routes/fs/digest.ts +106 -0
- package/src/server/routes/fs/index.ts +2 -0
- package/src/server/routes/fs/read.ts +6 -1
- package/src/server/routes/harness/custom.test.ts +131 -0
- package/src/server/routes/harness/import-action.ts +2 -2
- package/src/server/routes/harness/root.ts +41 -8
- package/src/server/routes/harness/update.ts +2 -2
- package/src/server/routes/panels/bindings.ts +2 -0
- package/src/server/routes/panels/settings.test.ts +165 -0
- package/src/server/routes/panels/settings.ts +106 -0
- package/src/server/routes/schedule/body.ts +14 -0
- package/src/server/routes/schedule/index.ts +28 -4
- package/src/server/routes/settings/mcp.ts +9 -26
- package/src/server/routes/waiting/index.ts +21 -2
- package/src/server/routes/waiting/routes.test.ts +21 -0
- package/src/shared/lib/chat/composer/delegation.ts +3 -3
- package/src/shared/lib/chat/timeline/fork-anchor.test.ts +97 -0
- package/src/shared/lib/chat/timeline/fork-anchor.ts +47 -0
- package/src/shared/lib/fs/content-hash.ts +29 -0
- package/src/shared/lib/harness/catalog.ts +48 -6
- package/src/shared/lib/harness/fork.ts +60 -0
- package/src/shared/lib/harness/mcp-facts.test.ts +30 -0
- package/src/shared/lib/harness/mcp-facts.ts +65 -0
- package/src/shared/lib/harness/menu.test.ts +16 -1
- package/src/shared/lib/harness/menu.ts +2 -2
- package/src/shared/lib/harness/rewind.ts +6 -6
- package/src/shared/lib/harness/session-modes.ts +31 -0
- package/src/shared/lib/harness/transcript.test.ts +29 -0
- package/src/shared/lib/harness/transcript.ts +19 -0
- package/src/shared/lib/notifications/settings.test.ts +21 -0
- package/src/shared/lib/notifications/settings.ts +24 -0
- package/src/shared/lib/omp/session/prewarm.test.ts +28 -4
- package/src/shared/lib/omp/session/prewarm.ts +25 -6
- package/src/shared/lib/omp/session/stream-state.server.test.ts +25 -0
- package/src/shared/lib/omp/session/stream-state.server.ts +8 -4
- package/src/shared/lib/panels/capabilities.test.ts +1 -1
- package/src/shared/lib/panels/capabilities.ts +3 -0
- package/src/shared/lib/plugins/settings.ts +22 -0
- package/src/shared/lib/schedule/parse.test.ts +48 -0
- package/src/shared/lib/schedule/parse.ts +69 -45
- package/src/shared/lib/schedule/timezone.ts +128 -0
- package/src/shared/lib/settings/defaults.ts +2 -0
- package/src/shared/lib/workspace/refresh-cadence.test.ts +25 -1
- package/src/shared/lib/workspace/relative-time.ts +16 -0
- package/src/shared/types/harness.ts +7 -0
- package/src/shared/types/omp/agent.ts +6 -0
- package/src/shared/types/panels-registry.ts +3 -3
- package/src/shared/types/panels.ts +4 -2
- package/src/shared/types/schedule.ts +13 -0
- package/src/shared/types/settings/state.ts +12 -1
- package/src/shared/types/waiting.ts +9 -0
- package/src/test-support/file-editor.test-util.ts +70 -5
- package/dist/client/static/js/index-32rpkj6b.css +0 -1
- package/src/client/hooks/editor/use-external-change-notice.ts +0 -71
- package/src/client/hooks/editor/use-external-change.test.ts +0 -88
- package/src/client/hooks/editor/use-external-change.ts +0 -146
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The harness, model, thinking and access picks for a scheduled task.
|
|
8
|
+
*
|
|
9
|
+
* A task runs with nobody watching, so the snapshot has to be explicit: the
|
|
10
|
+
* harness decides the transport and the model catalog, and the model/thinking
|
|
11
|
+
* picks are replayed at dispatch. The list is the SAME one the composer shows
|
|
12
|
+
* (`harnessModels`), so a task cannot offer a model the agent would refuse.
|
|
13
|
+
*
|
|
14
|
+
* The model value is `provider/modelId` — the shape both transports accept
|
|
15
|
+
* (`set_model` for omp, `session/set_config_option` for ACP). An empty value
|
|
16
|
+
* means "the harness's default": omp falls back to the composer's persisted
|
|
17
|
+
* pick, an ACP agent to its own configured default.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
import { useHarnesses } from '@/client/hooks/models/use-harnesses';
|
|
21
|
+
import { useModelsCatalog } from '@/client/hooks/models/use-models-catalog';
|
|
22
|
+
import {
|
|
23
|
+
harnessModels,
|
|
24
|
+
pickerHarnesses,
|
|
25
|
+
} from '@/client/components/workspace/model-dropdown/harness-models';
|
|
26
|
+
import { APPROVAL_MODES, type ApprovalMode } from '@/shared/lib/omp/config/access-mode';
|
|
27
|
+
import { selectableThinkingLevels } from '@/shared/lib/models/thinking-levels';
|
|
28
|
+
import type { AIModelOption } from '@/shared/types';
|
|
29
|
+
import type { ScheduledTaskModel } from '@/shared/types/schedule';
|
|
30
|
+
|
|
31
|
+
interface ModelFieldsProps {
|
|
32
|
+
harness: string;
|
|
33
|
+
model: ScheduledTaskModel | null;
|
|
34
|
+
onHarnessChange: (harness: string) => void;
|
|
35
|
+
onModelChange: (model: ScheduledTaskModel | null) => void;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
const ACCESS_LABELS: Record<ApprovalMode, string> = {
|
|
39
|
+
'always-ask': 'Ask before writes',
|
|
40
|
+
write: 'Auto-write, ask before exec',
|
|
41
|
+
yolo: 'Auto-run everything',
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
function modelKey(option: AIModelOption): string {
|
|
45
|
+
return `${option.provider}/${option.id}`;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/**
|
|
49
|
+
* The picker rows from either catalog shape: the real `/api/models` answers
|
|
50
|
+
* `modelList`, while the mock catalog answers `models` as an array. Narrowing
|
|
51
|
+
* here keeps a malformed entry out of the picker instead of rendering a blank
|
|
52
|
+
* row.
|
|
53
|
+
*/
|
|
54
|
+
function toPickerOptions(entries: unknown): AIModelOption[] {
|
|
55
|
+
if (!Array.isArray(entries)) return [];
|
|
56
|
+
const options: AIModelOption[] = [];
|
|
57
|
+
for (const entry of entries) {
|
|
58
|
+
if (!entry || typeof entry !== 'object') continue;
|
|
59
|
+
if (!('id' in entry) || typeof entry.id !== 'string') continue;
|
|
60
|
+
if (!('name' in entry) || typeof entry.name !== 'string') continue;
|
|
61
|
+
if (!('provider' in entry) || typeof entry.provider !== 'string') continue;
|
|
62
|
+
const thinkingLevels =
|
|
63
|
+
'thinkingLevels' in entry && Array.isArray(entry.thinkingLevels)
|
|
64
|
+
? entry.thinkingLevels.filter((level: unknown): level is string => typeof level === 'string')
|
|
65
|
+
: undefined;
|
|
66
|
+
options.push({
|
|
67
|
+
id: entry.id,
|
|
68
|
+
name: entry.name,
|
|
69
|
+
provider: entry.provider,
|
|
70
|
+
...(thinkingLevels ? { thinkingLevels } : {}),
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
return options;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
export function ModelFields({ harness, model, onHarnessChange, onModelChange }: ModelFieldsProps) {
|
|
77
|
+
const { harnesses } = useHarnesses();
|
|
78
|
+
// The scheduler only needs the picker's identity and thinking ladder; the
|
|
79
|
+
// registry's cost/context fields are not drawn here.
|
|
80
|
+
const ompModels = useModelsCatalog((data) => {
|
|
81
|
+
const list = Array.isArray(data.modelList) && data.modelList.length > 0 ? data.modelList : data.models;
|
|
82
|
+
return toPickerOptions(list);
|
|
83
|
+
});
|
|
84
|
+
const list = harnessModels(harnesses, harness, ompModels ?? []);
|
|
85
|
+
const options = list.models;
|
|
86
|
+
const selected = model
|
|
87
|
+
? options.find((option) => option.provider === model.provider && option.id === model.modelId)
|
|
88
|
+
: undefined;
|
|
89
|
+
const thinkingLevels = selectableThinkingLevels(selected?.thinkingLevels);
|
|
90
|
+
const harnessOptions = pickerHarnesses(harnesses, harness);
|
|
91
|
+
|
|
92
|
+
const pickModel = (value: string) => {
|
|
93
|
+
if (!value) {
|
|
94
|
+
onModelChange(null);
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
const option = options.find((entry) => modelKey(entry) === value);
|
|
98
|
+
if (!option) return;
|
|
99
|
+
onModelChange({
|
|
100
|
+
provider: option.provider,
|
|
101
|
+
modelId: option.id,
|
|
102
|
+
// `auto` leaves omp's level untouched and is skipped by an ACP agent that
|
|
103
|
+
// publishes no such value, so it is the honest default for both.
|
|
104
|
+
thinkingLevel: 'auto',
|
|
105
|
+
accessMode: model?.accessMode ?? 'always-ask',
|
|
106
|
+
});
|
|
107
|
+
};
|
|
108
|
+
|
|
109
|
+
const pickThinking = (level: string) => {
|
|
110
|
+
if (!model) return;
|
|
111
|
+
onModelChange({ ...model, thinkingLevel: level });
|
|
112
|
+
};
|
|
113
|
+
|
|
114
|
+
const pickAccess = (mode: ApprovalMode) => {
|
|
115
|
+
if (!model) return;
|
|
116
|
+
onModelChange({ ...model, accessMode: mode });
|
|
117
|
+
};
|
|
118
|
+
|
|
119
|
+
return (
|
|
120
|
+
<div className="space-y-2">
|
|
121
|
+
<div className="grid grid-cols-2 gap-2">
|
|
122
|
+
<div>
|
|
123
|
+
<label className="block font-semibold mb-1 text-ink">Harness</label>
|
|
124
|
+
<select
|
|
125
|
+
value={harness}
|
|
126
|
+
onChange={(e) => onHarnessChange(e.currentTarget.value)}
|
|
127
|
+
className="w-full bg-paper border border-ink/20 rounded px-2 py-1.5 outline-none focus:border-ink/50 text-xs"
|
|
128
|
+
>
|
|
129
|
+
{!harnessOptions.some((entry) => entry.id === harness) && (
|
|
130
|
+
<option value={harness}>{harness}</option>
|
|
131
|
+
)}
|
|
132
|
+
{harnessOptions.map((entry) => (
|
|
133
|
+
<option key={entry.id} value={entry.id}>{entry.label}</option>
|
|
134
|
+
))}
|
|
135
|
+
</select>
|
|
136
|
+
</div>
|
|
137
|
+
<div>
|
|
138
|
+
<label className="block font-semibold mb-1 text-ink">Model</label>
|
|
139
|
+
<select
|
|
140
|
+
value={model ? `${model.provider}/${model.modelId}` : ''}
|
|
141
|
+
onChange={(e) => pickModel(e.currentTarget.value)}
|
|
142
|
+
className="w-full bg-paper border border-ink/20 rounded px-2 py-1.5 outline-none focus:border-ink/50 text-xs"
|
|
143
|
+
>
|
|
144
|
+
<option value="">
|
|
145
|
+
{harness === 'omp-rpc' ? 'Default (composer selection)' : 'Harness default'}
|
|
146
|
+
</option>
|
|
147
|
+
{model && !options.some((option) => option.provider === model.provider && option.id === model.modelId) && (
|
|
148
|
+
<option value={`${model.provider}/${model.modelId}`}>
|
|
149
|
+
{model.provider}/{model.modelId}
|
|
150
|
+
</option>
|
|
151
|
+
)}
|
|
152
|
+
{options.map((option) => (
|
|
153
|
+
<option key={modelKey(option)} value={modelKey(option)}>
|
|
154
|
+
{option.name} · {option.provider}
|
|
155
|
+
</option>
|
|
156
|
+
))}
|
|
157
|
+
</select>
|
|
158
|
+
</div>
|
|
159
|
+
</div>
|
|
160
|
+
|
|
161
|
+
<div className="grid grid-cols-2 gap-2">
|
|
162
|
+
<div>
|
|
163
|
+
<label className="block font-semibold mb-1 text-ink">Thinking</label>
|
|
164
|
+
<select
|
|
165
|
+
value={model?.thinkingLevel ?? 'auto'}
|
|
166
|
+
disabled={!model || thinkingLevels.length === 0}
|
|
167
|
+
onChange={(e) => pickThinking(e.currentTarget.value)}
|
|
168
|
+
className="w-full bg-paper border border-ink/20 rounded px-2 py-1.5 outline-none focus:border-ink/50 text-xs disabled:opacity-40"
|
|
169
|
+
>
|
|
170
|
+
<option value="auto">Auto</option>
|
|
171
|
+
{model && model.thinkingLevel !== 'auto' && !thinkingLevels.includes(model.thinkingLevel) && (
|
|
172
|
+
<option value={model.thinkingLevel}>{model.thinkingLevel}</option>
|
|
173
|
+
)}
|
|
174
|
+
{thinkingLevels.map((level) => (
|
|
175
|
+
<option key={level} value={level}>{level}</option>
|
|
176
|
+
))}
|
|
177
|
+
</select>
|
|
178
|
+
</div>
|
|
179
|
+
<div>
|
|
180
|
+
<label className="block font-semibold mb-1 text-ink">Access</label>
|
|
181
|
+
<select
|
|
182
|
+
value={model?.accessMode ?? 'always-ask'}
|
|
183
|
+
disabled={!model}
|
|
184
|
+
onChange={(e) => pickAccess(e.currentTarget.value as ApprovalMode)}
|
|
185
|
+
className="w-full bg-paper border border-ink/20 rounded px-2 py-1.5 outline-none focus:border-ink/50 text-xs disabled:opacity-40"
|
|
186
|
+
>
|
|
187
|
+
{APPROVAL_MODES.map((mode) => (
|
|
188
|
+
<option key={mode} value={mode}>{ACCESS_LABELS[mode]}</option>
|
|
189
|
+
))}
|
|
190
|
+
</select>
|
|
191
|
+
</div>
|
|
192
|
+
</div>
|
|
193
|
+
|
|
194
|
+
{list.blocked && <p className="text-[11px] text-error">{list.blocked}</p>}
|
|
195
|
+
{list.unprobed && (
|
|
196
|
+
<p className="text-[11px] text-ink/40">
|
|
197
|
+
This harness has not been probed yet; its models appear after a status check.
|
|
198
|
+
</p>
|
|
199
|
+
)}
|
|
200
|
+
</div>
|
|
201
|
+
);
|
|
202
|
+
}
|
|
@@ -17,9 +17,10 @@ import { CHECKBOX_CLASS } from '@/client/components/common/checkbox/style';
|
|
|
17
17
|
import { useEffect, useState } from 'preact/hooks';
|
|
18
18
|
import { Loader2 } from 'lucide-preact';
|
|
19
19
|
import { validateSchedule } from '@/shared/lib/schedule/parse';
|
|
20
|
-
import type { ScheduleKind } from '@/shared/types/schedule';
|
|
20
|
+
import type { ScheduleKind, ScheduledTaskModel } from '@/shared/types/schedule';
|
|
21
21
|
import type { ScheduleDraft } from '@/client/hooks/workspace/scheduled-tasks';
|
|
22
22
|
import type { ScheduleFolderOption } from '@/client/components/layout/session-sidebar/scheduler-modal/folders';
|
|
23
|
+
import { ModelFields } from '@/client/components/layout/session-sidebar/scheduler-modal/ModelFields';
|
|
23
24
|
|
|
24
25
|
interface TaskFormProps {
|
|
25
26
|
/** Workspace folders a task can run in. */
|
|
@@ -28,6 +29,8 @@ interface TaskFormProps {
|
|
|
28
29
|
initial: (ScheduleDraft & { id: string }) | null;
|
|
29
30
|
/** The session the composer is on, offered as "resume this conversation". */
|
|
30
31
|
activeSessionId: string | null;
|
|
32
|
+
/** The server's zone, the default for a new task. */
|
|
33
|
+
serverTimeZone: string;
|
|
31
34
|
busy: boolean;
|
|
32
35
|
onSubmit: (draft: ScheduleDraft) => void;
|
|
33
36
|
onCancel: () => void;
|
|
@@ -61,10 +64,37 @@ function formatNext(at: number): string {
|
|
|
61
64
|
return `in ${Math.round(hours / 24)}d`;
|
|
62
65
|
}
|
|
63
66
|
|
|
67
|
+
/**
|
|
68
|
+
* The zones the picker offers. `Intl.supportedValuesOf` is the runtime's own
|
|
69
|
+
* list, so the picker cannot offer a zone the parser would refuse; the current
|
|
70
|
+
* value is prepended when the runtime does not list it (a legacy or alias name).
|
|
71
|
+
*/
|
|
72
|
+
let cachedZones: string[] | null = null;
|
|
73
|
+
|
|
74
|
+
function supportedZones(): string[] {
|
|
75
|
+
if (cachedZones) return cachedZones;
|
|
76
|
+
// `Intl.supportedValuesOf` is in the runtime but not in the ES2022 lib types.
|
|
77
|
+
const intlWithZones = Intl as typeof Intl & { supportedValuesOf?: (key: string) => string[] };
|
|
78
|
+
let supported: string[] = [];
|
|
79
|
+
try {
|
|
80
|
+
supported = intlWithZones.supportedValuesOf?.('timeZone') ?? [];
|
|
81
|
+
} catch {
|
|
82
|
+
supported = [];
|
|
83
|
+
}
|
|
84
|
+
cachedZones = supported.length ? supported : ['UTC'];
|
|
85
|
+
return cachedZones;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function timeZoneOptions(current: string): string[] {
|
|
89
|
+
const zones = supportedZones();
|
|
90
|
+
return current && !zones.includes(current) ? [current, ...zones] : zones;
|
|
91
|
+
}
|
|
92
|
+
|
|
64
93
|
export function TaskForm({
|
|
65
94
|
folders,
|
|
66
95
|
initial,
|
|
67
96
|
activeSessionId,
|
|
97
|
+
serverTimeZone,
|
|
68
98
|
busy,
|
|
69
99
|
onSubmit,
|
|
70
100
|
onCancel,
|
|
@@ -73,6 +103,12 @@ export function TaskForm({
|
|
|
73
103
|
const [prompt, setPrompt] = useState('');
|
|
74
104
|
const [kind, setKind] = useState<ScheduleKind>('every');
|
|
75
105
|
const [spec, setSpec] = useState('1h');
|
|
106
|
+
const [harness, setHarness] = useState('omp-rpc');
|
|
107
|
+
const [model, setModel] = useState<ScheduledTaskModel | null>(null);
|
|
108
|
+
// The topic snapshot carries the server's zone; before it lands (or when the
|
|
109
|
+
// server reports none) the browser's zone is the honest stand-in.
|
|
110
|
+
const defaultZone = serverTimeZone || Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC';
|
|
111
|
+
const [timezone, setTimezone] = useState(defaultZone);
|
|
76
112
|
const [folderId, setFolderId] = useState<number | null>(null);
|
|
77
113
|
const [useActiveSession, setUseActiveSession] = useState(false);
|
|
78
114
|
|
|
@@ -83,11 +119,14 @@ export function TaskForm({
|
|
|
83
119
|
setPrompt(initial?.prompt ?? '');
|
|
84
120
|
setKind(initial?.kind ?? 'every');
|
|
85
121
|
setSpec(initial?.spec ?? '1h');
|
|
122
|
+
setHarness(initial?.harness ?? 'omp-rpc');
|
|
123
|
+
setModel(initial?.model ?? null);
|
|
124
|
+
setTimezone(initial?.timezone ?? defaultZone);
|
|
86
125
|
setFolderId(initial?.folderId ?? null);
|
|
87
126
|
setUseActiveSession(Boolean(initial?.sessionId));
|
|
88
|
-
}, [initial?.id]);
|
|
127
|
+
}, [initial?.id, defaultZone]);
|
|
89
128
|
|
|
90
|
-
const validation = validateSchedule(kind, spec);
|
|
129
|
+
const validation = validateSchedule(kind, spec, Date.now(), timezone);
|
|
91
130
|
const canSubmit = Boolean(prompt.trim()) && validation.ok && !busy;
|
|
92
131
|
|
|
93
132
|
const submit = () => {
|
|
@@ -97,13 +136,13 @@ export function TaskForm({
|
|
|
97
136
|
prompt: prompt.trim(),
|
|
98
137
|
kind,
|
|
99
138
|
spec: spec.trim(),
|
|
139
|
+
harness,
|
|
140
|
+
timezone,
|
|
100
141
|
folderId,
|
|
101
142
|
// Resuming a session only makes sense for a fresh draft; an existing
|
|
102
143
|
// task keeps whatever it was saved with unless the box is re-ticked.
|
|
103
144
|
sessionId: useActiveSession ? initial?.sessionId ?? activeSessionId : null,
|
|
104
|
-
|
|
105
|
-
// composer selection, so an edit never rewrites it.
|
|
106
|
-
model: initial?.model ?? null,
|
|
145
|
+
model,
|
|
107
146
|
});
|
|
108
147
|
};
|
|
109
148
|
|
|
@@ -160,12 +199,24 @@ export function TaskForm({
|
|
|
160
199
|
|
|
161
200
|
<p className={`text-[11px] ${validation.ok ? 'text-ink/50' : 'text-error'}`}>
|
|
162
201
|
{validation.ok
|
|
163
|
-
? `Next run ${formatNext(validation.nextRunAt)} · ${new Date(validation.nextRunAt).toLocaleString()}`
|
|
202
|
+
? `Next run ${formatNext(validation.nextRunAt)} · ${new Date(validation.nextRunAt).toLocaleString(undefined, { timeZone: timezone })} · ${timezone}`
|
|
164
203
|
: validation.error}
|
|
165
204
|
</p>
|
|
166
205
|
<p className="text-[11px] text-ink/40">{KIND_HINTS[kind]}</p>
|
|
167
206
|
|
|
168
207
|
<div className="grid grid-cols-2 gap-2">
|
|
208
|
+
<div>
|
|
209
|
+
<label className="block font-semibold mb-1 text-ink">Timezone</label>
|
|
210
|
+
<select
|
|
211
|
+
value={timezone}
|
|
212
|
+
onChange={(e) => setTimezone(e.currentTarget.value)}
|
|
213
|
+
className="w-full bg-paper border border-ink/20 rounded px-2 py-1.5 outline-none focus:border-ink/50 text-xs"
|
|
214
|
+
>
|
|
215
|
+
{timeZoneOptions(timezone).map((zone) => (
|
|
216
|
+
<option key={zone} value={zone}>{zone}</option>
|
|
217
|
+
))}
|
|
218
|
+
</select>
|
|
219
|
+
</div>
|
|
169
220
|
<div>
|
|
170
221
|
<label className="block font-semibold mb-1 text-ink">Run in</label>
|
|
171
222
|
<select
|
|
@@ -179,20 +230,30 @@ export function TaskForm({
|
|
|
179
230
|
))}
|
|
180
231
|
</select>
|
|
181
232
|
</div>
|
|
182
|
-
<div className="flex items-end">
|
|
183
|
-
<label className={`flex items-center gap-2 text-[11px] ${activeSessionId ? 'text-ink/70' : 'text-ink/35'}`}>
|
|
184
|
-
<input
|
|
185
|
-
type="checkbox"
|
|
186
|
-
checked={useActiveSession}
|
|
187
|
-
disabled={!activeSessionId}
|
|
188
|
-
onChange={(e) => setUseActiveSession(e.currentTarget.checked)}
|
|
189
|
-
className={`${CHECKBOX_CLASS} accent-ink`}
|
|
190
|
-
/>
|
|
191
|
-
<span>Resume the open session each run</span>
|
|
192
|
-
</label>
|
|
193
|
-
</div>
|
|
194
233
|
</div>
|
|
195
234
|
|
|
235
|
+
<ModelFields
|
|
236
|
+
harness={harness}
|
|
237
|
+
model={model}
|
|
238
|
+
onHarnessChange={(next) => {
|
|
239
|
+
setHarness(next);
|
|
240
|
+
// A model snapshot belongs to the harness that published it.
|
|
241
|
+
setModel(null);
|
|
242
|
+
}}
|
|
243
|
+
onModelChange={setModel}
|
|
244
|
+
/>
|
|
245
|
+
|
|
246
|
+
<label className={`flex items-center gap-2 text-[11px] ${activeSessionId ? 'text-ink/70' : 'text-ink/35'}`}>
|
|
247
|
+
<input
|
|
248
|
+
type="checkbox"
|
|
249
|
+
checked={useActiveSession}
|
|
250
|
+
disabled={!activeSessionId}
|
|
251
|
+
onChange={(e) => setUseActiveSession(e.currentTarget.checked)}
|
|
252
|
+
className={`${CHECKBOX_CLASS} accent-ink`}
|
|
253
|
+
/>
|
|
254
|
+
<span>Resume the open session each run</span>
|
|
255
|
+
</label>
|
|
256
|
+
|
|
196
257
|
<div className="flex justify-end gap-2 pt-1">
|
|
197
258
|
<button
|
|
198
259
|
type="button"
|
|
@@ -26,7 +26,7 @@ import {
|
|
|
26
26
|
RotateCw,
|
|
27
27
|
Trash2,
|
|
28
28
|
} from 'lucide-preact';
|
|
29
|
-
import { describeSchedule } from '@/shared/lib/schedule/parse';
|
|
29
|
+
import { describeSchedule, formatDuration } from '@/shared/lib/schedule/parse';
|
|
30
30
|
import type { ScheduledTask, ScheduledTaskRun } from '@/shared/types/schedule';
|
|
31
31
|
|
|
32
32
|
interface TaskListProps {
|
|
@@ -111,7 +111,13 @@ export function TaskList({
|
|
|
111
111
|
<div className="min-w-0 flex-1">
|
|
112
112
|
<p className="text-xs font-medium text-ink truncate">{taskLabel(task)}</p>
|
|
113
113
|
<p className="text-[11px] text-ink/60 mt-0.5">
|
|
114
|
-
{describeSchedule(task.kind, task.spec)}
|
|
114
|
+
{describeSchedule(task.kind, task.spec, task.timezone)}
|
|
115
|
+
{task.kind !== 'every' && (
|
|
116
|
+
<>
|
|
117
|
+
<span className="text-ink/30"> · </span>
|
|
118
|
+
{task.timezone}
|
|
119
|
+
</>
|
|
120
|
+
)}
|
|
115
121
|
<span className="text-ink/30"> · </span>
|
|
116
122
|
{!task.enabled
|
|
117
123
|
? task.kind === 'once' && task.lastRunAt !== null
|
|
@@ -120,6 +126,10 @@ export function TaskList({
|
|
|
120
126
|
: `Next ${formatAbsolute(task.nextRunAt)}`}
|
|
121
127
|
</p>
|
|
122
128
|
{task.cwd && <p className="text-[10.5px] text-ink/40 font-mono truncate mt-0.5">{task.cwd}</p>}
|
|
129
|
+
<p className="text-[10.5px] text-ink/40 truncate mt-0.5">
|
|
130
|
+
{task.harness}
|
|
131
|
+
{task.model && ` · ${task.model.provider}/${task.model.modelId}`}
|
|
132
|
+
</p>
|
|
123
133
|
{task.sessionId && (
|
|
124
134
|
<p className="text-[10.5px] text-ink/40 font-mono truncate mt-0.5">
|
|
125
135
|
resumes {task.sessionId.slice(0, 8)}
|
|
@@ -204,7 +214,17 @@ export function TaskList({
|
|
|
204
214
|
>
|
|
205
215
|
{run.status}
|
|
206
216
|
</span>
|
|
207
|
-
<span className="
|
|
217
|
+
<span className="w-12 shrink-0 text-ink/40">
|
|
218
|
+
{run.finishedAt === null ? '…' : formatDuration(run.finishedAt - run.startedAt)}
|
|
219
|
+
</span>
|
|
220
|
+
<span className="min-w-0 flex-1 text-ink/60 break-words">
|
|
221
|
+
{run.detail || '–'}
|
|
222
|
+
{run.sessionId && (
|
|
223
|
+
<span className="block font-mono text-[10px] text-ink/40">
|
|
224
|
+
session {run.sessionId.slice(0, 8)}
|
|
225
|
+
</span>
|
|
226
|
+
)}
|
|
227
|
+
</span>
|
|
208
228
|
</div>
|
|
209
229
|
))}
|
|
210
230
|
</div>
|
|
@@ -165,6 +165,7 @@ export function SchedulerModal({
|
|
|
165
165
|
folders={folders}
|
|
166
166
|
initial={editor}
|
|
167
167
|
activeSessionId={activeSessionId}
|
|
168
|
+
serverTimeZone={controller.serverTimeZone}
|
|
168
169
|
busy={busy}
|
|
169
170
|
onSubmit={submit}
|
|
170
171
|
onCancel={() => {
|
|
@@ -196,6 +197,8 @@ export function SchedulerModal({
|
|
|
196
197
|
prompt: task.prompt,
|
|
197
198
|
kind: task.kind,
|
|
198
199
|
spec: task.spec,
|
|
200
|
+
harness: task.harness,
|
|
201
|
+
timezone: task.timezone,
|
|
199
202
|
folderId: task.folderId,
|
|
200
203
|
sessionId: task.sessionId,
|
|
201
204
|
model: task.model,
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The phone editor's content area: which surface draws the open file.
|
|
8
|
+
*
|
|
9
|
+
* The dispatch, in order, because every branch before the code surface exists
|
|
10
|
+
* for a reason the editor would get WRONG rather than merely worse:
|
|
11
|
+
*
|
|
12
|
+
* - a byte viewer (image, PDF, DOCX, workbook) draws its own bytes and has no
|
|
13
|
+
* text buffer, so the code surface would paint mojibake;
|
|
14
|
+
* - a rendered text view (markdown, CSV grid, SVG) is the same buffer drawn as
|
|
15
|
+
* what the file IS, and it is gated on the preview toggle;
|
|
16
|
+
* - the loading / refusal states and the markdown preview share one scroller,
|
|
17
|
+
* which is also where the outline's heading jump looks;
|
|
18
|
+
* - the code surface owns its own (CodeMirror) scroller and must NOT be wrapped
|
|
19
|
+
* in one: an outer `overflow-auto` resolves the editor's `height: 100%`
|
|
20
|
+
* against an auto-height box, so the panel grows to the document's height and
|
|
21
|
+
* has nothing to scroll.
|
|
22
|
+
*
|
|
23
|
+
* Split out of `FullEditor.tsx` for the repository's per-file ceiling; the
|
|
24
|
+
* order above is the whole contract, so it lives in one place.
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
import type { RefObject } from 'preact';
|
|
28
|
+
import { CodeSurface, type CodeSurfaceHandle } from '@/client/components/common/code-surface';
|
|
29
|
+
import { ImageViewer } from '@/client/components/common/image-viewer';
|
|
30
|
+
import { PreviewScroller } from '@/client/components/mobile/mobile-right-sidebar/PreviewScroller';
|
|
31
|
+
import type { MobileEditorFile } from '@/client/components/mobile/open-file-payload';
|
|
32
|
+
import { ViewerSurface, hasViewerSurface } from '@/client/components/workspace/editor/viewers/dispatch';
|
|
33
|
+
import type { UseFileEditorResult } from '@/client/hooks/editor/file-editor-types';
|
|
34
|
+
import type { ScrollRestoreBinding } from '@/client/hooks/editor/use-scroll-restore';
|
|
35
|
+
import type { EditorTypingOptions } from '@/client/components/common/code-surface/typing';
|
|
36
|
+
import type { EditorThemeState } from '@/client/hooks/editor/theme';
|
|
37
|
+
import { EDITOR_LINE_HEIGHT } from '@/shared/lib/code/editor/typography';
|
|
38
|
+
import type { ViewerKind } from '@/shared/lib/fs/document-kind';
|
|
39
|
+
|
|
40
|
+
interface MobileEditorSurfaceProps {
|
|
41
|
+
file: MobileEditorFile;
|
|
42
|
+
editor: UseFileEditorResult;
|
|
43
|
+
viewerKind: ViewerKind;
|
|
44
|
+
/** A byte-drawing viewer: its surface fetches the bytes itself. */
|
|
45
|
+
byteViewer: boolean;
|
|
46
|
+
isPreview: boolean;
|
|
47
|
+
/** The file is markdown, so the preview branch is the document view. */
|
|
48
|
+
isMd: boolean;
|
|
49
|
+
content: string;
|
|
50
|
+
language: string;
|
|
51
|
+
wordWrap: boolean;
|
|
52
|
+
fileKey: string;
|
|
53
|
+
revealMarks: readonly { start: number; end: number }[] | undefined;
|
|
54
|
+
currentMark: number;
|
|
55
|
+
surfaceRef: RefObject<CodeSurfaceHandle>;
|
|
56
|
+
setCodeScroller: (element: HTMLElement | null) => void;
|
|
57
|
+
previewRef: (element: HTMLElement | null) => void;
|
|
58
|
+
scroll: ScrollRestoreBinding;
|
|
59
|
+
fontSize: number;
|
|
60
|
+
reviewActive: boolean;
|
|
61
|
+
onExitReview: () => void;
|
|
62
|
+
editorTheme: EditorThemeState;
|
|
63
|
+
editorFontFamily: string;
|
|
64
|
+
indentUnitText: string;
|
|
65
|
+
typing: EditorTypingOptions;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
export function MobileEditorSurface({
|
|
69
|
+
file,
|
|
70
|
+
editor,
|
|
71
|
+
viewerKind,
|
|
72
|
+
byteViewer,
|
|
73
|
+
isPreview,
|
|
74
|
+
isMd,
|
|
75
|
+
content,
|
|
76
|
+
language,
|
|
77
|
+
wordWrap,
|
|
78
|
+
fileKey,
|
|
79
|
+
revealMarks,
|
|
80
|
+
currentMark,
|
|
81
|
+
surfaceRef,
|
|
82
|
+
setCodeScroller,
|
|
83
|
+
previewRef,
|
|
84
|
+
scroll,
|
|
85
|
+
fontSize,
|
|
86
|
+
reviewActive,
|
|
87
|
+
onExitReview,
|
|
88
|
+
editorTheme,
|
|
89
|
+
editorFontFamily,
|
|
90
|
+
indentUnitText,
|
|
91
|
+
typing,
|
|
92
|
+
}: MobileEditorSurfaceProps) {
|
|
93
|
+
if (editor.isImage && editor.imageUrl) {
|
|
94
|
+
return <ImageViewer src={editor.imageUrl} name={file.name} className="flex-1 min-h-0" />;
|
|
95
|
+
}
|
|
96
|
+
if (editor.isImage || (hasViewerSurface(viewerKind) && (byteViewer || isPreview))) {
|
|
97
|
+
return (
|
|
98
|
+
<ViewerSurface
|
|
99
|
+
kind={viewerKind}
|
|
100
|
+
path={file.path ?? file.name}
|
|
101
|
+
name={file.name}
|
|
102
|
+
source={editor.byteSource}
|
|
103
|
+
content={editor.content}
|
|
104
|
+
revision={editor.revision}
|
|
105
|
+
/>
|
|
106
|
+
);
|
|
107
|
+
}
|
|
108
|
+
if (editor.isLoading || editor.unsupported || editor.loadError || (isMd && isPreview)) {
|
|
109
|
+
return (
|
|
110
|
+
<PreviewScroller
|
|
111
|
+
fileName={file.name}
|
|
112
|
+
content={content}
|
|
113
|
+
path={file.path ?? file.name}
|
|
114
|
+
root={file.root}
|
|
115
|
+
repo={file.repo}
|
|
116
|
+
fontSize={fontSize}
|
|
117
|
+
scrollRef={previewRef}
|
|
118
|
+
onScroll={scroll.onScroll}
|
|
119
|
+
isLoading={editor.isLoading}
|
|
120
|
+
unsupported={editor.unsupported}
|
|
121
|
+
loadError={editor.loadError}
|
|
122
|
+
reviewActive={reviewActive}
|
|
123
|
+
onExitReview={onExitReview}
|
|
124
|
+
/>
|
|
125
|
+
);
|
|
126
|
+
}
|
|
127
|
+
return (
|
|
128
|
+
<CodeSurface
|
|
129
|
+
ref={surfaceRef}
|
|
130
|
+
value={content}
|
|
131
|
+
onValueChange={editor.onChange}
|
|
132
|
+
language={language}
|
|
133
|
+
wordWrap={wordWrap}
|
|
134
|
+
documentKey={fileKey}
|
|
135
|
+
marks={revealMarks}
|
|
136
|
+
currentMark={currentMark}
|
|
137
|
+
onScroller={setCodeScroller}
|
|
138
|
+
scrollTestId="editor-scroller"
|
|
139
|
+
// No `bg-paper`: an explicit editor theme paints its own surface, and the
|
|
140
|
+
// panel's colour under it would be a border of the wrong shade.
|
|
141
|
+
// `select-text` is the desktop pane's rule, and it matters more here: the
|
|
142
|
+
// sheet's own root is `select-none` (it is a header-and-status layout), and
|
|
143
|
+
// the editor is a `contenteditable` whose selection and caret are the
|
|
144
|
+
// BROWSER's business — an inherited `user-select: none` is the one thing
|
|
145
|
+
// that can take that away on a phone.
|
|
146
|
+
className="flex-1 min-h-0 text-ink select-text"
|
|
147
|
+
themeVars={editorTheme.vars}
|
|
148
|
+
themes={editorTheme.themes}
|
|
149
|
+
indentUnitText={indentUnitText}
|
|
150
|
+
typing={typing}
|
|
151
|
+
padding={12}
|
|
152
|
+
placeholder="This file is empty"
|
|
153
|
+
style={{ fontFamily: editorFontFamily, fontSize: `${fontSize}px`, lineHeight: EDITOR_LINE_HEIGHT }}
|
|
154
|
+
/>
|
|
155
|
+
);
|
|
156
|
+
}
|