Post-rebase reconciliation sweep: - Sidebar: main's folded Sidebar.tsx/Sidebar.logic.ts adapted to v2 shells (latestRun/runtime naming, waiting status instead of monitoring), with subagent-thread filtering and main's pinned-reorder helpers re-exported - Pinned drag reorder (#5581) ported into v2: thread.pin orderKey + thread.pin.reorder command, thread.pin-reordered event, Orchestrator fold, ProjectionStore/Maintenance, client-runtime commands and shell mapping - Project favicon (#4849-era) and defaultThreadEnvMode flowed through v2 contracts (OrchestrationProjectShell, application event payloads) - ChatView: main's #5592 header props, pull-request right-panel surfaces, liveAgentCount badge (#5745) wired into the v2 panel layout - enableAssistantStreaming -> enableLegacyTokenStreaming rename applied to v2 RunExecutionService and replay testkit - Removed v1 zombies resurrected by the rebase (provider service/reaper/ ingestion + v1 layer tests, server.test.ts, integration harness) - routeTree: main's tree + branch's /settings/scheduled-tasks route - Misc marker-sweep syntax repairs (rpc.ts, entities.ts, localApi.test.ts, rightPanelStore.test.ts, GitManager.test.ts, mobile model menu helpers)
Showing the changes to apps/web/src/components/ProjectScriptsControl.tsx (1 of 59 files). Show all
Unified · Split
| @@ -7,8 +7,8 @@ import { · 6 unmodified lines | |||
| 7 | isAtomCommandInterrupted, | 7 | isAtomCommandInterrupted, |
| 8 | squashAtomCommandFailure, | 8 | squashAtomCommandFailure, |
| 9 | } from "@t3tools/client-runtime/state/runtime"; | 9 | } from "@t3tools/client-runtime/state/runtime"; |
| 10 | import { ChevronDownIcon, DownloadIcon, PlusIcon, SettingsIcon } from "lucide-react"; | 10 | import { ChevronDownIcon, DownloadIcon, PlusIcon, SettingsIcon, WrenchIcon } from "lucide-react"; |
| 11 | import { useCallback, useMemo, useState } from "react"; | 11 | import React, { useCallback, useMemo, useState } from "react"; |
| 12 | 12 | ||
| 13 | import { commandForProjectScript, primaryProjectScript } from "~/projectScripts"; | 13 | import { commandForProjectScript, primaryProjectScript } from "~/projectScripts"; |
| 14 | import { shortcutLabelForCommand } from "~/keybindings"; | 14 | import { shortcutLabelForCommand } from "~/keybindings"; |
| @@ -77,14 +77,11 @@ export default function ProjectScriptsControl({ · 62 unmodified lines | |||
| 77 | onUpdateScript, | 77 | onUpdateScript, |
| 78 | onDeleteScript, | 78 | onDeleteScript, |
| 79 | }: ProjectScriptsControlProps) { | 79 | }: ProjectScriptsControlProps) { |
| 80 | <<<<<<< HEAD | ||
| 81 | ======= | ||
| 82 | const isPanel = displayMode === "panel"; | 80 | const isPanel = displayMode === "panel"; |
| 83 | const ActionGroup = isPanel ? "div" : Group; | 81 | const ActionGroup = isPanel ? "div" : Group; |
| 84 | const panelAnchorRef = React.useRef<HTMLDivElement | null>(null); | 82 | const panelAnchorRef = React.useRef<HTMLDivElement | null>(null); |
| 85 | const addScriptFormId = React.useId(); | 83 | const addScriptFormId = React.useId(); |
| 86 | const [editingScriptId, setEditingScriptId] = useState<string | null>(null); | 84 | const [editingScriptId, setEditingScriptId] = useState<string | null>(null); |
| 87 | >>>>>>> abd5cc5ff8 (Map thread panel into title bar and sidebar) | ||
| 88 | const [actionsMenuOpen, setActionsMenuOpen] = useState({ | 85 | const [actionsMenuOpen, setActionsMenuOpen] = useState({ |
| 89 | scripts: false, | 86 | scripts: false, |
| 90 | imports: false, | 87 | imports: false, |