agentram 0.1.47 → 0.1.50

package/agentram/cli.py

@@ -15,7 +15,7 @@ from typing import Any
 
 from .config import default_ram_root, global_agent_profile_enabled
 from .mcp_server import McpContext, call_tool
-from .orchestration import AgentModelEndpoint, MultiModelCodingOrchestrator
+from .orchestration import AgentModelEndpoint, MultiModelCodingOrchestrator, set_cli_stream_callback
 
 
 ENV_NAME_PATTERN = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*$")
@@ -434,7 +434,9 @@ def run_textual_tui(context: McpContext) -> bool:
             self.prompt_queue: list[str] = []
             self.processing_task: asyncio.Task[None] | None = None
             self.pending_approval_prompt: str | None = None
+            self.pending_approval_kind = "main"
             self.project_main_agent_approved = False
+            self.project_git_agent_approved = False
             self.suggestions: list[str] = []
             self.setup_done = False
             self.prompt_history: list[str] = []
@@ -478,6 +480,7 @@ def run_textual_tui(context: McpContext) -> bool:
                             yield Button("Next", id="setup-next", variant="primary")
                             yield Button("Skip", id="setup-skip")
                     yield RichLog(id="chat", wrap=True, highlight=True, markup=False, auto_scroll=True)
+                    yield Static("", id="activity")
                     with Vertical(id="approval"):
                         yield Static("Main agent wants terminal/file access. Allow?", id="approval-title")
                         yield Static("This can run commands or edit files in the current project.")
@@ -493,6 +496,7 @@ def run_textual_tui(context: McpContext) -> bool:
             self.context.init_storage()
             self.chat.write("system > AgentRAM Textual TUI ready")
             self.chat.write(f"system > RAM root: {self.context.ram_root}")
+            self.chat.write(bash_hint_text())
             self.prefill_setup_from_profile()
             self.refresh_setup_step()
             self.refresh_sidebar()
@@ -506,6 +510,12 @@ def run_textual_tui(context: McpContext) -> bool:
         def chat(self) -> RichLog:
             return self.query_one("#chat", RichLog)
 
+        def update_activity(self, text: str) -> None:
+            try:
+                self.query_one("#activity", Static).update(text)
+            except Exception:
+                return
+
         def refresh_sidebar(self) -> None:
             self.query_one("#sidebar", Static).update("\n".join(sidebar_lines(self.context)))
 
@@ -593,6 +603,7 @@ def run_textual_tui(context: McpContext) -> bool:
             self.context.profile_store.set_agent(slot, endpoint)
             set_global_agent_if_available(self.context, slot, endpoint)
             if saved_env_name:
+                save_profile_env_if_available(self.context, saved_env_name)
                 save_global_env_if_available(self.context, saved_env_name)
             if saved_env_name:
                 return f"{slot}={provider}:{model} key=global-jsonl:{saved_env_name}"
@@ -668,11 +679,17 @@ def run_textual_tui(context: McpContext) -> bool:
                 self.hide_setup()
                 self.query_one("#input", Input).focus()
 
-        def show_approval_popup(self, prompt: str) -> None:
+        def show_approval_popup(self, prompt: str, kind: str = "main") -> None:
             panel = self.query_one("#approval", Vertical)
-            self.query_one("#approval-title", Static).update("Main agent wants terminal/file access. Allow?")
+            if kind == "git":
+                title = "Main agent wants to change Git repo. Allow git init/add/commit?"
+                note = "agentram > git approval needed: click Yes / Yes, do this project / No"
+            else:
+                title = "Main agent wants terminal/file access. Allow?"
+                note = "agentram > approval needed: click Yes / Yes, do this project / No"
+            self.query_one("#approval-title", Static).update(title)
             panel.styles.display = "block"
-            self.chat.write("agentram > approval needed: click Yes / Yes, do this project / No")
+            self.chat.write(note)
 
         def hide_approval_popup(self) -> None:
             try:
@@ -688,8 +705,13 @@ def run_textual_tui(context: McpContext) -> bool:
             self.pending_approval_prompt = None
             self.hide_approval_popup()
             if decision == "yes_project":
-                self.project_main_agent_approved = True
-                self.chat.write("agentram > approved for this project")
+                if self.pending_approval_kind == "git":
+                    self.project_git_agent_approved = True
+                    self.project_main_agent_approved = True
+                    self.chat.write("agentram > git approved for this project")
+                else:
+                    self.project_main_agent_approved = True
+                    self.chat.write("agentram > approved for this project")
                 self.enqueue_prompt(approved)
                 return
             if decision == "yes_once":
