refactor: centralize types and extract seed data (Task 1.1)

- Create types/ directory with centralized domain types:
  session, tool-instance, tool-type, git-repository, config-folder,
  tool-config, project, user, api-response
- Remove inline type definitions from API modules;
  re-export from types/ for backward compatibility
- Update state/sessions.tsx to import Session from types/session.ts
- Update all consumer components/pages to import from types/
- Extract seed_builtin_tool_types from main.py to
  seeds/builtin_tool_types.py
- Create types/index.ts barrel export

Quality gates: tsc (pass), eslint (pass), Python syntax (pass)

apps/api/src/main.py

@@ -7,8 +7,6 @@ from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 from fastapi.staticfiles import StaticFiles
-from sqlalchemy import select, text
-
 from src.api.auth import router as auth_router
 from src.api.dashboard import router as dashboard_router
 from src.api.git_repositories import router as git_repositories_router
@@ -32,7 +30,7 @@ from src.logging_config import (
     RequestLoggingMiddleware,
     configure_logging,
 )
-from src.models.tool_type import ToolType
+from src.seeds.builtin_tool_types import seed_builtin_tool_types
 
 # Configure logging early
 log_level = os.getenv("LOG_LEVEL", "INFO").upper()
@@ -104,155 +102,6 @@ async def validation_exception_handler(request: Request, exc: RequestValidationE
     )
 
 
-async def _table_exists(session, table_name: str) -> bool:
-    """Check if a table exists in the database."""
-    try:
-        result = await session.execute(
-            text("""
-                SELECT EXISTS (
-                    SELECT FROM information_schema.tables
-                    WHERE table_schema = 'public'
-                    AND table_name = :table_name
-                )
-            """),
-            {"table_name": table_name},
-        )
-        return result.scalar() or False
-    except Exception:
-        return False
-
-
-async def seed_builtin_tool_types():
-    async with SessionLocal() as session:
-        # Check if tool_types table exists before attempting to seed
-        if not await _table_exists(session, "tool_types"):
-            logger.warning(
-                "tool_types table does not exist. Skipping seeding. "
-                "Migrations may not have run yet."
-            )
-            return
-
-        builtin_types = [
-            {
-                "name": "code-server",
-                "display_name": "VS Code Server",
-                "description": "VS Code running in the browser via code-server",
-                "category": "editor",
-                "interfaces": ["web"],
-                "compose_template": """version: "3.8"
-services:
-  code-server:
-    image: lscr.io/linuxserver/code-server:latest
-    container_name: {{TOOL_NAME}}
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/London
-    volumes:
-      - {{REPO_PATH}}:/config/workspace
-    ports:
-      - "8443:8443"
-    restart: unless-stopped""",
-                "default_port": 8443,
-                "required_variables": ["REPO_PATH", "TOOL_NAME"],
-            },
-            {
-                "name": "jupyter-notebook",
-                "display_name": "Jupyter Notebook",
-                "description": "Jupyter Lab for interactive development",
-                "category": "notebook",
-                "interfaces": ["web"],
-                "default_port": 8888,
-                "compose_template": """version: "3.8"
-services:
-  jupyter:
-    image: jupyter/scipy-notebook:latest
-    container_name: {{TOOL_NAME}}
-    environment:
-      - JUPYTER_ENABLE_LAB=yes
-    volumes:
-      - {{REPO_PATH}}:/home/jovyan/work
-    ports:
-      - "8888:8888"
-    restart: unless-stopped""",
-                "required_variables": ["REPO_PATH", "TOOL_NAME"],
-            },
-            {
-                "name": "opencode",
-                "display_name": "OpenCode",
-                "description": "AI coding assistant - run opencode in terminal",
-                "category": "ai-assistant",
-                "interfaces": ["terminal"],
-                "default_port": 3000,
-                "compose_template": """version: "3.8"
-services:
-  opencode:
-    image: node:20-slim
-    container_name: {{TOOL_NAME}}
-    working_dir: /workspace
-    environment:
-      - HOME=/tmp
-    volumes:
-      - {{REPO_PATH}}:/workspace
-      - opencode_home:/tmp
-    ports:
-      - "3000:3000"
-    command: >
-      sh -c "set -x &&
-             apt-get update && apt-get install -y git ca-certificates &&
-             echo 'Installing opencode...' &&
-             npm install -g opencode-ai 2>&1 || echo 'ERROR: npm install failed' &&
-             which opencode || echo 'ERROR: opencode not in PATH' &&
-             npm bin -g &&
-             ls -la $(npm bin -g) || echo 'ERROR: global bin dir not found' &&
-             echo 'export PATH=\"$(npm bin -g):\$PATH\"' >> /root/.bashrc &&
-             echo 'cd /workspace' >> /root/.bashrc &&
-             echo 'OpenCode installation complete' &&
-             cd /workspace &&
-             exec tail -f /dev/null"
-    stdin_open: true
-    tty: true
-    restart: unless-stopped
-
-volumes:
-  opencode_home:""",
-                "required_variables": ["REPO_PATH", "TOOL_NAME"],
-            },
-        ]
-
-        for tool_data in builtin_types:
-            existing = await session.scalar(select(ToolType).where(ToolType.name == tool_data["name"]))
-            if not existing:
-                tool_type = ToolType(
-                    name=tool_data["name"],
-                    display_name=tool_data["display_name"],
-                    description=tool_data["description"],
-                    category=tool_data["category"],
-                    interfaces=tool_data["interfaces"],
-                    definition_type="compose",
-                    compose_template=tool_data["compose_template"],
-                    required_variables=tool_data["required_variables"],
-                    default_port=tool_data.get("default_port"),
-                    is_builtin=True,
-                )
-                session.add(tool_type)
-                logger.info("Created built-in tool type: %s", tool_data["name"])
-            else:
-                # Update existing built-in tool types to reflect code changes
-                existing.display_name = tool_data["display_name"]
-                existing.description = tool_data["description"]
-                existing.category = tool_data["category"]
-                existing.interfaces = tool_data["interfaces"]
-                existing.definition_type = "compose"
-                existing.compose_template = tool_data["compose_template"]
-                existing.required_variables = tool_data["required_variables"]
-                existing.default_port = tool_data.get("default_port")
-                logger.info("Updated built-in tool type: %s", tool_data["name"])
-
-        await session.commit()
-        logger.info("Built-in tool types seeded successfully.")
-
-
 @app.on_event("startup")
 async def on_startup():
     logger.info("Starting up Headquarter API...")

