refactor: align project directory architecture

.github/workflows/release.yml

@@ -206,7 +206,7 @@ jobs:
         env:
           VERSION: ${{ needs.prepare.outputs.version }}
         run: |
-          node scripts/release/generate-legacy-update.mjs \
+          node .github/scripts/generate-legacy-update.mjs \
             --version "${VERSION}" \
             --repository "${GITHUB_REPOSITORY}" \
             --assets-dir legacy-update \
@@ -231,7 +231,7 @@ jobs:
             -H "Accept: application/octet-stream" \
             "repos/${GITHUB_REPOSITORY}/releases/assets/${asset_id}" \
             > tauri-update/latest.json
-          node scripts/release/normalize-tauri-update.mjs \
+          node .github/scripts/normalize-tauri-update.mjs \
             --manifest tauri-update/latest.json \
             --release tauri-update/release.json \
             --repository "${GITHUB_REPOSITORY}" \

Cargo.toml

@@ -3,7 +3,7 @@ members = [
     "server",
     "apps/desktop/src-tauri",
     "crates/semble-core",
-    "benchmarks/semble",
+    "support/benchmarks/semble",
 ]
 resolver = "2"
 

Dockerfile

@@ -20,7 +20,7 @@ COPY apps/desktop/src-tauri/src/ apps/desktop/src-tauri/src/
 COPY apps/desktop/src-tauri/capabilities/ apps/desktop/src-tauri/capabilities/
 COPY apps/desktop/src-tauri/icons/ apps/desktop/src-tauri/icons/
 COPY apps/desktop/src-tauri/tauri.conf.json apps/desktop/src-tauri/tauri.conf.json
-COPY scripts/cursor-proto/proto/ scripts/cursor-proto/proto/
+COPY protocols/cursor/ protocols/cursor/
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=/usr/local/cargo/git \
     --mount=type=cache,target=/src/target \

Makefile

@@ -35,7 +35,7 @@ $(LOCAL_TAURI_SIGNING_KEY):
 	@powershell -NoProfile -Command "New-Item -ItemType Directory -Force -Path '$(dir $@)' | Out-Null; & '$(CURDIR)/apps/desktop/node_modules/.bin/tauri.cmd' signer generate --ci --write-keys '$@'"
 
 build-desktop: $(LOCAL_TAURI_SIGNING_KEY)
-	@set "TAURI_SIGNING_PRIVATE_KEY=$(LOCAL_TAURI_SIGNING_KEY)" && set "TAURI_SIGNING_PRIVATE_KEY_PASSWORD=" && npm --prefix apps/desktop run tauri:build -- --bundles nsis
+	@node -e "const { spawnSync } = require('node:child_process'); const result = spawnSync(process.execPath, ['node_modules/@tauri-apps/cli/tauri.js', 'build', '--bundles', 'nsis'], { cwd: 'apps/desktop', stdio: 'inherit', env: { ...process.env, TAURI_SIGNING_PRIVATE_KEY: process.argv[1], TAURI_SIGNING_PRIVATE_KEY_PASSWORD: '' } }); process.exit(result.status ?? 1)" "$(LOCAL_TAURI_SIGNING_KEY)"
 else
 $(LOCAL_TAURI_SIGNING_KEY):
 	@install -d -m 700 "$(dir $@)"

README-CN.md

