mcli-framework 8.0.44__tar.gz → 8.0.46__tar.gz

{mcli_framework-8.0.44 → mcli_framework-8.0.46}/MANIFEST.in

@@ -17,12 +17,8 @@ recursive-include src/mcli *.toml
 graft mcli_rust/src
 include mcli_rust/Cargo.toml
 
-# Include GitHub workflows and configuration
-recursive-include .github *.yml *.yaml
-
-# Include tests (optional, for development)
-recursive-include tests *.py
-include tests/*.ini
+# Exclude CI/test files from distribution (not needed for end users)
+# GitHub workflows and test files are available in the source repository
 
 # Exclude build artifacts
 prune build/

{mcli_framework-8.0.44 → mcli_framework-8.0.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcli-framework
-Version: 8.0.44
+Version: 8.0.46
 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>
@@ -37,10 +37,12 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click<9.0.0,>=8.1.7
-Requires-Dist: rich>=14.0.0
+Requires-Dist: rich<15.0.0,>=14.0.0
 Requires-Dist: requests<3.0.0,>=2.31.0
-Requires-Dist: tomli>=2.2.1
-Requires-Dist: python-dotenv>=1.1.1
+Requires-Dist: tomli<3.0.0,>=2.2.1
+Requires-Dist: python-dotenv<2.0.0,>=1.1.1
+Requires-Dist: pydantic<3.0.0,>=2.0.0
+Requires-Dist: pydantic-settings<3.0.0,>=2.0.0
 Requires-Dist: watchdog<4.0.0,>=3.0.0
 Requires-Dist: tqdm<5.0.0,>=4.66.1
 Requires-Dist: humanize<5.0.0,>=4.9.0
@@ -48,22 +50,22 @@ Requires-Dist: psutil<6.0.0,>=5.9.0
 Requires-Dist: inquirerpy<0.4.0,>=0.3.4
 Requires-Dist: gitpython<4.0.0,>=3.1.40
 Requires-Dist: prompt-toolkit<4.0.0,>=3.0.0
-Requires-Dist: aiohttp>=3.13.3
-Requires-Dist: httpx>=0.28.1
-Requires-Dist: websockets>=12.0
-Requires-Dist: beautifulsoup4>=4.13.5
-Requires-Dist: fuzzywuzzy>=0.18.0
+Requires-Dist: aiohttp<4.0.0,>=3.13.3
+Requires-Dist: httpx<1.0.0,>=0.28.1
+Requires-Dist: websockets<14.0.0,>=12.0
+Requires-Dist: beautifulsoup4<5.0.0,>=4.13.5
+Requires-Dist: fuzzywuzzy<1.0.0,>=0.18.0
 Requires-Dist: openai<2.0.0,>=1.3.0
-Requires-Dist: anthropic>=0.60.0
-Requires-Dist: ollama>=0.5.3
+Requires-Dist: anthropic<1.0.0,>=0.60.0
+Requires-Dist: ollama<1.0.0,>=0.5.3
 Requires-Dist: ipython<9.0.0,>=8.12.0
-Requires-Dist: fastapi>=0.110.0
-Requires-Dist: uvicorn>=0.27.0
-Requires-Dist: uvloop>=0.19.0
-Requires-Dist: aiosqlite>=0.20.0
-Requires-Dist: redis>=5.0.0
-Requires-Dist: aiohttp-sse-client>=0.2.1
-Requires-Dist: aiomqtt>=2.0.0
+Requires-Dist: fastapi<1.0.0,>=0.110.0
+Requires-Dist: uvicorn<1.0.0,>=0.27.0
+Requires-Dist: uvloop<1.0.0,>=0.19.0
+Requires-Dist: aiosqlite<1.0.0,>=0.20.0
+Requires-Dist: redis<6.0.0,>=5.0.0
+Requires-Dist: aiohttp-sse-client<1.0.0,>=0.2.1
+Requires-Dist: aiomqtt<3.0.0,>=2.0.0
 Provides-Extra: dev
 Requires-Dist: pytest>=8.4.1; extra == "dev"
 Requires-Dist: pytest-cov<5.0.0,>=4.1.0; extra == "dev"

{mcli_framework-8.0.44 → mcli_framework-8.0.46}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcli-framework"
-version = "8.0.44"
+version = "8.0.46"
 description = "Portable workflow framework - transform any script into a versioned, schedulable command. Store in ~/.mcli/workflows/, version with lockfile, run as daemon or cron job."
 readme = "README.md"
  requires-python = ">=3.10"
@@ -37,10 +37,12 @@ classifiers = [
 dependencies = [
   # Core CLI dependencies
   "click>=8.1.7,<9.0.0",
-  "rich>=14.0.0",
+  "rich>=14.0.0,<15.0.0",
   "requests>=2.31.0,<3.0.0",
-  "tomli>=2.2.1",
-  "python-dotenv>=1.1.1",
+  "tomli>=2.2.1,<3.0.0",
+  "python-dotenv>=1.1.1,<2.0.0",
+  "pydantic>=2.0.0,<3.0.0",
+  "pydantic-settings>=2.0.0,<3.0.0",
   # Core utilities
   "watchdog>=3.0.0,<4.0.0",
   "tqdm>=4.66.1,<5.0.0",
@@ -50,25 +52,25 @@ dependencies = [
   "gitpython>=3.1.40,<4.0.0",
   "prompt-toolkit>=3.0.0,<4.0.0",
   # Basic HTTP/async support
-  "aiohttp>=3.13.3",  # CVE-2025-69223 through CVE-2025-69230 fixes
-  "httpx>=0.28.1",
-  "websockets>=12.0",
+  "aiohttp>=3.13.3,<4.0.0",  # CVE-2025-69223 through CVE-2025-69230 fixes
+  "httpx>=0.28.1,<1.0.0",
+  "websockets>=12.0,<14.0.0",
   # Data parsing
-  "beautifulsoup4>=4.13.5",
-  "fuzzywuzzy>=0.18.0",
+  "beautifulsoup4>=4.13.5,<5.0.0",
+  "fuzzywuzzy>=0.18.0,<1.0.0",
   # Chat and AI capabilities
   "openai>=1.3.0,<2.0.0",
-  "anthropic>=0.60.0",
-  "ollama>=0.5.3",
+  "anthropic>=0.60.0,<1.0.0",
+  "ollama>=0.5.3,<1.0.0",
   "ipython>=8.12.0,<9.0.0",
   # Enhanced async/performance features
-  "fastapi>=0.110.0",
-  "uvicorn>=0.27.0",
-  "uvloop>=0.19.0",
-  "aiosqlite>=0.20.0",
-  "redis>=5.0.0",
-  "aiohttp-sse-client>=0.2.1",
-  "aiomqtt>=2.0.0",
+  "fastapi>=0.110.0,<1.0.0",
+  "uvicorn>=0.27.0,<1.0.0",
+  "uvloop>=0.19.0,<1.0.0",
+  "aiosqlite>=0.20.0,<1.0.0",
+  "redis>=5.0.0,<6.0.0",
+  "aiohttp-sse-client>=0.2.1,<1.0.0",
+  "aiomqtt>=2.0.0,<3.0.0",
 ]
 
 [project.urls]
@@ -177,20 +179,15 @@ disable_error_code = [
     "index",
     "type-arg",
     "override",
-    "comparison-overlap",
-    "redundant-expr",
     "no-any-return",
     "has-type",
     "valid-type",
     "type-var",
     "dict-item",
     "call-overload",
-    "empty-body",
     "no-redef",
     "abstract",
     "list-item",
-    "str-bytes-safe",
-    "func-returns-value",
 ]
 
 # Module discovery
@@ -259,6 +256,8 @@ requires = ["setuptools>=65.0.0", "wheel>=0.40.0"]
 build-backend = "setuptools.build_meta"
 
 [dependency-groups]
+# NOTE: This is the primary dev dependency specification (PEP 735).
+# [project.optional-dependencies] dev is kept for pip compatibility.
 dev = [
     "black>=25.0.0,<26.0.0",  # Pin to 25.x to match lockfile
     "isort>=5.13.2",
@@ -320,7 +319,7 @@ precision = 2
 skip_covered = false
 skip_empty = false
 # Fail if coverage is below threshold
-fail_under = 25.0
+fail_under = 50.0
 
 [tool.coverage.html]
 directory = "htmlcov"
@@ -338,7 +337,7 @@ addopts = [
     "--cov-report=html",
     "--cov-report=xml",
     "--cov-branch",
-    "--cov-fail-under=80",
+    "--cov-fail-under=50",
 ]
 testpaths = ["tests"]
 python_files = ["test_*.py", "*_test.py"]

{mcli_framework-8.0.44 → mcli_framework-8.0.46}/src/mcli/app/commands_cmd.py

@@ -353,7 +353,9 @@ def init_store(path, remote):
         # 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)
+            subprocess.run(
+                ["git", "init"], cwd=store_path, check=True, capture_output=True, timeout=60
+            )
             success(f"Initialized git repository at {store_path}")
 
             # Create .gitignore
@@ -395,7 +397,10 @@ Last updated: {datetime.now().isoformat()}
             # Add remote if provided
             if remote:
                 subprocess.run(
-                    ["git", "remote", "add", "origin", remote], cwd=store_path, check=True
+                    ["git", "remote", "add", "origin", remote],
+                    cwd=store_path,
+                    check=True,
+                    timeout=60,
                 )
                 success(f"Added remote: {remote}")
         else:
@@ -455,11 +460,15 @@ def push_commands(message, all, is_global):
         success(f"Copied {copied_count} items to store")
 
         # Git add, commit, push
-        subprocess.run(["git", "add", "."], cwd=store_path, check=True)
+        subprocess.run(["git", "add", "."], cwd=store_path, check=True, timeout=60)
 
         # Check if there are changes
         result = subprocess.run(
-            ["git", "status", "--porcelain"], cwd=store_path, capture_output=True, text=True
+            ["git", "status", "--porcelain"],
+            cwd=store_path,
+            capture_output=True,
+            text=True,
+            timeout=60,
         )
 
         if not result.stdout.strip():
@@ -468,12 +477,14 @@ def push_commands(message, all, is_global):
 
         # 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)
+        subprocess.run(["git", "commit", "-m", commit_msg], cwd=store_path, check=True, timeout=60)
         success(f"Committed changes: {commit_msg}")
 
         # Push to remote if configured
         try:
-            subprocess.run(["git", "push"], cwd=store_path, check=True, capture_output=True)
+            subprocess.run(
+                ["git", "push"], cwd=store_path, check=True, capture_output=True, timeout=60
+            )
             success("Pushed to remote")
         except subprocess.CalledProcessError:
             warning("No remote configured or push failed. Commands committed locally.")
@@ -502,7 +513,7 @@ def pull_commands(force, is_global):
 
         # Pull from remote
         try:
-            subprocess.run(["git", "pull"], cwd=store_path, check=True)
+            subprocess.run(["git", "pull"], cwd=store_path, check=True, timeout=60)
             success("Pulled latest changes from remote")
         except subprocess.CalledProcessError:
             warning("No remote configured or pull failed. Using local store.")
@@ -561,7 +572,9 @@ def sync_commands(message, is_global):
         # First pull
         info("Pulling latest changes...")
         try:
-            subprocess.run(["git", "pull"], cwd=store_path, check=True, capture_output=True)
+            subprocess.run(
+                ["git", "pull"], cwd=store_path, check=True, capture_output=True, timeout=60
+            )
             success("Pulled from remote")
         except subprocess.CalledProcessError:
             warning("No remote or pull failed")
@@ -581,7 +594,11 @@ def sync_commands(message, is_global):
 
         # Check for changes
         result = subprocess.run(
-            ["git", "status", "--porcelain"], cwd=store_path, capture_output=True, text=True
+            ["git", "status", "--porcelain"],
+            cwd=store_path,
+            capture_output=True,
+            text=True,
+            timeout=60,
         )
 
         if not result.stdout.strip():
@@ -589,12 +606,14 @@ def sync_commands(message, is_global):
             return
 
         # Commit and push
-        subprocess.run(["git", "add", "."], cwd=store_path, check=True)
+        subprocess.run(["git", "add", "."], cwd=store_path, check=True, timeout=60)
         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)
+        subprocess.run(["git", "commit", "-m", commit_msg], cwd=store_path, check=True, timeout=60)
 
         try:
-            subprocess.run(["git", "push"], cwd=store_path, check=True, capture_output=True)
+            subprocess.run(
+                ["git", "push"], cwd=store_path, check=True, capture_output=True, timeout=60
+            )
             success("Synced and pushed to remote")
         except subprocess.CalledProcessError:
             success("Synced locally (no remote configured)")
@@ -614,7 +633,11 @@ def store_status():
 
         # Git status
         result = subprocess.run(
-            ["git", "status", "--short", "--branch"], cwd=store_path, capture_output=True, text=True
+            ["git", "status", "--short", "--branch"],
+            cwd=store_path,
+            capture_output=True,
+            text=True,
+            timeout=60,
         )
 
         if result.stdout:
@@ -622,7 +645,7 @@ def store_status():
 
         # Show remote
         result = subprocess.run(
-            ["git", "remote", "-v"], cwd=store_path, capture_output=True, text=True
+            ["git", "remote", "-v"], cwd=store_path, capture_output=True, text=True, timeout=60
         )
 
         if result.stdout:
@@ -656,17 +679,23 @@ def configure_store(remote, path):
         if remote:
             # Check if remote exists
             result = subprocess.run(
-                ["git", "remote"], cwd=store_path, capture_output=True, text=True
+                ["git", "remote"], cwd=store_path, capture_output=True, text=True, timeout=60
             )
 
             if "origin" in result.stdout:
                 subprocess.run(
-                    ["git", "remote", "set-url", "origin", remote], cwd=store_path, check=True
+                    ["git", "remote", "set-url", "origin", remote],
+                    cwd=store_path,
+                    check=True,
+                    timeout=60,
                 )
                 success(f"Updated remote URL: {remote}")
             else:
                 subprocess.run(
-                    ["git", "remote", "add", "origin", remote], cwd=store_path, check=True
+                    ["git", "remote", "add", "origin", remote],
+                    cwd=store_path,
+                    check=True,
+                    timeout=60,
                 )
                 success(f"Added remote URL: {remote}")
 
@@ -1391,9 +1420,7 @@ def add_command(command_name, group, description, template, language, shell, is_
         if language != "ipynb":
             import stat
 
-            script_path.chmod(
-                script_path.stat().st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
-            )
+            script_path.chmod(script_path.stat().st_mode | stat.S_IXUSR | stat.S_IXGRP)
 
         logger.info(f"Created script: {script_path}")
     except Exception as e:

{mcli_framework-8.0.44 → mcli_framework-8.0.46}/src/mcli/app/main.py

@@ -11,6 +11,7 @@ from mcli.lib.logger.logger import disable_runtime_tracing, enable_runtime_traci
 
 # Desired command order for help display
 COMMAND_ORDER = [
+    "setup",
     "init",
     "new",
     "import",
@@ -20,6 +21,7 @@ COMMAND_ORDER = [
     "search",
     "list",
     "run",
+    "source",
     "context",
     "health",
     "services",
@@ -110,6 +112,10 @@ def discover_modules(base_path: Path, config_path: Optional[Path] = None) -> lis
                 config = tomli.load(f)
                 logger.debug(f"Config loaded: {config}")
             logger.debug(f"Using config from {config_path}")
+            KNOWN_CONFIG_KEYS = {"paths", "settings", "plugins", "commands", "services"}
+            unknown_keys = set(config.keys()) - KNOWN_CONFIG_KEYS
+            if unknown_keys:
+                logger.warning(f"Unknown keys in config.toml: {unknown_keys}. Check for typos.")
         except Exception as e:
             logger.warning(f"Error reading config file {config_path}: {e}")
             config = {"paths": {"included_dirs": ["app", "self", "workflow", "public"]}}
@@ -441,6 +447,15 @@ def _add_lazy_commands(app: click.Group):
     except ImportError as e:
         logger.debug(f"Could not load sync group: {e}")
 
+    # mcli setup - Onboarding wizard for new users
+    try:
+        from mcli.app.setup_cmd import setup
+
+        app.add_command(setup, name="setup")
+        logger.debug("Added setup command")
+    except ImportError as e:
+        logger.debug(f"Could not load setup command: {e}")
+
     # mcli init - Top-level shortcut to initialize workflows directory
     try:
         from mcli.app.init_cmd import init
@@ -468,6 +483,15 @@ def _add_lazy_commands(app: click.Group):
     except ImportError as e:
         logger.debug(f"Could not load health command: {e}")
 
+    # mcli source - Python source file sync
+    try:
+        from mcli.app.source_sync_cmd import source_group
+
+        app.add_command(source_group, name="source")
+        logger.debug("Added source sync command")
+    except ImportError as e:
+        logger.debug(f"Could not load source sync command: {e}")
+
     # mcli services - Service lifecycle management
     try:
         from mcli.app.services_cmd import services

{mcli_framework-8.0.44 → mcli_framework-8.0.46}/src/mcli/app/model_cmd.py

@@ -5,10 +5,8 @@ This stub exists for backwards compatibility with tests and imports.
 The actual model command implementation is now in ~/.mcli/workflows/model.json
 """
 
-import json
 import sys
 from pathlib import Path
-from typing import Any
 
 from mcli.lib.constants.paths import DirNames
 
@@ -21,38 +19,16 @@ try:
         model_json_path = Path.home() / DirNames.MCLI / "commands" / "model.json"
 
     if model_json_path.exists():
-        # Load the command from the JSON file
-        with open(model_json_path) as f:
-            command_data = json.load(f)
-
-        # Execute the code to get the app (model command group)
-        code = command_data.get("code", "")
-        namespace: dict[str, Any] = {}
-        exec(code, namespace)
-
-        # Extract the app (model command group) and individual commands
-        app = namespace.get("app")
-        if app:
-            # The model group command
-            model = app
-
-            # Extract individual subcommands from the model group
-            if hasattr(model, "commands"):
-                commands = model.commands
-                list = commands.get("list")
-                download = commands.get("download")
-                start = commands.get("start")
-                recommend = commands.get("recommend")
-                status = commands.get("status")
-                stop = commands.get("stop")
-                pull = commands.get("pull")
-                delete = commands.get("delete")
-            else:
-                # Fallback if commands aren't available
-                list = download = start = recommend = status = stop = pull = delete = None
-        else:
-            # If app is not found, create empty placeholders
-            model = list = download = start = recommend = status = stop = pull = delete = None
+        # SECURITY: Do not execute arbitrary code from JSON files (fixes #165)
+        # The model command should be registered through the workflow system instead
+        import logging
+
+        _logger = logging.getLogger(__name__)
+        _logger.warning(
+            "model.json contains executable code - skipping exec() for security. "
+            "Use workflow system instead."
+        )
+        model = list = download = start = recommend = status = stop = pull = delete = None
     else:
         # If the JSON file doesn't exist, create empty placeholders
         print(f"Warning: {model_json_path} not found", file=sys.stderr)

{mcli_framework-8.0.44 → mcli_framework-8.0.46}/src/mcli/app/new_cmd.py

@@ -696,9 +696,9 @@ def save_script(
     with open(script_path, "w") as f:
         f.write(code)
 
-    # Make executable for shell/python scripts
+    # Make executable for shell/python scripts (owner + group, not world)
     if language in (ScriptLanguages.PYTHON, ScriptLanguages.SHELL):
-        script_path.chmod(script_path.stat().st_mode | stat.S_IXUSR)
+        script_path.chmod(script_path.stat().st_mode | stat.S_IXUSR | stat.S_IXGRP)
 
     return script_path
 

mcli_framework-8.0.46/src/mcli/app/setup_cmd.py

@@ -0,0 +1,187 @@
+"""
+Onboarding wizard for new MCLI users.
+
+Provides interactive and non-interactive setup modes to configure
+MCLI with validated settings.
+"""
+
+import os
+from pathlib import Path
+
+import click
+from rich.prompt import Confirm, Prompt
+from rich.table import Table
+
+from mcli.lib.logger.logger import get_logger
+from mcli.lib.ui.styling import console, info, success
+
+logger = get_logger(__name__)
+
+
+def _write_env_file(env_dict: dict, path: Path):
+    """Write a validated env dict to a .env file, preserving existing keys."""
+    existing = {}
+    if path.exists():
+        for line in path.read_text().splitlines():
+            line = line.strip()
+            if line and not line.startswith("#") and "=" in line:
+                key, _, val = line.partition("=")
+                existing[key.strip()] = val.strip()
+
+    merged = {**existing, **env_dict}
+
+    lines = ["# MCLI Configuration (generated by mcli setup)", ""]
+    for key in sorted(merged):
+        lines.append(f"{key}={merged[key]}")
+    lines.append("")
+
+    path.write_text("\n".join(lines))
+
+
+def _write_config_toml(included_dirs: list, path: Path):
+    """Write a config.toml with paths configuration."""
+    dirs_str = ", ".join(f'"{d}"' for d in included_dirs)
+    content = f"""# MCLI Configuration
+# Generated by mcli setup
+
+[paths]
+included_dirs = [{dirs_str}]
+"""
+    path.write_text(content)
+
+
+def _run_minimal_setup():
+    """Minimal setup: just create directories and default config."""
+    from mcli.lib.config.settings import MCLISettings
+
+    settings = MCLISettings()
+    home = settings.home_path
+    home.mkdir(parents=True, exist_ok=True)
+    (home / "workflows").mkdir(exist_ok=True)
+
+    config_toml = home / "config.toml"
+    if not config_toml.exists():
+        _write_config_toml(settings.included_dirs, config_toml)
+
+    return settings
+
+
+def _run_interactive_setup():
+    """Interactive setup: ask user for configuration choices."""
+    from mcli.lib.config.settings import MCLISettings
+
+    console.print()
+    console.print("[bold cyan]MCLI Setup Wizard[/bold cyan]")
+    console.print("[dim]Configure your MCLI installation step by step.[/dim]")
+    console.print()
+
+    env_overrides = {}
+
+    # Step 1: Environment
+    env = Prompt.ask(
+        "[cyan]Environment[/cyan]",
+        choices=["development", "staging", "production"],
+        default="development",
+    )
+    if env != "development":
+        env_overrides["MCLI_ENV"] = env
+
+    # Step 2: Editor
+    default_editor = os.getenv("EDITOR", "vim")
+    editor = Prompt.ask("[cyan]Preferred editor[/cyan]", default=default_editor)
+    if editor != "vim":
+        env_overrides["EDITOR"] = editor
+
+    # Step 3: API keys (optional)
+    console.print()
+    console.print("[bold]API Keys[/bold] [dim](optional, press Enter to skip)[/dim]")
+
+    openai_key = Prompt.ask("[cyan]OpenAI API key[/cyan]", default="", show_default=False)
+    if openai_key:
+        env_overrides["OPENAI_API_KEY"] = openai_key
+
+    anthropic_key = Prompt.ask("[cyan]Anthropic API key[/cyan]", default="", show_default=False)
+    if anthropic_key:
+        env_overrides["ANTHROPIC_API_KEY"] = anthropic_key
+
+    # Step 4: Debug mode
+    console.print()
+    if Confirm.ask("[cyan]Enable debug mode?[/cyan]", default=False):
+        env_overrides["MCLI_DEBUG"] = "1"
+
+    # Build validated settings
+    settings = MCLISettings(**env_overrides, _env_file=None)
+
+    # Create directories
+    home = settings.home_path
+    home.mkdir(parents=True, exist_ok=True)
+    (home / "workflows").mkdir(exist_ok=True)
+
+    # Write config files
+    env_dict = settings.to_env_dict()
+    env_dict.update({k: v for k, v in env_overrides.items() if k not in env_dict and v})
+
+    if env_dict:
+        env_path = Path.cwd() / ".env"
+        _write_env_file(env_dict, env_path)
+        console.print(f"[green]\u2713[/green] Wrote .env to {env_path}")
+
+    config_toml = home / "config.toml"
+    if not config_toml.exists():
+        _write_config_toml(settings.included_dirs, config_toml)
+        console.print(f"[green]\u2713[/green] Wrote config.toml to {config_toml}")
+
+    return settings
+
+
+@click.command("setup")
+@click.option("--minimal", is_flag=True, help="Minimal setup (directories + defaults only)")
+@click.option("--full", is_flag=True, help="Full setup with all optional features")
+def setup(minimal, full):
+    """Interactive setup wizard for new users.
+
+    Configures MCLI with validated settings, creates necessary directories,
+    and writes configuration files.
+
+    Examples:
+        mcli setup              # Interactive wizard
+        mcli setup --minimal    # Directories + defaults only
+        mcli setup --full       # All features configured
+    """
+    from mcli.lib.config.settings import MCLISettings
+
+    if minimal:
+        settings = _run_minimal_setup()
+        success("Minimal setup complete!")
+    elif full:
+        # Full mode: same as interactive but with all prompts
+        settings = _run_interactive_setup()
+    else:
+        settings = _run_interactive_setup()
+
+    # Summary table
+    console.print()
+    table = Table(title="Setup Summary", show_header=False)
+    table.add_column("Setting", style="cyan")
+    table.add_column("Value", style="green")
+
+    table.add_row("Environment", settings.mcli_env)
+    table.add_row("Home Directory", str(settings.home_path))
+    table.add_row("Workflows", str(settings.workflows_dir))
+    table.add_row("Editor", settings.editor)
+    table.add_row("Debug Mode", "Yes" if settings.is_debug else "No")
+    table.add_row("OpenAI API", "Configured" if settings.has_api_key("openai") else "Not set")
+    table.add_row(
+        "Anthropic API",
+        "Configured" if settings.has_api_key("anthropic") else "Not set",
+    )
+
+    console.print(table)
+    console.print()
+
+    # Next steps
+    console.print("[bold]Next Steps:[/bold]")
+    console.print("  1. Initialize workflows:  [cyan]mcli init[/cyan]")
+    console.print("  2. Create a command:      [cyan]mcli new my-command[/cyan]")
+    console.print("  3. Run a command:         [cyan]mcli run my-command[/cyan]")
+    console.print()