apps/api/src/seeds/builtin_tool_types.py

@@ -0,0 +1,161 @@
+import logging
+
+from sqlalchemy import select
+
+from src.database import SessionLocal
+from src.models.tool_type import ToolType
+
+logger = logging.getLogger(__name__)
+
+
+async def _table_exists(session, table_name: str) -> bool:
+    """Check if a table exists in the database."""
+    from sqlalchemy import text
+
+    try:
+        result = await session.execute(
+            text(
+                """
+                SELECT EXISTS (
+                    SELECT FROM information_schema.tables
+                    WHERE table_schema = 'public'
+                    AND table_name = :table_name
+                )
+            """
+            ),
+            {"table_name": table_name},
+        )
+        return result.scalar() or False
+    except Exception:
+        return False
+
+
+async def seed_builtin_tool_types():
+    async with SessionLocal() as session:
+        # Check if tool_types table exists before attempting to seed
+        if not await _table_exists(session, "tool_types"):
+            logger.warning(
+                "tool_types table does not exist. Skipping seeding. "
+                "Migrations may not have run yet."
+            )
+            return
+
+        builtin_types = [
+            {
+                "name": "code-server",
+                "display_name": "VS Code Server",
+                "description": "VS Code running in the browser via code-server",
+                "category": "editor",
+                "interfaces": ["web"],
+                "compose_template": """version: "3.8"
+services:
+  code-server:
+    image: lscr.io/linuxserver/code-server:latest
+    container_name: {{TOOL_NAME}}
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/London
+    volumes:
+      - {{REPO_PATH}}:/config/workspace
+    ports:
+      - "8443:8443"
+    restart: unless-stopped""",
+                "default_port": 8443,
+                "required_variables": ["REPO_PATH", "TOOL_NAME"],
+            },
+            {
+                "name": "jupyter-notebook",
+                "display_name": "Jupyter Notebook",
+                "description": "Jupyter Lab for interactive development",
+                "category": "notebook",
+                "interfaces": ["web"],
+                "default_port": 8888,
+                "compose_template": """version: "3.8"
+services:
+  jupyter:
+    image: jupyter/scipy-notebook:latest
+    container_name: {{TOOL_NAME}}
+    environment:
+      - JUPYTER_ENABLE_LAB=yes
+    volumes:
+      - {{REPO_PATH}}:/home/jovyan/work
+    ports:
+      - "8888:8888"
+    restart: unless-stopped""",
+                "required_variables": ["REPO_PATH", "TOOL_NAME"],
+            },
+            {
+                "name": "opencode",
+                "display_name": "OpenCode",
+                "description": "AI coding assistant - run opencode in terminal",
+                "category": "ai-assistant",
+                "interfaces": ["terminal"],
+                "default_port": 3000,
+                "compose_template": """version: "3.8"
+services:
+  opencode:
+    image: node:20-slim
+    container_name: {{TOOL_NAME}}
+    working_dir: /workspace
+    environment:
+      - HOME=/tmp
+    volumes:
+      - {{REPO_PATH}}:/workspace
+      - opencode_home:/tmp
+    ports:
+      - "3000:3000"
+    command: >
+      sh -c "set -x &&
+             apt-get update && apt-get install -y git ca-certificates &&
+             echo 'Installing opencode...' &&
+             npm install -g opencode-ai 2>&1 || echo 'ERROR: npm install failed' &&
+             which opencode || echo 'ERROR: opencode not in PATH' &&
+             npm bin -g &&
+             ls -la $(npm bin -g) || echo 'ERROR: global bin dir not found' &&
+             echo 'export PATH=\"$(npm bin -g):\\$PATH\"' >> /root/.bashrc &&
+             echo 'cd /workspace' >> /root/.bashrc &&
+             echo 'OpenCode installation complete' &&
+             cd /workspace &&
+             exec tail -f /dev/null"
+    stdin_open: true
+    tty: true
+    restart: unless-stopped
+
+volumes:
+  opencode_home:""",
+                "required_variables": ["REPO_PATH", "TOOL_NAME"],
+            },
+        ]
+
+        for tool_data in builtin_types:
+            existing = await session.scalar(select(ToolType).where(ToolType.name == tool_data["name"]))
+            if not existing:
+                tool_type = ToolType(
+                    name=tool_data["name"],
+                    display_name=tool_data["display_name"],
+                    description=tool_data["description"],
+                    category=tool_data["category"],
+                    interfaces=tool_data["interfaces"],
+                    definition_type="compose",
+                    compose_template=tool_data["compose_template"],
+                    required_variables=tool_data["required_variables"],
+                    default_port=tool_data.get("default_port"),
+                    is_builtin=True,
+                )
+                session.add(tool_type)
+                logger.info("Created built-in tool type: %s", tool_data["name"])
+            else:
+                # Update existing built-in tool types to reflect code changes
+                existing.display_name = tool_data["display_name"]
+                existing.description = tool_data["description"]
+                existing.category = tool_data["category"]
+                existing.interfaces = tool_data["interfaces"]
+                existing.definition_type = "compose"
+                existing.compose_template = tool_data["compose_template"]
+                existing.required_variables = tool_data["required_variables"]
+                existing.default_port = tool_data.get("default_port")
+                logger.info("Updated built-in tool type: %s", tool_data["name"])
+
+        await session.commit()
+        logger.info("Built-in tool types seeded successfully.")