@@ -120,13 +120,35 @@ API Key、模型配置和应用设置保存在本机。模型请求仍会发送
 ```text
 cursor-byok/
 ├── apps/
-│   ├── desktop/       # React、Vite、Tauri 桌面应用
+│   ├── desktop/
+│   │   ├── src/
+│   │   │   ├── features/ # 首页、模型、调用记录与设置
+│   │   │   ├── shell/    # 窗口框架、页面布局与广告外壳
+│   │   │   ├── shared/   # UI、虚拟列表、状态、API 与平台能力
+│   │   │   ├── i18n/     # 本地化运行时与语言目录
+│   │   │   └── styles/   # 全局主题与排版令牌
+│   │   └── src-tauri/    # Tauri 桌面生命周期
 │   └── docs/          # Next.js 与 Fumadocs 中文/英文文档站
-├── server/            # 本地服务、Cursor 请求处理和模型转发
+├── server/
+│   ├── src/
+│   │   ├── cursor/    # Cursor 协议适配
+│   │   ├── run/       # 通用 Agent Runtime 与内部 Port
+│   │   ├── provider/  # 模型供应商适配
+│   │   ├── model/     # 聚合领域模型
+│   │   ├── store/     # SQLite Repository
+│   │   ├── control/   # 管理面 API
+│   │   ├── harness/   # Cursor 本地集成
+│   │   └── search/    # Web 与 Semble 搜索接入
+│   ├── prompt/
+│   └── migrations/
 ├── crates/
 │   └── semble-core/   # 本地代码索引与搜索核心库
-├── cursor-proto/      # Cursor 协议定义
-├── benchmarks/        # 代码搜索和索引基准测试
+├── protocols/
+│   └── cursor/        # Cursor 协议定义的唯一来源
+├── support/                     # 仓库辅助设施
+│   ├── cursor-protocol-extractor/ # Cursor 协议提取与 Go 代码生成工具
+│   ├── cursor-capture/            # Cursor 协议抓取和调试工具
+│   └── benchmarks/                # 代码搜索和索引基准测试
 ├── images/            # README 展示图片
 ├── Cargo.toml         # Rust 工作区配置
 └── Makefile           # 常用开发、检查和构建命令

apps/desktop/src/App.tsx

@@ -1,16 +1,16 @@
 import { useEffect, useRef } from "react";
 import { HashRouter, Navigate, Route, Routes } from "react-router-dom";
-import { MessageProvider } from "./components/ui/MessageProvider";
-import { useMessage } from "./components/ui/message";
-import { AppFrame } from "./layouts/AppFrame";
-import { AppLayout } from "./layouts/AppLayout";
-import { CallsPage } from "./pages/CallsPage";
-import { CallDetailsPage } from "./pages/CallDetailsPage";
-import { CursorSettingsPage } from "./pages/CursorSettingsPage";
-import { HomePage } from "./pages/HomePage";
-import { SettingsPage } from "./pages/SettingsPage";
-import { useAppStore } from "./store/appStore";
-import { updateStore } from "./store/updateStore";
+import { MessageProvider } from "./shared/ui/MessageProvider";
+import { useMessage } from "./shared/ui/message";
+import { AppFrame } from "./shell/AppFrame";
+import { AppLayout } from "./shell/AppLayout";
+import { CallsPage } from "./features/calls/CallsPage";
+import { CallDetailsPage } from "./features/calls/CallDetailsPage";
+import { CursorSettingsPage } from "./features/models/CursorSettingsPage";
+import { HomePage } from "./features/home/HomePage";
+import { SettingsPage } from "./features/settings/SettingsPage";
+import { useAppStore } from "./shared/store/appStore";
+import { updateStore } from "./shared/store/updateStore";
 
 export function App() {
   return (

apps/desktop/src/demo/api.ts

@@ -8,7 +8,7 @@ import type {
   ProxySettings,
   StatisticsStorage,
   TabSettings,
-} from "../api";
+} from "../shared/api";
 
 const API_ROOT = "/__byok-api__/api";
 const FIXED_NOW = Date.UTC(2026, 7, 27, 8, 0, 0);

apps/desktop/src/features/calls/CallDetails.module.scss

@@ -1,4 +1,4 @@
-@use "../styles/typography" as type;
+@use "../../styles/typography" as type;
 
 .root {
   section { min-width: 0; }

apps/desktop/src/features/calls/CallDetails.tsx

@@ -1,6 +1,6 @@
-import type { CallDetail } from "../api";
-import { JsonEditor } from "./ui/JsonEditor";
-import { Tabs, type TabItem } from "./ui/Tabs";
+import type { CallDetail } from "../../shared/api";
+import { JsonEditor } from "../../shared/ui/JsonEditor";
+import { Tabs, type TabItem } from "../../shared/ui/Tabs";
 import styles from "./CallDetails.module.scss";
 
 const show = (value: string | number | null) => value ?? "-";

apps/desktop/src/features/calls/CallDetailsPage.module.scss

@@ -1,4 +1,4 @@
-@use "../styles/typography" as type;
+@use "../../styles/typography" as type;
 
 .root {
   width: 100%;

apps/desktop/src/features/calls/CallDetailsPage.tsx

@@ -1,10 +1,10 @@
 import { useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
-import { api, type CallDetail } from "../api";
-import { CallDetails } from "../components/CallDetails";
-import { TitledCard } from "../components/ui/TitledCard";
+import { api, type CallDetail } from "../../shared/api";
+import { CallDetails } from "./CallDetails";
+import { TitledCard } from "../../shared/ui/TitledCard";
 import styles from "./CallDetailsPage.module.scss";
-import { ScrollableContent } from "../components/virtual/ScrollableContent";
+import { ScrollableContent } from "../../shared/virtual/ScrollableContent";
 
 export function CallDetailsPage() {
   const { callId = "" } = useParams();

apps/desktop/src/features/calls/CallTable.module.scss

@@ -1,4 +1,4 @@
-@use "../styles/typography" as type;
+@use "../../styles/typography" as type;
 
 .status {
   padding: 3px 7px;

apps/desktop/src/features/calls/CallTable.tsx

@@ -1,9 +1,9 @@
-import type { LlmCall } from "../api";
-import controls from "./ui/Controls.module.scss";
-import { DataTable, type DataTableColumn } from "./ui/DataTable";
-import { Icon } from "./ui/Icon";
-import { TooltipTrigger } from "./ui/TooltipTrigger";
-import { eyeIcon } from "./ui/icons";
+import type { LlmCall } from "../../shared/api";
+import controls from "../../shared/ui/Controls.module.scss";
+import { DataTable, type DataTableColumn } from "../../shared/ui/DataTable";
+import { Icon } from "../../shared/ui/Icon";
+import { TooltipTrigger } from "../../shared/ui/TooltipTrigger";
+import { eyeIcon } from "../../shared/ui/icons";
 import styles from "./CallTable.module.scss";
 
 const value = (input: string | number | null) => input ?? "-";

apps/desktop/src/features/calls/CallsPage.tsx

@@ -1,7 +1,7 @@
 import { useEffect } from "react";
-import { CallTable } from "../components/CallTable";
-import { PageContent } from "../components/layout/PageContent";
-import { appStore, useAppStore } from "../store/appStore";
+import { CallTable } from "./CallTable";
+import { PageContent } from "../../shell/layout/PageContent";
+import { appStore, useAppStore } from "../../shared/store/appStore";
 import styles from "./CallsPage.module.scss";
 
 const CALL_REFRESH_INTERVAL_MS = 2_000;

apps/desktop/src/features/home/HomePage.tsx

@@ -1,15 +1,15 @@
 import { useEffect, useState } from "react";
-import { api, type Overview } from "../api";
-import { ContributionCalendarChart } from "../components/charts/ContributionCalendarChart";
-import { DailyTokenUsageChart } from "../components/charts/DailyTokenUsageChart";
-import { HomeMetrics } from "../components/metrics/HomeMetrics";
-import { PageContent } from "../components/layout/PageContent";
-import type { VirtualPageSection } from "../components/layout/VirtualPage";
-import { OverviewTimeRangeFilter, type OverviewRangePreset } from "../components/overview/OverviewTimeRangeFilter";
-import { PageActions } from "../layouts/PageActions";
-import { appStore, useAppStore } from "../store/appStore";
-import { formatTimeInput, parseTimeInput } from "../utils/parseTimeInput";
-import { claudeIcon, openAiIcon } from "../components/ui/icons";
+import { api, type Overview } from "../../shared/api";
+import { ContributionCalendarChart } from "./charts/ContributionCalendarChart";
+import { DailyTokenUsageChart } from "./charts/DailyTokenUsageChart";
+import { HomeMetrics } from "./metrics/HomeMetrics";
+import { PageContent } from "../../shell/layout/PageContent";
+import type { VirtualPageSection } from "../../shell/layout/VirtualPage";
+import { OverviewTimeRangeFilter, type OverviewRangePreset } from "./overview/OverviewTimeRangeFilter";
+import { PageActions } from "../../shell/PageActions";
+import { appStore, useAppStore } from "../../shared/store/appStore";
+import { formatTimeInput, parseTimeInput } from "../../shared/utils/parseTimeInput";
+import { claudeIcon, openAiIcon } from "../../shared/ui/icons";
 
 type TimeRange = { startMs: number; endMs: number };
 

apps/desktop/src/features/home/charts/ContributionCalendarChart.module.scss

@@ -1,4 +1,4 @@
-@use "../../styles/typography" as type;
+@use "../../../styles/typography" as type;
 
 .root {
   width: 100%;

apps/desktop/src/features/home/charts/ContributionCalendarChart.tsx

@@ -1,8 +1,8 @@
 import { useLayoutEffect, useMemo, useRef, useState } from "react";
 import { init, Rect, type ElementEvent } from "zrender";
-import type { Locale } from "../../i18n/runtime";
-import { useI18n } from "../../i18n/store";
-import { Tooltip, type TooltipAnchor } from "../ui/Tooltip";
+import type { Locale } from "../../../i18n/runtime";
+import { useI18n } from "../../../i18n/store";
+import { Tooltip, type TooltipAnchor } from "../../../shared/ui/Tooltip";
 import styles from "./ContributionCalendarChart.module.scss";
 
 export type ContributionDay = {

apps/desktop/src/features/home/charts/DailyTokenUsageChart.module.scss

@@ -1,4 +1,4 @@
-@use "../../styles/typography" as type;
+@use "../../../styles/typography" as type;
 
 .root {
   --daily-token-tooltip-font-size: #{type.$font-size-2xs};

apps/desktop/src/features/home/charts/DailyTokenUsageChart.tsx

@@ -1,7 +1,7 @@
 import type { EChartsCoreOption } from "echarts/core";
 import { useMemo, useState } from "react";
-import type { TokenUsageGranularity } from "../../api";
-import { formatCompactInteger } from "../../utils/numberFormat";
+import type { TokenUsageGranularity } from "../../../shared/api";
+import { formatCompactInteger } from "../../../shared/utils/numberFormat";
 import { EChart } from "./EChart";
 import styles from "./DailyTokenUsageChart.module.scss";
 

apps/desktop/src/features/home/charts/LatencyChart.tsx

@@ -1,5 +1,5 @@
 import type { EChartsCoreOption } from "echarts/core";
-import type { LlmCall } from "../../api";
+import type { LlmCall } from "../../../shared/api";
 import { EChart } from "./EChart";
 
 export function LatencyChart({ calls }: { calls: LlmCall[] }) {

apps/desktop/src/features/home/charts/TokenTrendChart.tsx

@@ -1,5 +1,5 @@
 import type { EChartsCoreOption } from "echarts/core";
-import type { LlmCall } from "../../api";
+import type { LlmCall } from "../../../shared/api";
 import { EChart } from "./EChart";
 
 export function TokenTrendChart({ calls }: { calls: LlmCall[] }) {

apps/desktop/src/features/home/metrics/CacheHitRateChart.module.scss

@@ -1,4 +1,4 @@
-@use "../../styles/typography" as type;
+@use "../../../styles/typography" as type;
 
 .root {
   position: relative;

apps/desktop/src/features/home/metrics/HomeMetrics.module.scss

@@ -1,4 +1,4 @@
-@use "../../styles/typography" as type;
+@use "../../../styles/typography" as type;
 
 .scroller {
   width: 100%;

apps/desktop/src/features/home/metrics/HomeMetrics.tsx

@@ -1,8 +1,8 @@
 import { useState } from "react";
-import { formatCompactInteger, formatInteger } from "../../utils/numberFormat";
-import { Icon } from "../ui/Icon";
-import { Tooltip, type TooltipAnchor } from "../ui/Tooltip";
-import { informationOutlineIcon } from "../ui/icons";
+import { formatCompactInteger, formatInteger } from "../../../shared/utils/numberFormat";
+import { Icon } from "../../../shared/ui/Icon";
+import { Tooltip, type TooltipAnchor } from "../../../shared/ui/Tooltip";
+import { informationOutlineIcon } from "../../../shared/ui/icons";
 import { CacheHitRateChart } from "./CacheHitRateChart";
 import styles from "./HomeMetrics.module.scss";
 

apps/desktop/src/features/home/overview/OverviewTimeRangeFilter.module.scss

@@ -1,4 +1,4 @@
-@use "../../styles/typography" as type;
+@use "../../../styles/typography" as type;
 
 .root,
 .presets {

apps/desktop/src/features/home/overview/OverviewTimeRangeFilter.tsx

@@ -1,12 +1,12 @@
 import { autoUpdate, computePosition, flip, offset, shift, size } from "@floating-ui/dom";
 import { useEffect, useId, useLayoutEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
-import { parseTimeInput } from "../../utils/parseTimeInput";
-import controls from "../ui/Controls.module.scss";
-import { Icon } from "../ui/Icon";
-import { MultiSelect, type MultiSelectOption } from "../ui/MultiSelect";
-import { TooltipTrigger } from "../ui/TooltipTrigger";
-import { refreshIcon } from "../ui/icons";
+import { parseTimeInput } from "../../../shared/utils/parseTimeInput";
+import controls from "../../../shared/ui/Controls.module.scss";
+import { Icon } from "../../../shared/ui/Icon";
+import { MultiSelect, type MultiSelectOption } from "../../../shared/ui/MultiSelect";
+import { TooltipTrigger } from "../../../shared/ui/TooltipTrigger";
+import { refreshIcon } from "../../../shared/ui/icons";
 import styles from "./OverviewTimeRangeFilter.module.scss";
 
 export type OverviewRangePreset = "ten-minutes" | "hour" | "today" | "week" | "month" | "custom";

apps/desktop/src/features/models/CursorGates.tsx

@@ -1,6 +1,6 @@
 import { createContext, useContext, type ReactNode } from "react";
-import { useAppStore } from "../../store/appStore";
-import controls from "../ui/Controls.module.scss";
+import { useAppStore } from "../../shared/store/appStore";
+import controls from "../../shared/ui/Controls.module.scss";
 import styles from "./CursorSettings.module.scss";
 
 const CaReady = createContext(false);

apps/desktop/src/features/models/CursorModelCards.tsx

@@ -1,11 +1,11 @@
 import type { IconifyIcon } from "@iconify/react/offline";
 import { useEffect, useRef } from "react";
 import Sortable from "sortablejs";
-import type { Model } from "../../api";
-import { Button } from "../ui/Button";
-import { Card } from "../ui/Card";
-import { Icon } from "../ui/Icon";
-import { claudeIcon, dragIcon, flatColorOrganizationIcon, openAiIcon } from "../ui/icons";
+import type { Model } from "../../shared/api";
+import { Button } from "../../shared/ui/Button";
+import { Card } from "../../shared/ui/Card";
+import { Icon } from "../../shared/ui/Icon";
+import { claudeIcon, dragIcon, flatColorOrganizationIcon, openAiIcon } from "../../shared/ui/icons";
 import { CursorModelTestResult, type CursorModelTestState } from "./CursorModelTestResult";
 import styles from "./CursorSettings.module.scss";
 

apps/desktop/src/features/models/CursorModelEditor.tsx

@@ -1,13 +1,13 @@
-import type { ModelInput, ModelType } from "../../api";
-import { defaultCustomHeadersText } from "../../utils/modelDefaults";
-import { modelPresets, presetEndpoint, trimTrailingSlash, type ModelPreset } from "../../utils/modelPresets";
-import { Button } from "../ui/Button";
-import { Checkbox } from "../ui/Checkbox";
-import { FormField, SecretTextInput, TextInput } from "../ui/FormControls";
-import { JsonEditor } from "../ui/JsonEditor";
-import { Combobox, Select } from "../ui/Select";
-import { Switch } from "../ui/Switch";
-import { claudeIcon, openAiIcon } from "../ui/icons";
+import type { ModelInput, ModelType } from "../../shared/api";
+import { defaultCustomHeadersText } from "../../shared/utils/modelDefaults";
+import { modelPresets, presetEndpoint, trimTrailingSlash, type ModelPreset } from "../../shared/utils/modelPresets";
+import { Button } from "../../shared/ui/Button";
+import { Checkbox } from "../../shared/ui/Checkbox";
+import { FormField, SecretTextInput, TextInput } from "../../shared/ui/FormControls";
+import { JsonEditor } from "../../shared/ui/JsonEditor";
+import { Combobox, Select } from "../../shared/ui/Select";
+import { Switch } from "../../shared/ui/Switch";
+import { claudeIcon, openAiIcon } from "../../shared/ui/icons";
 import { CursorPresetChips } from "./CursorPresetChips";
 import styles from "./CursorSettings.module.scss";
 

apps/desktop/src/features/models/CursorModelTestResult.tsx

@@ -1,7 +1,7 @@
-import type { ModelConnectivityResult } from "../../api";
-import { Icon } from "../ui/Icon";
-import { TooltipTrigger } from "../ui/TooltipTrigger";
-import { informationOutlineIcon } from "../ui/icons";
+import type { ModelConnectivityResult } from "../../shared/api";
+import { Icon } from "../../shared/ui/Icon";
+import { TooltipTrigger } from "../../shared/ui/TooltipTrigger";
+import { informationOutlineIcon } from "../../shared/ui/icons";
 import styles from "./CursorModelTestResult.module.scss";
 
 export type CursorModelTestState =

apps/desktop/src/features/models/CursorPresetChips.tsx

@@ -1,5 +1,5 @@
-import type { ModelType } from "../../api";
-import { modelPresets, presetEndpoint, trimTrailingSlash, type ModelPreset } from "../../utils/modelPresets";
+import type { ModelType } from "../../shared/api";
+import { modelPresets, presetEndpoint, trimTrailingSlash, type ModelPreset } from "../../shared/utils/modelPresets";
 import styles from "./CursorPresetChips.module.scss";
 
 /** 常用服务商预设：点击按当前协议类型自动填充对应端点与默认模型 */

apps/desktop/src/features/models/CursorSettingsPage.tsx

@@ -1,21 +1,21 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-import { api, type Model, type ModelInput } from "../api";
-import { CursorCaGate, CursorCaProvider, CursorModelGate, CursorModelProvider } from "../components/cursor/CursorGates";
-import { CursorModelCards, cursorModelGroups, type CursorModelGrouping } from "../components/cursor/CursorModelCards";
-import { CursorModelEditor, emptyCursorModelDraft, type CursorModelDraft } from "../components/cursor/CursorModelEditor";
-import { CursorModelTestResult, type CursorModelTestState } from "../components/cursor/CursorModelTestResult";
-import styles from "../components/cursor/CursorSettings.module.scss";
-import { PageContent } from "../components/layout/PageContent";
-import { LegacyModelImport } from "../components/models/LegacyModelImport";
-import { ConfirmDialog } from "../components/ui/ConfirmDialog";
-import controls from "../components/ui/Controls.module.scss";
-import { Icon } from "../components/ui/Icon";
-import { Modal } from "../components/ui/Modal";
-import { TooltipTrigger } from "../components/ui/TooltipTrigger";
-import { addIcon } from "../components/ui/icons";
-import { useMessage } from "../components/ui/message";
-import { PageActions } from "../layouts/PageActions";
-import { appStore, useAppStore } from "../store/appStore";
+import { api, type Model, type ModelInput } from "../../shared/api";
+import { CursorCaGate, CursorCaProvider, CursorModelGate, CursorModelProvider } from "./CursorGates";
+import { CursorModelCards, cursorModelGroups, type CursorModelGrouping } from "./CursorModelCards";
+import { CursorModelEditor, emptyCursorModelDraft, type CursorModelDraft } from "./CursorModelEditor";
+import { CursorModelTestResult, type CursorModelTestState } from "./CursorModelTestResult";
+import styles from "./CursorSettings.module.scss";
+import { PageContent } from "../../shell/layout/PageContent";
+import { LegacyModelImport } from "./LegacyModelImport";
+import { ConfirmDialog } from "../../shared/ui/ConfirmDialog";
+import controls from "../../shared/ui/Controls.module.scss";
+import { Icon } from "../../shared/ui/Icon";
+import { Modal } from "../../shared/ui/Modal";
+import { TooltipTrigger } from "../../shared/ui/TooltipTrigger";
+import { addIcon } from "../../shared/ui/icons";
+import { useMessage } from "../../shared/ui/message";
+import { PageActions } from "../../shell/PageActions";
+import { appStore, useAppStore } from "../../shared/store/appStore";
 
 export function CursorSettingsPage() {
   const { models, cursorHarness, cursorBusy } = useAppStore();

apps/desktop/src/features/models/LegacyModelImport.tsx

@@ -1,8 +1,8 @@
 import { useState, type ReactNode } from "react";
-import { api, type LegacyModelImportPreview } from "../../api";
-import { appStore } from "../../store/appStore";
-import { ConfirmDialog } from "../ui/ConfirmDialog";
-import { useMessage } from "../ui/message";
+import { api, type LegacyModelImportPreview } from "../../shared/api";
+import { appStore } from "../../shared/store/appStore";
+import { ConfirmDialog } from "../../shared/ui/ConfirmDialog";
+import { useMessage } from "../../shared/ui/message";
 import styles from "./LegacyModelImport.module.scss";
 
 type LegacyModelImportControl = {

apps/desktop/src/features/settings/AppLifecycleSettingsCard.tsx

@@ -8,12 +8,12 @@ import {
   writeAutostart,
   writeDockIconVisibility,
   writeSilentStart,
-} from "../../native/appLifecycle";
-import { updateStore, useUpdateStore } from "../../store/updateStore";
-import { Button } from "../ui/Button";
-import { Switch } from "../ui/Switch";
-import { TitledCard } from "../ui/TitledCard";
-import { useMessage } from "../ui/message";
+} from "../../shared/native/appLifecycle";
+import { updateStore, useUpdateStore } from "../../shared/store/updateStore";
+import { Button } from "../../shared/ui/Button";
+import { Switch } from "../../shared/ui/Switch";
+import { TitledCard } from "../../shared/ui/TitledCard";
+import { useMessage } from "../../shared/ui/message";
 import styles from "./AppLifecycleSettingsCard.module.scss";
 
 export function AppLifecycleSettingsCard() {

apps/desktop/src/features/settings/ProxySettingsCard.tsx

@@ -1,9 +1,9 @@
-import type { ProxySettings, ProxySettingsInput } from "../../api";
-import { Button } from "../ui/Button";
-import { Checkbox } from "../ui/Checkbox";
-import { TextInput } from "../ui/FormControls";
-import { Select } from "../ui/Select";
-import { TitledCard } from "../ui/TitledCard";
+import type { ProxySettings, ProxySettingsInput } from "../../shared/api";
+import { Button } from "../../shared/ui/Button";
+import { Checkbox } from "../../shared/ui/Checkbox";
+import { TextInput } from "../../shared/ui/FormControls";
+import { Select } from "../../shared/ui/Select";
+import { TitledCard } from "../../shared/ui/TitledCard";
 import styles from "./ProxySettingsCard.module.scss";
 
 export function ProxySettingsCard({

apps/desktop/src/features/settings/SettingsPage.module.scss

@@ -1,4 +1,4 @@
-@use "../styles/typography" as type;
+@use "../../styles/typography" as type;
 
 .page {
   display: grid;
@@ -41,6 +41,15 @@
   }
 }
 
+.textButton {
+  padding: 4px;
+  color: var(--vscode-textLink-foreground);
+  background: transparent;
+  border: 0;
+
+  &:hover { color: var(--vscode-textLink-activeForeground); }
+}
+
 .importRow {
   display: flex;
   align-items: center;
@@ -59,15 +68,6 @@
   }
 }
 
-.textButton {
-  padding: 4px;
-  color: var(--vscode-textLink-foreground);
-  background: transparent;
-  border: 0;
-
-  &:hover { color: var(--vscode-textLink-activeForeground); }
-}
-
 .confirmContent {
   display: grid;
   gap: 8px;
@@ -155,6 +155,7 @@
     align-items: stretch;
     flex-direction: column;
   }
+
 }
 
 .themeActions .selected {

apps/desktop/src/features/settings/SettingsPage.tsx

@@ -1,20 +1,20 @@
 import { useEffect, useState } from "react";
-import { api, type ProxySettings, type ProxySettingsInput, type StatisticsStorage, type StatisticsStorageScope, type TabSettings } from "../api";
-import { PageContent } from "../components/layout/PageContent";
-import { LegacyModelImport } from "../components/models/LegacyModelImport";
-import { AppLifecycleSettingsCard } from "../components/settings/AppLifecycleSettingsCard";
-import { ProxySettingsCard } from "../components/settings/ProxySettingsCard";
-import { TabSettingsCard } from "../components/settings/TabSettingsCard";
-import { Button } from "../components/ui/Button";
-import { Checkbox } from "../components/ui/Checkbox";
-import { ConfirmDialog } from "../components/ui/ConfirmDialog";
-import { FormField, TextInput } from "../components/ui/FormControls";
-import { Select } from "../components/ui/Select";
-import { TitledCard } from "../components/ui/TitledCard";
-import { setLocalePreference, useI18n, type LocalePreference } from "../i18n/store";
-import { useMessage } from "../components/ui/message";
-import { appStore, useAppStore } from "../store/appStore";
-import { themeOptions } from "../theme/theme";
+import { api, type ProxySettings, type ProxySettingsInput, type StatisticsStorage, type StatisticsStorageScope, type TabSettings } from "../../shared/api";
+import { PageContent } from "../../shell/layout/PageContent";
+import { LegacyModelImport } from "../models/LegacyModelImport";
+import { AppLifecycleSettingsCard } from "./AppLifecycleSettingsCard";
+import { ProxySettingsCard } from "./ProxySettingsCard";
+import { TabSettingsCard } from "./TabSettingsCard";
+import { Button } from "../../shared/ui/Button";
+import { Checkbox } from "../../shared/ui/Checkbox";
+import { ConfirmDialog } from "../../shared/ui/ConfirmDialog";
+import { FormField, TextInput } from "../../shared/ui/FormControls";
+import { Select } from "../../shared/ui/Select";
+import { TitledCard } from "../../shared/ui/TitledCard";
+import { setLocalePreference, useI18n, type LocalePreference } from "../../i18n/store";
+import { useMessage } from "../../shared/ui/message";
+import { appStore, useAppStore } from "../../shared/store/appStore";
+import { themeOptions } from "../../shared/theme/theme";
 import styles from "./SettingsPage.module.scss";
 
 export function SettingsPage() {

apps/desktop/src/features/settings/TabSettingsCard.tsx

@@ -1,10 +1,10 @@
-import cursorIconUrl from "../../assets/icons/cursor.svg";
-import type { TabMode, TabSettings } from "../../api";
-import { Button } from "../ui/Button";
-import { TextInput } from "../ui/FormControls";
-import { Icon } from "../ui/Icon";
-import { Select } from "../ui/Select";
-import { TitledCard } from "../ui/TitledCard";
+import cursorIconUrl from "../../shared/assets/icons/cursor.svg";
+import type { TabMode, TabSettings } from "../../shared/api";
+import { Button } from "../../shared/ui/Button";
+import { TextInput } from "../../shared/ui/FormControls";
+import { Icon } from "../../shared/ui/Icon";
+import { Select } from "../../shared/ui/Select";
+import { TitledCard } from "../../shared/ui/TitledCard";
 import styles from "./TabSettingsCard.module.scss";
 
 export function TabSettingsCard({

apps/desktop/src/index.tsx

@@ -2,8 +2,8 @@ import ReactDOM from "react-dom/client";
 import "../node_modules/monaco-editor/min/vs/editor/editor.main.css";
 import { I18nRoot } from "./i18n/I18nRoot";
 import { initializeI18n } from "./i18n/store";
-import { appStore } from "./store/appStore";
-import { applyTheme } from "./theme/theme";
+import { appStore } from "./shared/store/appStore";
+import { applyTheme } from "./shared/theme/theme";
 import "./styles/globals.scss";
 
 initializeI18n();

apps/desktop/src/shared/api.ts

@@ -1,5 +1,5 @@
-import type { AdRuntime } from "./components/ads/types";
-import type { Locale } from "./i18n/runtime";
+import type { AdRuntime } from "../shell/ads/types";
+import type { Locale } from "../i18n/runtime";
 
 export type ModelType = "openai" | "anthropic";