mcli-framework 7.12.3__py3-none-any.whl → 7.13.0__py3-none-any.whl

mcli/app/commands_cmd.py

@@ -4,6 +4,7 @@ import inspect
 import json
 import os
 import re
+import shutil
 import subprocess
 import tempfile
 from datetime import datetime
@@ -17,7 +18,7 @@ from mcli.lib.api.daemon_client import get_daemon_client
 from mcli.lib.custom_commands import get_command_manager
 from mcli.lib.discovery.command_discovery import get_command_discovery
 from mcli.lib.logger.logger import get_logger
-from mcli.lib.ui.styling import console
+from mcli.lib.ui.styling import console, error, info, success, warning
 
 logger = get_logger(__name__)
 
@@ -153,11 +154,19 @@ def append_lockfile(new_state):
 
 
 def find_state_by_hash(hash_value):
-    """Find a state by its hash value."""
+    """Find a state by its hash value (supports partial hash matching)."""
     states = load_lockfile()
+    matches = []
     for state in states:
-        if state["hash"] == hash_value:
-            return state
+        # Support both full hash and partial hash (prefix) matching
+        if state["hash"] == hash_value or state["hash"].startswith(hash_value):
+            matches.append(state)
+
+    if len(matches) == 1:
+        return matches[0]
+    elif len(matches) > 1:
+        # Ambiguous - multiple matches
+        return None
     return None
 
 
@@ -181,6 +190,390 @@ def workflow():
 commands = workflow
 
 
