codedthemes-cli 0.1.10__tar.gz → 0.1.12__tar.gz

{codedthemes_cli-0.1.10 → codedthemes_cli-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codedthemes-cli
-Version: 0.1.10
+Version: 0.1.12
 Summary: CLI tool for Code Theme and Integration
 Author: codedthemes
 Requires-Python: >=3.10

{codedthemes_cli-0.1.10 → codedthemes_cli-0.1.12}/codedthemes/cli.py

@@ -8,19 +8,48 @@ from getpass import getpass
 import jwt
 import requests
 
-from .config import save_config, load_config
+from .config import save_config, load_config, get_device_id
 from .mcp_client import MCPClient
 from .repo_utils import detect_repo_root, zip_repo
 from .sync_manager import SyncManager
+import socket
 
 
 def handle_login(server_url: str = None):
     """
     Handles user authentication with the MCP server.
     """
+    config = load_config()
+    existing_token = config.get("access_token")
+    if existing_token:
+        try:
+            decoded = jwt.decode(existing_token, options={"verify_signature": False})
+            existing_email = decoded.get("email", "unknown")
+            print(f"ℹ Currently logged in as: {existing_email}")
+            choice = input("Switch account? (y/N): ").strip().lower()
+            if choice not in ['y', 'yes']:
+                print("Login cancelled.")
+                return
+        except:
+            pass
+
     email = input("Email: ").strip()
     license_key = input("License key: ").strip()
     
+    # Idempotent check: Are we already logged in as this user?
+    if existing_token:
+        try:
+            decoded = jwt.decode(existing_token, options={"verify_signature": False})
+            if decoded.get("email") == email:
+                print(f"✔ Already logged in as {email}. Nothing changed.")
+                return
+        except:
+            pass
+
+    device_id = get_device_id()
+
+    device_name = socket.gethostname()
+
     client = MCPClient()
     if server_url:
         client.server_url = server_url
@@ -28,7 +57,9 @@ def handle_login(server_url: str = None):
     try:
         result = client.call("login", {
             "email": email,
-            "license_key": license_key
+            "license_key": license_key,
+            "device_id": device_id,
+            "device_name": device_name
         })
         
         if isinstance(result, dict):
@@ -39,27 +70,13 @@ def handle_login(server_url: str = None):
                 print(f"✖ {result['message']}")
                 sys.exit(1)
 
-        # Get token from result or local fallback
+        # Get token from result
         token = result.get("access_token") if isinstance(result, dict) else None
         
-        if not token:
-            token_file = os.path.expanduser("~/.mcp_token")
-            if os.path.exists(token_file):
-                with open(token_file, 'r') as f:
-                    token = f.read().strip()
-                    
         if not token:
             print("✖ Login failed: No access token returned. Please check your credentials.")
             sys.exit(1)
 
-        # Store token for both local MCP and CLI config
-        token_file = os.path.expanduser("~/.mcp_token")
-        try:
-            with open(token_file, 'w') as f:
-                f.write(token)
-        except Exception as e:
-            print(f"Warning: Could not write {token_file}: {e}")
-
         save_config({
             "server_url": client.server_url,
             "access_token": token
@@ -133,7 +150,8 @@ def handle_init():
         print('     "mcpServers": {')
         print('       "code-theme-mcp": {')
         print('         "type": "sse",')
-        print('         "serverURL": "https://mcp.codedthemes.com/api/mcp"')
+        print('         "serverURL": "https://mcp.codedthemes.com/api/mcp",')
+        print(f'         "env": {{ "CODEDTHEMES_TOKEN": "{client.token}" }}')
         print('       }')
         print('     }')
         print('   }\n')
@@ -146,7 +164,8 @@ def handle_init():
         print('     "servers": {')
         print('       "code-theme-mcp": {')
         print('         "url": "https://mcp.codedthemes.com/api/mcp",')
-        print('         "type": "http"')
+        print('         "type": "http",')
+        print(f'         "env": {{ "CODEDTHEMES_TOKEN": "{client.token}" }}')
         print('       }')
         print('     },')
         print('     "inputs": []')
@@ -160,7 +179,8 @@ def handle_init():
         print('     "mcpServers": {')
         print('       "code-theme-mcp": {')
         print('         "transport": "sse",')
-        print('         "url": "https://mcp.codedthemes.com/api/mcp"')
+        print('         "url": "https://mcp.codedthemes.com/api/mcp",')
+        print(f'         "env": {{ "CODEDTHEMES_TOKEN": "{client.token}" }}')
         print('       }')
         print('     }')
         print('   }\n')
@@ -207,14 +227,26 @@ def handle_apply(query: str):
         if workspace_id:
             try:
                 check = client.call("check_workspace", {"workspace_id": workspace_id})
+                if isinstance(check, dict) and check.get("status") == "error" and check.get("message") == "WORKSPACE_EVICTED":
+                    print("\n⚠ Your workspace is inactive.")
+                    print("It was unloaded from the server due to 30 minutes of inactivity.")
+                    print("\nRun '\033[1mcodedthemes init\033[0m' to restore your workspace.\n")
+                    sys.exit(0)
+                
                 if isinstance(check, dict) and check.get("status") == "ok":
                     # print(f"✔ Using active workspace: {workspace_id}")
                     pass
                 else:
                     workspace_id = None
-            except:
+            except Exception as e:
+                if "WORKSPACE_EVICTED" in str(e):
+                    print("\n⚠ Your workspace is inactive.")
+                    print("It was unloaded from the server due to 30 minutes of inactivity.")
+                    print("\nRun '\033[1mcodedthemes init\033[0m' to restore your workspace.\n")
+                    sys.exit(0)
                 workspace_id = None
 
+
         if not workspace_id:
             print("📦 Zipping and uploading repository (this may take a moment)...")
             upload_result = client.upload_workspace(repo_abs_path, user_email)

codedthemes_cli-0.1.12/codedthemes/config.py

@@ -0,0 +1,63 @@
+import json
+import socket
+import hashlib
+import uuid
+from pathlib import Path
+
+# Stores token at ~/.codedthemes/config.json
+CONFIG_DIR = Path.home() / ".codedthemes"
+CONFIG_FILE = CONFIG_DIR / "config.json"
+
+
+def ensure_config_dir():
+    """
+    Ensures the configuration directory exists.
+    """
+    CONFIG_DIR.mkdir(exist_ok=True)
+
+
+def save_config(data: dict):
+    """
+    Saves the provided configuration data to the config file (merging with existing).
+    """
+    ensure_config_dir()
+    existing = load_config()
+    existing.update(data)
+    with open(CONFIG_FILE, "w") as f:
+        json.dump(existing, f, indent=2)
+
+
+def get_device_id():
+    """
+    Generates or retrieves a unique device ID for the machine.
+    """
+    
+    config = load_config()
+    if "device_id" in config:
+        return config["device_id"]
+        
+    # Generate a stable device ID based on hostname and machine UUID
+    try:
+        hostname = socket.gethostname()
+        device_uuid = str(uuid.getnode()) # MAC address based
+        raw_id = f"{hostname}-{device_uuid}"
+        device_id = hashlib.sha256(raw_id.encode()).hexdigest()[:12]
+    except:
+        device_id = str(uuid.uuid4())[:12]
+        
+    save_config({"device_id": device_id})
+    return device_id
+
+
+
+def load_config():
+    """
+    Loads the configuration data from the config file.
+    """
+    if not CONFIG_FILE.exists():
+        return {}
+    with open(CONFIG_FILE, "r") as f:
+        try:
+            return json.load(f)
+        except json.JSONDecodeError:
+            return {}

{codedthemes_cli-0.1.10 → codedthemes_cli-0.1.12}/codedthemes_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codedthemes-cli
-Version: 0.1.10
+Version: 0.1.12
 Summary: CLI tool for Code Theme and Integration
 Author: codedthemes
 Requires-Python: >=3.10

{codedthemes_cli-0.1.10 → codedthemes_cli-0.1.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codedthemes-cli"
-version = "0.1.10"
+version = "0.1.12"
 description = "CLI tool for Code Theme and Integration"
 readme = "README.md"
 requires-python = ">=3.10"

codedthemes_cli-0.1.10/codedthemes/config.py

@@ -1,35 +0,0 @@
-import json
-from pathlib import Path
-
-# Stores token at ~/.codedthemes/config.json
-CONFIG_DIR = Path.home() / ".codedthemes"
-CONFIG_FILE = CONFIG_DIR / "config.json"
-
-
-def ensure_config_dir():
-    """
-    Ensures the configuration directory exists.
-    """
-    CONFIG_DIR.mkdir(exist_ok=True)
-
-
-def save_config(data: dict):
-    """
-    Saves the provided configuration data to the config file.
-    """
-    ensure_config_dir()
-    with open(CONFIG_FILE, "w") as f:
-        json.dump(data, f, indent=2)
-
-
-def load_config():
-    """
-    Loads the configuration data from the config file.
-    """
-    if not CONFIG_FILE.exists():
-        return {}
-    with open(CONFIG_FILE, "r") as f:
-        try:
-            return json.load(f)
-        except json.JSONDecodeError:
-            return {}