apps/web/src/api/config_folders.ts

@@ -1,38 +1,17 @@
 import { apiClient } from "./client";
+import type {
+  ConfigFolder,
+  CreateConfigFolderRequest,
+  UpdateConfigFolderRequest,
+  ProjectOverrideRequest,
+} from "../types/config-folder";
 
-export interface ConfigFolder {
-  id: string;
-  user_id: string;
-  name: string;
-  description: string | null;
-  mount_path: string;
-  files: Record<string, string>;
-  project_overrides: Record<string, { mount_path?: string; files?: Record<string, string> }> | null;
-  is_active: boolean;
-  created_at: string;
-  updated_at: string;
-}
-
-export interface CreateConfigFolderRequest {
-  name: string;
-  description?: string;
-  mount_path: string;
-  files?: Record<string, string>;
-  is_active?: boolean;
-}
-
-export interface UpdateConfigFolderRequest {
-  name?: string;
-  description?: string;
-  mount_path?: string;
-  files?: Record<string, string>;
-  is_active?: boolean;
-}
-
-export interface ProjectOverrideRequest {
-  mount_path?: string;
-  files?: Record<string, string>;
-}
+export type {
+  ConfigFolder,
+  CreateConfigFolderRequest,
+  UpdateConfigFolderRequest,
+  ProjectOverrideRequest,
+} from "../types/config-folder";
 
 export const listConfigFolders = async (): Promise<ConfigFolder[]> => {
   const response = await apiClient.get<ConfigFolder[]>("/config-folders");
@@ -55,7 +34,10 @@ export const updateConfigFolder = async (
   id: string,
   data: UpdateConfigFolderRequest
 ): Promise<ConfigFolder> => {
-  const response = await apiClient.put<ConfigFolder>(`/config-folders/${id}`, data);
+  const response = await apiClient.put<ConfigFolder>(
+    `/config-folders/${id}`,
+    data
+  );
   return response.data;
 };
 

apps/web/src/api/git_repositories.ts

@@ -1,32 +1,26 @@
 import { apiClient } from "./client";
+import type {
+  CommitDetail,
+  CommitHistoryResponse,
+  CommitResponse,
+  GitRepository,
+  GitRepositoryCreate,
+  GitStatus,
+  MergeResponse,
+  URLParseResult,
+} from "../types/git-repository";
 
-export interface GitRepository {
-  id: string;
-  name: string;
-  path: string;
-  project_id: string;
-  owner_id: string;
-  is_mirror: boolean;
-  remote_url: string | null;
-  last_push: string | null;
-  created_at: string | null;
-}
-
-export interface GitRepositoryCreate {
-  name: string;
-  remote_url?: string;
-  force_original_url?: boolean;
-}
-
-export interface URLParseResult {
-  original_url: string;
-  base_url: string | null;
-  is_valid_clone_url: boolean;
-  needs_parsing: boolean;
-  host: string | null;
-  message: string;
-  error_code: string | null;
-}
+export type {
+  CommitDetail,
+  CommitHistoryEntry,
+  CommitHistoryResponse,
+  CommitResponse,
+  GitRepository,
+  GitRepositoryCreate,
+  GitStatus,
+  MergeResponse,
+  URLParseResult,
+} from "../types/git-repository";
 
 export async function parseGitUrl(url: string): Promise<URLParseResult> {
   const response = await apiClient.post("/projects/repositories/parse-url", { url });
@@ -50,24 +44,6 @@ export async function deleteRepository(projectId: string, repoId: string): Promi
   await apiClient.delete(`/projects/${projectId}/repositories/${repoId}`);
 }
 
-export interface CommitHistoryEntry {
-  hash: string;
-  short_hash: string;
-  message: string;
-  author_name: string;
-  author_email: string;
-  author_date: string;
-  refs: string[];
-  graph_symbol: string;
-  graph_depth: number;
-}
-
-export interface CommitHistoryResponse {
-  commits: CommitHistoryEntry[];
-  branches: string[];
-  tags: string[];
-}
-
 export async function getRepositoryHistory(
   projectId: string,
   repoId: string,
@@ -83,25 +59,6 @@ export async function getRepositoryHistory(
   return response.data;
 }
 
-export interface CommitDetail {
-  hash: string;
-  short_hash: string;
-  message: string;
-  author_name: string;
-  author_email: string;
-  author_date: string;
-  committer_name: string;
-  committer_email: string;
-  committer_date: string;
-  stats: {
-    additions: number;
-    deletions: number;
-    files_changed: number;
-  };
-  diff: string;
-  parents: string[];
-}
-
 export async function getCommitDetail(
   projectId: string,
   repoId: string,
@@ -113,19 +70,6 @@ export async function getCommitDetail(
   return response.data;
 }
 
-// Git Control API
-
-export interface GitStatus {
-  branch: string;
-  modified: string[];
-  added: string[];
-  deleted: string[];
-  untracked: string[];
-  renamed: string[];
-  ahead: number;
-  behind: number;
-}
-
 export async function getRepositoryStatus(
   projectId: string,
   repoId: string
@@ -173,11 +117,6 @@ export async function checkoutBranch(
   return response.data;
 }
 
-export interface CommitResponse {
-  commit_hash: string;
-  message: string;
-}
-
 export async function commitChanges(
   projectId: string,
   repoId: string,
@@ -225,11 +164,6 @@ export async function pushRepository(
   return response.data;
 }
 
-export interface MergeResponse {
-  commit_hash: string;
-  message: string;
-}
-
 export async function mergeBranches(
   projectId: string,
   repoId: string,

apps/web/src/api/sessions.ts

@@ -1,31 +1,9 @@
 import { apiClient } from "./client";
+import type { Session } from "../types/session";
+import type { ToolInstance } from "../types/tool-instance";
 
-export interface ToolInstance {
-  id: string;
-  name: string;
-  display_name: string;
-  tool_type_id: string;
-  tool_type_name: string;
-  tool_type_interfaces: string[];
-  status: string;
-  url: string | null;
-  port: number | null;
-  created_at: string;
-}
-
-export interface Session {
-  id: string;
-  display_name: string;
-  tool_type_name: string;
-  tool_icon: string;
-  tool_type_interfaces: string[];
-  repository_name: string;
-  repository_id: string;
-  project_name: string;
-  project_id: string;
-  status: string;
-  url: string | null;
-}
+export type { Session } from "../types/session";
+export type { ToolInstance } from "../types/tool-instance";
 
 export async function listInstances(
   projectId: string,

apps/web/src/api/tool_configs.ts

@@ -1,33 +1,7 @@
 import { apiClient } from "./client";
+import type { ToolConfig, CreateToolConfigRequest } from "../types/tool-config";
 
-export interface ToolConfig {
-  id: string;
-  tool_type_id: string;
-  project_id: string | null;
-  key: string;
-  value: string;
-  config_type: string;
-  file_path: string | null;
-  port_override: number | null;
-  start_command: string | null;
-  working_directory: string | null;
-  environment_variables: Record<string, string> | null;
-  volumes: Array<{ source: string; target: string; type?: string }> | null;
-}
-
-export interface CreateToolConfigRequest {
-  tool_type_id: string;
-  project_id?: string;
-  key: string;
-  value: string;
-  config_type?: string;
-  file_path?: string;
-  port_override?: number;
-  start_command?: string;
-  working_directory?: string;
-  environment_variables?: Record<string, string>;
-  volumes?: Array<{ source: string; target: string; type?: string }>;
-}
+export type { ToolConfig, CreateToolConfigRequest } from "../types/tool-config";
 
 export const listToolConfigs = async (
   tool_type_id?: string,
@@ -36,7 +10,7 @@ export const listToolConfigs = async (
   const params = new URLSearchParams();
   if (tool_type_id) params.append("tool_type_id", tool_type_id);
   if (project_id) params.append("project_id", project_id);
-  
+
   const response = await apiClient.get<{ configs: ToolConfig[] }>(
     `/tool-configs?${params.toString()}`
   );
@@ -72,4 +46,4 @@ export const getToolConfigDefaults = async (
     `/tool-configs/defaults/${toolTypeId}`
   );
   return response.data;
-};
+};

apps/web/src/api/tool_types.ts

@@ -1,59 +1,7 @@
 import { apiClient } from "./client";
+import type { ToolType, CreateToolTypeRequest, UpdateToolTypeRequest } from "../types/tool-type";
 
-export interface ReadinessProbe {
-  command: string;
-  timeout: number;
-  interval: number;
-}
-
-export interface ToolType {
-  id: string;
-  name: string;
-  display_name: string;
-  description: string | null;
-  category: string;
-  interfaces: string[];
-  default_port: number | null;
-  definition_type: 'compose' | 'dockerfile';
-  compose_template: string | null;
-  dockerfile_template: string | null;
-  build_context: Record<string, string> | null;
-  readiness_probe: ReadinessProbe | null;
-  required_variables: string[];
-  is_builtin: boolean;
-  created_by_id: string | null;
-  created_at: string;
-  updated_at: string;
-}
-
-export interface CreateToolTypeRequest {
-  name: string;
-  display_name: string;
-  description?: string;
-  category?: string;
-  interfaces?: string[];
-  default_port: number;
-  definition_type?: 'compose' | 'dockerfile';
-  compose_template?: string;
-  dockerfile_template?: string;
-  build_context?: Record<string, string>;
-  readiness_probe?: ReadinessProbe;
-  required_variables: string[];
-}
-
-export interface UpdateToolTypeRequest {
-  display_name?: string;
-  description?: string;
-  category?: string;
-  interfaces?: string[];
-  default_port?: number;
-  definition_type?: 'compose' | 'dockerfile';
-  compose_template?: string;
-  dockerfile_template?: string;
-  build_context?: Record<string, string>;
-  readiness_probe?: ReadinessProbe;
-  required_variables?: string[];
-}
+export type { ReadinessProbe, ToolType, CreateToolTypeRequest, UpdateToolTypeRequest } from "../types/tool-type";
 
 export const listToolTypes = async (): Promise<ToolType[]> => {
   const response = await apiClient.get<ToolType[]>("/tool-types");

apps/web/src/components/app-shell.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect } from "react";
 import { Link, NavLink, Outlet } from "react-router-dom";
 
 import { getUserSessions } from "../api/sessions";
-import type { Session } from "../api/sessions";
+import type { Session } from "../types/session";
 import { useTheme } from "../hooks/use-theme";
 import { useAuth } from "../state/auth";
 import { useSessions } from "../state/sessions";

apps/web/src/components/instance-list.tsx

@@ -1,7 +1,8 @@
 import { useCallback, useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { Icon } from "./icon";
-import type { ToolInstance } from "../api/sessions";
+import type { ToolInstance } from "../types/tool-instance";
+import type { ToolType } from "../types/tool-type";
 import {
   checkInstanceHealth,
   createInstance,
@@ -12,7 +13,6 @@ import {
   startInstance,
   stopInstance,
 } from "../api/sessions";
-import type { ToolType } from "../api/tool_types";
 
 const API_BASE_URL = import.meta.env.VITE_API_BASE_URL ?? "http://localhost:8000";
 

apps/web/src/components/repositories-settings-tab.tsx

@@ -1,7 +1,8 @@
 import React, { useCallback, useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
 
-import { deleteRepository, listRepositories, type GitRepository } from "../api/git_repositories";
+import type { GitRepository } from "../types/git-repository";
+import { deleteRepository, listRepositories } from "../api/git_repositories";
 import { RepositoryCreateDialog } from "./repository-create-dialog";
 import { Icon } from "./icon";
 

apps/web/src/components/repository-create-dialog.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useRef, useState } from "react";
 
-import { createRepository, parseGitUrl, type GitRepositoryCreate, type URLParseResult } from "../api/git_repositories";
+import type { GitRepositoryCreate, URLParseResult } from "../types/git-repository";
+import { createRepository, parseGitUrl } from "../api/git_repositories";
 import { Icon } from "./icon";
 
 type CreateMode = "clone" | "blank";

apps/web/src/pages/dashboard.tsx

@@ -2,12 +2,15 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
 import { getDashboardSummary, type DashboardSummary } from "../api/dashboard";
-import { createInstance, getUserSessions, startInstance, stopInstance, deleteInstance, recreateInstanceTunnel, type Session as SessionApi } from "../api/sessions";
+import { createInstance, getUserSessions, startInstance, stopInstance, deleteInstance, recreateInstanceTunnel } from "../api/sessions";
 import { listProjects } from "../api/projects";
-import { listRepositories, type GitRepository } from "../api/git_repositories";
-import { listToolTypes, type ToolType } from "../api/tool_types";
+import { listRepositories } from "../api/git_repositories";
+import { listToolTypes } from "../api/tool_types";
 import { updateUserConfig } from "../api/settings";
-import type { Project } from "../types";
+import type { Project } from "../types/project";
+import type { Session as SessionApi } from "../types/session";
+import type { GitRepository } from "../types/git-repository";
+import type { ToolType } from "../types/tool-type";
 import { Icon } from "../components/icon";
 
 type HomeStatus = "loading" | "ready" | "error";

apps/web/src/pages/git-repositories.tsx

@@ -1,11 +1,11 @@
 import { useCallback, useEffect, useState } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 
+import type { GitRepository } from "../types/git-repository";
 import {
   deleteRepository,
   listRepositories,
 } from "../api/git_repositories";
-import type { GitRepository } from "../api/git_repositories";
 import { Icon } from "../components/icon";
 import { RepositoryCreateDialog } from "../components/repository-create-dialog";
 

apps/web/src/pages/repo-workspace.tsx

@@ -4,10 +4,11 @@ import { Icon } from "../components/icon";
 import { Link, useParams, useSearchParams } from "react-router-dom";
 
 import { apiClient } from "../api/client";
+import type { GitRepository } from "../types/git-repository";
+import type { ToolType } from "../types/tool-type";
 import {
   getRepositoryStatus,
   listRepositories,
-  type GitRepository,
   type GitStatus,
 } from "../api/git_repositories";
 import { CommitPanel } from "../components/commit-panel";
@@ -16,7 +17,6 @@ import { GitToolbar } from "../components/git-toolbar";
 import { InstanceList } from "../components/instance-list";
 import { WorkspaceHeader } from "../components/workspace-header";
 import { listToolTypes } from "../api/tool_types";
-import type { ToolType } from "../api/tool_types";
 
 type WorkspaceStatus = "loading" | "ready" | "error" | "empty";
 

apps/web/src/pages/sessions.tsx

@@ -2,20 +2,22 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
 import { listProjects } from "../api/projects";
-import type { Project } from "../types";
-import { listRepositories, type GitRepository } from "../api/git_repositories";
+import { listRepositories } from "../api/git_repositories";
 import {
   getUserSessions,
-  type Session,
   deleteInstance,
   stopInstance,
   startInstance,
   checkInstanceHealth,
   recreateInstanceTunnel,
+  createInstance,
 } from "../api/sessions";
-import { listToolTypes, type ToolType } from "../api/tool_types";
-import { createInstance } from "../api/sessions";
+import { listToolTypes } from "../api/tool_types";
 import { getUserConfig, updateUserConfig } from "../api/settings";
+import type { Project } from "../types/project";
+import type { Session } from "../types/session";
+import type { GitRepository } from "../types/git-repository";
+import type { ToolType } from "../types/tool-type";
 import { Icon } from "../components/icon";
 
 type SessionsStatus = "loading" | "ready" | "error";

apps/web/src/pages/tool-configs.tsx

@@ -2,13 +2,14 @@ import { useCallback, useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
 import { Icon } from "../components/icon";
-import { listToolTypes, type ToolType } from "../api/tool_types";
+import type { ToolType } from "../types/tool-type";
+import type { ToolConfig } from "../types/tool-config";
+import { listToolTypes } from "../api/tool_types";
 import {
   createToolConfig,
   deleteToolConfig,
   listToolConfigs,
   updateToolConfig,
-  type ToolConfig,
 } from "../api/tool_configs";
 
 type ConfigStatus = "loading" | "ready" | "error";

apps/web/src/pages/tool-types.tsx

@@ -1,16 +1,14 @@
 import { useCallback, useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
+import type { ToolType, CreateToolTypeRequest, UpdateToolTypeRequest } from "../types/tool-type";
 import {
   createToolType,
   deleteToolType,
   listToolTypes,
   updateToolType,
-  type CreateToolTypeRequest,
-  type UpdateToolTypeRequest,
 } from "../api/tool_types";
 import { Icon } from "../components/icon";
-import type { ToolType } from "../api/tool_types";
 
 type ToolTypesStatus = "loading" | "ready" | "error";
 type DialogMode = "none" | "create" | "edit";

apps/web/src/state/sessions.tsx

@@ -1,18 +1,7 @@
 import { createContext, useCallback, useContext, useState, type ReactNode } from "react";
+import type { Session } from "../types/session";
 
-export interface Session {
-  id: string;
-  display_name: string;
-  tool_type_name: string;
-  tool_icon: string;
-  tool_type_interfaces: string[];
-  repository_name: string;
-  repository_id: string;
-  project_name: string;
-  project_id: string;
-  status: string;
-  url: string | null;
-}
+export type { Session } from "../types/session";
 
 interface SessionsContextType {
   sessions: Session[];

apps/web/src/types.ts

@@ -1,18 +1,5 @@
-export type SessionUser = {
-  id: string;
-  email: string;
-  name: string;
-  avatar_url: string | null;
-};
+// Legacy types file — being migrated to types/ directory.
+// This file will be removed once all consumers are updated.
 
-export type SessionPayload = {
-  user: SessionUser;
-};
-
-export type Project = {
-  id: string;
-  name: string;
-  description: string | null;
-  owner_id: string;
-  default_ssh_key_id: string | null;
-};
+export type { Project } from "./types/project";
+export type { SessionPayload, SessionUser } from "./types/user";

apps/web/src/types/api-response.ts

@@ -0,0 +1,10 @@
+export interface ApiResponse<T> {
+  data: T;
+}
+
+export interface PaginatedResponse<T> {
+  items: T[];
+  total: number;
+  page: number;
+  page_size: number;
+}

apps/web/src/types/config-folder.ts

@@ -0,0 +1,33 @@
+export interface ConfigFolder {
+  id: string;
+  user_id: string;
+  name: string;
+  description: string | null;
+  mount_path: string;
+  files: Record<string, string>;
+  project_overrides: Record<string, { mount_path?: string; files?: Record<string, string> }> | null;
+  is_active: boolean;
+  created_at: string;
+  updated_at: string;
+}
+
+export interface CreateConfigFolderRequest {
+  name: string;
+  description?: string;
+  mount_path: string;
+  files?: Record<string, string>;
+  is_active?: boolean;
+}
+
+export interface UpdateConfigFolderRequest {
+  name?: string;
+  description?: string;
+  mount_path?: string;
+  files?: Record<string, string>;
+  is_active?: boolean;
+}
+
+export interface ProjectOverrideRequest {
+  mount_path?: string;
+  files?: Record<string, string>;
+}

apps/web/src/types/git-repository.ts

@@ -0,0 +1,85 @@
+export interface GitRepository {
+  id: string;
+  name: string;
+  path: string;
+  project_id: string;
+  owner_id: string;
+  is_mirror: boolean;
+  remote_url: string | null;
+  last_push: string | null;
+  created_at: string | null;
+}
+
+export interface GitRepositoryCreate {
+  name: string;
+  remote_url?: string;
+  force_original_url?: boolean;
+}
+
+export interface URLParseResult {
+  original_url: string;
+  base_url: string | null;
+  is_valid_clone_url: boolean;
+  needs_parsing: boolean;
+  host: string | null;
+  message: string;
+  error_code: string | null;
+}
+
+export interface CommitHistoryEntry {
+  hash: string;
+  short_hash: string;
+  message: string;
+  author_name: string;
+  author_email: string;
+  author_date: string;
+  refs: string[];
+  graph_symbol: string;
+  graph_depth: number;
+}
+
+export interface CommitHistoryResponse {
+  commits: CommitHistoryEntry[];
+  branches: string[];
+  tags: string[];
+}
+
+export interface CommitDetail {
+  hash: string;
+  short_hash: string;
+  message: string;
+  author_name: string;
+  author_email: string;
+  author_date: string;
+  committer_name: string;
+  committer_email: string;
+  committer_date: string;
+  stats: {
+    additions: number;
+    deletions: number;
+    files_changed: number;
+  };
+  diff: string;
+  parents: string[];
+}
+
+export interface GitStatus {
+  branch: string;
+  modified: string[];
+  added: string[];
+  deleted: string[];
+  untracked: string[];
+  renamed: string[];
+  ahead: number;
+  behind: number;
+}
+
+export interface CommitResponse {
+  commit_hash: string;
+  message: string;
+}
+
+export interface MergeResponse {
+  commit_hash: string;
+  message: string;
+}

apps/web/src/types/index.ts

@@ -0,0 +1,24 @@
+export type { ApiResponse, PaginatedResponse } from "./api-response";
+export type { ConfigFolder, CreateConfigFolderRequest, UpdateConfigFolderRequest, ProjectOverrideRequest } from "./config-folder";
+export type {
+  CommitDetail,
+  CommitHistoryEntry,
+  CommitHistoryResponse,
+  CommitResponse,
+  GitRepository,
+  GitRepositoryCreate,
+  GitStatus,
+  MergeResponse,
+  URLParseResult,
+} from "./git-repository";
+export type { Project } from "./project";
+export type { Session } from "./session";
+export type { ToolConfig, CreateToolConfigRequest } from "./tool-config";
+export type { ToolInstance } from "./tool-instance";
+export type {
+  CreateToolTypeRequest,
+  ReadinessProbe,
+  ToolType,
+  UpdateToolTypeRequest,
+} from "./tool-type";
+export type { SessionPayload, SessionUser } from "./user";

apps/web/src/types/project.ts

@@ -0,0 +1,7 @@
+export type Project = {
+  id: string;
+  name: string;
+  description: string | null;
+  owner_id: string;
+  default_ssh_key_id: string | null;
+};

apps/web/src/types/session.ts

@@ -0,0 +1,13 @@
+export interface Session {
+  id: string;
+  display_name: string;
+  tool_type_name: string;
+  tool_icon: string;
+  tool_type_interfaces: string[];
+  repository_name: string;
+  repository_id: string;
+  project_name: string;
+  project_id: string;
+  status: string;
+  url: string | null;
+}

apps/web/src/types/tool-config.ts

@@ -0,0 +1,28 @@
+export interface ToolConfig {
+  id: string;
+  tool_type_id: string;
+  project_id: string | null;
+  key: string;
+  value: string;
+  config_type: string;
+  file_path: string | null;
+  port_override: number | null;
+  start_command: string | null;
+  working_directory: string | null;
+  environment_variables: Record<string, string> | null;
+  volumes: Array<{ source: string; target: string; type?: string }> | null;
+}
+
+export interface CreateToolConfigRequest {
+  tool_type_id: string;
+  project_id?: string;
+  key: string;
+  value: string;
+  config_type?: string;
+  file_path?: string;
+  port_override?: number;
+  start_command?: string;
+  working_directory?: string;
+  environment_variables?: Record<string, string>;
+  volumes?: Array<{ source: string; target: string; type?: string }>;
+}

apps/web/src/types/tool-instance.ts

@@ -0,0 +1,12 @@
+export interface ToolInstance {
+  id: string;
+  name: string;
+  display_name: string;
+  tool_type_id: string;
+  tool_type_name: string;
+  tool_type_interfaces: string[];
+  status: string;
+  url: string | null;
+  port: number | null;
+  created_at: string;
+}

apps/web/src/types/tool-type.ts

@@ -0,0 +1,54 @@
+export interface ReadinessProbe {
+  command: string;
+  timeout: number;
+  interval: number;
+}
+
+export interface ToolType {
+  id: string;
+  name: string;
+  display_name: string;
+  description: string | null;
+  category: string;
+  interfaces: string[];
+  default_port: number | null;
+  definition_type: "compose" | "dockerfile";
+  compose_template: string | null;
+  dockerfile_template: string | null;
+  build_context: Record<string, string> | null;
+  readiness_probe: ReadinessProbe | null;
+  required_variables: string[];
+  is_builtin: boolean;
+  created_by_id: string | null;
+  created_at: string;
+  updated_at: string;
+}
+
+export interface CreateToolTypeRequest {
+  name: string;
+  display_name: string;
+  description?: string;
+  category?: string;
+  interfaces?: string[];
+  default_port: number;
+  definition_type?: "compose" | "dockerfile";
+  compose_template?: string;
+  dockerfile_template?: string;
+  build_context?: Record<string, string>;
+  readiness_probe?: ReadinessProbe;
+  required_variables: string[];
+}
+
+export interface UpdateToolTypeRequest {
+  display_name?: string;
+  description?: string;
+  category?: string;
+  interfaces?: string[];
+  default_port?: number;
+  definition_type?: "compose" | "dockerfile";
+  compose_template?: string;
+  dockerfile_template?: string;
+  build_context?: Record<string, string>;
+  readiness_probe?: ReadinessProbe;
+  required_variables?: string[];
+}

apps/web/src/types/user.ts

@@ -0,0 +1,10 @@
+export type SessionUser = {
+  id: string;
+  email: string;
+  name: string;
+  avatar_url: string | null;
+};
+
+export type SessionPayload = {
+  user: SessionUser;
+};