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

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

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

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

@@ -151,6 +151,14 @@ def handle_init():
 
         repo_abs_path = os.path.abspath(repo_root)
         repo_key = repo_abs_path.lower().replace(os.sep, "/")
+        
+        # Check if already initialized to avoid redundant uploads
+        config = load_config()
+        existing_ws_id = config.get("workspaces", {}).get(repo_key)
+        if existing_ws_id:
+             # Fast check: exists?
+             pass # We could call a /verify endpoint here, but for now let's just proceed with upload as "sync"
+             
         print("📦 Zipping and uploading repository (this may take a moment)...")
         upload_result = client.upload_workspace(repo_abs_path, user_email)
         workspace_id = upload_result.get("workspace_id")
@@ -232,10 +240,29 @@ def handle_init():
         sys.exit(1)
 
 
+def clean_remote_path(p: str) -> str:
+    """
+    Strips the deeply nested remote container path if present.
+    e.g., 'home/runner/work/<owner>/<repo>/src/...' -> 'src/...'
+    """
+    if not p: return p
+    p = p.replace('\\', '/')
+    if p.startswith('/'): p = p[1:]
+    if p.startswith('home/runner/work/'):
+        parts = p.split('/')
+        if len(parts) > 4: # e.g. ['home', 'runner', 'work', 'owner', 'repo', 'src', ...]
+            return '/'.join(parts[5:])
+    return p
+
 def handle_apply(query: str):
     """
     Plans and executes changes based on a natural language query.
     """
+    if not query or not query.strip():
+        print("✖ Error: Query cannot be empty.")
+        print("💡 Example: codedthemes apply \"Update the primary color to deep purple\"")
+        return
+
     try:
         repo_root = detect_repo_root()
         repo_abs_path = os.path.abspath(repo_root)
@@ -327,10 +354,10 @@ def handle_apply(query: str):
             print(f"✖ Planning failed: {plan.get('message', 'Unknown error')}")
             return
 
-        target_files = plan.get("files_to_modify", [])
+        target_files = [clean_remote_path(f) for f in plan.get("files_to_modify", [])]
         instructions = plan.get("plan_instructions", [])
-        files_to_create = plan.get("files_to_create", [])
-        files_to_delete = plan.get("files_to_delete", [])
+        files_to_create = [clean_remote_path(f) for f in plan.get("files_to_create", [])]
+        files_to_delete = [clean_remote_path(f) for f in plan.get("files_to_delete", [])]
 
         if not any([target_files, files_to_create, files_to_delete, instructions]):
             print("Information: No changes planned.")
@@ -388,41 +415,52 @@ def handle_apply(query: str):
         updates = res_data.get("updates_for_local", [])
         deletes = res_data.get("deleted_files", [])
         
-        if updates or deletes:
-            for item in updates:
-                rel_path, code = item.get("path"), item.get("code")
-                if not rel_path or code is None: continue
-                abs_path = os.path.abspath(os.path.join(repo_abs_path, rel_path.replace('/', os.sep)))
+        # 1. Apply local updates
+        for item in updates:
+            rel_path = clean_remote_path(item.get("path"))
+            code = item.get("code")
+            if not rel_path or code is None: continue
+            abs_path = os.path.abspath(os.path.join(repo_abs_path, rel_path.replace('/', os.sep)))
+            
+            try:
+                os.makedirs(os.path.dirname(abs_path), exist_ok=True)
+                with open(abs_path, 'w', encoding='utf-8') as f:
+                    f.write(code)
+                print(f"✔ Updated: {rel_path}")
+            except Exception as e:
+                print(f"✖ Error writing {rel_path}: {e}")
                 
+        # 2. Apply local deletions
+        for rel_path_raw in (deletes or []):
+            rel_path = clean_remote_path(rel_path_raw)
+            abs_path = os.path.normpath(os.path.join(repo_abs_path, rel_path.replace('/', os.sep)))
+            if os.path.exists(abs_path) and abs_path.startswith(os.path.abspath(repo_abs_path)):
                 try:
-                    os.makedirs(os.path.dirname(abs_path), exist_ok=True)
-                    with open(abs_path, 'w', encoding='utf-8') as f:
-                        f.write(code)
-                    print(f"✔ Updated: {rel_path}")
-                except Exception as e:
-                    print(f"✖ Error writing {rel_path}: {e}")
-                    
-            for rel_path in (deletes or []):
-                abs_path = os.path.normpath(os.path.join(repo_abs_path, rel_path.replace('/', os.sep)))
-                if os.path.exists(abs_path) and abs_path.startswith(os.path.abspath(repo_abs_path)):
-                    try:
-                        if os.path.isfile(abs_path): os.remove(abs_path)
-                        elif os.path.isdir(abs_path): shutil.rmtree(abs_path)
-                        print(f"✔ Deleted: {rel_path}")
-                    except: pass
-            
+                    if os.path.isfile(abs_path): os.remove(abs_path)
+                    elif os.path.isdir(abs_path): shutil.rmtree(abs_path)
+                    print(f"✔ Deleted: {rel_path}")
+                except: pass
+        
+        # 3. Synchronize state
+        if updates or deletes:
             sync_manager.update_sync_state(repo_abs_path, workspace_id, user_email)
             print("✔ Local sync state updated.")
 
-            _details_raw = res_data.get("details", [])
-            details_list = _details_raw.get("report", []) if isinstance(_details_raw, dict) else (_details_raw if isinstance(_details_raw, list) else [])
-            if details_list:
-                print("\n📊 Integration Report:")
-                for item in details_list:
-                    status_icon = "✔" if item.get("success") else "✖"
-                    print(f"  [{status_icon}] {item.get('file_path')}: {item.get('message', '')}")
-        else:
-            print(f"✔ {res_data.get('message', 'Changes applied successfully.')}")
+        # 4. Show Integration Report (Always show errors or details)
+        _details_raw = res_data.get("details", [])
+        details_list = _details_raw.get("report", []) if isinstance(_details_raw, dict) else (_details_raw if isinstance(_details_raw, list) else [])
+        if details_list:
+            print("\n📊 Integration Report:")
+            for item in details_list:
+                status_icon = "✔" if item.get("success") else "✖"
+                print(f"  [{status_icon}] {item.get('file_path')}: {item.get('message', '')}")
+                
+        # 5. Output Final Message if no updates were applied
+        if not updates and not deletes:
+            msg = res_data.get('message', 'Changes applied successfully.')
+            if isinstance(msg, str) and "AI MUST now sync" in msg:
+                msg = msg.split("AI MUST now sync")[0].strip()
+            print(f"✔ {msg}")
             
     except Exception as e:
         print(f"✖ Error: {e}")

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

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

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

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