codedthemes-cli 0.1.11__tar.gz → 0.1.13__tar.gz

{codedthemes_cli-0.1.11 → codedthemes_cli-0.1.13}/PKG-INFO

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

{codedthemes_cli-0.1.11 → codedthemes_cli-0.1.13}/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
@@ -36,7 +37,18 @@ def handle_login(server_url: str = None):
     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()
@@ -51,28 +63,23 @@ 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.")
+            # LAZY CONFIG: Only save if login succeeded
+            save_config({
+                "access_token": token,
+                "server_url": client.server_url,
+                "device_id": device_id
+            })
+            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)
-
-        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.")
     except Exception as e:
         err_msg = str(e)
         if "timed out" in err_msg.lower():
@@ -216,14 +223,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.11 → codedthemes_cli-0.1.13}/codedthemes/repo_utils.py

@@ -105,7 +105,7 @@ 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.
+    ai.json, or .git. Stricter than previous versions to avoid false positives.
     """
     if not start_path:
         start_path = os.getcwd()
@@ -113,11 +113,12 @@ def detect_repo_root(start_path=None):
     current = Path(start_path).resolve()
 
     while current != current.parent:
-        if any((current / f).exists() for f in ["package.json", "pyproject.toml", "ai.json", ".git"]):
+        if any((current / f).exists() for f in ["ai.json", ".git"]):
             return current
         current = current.parent
 
-    raise Exception("No repository root found.")
+    raise Exception("No repository root found. Please run this command inside a Git repository or one initialized with 'codedthemes init'.")
+
 
 
 def zip_repo(repo_root):

{codedthemes_cli-0.1.11 → codedthemes_cli-0.1.13}/codedthemes_cli.egg-info/PKG-INFO

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

{codedthemes_cli-0.1.11 → codedthemes_cli-0.1.13}/pyproject.toml

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