Merge upstream main changes

Integrate the concurrent feature-structure update before publishing the
title bar and activity navigation alignment fixes.

Author: mehmetozguldev

src/features/ai/components/input/chat-preferences-menu.tsx

@@ -50,7 +50,7 @@ import {
 } from "@/ui/icons";
 import { Spinner } from "@/ui/spinner";
 import { matchesSearchQuery } from "@/utils/search-match";
-import { getChatPreferencesModel } from "./chat-preferences-model";
+import { getChatPreferencesModel } from "@/features/ai/utils/chat-preferences-model";
 
 const FALLBACK_MODES: { id: ChatMode; label: string }[] = [
   { id: "chat", label: "Ask" },

src/features/ai/components/selectors/context-selector.tsx

@@ -31,7 +31,10 @@ import {
 } from "@/ui/icons";
 import { matchesSearchQuery } from "@/utils/search-match";
 import { AIFileSelector } from "../mentions/ai-file-selector";
-import { getGitContextFiles, groupContextBuffers } from "./context-selector-model";
+import {
+  getGitContextFiles,
+  groupContextBuffers,
+} from "@/features/ai/utils/context-selector-model";
 
 function getBufferContextDescription(buffer: PaneContent) {
   if (buffer.type === "webViewer") return buffer.url;

src/features/ai/tests/chat-preferences-model.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vite-plus/test";
-import { getChatPreferencesModel } from "../components/input/chat-preferences-model";
+import { getChatPreferencesModel } from "../utils/chat-preferences-model";
 import type { SessionConfigOption } from "../types/acp.types";
 
 function option(id: string, category: SessionConfigOption["category"]): SessionConfigOption {

src/features/ai/tests/context-selector-model.test.ts

@@ -1,9 +1,6 @@
 import { describe, expect, it } from "vitest";
 import type { PaneContent } from "@/features/panes/types/pane-content.types";
-import {
-  getGitContextFiles,
-  groupContextBuffers,
-} from "../components/selectors/context-selector-model";
+import { getGitContextFiles, groupContextBuffers } from "../utils/context-selector-model";
 
 function createBuffer(type: PaneContent["type"], id: string): PaneContent {
   return {

…mponents/input/chat-preferences-model.ts …tures/ai/utils/chat-preferences-model.tssrc/features/ai/components/input/chat-preferences-model.ts renamed to src/features/ai/utils/chat-preferences-model.ts src/features/ai/components/input/chat-preferences-model.ts renamed to src/features/ai/utils/chat-preferences-model.ts

@@ -2,7 +2,7 @@ import { PlusIcon as Plus, XIcon as X } from "@/ui/icons";
 import { Button } from "@/ui/button";
 import Input from "@/ui/input";
 import Select from "@/ui/select";
-import { databaseCardClassName } from "./database-surface";
+import { databaseCardClassName } from "../utils/database-surface";
 import type { ColumnFilter, ColumnInfo, FilterOperator } from "../types/common.types";
 
 const FILTER_OPERATORS: { value: FilterOperator; label: string }[] = [

…ents/selectors/context-selector-model.ts …tures/ai/utils/context-selector-model.tssrc/features/ai/components/selectors/context-selector-model.ts renamed to src/features/ai/utils/context-selector-model.ts src/features/ai/components/selectors/context-selector-model.ts renamed to src/features/ai/utils/context-selector-model.ts

@@ -17,8 +17,11 @@ import { normalizeDatabaseError } from "../../lib/database-errors";
 import type { DatabaseType } from "../../types/provider.types";
 import { PROVIDER_REGISTRY } from "../../providers/provider-registry";
 import { useConnectionStore } from "../../stores/connection.store";
-import { buildSavedConnectionConfig } from "./connection-config";
-import { getInstalledDatabaseTypes, validateConnectionInput } from "./connection-validation";
+import { buildSavedConnectionConfig } from "../../utils/connection-config";
+import {
+  getInstalledDatabaseTypes,
+  validateConnectionInput,
+} from "../../utils/connection-validation";
 
 interface ConnectionDialogProps {
   isOpen: boolean;

src/features/database/components/column-filters.tsx

@@ -40,11 +40,8 @@ import {
   getWorkspaceDatabaseFiles,
   type WorkspaceDatabaseFile,
 } from "../utils/workspace-database-files";
-import { buildSavedConnectionConfig } from "./connection/connection-config";
-import {
-  getInstalledDatabaseTypes,
-  validateConnectionInput,
-} from "./connection/connection-validation";
+import { buildSavedConnectionConfig } from "../utils/connection-config";
+import { getInstalledDatabaseTypes, validateConnectionInput } from "../utils/connection-validation";
 
 function getBaseName(path: string) {
   return path.split(/[\\/]/).filter(Boolean).pop() ?? path;

src/features/database/components/connection/connection-dialog.tsx

@@ -5,7 +5,7 @@ import { Button } from "@/ui/button";
 import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/ui/input-group";
 import Textarea from "@/ui/textarea";
 import { cn } from "@/utils/cn";
-import { databaseCardClassName } from "./database-surface";
+import { databaseCardClassName } from "../utils/database-surface";
 import type { ColumnInfo, TableInfo } from "../types/common.types";
 import {
   applySqlCompletion,