@myrialabs/clopen 0.2.1 → 0.2.3

package/backend/ws/snapshot/timeline.ts

@@ -7,7 +7,7 @@
 
 import { t } from 'elysia';
 import { createRouter } from '$shared/utils/ws-server';
-import { messageQueries, sessionQueries, checkpointQueries, snapshotQueries } from '../../lib/database/queries';
+import { messageQueries, sessionQueries, checkpointQueries, snapshotQueries } from '../../database/queries';
 import { debug } from '$shared/utils/logger';
 import {
 	extractMessageText,
@@ -17,8 +17,8 @@ import {
 	isDescendant,
 	getCheckpointFileStats,
 	INITIAL_NODE_ID
-} from '../../lib/snapshot/helpers';
-import type { CheckpointNode, TimelineResponse } from '../../lib/snapshot/helpers';
+} from '../../snapshot/helpers';
+import type { CheckpointNode, TimelineResponse } from '../../snapshot/helpers';
 import type { SDKMessage } from '$shared/types/messaging';
 
 export const timelineHandler = createRouter()

package/backend/ws/system/operations.ts

@@ -11,7 +11,7 @@ import { t } from 'elysia';
 import { join } from 'node:path';
 import { readFileSync } from 'node:fs';
 import { createRouter } from '$shared/utils/ws-server';
-import { initializeDatabase, getDatabase } from '../../lib/database';
+import { initializeDatabase, getDatabase } from '../../database';
 import { debug } from '$shared/utils/logger';
 
 /** Read current version from package.json */

package/backend/ws/terminal/persistence.ts

@@ -9,10 +9,10 @@
 
 import { t } from 'elysia';
 import { createRouter } from '$shared/utils/ws-server';
-import { terminalStreamManager } from '../../lib/terminal/stream-manager';
+import { terminalStreamManager } from '../../terminal/stream-manager';
 import { debug } from '$shared/utils/logger';
-import { ws } from '$backend/lib/utils/ws';
-import { ptySessionManager } from '../../lib/terminal/pty-session-manager';
+import { ws } from '$backend/utils/ws';
+import { ptySessionManager } from '../../terminal/pty-session-manager';
 
 export const persistenceHandler = createRouter()
 	// Get stream status

package/backend/ws/terminal/session.ts

@@ -12,14 +12,14 @@
 
 import { t } from 'elysia';
 import { createRouter } from '$shared/utils/ws-server';
-import { ptySessionManager } from '../../lib/terminal/pty-session-manager';
-import { terminalStreamManager } from '../../lib/terminal/stream-manager';
+import { ptySessionManager } from '../../terminal/pty-session-manager';
+import { terminalStreamManager } from '../../terminal/stream-manager';
 import { debug } from '$shared/utils/logger';
 import { resolve } from 'path';
-import { isWindows } from '../../lib/terminal/shell-utils';
-import { existsSync } from '../../lib/terminal/helpers';
-import { ws } from '$backend/lib/utils/ws';
-import { activePtyProcesses } from '../../lib/terminal/pty-manager';
+import { isWindows } from '../../terminal/shell-utils';
+import { existsSync } from '../../terminal/helpers';
+import { ws } from '$backend/utils/ws';
+import { activePtyProcesses } from '../../terminal/pty-manager';
 
 export const sessionHandler = createRouter()
 	// Create new terminal session

package/backend/ws/terminal/stream.ts

@@ -11,9 +11,9 @@
 
 import { t } from 'elysia';
 import { createRouter } from '$shared/utils/ws-server';
-import { ptySessionManager } from '../../lib/terminal/pty-session-manager';
+import { ptySessionManager } from '../../terminal/pty-session-manager';
 import { debug } from '$shared/utils/logger';
-import { ws } from '$backend/lib/utils/ws';
+import { ws } from '$backend/utils/ws';
 
 export const streamHandler = createRouter()
 	// Send keyboard input to terminal

