basic-memory 0.14.2__py3-none-any.whl → 0.14.3__py3-none-any.whl

basic_memory/mcp/tools/sync_status.py

@@ -4,8 +4,10 @@ from typing import Optional
 
 from loguru import logger
 
+from basic_memory.config import ConfigManager
 from basic_memory.mcp.server import mcp
 from basic_memory.mcp.project_session import get_active_project
+from basic_memory.services.sync_status_service import sync_status_tracker
 
 
 def _get_all_projects_status() -> list[str]:
@@ -13,8 +15,7 @@ def _get_all_projects_status() -> list[str]:
     status_lines = []
 
     try:
-        from basic_memory.config import app_config
-        from basic_memory.services.sync_status_service import sync_status_tracker
+        app_config = ConfigManager().config
 
         if app_config.projects:
             status_lines.extend(["", "---", "", "**All Projects Status:**"])

basic_memory/mcp/tools/write_note.py

@@ -10,7 +10,7 @@ from basic_memory.mcp.tools.utils import call_put
 from basic_memory.mcp.project_session import get_active_project
 from basic_memory.schemas import EntityResponse
 from basic_memory.schemas.base import Entity
-from basic_memory.utils import parse_tags
+from basic_memory.utils import parse_tags, validate_project_path
 
 # Define TagType as a Union that can accept either a string or a list of strings or None
 TagType = Union[List[str], str, None]