+# Helper function for store commands
+def _get_store_path() -> Path:
+    """Get store path from config or default."""
+    config_file = Path.home() / ".mcli" / "store.conf"
+
+    if config_file.exists():
+        store_path = Path(config_file.read_text().strip())
+        if store_path.exists():
+            return store_path
+
+    # Use default
+    return DEFAULT_STORE_PATH
+
+
+# Store commands (git sync for workflows)
+
+
+@workflow.command(name="init")
+@click.option("--path", "-p", type=click.Path(), help=f"Store path (default: {DEFAULT_STORE_PATH})")
+@click.option("--remote", "-r", help="Git remote URL (optional)")
+def init_store(path, remote):
+    """Initialize command store with git."""
+    store_path = Path(path) if path else DEFAULT_STORE_PATH
+
+    try:
+        # Create store directory
+        store_path.mkdir(parents=True, exist_ok=True)
+
+        # Initialize git if not already initialized
+        git_dir = store_path / ".git"
+        if not git_dir.exists():
+            subprocess.run(["git", "init"], cwd=store_path, check=True, capture_output=True)
+            success(f"Initialized git repository at {store_path}")
+
+            # Create .gitignore
+            gitignore = store_path / ".gitignore"
+            gitignore.write_text("*.backup\n.DS_Store\n")
+
+            # Create README
+            readme = store_path / "README.md"
+            readme.write_text(
+                f"""# MCLI Commands Store
+
+Personal workflow commands for mcli framework.
+
+## Usage
+
+Push commands:
+```bash
+mcli workflow push
+```
+
+Pull commands:
+```bash
+mcli workflow pull
+```
+
+Sync (bidirectional):
+```bash
+mcli workflow sync
+```
+
+## Structure
+
+All JSON command files from `~/.mcli/commands/` are stored here and version controlled.
+
+Last updated: {datetime.now().isoformat()}
+"""
+            )
+
+            # Add remote if provided
+            if remote:
+                subprocess.run(
+                    ["git", "remote", "add", "origin", remote], cwd=store_path, check=True
+                )
+                success(f"Added remote: {remote}")
+        else:
+            info(f"Git repository already exists at {store_path}")
+
+        # Save store path to config
+        config_file = Path.home() / ".mcli" / "store.conf"
+        config_file.parent.mkdir(parents=True, exist_ok=True)
+        config_file.write_text(str(store_path))
+
+        success(f"Command store initialized at {store_path}")
+        info(f"Store path saved to {config_file}")
+
+    except subprocess.CalledProcessError as e:
+        error(f"Git command failed: {e}")
+        logger.error(f"Git init failed: {e}")
+    except Exception as e:
+        error(f"Failed to initialize store: {e}")
+        logger.exception(e)
+
+
+@workflow.command(name="push")
+@click.option("--message", "-m", help="Commit message")
+@click.option("--all", "-a", is_flag=True, help="Push all files (including backups)")
+@click.option(
+    "--global", "-g", "is_global", is_flag=True, help="Push global commands instead of local"
+)
+def push_commands(message, all, is_global):
+    """
+    Push commands to git store.
+
+    By default pushes local commands (if in git repo), use --global/-g for global commands.
+    """
+    try:
+        store_path = _get_store_path()
+        from mcli.lib.paths import get_custom_commands_dir
+
+        COMMANDS_PATH = get_custom_commands_dir(global_mode=is_global)
+
+        # Copy commands to store
+        info(f"Copying commands from {COMMANDS_PATH} to {store_path}...")
+
+        copied_count = 0
+        for item in COMMANDS_PATH.glob("*"):
+            # Skip backups unless --all specified
+            if not all and item.name.endswith(".backup"):
+                continue
+
+            dest = store_path / item.name
+            if item.is_file():
+                shutil.copy2(item, dest)
+                copied_count += 1
+            elif item.is_dir():
+                shutil.copytree(item, dest, dirs_exist_ok=True)
+                copied_count += 1
+
+        success(f"Copied {copied_count} items to store")
+
+        # Git add, commit, push
+        subprocess.run(["git", "add", "."], cwd=store_path, check=True)
+
+        # Check if there are changes
+        result = subprocess.run(
+            ["git", "status", "--porcelain"], cwd=store_path, capture_output=True, text=True
+        )
+
+        if not result.stdout.strip():
+            info("No changes to commit")
+            return
+
+        # Commit with message
+        commit_msg = message or f"Update commands {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
+        subprocess.run(["git", "commit", "-m", commit_msg], cwd=store_path, check=True)
+        success(f"Committed changes: {commit_msg}")
+
+        # Push to remote if configured
+        try:
+            subprocess.run(["git", "push"], cwd=store_path, check=True, capture_output=True)
+            success("Pushed to remote")
+        except subprocess.CalledProcessError:
+            warning("No remote configured or push failed. Commands committed locally.")
+
+    except Exception as e:
+        error(f"Failed to push commands: {e}")
+        logger.exception(e)
+
+
+@workflow.command(name="pull")
+@click.option("--force", "-f", is_flag=True, help="Overwrite local commands without backup")
+@click.option(
+    "--global", "-g", "is_global", is_flag=True, help="Pull to global commands instead of local"
+)
+def pull_commands(force, is_global):
+    """
+    Pull commands from git store.
+
+    By default pulls to local commands (if in git repo), use --global/-g for global commands.
+    """
+    try:
+        store_path = _get_store_path()
+        from mcli.lib.paths import get_custom_commands_dir
+
+        COMMANDS_PATH = get_custom_commands_dir(global_mode=is_global)
+
+        # Pull from remote
+        try:
+            subprocess.run(["git", "pull"], cwd=store_path, check=True)
+            success("Pulled latest changes from remote")
+        except subprocess.CalledProcessError:
+            warning("No remote configured or pull failed. Using local store.")
+
+        # Backup existing commands if not force
+        if not force and COMMANDS_PATH.exists():
+            backup_dir = (
+                COMMANDS_PATH.parent / f"commands_backup_{datetime.now().strftime('%Y%m%d_%H%M%S')}"
+            )
+            shutil.copytree(COMMANDS_PATH, backup_dir)
+            info(f"Backed up existing commands to {backup_dir}")
+
+        # Copy from store to commands directory
+        info(f"Copying commands from {store_path} to {COMMANDS_PATH}...")
+
+        COMMANDS_PATH.mkdir(parents=True, exist_ok=True)
+
+        copied_count = 0
+        for item in store_path.glob("*"):
+            # Skip git directory and README
+            if item.name in [".git", "README.md", ".gitignore"]:
+                continue
+
+            dest = COMMANDS_PATH / item.name
+            if item.is_file():
+                shutil.copy2(item, dest)
+                copied_count += 1
+            elif item.is_dir():
+                shutil.copytree(item, dest, dirs_exist_ok=True)
+                copied_count += 1
+
+        success(f"Pulled {copied_count} items from store")
+
+    except Exception as e:
+        error(f"Failed to pull commands: {e}")
+        logger.exception(e)
+
+
+@workflow.command(name="sync")
+@click.option("--message", "-m", help="Commit message if pushing")
+@click.option(
+    "--global", "-g", "is_global", is_flag=True, help="Sync global commands instead of local"
+)
+def sync_commands(message, is_global):
+    """
+    Sync commands bidirectionally (pull then push if changes).
+
+    By default syncs local commands (if in git repo), use --global/-g for global commands.
+    """
+    try:
+        store_path = _get_store_path()
+        from mcli.lib.paths import get_custom_commands_dir
+
+        COMMANDS_PATH = get_custom_commands_dir(global_mode=is_global)
+
+        # First pull
+        info("Pulling latest changes...")
+        try:
+            subprocess.run(["git", "pull"], cwd=store_path, check=True, capture_output=True)
+            success("Pulled from remote")
+        except subprocess.CalledProcessError:
+            warning("No remote or pull failed")
+
+        # Then push local changes
+        info("Pushing local changes...")
+
+        # Copy commands
+        for item in COMMANDS_PATH.glob("*"):
+            if item.name.endswith(".backup"):
+                continue
+            dest = store_path / item.name
+            if item.is_file():
+                shutil.copy2(item, dest)
+            elif item.is_dir():
+                shutil.copytree(item, dest, dirs_exist_ok=True)
+
+        # Check for changes
+        result = subprocess.run(
+            ["git", "status", "--porcelain"], cwd=store_path, capture_output=True, text=True
+        )
+
+        if not result.stdout.strip():
+            success("Everything in sync!")
+            return
+
+        # Commit and push
+        subprocess.run(["git", "add", "."], cwd=store_path, check=True)
+        commit_msg = message or f"Sync commands {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
+        subprocess.run(["git", "commit", "-m", commit_msg], cwd=store_path, check=True)
+
+        try:
+            subprocess.run(["git", "push"], cwd=store_path, check=True, capture_output=True)
+            success("Synced and pushed to remote")
+        except subprocess.CalledProcessError:
+            success("Synced locally (no remote configured)")
+
+    except Exception as e:
+        error(f"Sync failed: {e}")
+        logger.exception(e)
+
+
+@workflow.command(name="status")
+def store_status():
+    """Show git status of command store."""
+    try:
+        store_path = _get_store_path()
+
+        click.echo(f"\n📦 Store: {store_path}\n")
+
+        # Git status
+        result = subprocess.run(
+            ["git", "status", "--short", "--branch"], cwd=store_path, capture_output=True, text=True
+        )
+
+        if result.stdout:
+            click.echo(result.stdout)
+
+        # Show remote
+        result = subprocess.run(
+            ["git", "remote", "-v"], cwd=store_path, capture_output=True, text=True
+        )
+
+        if result.stdout:
+            click.echo("\n🌐 Remotes:")
+            click.echo(result.stdout)
+        else:
+            info("\nNo remote configured")
+
+        click.echo()
+
+    except Exception as e:
+        error(f"Failed to get status: {e}")
+        logger.exception(e)
+
+
+@workflow.command(name="config")
+@click.option("--remote", "-r", help="Set git remote URL")
+@click.option("--path", "-p", type=click.Path(), help="Change store path")
+def configure_store(remote, path):
+    """Configure store settings."""
+    try:
+        store_path = _get_store_path()
+
+        if path:
+            new_path = Path(path).expanduser().resolve()
+            config_file = Path.home() / ".mcli" / "store.conf"
+            config_file.write_text(str(new_path))
+            success(f"Store path updated to: {new_path}")
+            return
+
+        if remote:
+            # Check if remote exists
+            result = subprocess.run(
+                ["git", "remote"], cwd=store_path, capture_output=True, text=True
+            )
+
+            if "origin" in result.stdout:
+                subprocess.run(
+                    ["git", "remote", "set-url", "origin", remote], cwd=store_path, check=True
+                )
+                success(f"Updated remote URL: {remote}")
+            else:
+                subprocess.run(
+                    ["git", "remote", "add", "origin", remote], cwd=store_path, check=True
+                )
+                success(f"Added remote URL: {remote}")
+
+    except Exception as e:
+        error(f"Configuration failed: {e}")
+        logger.exception(e)
+
+
+@workflow.command(name="show")
+@click.argument("command_name")
+@click.option("--store-dir", "-s", is_flag=True, help="Show from store instead of local")
+def show_command(command_name, store_dir):
+    """Show command file contents."""
+    try:
+        if store_dir:
+            store_path = _get_store_path()
+            path = store_path / command_name
+        else:
+            path = COMMANDS_PATH / command_name
+
+        if not path.exists():
+            error(f"Command not found: {command_name}")
+            return
+
+        if path.is_file():
+            click.echo(f"\n📄 {path}:\n")
+            click.echo(path.read_text())
+        else:
+            info(f"{command_name} is a directory")
+            for item in sorted(path.glob("*")):
+                click.echo(f"  {item.name}")
+
+        click.echo()
+
+    except Exception as e:
+        error(f"Failed to show command: {e}")
+        logger.exception(e)
+
+
 # init command moved to init_cmd.py as top-level command
 
 