package/backend/ws/tunnel/operations.ts

@@ -9,7 +9,7 @@
 
 import { t } from 'elysia';
 import { createRouter } from '$shared/utils/ws-server';
-import { globalTunnelManager } from '../../lib/tunnel/global-tunnel-manager';
+import { globalTunnelManager } from '../../tunnel/global-tunnel-manager';
 import { debug } from '$shared/utils/logger';
 
 export const operationsHandler = createRouter()

package/backend/ws/user/crud.ts

@@ -10,10 +10,10 @@
 
 import { t } from 'elysia';
 import { createRouter } from '$shared/utils/ws-server';
-import { generateAnonymousUser, generateColorFromString, getInitials } from '../../lib/user/helpers';
-import type { AnonymousUser } from '../../lib/user/helpers';
-import { ws } from '$backend/lib/utils/ws';
-import { settingsQueries } from '$backend/lib/database/queries';
+import { generateAnonymousUser, generateColorFromString, getInitials } from '../../utils/user-helpers';
+import type { AnonymousUser } from '../../utils/user-helpers';
+import { ws } from '$backend/utils/ws';
+import { settingsQueries } from '$backend/database/queries';
 import { debug } from '$shared/utils/logger';
 
 /**

package/bin/clopen.ts

@@ -23,6 +23,7 @@ if (typeof globalThis.Bun === 'undefined') {
 
 import { existsSync, copyFileSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
+import { loadEnvFile } from '../backend/utils/env';
 
 // CLI Options interface
 interface CLIOptions {
@@ -88,7 +89,7 @@ const MAX_PORT = 65535;
 
 function showHelp() {
 	console.log(`
-Clopen - Modern web UI for Claude Code
+Clopen - All-in-one web workspace for Claude Code & OpenCode
 
 USAGE:
   clopen [OPTIONS]
@@ -106,7 +107,7 @@ OPTIONS:
 
 EXAMPLES:
   clopen                  # Start with default settings (port ${DEFAULT_PORT})
-  clopen --port 9150      # Start on port 9150
+  clopen --port 9145      # Start on port 9145
   clopen --host 0.0.0.0   # Bind to all network interfaces
   clopen update           # Update to the latest version
   clopen reset-pat        # Regenerate admin login token
@@ -262,8 +263,8 @@ async function recoverAdminToken() {
 	console.log(`\x1b[36mClopen\x1b[0m v${version} — Admin Token Recovery\n`);
 
 	// Initialize database (import dynamically to avoid loading full backend)
-	const { initializeDatabase } = await import('../backend/lib/database/index');
-	const { listUsers, regeneratePAT } = await import('../backend/lib/auth/auth-service');
+	const { initializeDatabase } = await import('../backend/database/index');
+	const { listUsers, regeneratePAT } = await import('../backend/auth/auth-service');
 
 	await initializeDatabase();
 
@@ -367,21 +368,20 @@ async function startServer(options: CLIOptions) {
 	updateLoading('Starting server...');
 	await delay();
 
-	// Run server as subprocess to ensure it uses local node_modules
-	const serverPath = join(__dirname, 'backend/index.ts');
+	// Delegate to scripts/start.ts — handles port resolution (IPv4 + IPv6
+	// zombie detection) and starts backend in a single consistent path.
+	const startScript = join(__dirname, 'scripts/start.ts');
 
 	stopLoading();
 
-	// Prepare environment variables
-	const env = { ...process.env };
-	if (options.port) {
-		env.PORT = options.port.toString();
-	}
-	if (options.host) {
-		env.HOST = options.host;
-	}
+	// Overlay clopen's own .env on top of process.env to override any
+	// pollution from a .env file in the directory where `clopen` was invoked.
+	// CLI args take highest priority on top of that.
+	const env = { ...process.env, ...loadEnvFile(ENV_FILE) };
+	if (options.port) env.PORT = options.port.toString();
+	if (options.host) env.HOST = options.host;
 
-	const serverProc = Bun.spawn(['bun', serverPath], {
+	const serverProc = Bun.spawn(['bun', startScript], {
 		cwd: __dirname,
 		stdout: 'inherit',
 		stderr: 'inherit',

package/docker-compose.yml

@@ -0,0 +1,31 @@
+services:
+  clopen:
+    build:
+      context: .
+      dockerfile_inline: |
+        FROM oven/bun:latest
+        USER root
+        RUN apt-get update && apt-get install -y --no-install-recommends \
+            git \
+            curl \
+            chromium \
+            && rm -rf /var/lib/apt/lists/*
+        ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+        ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
+        RUN curl -fsSL https://claude.ai/install.sh | bash
+        ENV PATH="/root/.claude/local:$PATH"
+        RUN curl -fsSL https://opencode.ai/install | bash
+        RUN bun add -g @myrialabs/clopen
+        EXPOSE 9141
+        CMD ["clopen", "--host", "0.0.0.0"]
+    restart: unless-stopped
+    ports:
+      - "${PORT:-9141}:9141"
+    volumes:
+      - clopen_data:/root/.clopen
+      - ${PROJECTS_DIR:-./projects}:/root/projects
+    environment:
+      - NODE_ENV=production
+
+volumes:
+  clopen_data:

package/frontend/App.svelte

@@ -1,18 +1,18 @@
 <script lang="ts">
 	import { onMount, onDestroy } from 'svelte';
-	import { authStore } from '$frontend/lib/stores/features/auth.svelte';
-	import WorkspaceLayout from '$frontend/lib/components/workspace/WorkspaceLayout.svelte';
-	import ConnectionBanner from '$frontend/lib/components/common/ConnectionBanner.svelte';
-	import UpdateBanner from '$frontend/lib/components/common/UpdateBanner.svelte';
-	import LoadingScreen from '$frontend/lib/components/common/LoadingScreen.svelte';
-	import SetupPage from '$frontend/lib/components/auth/SetupPage.svelte';
-	import LoginPage from '$frontend/lib/components/auth/LoginPage.svelte';
-	import InvitePage from '$frontend/lib/components/auth/InvitePage.svelte';
-	import { backgroundTerminalService } from '$frontend/lib/services/terminal/background';
-	import { initializeMCPPreview } from '$frontend/lib/services/preview';
-	import { globalStreamMonitor } from '$frontend/lib/services/notification/global-stream-monitor';
-	import { tunnelStore } from '$frontend/lib/stores/features/tunnel.svelte';
-	import { startUpdateChecker, stopUpdateChecker } from '$frontend/lib/stores/ui/update.svelte';
+	import { authStore } from '$frontend/stores/features/auth.svelte';
+	import WorkspaceLayout from '$frontend/components/workspace/WorkspaceLayout.svelte';
+	import ConnectionBanner from '$frontend/components/common/feedback/ConnectionBanner.svelte';
+	import UpdateBanner from '$frontend/components/common/feedback/UpdateBanner.svelte';
+	import LoadingScreen from '$frontend/components/common/feedback/LoadingScreen.svelte';
+	import SetupPage from '$frontend/components/auth/SetupPage.svelte';
+	import LoginPage from '$frontend/components/auth/LoginPage.svelte';
+	import InvitePage from '$frontend/components/auth/InvitePage.svelte';
+	import { backgroundTerminalService } from '$frontend/services/terminal/background';
+	import { initializeMCPPreview } from '$frontend/services/preview';
+	import { globalStreamMonitor } from '$frontend/services/notification/global-stream-monitor';
+	import { tunnelStore } from '$frontend/stores/features/tunnel.svelte';
+	import { startUpdateChecker, stopUpdateChecker } from '$frontend/stores/ui/update.svelte';
 
 	let servicesInitialized = false;
 

package/frontend/{lib/components → components}/auth/InvitePage.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import { authStore } from '$frontend/lib/stores/features/auth.svelte';
-	import ws from '$frontend/lib/utils/ws';
+	import { authStore } from '$frontend/stores/features/auth.svelte';
+	import ws from '$frontend/utils/ws';
 
 	let name = $state('');
 	let error = $state('');

package/frontend/{lib/components → components}/auth/LoginPage.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { authStore } from '$frontend/lib/stores/features/auth.svelte';
+	import { authStore } from '$frontend/stores/features/auth.svelte';
 
 	let token = $state('');
 	let error = $state('');

package/frontend/{lib/components → components}/auth/SetupPage.svelte

@@ -1,12 +1,12 @@
 <script lang="ts">
 	import { onMount, onDestroy } from 'svelte';
-	import { authStore } from '$frontend/lib/stores/features/auth.svelte';
-	import { themeStore, toggleDarkMode, isDarkMode, initializeTheme } from '$frontend/lib/stores/ui/theme.svelte';
-	import { settings, updateSettings, applyFontSize } from '$frontend/lib/stores/features/settings.svelte';
+	import { authStore } from '$frontend/stores/features/auth.svelte';
+	import { themeStore, toggleDarkMode, isDarkMode, initializeTheme } from '$frontend/stores/ui/theme.svelte';
+	import { settings, updateSettings, applyFontSize } from '$frontend/stores/features/settings.svelte';
 	import { ENGINES } from '$shared/constants/engines';
-	import { claudeAccountsStore, type ClaudeAccountItem } from '$frontend/lib/stores/features/claude-accounts.svelte';
-	import Icon from '$frontend/lib/components/common/Icon.svelte';
-	import ws from '$frontend/lib/utils/ws';
+	import { claudeAccountsStore, type ClaudeAccountItem } from '$frontend/stores/features/claude-accounts.svelte';
+	import Icon from '$frontend/components/common/display/Icon.svelte';
+	import ws from '$frontend/utils/ws';
 	import type { AuthMode } from '$shared/types/stores/settings';
 	import type { IconName } from '$shared/types/ui/icons';
 
@@ -100,14 +100,41 @@
 		authModeLoading = true;
 
 		try {
-			if (selectedAuthMode === 'none') {
-				await authStore.setupNoAuth();
-				completedSteps.add('auth-mode');
-				completedSteps.add('admin-account');
-				completedSteps = new Set(completedSteps);
-				currentStep = 'engines';
+			if (!isExistingUser) {
+				// Fresh setup — existing behavior
+				if (selectedAuthMode === 'none') {
+					await authStore.setupNoAuth();
+					completedSteps.add('auth-mode');
+					completedSteps.add('admin-account');
+					completedSteps = new Set(completedSteps);
+					currentStep = 'engines';
+				} else {
+					goToNextStep();
+				}
 			} else {
-				goToNextStep();
+				// Returning user (wizard shown again after refresh) — apply selected mode
+				const previousMode = authStore.authMode;
+				if (selectedAuthMode === 'none' && previousMode !== 'none') {
+					// with-auth → no-auth: update mode, skip admin-account
+					await authStore.switchToNoAuth();
+					completedSteps.add('auth-mode');
+					completedSteps.add('admin-account');
+					completedSteps = new Set(completedSteps);
+					currentStep = 'engines';
+				} else if (selectedAuthMode === 'required' && previousMode !== 'required') {
+					// no-auth → with-auth: update mode, regenerate PAT, go to admin-account
+					await authStore.switchToWithAuth();
+					goToNextStep();
+				} else if (selectedAuthMode === 'none') {
+					// Same mode (none) — skip admin-account, go to engines
+					completedSteps.add('auth-mode');
+					completedSteps.add('admin-account');
+					completedSteps = new Set(completedSteps);
+					currentStep = 'engines';
+				} else {
+					// Same mode (required) — advance to admin-account
+					goToNextStep();
+				}
 			}
 		} catch (err) {
 			authModeError = err instanceof Error ? err.message : 'Setup failed';
@@ -133,11 +160,16 @@
 		adminLoading = true;
 		try {
 			if (isExistingUser) {
-				// Existing user — just update name if changed and proceed
+				// Existing user — update name if changed
 				if (adminName.trim() !== existingUserName) {
 					await authStore.updateName(adminName.trim());
 				}
-				goToNextStep();
+				// If a PAT was just generated (e.g. switched from no-auth to with-auth), show it
+				if (authStore.personalAccessToken) {
+					showPAT = true;
+				} else {
+					goToNextStep();
+				}
 			} else {
 				await authStore.setup(adminName.trim());
 				showPAT = true;
@@ -324,8 +356,8 @@
 	});
 
 	// ─── Step 4: Preferences ───
-	const FONT_SIZE_MIN = 10;
-	const FONT_SIZE_MAX = 20;
+	const FONT_SIZE_MIN = 8;
+	const FONT_SIZE_MAX = 24;
 
 	function handleFontSizeChange(e: Event) {
 		const value = Number((e.target as HTMLInputElement).value);

package/frontend/{lib/components → components}/chat/ChatInterface.svelte

@@ -10,29 +10,29 @@
 -->
 
 <script lang="ts">
-	import { sessionState, setCurrentSession, createNewChatSession, clearMessages, loadMessagesForSession } from '$frontend/lib/stores/core/sessions.svelte';
-	import { projectState } from '$frontend/lib/stores/core/projects.svelte';
-	import { appState, isSessionUnread } from '$frontend/lib/stores/core/app.svelte';
-	import { presenceState, isSessionWaitingInput } from '$frontend/lib/stores/core/presence.svelte';
-	import { userStore } from '$frontend/lib/stores/features/user.svelte';
-	import { addNotification } from '$frontend/lib/stores/ui/notification.svelte';
-	import { chatService } from '$frontend/lib/services/chat/chat.service';
+	import { sessionState, setCurrentSession, createNewChatSession, clearMessages, loadMessagesForSession } from '$frontend/stores/core/sessions.svelte';
+	import { projectState } from '$frontend/stores/core/projects.svelte';
+	import { appState, isSessionUnread } from '$frontend/stores/core/app.svelte';
+	import { presenceState, isSessionWaitingInput } from '$frontend/stores/core/presence.svelte';
+	import { userStore } from '$frontend/stores/features/user.svelte';
+	import { addNotification } from '$frontend/stores/ui/notification.svelte';
+	import { chatService } from '$frontend/services/chat/chat.service';
 	import { onMount } from 'svelte';
 	import { fade } from 'svelte/transition';
 	import ChatMessages from './message/ChatMessages.svelte';
 	import ChatInput from './input/ChatInput.svelte';
 	import FloatingTodoList from './widgets/FloatingTodoList.svelte';
-	import TimelineModal from '$frontend/lib/components/checkpoint/TimelineModal.svelte';
+	import TimelineModal from '$frontend/components/checkpoint/TimelineModal.svelte';
 	// import TokenUsage from './widgets/TokenUsage.svelte'; // DISABLED
-	import Icon from '$frontend/lib/components/common/Icon.svelte';
-	import AvatarBubble from '$frontend/lib/components/common/AvatarBubble.svelte';
-	import Button from '$frontend/lib/components/common/Button.svelte';
-	import PageTemplate from '$frontend/lib/components/common/PageTemplate.svelte';
-	import Modal from '$frontend/lib/components/common/Modal.svelte';
+	import Icon from '$frontend/components/common/display/Icon.svelte';
+	import AvatarBubble from '$frontend/components/common/display/AvatarBubble.svelte';
+	import Button from '$frontend/components/common/display/Button.svelte';
+	import PageTemplate from '$frontend/components/common/display/PageTemplate.svelte';
+	import Modal from '$frontend/components/common/overlay/Modal.svelte';
 	import type { IconName } from '$shared/types/ui/icons';
 	import type { ChatSession } from '$shared/types/database/schema';
 	import { debug } from '$shared/utils/logger';
-	import ws from '$frontend/lib/utils/ws';
+	import ws from '$frontend/utils/ws';
 
 	// Welcome state - don't show during restoration
 	const isWelcomeState = $derived(

package/frontend/{lib/components → components}/chat/formatters/ErrorMessage.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Icon from '$frontend/lib/components/common/Icon.svelte';
+	import Icon from '$frontend/components/common/display/Icon.svelte';
 	
 	const { errorText }: { errorText: string } = $props();
 	

package/frontend/{lib/components → components}/chat/formatters/MessageFormatter.svelte

@@ -2,14 +2,14 @@
 	import ErrorMessage from './ErrorMessage.svelte';
 	import TextMessage from './TextMessage.svelte';
 	import Tools from './Tools.svelte';
-	import Lightbox from '$frontend/lib/components/common/Lightbox.svelte';
-	import Icon from '$frontend/lib/components/common/Icon.svelte';
-	import { getFileIcon } from '$frontend/lib/utils/file-icon-mappings';
+	import Lightbox from '$frontend/components/common/overlay/Lightbox.svelte';
+	import Icon from '$frontend/components/common/display/Icon.svelte';
+	import { getFileIcon } from '$frontend/utils/file-icon-mappings';
 	import { formatFileSize } from '../shared/utils';
 
 	import type { SDKMessage, SDKPartialAssistantMessage } from '$shared/types/messaging';
 	import type { SDKMessageFormatter } from '$shared/types/database/schema';
-	import { getCompactSummary } from '$frontend/lib/utils/chat/message-grouper';
+	import { getCompactSummary } from '$frontend/utils/chat/message-grouper';
 
 	const { message }: { message: SDKMessageFormatter } = $props();
 

package/frontend/{lib/components → components}/chat/formatters/TextMessage.svelte

@@ -6,7 +6,7 @@
 		splitContentIntoSegments,
 		formatTerminalOutput,
 		escapeHtml
-	} from '$frontend/lib/utils/terminalFormatter';
+	} from '$frontend/utils/terminal-formatter';
 
 	const { content }: { content: string } = $props();
 

package/frontend/{lib/components → components}/chat/formatters/Tools.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Icon from '$frontend/lib/components/common/Icon.svelte';
+	import Icon from '$frontend/components/common/display/Icon.svelte';
 	import type { ToolInput } from '$shared/types/messaging';
 	import {
 		BashTool, BashOutputTool, EditTool, EnterPlanModeTool, ExitPlanModeTool,

package/frontend/{lib/components → components}/chat/input/ChatInput.svelte

@@ -11,21 +11,21 @@
 -->
 
 <script lang="ts">
-	import { sessionState } from '$frontend/lib/stores/core/sessions.svelte';
-	import { projectState } from '$frontend/lib/stores/core/projects.svelte';
-	import { appState } from '$frontend/lib/stores/core/app.svelte';
-	import { settings } from '$frontend/lib/stores/features/settings.svelte';
+	import { sessionState } from '$frontend/stores/core/sessions.svelte';
+	import { projectState } from '$frontend/stores/core/projects.svelte';
+	import { appState } from '$frontend/stores/core/app.svelte';
+	import { settings } from '$frontend/stores/features/settings.svelte';
 	import { onDestroy, untrack } from 'svelte';
-	import { ChatService } from '$frontend/lib/services/chat';
-	import { chatService } from '$frontend/lib/services/chat/chat.service';
+	import { ChatService } from '$frontend/services/chat';
+	import { chatService } from '$frontend/services/chat/chat.service';
 	import { getEngineInfo } from '$shared/constants/engines';
-	import { modelStore } from '$frontend/lib/stores/features/models.svelte';
-	import { chatModelState } from '$frontend/lib/stores/ui/chat-model.svelte';
-	import { presenceState } from '$frontend/lib/stores/core/presence.svelte';
-	import { editModeState } from '$frontend/lib/stores/ui/edit-mode.svelte';
-	import { claudeAccountsStore } from '$frontend/lib/stores/features/claude-accounts.svelte';
+	import { modelStore } from '$frontend/stores/features/models.svelte';
+	import { chatModelState } from '$frontend/stores/ui/chat-model.svelte';
+	import { presenceState } from '$frontend/stores/core/presence.svelte';
+	import { editModeState } from '$frontend/stores/ui/edit-mode.svelte';
+	import { claudeAccountsStore } from '$frontend/stores/features/claude-accounts.svelte';
 	import type { IconName } from '$shared/types/ui/icons';
-	import ws from '$frontend/lib/utils/ws';
+	import ws from '$frontend/utils/ws';
 	import { debug } from '$shared/utils/logger';
 
 	// Components

package/frontend/{lib/components → components}/chat/input/components/ChatInputActions.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Icon from '$frontend/lib/components/common/Icon.svelte';
+	import Icon from '$frontend/components/common/display/Icon.svelte';
 	import type { FileAttachment } from '../composables/use-file-handling.svelte';
 
 	interface Props {

package/frontend/{lib/components → components}/chat/input/components/EditModeIndicator.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-	import Icon from '$frontend/lib/components/common/Icon.svelte';
-	import { editModeState } from '$frontend/lib/stores/ui/edit-mode.svelte';
+	import Icon from '$frontend/components/common/display/Icon.svelte';
+	import { editModeState } from '$frontend/stores/ui/edit-mode.svelte';
 
 	interface Props {
 		onCancel: () => void;

package/frontend/{lib/components → components}/chat/input/components/EngineModelPicker.svelte

@@ -1,16 +1,16 @@
 <script lang="ts">
 	import { untrack } from 'svelte';
-	import { settings } from '$frontend/lib/stores/features/settings.svelte';
-	import { modelStore } from '$frontend/lib/stores/features/models.svelte';
-	import { sessionState } from '$frontend/lib/stores/core/sessions.svelte';
-	import { appState } from '$frontend/lib/stores/core/app.svelte';
-	import { userStore } from '$frontend/lib/stores/features/user.svelte';
-	import { chatModelState, initChatModel, restoreChatModelFromSession } from '$frontend/lib/stores/ui/chat-model.svelte';
+	import { settings } from '$frontend/stores/features/settings.svelte';
+	import { modelStore } from '$frontend/stores/features/models.svelte';
+	import { sessionState } from '$frontend/stores/core/sessions.svelte';
+	import { appState } from '$frontend/stores/core/app.svelte';
+	import { userStore } from '$frontend/stores/features/user.svelte';
+	import { chatModelState, initChatModel, restoreChatModelFromSession } from '$frontend/stores/ui/chat-model.svelte';
 	import { ENGINES } from '$shared/constants/engines';
 	import type { EngineType, EngineModel } from '$shared/types/engine';
-	import Icon from '$frontend/lib/components/common/Icon.svelte';
-	import { claudeAccountsStore, type ClaudeAccountItem } from '$frontend/lib/stores/features/claude-accounts.svelte';
-	import ws from '$frontend/lib/utils/ws';
+	import Icon from '$frontend/components/common/display/Icon.svelte';
+	import { claudeAccountsStore, type ClaudeAccountItem } from '$frontend/stores/features/claude-accounts.svelte';
+	import ws from '$frontend/utils/ws';
 	import { debug } from '$shared/utils/logger';
 
 	// ════════════════════════════════════════════

package/frontend/{lib/components → components}/chat/input/components/FileAttachmentPreview.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Icon from '$frontend/lib/components/common/Icon.svelte';
+	import Icon from '$frontend/components/common/display/Icon.svelte';
 	import type { FileAttachment } from '../composables/use-file-handling.svelte';
 
 	interface Props {

package/frontend/{lib/components → components}/chat/input/components/LoadingIndicator.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { appState } from '$frontend/lib/stores/core/app.svelte';
-	import Icon from '$frontend/lib/components/common/Icon.svelte';
+	import { appState } from '$frontend/stores/core/app.svelte';
+	import Icon from '$frontend/components/common/display/Icon.svelte';
 	import { fly } from 'svelte/transition';
 
 	interface Props {

package/frontend/{lib/components → components}/chat/input/composables/use-chat-actions.svelte.ts

@@ -1,11 +1,11 @@
-import { appState } from '$frontend/lib/stores/core/app.svelte';
-import { sessionState, loadMessagesForSession } from '$frontend/lib/stores/core/sessions.svelte';
-import { chatService } from '$frontend/lib/services/chat/chat.service';
-import { snapshotService } from '$frontend/lib/services/snapshot/snapshot.service';
-import { soundNotification } from '$frontend/lib/services/notification';
-import { addNotification } from '$frontend/lib/stores/ui/notification.svelte';
-import { editModeState, cancelEdit } from '$frontend/lib/stores/ui/edit-mode.svelte';
-import { clearInput, setSkipNextRestore } from '$frontend/lib/stores/ui/chat-input.svelte';
+import { appState } from '$frontend/stores/core/app.svelte';
+import { sessionState, loadMessagesForSession } from '$frontend/stores/core/sessions.svelte';
+import { chatService } from '$frontend/services/chat/chat.service';
+import { snapshotService } from '$frontend/services/snapshot/snapshot.service';
+import { soundNotification } from '$frontend/services/notification';
+import { addNotification } from '$frontend/stores/ui/notification.svelte';
+import { editModeState, cancelEdit } from '$frontend/stores/ui/edit-mode.svelte';
+import { clearInput, setSkipNextRestore } from '$frontend/stores/ui/chat-input.svelte';
 import { debug } from '$shared/utils/logger';
 import type { FileAttachment } from './use-file-handling.svelte';
 

package/frontend/{lib/components → components}/chat/input/composables/use-file-handling.svelte.ts

@@ -1,4 +1,4 @@
-import { addNotification } from '$frontend/lib/stores/ui/notification.svelte';
+import { addNotification } from '$frontend/stores/ui/notification.svelte';
 import { debug } from '$shared/utils/logger';
 
 // File attachments interface

package/frontend/{lib/components → components}/chat/input/composables/use-input-state.svelte.ts

@@ -1,11 +1,11 @@
 import { onMount, onDestroy } from 'svelte';
-import { editModeState } from '$frontend/lib/stores/ui/edit-mode.svelte';
-import { chatInputState, resetFocus, shouldSkipRestore } from '$frontend/lib/stores/ui/chat-input.svelte';
-import { projectState } from '$frontend/lib/stores/core/projects.svelte';
-import { sessionState } from '$frontend/lib/stores/core/sessions.svelte';
-import { userStore } from '$frontend/lib/stores/features/user.svelte';
+import { editModeState } from '$frontend/stores/ui/edit-mode.svelte';
+import { chatInputState, resetFocus, shouldSkipRestore } from '$frontend/stores/ui/chat-input.svelte';
+import { projectState } from '$frontend/stores/core/projects.svelte';
+import { sessionState } from '$frontend/stores/core/sessions.svelte';
+import { userStore } from '$frontend/stores/features/user.svelte';
 import { debug } from '$shared/utils/logger';
-import ws from '$frontend/lib/utils/ws';
+import ws from '$frontend/utils/ws';
 import type { FileAttachment } from './use-file-handling.svelte';
 
 /**