@@ -75,6 +75,14 @@ async def write_note(
     # Get the active project first to check project-specific sync status
     active_project = get_active_project(project)
 
+    # Validate folder path to prevent path traversal attacks
+    project_path = active_project.home
+    if folder and not validate_project_path(folder, project_path):
+        logger.warning(
+            "Attempted path traversal attack blocked", folder=folder, project=active_project.name
+        )
+        return f"# Error\n\nFolder path '{folder}' is not allowed - paths must stay within project boundaries"
+
     # Check migration status and wait briefly if needed
     from basic_memory.mcp.tools.utils import wait_for_migration_or_return_status
 

basic_memory/models/project.py

@@ -1,6 +1,6 @@
 """Project model for Basic Memory."""
 
-from datetime import datetime
+from datetime import datetime, UTC
 from typing import Optional
 
 from sqlalchemy import (
@@ -52,9 +52,9 @@ class Project(Base):
     is_default: Mapped[Optional[bool]] = mapped_column(Boolean, default=None, nullable=True)
 
     # Timestamps
-    created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow)
+    created_at: Mapped[datetime] = mapped_column(DateTime, default=lambda: datetime.now(UTC))
     updated_at: Mapped[datetime] = mapped_column(
-        DateTime, default=datetime.utcnow, onupdate=datetime.utcnow
+        DateTime, default=lambda: datetime.now(UTC), onupdate=lambda: datetime.now(UTC)
     )
 
     # Define relationships to entities, observations, and relations

basic_memory/repository/project_repository.py

@@ -83,3 +83,21 @@ class ProjectRepository(Repository[Project]):
                 await session.flush()
                 return target_project
             return None  # pragma: no cover
+
+    async def update_path(self, project_id: int, new_path: str) -> Optional[Project]:
+        """Update project path.
+
+        Args:
+            project_id: ID of the project to update
+            new_path: New filesystem path for the project
+
+        Returns:
+            The updated project if found, None otherwise
+        """
+        async with db.scoped_session(self.session_maker) as session:
+            project = await self.select_by_id(session, project_id)
+            if project:
+                project.path = new_path
+                await session.flush()
+                return project
+            return None

basic_memory/schemas/importer.py

@@ -32,3 +32,4 @@ class EntityImportResult(ImportResult):
 
     entities: int = 0
     relations: int = 0
+    skipped_entities: int = 0

basic_memory/services/entity_service.py

@@ -15,6 +15,7 @@ from basic_memory.markdown.entity_parser import EntityParser
 from basic_memory.markdown.utils import entity_model_from_markdown, schema_to_markdown
 from basic_memory.models import Entity as EntityModel
 from basic_memory.models import Observation, Relation
+from basic_memory.models.knowledge import Entity
 from basic_memory.repository import ObservationRepository, RelationRepository
 from basic_memory.repository.entity_repository import EntityRepository
 from basic_memory.schemas import Entity as EntitySchema
@@ -44,6 +45,39 @@ class EntityService(BaseService[EntityModel]):
         self.file_service = file_service
         self.link_resolver = link_resolver
 
+    async def detect_file_path_conflicts(self, file_path: str) -> List[Entity]:
+        """Detect potential file path conflicts for a given file path.
+
+        This checks for entities with similar file paths that might cause conflicts:
+        - Case sensitivity differences (Finance/file.md vs finance/file.md)
+        - Character encoding differences
+        - Hyphen vs space differences
+        - Unicode normalization differences
+
+        Args:
+            file_path: The file path to check for conflicts
+
+        Returns:
+            List of entities that might conflict with the given file path
+        """
+        from basic_memory.utils import detect_potential_file_conflicts
+
+        conflicts = []
+
+        # Get all existing file paths
+        all_entities = await self.repository.find_all()
+        existing_paths = [entity.file_path for entity in all_entities]
+
+        # Use the enhanced conflict detection utility
+        conflicting_paths = detect_potential_file_conflicts(file_path, existing_paths)
+
+        # Find the entities corresponding to conflicting paths
+        for entity in all_entities:
+            if entity.file_path in conflicting_paths:
+                conflicts.append(entity)
+
+        return conflicts
+
     async def resolve_permalink(
         self, file_path: Permalink | Path, markdown: Optional[EntityMarkdown] = None
     ) -> str:
@@ -54,18 +88,30 @@ class EntityService(BaseService[EntityModel]):
         2. If markdown has permalink but it's used by another file -> make unique
         3. For existing files, keep current permalink from db
         4. Generate new unique permalink from file path
+
+        Enhanced to detect and handle character-related conflicts.
         """
+        file_path_str = str(file_path)
+
+        # Check for potential file path conflicts before resolving permalink
+        conflicts = await self.detect_file_path_conflicts(file_path_str)
+        if conflicts:
+            logger.warning(
+                f"Detected potential file path conflicts for '{file_path_str}': "
+                f"{[entity.file_path for entity in conflicts]}"
+            )
+
         # If markdown has explicit permalink, try to validate it
         if markdown and markdown.frontmatter.permalink:
             desired_permalink = markdown.frontmatter.permalink
             existing = await self.repository.get_by_permalink(desired_permalink)
 
             # If no conflict or it's our own file, use as is
-            if not existing or existing.file_path == str(file_path):
+            if not existing or existing.file_path == file_path_str:
                 return desired_permalink
 
         # For existing files, try to find current permalink
-        existing = await self.repository.get_by_file_path(str(file_path))
+        existing = await self.repository.get_by_file_path(file_path_str)
         if existing:
             return existing.permalink
 
@@ -75,7 +121,7 @@ class EntityService(BaseService[EntityModel]):
         else:
             desired_permalink = generate_permalink(file_path)
 
-        # Make unique if needed
+        # Make unique if needed - enhanced to handle character conflicts
         permalink = desired_permalink
         suffix = 1
         while await self.repository.get_by_permalink(permalink):

basic_memory/services/initialization.py

@@ -5,14 +5,12 @@ to ensure consistent application startup across all entry points.
 """
 
 import asyncio
-import shutil
 from pathlib import Path
 
 from loguru import logger
 
 from basic_memory import db
 from basic_memory.config import BasicMemoryConfig
-from basic_memory.models import Project
 from basic_memory.repository import ProjectRepository
 
 
@@ -70,63 +68,6 @@ async def reconcile_projects_with_config(app_config: BasicMemoryConfig):
         logger.info("Continuing with initialization despite synchronization error")
 
 
-async def migrate_legacy_projects(app_config: BasicMemoryConfig):
-    # Get database session - migrations handled centrally
-    _, session_maker = await db.get_or_create_db(
-        db_path=app_config.database_path,
-        db_type=db.DatabaseType.FILESYSTEM,
-        ensure_migrations=False,
-    )
-    logger.info("Migrating legacy projects...")
-    project_repository = ProjectRepository(session_maker)
-
-    # For each project in config.json, check if it has a .basic-memory dir
-    for project_name, project_path in app_config.projects.items():
-        legacy_dir = Path(project_path) / ".basic-memory"
-        if not legacy_dir.exists():
-            continue
-        logger.info(f"Detected legacy project directory: {legacy_dir}")
-        project = await project_repository.get_by_name(project_name)
-        if not project:  # pragma: no cover
-            logger.error(f"Project {project_name} not found in database, skipping migration")
-            continue
-
-        logger.info(f"Starting migration for project: {project_name} (id: {project.id})")
-        await migrate_legacy_project_data(project, legacy_dir)
-        logger.info(f"Completed migration for project: {project_name}")
-    logger.info("Legacy projects successfully migrated")
-
-
-async def migrate_legacy_project_data(project: Project, legacy_dir: Path) -> bool:
-    """Check if project has legacy .basic-memory dir and migrate if needed.
-
-    Args:
-        project: The project to check and potentially migrate
-
-    Returns:
-        True if migration occurred, False otherwise
-    """
-
-    # avoid circular imports
-    from basic_memory.cli.commands.sync import get_sync_service
-
-    sync_service = await get_sync_service(project)
-    sync_dir = Path(project.path)
-
-    logger.info(f"Sync starting project: {project.name}")
-    await sync_service.sync(sync_dir, project_name=project.name)
-    logger.info(f"Sync completed successfully for project: {project.name}")
-
-    # After successful sync, remove the legacy directory
-    try:
-        logger.info(f"Removing legacy directory: {legacy_dir}")
-        shutil.rmtree(legacy_dir)
-        return True
-    except Exception as e:
-        logger.error(f"Error removing legacy directory: {e}")
-        return False
-
-
 async def initialize_file_sync(
     app_config: BasicMemoryConfig,
 ):
@@ -186,16 +127,6 @@ async def initialize_file_sync(
             sync_status_tracker.fail_project_sync(project.name, str(e))
             # Continue with other projects even if one fails
 
-    # Mark migration complete if it was in progress
-    try:
-        from basic_memory.services.migration_service import migration_manager
-
-        if not migration_manager.is_ready:  # pragma: no cover
-            migration_manager.mark_completed("Migration completed with file sync")
-            logger.info("Marked migration as completed after file sync")
-    except Exception as e:  # pragma: no cover
-        logger.warning(f"Could not update migration status: {e}")
-
     # Then start the watch service in the background
     logger.info("Starting watch service for all projects")
     # run the watch service
@@ -229,13 +160,7 @@ async def initialize_app(
     # Reconcile projects from config.json with projects table
     await reconcile_projects_with_config(app_config)
 
-    # Start background migration for legacy project data (non-blocking)
-    from basic_memory.services.migration_service import migration_manager
-
-    await migration_manager.start_background_migration(app_config)
-
     logger.info("App initialization completed (migration running in background if needed)")
-    return migration_manager
 
 
 def ensure_initialization(app_config: BasicMemoryConfig) -> None:

basic_memory/services/project_service.py

@@ -9,7 +9,6 @@ from typing import Dict, Optional, Sequence
 from loguru import logger
 from sqlalchemy import text
 
-from basic_memory.config import config, app_config
 from basic_memory.models import Project
 from basic_memory.repository.project_repository import ProjectRepository
 from basic_memory.schemas import (
@@ -18,9 +17,8 @@ from basic_memory.schemas import (
     ProjectStatistics,
     SystemStatus,
 )
-from basic_memory.config import WATCH_STATUS_JSON
+from basic_memory.config import WATCH_STATUS_JSON, ConfigManager, get_project_config, ProjectConfig
 from basic_memory.utils import generate_permalink
-from basic_memory.config import config_manager
 
 
 class ProjectService:
@@ -33,6 +31,24 @@ class ProjectService:
         super().__init__()
         self.repository = repository
 
+    @property
+    def config_manager(self) -> ConfigManager:
+        """Get a ConfigManager instance.
+
+        Returns:
+            Fresh ConfigManager instance for each access
+        """
+        return ConfigManager()
+
+    @property
+    def config(self) -> ProjectConfig:
+        """Get the current project configuration.
+
+        Returns:
+            Current project configuration
+        """
+        return get_project_config()
+
     @property
     def projects(self) -> Dict[str, str]:
         """Get all configured projects.
@@ -40,7 +56,7 @@ class ProjectService:
         Returns:
             Dict mapping project names to their file paths
         """
-        return config_manager.projects
+        return self.config_manager.projects
 
     @property
     def default_project(self) -> str:
@@ -49,7 +65,7 @@ class ProjectService:
         Returns:
             The name of the default project
         """
-        return config_manager.default_project
+        return self.config_manager.default_project
 
     @property
     def current_project(self) -> str:
@@ -58,7 +74,7 @@ class ProjectService:
         Returns:
             The name of the current project
         """
-        return os.environ.get("BASIC_MEMORY_PROJECT", config_manager.default_project)
+        return os.environ.get("BASIC_MEMORY_PROJECT", self.config_manager.default_project)
 
     async def list_projects(self) -> Sequence[Project]:
         return await self.repository.find_all()
@@ -87,7 +103,7 @@ class ProjectService:
         resolved_path = os.path.abspath(os.path.expanduser(path))
 
         # First add to config file (this will validate the project doesn't exist)
-        project_config = config_manager.add_project(name, resolved_path)
+        project_config = self.config_manager.add_project(name, resolved_path)
 
         # Then add to database
         project_data = {
@@ -103,7 +119,7 @@ class ProjectService:
         # If this should be the default project, ensure only one default exists
         if set_default:
             await self.repository.set_as_default(created_project.id)
-            config_manager.set_default_project(name)
+            self.config_manager.set_default_project(name)
             logger.info(f"Project '{name}' set as default")
 
         logger.info(f"Project '{name}' added at {resolved_path}")
@@ -121,7 +137,7 @@ class ProjectService:
             raise ValueError("Repository is required for remove_project")
 
         # First remove from config (this will validate the project exists and is not default)
-        config_manager.remove_project(name)
+        self.config_manager.remove_project(name)
 
         # Then remove from database
         project = await self.repository.get_by_name(name)
@@ -143,7 +159,7 @@ class ProjectService:
             raise ValueError("Repository is required for set_default_project")
 
         # First update config file (this will validate the project exists)
-        config_manager.set_default_project(name)
+        self.config_manager.set_default_project(name)
 
         # Then update database
         project = await self.repository.get_by_name(name)
@@ -196,7 +212,7 @@ class ProjectService:
         elif len(default_projects) == 0:  # pragma: no cover
             # No default project - set the config default as default
             # This is defensive code for edge cases where no default exists
-            config_default = config_manager.default_project  # pragma: no cover
+            config_default = self.config_manager.default_project  # pragma: no cover
             config_project = await self.repository.get_by_name(config_default)  # pragma: no cover
             if config_project:  # pragma: no cover
                 await self.repository.set_as_default(config_project.id)  # pragma: no cover
@@ -221,7 +237,7 @@ class ProjectService:
         db_projects_by_permalink = {p.permalink: p for p in db_projects}
 
         # Get all projects from configuration and normalize names if needed
-        config_projects = config_manager.projects.copy()
+        config_projects = self.config_manager.projects.copy()
         updated_config = {}
         config_updated = False
 
@@ -237,8 +253,9 @@ class ProjectService:
 
         # Update the configuration if any changes were made
         if config_updated:
-            config_manager.config.projects = updated_config
-            config_manager.save_config(config_manager.config)
+            config = self.config_manager.load_config()
+            config.projects = updated_config
+            self.config_manager.save_config(config)
             logger.info("Config updated with normalized project names")
 
         # Use the normalized config for further processing
@@ -261,19 +278,19 @@ class ProjectService:
         for name, project in db_projects_by_permalink.items():
             if name not in config_projects:
                 logger.info(f"Adding project '{name}' to configuration")
-                config_manager.add_project(name, project.path)
+                self.config_manager.add_project(name, project.path)
 
         # Ensure database default project state is consistent
         await self._ensure_single_default_project()
 
         # Make sure default project is synchronized between config and database
         db_default = await self.repository.get_default_project()
-        config_default = config_manager.default_project
+        config_default = self.config_manager.default_project
 
         if db_default and db_default.name != config_default:
             # Update config to match DB default
             logger.info(f"Updating default project in config to '{db_default.name}'")
-            config_manager.set_default_project(db_default.name)
+            self.config_manager.set_default_project(db_default.name)
         elif not db_default and config_default:
             # Update DB to match config default (if the project exists)
             project = await self.repository.get_by_name(config_default)
@@ -292,6 +309,47 @@ class ProjectService:
             # MCP components might not be available in all contexts
             logger.debug("MCP session not available, skipping session refresh")
 
+    async def move_project(self, name: str, new_path: str) -> None:
+        """Move a project to a new location.
+
+        Args:
+            name: The name of the project to move
+            new_path: The new absolute path for the project
+
+        Raises:
+            ValueError: If the project doesn't exist or repository isn't initialized
+        """
+        if not self.repository:
+            raise ValueError("Repository is required for move_project")
+
+        # Resolve to absolute path
+        resolved_path = os.path.abspath(os.path.expanduser(new_path))
+
+        # Validate project exists in config
+        if name not in self.config_manager.projects:
+            raise ValueError(f"Project '{name}' not found in configuration")
+
+        # Create the new directory if it doesn't exist
+        Path(resolved_path).mkdir(parents=True, exist_ok=True)
+
+        # Update in configuration
+        config = self.config_manager.load_config()
+        old_path = config.projects[name]
+        config.projects[name] = resolved_path
+        self.config_manager.save_config(config)
+
+        # Update in database
+        project = await self.repository.get_by_name(name)
+        if project:
+            await self.repository.update_path(project.id, resolved_path)
+            logger.info(f"Moved project '{name}' from {old_path} to {resolved_path}")
+        else:
+            logger.error(f"Project '{name}' exists in config but not in database")
+            # Restore the old path in config since DB update failed
+            config.projects[name] = old_path
+            self.config_manager.save_config(config)
+            raise ValueError(f"Project '{name}' not found in database")
+
     async def update_project(  # pragma: no cover
         self, name: str, updated_path: Optional[str] = None, is_active: Optional[bool] = None
     ) -> None:
@@ -309,7 +367,7 @@ class ProjectService:
             raise ValueError("Repository is required for update_project")
 
         # Validate project exists in config
-        if name not in config_manager.projects:
+        if name not in self.config_manager.projects:
             raise ValueError(f"Project '{name}' not found in configuration")
 
         # Get project from database
@@ -323,10 +381,9 @@ class ProjectService:
             resolved_path = os.path.abspath(os.path.expanduser(updated_path))
 
             # Update in config
-            projects = config_manager.config.projects.copy()
-            projects[name] = resolved_path
-            config_manager.config.projects = projects
-            config_manager.save_config(config_manager.config)
+            config = self.config_manager.load_config()
+            config.projects[name] = resolved_path
+            self.config_manager.save_config(config)
 
             # Update in database
             project.path = resolved_path
@@ -347,7 +404,7 @@ class ProjectService:
             if active_projects:
                 new_default = active_projects[0]
                 await self.repository.set_as_default(new_default.id)
-                config_manager.set_default_project(new_default.name)
+                self.config_manager.set_default_project(new_default.name)
                 logger.info(
                     f"Changed default project to '{new_default.name}' as '{name}' was deactivated"
                 )
@@ -365,9 +422,9 @@ class ProjectService:
             raise ValueError("Repository is required for get_project_info")
 
         # Use specified project or fall back to config project
-        project_name = project_name or config.project
+        project_name = project_name or self.config.project
         # Get project path from configuration
-        name, project_path = config_manager.get_project(project_name)
+        name, project_path = self.config_manager.get_project(project_name)
         if not name:  # pragma: no cover
             raise ValueError(f"Project '{project_name}' not found in configuration")
 
@@ -393,11 +450,11 @@ class ProjectService:
         db_projects_by_permalink = {p.permalink: p for p in db_projects}
 
         # Get default project info
-        default_project = config_manager.default_project
+        default_project = self.config_manager.default_project
 
         # Convert config projects to include database info
         enhanced_projects = {}
-        for name, path in config_manager.projects.items():
+        for name, path in self.config_manager.projects.items():
             config_permalink = generate_permalink(name)
             db_project = db_projects_by_permalink.get(config_permalink)
             enhanced_projects[name] = {
@@ -673,7 +730,7 @@ class ProjectService:
         import basic_memory
 
         # Get database information
-        db_path = app_config.database_path
+        db_path = self.config_manager.config.database_path
         db_size = db_path.stat().st_size if db_path.exists() else 0
         db_size_readable = f"{db_size / (1024 * 1024):.2f} MB"
 

basic_memory/sync/background_sync.py

@@ -2,7 +2,7 @@ import asyncio
 
 from loguru import logger
 
-from basic_memory.config import config as project_config
+from basic_memory.config import get_project_config
 from basic_memory.sync import SyncService, WatchService
 
 
@@ -11,9 +11,10 @@ async def sync_and_watch(
 ):  # pragma: no cover
     """Run sync and watch service."""
 
-    logger.info(f"Starting watch service to sync file changes in dir: {project_config.home}")
+    config = get_project_config()
+    logger.info(f"Starting watch service to sync file changes in dir: {config.home}")
     # full sync
-    await sync_service.sync(project_config.home)
+    await sync_service.sync(config.home)
 
     # watch changes
     await watch_service.run()

basic_memory/sync/sync_service.py

@@ -453,6 +453,36 @@ class SyncService:
 
         entity = await self.entity_repository.get_by_file_path(old_path)
         if entity:
+            # Check if destination path is already occupied by another entity
+            existing_at_destination = await self.entity_repository.get_by_file_path(new_path)
+            if existing_at_destination and existing_at_destination.id != entity.id:
+                # Handle the conflict - this could be a file swap or replacement scenario
+                logger.warning(
+                    f"File path conflict detected during move: "
+                    f"entity_id={entity.id} trying to move from '{old_path}' to '{new_path}', "
+                    f"but entity_id={existing_at_destination.id} already occupies '{new_path}'"
+                )
+
+                # Check if this is a file swap (the destination entity is being moved to our old path)
+                # This would indicate a simultaneous move operation
+                old_path_after_swap = await self.entity_repository.get_by_file_path(old_path)
+                if old_path_after_swap and old_path_after_swap.id == existing_at_destination.id:
+                    logger.info(f"Detected file swap between '{old_path}' and '{new_path}'")
+                    # This is a swap scenario - both moves should succeed
+                    # We'll allow this to proceed since the other file has moved out
+                else:
+                    # This is a conflict where the destination is occupied
+                    raise ValueError(
+                        f"Cannot move entity from '{old_path}' to '{new_path}': "
+                        f"destination path is already occupied by another file. "
+                        f"This may be caused by: "
+                        f"1. Conflicting file names with different character encodings, "
+                        f"2. Case sensitivity differences (e.g., 'Finance/' vs 'finance/'), "
+                        f"3. Character conflicts between hyphens in filenames and generated permalinks, "
+                        f"4. Files with similar names containing special characters. "
+                        f"Try renaming one of the conflicting files to resolve this issue."
+                    )
+
             # Update file_path in all cases
             updates = {"file_path": new_path}
 
@@ -477,7 +507,26 @@ class SyncService:
                     f"new_checksum={new_checksum}"
                 )
 
-            updated = await self.entity_repository.update(entity.id, updates)
+            try:
+                updated = await self.entity_repository.update(entity.id, updates)
+            except Exception as e:
+                # Catch any database integrity errors and provide helpful context
+                if "UNIQUE constraint failed" in str(e):
+                    logger.error(
+                        f"Database constraint violation during move: "
+                        f"entity_id={entity.id}, old_path='{old_path}', new_path='{new_path}'"
+                    )
+                    raise ValueError(
+                        f"Cannot complete move from '{old_path}' to '{new_path}': "
+                        f"a database constraint was violated. This usually indicates "
+                        f"a file path or permalink conflict. Please check for: "
+                        f"1. Duplicate file names, "
+                        f"2. Case sensitivity issues (e.g., 'File.md' vs 'file.md'), "
+                        f"3. Character encoding conflicts in file names."
+                    ) from e
+                else:
+                    # Re-raise other exceptions as-is
+                    raise
 
             if updated is None:  # pragma: no cover
                 logger.error(