merge: worker/2fb623c3 - fix circular import dependencies

Author: echobt

src/components/cortex/CortexChatMessageBubble.tsx

@@ -11,7 +11,7 @@
 
 import { Component, JSX, Show, For, createSignal, createResource } from "solid-js";
 import { CortexIcon } from "./primitives";
-import type { ChatMessage } from "./CortexChatPanel";
+import type { ChatMessage } from "./cortexChatTypes";
 
 export interface ChatMessageBubbleProps {
   message: ChatMessage;

src/components/cortex/CortexChatPanel.tsx

@@ -13,40 +13,18 @@ import { Component, JSX, splitProps, Show, For } from "solid-js";
 import { CortexPromptInput } from "./primitives";
 import { ChatMessageBubble } from "./CortexChatMessageBubble";
 
-export type ChatPanelState = "home" | "minimized" | "expanded";
-
-export interface ChatMessage {
-  id: string;
-  type: "user" | "agent";
-  content: string;
-  timestamp?: Date;
-  actions?: ChatAction[];
-  isThinking?: boolean;
-  progress?: ChatProgress[];
-  toolCalls?: ChatToolCall[];
-  codeBlocks?: { language: string; code: string }[];
-}
-
-export interface ChatAction {
-  id: string;
-  label: string;
-  icon?: string;
-  onClick?: () => void;
-}
-
-export interface ChatProgress {
-  id: string;
-  label: string;
-  status: "pending" | "running" | "completed" | "error";
-}
-
-export interface ChatToolCall {
-  name: string;
-  status: "running" | "completed" | "error";
-  filesEdited?: number;
-  onUndo?: () => void;
-  onReview?: () => void;
-}
+export type {
+  ChatPanelState,
+  ChatMessage,
+  ChatAction,
+  ChatProgress,
+  ChatToolCall,
+} from "./cortexChatTypes";
+
+import type {
+  ChatPanelState,
+  ChatMessage,
+} from "./cortexChatTypes";
 
 export interface CortexChatPanelProps {
   state?: ChatPanelState;

src/components/cortex/__tests__/CortexChatMessageBubble.test.tsx

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { render, fireEvent, cleanup } from "@solidjs/testing-library";
 import { ChatMessageBubble } from "../CortexChatMessageBubble";
-import type { ChatMessage } from "../CortexChatPanel";
+import type { ChatMessage } from "../cortexChatTypes";
 
 vi.mock("../primitives", () => ({
   CortexIcon: (props: { name: string; size?: number; color?: string }) => (

src/components/cortex/cortexChatTypes.ts

@@ -0,0 +1,34 @@
+export type ChatPanelState = "home" | "minimized" | "expanded";
+
+export interface ChatMessage {
+  id: string;
+  type: "user" | "agent";
+  content: string;
+  timestamp?: Date;
+  actions?: ChatAction[];
+  isThinking?: boolean;
+  progress?: ChatProgress[];
+  toolCalls?: ChatToolCall[];
+  codeBlocks?: { language: string; code: string }[];
+}
+
+export interface ChatAction {
+  id: string;
+  label: string;
+  icon?: string;
+  onClick?: () => void;
+}
+
+export interface ChatProgress {
+  id: string;
+  label: string;
+  status: "pending" | "running" | "completed" | "error";
+}
+
+export interface ChatToolCall {
+  name: string;
+  status: "running" | "completed" | "error";
+  filesEdited?: number;
+  onUndo?: () => void;
+  onReview?: () => void;
+}

src/context/SDKContext.tsx

@@ -1,7 +1,7 @@
 import { createContext, useContext, ParentProps, onCleanup, onMount, batch } from "solid-js";
 import { createStore, produce } from "solid-js/store";
 import { invoke } from "@tauri-apps/api/core";
-import { useTauriListen } from "../hooks";
+import { useTauriListen } from "../hooks/useTauriListen";
 import { type ServerInfo } from "@/utils/tauri";
 import { API_BASE_URL } from "../utils/config";
 import { getWindowLabel } from "@/utils/windowStorage";

src/context/TerminalsContext.tsx

@@ -3,7 +3,7 @@ import { createStore, produce } from "solid-js/store";
 import { invoke } from "@tauri-apps/api/core";
 import { terminalLogger } from "../utils/logger";
 import { useToast } from "./ToastContext";
-import { useTauriListen } from "../hooks";
+import { useTauriListen } from "../hooks/useTauriListen";
 
 // Shell integration utilities
 import {

src/context/WindowsContext.tsx

@@ -2,7 +2,7 @@ import { createContext, useContext, ParentProps, onMount, onCleanup } from "soli
 import { createStore, produce } from "solid-js/store";
 import { WebviewWindow, getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 import { emit } from "@tauri-apps/api/event";
-import { useTauriListeners } from "../hooks";
+import { useTauriListeners } from "../hooks/useTauriListen";
 
 // ============================================================================
 // Types

src/context/editor/EditorUIContext.tsx

@@ -25,12 +25,8 @@ export type { SplitDirection, EditorGroup, EditorSplit, EditorLayout };
 // State
 // ============================================================================
 
-export interface EditorUIState {
-  activeGroupId: string;
-  groups: EditorGroup[];
-  splits: EditorSplit[];
-  maximizedGroupId: string | null;
-}
+import type { EditorUIState } from "./editorUITypes";
+export type { EditorUIState } from "./editorUITypes";
 
 const DEFAULT_GROUP_ID = "group-default";
 

src/context/editor/editorGridLayout.ts

@@ -1,7 +1,7 @@
 import { batch } from "solid-js";
 import type { SetStoreFunction } from "solid-js/store";
 import type { EditorGroup, EditorSplit } from "../../types";
-import type { EditorUIState } from "./EditorUIContext";
+import type { EditorUIState } from "./editorUITypes";
 import { generateId } from "./languageDetection";
 
 export function createGridLayoutOps(

src/context/editor/editorGroupOps.ts

@@ -1,7 +1,7 @@
 import { batch } from "solid-js";
 import { produce, type SetStoreFunction } from "solid-js/store";
 import type { SplitDirection, EditorGroup, EditorSplit } from "../../types";
-import type { EditorUIState } from "./EditorUIContext";
+import type { EditorUIState } from "./editorUITypes";
 import { generateId } from "./languageDetection";
 
 export function createGroupOps(