machineconfig 7.50__py3-none-any.whl → 8.12__py3-none-any.whl

machineconfig/scripts/python/helpers/repo_rag.py

@@ -0,0 +1,325 @@
+# #!/usr/bin/env python3
+# from pathlib import Path
+# from typing import Annotated
+# import subprocess
+# import typer
+# from rich.console import Console
+# from rich.progress import Progress, SpinnerColumn, TextColumn
+# from rich.table import Table
+# from rich.syntax import Syntax
+
+# import chromadb
+# from chromadb.config import Settings
+# from sentence_transformers import SentenceTransformer
+
+
+# app = typer.Typer(help="Semantic search over your repository using local RAG")
+# console = Console()
+
+
+# DEFAULT_EXTENSIONS = [".py", ".sh", ".ps1", ".md", ".toml", ".yaml", ".yml", ".json"]
+# DEFAULT_MODEL = "all-MiniLM-L6-v2"
+# DEFAULT_DB_PATH = Path.home() / ".cache" / "repo_rag"
+
+
+# class RepoRAG:
+#     def __init__(self, db_path: Path, model_name: str = DEFAULT_MODEL) -> None:
+#         self.db_path = db_path
+#         self.db_path.mkdir(parents=True, exist_ok=True)
+        
+#         with console.status(f"[bold green]Loading embedding model: {model_name}..."):
+#             self.model = SentenceTransformer(model_name)
+        
+#         self.client = chromadb.PersistentClient(
+#             path=str(db_path),
+#             settings=Settings(anonymized_telemetry=False)
+#         )
+        
+#     def _get_or_create_collection(self, repo_path: Path) -> chromadb.Collection:
+#         collection_name = f"repo_{repo_path.name}".replace("-", "_").replace(".", "_")
+#         return self.client.get_or_create_collection(
+#             name=collection_name,
+#             metadata={"repo_path": str(repo_path)}
+#         )
+    
+#     def _chunk_file_content(self, content: str, chunk_size: int = 500, overlap: int = 50) -> list[str]:
+#         lines = content.split("\n")
+#         chunks: list[str] = []
+#         current_chunk: list[str] = []
+#         current_size = 0
+        
+#         for line in lines:
+#             line_size = len(line)
+#             if current_size + line_size > chunk_size and current_chunk:
+#                 chunks.append("\n".join(current_chunk))
+#                 overlap_lines = current_chunk[-overlap:] if len(current_chunk) > overlap else current_chunk
+#                 current_chunk = overlap_lines
+#                 current_size = sum(len(line_text) for line_text in current_chunk)
+            
+#             current_chunk.append(line)
+#             current_size += line_size
+        
+#         if current_chunk:
+#             chunks.append("\n".join(current_chunk))
+        
+#         return chunks if chunks else [content]
+    
+#     def index_repo(self, repo_path: Path, extensions: list[str], max_file_size_kb: int = 500) -> None:
+#         collection = self._get_or_create_collection(repo_path)
+        
+#         files_to_index: list[Path] = []
+#         for ext in extensions:
+#             files_to_index.extend(repo_path.rglob(f"*{ext}"))
+        
+#         files_to_index = [
+#             f for f in files_to_index 
+#             if not any(part.startswith('.') for part in f.relative_to(repo_path).parts[:-1])
+#             and f.stat().st_size < max_file_size_kb * 1024
+#         ]
+        
+#         console.print(f"[bold cyan]Found {len(files_to_index)} files to index")
+        
+#         with Progress(
+#             SpinnerColumn(),
+#             TextColumn("[progress.description]{task.description}"),
+#             console=console
+#         ) as progress:
+#             task = progress.add_task("Indexing files...", total=len(files_to_index))
+            
+#             for file_path in files_to_index:
+#                 try:
+#                     content = file_path.read_text(encoding="utf-8", errors="ignore")
+#                     rel_path = str(file_path.relative_to(repo_path))
+                    
+#                     chunks = self._chunk_file_content(content)
+                    
+#                     for i, chunk in enumerate(chunks):
+#                         doc_id = f"{rel_path}::chunk_{i}"
+#                         embedding = self.model.encode(chunk).tolist()
+                        
+#                         collection.upsert(
+#                             ids=[doc_id],
+#                             embeddings=[embedding],
+#                             documents=[chunk],
+#                             metadatas=[{
+#                                 "file_path": rel_path,
+#                                 "chunk_index": i,
+#                                 "total_chunks": len(chunks),
+#                                 "extension": file_path.suffix
+#                             }]
+#                         )
+                    
+#                 except Exception as e:
+#                     console.print(f"[yellow]Warning: Failed to index {file_path}: {e}")
+                
+#                 progress.advance(task)
+        
+#         console.print("[bold green]✓ Indexing complete!")
+    
+#     def search(self, repo_path: Path, query: str, n_results: int = 20) -> list[dict[str, str | dict[str, str | int]]]:
+#         collection = self._get_or_create_collection(repo_path)
+        
+#         with console.status("[bold green]Searching..."):
+#             query_embedding = self.model.encode(query).tolist()
+#             results = collection.query(
+#                 query_embeddings=[query_embedding],
+#                 n_results=n_results
+#             )
+        
+#         if not results["ids"] or not results["ids"][0]:
+#             return []
+        
+#         search_results: list[dict[str, str | dict[str, str | int]]] = []
+#         for i, doc_id in enumerate(results["ids"][0]):
+#             search_results.append({
+#                 "id": doc_id,
+#                 "file_path": results["metadatas"][0][i]["file_path"],
+#                 "content": results["documents"][0][i],
+#                 "distance": results["distances"][0][i] if results.get("distances") else 0.0,
+#                 "metadata": results["metadatas"][0][i]
+#             })
+        
+#         return search_results
+    
+#     def delete_index(self, repo_path: Path) -> None:
+#         collection_name = f"repo_{repo_path.name}".replace("-", "_").replace(".", "_")
+#         try:
+#             self.client.delete_collection(name=collection_name)
+#             console.print(f"[bold green]✓ Deleted index for {repo_path.name}")
+#         except Exception as e:
+#             console.print(f"[bold red]Error deleting index: {e}")
+
+
+# @app.command()
+# def index(
+#     repo_path: Annotated[Path, typer.Argument(help="Path to repository to index")] = Path.cwd(),
+#     extensions: Annotated[str, typer.Option("--ext", "-e", help="Comma-separated list of extensions")] = ",".join(DEFAULT_EXTENSIONS),
+#     model: Annotated[str, typer.Option("--model", "-m", help="Sentence transformer model name")] = DEFAULT_MODEL,
+#     db_path: Annotated[Path, typer.Option("--db", help="Database path")] = DEFAULT_DB_PATH,
+#     max_size_kb: Annotated[int, typer.Option("--max-size", help="Max file size in KB")] = 500,
+# ) -> None:
+#     repo_path = repo_path.resolve()
+    
+#     if not repo_path.exists():
+#         console.print(f"[bold red]Error: Repository path does not exist: {repo_path}")
+#         raise typer.Exit(1)
+    
+#     ext_list = [ext.strip() if ext.startswith(".") else f".{ext.strip()}" for ext in extensions.split(",")]
+    
+#     console.print(f"[bold cyan]Repository:[/] {repo_path}")
+#     console.print(f"[bold cyan]Extensions:[/] {', '.join(ext_list)}")
+#     console.print(f"[bold cyan]Model:[/] {model}")
+#     console.print(f"[bold cyan]Database:[/] {db_path}")
+#     console.print()
+    
+#     rag = RepoRAG(db_path, model)
+#     rag.index_repo(repo_path, ext_list, max_size_kb)
+
+
+# @app.command()
+# def search(
+#     query: Annotated[str, typer.Argument(help="Search query")],
+#     repo_path: Annotated[Path, typer.Option("--repo", "-r", help="Path to repository")] = Path.cwd(),
+#     n_results: Annotated[int, typer.Option("--num", "-n", help="Number of results")] = 20,
+#     model: Annotated[str, typer.Option("--model", "-m", help="Sentence transformer model name")] = DEFAULT_MODEL,
+#     db_path: Annotated[Path, typer.Option("--db", help="Database path")] = DEFAULT_DB_PATH,
+#     use_fzf: Annotated[bool, typer.Option("--fzf", help="Use fzf for interactive selection")] = True,
+#     show_content: Annotated[bool, typer.Option("--content", "-c", help="Show content snippets")] = True,
+# ) -> None:
+#     repo_path = repo_path.resolve()
+    
+#     if not repo_path.exists():
+#         console.print(f"[bold red]Error: Repository path does not exist: {repo_path}")
+#         raise typer.Exit(1)
+    
+#     rag = RepoRAG(db_path, model)
+#     results = rag.search(repo_path, query, n_results)
+    
+#     if not results:
+#         console.print("[yellow]No results found")
+#         raise typer.Exit(0)
+    
+#     if use_fzf:
+#         _search_with_fzf(results, repo_path, show_content)
+#     else:
+#         _display_results(results, show_content)
+
+
+# def _display_results(results: list[dict[str, str | dict[str, str | int]]], show_content: bool) -> None:
+#     table = Table(title="Search Results", show_header=True, header_style="bold magenta")
+#     table.add_column("#", style="cyan", width=4)
+#     table.add_column("File", style="green")
+#     table.add_column("Chunk", style="yellow", width=8)
+#     table.add_column("Score", style="blue", width=8)
+#     if show_content:
+#         table.add_column("Content Preview", style="white", width=60)
+    
+#     for i, result in enumerate(results, 1):
+#         file_path = str(result["file_path"])
+#         metadata = result["metadata"]
+#         chunk_info = f"{int(metadata['chunk_index']) + 1}/{int(metadata['total_chunks'])}"
+#         score = f"{float(result['distance']):.3f}"
+        
+#         row = [str(i), file_path, chunk_info, score]
+        
+#         if show_content:
+#             content = str(result["content"])
+#             preview = content[:200].replace("\n", " ") + ("..." if len(content) > 200 else "")
+#             row.append(preview)
+        
+#         table.add_row(*row)
+    
+#     console.print(table)
+
+
+# def _search_with_fzf(results: list[dict[str, str | dict[str, str | int]]], repo_path: Path, show_content: bool) -> None:
+#     try:
+#         fzf_input_lines: list[str] = []
+#         for i, result in enumerate(results, 1):
+#             file_path = str(result["file_path"])
+#             metadata = result["metadata"]
+#             chunk_info = f"{int(metadata['chunk_index']) + 1}/{int(metadata['total_chunks'])}"
+#             score = f"{float(result['distance']):.3f}"
+            
+#             if show_content:
+#                 content = str(result["content"]).replace("\n", " ")[:100]
+#                 line = f"{i:3d} │ {score:6s} │ {chunk_info:5s} │ {file_path:60s} │ {content}"
+#             else:
+#                 line = f"{i:3d} │ {score:6s} │ {chunk_info:5s} │ {file_path}"
+            
+#             fzf_input_lines.append(line)
+        
+#         fzf_input = "\n".join(fzf_input_lines)
+        
+#         result = subprocess.run(
+#             ["fzf", "--ansi", "--multi", "--reverse", "--header=Select files to open (TAB for multi-select)"],
+#             input=fzf_input.encode(),
+#             capture_output=True
+#         )
+        
+#         if result.returncode != 0:
+#             console.print("[yellow]Selection cancelled")
+#             return
+        
+#         selected_lines = result.stdout.decode().strip().split("\n")
+        
+#         for line in selected_lines:
+#             if not line:
+#                 continue
+            
+#             parts = line.split("│")
+#             if len(parts) < 4:
+#                 continue
+            
+#             file_path_str = parts[3].strip().split()[0]
+            
+#             idx = int(parts[0].strip()) - 1
+#             if idx < len(results):
+#                 content = str(results[idx]["content"])
+                
+#                 console.print(f"\n[bold green]File:[/] {file_path_str}")
+#                 console.print("[bold cyan]Content:[/]")
+                
+#                 syntax = Syntax(content, "python", theme="monokai", line_numbers=True)
+#                 console.print(syntax)
+#                 console.print("\n" + "─" * 80 + "\n")
+    
+#     except FileNotFoundError:
+#         console.print("[bold red]Error: fzf not found. Install fzf or use --no-fzf flag")
+#         _display_results(results, show_content)
+
+
+# @app.command()
+# def delete(
+#     repo_path: Annotated[Path, typer.Argument(help="Path to repository")] = Path.cwd(),
+#     db_path: Annotated[Path, typer.Option("--db", help="Database path")] = DEFAULT_DB_PATH,
+#     model: Annotated[str, typer.Option("--model", "-m", help="Sentence transformer model name")] = DEFAULT_MODEL,
+# ) -> None:
+#     repo_path = repo_path.resolve()
+#     rag = RepoRAG(db_path, model)
+#     rag.delete_index(repo_path)
+
+
+# @app.command()
+# def info() -> None:
+#     console.print("[bold cyan]Repo RAG - Semantic Code Search[/]\n")
+    
+#     info_table = Table(show_header=False, box=None)
+#     info_table.add_column("Key", style="cyan")
+#     info_table.add_column("Value", style="white")
+    
+#     info_table.add_row("Embedding Model", DEFAULT_MODEL)
+#     info_table.add_row("Vector Store", "ChromaDB (embedded)")
+#     info_table.add_row("Default Extensions", ", ".join(DEFAULT_EXTENSIONS))
+#     info_table.add_row("Database Path", str(DEFAULT_DB_PATH))
+    
+#     console.print(info_table)
+    
+#     console.print("\n[bold green]Quick Start:[/]")
+#     console.print("1. Index your repo:     [yellow]repo-rag index[/]")
+#     console.print("2. Search semantically: [yellow]repo-rag search 'your query'[/]")
+#     console.print("3. Delete index:        [yellow]repo-rag delete[/]")
+
+
+# if __name__ == "__main__":
+#     app()

