agentram 0.1.32 → 0.1.34

package/agentram/cli.py

@@ -439,6 +439,9 @@ def run_textual_tui(context: McpContext) -> bool:
         .setup-input { height: 3; }
         #chat { height: 1fr; border: solid #263241; padding: 1; overflow-y: scroll; }
         #palette { height: auto; max-height: 12; border: solid #3b82f6; padding: 1; background: #101826; display: none; }
+        #approval { height: auto; border: heavy #f59e0b; padding: 1; background: #1c1608; display: none; }
+        #approval-title { color: #fde68a; }
+        #approval-actions { height: auto; }
         #input { dock: bottom; border: solid #3b82f6; }
         .muted { color: #8b9bb0; }
         """
@@ -496,6 +499,13 @@ 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)
+                    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.")
+                        with Horizontal(id="approval-actions"):
+                            yield Button("Yes", id="approval-yes", variant="success")
+                            yield Button("Yes, do this project", id="approval-project", variant="primary")
+                            yield Button("No", id="approval-no", variant="error")
                     yield Static(id="palette")
                     yield Input(placeholder="Prompt or /command. Mouse wheel scroll in chat.", id="input")
             yield Footer()
@@ -661,7 +671,13 @@ def run_textual_tui(context: McpContext) -> bool:
                 self.last_ctrl_c_at = now
 
         def on_button_pressed(self, event: Button.Pressed) -> None:
-            if event.button.id == "setup-next":
+            if event.button.id == "approval-yes":
+                self.approve_pending_prompt("yes_once")
+            elif event.button.id == "approval-project":
+                self.approve_pending_prompt("yes_project")
+            elif event.button.id == "approval-no":
+                self.approve_pending_prompt("no")
+            elif event.button.id == "setup-next":
                 self.action_next_setup()
             elif event.button.id == "setup-prev":
                 self.action_prev_setup()
@@ -670,6 +686,36 @@ def run_textual_tui(context: McpContext) -> bool:
                 self.hide_setup()
                 self.query_one("#input", Input).focus()
 
+        def show_approval_popup(self, prompt: str) -> None:
+            panel = self.query_one("#approval", Vertical)
+            self.query_one("#approval-title", Static).update("Main agent wants terminal/file access. Allow?")
+            panel.styles.display = "block"
+            self.chat.write("agentram > approval needed: click Yes / Yes, do this project / No")
+
+        def hide_approval_popup(self) -> None:
+            try:
+                self.query_one("#approval", Vertical).styles.display = "none"
+            except Exception:  # noqa: BLE001 - widget may not be mounted yet
+                return
+
+        def approve_pending_prompt(self, decision: str) -> None:
+            if self.pending_approval_prompt is None:
+                self.hide_approval_popup()
+                return
+            approved = self.pending_approval_prompt
+            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")
+                self.enqueue_prompt(approved)
+                return
+            if decision == "yes_once":
+                self.chat.write("agentram > approved once")
+                self.enqueue_prompt(approved)
+                return
+            self.chat.write("agentram > denied; prompt dropped")
+
         def hide_palette(self) -> None:
             try:
                 palette = self.query_one("#palette", Static)
@@ -743,12 +789,14 @@ def run_textual_tui(context: McpContext) -> bool:
                 if decision == "yes_once":
                     approved = self.pending_approval_prompt
                     self.pending_approval_prompt = None
+                    self.hide_approval_popup()
                     self.chat.write("agentram > approved once")
                     self.enqueue_prompt(approved)
                     return
                 if decision == "yes_project":
                     approved = self.pending_approval_prompt
                     self.pending_approval_prompt = None
+                    self.hide_approval_popup()
                     self.project_main_agent_approved = True
                     self.chat.write("agentram > approved for this project")
                     self.enqueue_prompt(approved)
@@ -756,8 +804,9 @@ def run_textual_tui(context: McpContext) -> bool:
                 if decision == "no":
                     self.chat.write("agentram > denied; prompt dropped")
                     self.pending_approval_prompt = None
+                    self.hide_approval_popup()
                     return
-                self.chat.write("agentram > approval required: type yes, yes do this project, or no")
+                self.chat.write("agentram > approval required: click Yes / Yes, do this project / No")
                 return
             if text and (not self.prompt_history or self.prompt_history[-1] != text):
                 self.prompt_history.append(text)
@@ -769,12 +818,7 @@ def run_textual_tui(context: McpContext) -> bool:
                 return
             if requires_main_agent_approval(self.context, text) and not self.project_main_agent_approved:
                 self.pending_approval_prompt = text
-                self.chat.write(
-                    "agentram > main agent wants terminal/file access. Allow?\n"
-                    "  yes = allow once\n"
-                    "  yes do this project = allow for this project\n"
-                    "  no = deny"
-                )
+                self.show_approval_popup(text)
                 return
             self.enqueue_prompt(text)
 
@@ -1278,19 +1322,14 @@ def supervisor_workflow_text(context: McpContext, prompt: str) -> str:
     plan = runtime_execution_plan(context, supervisor, prompt, memory_context, route)
     outputs["supervisor"] = plan
     outputs["small_after_plan"] = small_agent_observe(context, small_agent, prompt, "supervisor_plan", plan, plan, memory_context)
-    if main_agent:
-        try:
-            outputs["main"] = call_agent_endpoint(main_agent, build_main_agent_prompt(prompt, plan, memory_context))
-        except Exception as error:  # noqa: BLE001 - agent boundary
-            outputs["main"] = f"error: {model_error_hint(str(error))}"
-    else:
-        outputs["main"] = "No main agent bound. Use /bind-agent main <provider> <model>."
-    outputs["small"] = small_agent_observe(context, small_agent, prompt, "main_result", outputs.get("main", ""), plan, memory_context)
+    loop_result = run_main_agent_loop(context, main_agent, small_agent, prompt, plan, memory_context)
+    outputs.update(loop_result["outputs"])
     sync_goal_state_from_small_agent(context, prompt, plan, outputs.get("small", ""))
     persist_workflow_memory(context, prompt, plan, outputs)
     return "\n".join(
         [
-            f"Workflow: route={intent} confidence={float(route.get('confidence', 0.0)):.2f} -> main -> small memory note -> merge",
+            f"Workflow: route={intent} confidence={float(route.get('confidence', 0.0)):.2f} -> main loop -> small memory note -> merge",
+            f"Loop: steps={loop_result['steps']} status={loop_result['status']} retries={loop_result['retries']}",
             "Supervisor plan:",
             plan,
             "",
@@ -1305,6 +1344,104 @@ def supervisor_workflow_text(context: McpContext, prompt: str) -> str:
         ]
     )
 
+def main_loop_limits() -> tuple[int, int]:
+    max_steps = max(1, min(10, int(os.getenv("AGENTRAM_MAIN_MAX_STEPS", "3"))))
+    max_retries = max(0, min(5, int(os.getenv("AGENTRAM_MAIN_MAX_RETRIES", "1"))))
+    return max_steps, max_retries
+
+def run_main_agent_loop(
+    context: McpContext,
+    main_agent: AgentModelEndpoint | None,
+    small_agent: AgentModelEndpoint | None,
+    prompt: str,
+    plan: str,
+    memory_context: str,
+) -> dict[str, object]:
+    outputs: dict[str, str] = {}
+    if not main_agent:
+        outputs["main"] = "No main agent bound. Use /bind-agent main <provider> <model>."
+        outputs["small"] = small_agent_observe(context, small_agent, prompt, "main_result", outputs["main"], plan, memory_context)
+        return {"outputs": outputs, "steps": 0, "status": "no_main", "retries": 0}
+
+    max_steps, max_retries = main_loop_limits()
+    retries = 0
+    status = "max_steps"
+    previous_main_outputs: list[str] = []
+    small_notes: list[str] = []
+
+    for step in range(1, max_steps + 1):
+        step_prompt = build_main_loop_prompt(prompt, plan, memory_context, previous_main_outputs, small_notes, step, max_steps)
+        try:
+            main_output = call_agent_endpoint(main_agent, step_prompt)
+        except Exception as error:  # noqa: BLE001 - agent boundary
+            main_output = f"error: {model_error_hint(str(error))}"
+            retries += 1
+            previous_main_outputs.append(f"Step {step}: {main_output}")
+            small_note = small_agent_observe(context, small_agent, prompt, f"main_error_step_{step}", main_output, plan, memory_context)
+            small_notes.append(small_note)
+            outputs[f"main_step_{step}"] = main_output
+            outputs[f"small_step_{step}"] = small_note
+            if retries > max_retries:
+                status = "error_retry_limit"
+                break
+            continue
+
+        previous_main_outputs.append(f"Step {step}: {main_output}")
+        small_note = small_agent_observe(context, small_agent, prompt, f"main_result_step_{step}", main_output, plan, memory_context)
+        small_notes.append(small_note)
+        outputs[f"main_step_{step}"] = main_output
+        outputs[f"small_step_{step}"] = small_note
+        decision = small_loop_decision(main_output, small_note)
+        status = decision
+        if decision in {"done", "blocker", "error"}:
+            break
+
+    outputs["main"] = "\n\n".join(previous_main_outputs).strip() or "-"
+    outputs["small"] = "\n\n".join(small_notes).strip() or "No small agent bound."
+    return {"outputs": outputs, "steps": len(previous_main_outputs), "status": status, "retries": retries}
+
+def build_main_loop_prompt(
+    prompt: str,
+    plan: str,
+    memory_context: str,
+    previous_main_outputs: list[str],
+    small_notes: list[str],
+    step: int,
+    max_steps: int,
+) -> str:
+    history = "\n\n".join([*previous_main_outputs[-3:], *small_notes[-3:]]) or "-"
+    return "\n".join(
+        [
+            f"AgentRAM main loop step {step}/{max_steps}.",
+            "Continue only if needed. Stop when done or blocked.",
+            "If complete, include DONE. If blocked, include BLOCKER and reason.",
+            "User request:",
+            prompt,
+            "Supervisor / execution plan:",
+            plan,
+            "Recent main/small feedback:",
+            history,
+            "AgentRAM context:",
+            memory_context,
+        ]
+    )
+
+def small_loop_decision(main_output: str, small_note: str) -> str:
+    combined = f"{main_output}\n{small_note}".lower()
+    if "error:" in main_output.lower():
+        return "error"
+    done_markers = ["loop_decision: done", "status: done", "done", "hoàn thành", "hoan thanh", "complete", "completed"]
+    blocker_markers = ["loop_decision: blocker", "status: blocker", "blocker", "blocked", "bị chặn", "bi chan", "không thể tiếp tục", "khong the tiep tuc"]
+    continue_markers = ["loop_decision: continue", "status: continue", "continue", "tiếp tục", "tiep tuc", "next step"]
+    if any(marker in combined for marker in blocker_markers):
+        return "blocker"
+    if any(marker in combined for marker in continue_markers):
+        return "continue"
+    if any(marker in combined for marker in done_markers):
+        return "done"
+    return "done"
+
+
 def classify_agent_runtime_route(context: McpContext, prompt: str, main_agent: AgentModelEndpoint | None = None) -> dict[str, object]:
     if main_agent:
         try:
@@ -1458,7 +1595,7 @@ def build_main_agent_prompt(prompt: str, plan: str, memory_context: str) -> str:
     return "\n".join(["You are AgentRAM main coding agent.", "Nếu user prompt bằng tiếng Việt, trả lời bằng tiếng Việt. Giữ code, command, path, errors nguyên văn.", "Follow supervisor plan. Focus on planning, orchestration, coding, refactor, bug fix, and final result.", "Do not invent repo facts. Mention files to inspect/change.", "User request:", prompt, "Supervisor plan:", plan, "AgentRAM context:", memory_context])
 
 def build_small_agent_prompt(prompt: str, plan: str, memory_context: str, event_content: str = "", event_type: str = "main_result") -> str:
-    return "\n".join(["You are AgentRAM small memory agent.", "Nếu user prompt bằng tiếng Việt, ghi note RAM bằng tiếng Việt. Giữ code, command, path, errors nguyên văn.", "You participate in every AgentRAM event directly: user request, supervisor plan, main result, compact/merge.", "Do not edit code. Observe event content, then note decisions, risks, files, next tasks, and coding facts for RAM.", "You are responsible for setting the visible RAM goal/task from the latest event.", "Return concise memory notes only. Không dùng tiếng Anh nếu user đang dùng tiếng Việt.", "Bắt buộc gồm 2 dòng đầu theo format: current_goal: ... và current_task: ...", "User request:", prompt, "Supervisor plan:", plan, "Observed event type:", event_type, "Observed event content:", event_content or "-", "AgentRAM context:", memory_context])
+    return "\n".join(["You are AgentRAM small memory agent.", "Nếu user prompt bằng tiếng Việt, ghi note RAM bằng tiếng Việt. Giữ code, command, path, errors nguyên văn.", "You participate in every AgentRAM event directly: user request, supervisor plan, main result, compact/merge.", "Do not edit code. Observe event content, then note decisions, risks, files, next tasks, and coding facts for RAM.", "You are responsible for setting the visible RAM goal/task from the latest event.", "Return concise memory notes only. Không dùng tiếng Anh nếu user đang dùng tiếng Việt.", "Bắt buộc gồm 2 dòng đầu theo format: current_goal: ... và current_task: ...", "Nếu main cần chạy tiếp, thêm dòng loop_decision: continue. Nếu xong, loop_decision: done. Nếu bị chặn, loop_decision: blocker.", "User request:", prompt, "Supervisor plan:", plan, "Observed event type:", event_type, "Observed event content:", event_content or "-", "AgentRAM context:", memory_context])
 
 def bind_router_text(context: McpContext, options: dict[str, object]) -> str:
     api_key_env = str(options.get("api_key_env", ""))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentram",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "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.32"
+version = "0.1.34"
 description = "Async, model-agnostic RAM layer for agentic coding tools."
 readme = "README.md"
 license = "MIT"