@@ -1316,7 +1709,7 @@ def edit_command(command_name, editor, is_global):
 # Moved from mcli.self for better organization
 
 
-@workflow.command("extract-workflow-commands")
+@workflow.command("extract")
 @click.option(
     "--output", "-o", type=click.Path(), help="Output file (default: workflow-commands.json)"
 )

mcli/app/lock_cmd.py

@@ -48,11 +48,19 @@ def append_lockfile(new_state):
 
 
 def find_state_by_hash(hash_value):
-    """Find a state by its hash value."""
+    """Find a state by its hash value (supports partial hash matching)."""
     states = load_lockfile()
+    matches = []
     for state in states:
-        if state["hash"] == hash_value:
-            return state
+        # Support both full hash and partial hash (prefix) matching
+        if state["hash"] == hash_value or state["hash"].startswith(hash_value):
+            matches.append(state)
+
+    if len(matches) == 1:
+        return matches[0]
+    elif len(matches) > 1:
+        # Ambiguous - multiple matches
+        return None
     return None
 
 

mcli/app/main.py

@@ -347,14 +347,7 @@ def _add_lazy_commands(app: click.Group):
     except ImportError as e:
         logger.debug(f"Could not load lock group: {e}")
 
-    # Top-level store group
-    try:
-        from mcli.app.store_cmd import store
-
-        app.add_command(store, name="store")
-        logger.debug("Added store group")
-    except ImportError as e:
-        logger.debug(f"Could not load store group: {e}")
+    # Store commands moved to workflow group
 
     # Workflow management - load immediately for fast access (renamed from 'commands')
     try:

{mcli_framework-7.12.3.dist-info → mcli_framework-7.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcli-framework
-Version: 7.12.3
+Version: 7.13.0
 Summary: Portable workflow framework - transform any script into a versioned, schedulable command. Store in ~/.mcli/workflows/, version with lockfile, run as daemon or cron job.
 Author-email: Luis Fernandez de la Vara <luis@lefv.io>
 Maintainer-email: Luis Fernandez de la Vara <luis@lefv.io>

{mcli_framework-7.12.3.dist-info → mcli_framework-7.13.0.dist-info}/RECORD

@@ -3,13 +3,12 @@ mcli/__main__.py,sha256=nKdf3WqtXi5PhWhZGjpXKAT3a2yGUYkYCBgSLxk4hSQ,295
 mcli/cli.py,sha256=3OgzOodRtHGZnsq5H3Fy-hl7JKwjJZa5ig2L4-izK2E,382
 mcli/config.toml,sha256=263yEVvP_W9F2zOLssUBgy7amKaRAFQuBrfxcMhKxaQ,1706
 mcli/app/__init__.py,sha256=UWt7rsI_lHjZ29_iH5lX6qSLt__uBMmp5W-Rt3BEG0E,447
-mcli/app/commands_cmd.py,sha256=-ZMnqUjEhgRYEYXHYEcwXwZjtxu0zLxQOXqSOHg9w80,50298
+mcli/app/commands_cmd.py,sha256=A-YhX8dATAUTQe8c9jzLnwJXIdPKEdzYyZWcYVhIFwg,63098
 mcli/app/completion_helpers.py,sha256=_gBHJukhseferp3G7pj6QkDvAhVt72nsfbyOHcnBazg,7484
 mcli/app/init_cmd.py,sha256=VWeCAaN5tinFBBHgzmt_JR3UdSTNVBofXXRZ4FNdkcw,12428
-mcli/app/lock_cmd.py,sha256=nkTTvt0UNpMuvwpxIOtVPBhGbMhR0jdRF6J_rP-ODaU,12577
-mcli/app/main.py,sha256=eSrgA4C0vePllEuH2TSqyBpOxAbyAEkc-rUZk77KQBw,19076
+mcli/app/lock_cmd.py,sha256=0m7xkpWxfJ8vxTgyvRNY2XKAwJj_CB7Sf-wvnte5RS4,12883
+mcli/app/main.py,sha256=ppQm1Jl8x6sub3_2X3eot00pYham8FeHg8l0OV0Nw9I,18865
 mcli/app/model_cmd.py,sha256=LQQD8FaebFoaJGK3u_kt19wZ3HJyo_ecwSMYyC2xIp8,2497
-mcli/app/store_cmd.py,sha256=N7FhnrhIeY6Hetv6kW4mcJ97EQvhgh0pwHiwoZSfzhU,14315
 mcli/app/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcli/app/model/model.py,sha256=w3yrZ2bgh47V0SlpNHcuMkBX0fC9gni66VEwpBg0iYU,38968
 mcli/app/video/__init__.py,sha256=NS3kaM8lWKL-gVh7WLGBqNda0-QJS6MCY6iW_GWPUco,44
@@ -271,9 +270,9 @@ mcli/workflow/sync/test_cmd.py,sha256=E-DItNtiBTGE9ofmfrjm9qjgYjeBpMXp08fmRk6nhR
 mcli/workflow/videos/__init__.py,sha256=aV3DEoO7qdKJY4odWKoQbOKDQq4ludTeCLnZcupOFIM,25
 mcli/workflow/wakatime/__init__.py,sha256=gD6SKA7dJ28HXFd1w04YuB_WgL0SWosbEFtT2uS__pg,2595
 mcli/workflow/wakatime/wakatime.py,sha256=ig86g04qXgRrx6UXsIKd9Cv9OFhJnQLL2Plylf8TMAA,134
-mcli_framework-7.12.3.dist-info/licenses/LICENSE,sha256=sahwAMfrJv2-V66HNPTp7A9UmMjxtyejwTZZoWQvEcI,1075
-mcli_framework-7.12.3.dist-info/METADATA,sha256=MCbvO8aDP_lYdW6GLTu2Yfe9sA9i-8rLgutymLuVrko,18635
-mcli_framework-7.12.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcli_framework-7.12.3.dist-info/entry_points.txt,sha256=dYrZbDIm-KUPsl1wfv600Kx_8sMy89phMkCihbDRgP8,261
-mcli_framework-7.12.3.dist-info/top_level.txt,sha256=_bnO8J2EUkliWivey_1le0UrnocFKmyVMQjbQ8iVXjc,5
-mcli_framework-7.12.3.dist-info/RECORD,,
+mcli_framework-7.13.0.dist-info/licenses/LICENSE,sha256=sahwAMfrJv2-V66HNPTp7A9UmMjxtyejwTZZoWQvEcI,1075
+mcli_framework-7.13.0.dist-info/METADATA,sha256=-QZ_QbgHr6odb5UvHD7pzy5b3mpNRreBagwT70IdV-Q,18635
+mcli_framework-7.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcli_framework-7.13.0.dist-info/entry_points.txt,sha256=dYrZbDIm-KUPsl1wfv600Kx_8sMy89phMkCihbDRgP8,261
+mcli_framework-7.13.0.dist-info/top_level.txt,sha256=_bnO8J2EUkliWivey_1le0UrnocFKmyVMQjbQ8iVXjc,5
+mcli_framework-7.13.0.dist-info/RECORD,,

mcli/app/store_cmd.py

@@ -1,448 +0,0 @@
-"""
-Top-level store management commands for MCLI.
-Manages command store - sync ~/.mcli/commands/ to git.
-"""
-
-import shutil
-import subprocess
-from datetime import datetime
-from pathlib import Path
-
-import click
-
-from mcli.lib.logger.logger import get_logger
-from mcli.lib.ui.styling import error, info, success, warning
-
-logger = get_logger(__name__)
-
-# Command store configuration
-DEFAULT_STORE_PATH = Path.home() / "repos" / "mcli-commands"
-COMMANDS_PATH = Path.home() / ".mcli" / "commands"
-
-
-def _get_store_path() -> Path:
-    """Get store path from config or default."""
-    config_file = Path.home() / ".mcli" / "store.conf"
-
-    if config_file.exists():
-        store_path = Path(config_file.read_text().strip())
-        if store_path.exists():
-            return store_path
-
-    # Use default
-    return DEFAULT_STORE_PATH
-
-
-@click.group(name="store")
-def store():
-    """Manage command store - sync ~/.mcli/commands/ to git."""
-
-
-@store.command(name="init")
-@click.option("--path", "-p", type=click.Path(), help=f"Store path (default: {DEFAULT_STORE_PATH})")
-@click.option("--remote", "-r", help="Git remote URL (optional)")
-def init_store(path, remote):
-    """Initialize command store with git."""
-    store_path = Path(path) if path else DEFAULT_STORE_PATH
-
-    try:
-        # Create store directory
-        store_path.mkdir(parents=True, exist_ok=True)
-
-        # Initialize git if not already initialized
-        git_dir = store_path / ".git"
-        if not git_dir.exists():
-            subprocess.run(["git", "init"], cwd=store_path, check=True, capture_output=True)
-            success(f"Initialized git repository at {store_path}")
-
-            # Create .gitignore
-            gitignore = store_path / ".gitignore"
-            gitignore.write_text("*.backup\n.DS_Store\n")
-
-            # Create README
-            readme = store_path / "README.md"
-            readme.write_text(
-                f"""# MCLI Commands Store
-
-Personal workflow commands for mcli framework.
-
-## Usage
-
-Push commands:
-```bash
-mcli store push
-```
-
-Pull commands:
-```bash
-mcli store pull
-```
-
-Sync (bidirectional):
-```bash
-mcli store sync
-```
-
-## Structure
-
-All JSON command files from `~/.mcli/commands/` are stored here and version controlled.
-
-Last updated: {datetime.now().isoformat()}
-"""
-            )
-
-            # Add remote if provided
-            if remote:
-                subprocess.run(
-                    ["git", "remote", "add", "origin", remote], cwd=store_path, check=True
-                )
-                success(f"Added remote: {remote}")
-        else:
-            info(f"Git repository already exists at {store_path}")
-
-        # Save store path to config
-        config_file = Path.home() / ".mcli" / "store.conf"
-        config_file.parent.mkdir(parents=True, exist_ok=True)
-        config_file.write_text(str(store_path))
-
-        success(f"Command store initialized at {store_path}")
-        info(f"Store path saved to {config_file}")
-
-    except subprocess.CalledProcessError as e:
-        error(f"Git command failed: {e}")
-        logger.error(f"Git init failed: {e}")
-    except Exception as e:
-        error(f"Failed to initialize store: {e}")
-        logger.exception(e)
-
-
-@store.command(name="push")
-@click.option("--message", "-m", help="Commit message")
-@click.option("--all", "-a", is_flag=True, help="Push all files (including backups)")
-@click.option(
-    "--global", "-g", "is_global", is_flag=True, help="Push global commands instead of local"
-)
-def push_commands(message, all, is_global):
-    """
-    Push commands to git store.
-
-    By default pushes local commands (if in git repo), use --global/-g for global commands.
-    """
-    try:
-        store_path = _get_store_path()
-        from mcli.lib.paths import get_custom_commands_dir
-
-        COMMANDS_PATH = get_custom_commands_dir(global_mode=is_global)
-
-        # Copy commands to store
-        info(f"Copying commands from {COMMANDS_PATH} to {store_path}...")
-
-        copied_count = 0
-        for item in COMMANDS_PATH.glob("*"):
-            # Skip backups unless --all specified
-            if not all and item.name.endswith(".backup"):
-                continue
-
-            dest = store_path / item.name
-            if item.is_file():
-                shutil.copy2(item, dest)
-                copied_count += 1
-            elif item.is_dir():
-                shutil.copytree(item, dest, dirs_exist_ok=True)
-                copied_count += 1
-
-        success(f"Copied {copied_count} items to store")
-
-        # Git add, commit, push
-        subprocess.run(["git", "add", "."], cwd=store_path, check=True)
-
-        # Check if there are changes
-        result = subprocess.run(
-            ["git", "status", "--porcelain"], cwd=store_path, capture_output=True, text=True
-        )
-
-        if not result.stdout.strip():
-            info("No changes to commit")
-            return
-
-        # Commit with message
-        commit_msg = message or f"Update commands {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
-        subprocess.run(["git", "commit", "-m", commit_msg], cwd=store_path, check=True)
-        success(f"Committed changes: {commit_msg}")
-
-        # Push to remote if configured
-        try:
-            subprocess.run(["git", "push"], cwd=store_path, check=True, capture_output=True)
-            success("Pushed to remote")
-        except subprocess.CalledProcessError:
-            warning("No remote configured or push failed. Commands committed locally.")
-
-    except Exception as e:
-        error(f"Failed to push commands: {e}")
-        logger.exception(e)
-
-
-@store.command(name="pull")
-@click.option("--force", "-f", is_flag=True, help="Overwrite local commands without backup")
-@click.option(
-    "--global", "-g", "is_global", is_flag=True, help="Pull to global commands instead of local"
-)
-def pull_commands(force, is_global):
-    """
-    Pull commands from git store.
-
-    By default pulls to local commands (if in git repo), use --global/-g for global commands.
-    """
-    try:
-        store_path = _get_store_path()
-        from mcli.lib.paths import get_custom_commands_dir
-
-        COMMANDS_PATH = get_custom_commands_dir(global_mode=is_global)
-
-        # Pull from remote
-        try:
-            subprocess.run(["git", "pull"], cwd=store_path, check=True)
-            success("Pulled latest changes from remote")
-        except subprocess.CalledProcessError:
-            warning("No remote configured or pull failed. Using local store.")
-
-        # Backup existing commands if not force
-        if not force and COMMANDS_PATH.exists():
-            backup_dir = (
-                COMMANDS_PATH.parent / f"commands_backup_{datetime.now().strftime('%Y%m%d_%H%M%S')}"
-            )
-            shutil.copytree(COMMANDS_PATH, backup_dir)
-            info(f"Backed up existing commands to {backup_dir}")
-
-        # Copy from store to commands directory
-        info(f"Copying commands from {store_path} to {COMMANDS_PATH}...")
-
-        COMMANDS_PATH.mkdir(parents=True, exist_ok=True)
-
-        copied_count = 0
-        for item in store_path.glob("*"):
-            # Skip git directory and README
-            if item.name in [".git", "README.md", ".gitignore"]:
-                continue
-
-            dest = COMMANDS_PATH / item.name
-            if item.is_file():
-                shutil.copy2(item, dest)
-                copied_count += 1
-            elif item.is_dir():
-                shutil.copytree(item, dest, dirs_exist_ok=True)
-                copied_count += 1
-
-        success(f"Pulled {copied_count} items from store")
-
-    except Exception as e:
-        error(f"Failed to pull commands: {e}")
-        logger.exception(e)
-
-
-@store.command(name="sync")
-@click.option("--message", "-m", help="Commit message if pushing")
-@click.option(
-    "--global", "-g", "is_global", is_flag=True, help="Sync global commands instead of local"
-)
-def sync_commands(message, is_global):
-    """
-    Sync commands bidirectionally (pull then push if changes).
-
-    By default syncs local commands (if in git repo), use --global/-g for global commands.
-    """
-    try:
-        store_path = _get_store_path()
-        from mcli.lib.paths import get_custom_commands_dir
-
-        COMMANDS_PATH = get_custom_commands_dir(global_mode=is_global)
-
-        # First pull
-        info("Pulling latest changes...")
-        try:
-            subprocess.run(["git", "pull"], cwd=store_path, check=True, capture_output=True)
-            success("Pulled from remote")
-        except subprocess.CalledProcessError:
-            warning("No remote or pull failed")
-
-        # Then push local changes
-        info("Pushing local changes...")
-
-        # Copy commands
-        for item in COMMANDS_PATH.glob("*"):
-            if item.name.endswith(".backup"):
-                continue
-            dest = store_path / item.name
-            if item.is_file():
-                shutil.copy2(item, dest)
-            elif item.is_dir():
-                shutil.copytree(item, dest, dirs_exist_ok=True)
-
-        # Check for changes
-        result = subprocess.run(
-            ["git", "status", "--porcelain"], cwd=store_path, capture_output=True, text=True
-        )
-
-        if not result.stdout.strip():
-            success("Everything in sync!")
-            return
-
-        # Commit and push
-        subprocess.run(["git", "add", "."], cwd=store_path, check=True)
-        commit_msg = message or f"Sync commands {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
-        subprocess.run(["git", "commit", "-m", commit_msg], cwd=store_path, check=True)
-
-        try:
-            subprocess.run(["git", "push"], cwd=store_path, check=True, capture_output=True)
-            success("Synced and pushed to remote")
-        except subprocess.CalledProcessError:
-            success("Synced locally (no remote configured)")
-
-    except Exception as e:
-        error(f"Sync failed: {e}")
-        logger.exception(e)
-
-
-@store.command(name="status")
-def store_status():
-    """Show git status of command store."""
-    try:
-        store_path = _get_store_path()
-
-        click.echo(f"\n📦 Store: {store_path}\n")
-
-        # Git status
-        result = subprocess.run(
-            ["git", "status", "--short", "--branch"], cwd=store_path, capture_output=True, text=True
-        )
-
-        if result.stdout:
-            click.echo(result.stdout)
-
-        # Show remote
-        result = subprocess.run(
-            ["git", "remote", "-v"], cwd=store_path, capture_output=True, text=True
-        )
-
-        if result.stdout:
-            click.echo("\n🌐 Remotes:")
-            click.echo(result.stdout)
-        else:
-            info("\nNo remote configured")
-
-        click.echo()
-
-    except Exception as e:
-        error(f"Failed to get status: {e}")
-        logger.exception(e)
-
-
-@store.command(name="config")
-@click.option("--remote", "-r", help="Set git remote URL")
-@click.option("--path", "-p", type=click.Path(), help="Change store path")
-def configure_store(remote, path):
-    """Configure store settings."""
-    try:
-        store_path = _get_store_path()
-
-        if path:
-            new_path = Path(path).expanduser().resolve()
-            config_file = Path.home() / ".mcli" / "store.conf"
-            config_file.write_text(str(new_path))
-            success(f"Store path updated to: {new_path}")
-            return
-
-        if remote:
-            # Check if remote exists
-            result = subprocess.run(
-                ["git", "remote"], cwd=store_path, capture_output=True, text=True
-            )
-
-            if "origin" in result.stdout:
-                subprocess.run(
-                    ["git", "remote", "set-url", "origin", remote], cwd=store_path, check=True
-                )
-                success(f"Updated remote URL: {remote}")
-            else:
-                subprocess.run(
-                    ["git", "remote", "add", "origin", remote], cwd=store_path, check=True
-                )
-                success(f"Added remote URL: {remote}")
-
-    except Exception as e:
-        error(f"Configuration failed: {e}")
-        logger.exception(e)
-
-
-@store.command(name="list")
-@click.option("--store-dir", "-s", is_flag=True, help="List store instead of local")
-def list_commands(store_dir):
-    """List all commands."""
-    try:
-        if store_dir:
-            store_path = _get_store_path()
-            path = store_path
-            title = f"Commands in store ({store_path})"
-        else:
-            path = COMMANDS_PATH
-            title = f"Local commands ({COMMANDS_PATH})"
-
-        click.echo(f"\n{title}:\n")
-
-        if not path.exists():
-            warning(f"Directory does not exist: {path}")
-            return
-
-        items = sorted(path.glob("*"))
-        if not items:
-            info("No commands found")
-            return
-
-        for item in items:
-            if item.name in [".git", ".gitignore", "README.md"]:
-                continue
-
-            if item.is_file():
-                size = item.stat().st_size / 1024
-                modified = datetime.fromtimestamp(item.stat().st_mtime).strftime("%Y-%m-%d %H:%M")
-                click.echo(f"  📄 {item.name:<40} {size:>8.1f} KB  {modified}")
-            elif item.is_dir():
-                count = len(list(item.glob("*")))
-                click.echo(f"  📁 {item.name:<40} {count:>3} files")
-
-        click.echo()
-
-    except Exception as e:
-        error(f"Failed to list commands: {e}")
-        logger.exception(e)
-
-
-@store.command(name="show")
-@click.argument("command_name")
-@click.option("--store-dir", "-s", is_flag=True, help="Show from store instead of local")
-def show_command(command_name, store_dir):
-    """Show command file contents."""
-    try:
-        if store_dir:
-            store_path = _get_store_path()
-            path = store_path / command_name
-        else:
-            path = COMMANDS_PATH / command_name
-
-        if not path.exists():
-            error(f"Command not found: {command_name}")
-            return
-
-        if path.is_file():
-            click.echo(f"\n📄 {path}:\n")
-            click.echo(path.read_text())
-        else:
-            info(f"{command_name} is a directory")
-            for item in sorted(path.glob("*")):
-                click.echo(f"  {item.name}")
-
-        click.echo()
-
-    except Exception as e:
-        error(f"Failed to show command: {e}")
-        logger.exception(e)