machineconfig/scripts/python/helpers/symantic_search.py

@@ -0,0 +1,25 @@
+"""
+please fully read docs of https://github.com/meilisearch/meilisearch-python
+
+then make a cli using typer in this file
+
+I want commands to
+create-index (pass name of index)
+command to populate the index with files in folder
+command is add-to-index
+--directory [str] and --extensions .py,.ps1,.sh
+
+command to rebuild index
+
+coimmand to search
+command show stats and rop index
+
+learn from my style of building apps like this #file:msearch.py 
+
+and add option when building index to say --symantic (means use ai locall embedding to build the index)
+
+in all cases we should be able to pass
+MEILI_URL="http://localhost:7700" (default)
+MEILI_MASTER_KEY="YOUR_MASTER_KEY"
+
+"""

machineconfig/scripts/python/helpers_agents/agentic_frameworks/fire_crush.json

@@ -7,7 +7,7 @@
         }
     },
     "providers": {
-        "openrouter": {
+        "{provider}": {
             "api_key": "{api_key}"
         }
     }

machineconfig/scripts/python/helpers_agents/agentic_frameworks/fire_crush.py

@@ -11,21 +11,23 @@ def fire_crush(ai_spec: AI_SPEC, prompt_path: Path, repo_root: Path) -> str:
 crush run {prompt_path}
 """
         case "docker":
-            assert ai_spec["api_key"] is not None, "API key is required for Crush agent in docker mode."
+            assert ai_spec["api_spec"]["api_key"] is not None, "API key is required for Crush agent in docker mode."
             json_path = Path(__file__).parent / "fire_crush.json"
             json_template = json_path.read_text(encoding="utf-8")
-            json_filled = json_template.replace("{api_key}", ai_spec["api_key"]).replace("{model}", ai_spec["model"]).replace("{provider}", ai_spec["provider"])
+            api_key = ai_spec["api_spec"]["api_key"]
+            json_filled = json_template.replace("{api_key}", api_key)
+            json_filled = json_filled.replace("{model}", ai_spec["model"])
+            if ai_spec["provider"] == "google":
+                provider = "gemini"  # weird crush way of naming.
+            else:
+                provider = ai_spec["provider"]
+            json_filled = json_filled.replace("{provider}", provider)
             from machineconfig.utils.accessories import randstr
             temp_config_file_local = Path.home().joinpath("tmp_results/tmp_files/crush_" + randstr(8) + ".json")
             temp_config_file_local.parent.mkdir(parents=True, exist_ok=True)
             Path(temp_config_file_local).write_text(json_filled, encoding="utf-8")            
             cmd = f"""
 
-#   -e "PATH_PROMPT=$PATH_PROMPT"
-#   opencode --model "{ai_spec["provider"]}/{ai_spec["model"]}" run {prompt_path}
-  
-
-echo "Running prompt @ {prompt_path.relative_to(repo_root)} using Docker with Crush..."
 docker run -it --rm \
   -v "{repo_root}:/workspace/{repo_root.name}" \
   -v "{temp_config_file_local}:/root/.local/share/crush/crush.json" \

machineconfig/scripts/python/helpers_agents/agentic_frameworks/fire_gemini.py

@@ -14,12 +14,25 @@ def fire_gemini(ai_spec: AI_SPEC, prompt_path: Path, repo_root: Path) -> str:
     model_arg = f"--model {shlex.quote(ai_spec['model'])}"
     # Need a real shell for the pipeline; otherwise '| gemini ...' is passed as args to 'cat'
     safe_path = shlex.quote(str(prompt_path))
-
+    settings_dot_json = {
+   "security": {
+    "auth": {
+      "selectedType": "gemini-api-key"
+    }
+  }
+}
+    # settings_path = Path.home().joinpath(".gemini", "settings.json")
+    from machineconfig.utils.accessories import randstr
+    settings_tmp_path = Path.home().joinpath("tmp_results", "tmp_files", "agents", f"gemini_settings_{randstr()}.json")
+    settings_tmp_path.parent.mkdir(parents=True, exist_ok=True)
+    import json
+    settings_tmp_path.write_text(json.dumps(settings_dot_json, indent=2), encoding="utf-8")
     match ai_spec["machine"]:
         case "local":
             # Export the environment variable so it's available to subshells
-            if ai_spec["api_key"] is not None:
-                define_api_key = f"""export GEMINI_API_KEY="{shlex.quote(ai_spec['api_key'])}" """
+            api_key = ai_spec["api_spec"]["api_key"]
+            if api_key is not None:
+                define_api_key = f"""export GEMINI_API_KEY="{shlex.quote(api_key)}" """
             else:
                 define_api_key = "echo 'Warning: No GEMINI_API_KEY provided, hoping it is set in the environment.'"
             cmd = f"""
@@ -27,16 +40,16 @@ def fire_gemini(ai_spec: AI_SPEC, prompt_path: Path, repo_root: Path) -> str:
 echo "Using Gemini API key $GEMINI_API_KEY"
 gemini {model_arg} --yolo --prompt {safe_path}
 """
-            
 
         case "docker":
-            assert ai_spec["api_key"] is not None, "When using docker, api_key must be provided."
+            api_key = ai_spec["api_spec"]["api_key"]
+            assert api_key is not None, "When using docker, api_key must be provided."
             cmd = f"""
 docker run -it --rm \
-  -e GEMINI_API_KEY="{ai_spec['api_key']}" \
+  -v {settings_tmp_path}:/root/.gemini/settings.json \
   -v "{repo_root}:/workspace/{repo_root.name}" \
   -w "/workspace/{repo_root.name}" \
   statistician/machineconfig-ai:latest  \
-  gemini --prompt "$PATH_PROMPT"
-"""
+  bash -c '. ~/.bashrc; export GEMINI_API_KEY="{api_key}"; gemini --model {shlex.quote(ai_spec['model'])} --yolo {prompt_path.relative_to(repo_root)}'
+  """
     return cmd

machineconfig/scripts/python/helpers_agents/agentic_frameworks/fire_qwen.py

@@ -5,22 +5,10 @@ from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import
 
 
 def fire_qwen(ai_spec: AI_SPEC, prompt_path: Path, repo_root: Path, config_dir: str | None) -> str:
-    # assert model == "qwen", "Only qwen is supported currently."
-    # assert provider == "qwen", "Only qwen is supported currently."
-    # model = "qwen"
-    # model = "gemini-2.5-flash-lite"
-    # model = None  # auto-select
-    # if model is None:
-    #     model_arg = ""
-    # else:
     _ = ai_spec["provider"]
-    # model_arg = f"--model {shlex.quote(model)}"
-    # Need a real shell for the pipeline; otherwise '| gemini ...' is passed as args to 'cat'
     safe_path = shlex.quote(str(prompt_path))
-
     match ai_spec["machine"]:
         case "local":
-            # Export the environment variable so it's available to subshells
             cmd = f"""
 qwen --yolo --prompt {safe_path}
     """

machineconfig/scripts/python/helpers_agents/fire_agents_help_launch.py

@@ -2,19 +2,24 @@
 import random
 import shlex
 from pathlib import Path
-from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import AGENTS, AGENT_NAME_FORMATTER, HOST, PROVIDER, AI_SPEC
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import AGENTS, AGENT_NAME_FORMATTER, HOST, PROVIDER, AI_SPEC, API_SPEC
 
 
-def get_api_keys(provider: PROVIDER) -> list[str]:
+def get_api_keys(provider: PROVIDER) -> list[API_SPEC]:
     from machineconfig.utils.io import read_ini
     config = read_ini(Path.home().joinpath(f"dotfiles/creds/llm/{provider}/api_keys.ini"))
-    res: list[str] = []
+    res: list[API_SPEC] = []
     for a_section_name in list(config.sections()):
         a_section = config[a_section_name]
         if "api_key" in a_section:
             api_key = a_section["api_key"].strip()
             if api_key:
-                res.append(api_key)
+                res.append(API_SPEC(
+                    api_key=api_key,
+                    api_name=a_section.get("api_name", ""),
+                    api_label=a_section_name,
+                    api_account=a_section.get("email", "")
+                ))
     print(f"Found {len(res)} {provider} API keys configured.")
     return res
 
@@ -55,6 +60,7 @@ export FIRE_AGENTS_PROMPT_FILE="{prompt_path}"
 export FIRE_AGENTS_MATERIAL_FILE="{prompt_material_path}"
 export FIRE_AGENTS_AGENT_LAUNCHER="{agent_cmd_launch_path}"
 
+
 echo "Sleeping for {random_sleep_time:.2f} seconds to stagger agent startups..."
 sleep {random_sleep_time:.2f}
 echo "--------START OF AGENT OUTPUT--------"
@@ -65,19 +71,24 @@ sleep 0.1
             case "gemini":
                 assert provider == "google", "Gemini agent only works with google provider."
                 api_keys = get_api_keys(provider="google")
-                api_key = api_keys[idx % len(api_keys)] if len(api_keys) > 0 else None
-                ai_spec: AI_SPEC = AI_SPEC(provider=provider, model="gemini-2.5-pro", agent=agent, machine=machine, api_key=api_key, api_name="gemini")
+                api_spec = api_keys[idx % len(api_keys)] if len(api_keys) > 0 else None
+                if api_spec is None:
+                    raise ValueError("No API keys found for Google Gemini. Please configure them in dotfiles/creds/llm/google/api_keys.ini")
+                ai_spec: AI_SPEC = AI_SPEC(provider=provider, model="gemini-2.5-pro", agent=agent, machine=machine, api_spec=api_spec)
                 from machineconfig.scripts.python.helpers_agents.agentic_frameworks.fire_gemini import fire_gemini
                 cmd = fire_gemini(ai_spec=ai_spec, prompt_path=prompt_path, repo_root=repo_root)
             case "cursor-agent":
-                ai_spec: AI_SPEC = AI_SPEC(provider=provider, model=model, agent=agent, machine=machine, api_key=None, api_name="cursor")
+                api_spec = API_SPEC(api_key=None, api_name="", api_label="", api_account="")
+                ai_spec: AI_SPEC = AI_SPEC(provider=provider, model=model, agent=agent, machine=machine, api_spec=api_spec)
                 from machineconfig.scripts.python.helpers_agents.agentic_frameworks.fire_cursor_agents import fire_cursor
                 cmd = fire_cursor(ai_spec=ai_spec, prompt_path=prompt_path)
                 raise NotImplementedError("Cursor agent is not implemented yet, api key missing")
             case "crush":
                 api_keys = get_api_keys(provider=provider)
-                api_key = api_keys[idx % len(api_keys)] if len(api_keys) > 0 else None
-                ai_spec: AI_SPEC = AI_SPEC(provider=provider, model=model, agent=agent, machine=machine, api_key=api_key, api_name="crush")
+                api_spec = api_keys[idx % len(api_keys)] if len(api_keys) > 0 else None
+                if api_spec is None:
+                    raise ValueError("No API keys found for Crush. Please configure them in dotfiles/creds/llm/crush/api_keys.ini")
+                ai_spec: AI_SPEC = AI_SPEC(provider=provider, model=model, agent=agent, machine=machine, api_spec=api_spec)
                 from machineconfig.scripts.python.helpers_agents.agentic_frameworks.fire_crush import fire_crush
                 cmd = fire_crush(ai_spec=ai_spec, prompt_path=prompt_path, repo_root=repo_root)
             # case "q":
@@ -85,7 +96,12 @@ sleep 0.1
             #     cmd = fire_q(api_key="", prompt_path=prompt_path, machine=machine)
             case _:
                 raise ValueError(f"Unsupported agent type: {agent}")
-
+        cmd_prefix += f"""
+echo "Running with api label:   {ai_spec['api_spec']['api_label']}"
+echo "Running with api acount:  {ai_spec['api_spec']['api_account']}"
+echo "Running with api name:    {ai_spec['api_spec']['api_name']}"
+echo "Running with api key:     {ai_spec['api_spec']['api_key']}"
+"""
         cmd_postfix = """
 sleep 0.1
 echo "---------END OF AGENT OUTPUT---------"
@@ -96,10 +112,13 @@ echo "---------END OF AGENT OUTPUT---------"
 
 def get_agents_launch_layout(session_root: Path):
     from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig, LayoutsFile
-
     tab_config: list[TabConfig] = []
     prompt_root = session_root / "prompts"
     all_dirs_under_prompts = [d for d in prompt_root.iterdir() if d.is_dir()]
+
+    import re
+    all_dirs_under_prompts = sorted(all_dirs_under_prompts, key=lambda path: [int(text) if text.isdigit() else text.lower() for text in re.split(r'(\d+)', path.name)])
+    print(all_dirs_under_prompts)
     for a_prompt_dir in all_dirs_under_prompts:
         idx = a_prompt_dir.name.split("_")[-1]  # e.g., agent_0 -> 0
         agent_cmd_path = a_prompt_dir / AGENT_NAME_FORMATTER.format(idx=idx)

machineconfig/scripts/python/helpers_agents/fire_agents_helper_types.py

@@ -20,13 +20,20 @@ AGENTS: TypeAlias = Literal["cursor-agent", "gemini", "qwen-code", "copilot", "c
 HOST: TypeAlias = Literal["local", "docker"]
 PROVIDER: TypeAlias = Literal["azure", "google", "aws", "openai", "anthropic", "openrouter", "xai"]
 
+
+class API_SPEC(TypedDict):
+    api_key: str | None
+    api_name: str
+    api_label: str
+    api_account: str
+
+
 class AI_SPEC(TypedDict):
     provider: PROVIDER
     model: str
     agent: AGENTS
     machine: HOST
-    api_key: str | None
-    api_name: str
+    api_spec: API_SPEC
 
 
 AGENT_NAME_FORMATTER = "agent_{idx}_cmd.sh"  # e.g., agent_0_cmd.sh

machineconfig/scripts/python/helpers_agents/privacy/configs/aichat/config.yaml

@@ -0,0 +1,5 @@
+save: false
+save_session: false
+save_shell_history: false
+user_agent: "Mozilla/5.0"
+sync_models_url: ""

machineconfig/scripts/python/helpers_agents/privacy/configs/aider/.aider.conf.yml

@@ -0,0 +1,2 @@
+analytics: false
+check-update: false

machineconfig/scripts/python/helpers_agents/privacy/configs/copilot/config.yml

@@ -0,0 +1 @@
+optional_usage_analytics: false

machineconfig/scripts/python/helpers_agents/privacy/configs/crush/crush.json

@@ -0,0 +1,10 @@
+{
+  "options": {
+    "disable_metrics": true,
+    "disable_provider_auto_update": true,
+    "attribution": {
+      "trailer_style": "none",
+      "generated_with": false
+    }
+  }
+}

machineconfig/scripts/python/helpers_agents/privacy/configs/gemini/settings.json

@@ -0,0 +1,12 @@
+{
+  "telemetry": {
+    "enabled": false,
+    "logPrompts": false,
+    "useCollector": false,
+    "target": "local",
+    "outfile": null
+  },
+  "advanced": {
+    "bugCommand": null
+  }
+}