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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codedthemes-cli
-Version: 0.1.12
+Version: 0.1.14
 Summary: CLI tool for Code Theme and Integration
 Author: codedthemes
 Requires-Python: >=3.10
@@ -38,7 +38,15 @@ codedthemes login
 ```
 *Enter your registered email and license key when prompted.*
 
-### 2. Initialization (Optional)
+### 2. Logout
+
+Log out from the current device to free up a license slot on the server.
+
+```bash
+codedthemes logout
+```
+
+### 3. Initialization (Optional)
 
 Initialize your repository to establish a baseline for synchronization. This is recommended for first-time use in a project.
 

{codedthemes_cli-0.1.12 → codedthemes_cli-0.1.14}/README.md

@@ -28,7 +28,15 @@ codedthemes login
 ```
 *Enter your registered email and license key when prompted.*
 
-### 2. Initialization (Optional)
+### 2. Logout
+
+Log out from the current device to free up a license slot on the server.
+
+```bash
+codedthemes logout
+```
+
+### 3. Initialization (Optional)
 
 Initialize your repository to establish a baseline for synchronization. This is recommended for first-time use in a project.
 

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

@@ -29,6 +29,7 @@ def handle_login(server_url: str = None):
             choice = input("Switch account? (y/N): ").strip().lower()
             if choice not in ['y', 'yes']:
                 print("Login cancelled.")
+                print("Please enter your credentials to log in.")
                 return
         except:
             pass
@@ -62,28 +63,25 @@ def handle_login(server_url: str = None):
             "device_name": device_name
         })
         
-        if isinstance(result, dict):
-            if result.get("status") == "error":
-                print(f"✖ Login failed: {result.get('message', 'Unknown error')}")
-                sys.exit(1)
-            elif "message" in result and "Login failed" in result["message"]:
-                print(f"✖ {result['message']}")
+        if result.get("status") == "success":
+            token = result.get("access_token")
+            if not token:
+                print("✖ Login failed: No access token returned. Please check your credentials.")
                 sys.exit(1)
 
-        # Get token from result
-        token = result.get("access_token") if isinstance(result, dict) else None
-        
-        if not token:
-            print("✖ Login failed: No access token returned. Please check your credentials.")
-            sys.exit(1)
+            # LAZY CONFIG: Only save if login succeeded
+            save_config({
+                "access_token": token,
+                "server_url": client.server_url,
+                "device_id": device_id,
+                "license_key": license_key
+            })
 
-        save_config({
-            "server_url": client.server_url,
-            "access_token": token
-        })
-
-        print("✔ Login successful.")
-        print("\n🚀 Next Step: Run 'codedthemes init' to initialize your repository and sync it with the cloud.")
+            print(f"✔ {result.get('message')}")
+            print("\n🚀 Next Step: Run 'codedthemes init' to initialize your repository and sync it with the cloud.")
+        else:
+            print(f"✖ {result.get('message', 'Login failed')}")
+            sys.exit(1)
     except Exception as e:
         err_msg = str(e)
         if "timed out" in err_msg.lower():
@@ -93,7 +91,45 @@ def handle_login(server_url: str = None):
         sys.exit(1)
 
 
+def handle_logout():
+    """
+    Clears local session and notifies server to de-authenticate this device.
+    """
+    try:
+        config = load_config()
+        token = config.get("access_token")
+        license_key = config.get("license_key")
+        
+        if not token:
+            print("ℹ Not logged in.")
+            return
+
+        device_id = get_device_id()
+        client = MCPClient()
+        
+        print("Logging out...")
+        if license_key:
+            try:
+                client.call("logout", {
+                    "license_key": license_key,
+                    "device_id": device_id
+                })
+            except Exception as e:
+                # Silently fail if server logout fails, we still want to clear local state
+                pass
+        
+        # Local cleanup: Remove config.json but KEEP device.json
+        from .config import CONFIG_FILE
+        if CONFIG_FILE.exists():
+            CONFIG_FILE.unlink()
+            
+        print("✔ Logged out successfully.")
+    except Exception as e:
+        print(f"✖ Logout failed: {e}")
+
+
 def handle_init():
+
     """
     Initializes the local repository and syncs it with the cloud.
     """
@@ -413,6 +449,8 @@ def main():
     apply_parser.add_argument("query", help="Description of changes to make")
 
     subparsers.add_parser("init", help="Initialize repository and sync to cloud")
