agentram 0.1.20 → 0.1.21

package/agentram/cli.py

@@ -5,6 +5,7 @@ import asyncio
 from concurrent.futures import ThreadPoolExecutor
 import json
 import os
+import re
 import shlex
 import shutil
 import textwrap
@@ -16,6 +17,51 @@ from .config import default_ram_root
 from .mcp_server import McpContext, call_tool
 from .orchestration import AgentModelEndpoint, MultiModelCodingOrchestrator
 
+
+ENV_NAME_PATTERN = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*$")
+RAW_KEY_PREFIXES = ("sk-", "sk_", "sk-proj-", "gsk_", "xai-", "AIza")
+
+
+def looks_like_raw_api_key(value: str) -> bool:
+    stripped = value.strip()
+    if not stripped:
+        return False
+    if stripped.startswith(RAW_KEY_PREFIXES):
+        return True
+    return not bool(ENV_NAME_PATTERN.fullmatch(stripped))
+
+
+def update_env_file_value(path: Path, key: str, value: str) -> None:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    lines = path.read_text(encoding="utf-8").splitlines() if path.exists() else []
+    assignment = f"{key}={value}"
+    updated = False
+    output: list[str] = []
+    for line in lines:
+        if line.strip().startswith(f"{key}="):
+            output.append(assignment)
+            updated = True
+        else:
+            output.append(line)
+    if not updated:
+        if output and output[-1].strip():
+            output.append("")
+        output.append("# Added by AgentRAM TUI setup")
+        output.append(assignment)
+    path.write_text("\n".join(output) + "\n", encoding="utf-8")
+
+
+def resolve_api_key_env(slot: str, value: str) -> tuple[str, str | None]:
+    stripped = value.strip()
+    if not stripped:
+        return "", None
+    if looks_like_raw_api_key(stripped):
+        env_name = f"AGENTRAM_{slot.upper()}_API_KEY"
+        update_env_file_value(Path(".env"), env_name, stripped)
+        os.environ[env_name] = stripped
+        return env_name, env_name
+    return stripped, None
+
 SUBAGENTS: dict[str, str] = {
     "memory": "Summarize important facts, decisions, files, risks, and next tasks into AgentRAM events. Do not edit code.",
     "planner": "Break the coding request into small ordered steps. Check AgentRAM goal drift before scope changes.",
@@ -335,7 +381,7 @@ def run_textual_tui(context: McpContext) -> bool:
                                 yield Input(placeholder="Custom provider if preset=Custom", id=f"setup-{slot}-custom-provider", classes="setup-input")
                                 yield Input(value=default_model, placeholder="Model name", id=f"setup-{slot}-model", classes="setup-input")
                                 yield Input(placeholder="Base URL, e.g. http://localhost:20128/v1", id=f"setup-{slot}-base-url", classes="setup-input")
-                                yield Input(value="OPENAI_API_KEY", placeholder="API key env name, not raw key", id=f"setup-{slot}-api-key-env", classes="setup-input")
+                                yield Input(value="OPENAI_API_KEY", placeholder="API key or env name", id=f"setup-{slot}-api-key-env", classes="setup-input")
                         with Horizontal(id="setup-actions"):
                             yield Button("Save setup", id="setup-save", variant="primary")
                             yield Button("Skip", id="setup-skip")
@@ -396,10 +442,8 @@ def run_textual_tui(context: McpContext) -> bool:
                 provider = self.setup_provider(slot)
                 model = self.setup_value(f"setup-{slot}-model")
                 base_url = self.setup_value(f"setup-{slot}-base-url")
-                api_key_env = self.setup_value(f"setup-{slot}-api-key-env")
-                if api_key_env.startswith(("sk-", "gsk_", "sk_")):
-                    self.chat.write(f"agentram > setup error: {slot} api key env must be variable name, not raw key")
-                    return
+                api_key_input = self.setup_value(f"setup-{slot}-api-key-env")
+                api_key_env, saved_env_name = resolve_api_key_env(slot, api_key_input)
                 if not model:
                     continue
                 endpoint = AgentModelEndpoint(
@@ -411,7 +455,10 @@ def run_textual_tui(context: McpContext) -> bool:
                     modalities=["text"],
                 )
                 self.context.profile_store.set_agent(slot, endpoint)
-                bound.append(f"{slot}={provider}:{model}")
+                if saved_env_name:
+                    bound.append(f"{slot}={provider}:{model} key=.env:{saved_env_name}")
+                else:
+                    bound.append(f"{slot}={provider}:{model}")
             if not bound:
                 self.chat.write("agentram > setup skipped: no model entered")
             else:

package/package.json

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