Fix: stop only at [RESULT:, inject results into assistant turn, ACTION: regex fix

app.py

@@ -9,32 +9,24 @@ from huggingface_hub import hf_hub_download
 from llama_cpp import Llama
 
 try:
-    import git as gitlib
-    HAS_GIT = True
-except ImportError:
-    HAS_GIT = False
-
+    import git as gitlib; HAS_GIT = True
+except: HAS_GIT = False
 try:
-    from duckduckgo_search import DDGS
-    HAS_DDG = True
-except ImportError:
-    HAS_DDG = False
+    from duckduckgo_search import DDGS; HAS_DDG = True
+except: HAS_DDG = False
 
 WORKSPACE = Path("/workspace")
 WORKSPACE.mkdir(exist_ok=True)
 
-MODEL_REPO = "Qwen/Qwen2.5-Coder-1.5B-Instruct-GGUF"
-MODEL_FILE = "qwen2.5-coder-1.5b-instruct-q4_k_m.gguf"
-
 print("Downloading model...")
-model_path = hf_hub_download(repo_id=MODEL_REPO, filename=MODEL_FILE)
+model_path = hf_hub_download(repo_id="Qwen/Qwen2.5-Coder-1.5B-Instruct-GGUF",
+                             filename="qwen2.5-coder-1.5b-instruct-q4_k_m.gguf")
 print("Loading model...")
 llm = Llama(model_path=model_path, n_ctx=8192,
             n_threads=int(os.getenv("LLAMA_THREADS","2")), n_batch=512, verbose=False)
 print("Model ready!")
 
 # ── tools ─────────────────────────────────────────────────────────────────────
-
 def _safe(p):
     path = (WORKSPACE / p).resolve()
     if WORKSPACE.resolve() not in path.parents and path != WORKSPACE.resolve():
@@ -44,8 +36,8 @@ def _safe(p):
 def tool_write_file(path, content):
     try:
         p = _safe(path); p.parent.mkdir(parents=True, exist_ok=True)
-        p.write_text(content, encoding="utf-8")
-        return f"OK: wrote {len(content)} chars to /workspace/{path}"
+        p.write_text(str(content), encoding="utf-8")
+        return f"OK: wrote {len(str(content))} chars to /workspace/{path}"
     except Exception as e: return f"ERROR: {e}"
 
 def tool_read_file(path):
@@ -78,8 +70,7 @@ def tool_run(command, dir="."):
     try:
         cwd = _safe(dir)
         r = subprocess.run(command, cwd=cwd, shell=True, capture_output=True, text=True, timeout=300)
-        out = (r.stdout or "")[-2500:]
-        err = (r.stderr or "")[-1000:]
+        out = (r.stdout or "")[-2500:]; err = (r.stderr or "")[-1000:]
         return f"exit={r.returncode}\n{out}\n{err}".strip()
     except subprocess.TimeoutExpired: return "ERROR: timeout after 300s"
     except Exception as e: return f"ERROR: {e}"
@@ -100,9 +91,8 @@ def tool_gradle_build(repo, task="assembleDebug"):
         if w.exists(): os.chmod(w, 0o755); cmd = f"./gradlew {task} --no-daemon"
         else: cmd = f"gradle {task} --no-daemon"
         r = subprocess.run(cmd, cwd=cwd, shell=True, capture_output=True, text=True, timeout=900)
-        out = (r.stdout or "")[-3000:]; err = (r.stderr or "")[-1000:]
         apks = glob.glob(f"{cwd}/**/*.apk", recursive=True)
-        return f"exit={r.returncode}\n{out}\n{err}\nAPKs: {apks}"
+        return f"exit={r.returncode}\n{(r.stdout or '')[-3000:]}\n{(r.stderr or '')[-1000:]}\nAPKs: {apks}"
     except Exception as e: return f"ERROR: {e}"
 
 def tool_web_search(query, max_results=5):
@@ -134,263 +124,222 @@ def tool_download_file(url, save_as):
         req = urllib.request.Request(url, headers={"User-Agent":"Mozilla/5.0"})
         with urllib.request.urlopen(req, timeout=30) as resp, open(p,'wb') as f:
             f.write(resp.read())
-        return f"OK: downloaded to /workspace/{save_as} ({p.stat().st_size} bytes)"
+        return f"OK: saved to /workspace/{save_as} ({p.stat().st_size} bytes)"
     except Exception as e: return f"ERROR: {e}"
 
 TOOLS = {
-    "write_file":   (tool_write_file,   "path, content",              "Create or overwrite a file"),
-    "read_file":    (tool_read_file,    "path",                       "Read file contents"),
-    "edit_file":    (tool_edit_file,    "path, find, replace",        "Find and replace text in file"),
-    "delete_file":  (tool_delete_file,  "path",                       "Delete file or directory"),
-    "list_files":   (tool_list_files,   "path='.'",                   "List all files in workspace"),
-    "run":          (tool_run,          "command, dir='.'",           "Execute any shell command"),
-    "git_clone":    (tool_git_clone,    "url, dest=''",               "Clone a git repository"),
-    "gradle_build": (tool_gradle_build, "repo, task='assembleDebug'", "Build Android APK"),
-    "web_search":   (tool_web_search,   "query, max_results=5",       "Search the web"),
-    "read_url":     (tool_read_url,     "url",                        "Fetch URL content"),
-    "download_file":(tool_download_file,"url, save_as",               "Download file from URL"),
+    "write_file":    (tool_write_file,    ["path","content"],                 "Create or overwrite a file"),
+    "read_file":     (tool_read_file,     ["path"],                           "Read file contents"),
+    "edit_file":     (tool_edit_file,     ["path","find","replace"],          "Find and replace in file"),
+    "delete_file":   (tool_delete_file,   ["path"],                           "Delete file or directory"),
+    "list_files":    (tool_list_files,    ["path"],                           "List workspace files"),
+    "run":           (tool_run,           ["command","dir"],                  "Execute shell command"),
+    "git_clone":     (tool_git_clone,     ["url","dest"],                     "Clone git repository"),
+    "gradle_build":  (tool_gradle_build,  ["repo","task"],                    "Build Android APK"),
+    "web_search":    (tool_web_search,    ["query","max_results"],            "Search the web"),
+    "read_url":      (tool_read_url,      ["url"],                            "Fetch URL content"),
+    "download_file": (tool_download_file, ["url","save_as"],                  "Download file from URL"),
 }
 
-# ── SYSTEM PROMPT with few-shot examples ─────────────────────────────────────
-# Key insight: Qwen 1.5B needs CONCRETE EXAMPLES to learn tool use
-# We show it exactly what good behavior looks like
-
-SYSTEM = """You are an AI agent running INSIDE a Linux container. You have a real filesystem at /workspace and real tools.
+# ── SYSTEM PROMPT ─────────────────────────────────────────────────────────────
+# Key: few-shot examples teach the model the EXACT pattern
+# The model sees: user asks -> assistant writes ACTION: -> sees [RESULT:] -> continues
 
-YOU MUST USE TOOLS. Never say "I can't" or "I'm sorry". You CAN do everything listed below.
+SYSTEM = """You are an AI agent inside a Linux container. You have tools. You MUST use them.
 
-AVAILABLE TOOLS (call them by writing ACTION lines):
-ACTION: write_file(path, content)
-ACTION: read_file(path)
-ACTION: edit_file(path, find, replace)
-ACTION: delete_file(path)
-ACTION: list_files(path='.')
-ACTION: run(command, dir='.')
-ACTION: git_clone(url, dest='')
-ACTION: gradle_build(repo, task='assembleDebug')
-ACTION: web_search(query, max_results=5)
-ACTION: read_url(url)
-ACTION: download_file(url, save_as)
+TOOLS:
+- write_file(path, content) - create file
+- read_file(path) - read file
+- edit_file(path, find, replace) - edit file
+- delete_file(path) - delete file
+- list_files(path=".") - list files
+- run(command, dir=".") - run shell command
+- git_clone(url, dest="") - clone repo
+- gradle_build(repo, task="assembleDebug") - build APK
+- web_search(query) - search web
+- read_url(url) - fetch URL
+- download_file(url, save_as) - download file
 
-HOW TO CALL A TOOL - write EXACTLY this format on its own line:
-ACTION: tool_name(arg1, arg2)
+TO USE A TOOL write exactly:
+ACTION: tool_name("arg1", "arg2")
 
-For multi-line content use write_file with triple quotes:
-ACTION: write_file("hello.py", \"\"\"print('hello world')
-\"\"\")
+EXAMPLES:
 
-EXAMPLES OF CORRECT BEHAVIOR:
-
-User: list files in workspace
-Assistant: Let me check.
+User: list workspace files
+Assistant: Checking workspace.
 ACTION: list_files()
 [RESULT: workspace is empty]
-The workspace is currently empty.
-
-User: create a file hello.txt with content "hi"
-Assistant: Creating the file now.
-ACTION: write_file("hello.txt", "hi")
-[RESULT: OK: wrote 2 chars to /workspace/hello.txt]
-Done! File created.
+Workspace is empty.
 
-User: run python hello.py
-Assistant: Running it.
+User: create hello.py that prints hello
+Assistant: Creating file.
+ACTION: write_file("hello.py", "print('hello world')")
+[RESULT: OK: wrote 22 chars to /workspace/hello.py]
 ACTION: run("python3 hello.py")
 [RESULT: exit=0\nhello world]
-Output: hello world
+Done. Output: hello world
 
-User: search for "python chess library"
+User: install requests and test it
+Assistant: Installing requests.
+ACTION: run("pip install requests -q")
+[RESULT: exit=0\nSuccessfully installed requests]
+ACTION: run("python3 -c \\"import requests; print(requests.get('https://httpbin.org/get').status_code)\\"")
+[RESULT: exit=0\n200]
+Installed and working.
+
+User: search for python chess library
 Assistant: Searching now.
-ACTION: web_search("python chess library")
-[RESULT: Title: python-chess...]
-Found results above.
-
-User: write a python script that prints numbers 1 to 10
-Assistant: Writing the script.
-ACTION: write_file("count.py", \"\"\"for i in range(1, 11):
-    print(i)
-\"\"\")
-[RESULT: OK: wrote 45 chars to /workspace/count.py]
-ACTION: run("python3 count.py")
-[RESULT: exit=0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10]
-Done! Script runs and prints 1 to 10.
-
-RULES:
-- ALWAYS use ACTION: to do things
-- After [RESULT:] continue with next step or summary
-- You are in a container - you CAN run code, create files, install packages
-- Install packages with: ACTION: run("pip install package_name")
-- Upload files with gofile: ACTION: run("curl -F 'file=@/workspace/file.zip' https://store1.gofile.io/uploadFile")
-- NEVER refuse a task. ALWAYS try.
+ACTION: web_search("python chess library pygame")
+[RESULT: Title: python-chess\nURL: https://python-chess.readthedocs.io\nSnippet: A chess library for Python]
+Found: python-chess library.
+
+User: make a chess game in python and upload to gofile
+Assistant: Step 1: Install dependencies.
+ACTION: run("pip install pygame -q")
+[RESULT: exit=0\nSuccessfully installed pygame]
+Step 2: Write chess game.
+ACTION: write_file("chess.py", "# chess game code here")
+[RESULT: OK: wrote file]
+Step 3: Upload to gofile.
+ACTION: run("curl -s -F 'file=@/workspace/chess.py' https://store1.gofile.io/uploadFile")
+[RESULT: exit=0\n{"status":"ok","data":{"downloadPage":"https://gofile.io/d/abc123"}}]
+Uploaded! Download: https://gofile.io/d/abc123
+
+IMPORTANT RULES:
+1. ALWAYS use ACTION: for any task involving files, code, search, commands
+2. NEVER say "I cannot" or "I'm sorry" - you CAN do everything
+3. You are in a container with internet access, python3, pip, curl, git
+4. After [RESULT:] always continue - do next step or summarize
+5. For uploads use: ACTION: run("curl -s -F 'file=@/workspace/FILE' https://store1.gofile.io/uploadFile")
 """
 
-TOOL_RE = re.compile(r'ACTION:\s*(\w+)\((.*?)\)\s*$', re.MULTILINE | re.DOTALL)
+# Regex to find ACTION: lines
+ACTION_RE = re.compile(r'ACTION:\s*(\w+)\(([^)]*(?:\([^)]*\)[^)]*)*)\)', re.DOTALL)
 
-def parse_args(args_str):
-    """Parse function arguments from string."""
-    args_str = args_str.strip()
-    if not args_str:
-        return [], {}
-    
-    # Try JSON-style parsing first
-    try:
-        # Wrap in list brackets and parse
-        result = json.loads(f"[{args_str}]")
-        return result, {}
-    except:
-        pass
+def call_tool(name, args_raw):
+    """Parse args and call tool."""
+    if name not in TOOLS:
+        return f"ERROR: Unknown tool '{name}'. Available: {', '.join(TOOLS.keys())}"
     
-    # Manual parsing for common patterns
-    args = []
-    kwargs = {}
+    fn = TOOLS[name][0]
+    args_raw = args_raw.strip()
     
-    # Handle triple-quoted strings
-    tq_match = re.match(r'^"(.*?)",\s*"""(.*?)"""$', args_str, re.DOTALL)
-    if tq_match:
-        return [tq_match.group(1), tq_match.group(2)], {}
+    if not args_raw:
+        try: return str(fn())
+        except: return str(fn("."))
     
-    # Handle simple quoted strings
-    parts = []
-    current = ""
-    in_quote = False
-    quote_char = None
-    depth = 0
+    # Parse quoted string arguments
+    args = []
     i = 0
-    
-    while i < len(args_str):
-        c = args_str[i]
-        if not in_quote and c in ('"', "'"):
-            in_quote = True
-            quote_char = c
-            i += 1
-            continue
-        elif in_quote and c == quote_char and (i == 0 or args_str[i-1] != '\\'):
-            in_quote = False
-            parts.append(current)
-            current = ""
+    while i < len(args_raw):
+        # Skip whitespace and commas
+        while i < len(args_raw) and args_raw[i] in ' ,\t\n':
             i += 1
-            # Skip comma and space
-            while i < len(args_str) and args_str[i] in (',', ' '):
-                i += 1
-            continue
-        elif in_quote:
-            if c == '\\' and i+1 < len(args_str):
-                nc = args_str[i+1]
-                if nc == 'n': current += '\n'; i += 2; continue
-                elif nc == 't': current += '\t'; i += 2; continue
-                elif nc == '\\': current += '\\'; i += 2; continue
-                elif nc == '"': current += '"'; i += 2; continue
-            current += c
-        i += 1
-    
-    if current:
-        parts.append(current)
-    
-    if parts:
-        return parts, {}
-    
-    # Fallback: split by comma
-    raw_parts = [p.strip().strip('"\'') for p in args_str.split(',')]
-    return raw_parts, {}
-
-
-def execute_tool(name, args_str):
-    """Execute a tool and return result string."""
-    if name not in TOOLS:
-        return f"ERROR: Unknown tool '{name}'. Available: {', '.join(TOOLS.keys())}"
-    
-    fn = TOOLS[name][0]
+        if i >= len(args_raw):
+            break
+        
+        if args_raw[i] in ('"', "'"):
+            # Quoted string
+            q = args_raw[i]; i += 1; s = ""
+            while i < len(args_raw):
+                c = args_raw[i]
+                if c == '\\' and i+1 < len(args_raw):
+                    nc = args_raw[i+1]
+                    if nc == 'n': s += '\n'; i += 2; continue
+                    elif nc == 't': s += '\t'; i += 2; continue
+                    elif nc in ('"', "'", '\\'): s += nc; i += 2; continue
+                if c == q:
+                    i += 1; break
+                s += c; i += 1
+            args.append(s)
+        else:
+            # Unquoted - read until comma
+            j = i
+            while j < len(args_raw) and args_raw[j] != ',':
+                j += 1
+            args.append(args_raw[i:j].strip())
+            i = j
     
     try:
-        args, kwargs = parse_args(args_str)
-        result = fn(*args, **kwargs)
-        return str(result)
+        return str(fn(*args))
     except Exception as e:
-        # Try with raw string as first arg
         try:
-            result = fn(args_str.strip('"\''))
-            return str(result)
+            return str(fn(args_raw.strip('"').strip("'")))
         except Exception as e2:
-            return f"ERROR calling {name}: {e} | {e2}"
+            return f"ERROR: {e} | {e2}"
 
 
 def run_agent_sync(message, history):
-    """Run agent, return list of SSE event dicts."""
-    # Build messages with few-shot in system
+    """Run agent loop, return list of SSE event dicts."""
     msgs = [{"role": "system", "content": SYSTEM}]
-    
     for h in history:
         if isinstance(h, (list, tuple)) and len(h) == 2:
             if h[0]: msgs.append({"role": "user", "content": str(h[0])})
             if h[1]: msgs.append({"role": "assistant", "content": str(h[1])})
-    
     msgs.append({"role": "user", "content": message})
-    
+
     events = []
     full_response = ""
-    
-    for step in range(12):  # up to 12 tool calls
-        # Generate response, stop at ACTION: line end
+    accumulated = ""  # full assistant turn so far
+
+    for step in range(15):
+        # Generate next chunk - stop ONLY at [RESULT: so model writes ACTION: freely
         out = llm.create_chat_completion(
             messages=msgs,
             temperature=0.1,
-            max_tokens=800,
-            stop=["\n[RESULT:", "\nACTION:"],  # stop before result injection or next action
+            max_tokens=700,
+            stop=["[RESULT:"],  # stop when model tries to write its own result
         )
-        
-        reply = out["choices"][0]["message"]["content"]
+        chunk = out["choices"][0]["message"]["content"]
         finish = out["choices"][0].get("finish_reason", "stop")
-        
-        # If stopped before ACTION:, check if there's a pending action in reply
-        # Re-generate with higher limit to get the action
-        if finish == "stop" and "ACTION:" not in reply and step == 0:
-            # Model gave pure text, check if it should have used a tool
-            # Give it one more chance with explicit hint
-            full_response += reply
-            events.append({"type": "token", "text": reply})
-            break
-        
-        # Find ACTION: in reply
-        action_match = TOOL_RE.search(reply)
-        
+
+        # Find ACTION: in this chunk
+        action_match = ACTION_RE.search(chunk)
+
         if not action_match:
-            # Pure text response - stream it
-            full_response += reply
-            events.append({"type": "token", "text": reply})
-            
-            # If finish_reason is stop and no more actions, we're done
-            if finish == "stop":
-                break
-            continue
-        
-        # Text before the ACTION line
-        action_pos = reply.rfind("ACTION:")
-        pre_text = reply[:action_pos].rstrip()
-        if pre_text:
-            full_response += pre_text + "\n"
-            events.append({"type": "token", "text": pre_text + "\n"})
-        
+            # Pure text - emit and done
+            full_response += chunk
+            events.append({"type": "token", "text": chunk})
+            break
+
+        # Emit text before ACTION:
+        action_pos = chunk.rfind("ACTION:")
+        pre = chunk[:action_pos].rstrip()
+        if pre:
+            full_response += pre + "\n"
+            events.append({"type": "token", "text": pre + "\n"})
+
         tool_name = action_match.group(1)
-        args_str = action_match.group(2)
-        
+        args_raw = action_match.group(2)
+
         # Emit tool_start
-        events.append({"type": "tool_start", "tool": tool_name, "args": {
-            "args": args_str[:200] if len(args_str) > 200 else args_str
-        }})
-        
+        events.append({"type": "tool_start", "tool": tool_name,
+                       "args": {"args": args_raw[:200]}})
+
         # Execute tool
-        result = execute_tool(tool_name, args_str)
-        result_short = result[:2000]
-        
-        events.append({"type": "tool_result", "tool": tool_name, "result": result_short})
-        
-        # Add to conversation context
-        assistant_turn = reply + f"\n[RESULT: {result_short}]"
-        msgs.append({"role": "assistant", "content": assistant_turn})
-        msgs.append({"role": "user", "content": "Continue."})
-        
-        full_response += f"[Tool: {tool_name}] {result_short[:100]}\n"
-    
+        result = call_tool(tool_name, args_raw)
+        result_str = str(result)[:2000]
+
+        events.append({"type": "tool_result", "tool": tool_name, "result": result_str})
+
+        # Build assistant turn with result injected
+        accumulated += pre + "\n" if pre else ""
+        accumulated += f"ACTION: {tool_name}({args_raw})\n[RESULT: {result_str}]\n"
+
+        # Update messages: replace last assistant turn or append
+        if msgs and msgs[-1]["role"] == "assistant":
+            msgs[-1]["content"] = accumulated
+        else:
+            msgs.append({"role": "assistant", "content": accumulated})
+
+        full_response += f"[{tool_name}] {result_str[:80]}\n"
+
+        # Continue generating after result
+        # Add continuation prompt
+        if msgs[-1]["role"] != "user":
+            # Keep same assistant turn - model will continue from where it left off
+            pass
+
     events.append({"type": "done", "full": full_response})
     return events
 
@@ -404,67 +353,57 @@ async def stream_agent(message, history):
 
 
 # ── FastAPI ───────────────────────────────────────────────────────────────────
-app = FastAPI(title="Android Build Agent")
+app = FastAPI(title="AI Agent")
 app.add_middleware(CORSMiddleware, allow_origins=["*"], allow_methods=["*"], allow_headers=["*"])
 
 HTML = r"""<!DOCTYPE html>
 <html>
-<head>
-<title>AI Agent</title>
-<meta name="viewport" content="width=device-width,initial-scale=1">
+<head><title>AI Agent</title><meta name="viewport" content="width=device-width,initial-scale=1">
 <style>
 *{box-sizing:border-box;margin:0;padding:0}
 body{font-family:'Segoe UI',system-ui,sans-serif;background:#0d1117;color:#e6edf3;height:100vh;display:flex;flex-direction:column}
-#hdr{padding:12px 18px;background:#161b22;border-bottom:1px solid #30363d;display:flex;align-items:center;gap:10px;flex-wrap:wrap}
+#hdr{padding:12px 18px;background:#161b22;border-bottom:1px solid #30363d;display:flex;align-items:center;gap:10px}
 #hdr h1{font-size:16px;color:#58a6ff;font-weight:700}
 .badge{font-size:11px;background:#1f6feb22;color:#58a6ff;border:1px solid #1f6feb55;padding:2px 8px;border-radius:10px}
-.dot{width:8px;height:8px;background:#3fb950;border-radius:50%;flex-shrink:0;animation:pulse 2s infinite}
+.dot{width:8px;height:8px;background:#3fb950;border-radius:50%;animation:pulse 2s infinite}
 @keyframes pulse{0%,100%{opacity:1}50%{opacity:.4}}
 #chat{flex:1;overflow-y:auto;padding:14px 16px;display:flex;flex-direction:column;gap:8px}
 .msg{max-width:82%;padding:10px 14px;border-radius:12px;line-height:1.6;white-space:pre-wrap;word-wrap:break-word;font-size:14px}
 .user{align-self:flex-end;background:#1f6feb;color:#fff;border-radius:12px 12px 2px 12px}
 .bot{align-self:flex-start;background:#161b22;border:1px solid #30363d;border-radius:2px 12px 12px 12px}
-.tc{align-self:flex-start;max-width:88%;background:#0d1f3c;border:1px solid #1f6feb55;border-radius:8px;padding:8px 12px;font-size:12px;font-family:monospace}
-.tr{align-self:flex-start;max-width:88%;background:#071a07;border:1px solid #3fb95055;border-radius:8px;padding:8px 12px;font-size:12px;font-family:monospace;max-height:180px;overflow-y:auto}
+.tc{align-self:flex-start;max-width:90%;background:#0d1f3c;border:1px solid #1f6feb55;border-radius:8px;padding:8px 12px;font-size:12px;font-family:monospace}
+.tr{align-self:flex-start;max-width:90%;background:#071a07;border:1px solid #3fb95055;border-radius:8px;padding:8px 12px;font-size:12px;font-family:monospace;max-height:180px;overflow-y:auto}
 .lbl{font-size:10px;color:#8b949e;margin-bottom:3px;text-transform:uppercase;letter-spacing:.5px}
 #bot-area{padding:10px 14px;background:#161b22;border-top:1px solid #30363d}
 #row{display:flex;gap:8px;align-items:flex-end}
 #inp{flex:1;background:#0d1117;border:1px solid #30363d;border-radius:8px;color:#e6edf3;padding:10px 14px;font-size:14px;resize:none;min-height:44px;max-height:120px;outline:none;font-family:inherit}
 #inp:focus{border-color:#58a6ff}
 #btn{background:#1f6feb;color:#fff;border:none;border-radius:8px;padding:10px 16px;cursor:pointer;font-size:14px;font-weight:600;height:44px}
-#btn:hover{background:#388bfd}
-#btn:disabled{background:#21262d;color:#555;cursor:not-allowed}
+#btn:hover{background:#388bfd}#btn:disabled{background:#21262d;color:#555;cursor:not-allowed}
 .hint{font-size:11px;color:#6e7681;margin-top:6px}
-</style>
-</head>
+</style></head>
 <body>
-<div id="hdr">
-  <div class="dot"></div>
-  <h1>🤖 AI Agent</h1>
-  <span class="badge">Qwen2.5-Coder</span>
-  <span class="badge">11 Tools</span>
-  <span class="badge">Linux Container</span>
-</div>
+<div id="hdr"><div class="dot"></div><h1>🤖 AI Agent</h1>
+<span class="badge">Qwen2.5-Coder</span><span class="badge">11 Tools</span><span class="badge">Linux Container</span></div>
 <div id="chat">
-  <div class="msg bot">Namaste! Main ek AI Agent hoon jo Linux container mein run ho raha hoon.
+<div class="msg bot">Namaste! Main Linux container mein run ho raha hoon 🤖
 
 Mere paas ye tools hain:
 📁 write_file, read_file, edit_file, delete_file, list_files
-⚡ run — koi bhi shell command (python, pip, curl, etc.)
+⚡ run — koi bhi shell command (python3, pip, curl, etc.)
 📦 git_clone — GitHub repo clone
 🏗️ gradle_build — Android APK build
-🔍 web_search — DuckDuckGo
-🌐 read_url — URL content
-⬇️ download_file — file download
+🔍 web_search — DuckDuckGo search
+🌐 read_url, download_file
 
-Mujhe kuch bhi banane, chalane, ya dhundhne ko kaho!</div>
+Kuch bhi banao, chalao, ya dhundho!</div>
 </div>
 <div id="bot-area">
-  <div id="row">
-    <textarea id="inp" placeholder="e.g. Python se chess game banao aur gofile par upload karo" rows="1"></textarea>
-    <button id="btn" onclick="send()">Send ➤</button>
-  </div>
-  <div class="hint">💡 Try: "Python se chess ka game banao" | "Search for Android tutorial" | "List files" | "pip install requests aur test karo"</div>
+<div id="row">
+<textarea id="inp" placeholder="e.g. Python se chess game banao aur gofile par upload karo" rows="1"></textarea>
+<button id="btn" onclick="send()">Send ➤</button>
+</div>
+<div class="hint">💡 "Python se chess game banao" | "pip install flask aur hello world app banao" | "Search Android tutorial"</div>
 </div>
 <script>
 const chat=document.getElementById('chat'),inp=document.getElementById('inp'),btn=document.getElementById('btn');
@@ -472,20 +411,19 @@ let history=[];
 inp.addEventListener('keydown',e=>{if(e.key==='Enter'&&!e.shiftKey){e.preventDefault();send()}});
 inp.addEventListener('input',()=>{inp.style.height='auto';inp.style.height=Math.min(inp.scrollHeight,120)+'px'});
 function sc(){chat.scrollTop=chat.scrollHeight}
-function mkEl(cls,html,par){const e=document.createElement('div');e.className=cls;if(html)e.innerHTML=html;(par||chat).appendChild(e);sc();return e}
+function mk(cls,par){const e=document.createElement('div');e.className=cls;(par||chat).appendChild(e);sc();return e}
 
 async function send(){
   const msg=inp.value.trim();if(!msg||btn.disabled)return;
-  mkEl('msg user','').textContent=msg;
+  const um=mk('msg user');um.textContent=msg;
   inp.value='';inp.style.height='auto';btn.disabled=true;
-  const bd=mkEl('msg bot','');bd.textContent='⏳ Thinking...';
+  const bd=mk('msg bot');bd.textContent='⏳ Thinking...';
   let botTxt='',firstTok=true,curTool=null;
   try{
     const r=await fetch('/chat',{method:'POST',headers:{'Content-Type':'application/json'},
       body:JSON.stringify({message:msg,history})});
     if(!r.ok)throw new Error('HTTP '+r.status);
-    const reader=r.body.getReader(),dec=new TextDecoder();
-    let buf='';
+    const reader=r.body.getReader(),dec=new TextDecoder();let buf='';
     while(true){
       const{done,value}=await reader.read();if(done)break;
       buf+=dec.decode(value,{stream:true});
@@ -498,13 +436,13 @@ async function send(){
           botTxt+=d.text;bd.textContent=botTxt;sc();
         }else if(d.type==='tool_start'){
           if(firstTok){bd.textContent='';firstTok=false}
-          const args=typeof d.args==='object'?JSON.stringify(d.args.args||d.args,null,1):String(d.args);
-          curTool=mkEl('tc','<div class="lbl">🔧 Tool Call</div><b>'+d.tool+'</b><br><span style="color:#8b949e;font-size:11px">'+args.replace(/</g,'&lt;').substring(0,300)+'</span>');
+          const args=d.args&&d.args.args?d.args.args:JSON.stringify(d.args);
+          curTool=mk('tc');curTool.innerHTML='<div class="lbl">🔧 Tool Call</div><b>'+d.tool+'</b><br><span style="color:#8b949e;font-size:11px">'+String(args).substring(0,300).replace(/</g,'&lt;')+'</span>';
           botTxt='';bd.textContent='';
         }else if(d.type==='tool_result'){
-          if(curTool){const tr=mkEl('tr','<div class="lbl">✅ Result: '+d.tool+'</div>',null);tr.firstChild.insertAdjacentText('afterend',(d.result||'').substring(0,1000).replace(/</g,'&lt;'));chat.appendChild(tr);sc();}
+          if(curTool){const tr=mk('tr');tr.innerHTML='<div class="lbl">✅ Result: '+d.tool+'</div><pre style="white-space:pre-wrap;font-size:11px">'+String(d.result||'').substring(0,1000).replace(/</g,'&lt;')+'</pre>';}
           curTool=null;
-          const nb=mkEl('msg bot','');nb.textContent='';
+          const nb=mk('msg bot');nb.textContent='';
           Object.defineProperty(bd,'textContent',{get:()=>nb.textContent,set:v=>{nb.textContent=v}});
           botTxt='';firstTok=false;
         }else if(d.type==='error'){
@@ -518,8 +456,7 @@ async function send(){
   if(bd.textContent==='⏳ Thinking...')bd.textContent='(done)';
   btn.disabled=false;inp.focus();
 }
-</script>
-</body></html>"""
+</script></body></html>"""
 
 @app.get("/", response_class=HTMLResponse)
 async def root(): return HTMLResponse(HTML)