+    subparsers.add_parser("logout", help="Log out from current device")
+
 
     args = parser.parse_args()
 
@@ -426,6 +464,9 @@ def main():
         handle_init()
     elif args.command == "apply":
         handle_apply(args.query)
+    elif args.command == "logout":
+        handle_logout()
+
 
 
 if __name__ == "__main__":

{codedthemes_cli-0.1.12 → codedthemes_cli-0.1.14}/codedthemes/config.py

@@ -29,27 +29,41 @@ def save_config(data: dict):
 
 def get_device_id():
     """
-    Generates or retrieves a unique device ID for the machine.
+    Returns a unique device ID, stored globally in ~/.codedthemes/device.json.
     """
+    device_file = CONFIG_DIR / "device.json"
     
-    config = load_config()
-    if "device_id" in config:
-        return config["device_id"]
-        
-    # Generate a stable device ID based on hostname and machine UUID
+    if device_file.exists():
+        try:
+            with open(device_file, "r") as f:
+                data = json.load(f)
+                if data.get("device_id"):
+                    return data["device_id"]
+        except:
+            pass
+
+    # Generate new device ID
     try:
         hostname = socket.gethostname()
-        device_uuid = str(uuid.getnode()) # MAC address based
+        device_uuid = str(uuid.getnode())
         raw_id = f"{hostname}-{device_uuid}"
         device_id = hashlib.sha256(raw_id.encode()).hexdigest()[:12]
     except:
         device_id = str(uuid.uuid4())[:12]
+    
+    # Save globally (create dir if not exists)
+    CONFIG_DIR.mkdir(exist_ok=True)
+    try:
+        with open(device_file, "w") as f:
+            json.dump({"device_id": device_id}, f)
+    except:
+        pass
         
-    save_config({"device_id": device_id})
     return device_id
 
 
 
+
 def load_config():
     """
     Loads the configuration data from the config file.

{codedthemes_cli-0.1.12 → codedthemes_cli-0.1.14}/codedthemes/mcp_client.py

@@ -66,12 +66,15 @@ class MCPClient:
         if self.token:
             headers["Authorization"] = f"Bearer {self.token}"
 
-        # Login uses a dedicated endpoint, not the tools bridge
+        # Login and Logout use dedicated endpoints
         if tool_name == "login":
             url = f"{self.server_url}/auth/login"
+        elif tool_name == "logout":
+            url = f"{self.server_url}/auth/logout"
         else:
             url = f"{self.server_url}/tools/{tool_name}"
 
+
         response = requests.post(
             url,
             json=payload,

{codedthemes_cli-0.1.12 → codedthemes_cli-0.1.14}/codedthemes/repo_utils.py

@@ -104,20 +104,21 @@ def _is_gitignored(rel_path, patterns):
 
 def detect_repo_root(start_path=None):
     """
-    Traverses up from start_path to find a repository root containing 
-    package.json, pyproject.toml, ai.json, or .git.
+    Checks if the current directory contains ai.json or .git.
+    Strictly restricted to the current path (no upward traversal) to avoid 
+    incorrectly detecting parent repos.
     """
     if not start_path:
         start_path = os.getcwd()
 
     current = Path(start_path).resolve()
 
-    while current != current.parent:
-        if any((current / f).exists() for f in ["package.json", "pyproject.toml", "ai.json", ".git"]):
-            return current
-        current = current.parent
+    if any((current / f).exists() for f in ["ai.json", ".git"]):
+        return current
+
+    raise Exception("No repository root found. Please run this command inside a Git repository or one initialized with 'codedthemes init'.")
+
 
-    raise Exception("No repository root found.")
 
 
 def zip_repo(repo_root):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codedthemes-cli
-Version: 0.1.12
+Version: 0.1.14
 Summary: CLI tool for Code Theme and Integration
 Author: codedthemes
 Requires-Python: >=3.10
@@ -38,7 +38,15 @@ codedthemes login
 ```
 *Enter your registered email and license key when prompted.*
 
-### 2. Initialization (Optional)
+### 2. Logout
+
+Log out from the current device to free up a license slot on the server.
+
+```bash
+codedthemes logout
+```
+
+### 3. Initialization (Optional)
 
 Initialize your repository to establish a baseline for synchronization. This is recommended for first-time use in a project.
 

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

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