@@ -778,10 +800,16 @@ def run_textual_tui(context: McpContext) -> bool:
                     return
                 if decision == "yes_project":
                     approved = self.pending_approval_prompt
+                    kind = self.pending_approval_kind
                     self.pending_approval_prompt = None
                     self.hide_approval_popup()
-                    self.project_main_agent_approved = True
-                    self.chat.write("agentram > approved for this project")
+                    if kind == "git":
+                        self.project_git_agent_approved = True
+                        self.project_main_agent_approved = True
+                        self.chat.write("agentram > git approved for this project")
+                    else:
+                        self.project_main_agent_approved = True
+                        self.chat.write("agentram > approved for this project")
                     self.enqueue_prompt(approved)
                     return
                 if decision == "no":
@@ -799,8 +827,14 @@ def run_textual_tui(context: McpContext) -> bool:
                 self.chat.clear()
                 self.chat.write("system > Chat cleared.")
                 return
+            if requires_git_repo_approval(self.context, text) and not self.project_git_agent_approved:
+                self.pending_approval_prompt = text
+                self.pending_approval_kind = "git"
+                self.show_approval_popup(text, kind="git")
+                return
             if requires_main_agent_approval(self.context, text) and not self.project_main_agent_approved:
                 self.pending_approval_prompt = text
+                self.pending_approval_kind = "main"
                 self.show_approval_popup(text)
                 return
             self.enqueue_prompt(text)
@@ -823,10 +857,23 @@ def run_textual_tui(context: McpContext) -> bool:
                     pending = len(self.prompt_queue)
                     suffix = f" ({pending} queued)" if pending else ""
                     self.chat.write(f"agentram > thinking...{suffix}")
+                    def stream_to_activity(line: str) -> None:
+                        clean = line.rstrip()
+                        try:
+                            if clean == "__agentram_stream_clear__":
+                                self.call_from_thread(self.update_activity, "")
+                            elif clean:
+                                self.call_from_thread(self.update_activity, "cli > " + trim(clean, 140))
+                        except Exception:
+                            return
+                    previous_callback = set_cli_stream_callback(stream_to_activity)
                     try:
                         response = await asyncio.to_thread(handle_chat_input, self.context, text, self.messages)
                     except Exception as error:  # noqa: BLE001 - TUI boundary
                         response = f"error: {error}"
+                    finally:
+                        set_cli_stream_callback(previous_callback)
+                        self.update_activity("")
                     if response == "__clear__":
                         self.chat.clear()
                         self.chat.write("system > Chat cleared.")
@@ -883,6 +930,13 @@ def create_prompt_session() -> Any | None:
     )
 
 
+def bash_hint_text() -> str:
+    bash_path = shutil.which("bash")
+    if bash_path:
+        return f"system > bash detected: {bash_path}. Use `bash -lc \"...\"` when needed."
+    return "system > bash not detected. Use PowerShell, or install Git Bash/WSL for bash commands."
+
+
 def read_tui_input(prompt_session: Any | None) -> str:
     if prompt_session is None:
         return input("You > ")
@@ -898,6 +952,32 @@ def normalize_approval_decision(text: str) -> str:
         return "no"
     return ""
 
+def git_repo_mutation_requested(prompt: str) -> bool:
+    lower = prompt.lower()
+    patterns = [
+        r"\bgit\s+init\b",
+        r"\bgit\s+add\b",
+        r"\bgit\s+commit\b",
+        r"\bgit\s+reset\b",
+        r"\bgit\s+checkout\b",
+        r"\bgit\s+clean\b",
+        r"\binitial\s+commit\b",
+        r"\btạo\s+git\b",
+        r"\btao\s+git\b",
+        r"\bkhởi\s+tạo\s+git\b",
+        r"\bkhoi\s+tao\s+git\b",
+    ]
+    return any(re.search(pattern, lower) for pattern in patterns)
+
+def requires_git_repo_approval(context: McpContext, prompt: str) -> bool:
+    main_agent = context.profile_store.list_agents().get("main")
+    if not main_agent:
+        return False
+    provider = main_agent.provider.lower()
+    if provider not in {"codex-cli", "claude-code", "claude-cli", "claude-subagent", "claude-code-subagent"}:
+        return False
+    return git_repo_mutation_requested(prompt)
+
 def requires_main_agent_approval(context: McpContext, prompt: str) -> bool:
     main_agent = context.profile_store.list_agents().get("main")
     if not main_agent:
@@ -1230,6 +1310,16 @@ def bind_model_text(context: McpContext, options: dict[str, object]) -> str:
     return f"Bound model: {endpoint.get('id')} provider={endpoint.get('provider')} model={endpoint.get('model')} role={endpoint.get('role')}"
 
 
+def save_profile_env_if_available(context: McpContext, env_name: str) -> bool:
+    if not env_name:
+        return False
+    value = os.getenv(env_name, "")
+    if not value:
+        return False
+    context.profile_store.set_env_value(env_name, value)
+    return True
+
+
 def save_global_env_if_available(context: McpContext, env_name: str) -> bool:
     if not env_name or not global_agent_profile_enabled():
         return False
@@ -1743,7 +1833,7 @@ def model_error_hint(message: str) -> str:
     if "command not found" in lower or "winerror 2" in lower or "the system cannot find the file" in lower:
         return message + r" | Fix: install the CLI or set Main base_url to full command path. For Codex use base_url='C:\Users\admin\AppData\Roaming\npm\codex.cmd exec' or paste codex.cmd path; AgentRAM auto-adds exec when missing."
     if "missing api key env" in lower:
-        return message + " | Fix: set environment variable, then bind using --api-key-env ENV_NAME, not raw key."
+        return message + " | Fix: run AgentRAM setup again and paste raw key; AgentRAM stores it in agent_profile.jsonl, not .env."
     return message
 
 def claude_template_root() -> Path:
@@ -1854,6 +1944,9 @@ def sidebar_lines(context: McpContext) -> list[str]:
         "TASK",
         f"  {trim(goal.current_task or '-', 24)}",
         "",
+        "SHELL",
+        f"  bash: {'yes' if shutil.which('bash') else 'no'}",
+        "",
         "COMMANDS",
         "  / = command palette",
         "  /setup",

package/agentram/orchestration.py

@@ -18,6 +18,20 @@ from uuid import uuid4
 from .config import global_agent_profile_enabled, global_agent_profile_path
 
 
+CLI_STREAM_CALLBACK: Callable[[str], None] | None = None
+
+def set_cli_stream_callback(callback: Callable[[str], None] | None) -> Callable[[str], None] | None:
+    global CLI_STREAM_CALLBACK
+    previous = CLI_STREAM_CALLBACK
+    CLI_STREAM_CALLBACK = callback
+    return previous
+
+def emit_cli_stream(line: str) -> None:
+    if CLI_STREAM_CALLBACK:
+        CLI_STREAM_CALLBACK(line)
+    else:
+        print(line, end="", flush=True)
+
 @dataclass(frozen=True)
 class CliProcessResult:
     returncode: int
@@ -54,14 +68,14 @@ def run_cli_process(args: list[str], timeout: int) -> CliProcessResult:
         assert process.stdout is not None
         for line in process.stdout:
             lines.append(line)
-            print(line, end="", flush=True)
+            emit_cli_stream(line)
         returncode = process.wait(timeout=timeout)
     except subprocess.TimeoutExpired:
         process.kill()
         returncode = process.wait()
         lines.append(f"\ncommand timed out after {timeout}s\n")
     finally:
-        print("\033[2K\r", end="", flush=True)
+        emit_cli_stream("__agentram_stream_clear__")
     return CliProcessResult(returncode, "".join(lines), "")
 
 def add_codex_output_last_message(args: list[str], output_path: str) -> list[str]:
@@ -152,7 +166,7 @@ def env_value(name: str) -> str:
         key, raw_value = stripped.split("=", 1)
         if key.strip() == name:
             return raw_value.strip().strip('"').strip("'")
-    return ""
+    return global_profile_env_value(name)
 
 
 @dataclass(frozen=True)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentram",
-  "version": "0.1.47",
+  "version": "0.1.50",
   "description": "Async, model-agnostic Working RAM for coding agents.",
   "license": "MIT",
   "homepage": "https://github.com/trancongnghia/AGENT_RAM#readme",

package/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "agentram"
-version = "0.1.47"
+version = "0.1.50"
 description = "Async, model-agnostic RAM layer for agentic coding tools."
 readme = "README.md"
 license = "MIT"