refactor: reorganize models into subpackages

Move models into domain subpackages (max 4 files each):
- models/tool/ — tool_type, tool_instance, tool_definition_manifest
- models/config/ — config_profile
- models/user/ — user, user_config, ssh_key
- models/project/ — project, git_repository, workspace
- models/system/ — health_check, notification, instance_event, terminal_session

models/__init__.py continues to re-export all symbols, so consumers
using 'from src.models import X' are unaffected. Updated direct file
imports across the backend to use the new paths.

Quality gates: py_compile passed, ruff passed.

apps/api/.dockerignore

@@ -0,0 +1,42 @@
+# Python cache
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+
+# Virtual environments
+.venv/
+venv/
+env/
+
+# Test artifacts
+.pytest_cache/
+.coverage
+htmlcov/
+
+# IDE
+.idea/
+.vscode/
+*.swp
+*.swo
+
+# Git
+.git/
+.gitignore
+
+# Local env files
+.env
+.env.local
+
+# Alembic cache
+alembic/versions/__pycache__/
+
+# Pi lens cache
+.pi-lens/
+
+# Documentation
+docs/
+*.md
+
+# Scripts not needed in container
+scripts/

apps/api/alembic/versions/0013_add_config_profiles.py

@@ -0,0 +1,204 @@
+"""add config profiles, includes, mounts, and tool instance profile selection
+
+Revision ID: 0013_add_config_profiles
+Revises: 0012_default_port_req
+Create Date: 2026-05-24 12:00:00.000000
+
+"""
+from collections.abc import Sequence
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "0013_add_config_profiles"
+down_revision: str | None = "0012_default_port_req"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def _table_exists(table_name: str) -> bool:
+    return sa.inspect(op.get_bind()).has_table(table_name)
+
+
+def _column_exists(table_name: str, column_name: str) -> bool:
+    if not _table_exists(table_name):
+        return False
+    return column_name in {
+        column["name"] for column in sa.inspect(op.get_bind()).get_columns(table_name)
+    }
+
+
+def _index_exists(table_name: str, index_name: str) -> bool:
+    if not _table_exists(table_name):
+        return False
+    return index_name in {
+        index["name"] for index in sa.inspect(op.get_bind()).get_indexes(table_name)
+    }
+
+
+def _foreign_key_exists(
+    table_name: str,
+    constrained_columns: list[str],
+    referred_table: str,
+) -> bool:
+    if not _table_exists(table_name):
+        return False
+    for foreign_key in sa.inspect(op.get_bind()).get_foreign_keys(table_name):
+        if (
+            foreign_key.get("constrained_columns") == constrained_columns
+            and foreign_key.get("referred_table") == referred_table
+        ):
+            return True
+    return False
+
+
+def upgrade() -> None:
+    # Earlier branches may already have created config_profiles. Keep this
+    # migration defensive so databases can converge onto the current graph.
+    if not _table_exists("config_profiles"):
+        op.create_table(
+            "config_profiles",
+            sa.Column("id", postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column("user_id", postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column("name", sa.String(length=255), nullable=False),
+            sa.Column("description", sa.Text(), nullable=True),
+            sa.Column(
+                "created_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("NOW()"),
+                nullable=False,
+            ),
+            sa.Column(
+                "updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("NOW()"),
+                nullable=False,
+            ),
+            sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"),
+            sa.PrimaryKeyConstraint("id"),
+            sa.UniqueConstraint(
+                "user_id", "name", name="uq_config_profiles_user_name"
+            ),
+        )
+    if not _index_exists("config_profiles", "idx_config_profiles_user"):
+        op.create_index("idx_config_profiles_user", "config_profiles", ["user_id"])
+
+    if not _table_exists("config_includes"):
+        op.create_table(
+            "config_includes",
+            sa.Column("id", postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column("profile_id", postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column(
+                "included_profile_id", postgresql.UUID(as_uuid=True), nullable=False
+            ),
+            sa.Column("order_index", sa.Integer(), nullable=False, server_default="0"),
+            sa.Column(
+                "created_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("NOW()"),
+                nullable=False,
+            ),
+            sa.Column(
+                "updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("NOW()"),
+                nullable=False,
+            ),
+            sa.ForeignKeyConstraint(
+                ["profile_id"], ["config_profiles.id"], ondelete="CASCADE"
+            ),
+            sa.ForeignKeyConstraint(
+                ["included_profile_id"],
+                ["config_profiles.id"],
+                ondelete="CASCADE",
+            ),
+            sa.PrimaryKeyConstraint("id"),
+            sa.UniqueConstraint(
+                "profile_id", "included_profile_id", name="uq_config_includes_pair"
+            ),
+        )
+    if not _index_exists("config_includes", "idx_config_includes_profile"):
+        op.create_index("idx_config_includes_profile", "config_includes", ["profile_id"])
+    if not _index_exists("config_includes", "idx_config_includes_included"):
+        op.create_index(
+            "idx_config_includes_included", "config_includes", ["included_profile_id"]
+        )
+
+    if not _table_exists("config_mounts"):
+        op.create_table(
+            "config_mounts",
+            sa.Column("id", postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column("profile_id", postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column("mount_path", sa.String(length=1024), nullable=False),
+            sa.Column("content", sa.Text(), nullable=True),
+            sa.Column("source_profile_id", postgresql.UUID(as_uuid=True), nullable=True),
+            sa.Column("order_index", sa.Integer(), nullable=False, server_default="0"),
+            sa.Column(
+                "created_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("NOW()"),
+                nullable=False,
+            ),
+            sa.Column(
+                "updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("NOW()"),
+                nullable=False,
+            ),
+            sa.ForeignKeyConstraint(
+                ["profile_id"], ["config_profiles.id"], ondelete="CASCADE"
+            ),
+            sa.ForeignKeyConstraint(
+                ["source_profile_id"], ["config_profiles.id"], ondelete="SET NULL"
+            ),
+            sa.PrimaryKeyConstraint("id"),
+        )
+    if not _index_exists("config_mounts", "idx_config_mounts_profile"):
+        op.create_index("idx_config_mounts_profile", "config_mounts", ["profile_id"])
+
+    if not _column_exists("tool_instances", "selected_profile_id"):
+        op.add_column(
+            "tool_instances",
+            sa.Column("selected_profile_id", postgresql.UUID(as_uuid=True), nullable=True),
+        )
+    if not _foreign_key_exists(
+        "tool_instances", ["selected_profile_id"], "config_profiles"
+    ):
+        op.create_foreign_key(
+            "fk_tool_instances_selected_profile",
+            "tool_instances",
+            "config_profiles",
+            ["selected_profile_id"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+    if not _index_exists("tool_instances", "idx_tool_instances_selected_profile"):
+        op.create_index(
+            "idx_tool_instances_selected_profile",
+            "tool_instances",
+            ["selected_profile_id"],
+        )
+
+
+def downgrade() -> None:
+    # Remove selected_profile_id from tool_instances
+    op.drop_index("idx_tool_instances_selected_profile", table_name="tool_instances")
+    op.drop_constraint(
+        "fk_tool_instances_selected_profile", "tool_instances", type_="foreignkey"
+    )
+    op.drop_column("tool_instances", "selected_profile_id")
+
+    # Drop config_mounts
+    op.drop_index("idx_config_mounts_profile", table_name="config_mounts")
+    op.drop_table("config_mounts")
+
+    # Drop config_includes
+    op.drop_index("idx_config_includes_included", table_name="config_includes")
+    op.drop_index("idx_config_includes_profile", table_name="config_includes")
+    op.drop_table("config_includes")
+
+    # Drop config_profiles
+    op.drop_index("idx_config_profiles_user", table_name="config_profiles")
+    op.drop_table("config_profiles")

apps/api/alembic/versions/0014_add_profile_resolver_fields.py

@@ -0,0 +1,180 @@
+"""add profile resolver fields to config profiles and mounts
+
+Revision ID: 0014_add_profile_resolver_fields
+Revises: 0013_add_config_profiles
+Create Date: 2026-05-24 14:00:00.000000
+
+"""
+from collections.abc import Sequence
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "0014_add_profile_resolver_fields"
+down_revision: str | None = "0013_add_config_profiles"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def _table_exists(table_name: str) -> bool:
+    return sa.inspect(op.get_bind()).has_table(table_name)
+
+
+def _column_exists(table_name: str, column_name: str) -> bool:
+    if not _table_exists(table_name):
+        return False
+    return column_name in {
+        column["name"] for column in sa.inspect(op.get_bind()).get_columns(table_name)
+    }
+
+
+def _index_exists(table_name: str, index_name: str) -> bool:
+    if not _table_exists(table_name):
+        return False
+    return index_name in {
+        index["name"] for index in sa.inspect(op.get_bind()).get_indexes(table_name)
+    }
+
+
+def _foreign_key_exists(
+    table_name: str,
+    constrained_columns: list[str],
+    referred_table: str,
+) -> bool:
+    if not _table_exists(table_name):
+        return False
+    for foreign_key in sa.inspect(op.get_bind()).get_foreign_keys(table_name):
+        if (
+            foreign_key.get("constrained_columns") == constrained_columns
+            and foreign_key.get("referred_table") == referred_table
+        ):
+            return True
+    return False
+
+
+def _foreign_key_names_for_column(table_name: str, column_name: str) -> list[str]:
+    if not _table_exists(table_name):
+        return []
+    names: list[str] = []
+    for foreign_key in sa.inspect(op.get_bind()).get_foreign_keys(table_name):
+        if column_name in foreign_key.get("constrained_columns", []):
+            name = foreign_key.get("name")
+            if name:
+                names.append(name)
+    return names
+
+
+def upgrade() -> None:
+    if not _column_exists("config_profiles", "project_id"):
+        op.add_column(
+            "config_profiles",
+            sa.Column("project_id", postgresql.UUID(as_uuid=True), nullable=True),
+        )
+    if not _column_exists("config_profiles", "tool_type_id"):
+        op.add_column(
+            "config_profiles",
+            sa.Column("tool_type_id", postgresql.UUID(as_uuid=True), nullable=True),
+        )
+    if not _column_exists("config_profiles", "environment_variables"):
+        op.add_column(
+            "config_profiles",
+            sa.Column("environment_variables", sa.JSON(), nullable=True),
+        )
+    if not _column_exists("config_profiles", "start_command"):
+        op.add_column(
+            "config_profiles",
+            sa.Column("start_command", sa.Text(), nullable=True),
+        )
+    if not _column_exists("config_profiles", "working_directory"):
+        op.add_column(
+            "config_profiles",
+            sa.Column("working_directory", sa.Text(), nullable=True),
+        )
+    if not _column_exists("config_profiles", "port"):
+        op.add_column("config_profiles", sa.Column("port", sa.Integer(), nullable=True))
+    if not _column_exists("config_profiles", "is_default"):
+        op.add_column(
+            "config_profiles",
+            sa.Column("is_default", sa.Boolean(), nullable=False, server_default="false"),
+        )
+
+    if not _foreign_key_exists("config_profiles", ["project_id"], "projects"):
+        op.create_foreign_key(
+            "fk_config_profiles_project",
+            "config_profiles",
+            "projects",
+            ["project_id"],
+            ["id"],
+            ondelete="CASCADE",
+        )
+    if not _foreign_key_exists("config_profiles", ["tool_type_id"], "tool_types"):
+        op.create_foreign_key(
+            "fk_config_profiles_tool_type",
+            "config_profiles",
+            "tool_types",
+            ["tool_type_id"],
+            ["id"],
+            ondelete="CASCADE",
+        )
+
+    if not _index_exists("config_profiles", "idx_config_profiles_project"):
+        op.create_index("idx_config_profiles_project", "config_profiles", ["project_id"])
+    if not _index_exists("config_profiles", "idx_config_profiles_tool_type"):
+        op.create_index(
+            "idx_config_profiles_tool_type", "config_profiles", ["tool_type_id"]
+        )
+
+    if _column_exists("config_mounts", "mount_path") and not _column_exists(
+        "config_mounts", "target_path"
+    ):
+        op.alter_column("config_mounts", "mount_path", new_column_name="target_path")
+    if not _column_exists("config_mounts", "mode"):
+        op.add_column(
+            "config_mounts",
+            sa.Column("mode", sa.String(length=10), nullable=False, server_default="rw"),
+        )
+    if not _column_exists("config_mounts", "files"):
+        op.add_column(
+            "config_mounts",
+            sa.Column("files", sa.JSON(), nullable=True),
+        )
+    for constraint_name in _foreign_key_names_for_column(
+        "config_mounts", "source_profile_id"
+    ):
+        op.drop_constraint(constraint_name, "config_mounts", type_="foreignkey")
+    if _column_exists("config_mounts", "content"):
+        op.drop_column("config_mounts", "content")
+    if _column_exists("config_mounts", "source_profile_id"):
+        op.drop_column("config_mounts", "source_profile_id")
+
+
+def downgrade() -> None:
+    # Restore config_mounts
+    op.add_column(
+        "config_mounts",
+        sa.Column("source_profile_id", postgresql.UUID(as_uuid=True), nullable=True),
+    )
+    op.add_column(
+        "config_mounts",
+        sa.Column("content", sa.Text(), nullable=True),
+    )
+    op.drop_column("config_mounts", "files")
+    op.drop_column("config_mounts", "mode")
+    op.alter_column("config_mounts", "target_path", new_column_name="mount_path")
+
+    # Restore config_profiles
+    op.drop_index("idx_config_profiles_tool_type", table_name="config_profiles")
+    op.drop_index("idx_config_profiles_project", table_name="config_profiles")
+    op.drop_constraint(
+        "fk_config_profiles_tool_type", "config_profiles", type_="foreignkey"
+    )
+    op.drop_constraint("fk_config_profiles_project", "config_profiles", type_="foreignkey")
+    op.drop_column("config_profiles", "is_default")
+    op.drop_column("config_profiles", "port")
+    op.drop_column("config_profiles", "working_directory")
+    op.drop_column("config_profiles", "start_command")
+    op.drop_column("config_profiles", "environment_variables")
+    op.drop_column("config_profiles", "tool_type_id")
+    op.drop_column("config_profiles", "project_id")

apps/api/alembic/versions/86cec91fdb00_merge_profile_resolver_and_workspaces_.py

@@ -0,0 +1,20 @@
+"""merge profile resolver and workspaces heads
+
+Revision ID: 86cec91fdb00
+Revises: 0014_add_profile_resolver_fields, 2026_06_01_add_workspaces
+Create Date: 2026-06-03 12:48:36.145702
+"""
+
+# revision identifiers, used by Alembic.
+revision = "86cec91fdb00"
+down_revision = ("0014_add_profile_resolver_fields", "2026_06_01_add_workspaces")
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

apps/api/src/api/config/__init__.py

@@ -0,0 +1 @@
+"""Config module."""

apps/api/src/api/config_profiles.py

@@ -14,9 +14,10 @@ from sqlalchemy.orm import selectinload
 
 from src.api.shared_validators import validate_env_vars as _validate_env_vars
 from src.auth.dependencies import get_current_user_id, get_db_session
-from src.models.config_profile import ConfigProfile, ConfigProfileInclude
+from src.models import ConfigProfile, ConfigProfileInclude
 from src.models.project import Project
-from src.models.tool_type import ToolType
+from src.models import ToolType
+from src.models import UserConfig
 from src.services.config_profile_resolver import (
     ConfigProfileCycleError,
     check_include_cycle,
@@ -840,6 +841,105 @@ async def resolve_default_profile(
     return {"profile_id": str(first.id), "profile_name": first.name}
 
 
+# ---------------------------------------------------------------------------
+# Default profile management
+# ---------------------------------------------------------------------------
+
+
+class DefaultProfilesUpdate(BaseModel):
+    default_profiles: dict[str, str] = Field(
+        description="Mapping of tool_type_id -> profile_id for default profiles"
+    )
+
+
+async def _get_or_create_user_config(
+    session: AsyncSession,
+    user_id: uuid.UUID,
+) -> UserConfig:
+    """Get existing user config or create a new one."""
+    result = await session.execute(
+        select(UserConfig).where(UserConfig.user_id == user_id)
+    )
+    user_config = result.scalar_one_or_none()
+    if user_config is None:
+        user_config = UserConfig(user_id=user_id, config={})
+        session.add(user_config)
+    return user_config
+
+
+async def _validate_default_profiles(
+    session: AsyncSession,
+    user_id: uuid.UUID,
+    default_profiles: dict[str, str],
+) -> None:
+    """Validate that all profile IDs in default_profiles belong to the user."""
+    for tool_type_id, profile_id_str in default_profiles.items():
+        try:
+            profile_uuid = uuid.UUID(profile_id_str)
+        except ValueError:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=f"Invalid profile ID for tool type {tool_type_id}: {profile_id_str}",
+            )
+        profile = await session.get(ConfigProfile, profile_uuid)
+        if profile is None:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=f"Profile not found: {profile_id_str}",
+            )
+        if profile.user_id != user_id:
+            raise HTTPException(
+                status_code=status.HTTP_403_FORBIDDEN,
+                detail=f"Profile does not belong to user: {profile_id_str}",
+            )
+
+
+@router.get("/defaults")
+async def get_default_profiles_endpoint(
+    user_id: uuid.UUID = Depends(get_current_user_id),
+    session: AsyncSession = Depends(get_db_session),
+) -> dict:
+    """Get all default profile mappings for the current user."""
+    result = await session.execute(
+        select(UserConfig).where(UserConfig.user_id == user_id)
+    )
+    user_config = result.scalar_one_or_none()
+    return {"default_profiles": user_config.default_profiles if user_config else {}}
+
+
+@router.put("/defaults")
+async def set_default_profiles_endpoint(
+    data: DefaultProfilesUpdate,
+    user_id: uuid.UUID = Depends(get_current_user_id),
+    session: AsyncSession = Depends(get_db_session),
+) -> dict:
+    """Set default profile mappings for the current user."""
+    await _validate_default_profiles(session, user_id, data.default_profiles)
+    user_config = await _get_or_create_user_config(session, user_id)
+    user_config.config = {
+        **user_config.config,
+        "default_profiles": data.default_profiles,
+    }
+    await session.commit()
+    await session.refresh(user_config)
+    return {"default_profiles": user_config.default_profiles}
+
+
+@router.get("/defaults/{tool_type_id}")
+async def get_default_profile_for_tool_type_endpoint(
+    tool_type_id: str,
+    user_id: uuid.UUID = Depends(get_current_user_id),
+    session: AsyncSession = Depends(get_db_session),
+) -> dict:
+    """Get the default profile ID for a specific tool type."""
+    result = await session.execute(
+        select(UserConfig).where(UserConfig.user_id == user_id)
+    )
+    user_config = result.scalar_one_or_none()
+    profile_id = user_config.default_profiles.get(tool_type_id) if user_config else None
+    return {"tool_type_id": tool_type_id, "profile_id": profile_id}
+
+
 class ValidateGitUrlRequest(BaseModel):
     url: str = Field(description="Git remote URL to validate")
     ssh_key_id: str | None = Field(
@@ -891,7 +991,7 @@ async def validate_git_url(
     env = None
     key_path = None
     if data.ssh_key_id:
-        from src.models.ssh_key import SSHKey
+        from src.models import SSHKey
         from src.services.ssh_keys import _get_fernet
 
         try:

apps/api/src/api/dashboard.py

@@ -5,9 +5,9 @@ from sqlalchemy import func, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.auth.dependencies import get_current_user_id, get_db_session
-from src.models.git_repository import GitRepository
+from src.models import GitRepository
 from src.models.project import Project
-from src.models.ssh_key import SSHKey
+from src.models import SSHKey
 
 router = APIRouter(prefix="/dashboard", tags=["dashboard"])
 

apps/api/src/api/git_repositories.py

@@ -17,8 +17,8 @@ from src.auth.dependencies import (
     get_db_session,
 )
 from src.config import Settings
-from src.models.git_repository import GitRepository
+from src.models import GitRepository
-from src.models.ssh_key import SSHKey
+from src.models import SSHKey
 from src.utils.git_files import (
     commit_file,
     get_file_content,

apps/api/src/api/instance_proxy.py

@@ -8,8 +8,8 @@ from fastapi import APIRouter, Depends, HTTPException, Request, Response, status
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.auth.dependencies import get_current_user_id, get_db_session
-from src.models.tool_instance import ToolInstance
+from src.models import ToolInstance
-from src.models.tool_type import ToolType
+from src.models import ToolType
 
 logger = logging.getLogger(__name__)
 

apps/api/src/api/notifications.py

@@ -9,7 +9,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.auth.dependencies import get_current_user, get_db_session
 from src.models.user import User
-from src.models.user_config import UserConfig
+from src.models import UserConfig
 from src.services.notification_service import notification_service
 
 router = APIRouter(prefix="/notifications", tags=["notifications"])

apps/api/src/api/project/__init__.py

@@ -0,0 +1 @@
+"""Project module."""

apps/api/src/api/projects.py

@@ -13,10 +13,10 @@ from src.auth.dependencies import (
     get_current_user_id,
     get_db_session,
 )
-from src.models.git_repository import GitRepository
+from src.models import GitRepository
 from src.models.project import Project
-from src.models.ssh_key import SSHKey
+from src.models import SSHKey
-from src.models.tool_instance import ToolInstance
+from src.models import ToolInstance
 
 router = APIRouter(prefix="/projects", tags=["projects"])
 
@@ -101,7 +101,7 @@ async def list_projects(
     )
     projects = result.scalars().all()
 
-    from src.models.workspace import Workspace
+    from src.models import Workspace
 
     enriched = []
     for project in projects:

apps/api/src/api/ssh_keys.py

@@ -12,7 +12,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.auth.dependencies import _get_user, get_current_user_id, get_db_session
 from src.config import Settings
-from src.models.ssh_key import SSHKey
+from src.models import SSHKey
 
 router = APIRouter(prefix="/ssh-keys", tags=["ssh-keys"])
 

apps/api/src/api/system/__init__.py

@@ -0,0 +1 @@
+"""System module."""

apps/api/src/api/terminal.py

@@ -12,9 +12,9 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from starlette.websockets import WebSocketDisconnect
 
 from src.auth.dependencies import get_current_user_id, get_db_session
-from src.models.terminal_session import TerminalSessionModel
+from src.models import TerminalSessionModel
-from src.models.tool_instance import ToolInstance
+from src.models import ToolInstance
-from src.models.tool_type import ToolType
+from src.models import ToolType
 from src.services.terminal_manager import MaxSessionsExceededError, terminal_manager
 
 router = APIRouter()

apps/api/src/api/tool/__init__.py

@@ -0,0 +1 @@
+"""Tool module."""

apps/api/src/api/tool_definitions.py

@@ -9,8 +9,8 @@ from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.auth.dependencies import get_current_user_id, get_db_session
-from src.models.tool_definition_manifest import ToolDefinitionManifest
+from src.models import ToolDefinitionManifest
-from src.models.tool_type import ToolType
+from src.models import ToolType
 from src.services.manifest_compiler import (
     compile_compose,
     compile_dockerfile,

apps/api/src/api/tool_instances.py

@@ -30,12 +30,12 @@ from src.auth.dependencies import (
 )
 from src.services.event_bus import InstanceEventBus
 from src.services.lifecycle_hooks import publish_lifecycle_event
-from src.models.config_profile import ConfigProfile
+from src.models import ConfigProfile
-from src.models.git_repository import GitRepository
+from src.models import GitRepository
 from src.models.project import Project
-from src.models.ssh_key import SSHKey
+from src.models import SSHKey
-from src.models.tool_instance import ToolInstance
+from src.models import ToolInstance
-from src.models.tool_type import ToolType
+from src.models import ToolType
 from src.services.clone import check_dirty_state, clone_repository
 from src.services.config_profile_resolver import (
     ConfigProfileCycleError,
@@ -856,7 +856,7 @@ async def create_instance(
     workspace = None
     workspace_id = None
     if data.workspace_id:
-        from src.models.workspace import Workspace as WorkspaceModel
+        from src.models import Workspace as WorkspaceModel
 
         try:
             workspace_id = uuid.UUID(data.workspace_id)
@@ -893,9 +893,25 @@ async def create_instance(
 
         # Generate unique name
         instance_name = f"{tool_type.name}-{repo.name}-{uuid.uuid4().hex[:8]}"
-        instance_display = (
+
-            data.display_name or f"{tool_type.display_name} - {repo.name}"
+        # Auto-generate display name with numbering when duplicates exist
-        )
+        if data.display_name:
+            instance_display = data.display_name
+        else:
+            auto_name = f"{_project.name} / {repo.name} / {tool_type.display_name}"
+            result = await session.execute(
+                select(ToolInstance).where(
+                    ToolInstance.project_id == project_id,
+                    ToolInstance.repository_id == repo_id,
+                    ToolInstance.tool_type_id == tool_type_id,
+                    ToolInstance.owner_id == user_id,
+                )
+            )
+            existing_count = len(result.scalars().all())
+            if existing_count > 0:
+                instance_display = f"{auto_name} #{existing_count + 1}"
+            else:
+                instance_display = auto_name
 
         # Create instance directory
         instance_dir = ensure_instance_directory(instance_name)
@@ -1040,7 +1056,7 @@ services:
 
         elif tool_type.definition_type == "manifest":
             # Manifest-based: generate compose only; image built lazily on start
-            from src.models.tool_definition_manifest import ToolDefinitionManifest
+            from src.models import ToolDefinitionManifest
 
             manifest_def = await session.get(
                 ToolDefinitionManifest, tool_type.manifest_id
@@ -1325,7 +1341,7 @@ async def _prepare_manifest_instance(
     Returns:
         Tuple of (image_tag, compose_content, resolved_manifest, home_dir)
     """
-    from src.models.tool_definition_manifest import ToolDefinitionManifest
+    from src.models import ToolDefinitionManifest
 
     tool_type = await session.get(ToolType, instance.tool_type_id)
     manifest_def = await session.get(ToolDefinitionManifest, tool_type.manifest_id)
@@ -1521,7 +1537,7 @@ async def start_instance(
     container_uid = 0
     container_gid = 0
     if tool_type and tool_type.definition_type == "manifest" and tool_type.manifest_id:
-        from src.models.tool_definition_manifest import ToolDefinitionManifest
+        from src.models import ToolDefinitionManifest
 
         manifest_def = await session.get(ToolDefinitionManifest, tool_type.manifest_id)
         if manifest_def:
@@ -1708,7 +1724,7 @@ async def start_instance(
         # Determine repo path (workspace takes precedence)
         repo_path = ""
         if instance.workspace_id:
-            from src.models.workspace import Workspace as WorkspaceModel
+            from src.models import Workspace as WorkspaceModel
 
             workspace = await session.get(WorkspaceModel, instance.workspace_id)
             if workspace:
@@ -2751,7 +2767,7 @@ async def get_instance_events(
         List of event dictionaries.
     """
     from sqlalchemy import select
-    from src.models.instance_event import InstanceEvent
+    from src.models import InstanceEvent
 
     _user = await _get_user(session, user_id)
     _project = await _get_owned_project(project_id, user_id, session)

apps/api/src/api/tool_types.py

@@ -12,7 +12,7 @@ from src.api.tool_types_validation import (
     validate_required_variables,
 )
 from src.auth.dependencies import _get_user, get_current_user_id, get_db_session
-from src.models.tool_type import ToolType
+from src.models import ToolType
 from src.models.user import User
 
 router = APIRouter(prefix="/tool-types", tags=["tool-types"])

apps/api/src/api/user/__init__.py

@@ -0,0 +1 @@
+"""User module."""

apps/api/src/api/user_config.py

@@ -7,7 +7,7 @@ from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.auth.dependencies import _get_user, get_current_user_id, get_db_session
-from src.models.user_config import UserConfig
+from src.models import UserConfig
 
 logger = logging.getLogger(__name__)
 

apps/api/src/api/workspace/__init__.py

@@ -0,0 +1 @@
+"""Workspace module."""

apps/api/src/api/workspace_files.py

@@ -6,7 +6,7 @@ from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.auth.dependencies import get_current_user_id, get_db_session
-from src.models.workspace import Workspace
+from src.models import Workspace
 from src.services.file_service import FileService
 
 router = APIRouter(prefix="/workspaces/{workspace_id}/files")

apps/api/src/api/workspace_git.py

@@ -6,7 +6,7 @@ from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.auth.dependencies import get_current_user_id, get_db_session
-from src.models.workspace import Workspace
+from src.models import Workspace
 from src.services.git_operations import GitOperations
 
 router = APIRouter(prefix="/workspaces/{workspace_id}/git")

apps/api/src/api/workspace_instances.py

@@ -7,8 +7,8 @@ from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.auth.dependencies import get_current_user_id, get_db_session
-from src.models.tool_instance import ToolInstance
+from src.models import ToolInstance
-from src.models.workspace import Workspace
+from src.models import Workspace
 
 router = APIRouter(prefix="/workspaces/{workspace_id}/instances")
 

apps/api/src/api/workspaces.py

@@ -9,9 +9,9 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 
 from src.auth.dependencies import get_current_user_id, get_db_session
-from src.models.git_repository import GitRepository
+from src.models import GitRepository
-from src.models.tool_instance import ToolInstance
+from src.models import ToolInstance
-from src.models.workspace import Workspace
+from src.models import Workspace
 from src.services.workspace_manager import WorkspaceHasInstancesError, WorkspaceManager
 
 logger = logging.getLogger(__name__)

apps/api/src/main.py

@@ -29,14 +29,15 @@ from src.api.workspace_git import router as workspace_git_router
 from src.api.workspace_instances import router as workspace_instances_router
 from src.api.workspaces import all_workspaces_router, router as workspaces_router
 from src.config import Settings
-from src.models.notification import Notification  # noqa: F401 – Alembic model discovery
+from src.models import Notification  # noqa: F401 – Alembic model discovery
-from src.models.terminal_session import TerminalSessionModel  # noqa: F401 – Alembic model discovery
+from src.models import TerminalSessionModel  # noqa: F401 – Alembic model discovery
 from src.database import init_database
 from src.logging_config import (
     ExceptionLoggingMiddleware,
     RequestLoggingMiddleware,
     configure_logging,
 )
+from src.seeds.builtin_tool_types import seed_builtin_tool_types
 from src.services.correlation import CorrelationIdMiddleware
 from src.services.event_bus import InstanceEventBus
 from src.services.health_monitor import HealthMonitor
@@ -135,6 +136,10 @@ async def on_startup():
     _health_monitor.start()
     logger.info("Health monitor started")
 
+    # Seed built-in tool types
+    await seed_builtin_tool_types()
+    logger.info("Built-in tool types seeded")
+
     logger.info("Startup complete.")
 
 

apps/api/src/models/__init__.py

@@ -1,18 +1,18 @@
 from src.models.base import Base
-from src.models.config_profile import ConfigProfile, ConfigProfileInclude
+from src.models.config.config_profile import ConfigProfile, ConfigProfileInclude
-from src.models.git_repository import GitRepository
+from src.models.project.git_repository import GitRepository
-from src.models.health_check import HealthCheck
+from src.models.project.project import Project
-from src.models.instance_event import InstanceEvent
+from src.models.project.workspace import Workspace
-from src.models.notification import Notification
+from src.models.system.health_check import HealthCheck
-from src.models.project import Project
+from src.models.system.instance_event import InstanceEvent
-from src.models.ssh_key import SSHKey
+from src.models.system.notification import Notification
-from src.models.terminal_session import TerminalSessionModel
+from src.models.system.terminal_session import TerminalSessionModel
-from src.models.tool_definition_manifest import ToolDefinitionManifest
+from src.models.tool.tool_definition_manifest import ToolDefinitionManifest
-from src.models.tool_instance import ToolInstance
+from src.models.tool.tool_instance import ToolInstance
-from src.models.tool_type import ToolType
+from src.models.tool.tool_type import ToolType
-from src.models.user import User
+from src.models.user.ssh_key import SSHKey
-from src.models.user_config import UserConfig
+from src.models.user.user import User
-from src.models.workspace import Workspace
+from src.models.user.user_config import UserConfig
 
 __all__ = [
     "Base",

apps/api/src/models/config/__init__.py

@@ -0,0 +1,5 @@
+"""Config models module."""
+
+from src.models.config.config_profile import ConfigProfile, ConfigProfileInclude
+
+__all__ = ["ConfigProfile", "ConfigProfileInclude"]

apps/api/src/models/config/config_profile.py

@@ -1,7 +1,15 @@
 import uuid
 from typing import TYPE_CHECKING
 
-from sqlalchemy import ForeignKey, JSON, Integer, String, Text, Boolean
+from sqlalchemy import (
+    Boolean,
+    ForeignKey,
+    JSON,
+    Integer,
+    String,
+    Text,
+    UniqueConstraint,
+)
 from sqlalchemy import Uuid as UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -9,12 +17,15 @@ from src.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
 
 if TYPE_CHECKING:
     from src.models.project import Project
-    from src.models.tool_type import ToolType
+    from src.models import ToolType
     from src.models.user import User
 
 
 class ConfigProfile(UUIDPrimaryKeyMixin, TimestampMixin, Base):
     __tablename__ = "config_profiles"
+    __table_args__ = (
+        UniqueConstraint("user_id", "name", name="uq_config_profiles_user_name"),
+    )
 
     user_id: Mapped[uuid.UUID] = mapped_column(
         UUID(), ForeignKey("users.id", ondelete="CASCADE"), nullable=False

apps/api/src/models/project/__init__.py

@@ -0,0 +1,7 @@
+"""Project models module."""
+
+from src.models.project.git_repository import GitRepository
+from src.models.project.project import Project
+from src.models.project.workspace import Workspace
+
+__all__ = ["GitRepository", "Project", "Workspace"]

apps/api/src/models/project/git_repository.py

@@ -10,7 +10,7 @@ from src.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
 
 if TYPE_CHECKING:
     from src.models.project import Project
-    from src.models.ssh_key import SSHKey
+    from src.models import SSHKey
     from src.models.user import User
 
 

apps/api/src/models/project/project.py

@@ -8,8 +8,8 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship
 from src.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
 
 if TYPE_CHECKING:
-    from src.models.git_repository import GitRepository
+    from src.models import GitRepository
-    from src.models.ssh_key import SSHKey
+    from src.models import SSHKey
     from src.models.user import User
 
 

apps/api/src/models/project/workspace.py

@@ -12,7 +12,7 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship
 from src.models.base import Base, TimestampMixin
 
 if TYPE_CHECKING:
-    from src.models.git_repository import GitRepository
+    from src.models import GitRepository
     from src.models.user import User
 
 

apps/api/src/models/system/__init__.py

@@ -0,0 +1,8 @@
+"""System models module."""
+
+from src.models.system.health_check import HealthCheck
+from src.models.system.instance_event import InstanceEvent
+from src.models.system.notification import Notification
+from src.models.system.terminal_session import TerminalSessionModel
+
+__all__ = ["HealthCheck", "InstanceEvent", "Notification", "TerminalSessionModel"]

apps/api/src/models/tool/__init__.py

@@ -0,0 +1,7 @@
+"""Tool models module."""
+
+from src.models.tool.tool_definition_manifest import ToolDefinitionManifest
+from src.models.tool.tool_instance import ToolInstance
+from src.models.tool.tool_type import ToolType
+
+__all__ = ["ToolDefinitionManifest", "ToolInstance", "ToolType"]

apps/api/src/models/tool/tool_instance.py

@@ -9,12 +9,12 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship
 from src.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
 
 if TYPE_CHECKING:
-    from src.models.config_profile import ConfigProfile
+    from src.models import ConfigProfile
-    from src.models.git_repository import GitRepository
+    from src.models import GitRepository
     from src.models.project import Project
-    from src.models.tool_type import ToolType
+    from src.models import ToolType
     from src.models.user import User
-    from src.models.workspace import Workspace
+    from src.models import Workspace
 
 
 class ToolInstance(UUIDPrimaryKeyMixin, TimestampMixin, Base):

apps/api/src/models/tool/tool_type.py

@@ -6,8 +6,7 @@ from sqlalchemy import Uuid as UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
-
+from src.models.tool.tool_definition_manifest import ToolDefinitionManifest
-from src.models.tool_definition_manifest import ToolDefinitionManifest
 
 if TYPE_CHECKING:
     from src.models.user import User

apps/api/src/models/user/__init__.py

@@ -0,0 +1,7 @@
+"""User models module."""
+
+from src.models.user.ssh_key import SSHKey
+from src.models.user.user import User
+from src.models.user.user_config import UserConfig
+
+__all__ = ["SSHKey", "User", "UserConfig"]

apps/api/src/models/user/user.py

@@ -7,8 +7,8 @@ from src.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
 
 if TYPE_CHECKING:
     from src.models.project import Project
-    from src.models.ssh_key import SSHKey
+    from src.models import SSHKey
-    from src.models.user_config import UserConfig
+    from src.models import UserConfig
 
 
 class User(UUIDPrimaryKeyMixin, TimestampMixin, Base):

apps/api/src/models/user/user_config.py

@@ -0,0 +1,51 @@
+import uuid
+from typing import TYPE_CHECKING
+
+from sqlalchemy import ForeignKey, JSON
+from sqlalchemy import Uuid as UUID
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from src.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
+
+if TYPE_CHECKING:
+    from src.models.user import User
+
+
+class UserConfig(UUIDPrimaryKeyMixin, TimestampMixin, Base):
+    __tablename__ = "user_configs"
+
+    user_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(), ForeignKey("users.id"), nullable=False, unique=True
+    )
+    config: Mapped[dict[str, object]] = mapped_column(
+        JSON, default=dict, nullable=False
+    )
+
+    user: Mapped["User"] = relationship(back_populates="user_config")
+
+    @property
+    def default_profile_id(self) -> uuid.UUID | None:
+        """Return the legacy global default profile ID from config JSON."""
+        profile_id = self.config.get("default_profile_id")
+        if isinstance(profile_id, str):
+            return uuid.UUID(profile_id)
+        return None
+
+    @default_profile_id.setter
+    def default_profile_id(self, value: uuid.UUID | None) -> None:
+        if value is not None:
+            self.config["default_profile_id"] = str(value)
+        elif "default_profile_id" in self.config:
+            del self.config["default_profile_id"]
+
+    @property
+    def default_profiles(self) -> dict[str, str]:
+        """Return per-tool-type default profile IDs from config JSON."""
+        value = self.config.get("default_profiles", {})
+        if isinstance(value, dict):
+            return {str(k): str(v) for k, v in value.items()}
+        return {}
+
+    @default_profiles.setter
+    def default_profiles(self, value: dict[str, str]) -> None:
+        self.config["default_profiles"] = value

apps/api/src/models/user_config.py

@@ -1,20 +0,0 @@
-import uuid
-from typing import TYPE_CHECKING
-
-from sqlalchemy import ForeignKey
-from sqlalchemy import JSON, Uuid as UUID
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from src.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
-
-if TYPE_CHECKING:
-    from src.models.user import User
-
-
-class UserConfig(UUIDPrimaryKeyMixin, TimestampMixin, Base):
-    __tablename__ = "user_configs"
-
-    user_id: Mapped[uuid.UUID] = mapped_column(UUID(), ForeignKey("users.id"), nullable=False, unique=True)
-    config: Mapped[dict[str, object]] = mapped_column(JSON, default=dict, nullable=False)
-
-    user: Mapped["User"] = relationship(back_populates="user_config")

apps/api/src/schemas/config/__init__.py

@@ -0,0 +1 @@
+"""Config module."""

apps/api/src/schemas/project/__init__.py

@@ -0,0 +1 @@
+"""Project module."""

apps/api/src/schemas/system/__init__.py

@@ -0,0 +1 @@
+"""System module."""

apps/api/src/schemas/tool/__init__.py

@@ -0,0 +1 @@
+"""Tool module."""

apps/api/src/schemas/user/__init__.py

@@ -0,0 +1 @@
+"""User module."""

apps/api/src/seeds/__init__.py

@@ -0,0 +1 @@
+"""Database seeding utilities."""

apps/api/src/seeds/builtin_tool_types.py

@@ -0,0 +1,168 @@
+"""Seed built-in tool types into the database."""
+
+import logging
+
+from sqlalchemy import select, text
+
+from src.database import SessionLocal
+from src.models import ToolType
+
+logger = logging.getLogger(__name__)
+
+
+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():
+    """Create or update built-in tool types in the database.
+
+    Built-in tool types have no creator (created_by_id=None) and provide
+    out-of-the-box tools for users without requiring manual tool creation.
+    """
+    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",
+                "interface_type": "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",
+                "interface_type": "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",
+                "interface_type": "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"],
+                    interface_type=tool_data["interface_type"],
+                    definition_type="compose",
+                    compose_template=tool_data["compose_template"],
+                    required_variables=tool_data["required_variables"],
+                    default_port=tool_data.get("default_port", 0),
+                    created_by_id=None,
+                )
+                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.interface_type = tool_data["interface_type"]
+                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", 0)
+                logger.info("Updated built-in tool type: %s", tool_data["name"])
+
+        await session.commit()
+        logger.info("Built-in tool types seeded successfully.")

apps/api/src/services/config/__init__.py

@@ -0,0 +1 @@
+"""Config module."""

apps/api/src/services/config_profile_resolver.py

@@ -13,7 +13,7 @@ from typing import Any
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.models.config_profile import ConfigProfile, ConfigProfileInclude
+from src.models import ConfigProfile, ConfigProfileInclude
 
 logger = logging.getLogger(__name__)
 

apps/api/src/services/file_service.py

@@ -4,7 +4,7 @@ import logging
 import os
 from dataclasses import dataclass
 
-from src.models.workspace import Workspace
+from src.models import Workspace
 
 logger = logging.getLogger(__name__)
 

apps/api/src/services/git/__init__.py

@@ -0,0 +1 @@
+"""Git module."""

apps/api/src/services/git_operations.py

@@ -4,7 +4,7 @@ import asyncio
 import logging
 from dataclasses import dataclass
 
-from src.models.workspace import Workspace
+from src.models import Workspace
 
 logger = logging.getLogger(__name__)
 

apps/api/src/services/health_monitor.py

@@ -10,8 +10,8 @@ from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.database import SessionLocal
-from src.models.health_check import HealthCheck
+from src.models import HealthCheck
-from src.models.tool_instance import ToolInstance
+from src.models import ToolInstance
 from src.services.correlation import get_correlation_id
 from src.services.docker import get_container_status
 from src.services.tunnel import check_tunnel_health

apps/api/src/services/instance/__init__.py

@@ -0,0 +1 @@
+"""Instance module."""

apps/api/src/services/lifecycle_hooks.py

@@ -6,8 +6,8 @@ from datetime import datetime, timezone
 
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.models.instance_event import InstanceEvent
+from src.models import InstanceEvent
-from src.models.tool_instance import ToolInstance
+from src.models import ToolInstance
 from src.services.correlation import get_correlation_id
 from src.services.event_bus import InstanceEventBus, InstanceEventPayload
 from src.services.notification_service import notification_service

apps/api/src/services/notification_service.py

@@ -8,7 +8,7 @@ from sqlalchemy import func, select, update
 from sqlalchemy.engine import CursorResult
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.models.notification import Notification
+from src.models import Notification
 
 
 class NotificationService:

apps/api/src/services/shared/__init__.py

@@ -0,0 +1 @@
+"""Shared module."""

apps/api/src/services/terminal/__init__.py

@@ -0,0 +1 @@
+"""Terminal module."""

apps/api/src/services/terminal_manager.py

@@ -9,7 +9,7 @@ from fastapi import WebSocket
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 
 from src.database import SessionLocal
-from src.models.terminal_session import TerminalSessionModel
+from src.models import TerminalSessionModel
 from src.services.terminal_session import TerminalSession
 
 logger = logging.getLogger(__name__)

apps/api/src/services/tunnel.py

@@ -133,7 +133,9 @@ def start_tunnel(
     logger.debug("Tunnel container started: %s", container_id)
 
     # Wait for URL to appear in logs
-    url_pattern = re.compile(r"https://[a-z0-9-]+\.trycloudflare\.com")
+    # Exclude api.trycloudflare.com which is the Cloudflare API endpoint,
+    # not a tunnel URL. Real tunnel URLs have random subdomains (10+ chars).
+    url_pattern = re.compile(r"https://(?!api\.)[a-z0-9-]{10,}\.trycloudflare\.com")
     start_time = __import__("time").time()
     url: str | None = None
     combined_logs = ""

apps/api/src/services/workspace_manager.py

@@ -14,15 +14,15 @@ from typing import TYPE_CHECKING
 
 from sqlalchemy import select
 
-from src.models.workspace import Workspace
+from src.models import Workspace
 from src.services.git_service import GitService
 from src.services.ssh_keys import _get_fernet
 
 if TYPE_CHECKING:
     from sqlalchemy.ext.asyncio import AsyncSession
 
-    from src.models.git_repository import GitRepository
+    from src.models import GitRepository
-    from src.models.tool_instance import ToolInstance
+    from src.models import ToolInstance
 
 logger = logging.getLogger(__name__)
 
@@ -96,7 +96,7 @@ class WorkspaceManager:
         # Load SSH key if repo has one
         ssh_key = None
         if getattr(repo, "ssh_key_id", None) and session is not None:
-            from src.models.ssh_key import SSHKey
+            from src.models import SSHKey
 
             result = await session.execute(
                 select(SSHKey).where(SSHKey.id == repo.ssh_key_id)
@@ -181,8 +181,8 @@ class WorkspaceManager:
         # Load SSH key if repo has one
         ssh_key = None
         if session is not None:
-            from src.models.git_repository import GitRepository
+            from src.models import GitRepository
-            from src.models.ssh_key import SSHKey
+            from src.models import SSHKey
 
             repo = await session.get(GitRepository, workspace.repo_id)
             if repo and getattr(repo, "ssh_key_id", None):
@@ -241,7 +241,7 @@ class WorkspaceManager:
         session: AsyncSession,
     ) -> list[ToolInstance]:
         """Get all tool instances associated with this workspace."""
-        from src.models.tool_instance import ToolInstance
+        from src.models import ToolInstance
 
         result = await session.execute(
             select(ToolInstance).where(ToolInstance.workspace_id == workspace.id)

docker-compose.yml

@@ -64,6 +64,7 @@ services:
       - /data/repos:/data/repos
       - /data/working-copies:/data/working-copies
       - /data/instances:/data/instances
+      - ./apps/api/src:/app/src:ro
     ports:
       - "8000:8000"
     depends_on:

openspec/changes/backend-frontend-refactoring/.openspec.yaml

@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-06-03

openspec/changes/backend-frontend-refactoring/design.md

@@ -0,0 +1,319 @@
+## Context
+
+Current `dev` has all behavioral features from the overwritten `main` merge, but the code structure is pre-refactor:
+- Monolithic `api/tool_instances.py` (~3000 lines)
+- Monolithic `api/config_profiles.py` (~1000 lines)
+- Monolithic `services/docker.py`
+- No `schemas/` directory
+- Flat frontend component structure with inconsistent naming
+
+The `b6f89f9` merge from `main` had a clean refactoring that we need to redo, but adapted to our current reality.
+
+## Goals / Non-Goals
+
+**Goals:**
+- Extract Pydantic schemas from API routers into `src/schemas/`
+- Split `services/docker.py` into `services/docker/` package
+- Extract instance lifecycle logic from `api/tool_instances.py` into `services/instance_lifecycle.py`
+- Extract config profile business logic from `api/config_profiles.py` into `services/config_profiles.py`
+- Add `get_current_user` auth dependency and migrate routers that need the full user object
+- Reorganize frontend components into `features/` directories
+- Standardize frontend API file naming to kebab-case
+- Standardize frontend page naming to `*Page.tsx`
+
+**Non-Goals:**
+- Changing any API request/response shapes
+- Changing any database schemas
+- Adding new features
+- Modifying frontend component behavior or styling
+- Converting `ConfigProfile` mounts from JSON to relation tables (out of scope — would require migration)
+
+## Decisions
+
+### 0. Submodule Rule: Max 5–10 Files Per Directory
+**Decision:** Every directory that functions as a Python module must contain at most 5–10 `.py` files. When a module grows beyond this, split it into a package with submodules.
+**Rationale:** Prevents monolithic directories, makes navigation predictable, and keeps cognitive load bounded.
+
+### 1. Schema Extraction: Domain Subpackages
+**Decision:** Extract Pydantic models into `schemas/` subpackages by domain:
+- `schemas/tool/` — tool_type.py, tool_instance.py
+- `schemas/config/` — config_profile.py
+- `schemas/user/` — user.py, user_config.py
+- `schemas/project/` — project.py, git_repository.py, ssh_key.py
+- `schemas/system/` — health.py
+**Rationale:** Keeps schemas close to their domain. Each subpackage has ≤5 files.
+
+### 2. API Router Subpackages
+**Decision:** Split `api/` into domain subpackages:
+- `api/tool/` — tool_instances.py, tool_types.py, tool_definitions.py, tool_types_validation.py, sessions.py
+- `api/config/` — config_profiles.py, user_config.py
+- `api/workspace/` — workspaces.py, workspace_files.py, workspace_git.py, workspace_instances.py
+- `api/user/` — users.py, auth.py, ssh_keys.py
+- `api/project/` — projects.py, git_repositories.py
+- `api/system/` — health.py, events.py, notifications.py, dashboard.py, terminal.py, instance_proxy.py
+**Rationale:** `api/` currently has ~22 files. Splitting into 6 subpackages keeps each at 2–6 files.
+
+### 3. Service Subpackages
+**Decision:** Split `services/` into subpackages:
+- `services/docker/` — compose.py, container.py, config_staging.py, tunnel.py, __init__.py
+- `services/instance/` — instance_lifecycle.py, lifecycle_hooks.py, health_monitor.py, event_bus.py
+- `services/config/` — config_profile_resolver.py, config_profiles.py
+- `services/git/` — clone.py, git_operations.py, git_service.py
+- `services/build/` — docker_build.py, manifest_compiler.py
+- `services/terminal/` — terminal_manager.py, terminal_session.py
+- `services/shared/` — tunnel.py, notification_service.py, file_service.py, permission_fixer.py, readiness_probe.py, ssh_keys.py, workspace_manager.py, correlation.py
+**Rationale:** `services/` currently has ~20 files. Subpackages keep each at ≤8 files.
+
+### 4. Model Subpackages
+**Decision:** Split `models/` into subpackages:
+- `models/tool/` — tool_type.py, tool_instance.py, tool_definition_manifest.py
+- `models/config/` — config_profile.py, config_include.py, config_mount.py
+- `models/user/` — user.py, user_config.py, ssh_key.py
+- `models/project/` — project.py, git_repository.py, workspace.py
+- `models/system/` — health_check.py, notification.py, instance_event.py, terminal_session.py
+- `models/base.py` stays at root
+**Rationale:** `models/` currently has ~15 files. Subpackages keep each at ≤4 files.
+
+### 5. Docker Service Split: Functional Boundaries
+**Decision:** Split by responsibility:
+- `compose.py` — compose file generation, modification, port injection, network injection
+- `container.py` — container status, IP lookup, network connect, logs
+- `config_staging.py` — staging config files into instance directories
+- `tunnel.py` — extracting tunnel URLs from cloudflared output
+**Rationale:** Each module has a single reason to change. `docker.py` mixed compose logic with container runtime queries.
+
+### 6. Instance Lifecycle: Service Receives Raw Params, Not Request Objects
+**Decision:** Service functions receive model instances and primitive parameters, not FastAPI request objects.
+**Example:** `create_instance(session, user, project, repo, tool_type, data: CreateInstanceRequest)` → service extracts fields.
+**Rationale:** Keeps service layer independent of HTTP framework. Easier to test.
+
+### 7. Auth Pattern: Gradual Migration, Not Big Bang
+**Decision:** Add `get_current_user` alongside existing `get_current_user_id`. Migrate routers incrementally.
+**Rationale:** Reduces risk. Endpoints that only need the ID can keep the old pattern.
+
+### 8. Frontend Naming: Align with `b6f89f9` Conventions
+**Decision:** Use kebab-case for API files, PascalCase for page files with `Page` suffix, `features/` for component directories.
+**Rationale:** Matches the `b6f89f9` structure that was already reviewed and accepted.
+
+## Module Map
+
+### Backend — Before
+```
+api/                        (~22 .py files)
+  tool_instances.py         (~3000 lines) — HTTP + Docker + Git + Lifecycle
+  config_profiles.py        (~1000 lines) — HTTP + Validation + Defaults
+  tool_types.py             (~500 lines)  — HTTP + Schemas
+  health.py                 (~150 lines)  — HTTP + Schemas
+  users.py                  (~100 lines)  — HTTP + Schemas
+  ...
+services/                   (~20 .py files)
+  docker.py                 (~600 lines)  — Compose + Container + Tunnel
+models/                     (~15 .py files)
+  config_profile.py
+  tool_instance.py
+  ...
+```
+
+### Backend — After
+```
+schemas/                    (5 subpackages, ≤5 files each)
+  tool/
+    __init__.py
+    tool_type.py
+    tool_instance.py
+  config/
+    __init__.py
+    config_profile.py
+  user/
+    __init__.py
+    user.py
+    user_config.py
+  project/
+    __init__.py
+    project.py
+    git_repository.py
+    ssh_key.py
+  system/
+    __init__.py
+    health.py
+
+api/                        (6 subpackages, 2–6 files each)
+  tool/
+    __init__.py
+    tool_instances.py       (~300 lines)  — HTTP routing only
+    tool_types.py           (~250 lines)  — HTTP + validation
+    tool_definitions.py
+    tool_types_validation.py
+    sessions.py
+  config/
+    __init__.py
+    config_profiles.py      (~200 lines)  — HTTP routing only
+    user_config.py
+  workspace/
+    __init__.py
+    workspaces.py
+    workspace_files.py
+    workspace_git.py
+    workspace_instances.py
+  user/
+    __init__.py
+    users.py                (~60 lines)   — HTTP only
+    auth.py
+    ssh_keys.py
+  project/
+    __init__.py
+    projects.py
+    git_repositories.py
+  system/
+    __init__.py
+    health.py               (~80 lines)   — HTTP only
+    events.py
+    notifications.py
+    dashboard.py
+    terminal.py
+    instance_proxy.py
+
+services/                   (7 subpackages, ≤8 files each)
+  docker/
+    __init__.py             (~40 lines)   — Re-exports
+    compose.py              (~240 lines)  — Compose generation
+    container.py            (~120 lines)  — Container queries
+    config_staging.py       (~80 lines)   — File staging
+    tunnel.py               (~150 lines)  — Tunnel URL extraction
+  instance/
+    __init__.py
+    instance_lifecycle.py   (~420 lines)  — Create/Start/Stop/Restart/Delete
+    lifecycle_hooks.py
+    health_monitor.py
+    event_bus.py
+  config/
+    __init__.py
+    config_profile_resolver.py
+    config_profiles.py      (~300 lines)  — CRUD + Defaults
+  git/
+    __init__.py
+    clone.py
+    git_operations.py
+    git_service.py
+  build/
+    __init__.py
+    docker_build.py
+    manifest_compiler.py
+  terminal/
+    __init__.py
+    terminal_manager.py
+    terminal_session.py
+  shared/
+    __init__.py
+    tunnel.py
+    notification_service.py
+    file_service.py
+    permission_fixer.py
+    readiness_probe.py
+    ssh_keys.py
+    workspace_manager.py
+    correlation.py
+
+models/                     (5 subpackages + base.py)
+  tool/
+    __init__.py
+    tool_type.py
+    tool_instance.py
+    tool_definition_manifest.py
+  config/
+    __init__.py
+    config_profile.py
+    config_include.py
+    config_mount.py
+  user/
+    __init__.py
+    user.py
+    user_config.py
+    ssh_key.py
+  project/
+    __init__.py
+    project.py
+    git_repository.py
+    workspace.py
+  system/
+    __init__.py
+    health_check.py
+    notification.py
+    instance_event.py
+    terminal_session.py
+  base.py                   (stays at root)
+```
+
+### Frontend — Before
+```
+src/
+  api/
+    tool_types.ts
+    ssh_keys.ts
+    git_repositories.ts
+    sessions.ts
+  components/
+    git-toolbar.tsx
+    file-editor.tsx
+    commit-dialog.tsx
+    ...
+  pages/
+    dashboard.tsx
+    projects.tsx
+    sessions.tsx
+    ...
+```
+
+### Frontend — After
+```
+src/
+  api/
+    tool-types.ts
+    ssh-keys.ts
+    git-repositories.ts
+    sessions.ts
+  components/
+    features/
+      git/
+        GitToolbar.tsx
+        FileBrowser.tsx
+        FileEditor.tsx
+        CommitDialog.tsx
+        MergeDialog.tsx
+        WorkspaceSidebar.tsx
+      dashboard/
+        DashboardSummary.tsx
+        ActiveSessionsList.tsx
+        ProjectsSection.tsx
+        QuickCreateForm.tsx
+        RecentSessionsSection.tsx
+      project/
+        RepositoriesSettingsTab.tsx
+      tool-workshop/
+        ToolTypesTab.tsx
+    ProtectedRoute.tsx
+    AppShell.tsx
+  pages/
+    DashboardPage.tsx
+    ProjectsPage.tsx
+    SessionsPage.tsx
+    ...
+```
+
+## Risks / Trade-offs
+
+**[Risk] Import cycles during extraction** → **Mitigation:** Extract schemas first (no service dependencies), then services, then thin routers last. Use TYPE_CHECKING guards.
+
+**[Risk] Merge conflicts with in-flight features** → **Mitigation:** Coordinate timing. This refactor should be the only large change on `dev` while it's in progress. Freeze other backend work.
+
+**[Risk] Frontend renaming breaks imports** → **Mitigation:** Use `git mv` for renames so git tracks history. Update all imports in a single commit.
+
+**[Risk] Missing re-export in docker/__init__.py breaks consumers** → **Mitigation:** After splitting, run a full import test across all backend files. Add any missing re-exports.
+
+## Migration Plan
+
+1. **Phase 1: Schemas** — Extract all Pydantic models into `schemas/`. Update imports in API routers. No logic changes.
+2. **Phase 2: Services** — Split `docker.py`, extract `instance_lifecycle.py`, extract `config_profiles.py`. Update imports.
+3. **Phase 3: Auth** — Add `get_current_user`, migrate routers that need the full user object.
+4. **Phase 4: Frontend** — Rename files, move components, update imports.
+5. **Phase 5: Verification** — Run full test suite, typecheck, build.

openspec/changes/backend-frontend-refactoring/proposal.md

@@ -0,0 +1,52 @@
+## Why
+
+The `main` branch was previously merged into `dev` (commit `b6f89f9`) bringing a large structural refactoring: schema extraction, service splitting, auth dependency pattern changes, and frontend reorganization. This merge was later overwritten when `dev` was reset to a pre-merge clean state (`51a399c`).
+
+We have since forward-ported all behavioral features (built-in tool type seeding, config profile defaults, unique constraints, SSH key mounting, terminal backend, etc.) onto the clean `dev` base. **The codebase now works functionally but lacks the structural cleanliness of the refactoring.**
+
+Monolithic files make the backend harder to navigate, test, and maintain:
+- `api/tool_instances.py` is ~3000 lines (mixing HTTP handling with Docker orchestration)
+- `api/config_profiles.py` is ~1000 lines (mixing HTTP handling with business logic)
+- `services/docker.py` is a monolith of ~600 lines covering compose, container, and tunnel logic
+- Frontend API files use inconsistent naming (`tool_types.ts` vs `tool-types.ts`)
+- Frontend components are flat in `components/` instead of organized by feature domain
+
+## What Changes
+
+Redo the structural refactoring from `b6f89f9`, **adapted to current dev reality**:
+
+1. **Backend schema extraction** — Extract Pydantic request/response schemas from API routers into `apps/api/src/schemas/`
+2. **Backend service splits** — Split `services/docker.py` into `services/docker/` package; extract `services/instance_lifecycle.py` and `services/config_profiles.py`
+3. **Auth dependency refactor** — Change from `get_current_user_id` + manual `_get_user` calls to `get_current_user` dependency returning `User` directly
+4. **Frontend reorganization** — Move components into `features/` directories; rename API files to kebab-case
+
+**No behavioral changes.** This is a pure structural refactor. All existing endpoints, models, and UI flows remain identical.
+
+## Capabilities
+
+### New Capabilities
+- None (pure refactor)
+
+### Modified Capabilities
+- `backend-structure`: Cleaner module boundaries, smaller files, separated concerns
+- `frontend-structure`: Feature-organized components, consistent file naming
+
+## Impact
+
+- **Backend**: `apps/api/src/schemas/*` (new), `apps/api/src/services/docker/*` (new package), `apps/api/src/services/instance_lifecycle.py` (new), `apps/api/src/services/config_profiles.py` (new)
+- **Backend**: `apps/api/src/api/*.py` (reduced in size, imports change)
+- **Backend**: `apps/api/src/auth/dependencies.py` (new `get_current_user`)
+- **Frontend**: `apps/web/src/components/features/*` (new directories), `apps/web/src/api/*` (renamed to kebab-case)
+- **Frontend**: `apps/web/src/pages/*` (renamed to `*Page.tsx`)
+
+## Exclusions (Already Done)
+
+The following behavioral features from `b6f89f9` are **already present** in current `dev` and out of scope for this refactor:
+- Built-in tool type seeding (`src/seeds/builtin_tool_types.py`)
+- Config profile default management (endpoints + `UserConfig` properties)
+- Config profile unique constraint (`uq_config_profiles_user_name`)
+- SSH key mounting in instance lifecycle
+- Terminal backend (WebSocket, session management)
+- Tunnel URL regex fix
+- Session auto-numbering
+- Config profile resolver (`services/config_profile_resolver.py`)

openspec/changes/backend-frontend-refactoring/spec.md

@@ -0,0 +1,75 @@
+## Scope
+
+This change is a **pure structural refactoring** of the backend and frontend codebase. No API contracts, database schemas, or user-facing behaviors change.
+
+### In Scope
+
+1. **Schema extraction** (`apps/api/src/schemas/`)
+   - Extract Pydantic models from API routers into dedicated schema modules
+   - Schemas to extract: `tool_type`, `tool_instance`, `config_profile`, `user`, `user_config`, `project`, `ssh_key`, `git_repository`, `health`
+   - Each API router imports schemas from `src.schemas.*` instead of defining inline
+
+2. **Docker service package** (`apps/api/src/services/docker/`)
+   - Split `services/docker.py` monolith into focused modules:
+     - `docker/compose.py` — compose file generation, modification, validation
+     - `docker/container.py` — container lifecycle (status, IP, network, logs)
+     - `docker/config_staging.py` — config file staging for instances
+     - `docker/tunnel.py` — tunnel URL extraction (moved from `services/tunnel.py`)
+     - `docker/__init__.py` — re-exports for backward compatibility
+   - Update all imports across the backend
+
+3. **Instance lifecycle extraction** (`apps/api/src/services/instance_lifecycle.py`)
+   - Extract instance creation, start, stop, restart, and deletion logic from `api/tool_instances.py`
+   - The API router becomes thin: validates auth, calls service, returns response
+   - Service functions are async and receive `AsyncSession`, models, and raw parameters
+
+4. **Config profile service extraction** (`apps/api/src/services/config_profiles.py`)
+   - Extract business logic from `api/config_profiles.py`: CRUD helpers, validation, default profile management
+   - API router delegates to service functions
+
+5. **Auth dependency refactor** (`apps/api/src/auth/dependencies.py`)
+   - Add `get_current_user` dependency that returns a `User` model directly
+   - Update API routers to use `user: User = Depends(get_current_user)` where the full user object is needed
+   - Keep `get_current_user_id` for endpoints that only need the ID
+
+6. **Frontend reorganization**
+   - Move components into `features/` directories by domain:
+     - `features/git/` — CommitDialog, FileBrowser, FileEditor, GitToolbar, MergeDialog, WorkspaceSidebar
+     - `features/dashboard/` — ActiveSessionsList, DashboardSummary, ProjectsSection, QuickCreateForm, RecentSessionsSection
+     - `features/project/` — RepositoriesSettingsTab
+     - `features/tool-workshop/` — ToolTypesTab (already exists)
+   - Rename API files from snake_case to kebab-case:
+     - `tool_types.ts` → `tool-types.ts`
+     - `ssh_keys.ts` → `ssh-keys.ts`
+     - `git_repositories.ts` → `git-repositories.ts`
+   - Rename page files to `*Page.tsx`:
+     - `dashboard.tsx` → `DashboardPage.tsx`
+     - `projects.tsx` → `ProjectsPage.tsx`
+     - etc.
+
+### Out of Scope
+
+- Any new features or behavioral changes
+- Database schema changes (no migrations)
+- API contract changes (same endpoints, same request/response shapes)
+- Frontend UI behavior changes (same components, same interactions)
+- Removing or modifying the `ConfigProfileInclude` model (already exists as a relation)
+- Extracting `ConfigMount` into a separate model (current dev uses JSON arrays; this is a schema decision, not a refactor)
+- Changes to `tool_definition_manifest` or `workspace` models
+
+## Acceptance Criteria
+
+1. All existing tests pass without modification (behavior unchanged)
+2. All existing API endpoints return identical responses for identical requests
+3. All frontend pages render identically
+4. `docker compose up` starts successfully
+5. Backend `ruff check` passes
+6. Frontend `npm run typecheck` passes
+7. Frontend `npm run build` passes
+8. File sizes are reduced: no API router > 500 lines, no service > 400 lines
+
+## Preconditions
+
+- Current `dev` branch is stable and all behavioral forward-ports are complete
+- All legacy `ToolConfig`/`ConfigFolder` code has been removed
+- Database migrations are at a single head

openspec/changes/backend-frontend-refactoring/tasks.md

@@ -0,0 +1,158 @@
+## Phase 0: Submodule Infrastructure (Create Directories + __init__.py Files)
+
+- [ ] 0.1 Create `apps/api/src/schemas/tool/__init__.py`
+- [ ] 0.2 Create `apps/api/src/schemas/config/__init__.py`
+- [ ] 0.3 Create `apps/api/src/schemas/user/__init__.py`
+- [ ] 0.4 Create `apps/api/src/schemas/project/__init__.py`
+- [ ] 0.5 Create `apps/api/src/schemas/system/__init__.py`
+- [ ] 0.6 Create `apps/api/src/api/tool/__init__.py`
+- [ ] 0.7 Create `apps/api/src/api/config/__init__.py`
+- [ ] 0.8 Create `apps/api/src/api/workspace/__init__.py`
+- [ ] 0.9 Create `apps/api/src/api/user/__init__.py`
+- [ ] 0.10 Create `apps/api/src/api/project/__init__.py`
+- [ ] 0.11 Create `apps/api/src/api/system/__init__.py`
+- [ ] 0.12 Create `apps/api/src/services/instance/__init__.py`
+- [ ] 0.13 Create `apps/api/src/services/config/__init__.py`
+- [ ] 0.14 Create `apps/api/src/services/git/__init__.py`
+- [ ] 0.15 Create `apps/api/src/services/build/__init__.py`
+- [ ] 0.16 Create `apps/api/src/services/terminal/__init__.py`
+- [ ] 0.17 Create `apps/api/src/services/shared/__init__.py`
+- [ ] 0.18 Create `apps/api/src/models/tool/__init__.py`
+- [ ] 0.19 Create `apps/api/src/models/config/__init__.py`
+- [ ] 0.20 Create `apps/api/src/models/user/__init__.py`
+- [ ] 0.21 Create `apps/api/src/models/project/__init__.py`
+- [ ] 0.22 Create `apps/api/src/models/system/__init__.py`
+
+## Phase 1: Model Subpackages
+
+- [ ] 1.1 Move `models/tool_type.py` → `models/tool/tool_type.py`
+- [ ] 1.2 Move `models/tool_instance.py` → `models/tool/tool_instance.py`
+- [ ] 1.3 Move `models/tool_definition_manifest.py` → `models/tool/tool_definition_manifest.py`
+- [ ] 1.4 Move `models/config_profile.py` → `models/config/config_profile.py`
+- [ ] 1.5 Move `models/config_include.py` (if exists) → `models/config/config_include.py`
+- [ ] 1.6 Move `models/config_mount.py` (if exists) → `models/config/config_mount.py`
+- [ ] 1.7 Move `models/user.py` → `models/user/user.py`
+- [ ] 1.8 Move `models/user_config.py` → `models/user/user_config.py`
+- [ ] 1.9 Move `models/ssh_key.py` → `models/user/ssh_key.py`
+- [ ] 1.10 Move `models/project.py` → `models/project/project.py`
+- [ ] 1.11 Move `models/git_repository.py` → `models/project/git_repository.py`
+- [ ] 1.12 Move `models/workspace.py` → `models/project/workspace.py`
+- [ ] 1.13 Move `models/health_check.py` → `models/system/health_check.py`
+- [ ] 1.14 Move `models/notification.py` → `models/system/notification.py`
+- [ ] 1.15 Move `models/instance_event.py` → `models/system/instance_event.py`
+- [ ] 1.16 Move `models/terminal_session.py` → `models/system/terminal_session.py`
+- [ ] 1.17 Update `models/__init__.py` to import from subpackages
+- [ ] 1.18 Update all backend imports to use `models.tool.tool_type` etc.
+- [ ] 1.19 Verify `py_compile` and `ruff` pass
+
+## Phase 2: Schema Extraction + Subpackages
+
+- [ ] 2.1 Extract `schemas/tool/tool_type.py` from `api/tool_types.py`
+- [ ] 2.2 Extract `schemas/tool/tool_instance.py` from `api/tool_instances.py`
+- [ ] 2.3 Extract `schemas/config/config_profile.py` from `api/config_profiles.py`
+- [ ] 2.4 Extract `schemas/system/health.py` from `api/health.py`
+- [ ] 2.5 Extract `schemas/user/user.py` from `api/users.py`
+- [ ] 2.6 Extract `schemas/user/user_config.py` from `api/user_config.py`
+- [ ] 2.7 Extract `schemas/project/project.py` from `api/projects.py`
+- [ ] 2.8 Extract `schemas/project/ssh_key.py` from `api/ssh_keys.py`
+- [ ] 2.9 Extract `schemas/project/git_repository.py` from `api/git_repositories.py`
+- [ ] 2.10 Update all API routers to import schemas from `src.schemas.*`
+- [ ] 2.11 Verify `py_compile` and `ruff` pass
+
+## Phase 3: Docker Service Package Split
+
+- [ ] 3.1 Create `services/docker/__init__.py` with re-exports
+- [ ] 3.2 Create `services/docker/compose.py` from `services/docker.py`
+- [ ] 3.3 Create `services/docker/container.py` from `services/docker.py`
+- [ ] 3.4 Create `services/docker/config_staging.py` from `services/docker.py`
+- [ ] 3.5 Create `services/docker/tunnel.py` from `services/tunnel.py`
+- [ ] 3.6 Remove `services/docker.py` after verifying imports
+- [ ] 3.7 Update `services/tunnel.py` or remove if subsumed
+- [ ] 3.8 Update all consumers to import from `services.docker`
+- [ ] 3.9 Verify `py_compile` and `ruff` pass
+
+## Phase 4: Service Subpackages
+
+- [ ] 4.1 Move `services/lifecycle_hooks.py` → `services/instance/lifecycle_hooks.py`
+- [ ] 4.2 Move `services/health_monitor.py` → `services/instance/health_monitor.py`
+- [ ] 4.3 Move `services/event_bus.py` → `services/instance/event_bus.py`
+- [ ] 4.4 Move `services/config_profile_resolver.py` → `services/config/config_profile_resolver.py`
+- [ ] 4.5 Move `services/clone.py` → `services/git/clone.py`
+- [ ] 4.6 Move `services/git_operations.py` → `services/git/git_operations.py`
+- [ ] 4.7 Move `services/git_service.py` → `services/git/git_service.py`
+- [ ] 4.8 Move `services/docker_build.py` → `services/build/docker_build.py`
+- [ ] 4.9 Move `services/manifest_compiler.py` → `services/build/manifest_compiler.py`
+- [ ] 4.10 Move `services/terminal_manager.py` → `services/terminal/terminal_manager.py`
+- [ ] 4.11 Move `services/terminal_session.py` → `services/terminal/terminal_session.py`
+- [ ] 4.12 Move `services/tunnel.py` → `services/shared/tunnel.py`
+- [ ] 4.13 Move `services/notification_service.py` → `services/shared/notification_service.py`
+- [ ] 4.14 Move `services/file_service.py` → `services/shared/file_service.py`
+- [ ] 4.15 Move `services/permission_fixer.py` → `services/shared/permission_fixer.py`
+- [ ] 4.16 Move `services/readiness_probe.py` → `services/shared/readiness_probe.py`
+- [ ] 4.17 Move `services/ssh_keys.py` → `services/shared/ssh_keys.py`
+- [ ] 4.18 Move `services/workspace_manager.py` → `services/shared/workspace_manager.py`
+- [ ] 4.19 Move `services/correlation.py` → `services/shared/correlation.py`
+- [ ] 4.20 Extract `services/instance/instance_lifecycle.py` from `api/tool_instances.py`
+- [ ] 4.21 Extract `services/config/config_profiles.py` from `api/config_profiles.py`
+- [ ] 4.22 Update all imports across the backend
+- [ ] 4.23 Verify `py_compile` and `ruff` pass
+
+## Phase 5: API Router Subpackages
+
+- [ ] 5.1 Move `api/tool_instances.py` → `api/tool/tool_instances.py`
+- [ ] 5.2 Move `api/tool_types.py` → `api/tool/tool_types.py`
+- [ ] 5.3 Move `api/tool_definitions.py` → `api/tool/tool_definitions.py`
+- [ ] 5.4 Move `api/tool_types_validation.py` → `api/tool/tool_types_validation.py`
+- [ ] 5.5 Move sessions_router from `api/tool_instances.py` → `api/tool/sessions.py`
+- [ ] 5.6 Move `api/config_profiles.py` → `api/config/config_profiles.py`
+- [ ] 5.7 Move `api/user_config.py` → `api/config/user_config.py`
+- [ ] 5.8 Move `api/workspaces.py` → `api/workspace/workspaces.py`
+- [ ] 5.9 Move `api/workspace_files.py` → `api/workspace/workspace_files.py`
+- [ ] 5.10 Move `api/workspace_git.py` → `api/workspace/workspace_git.py`
+- [ ] 5.11 Move `api/workspace_instances.py` → `api/workspace/workspace_instances.py`
+- [ ] 5.12 Move `api/users.py` → `api/user/users.py`
+- [ ] 5.13 Move `api/auth.py` → `api/user/auth.py`
+- [ ] 5.14 Move `api/ssh_keys.py` → `api/user/ssh_keys.py`
+- [ ] 5.15 Move `api/projects.py` → `api/project/projects.py`
+- [ ] 5.16 Move `api/git_repositories.py` → `api/project/git_repositories.py`
+- [ ] 5.17 Move `api/health.py` → `api/system/health.py`
+- [ ] 5.18 Move `api/events.py` → `api/system/events.py`
+- [ ] 5.19 Move `api/notifications.py` → `api/system/notifications.py`
+- [ ] 5.20 Move `api/dashboard.py` → `api/system/dashboard.py`
+- [ ] 5.21 Move `api/terminal.py` → `api/system/terminal.py`
+- [ ] 5.22 Move `api/instance_proxy.py` → `api/system/instance_proxy.py`
+- [ ] 5.23 Update `main.py` to import from subpackages
+- [ ] 5.24 Update all cross-router imports
+- [ ] 5.25 Verify `py_compile` and `ruff` pass
+
+## Phase 6: Auth Dependency Refactor
+
+- [ ] 6.1 Add `get_current_user` to `auth/dependencies.py`
+- [ ] 6.2 Migrate `api/user/users.py` to use `get_current_user`
+- [ ] 6.3 Migrate `api/tool/sessions.py` to use `get_current_user`
+- [ ] 6.4 Migrate other routers incrementally
+- [ ] 6.5 Verify `py_compile` and `ruff` pass
+
+## Phase 7: Frontend Reorganization
+
+- [ ] 7.1 Rename API files to kebab-case
+- [ ] 7.2 Rename page files to `*Page.tsx`
+- [ ] 7.3 Move components into `features/` directories
+- [ ] 7.4 Update `router.tsx`
+- [ ] 7.5 Verify `npm run typecheck` passes
+- [ ] 7.6 Verify `npm run build` passes
+
+## Phase 8: Integration and Verification
+
+- [ ] 8.1 Run backend tests: `docker exec hq-api pytest`
+- [ ] 8.2 Run backend lint: `ruff check`
+- [ ] 8.3 Run frontend typecheck: `npm run typecheck`
+- [ ] 8.4 Run frontend build: `npm run build`
+- [ ] 8.5 Run `docker compose up --build` and verify API starts
+- [ ] 8.6 Verify key user flows manually
+- [ ] 8.7 Verify no 404s or import errors in browser console
+
+## Phase 9: Documentation
+
+- [ ] 9.1 Update `AGENTS.md` with new module structure
+- [ ] 9.2 Document `get_current_user` vs `get_current_user_id` pattern