Update recursive_context.py

recursive_context.py

@@ -398,66 +398,33 @@ class RecursiveContextManager:
             return f"STDOUT: {result.stdout}\nSTDERR: {result.stderr}"
         except Exception as e:
             return f"Execution Error: {e}"
-    def push_to_github(self, commit_message="Auto-backup from Clawdbot"):
-        """Pushes the current workspace to the configured GitHub repository."""
+        # =====================================================================
+    # GIT TOOLS (Fixed for Double-URL Issue)
+    # =====================================================================
+    def _get_authenticated_remote_url(self):
+        """Helper to construct the correct authenticated URL."""
         token = os.getenv("GITHUB_TOKEN")
         repo = os.getenv("GITHUB_REPO")
         
         if not token or not repo:
-            return "❌ Error: GITHUB_TOKEN or GITHUB_REPO secret is missing."
-
-        # authenticated URL
-        remote_url = f"https://{token}@github.com/{repo}.git"
-        
-        try:
-            # 1. Initialize if needed (Docker containers often lack .git)
-            if not (self.repo_path / ".git").exists():
-                subprocess.run(["git", "init"], cwd=self.repo_path, check=True)
-                subprocess.run(["git", "config", "user.email", "clawdbot@e-t-systems.ai"], cwd=self.repo_path)
-                subprocess.run(["git", "config", "user.name", "Clawdbot"], cwd=self.repo_path)
-                subprocess.run(["git", "branch", "-M", "main"], cwd=self.repo_path)
-                
-            # 2. Configure Remote (Idempotent)
-            # Remove existing remote to ensure token is fresh/correct
-            subprocess.run(["git", "remote", "remove", "origin"], cwd=self.repo_path, stderr=subprocess.DEVNULL)
-            subprocess.run(["git", "remote", "add", "origin", remote_url], cwd=self.repo_path, check=True)
-
-            # 3. Add, Commit, Push
-            subprocess.run(["git", "add", "."], cwd=self.repo_path, check=True)
-            
-            # Commit (allow empty if nothing changed)
-            commit_res = subprocess.run(
-                ["git", "commit", "-m", commit_message], 
-                cwd=self.repo_path, capture_output=True, text=True
-            )
+            return None
             
-            # Push (force is safer for a backup mirror to overwrite conflicts)
-            push_res = subprocess.run(
-                ["git", "push", "-u", "origin", "main", "--force"], 
-                cwd=self.repo_path, capture_output=True, text=True
-            )
+        # Clean the repo string if it's already a full URL
+        if repo.startswith("https://github.com/"):
+            repo = repo.replace("https://github.com/", "")
+        if repo.endswith(".git"):
+            repo = repo[:-4]
             
-            if push_res.returncode == 0:
-                return f"✅ Successfully pushed to GitHub: https://github.com/{repo}"
-            else:
-                return f"⚠️ Git Push Failed: {push_res.stderr}"
-
-        except Exception as e:
-            return f"❌ Critical Git Error: {e}"
+        return f"https://{token}@github.com/{repo}.git"
 
     def push_to_github(self, commit_message="Auto-backup from Clawdbot"):
         """Pushes the current workspace to the configured GitHub repository."""
-        token = os.getenv("GITHUB_TOKEN")
-        repo = os.getenv("GITHUB_REPO")
-        
-        if not token or not repo:
+        remote_url = self._get_authenticated_remote_url()
+        if not remote_url:
             return "❌ Error: GITHUB_TOKEN or GITHUB_REPO secret is missing."
-
-        # authenticated URL
-        remote_url = f"https://{token}@github.com/{repo}.git"
         
         try:
-            # 1. Initialize if needed (Docker containers often lack .git)
+            # 1. Initialize if needed
             if not (self.repo_path / ".git").exists():
                 subprocess.run(["git", "init"], cwd=self.repo_path, check=True)
                 subprocess.run(["git", "config", "user.email", "clawdbot@e-t-systems.ai"], cwd=self.repo_path)
@@ -465,7 +432,6 @@ class RecursiveContextManager:
                 subprocess.run(["git", "branch", "-M", "main"], cwd=self.repo_path)
                 
             # 2. Configure Remote (Idempotent)
-            # Remove existing remote to ensure token is fresh/correct
             subprocess.run(["git", "remote", "remove", "origin"], cwd=self.repo_path, stderr=subprocess.DEVNULL)
             subprocess.run(["git", "remote", "add", "origin", remote_url], cwd=self.repo_path, check=True)
 
@@ -478,14 +444,16 @@ class RecursiveContextManager:
                 cwd=self.repo_path, capture_output=True, text=True
             )
             
-            # Push (force is safer for a backup mirror to overwrite conflicts)
+            # Push (force is safer for a backup mirror)
             push_res = subprocess.run(
                 ["git", "push", "-u", "origin", "main", "--force"], 
                 cwd=self.repo_path, capture_output=True, text=True
             )
             
             if push_res.returncode == 0:
-                return f"✅ Successfully pushed to GitHub: https://github.com/{repo}"
+                # Clean URL for display security
+                display_url = remote_url.replace(os.getenv("GITHUB_TOKEN"), "TOKEN_HIDDEN")
+                return f"✅ Successfully pushed to GitHub"
             else:
                 return f"⚠️ Git Push Failed: {push_res.stderr}"
 
@@ -494,13 +462,9 @@ class RecursiveContextManager:
 
     def pull_from_github(self, branch="main"):
         """Hard reset: Destroys local changes and pulls clean code from GitHub."""
-        token = os.getenv("GITHUB_TOKEN")
-        repo = os.getenv("GITHUB_REPO")
-        
-        if not token or not repo:
+        remote_url = self._get_authenticated_remote_url()
+        if not remote_url:
             return "❌ Error: GITHUB_TOKEN or GITHUB_REPO secret is missing."
-
-        remote_url = f"https://{token}@github.com/{repo}.git"
         
         try:
             # 1. Init if missing
@@ -555,11 +519,10 @@ class RecursiveContextManager:
         """Reads the Working Memory notebook."""
         notes = self._load_notebook()
         if not notes:
-            return "" # Return empty string so UI doesn't clutter if empty
+            return "" 
         
         display = []
         for i, note in enumerate(notes):
-            # Format: "1. [2026-02-03 14:00] Note content..."
             display.append(f"{i+1}. [{note['timestamp']}] {note['content']}")
         return "\n".join(display)
 
@@ -567,7 +530,6 @@ class RecursiveContextManager:
         """Adds a new note to the notebook."""
         notes = self._load_notebook()
         
-        # Pocket Notebook Limit (Force curation)
         if len(notes) >= 25:
             return "⚠️ Notebook full (25/25 slots). Please delete obsolete notes first."
         
@@ -580,7 +542,6 @@ class RecursiveContextManager:
         """Deletes a note by its number (1-based index)."""
         notes = self._load_notebook()
         try:
-            # Convert 1-based index (User view) to 0-based (List view)
             idx = int(index) - 1
             if 0 <= idx < len(notes):
                 removed = notes.pop(idx)
@@ -590,6 +551,7 @@ class RecursiveContextManager:
                 return f"❌ Invalid index: {index}. Valid range: 1-{len(notes)}"
         except ValueError:
             return "❌ Index must be a number."
+
     # =====================================================================
     # RECURSIVE SEARCH TOOLS
     # =====================================================================