mlx-code 0.0.28__tar.gz → 0.0.30__tar.gz

{mlx_code-0.0.28 → mlx_code-0.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlx-code
-Version: 0.0.28
+Version: 0.0.30
 Summary: Coding Agent for Mac
 Home-page: https://josefalbers.github.io/mlx-code/
 Author: J Joe
@@ -483,6 +483,7 @@ agent = Agent(extra_tool_classes=[LiveDBTool], tool_names=["QueryDB"])
 | `/abort` | Abort the running agent |
 | `/errors` | Show timestamped error log for the current tab |
 | `/export [path]` | Export session to JSON |
+| `/merge` | Merge current branch into parent tab |
 | `/exit [--all]` | Close branch tab, or exit the app |
 | `/help` | Show command reference |
 | `!command` | Run a shell command; output captured in the TUI (eg, `ls`, `cat hello.c`) |
@@ -548,8 +549,18 @@ mlc --leash claude       # claude code
     - subdomain: jjoe
     - domain: mlx-code.com
     - service url: http://host.containers.internal:8080
+
+[protect & connect]-[zero trust]-[access controls]-[applications]-[create new application]-[self-hosted and private]:
+    - subdomain: jjoe
+    - domain: mlx-code.com
+    - [create new policy]
+        - policy name: Kaputt
+        - action: Allow
+        - [policy rules]-[(or) include]-[selector is]
+
 mlc --host 0.0.0.0 --engine batch --web &
 podman run cloudflare/cloudflared:latest tunnel --no-autoupdate run --token $JJ_CFD_TOKEN
+
 phone http://jjoe.mlx-code.com
 ```
 

{mlx_code-0.0.28 → mlx_code-0.0.30}/README.md

@@ -445,6 +445,7 @@ agent = Agent(extra_tool_classes=[LiveDBTool], tool_names=["QueryDB"])
 | `/abort` | Abort the running agent |
 | `/errors` | Show timestamped error log for the current tab |
 | `/export [path]` | Export session to JSON |
+| `/merge` | Merge current branch into parent tab |
 | `/exit [--all]` | Close branch tab, or exit the app |
 | `/help` | Show command reference |
 | `!command` | Run a shell command; output captured in the TUI (eg, `ls`, `cat hello.c`) |
@@ -510,8 +511,18 @@ mlc --leash claude       # claude code
     - subdomain: jjoe
     - domain: mlx-code.com
     - service url: http://host.containers.internal:8080
+
+[protect & connect]-[zero trust]-[access controls]-[applications]-[create new application]-[self-hosted and private]:
+    - subdomain: jjoe
+    - domain: mlx-code.com
+    - [create new policy]
+        - policy name: Kaputt
+        - action: Allow
+        - [policy rules]-[(or) include]-[selector is]
+
 mlc --host 0.0.0.0 --engine batch --web &
 podman run cloudflare/cloudflared:latest tunnel --no-autoupdate run --token $JJ_CFD_TOKEN
+
 phone http://jjoe.mlx-code.com
 ```
 

{mlx_code-0.0.28 → mlx_code-0.0.30}/mlx_code/apis.py

@@ -75,7 +75,7 @@ class ClaudeChat:
                 out.append(blk)
             elif t == 'thinking':
                 if b['redacted']:
-                    out.append({'type': 'redacted_thinking', 'data': b['thinking']})
+                    out.append({'type': 'redacted_thinking', 'data': b.get('thinking', b.get('redacted_data', ''))})
                 else:
                     out.append({'type': 'thinking', 'thinking': b['thinking'], 'signature': b.get('signature') or ''})
             elif t == 'toolCall':
@@ -156,7 +156,7 @@ class ClaudeChat:
                                     msg['content'].append({'type': 'thinking', 'thinking': '', 'signature': None, 'redacted': False})
                                 elif bt == 'redacted_thinking':
                                     _idx[idx] = len(msg['content'])
-                                    msg['content'].append({'type': 'thinking', 'thinking': '', 'signature': None, 'redacted': True})
+                                    msg['content'].append({'type': 'thinking', 'redacted_data': blk.get('data', ''), 'signature': None, 'redacted': True})
                                 elif bt == 'tool_use':
                                     _idx[idx] = len(msg['content'])
                                     msg['content'].append({'type': 'toolCall', 'id': blk['id'], 'name': blk['name'], 'arguments': {}})

{mlx_code-0.0.28 → mlx_code-0.0.30}/mlx_code/bats.py

@@ -1,4 +1,3 @@
-_UI_HTML = '<!DOCTYPE html>\n<html lang="en">\n<head>\n<meta charset="UTF-8">\n<meta name="viewport" content="width=device-width, initial-scale=1.0">\n<title>MLX Code</title>\n<style>\n*{margin:0;padding:0;box-sizing:border-box}\nbody{font-family:system-ui,-apple-system,sans-serif;background:#0d1117;color:#c9d1d9;height:100vh;display:flex;flex-direction:column}\n#hdr{padding:8px 16px;background:#161b22;border-bottom:1px solid #30363d;display:flex;justify-content:space-between;align-items:center;flex-shrink:0}\n#hdr h1{font-size:14px;font-weight:600}\n#hdr .info{display:flex;gap:8px;align-items:center;font-size:12px;color:#8b949e}\n#hdr button{background:transparent;color:#8b949e;border:1px solid #30363d;border-radius:6px;padding:4px 10px;cursor:pointer;font-size:12px}\n#hdr button:hover{color:#c9d1d9;border-color:#8b949e}\n#chat{flex:1;overflow-y:auto;padding:16px}\n.chat-inner{max-width:920px;margin:0 auto}\n.msg{margin-bottom:14px}\n.msg-role{font-size:12px;color:#8b949e;margin-bottom:3px}\n.msg-body{padding:10px 14px;border-radius:8px;line-height:1.6;white-space:pre-wrap;word-break:break-word;font-size:14px}\n.msg-user .msg-body{background:#1c2128;border:1px solid #30363d}\n.msg-assistant .msg-body{background:#161b22;border:1px solid #30363d}\n.msg-thinking .msg-body{color:#6e7681;font-style:italic;background:rgba(136,144,150,0.05);border-left:2px solid #30363d;font-size:13px}\n.msg-tool .msg-body{background:rgba(210,153,34,0.08);border-left:2px solid #d29922;font-family:ui-monospace,SFMono-Regular,monospace;font-size:13px}\n.msg-error .msg-body{color:#f85149}\n.cursor{display:inline-block;width:7px;height:15px;background:#58a6ff;animation:blink 1s steps(2) infinite;vertical-align:text-bottom;margin-left:2px;border-radius:1px}\n@keyframes blink{50%{opacity:0}}\n#input-area{padding:12px 16px;background:#161b22;border-top:1px solid #30363d;flex-shrink:0}\n.input-inner{max-width:920px;margin:0 auto;display:flex;gap:8px}\n#input{flex:1;background:#0d1117;color:#c9d1d9;border:1px solid #30363d;border-radius:8px;padding:10px 14px;font-family:inherit;font-size:14px;resize:none;height:44px;max-height:200px;line-height:1.5}\n#input:focus{outline:none;border-color:#58a6ff}\n#send{background:#238636;color:#fff;border:none;border-radius:8px;padding:0 20px;cursor:pointer;font-size:14px;font-weight:500;white-space:nowrap}\n#send:hover{background:#2ea043}\n#send:disabled{background:#21262d;color:#484f58;cursor:not-allowed}\n</style>\n</head>\n<body>\n<div id="hdr">\n  <h1>⚡ MLX Code</h1>\n  <div class="info">\n    <span id="status">connecting...</span>\n    <button onclick="clearChat()">Clear</button>\n  </div>\n</div>\n<div id="chat"><div class="chat-inner" id="chatInner"></div></div>\n<div id="input-area">\n  <div class="input-inner">\n    <textarea id="input" placeholder="Send a message... (Enter=send, Shift+Enter=newline)" rows="1"></textarea>\n    <button id="send" onclick="send()">Send</button>\n  </div>\n</div>\n<script>\nconst chatEl=document.getElementById(\'chat\');\nconst innerEl=document.getElementById(\'chatInner\');\nconst inputEl=document.getElementById(\'input\');\nconst sendBtn=document.getElementById(\'send\');\nconst statusEl=document.getElementById(\'status\');\nconst SYSTEM_PROMPT = \'You are a helpful assistant. You are running in a web chat mode with no tool execution capabilities. Answer the user directly and concisely.\';\nlet messages=[{role:\'system\',content:SYSTEM_PROMPT}];\nlet streaming=false;\n\ninputEl.addEventListener(\'keydown\',e=>{\n  if(e.key===\'Enter\'&&!e.shiftKey){e.preventDefault();send();}\n});\ninputEl.addEventListener(\'input\',()=>{\n  inputEl.style.height=\'auto\';\n  inputEl.style.height=Math.min(inputEl.scrollHeight,200)+\'px\';\n});\n\nfunction scrollBottom(){chatEl.scrollTop=chatEl.scrollHeight;}\n\nfunction addMsg(role,label){\n  const d=document.createElement(\'div\');\n  d.className=\'msg msg-\'+role;\n  const r=document.createElement(\'div\');r.className=\'msg-role\';r.textContent=label;\n  const b=document.createElement(\'div\');b.className=\'msg-body\';\n  d.appendChild(r);d.appendChild(b);\n  innerEl.appendChild(d);scrollBottom();return b;\n}\n\nfunction clearChat(){\n  if(streaming)return;\n  messages=[{role:\'system\',content:SYSTEM_PROMPT}];innerEl.innerHTML=\'\';inputEl.focus();\n}\n\nfunction stripToolXml(text){\n  // Remove complete <tool_call>...</tool_call> blocks\n  text=text.replace(/<tool_call>[\\s\\S]*?<\\/tool_call>/g,\'\');\n  // Handle incomplete <tool_call> at end (closing tag not yet received)\n  const idx=text.lastIndexOf(\'<tool_call>\');\n  if(idx!==-1&&text.indexOf(\'</tool_call>\',idx)===-1)return text.substring(0,idx);\n  // Handle partial opening tag at end (e.g. "<tool", "<tool_c")\n  const tag=\'<tool_call>\';\n  for(let i=tag.length-1;i>0;i--){\n    if(text.endsWith(tag.substring(0,i)))return text.substring(0,text.length-i);\n  }\n  return text;\n}\n\nfunction checkHealth(){\n  fetch(\'/health\').then(r=>r.json()).then(d=>{\n    statusEl.textContent=d.model||\'ready\';\n  }).catch(()=>{statusEl.textContent=\'offline\';});\n}\n\nasync function send(){\n  const text=inputEl.value.trim();\n  if(!text||streaming)return;\n  inputEl.value=\'\';inputEl.style.height=\'auto\';\n  messages.push({role:\'user\',content:text});\n  addMsg(\'user\',\'≫ You\').textContent=text;\n  streaming=true;sendBtn.disabled=true;statusEl.textContent=\'generating...\';\n\n  const aBody=addMsg(\'assistant\',\'○ Assistant\');\n  let tBody=null,displayText=\'\',thinkText=\'\',rawText=\'\',toolCalls=[];\n  const cursor=document.createElement(\'span\');cursor.className=\'cursor\';aBody.appendChild(cursor);\n\n  try{\n    const resp=await fetch(\'/v1/chat/completions\',{\n      method:\'POST\',\n      headers:{\'Content-Type\':\'application/json\'},\n      body:JSON.stringify({messages,max_tokens:8192})\n    });\n\n    if(!resp.ok){\n      cursor.remove();\n      let msg=\'HTTP \'+resp.status;\n      try{const e=await resp.json();msg+=\': \'+(e.error||JSON.stringify(e));}catch(_){try{msg+=\': \'+await resp.text();}catch(_){}}\n      aBody.textContent=\'✗ \'+msg;\n      aBody.parentElement.classList.add(\'msg-error\');\n      messages.pop();return;\n    }\n\n    const reader=resp.body.getReader();\n    const dec=new TextDecoder();\n    let buf=\'\';\n\n    while(true){\n      const{done,value}=await reader.read();\n      if(done)break;\n      buf+=dec.decode(value,{stream:true});\n      const lines=buf.split(\'\\n\');\n      buf=lines.pop();  // keep partial line in buffer\n\n      for(const line of lines){\n        if(!line.startsWith(\'data: \'))continue;\n        const data=line.slice(6).trim();\n        if(!data||data===\'[DONE]\')continue;\n        let ch;try{ch=JSON.parse(data);}catch(_){continue;}\n        const delta=ch.choices&&ch.choices[0]&&ch.choices[0].delta;\n        if(!delta)continue;\n\n        if(delta.reasoning_content){\n          if(!tBody){\n            cursor.remove();\n            tBody=addMsg(\'thinking\',\'◌ Thinking\');\n            tBody.appendChild(cursor.cloneNode());\n          }\n          thinkText+=delta.reasoning_content;\n          const c=tBody.querySelector(\'.cursor\');if(c)c.remove();\n          tBody.textContent=thinkText;\n          tBody.appendChild(cursor.cloneNode());\n          scrollBottom();\n        }\n\n        if(delta.content){\n          if(tBody){\n            const c=tBody.querySelector(\'.cursor\');if(c)c.remove();\n            tBody=null;aBody.appendChild(cursor);\n          }\n          rawText+=delta.content;\n          displayText=stripToolXml(rawText);\n          cursor.remove();aBody.textContent=displayText;aBody.appendChild(cursor);\n          scrollBottom();\n        }\n\n        if(delta.tool_calls){\n          cursor.remove();\n          for(const tc of delta.tool_calls){\n            const fn=tc.function||{};\n            if(fn.name){\n              toolCalls.push({name:fn.name,args:\'\'});\n              addMsg(\'tool\',\'⚙ \'+fn.name).textContent=fn.name;\n            }\n            if(fn.arguments&&toolCalls.length>0){\n              toolCalls[toolCalls.length-1].args+=fn.arguments;\n              const tbs=innerEl.querySelectorAll(\'.msg-tool .msg-body\');\n              if(tbs.length>0){\n                let disp=toolCalls[toolCalls.length-1].name+\'\\n\';\n                try{disp+=JSON.stringify(JSON.parse(toolCalls[toolCalls.length-1].args),null,2);}\n                catch(_){disp+=toolCalls[toolCalls.length-1].args;}\n                tbs[tbs.length-1].textContent=disp;\n              }\n            }\n          }\n          scrollBottom();\n        }\n      }\n    }\n\n    cursor.remove();\n    if(displayText.trim()){\n      aBody.textContent=displayText;\n      messages.push({role:\'assistant\',content:displayText});\n    }else{\n      aBody.textContent=thinkText?\'(thinking only)\':\'(no output)\';\n      messages.push({role:\'assistant\',content:displayText});\n    }\n    if(toolCalls.length>0){\n      addMsg(\'tool\',\'⚠ Note\').textContent=\'Tool calls cannot be executed in the web UI. Use the terminal REPL (--bare) for full tool support.\';\n    }\n  }catch(e){\n    cursor.remove();\n    aBody.textContent=\'✗ \'+e.message;\n    aBody.parentElement.classList.add(\'msg-error\');\n    if(messages.length>0&&messages[messages.length-1].role===\'user\')messages.pop();\n  }finally{\n    streaming=false;sendBtn.disabled=false;\n    checkHealth();inputEl.focus();\n  }\n}\n\ncheckHealth();inputEl.focus();\n</script>\n</body>\n</html>'
 import asyncio
 import json
 import queue as _queue
@@ -12,7 +11,7 @@ from pathlib import Path
 import mlx.core as mx
 from starlette.applications import Starlette
 from starlette.requests import Request
-from starlette.responses import StreamingResponse, JSONResponse, HTMLResponse
+from starlette.responses import StreamingResponse, JSONResponse
 from starlette.routing import Route
 import logging
 logger = logging.getLogger(__name__)

{mlx_code-0.0.28 → mlx_code-0.0.30}/mlx_code/gits.py

@@ -349,4 +349,21 @@ def get_branch_base_sha(worktree: str) -> str | None:
             except GitError:
                 pass
     root_sha = _git(worktree, 'rev-list', '--max-parents=0', 'HEAD', check=False)
-    return root_sha or None
+    return root_sha or None
+
+def merge_branch_into_worktree(parent_gwt, child_gwt) -> tuple[bool, str]:
+    if parent_gwt is None or child_gwt is None:
+        out = f'Not git: parent_gwt={parent_gwt!r} child_gwt={child_gwt!r}'
+        logger.debug(out)
+        return (False, out)
+    try:
+        out = _git(parent_gwt.worktree, 'merge', '--no-edit', '--no-ff', child_gwt.branch)
+        logger.info(out)
+        return (True, out)
+    except GitError as exc:
+        logger.error('Failed merge')
+        try:
+            _git(parent_gwt.worktree, 'merge', '--abort', check=False)
+        except Exception as _exc:
+            logger.error('Failed merge --abort')
+        return (False, str(exc))

{mlx_code-0.0.28 → mlx_code-0.0.30}/mlx_code/main.py

@@ -387,10 +387,11 @@ def is_stuck(tokens, pattern_size=100, min_repeats=3):
     if len(tokens) < pattern_size * min_repeats:
         return False
     pattern = tuple(tokens[-pattern_size:])
+    window = tokens[-(pattern_size * min_repeats + pattern_size):]
     positions = []
-    limit = len(tokens) - pattern_size
+    limit = len(window) - pattern_size
     for i in range(limit):
-        if tuple(tokens[i:i + pattern_size]) == pattern:
+        if tuple(window[i:i + pattern_size]) == pattern:
             positions.append(i)
     if len(positions) < min_repeats:
         return False

{mlx_code-0.0.28 → mlx_code-0.0.30}/mlx_code/repl.py

@@ -148,16 +148,17 @@ class Agent:
                             r['content'].insert(0, {'type': 'text', 'text': warn})
             self.messages.extend(results)
             await self._emit({'type': 'tool_results_ready', 'payload': {}})
-            new_gwt, diff_stat = commit_worktree(self.ctx['gwt'], self.messages)
-            self.ctx['gwt'] = new_gwt
-            if diff_stat:
-                sha = new_gwt.commit[:8] if new_gwt else ''
-                self.messages.append({'role': 'commit', 'content': f'[{sha}]\n{diff_stat}', 'sha': sha})
-                await self._emit({'type': 'commit', 'payload': {'diff_stat': diff_stat, 'sha': sha}})
             if self._signal and self._signal.is_set():
                 final['stop_reason'] = 'aborted'
                 break
+        new_gwt, diff_stat = commit_worktree(self.ctx['gwt'], self.messages)
+        self.ctx['gwt'] = new_gwt
+        if diff_stat:
+            sha = new_gwt.commit[:8] if new_gwt else ''
+            self.messages.append({'role': 'commit', 'content': f'[{sha}]\n{diff_stat}', 'sha': sha})
+            await self._emit({'type': 'commit', 'payload': {'diff_stat': diff_stat, 'sha': sha}})
         await self._emit({'type': 'agent_end', 'payload': {'message': final}})
+        logger.debug(json.dumps(self.messages, indent=2, ensure_ascii=False))
         return final
 
     async def _execute_tools(self, calls: list[dict]) -> list[dict]:
@@ -237,7 +238,7 @@ class UIAdapter(Protocol):
 
     def exit_app(self, summary: list[dict]) -> None:
         ...
-HELP_TEXT = '\nCommands:\n/help               show this message\n/clear [--config F] clear conversation; --config reconfigures agent from YAML/JSON\n/history            show full conversation transcript\n/history --raw      show raw API message log (debug)\n/diff [--all]       show side-by-side diff of changes\n/errors             show timestamped error log for this tab\n/tools              list active tools\n/branch [--rev N] [--no-worktree] [prompt]\n                    open a branch tab; optional prompt runs immediately\n/branches           list all tabs/branches\n/abort              abort the running agent\n/export [path]      export session to JSON\n/verbose            toggle verbose mode (show raw tool calls and output)\n/exit  /quit [--all] close branch tab, or exit the app\n!command            run shell command in worktree (output captured)\n$command            run interactive shell command (terminal handed to process)\n                    e.g.  !ls  !git diff  !cat file.py\n                          $vim file.py  $yazi  $less log.txt\n\nKeys (TUI only):\nEnter               submit\nCtrl-J              insert newline in editor\nCtrl-1 … Ctrl-9     jump directly to tab N\nCtrl-, / Ctrl-.     cycle through tabs\nCtrl-C              abort running agent\nCtrl-D              close branch tab (exit app if last tab)\nCtrl-R              recall last prompt into editor\n'
+HELP_TEXT = '\nCommands:\n/help               show this message\n/clear [--config F] clear conversation; --config reconfigures agent from YAML/JSON\n/history            show full conversation transcript\n/history --raw      show raw API message log (debug)\n/diff [--all]       show side-by-side diff of changes\n/errors             show timestamped error log for this tab\n/tools              list active tools\n/branch [--rev N] [--no-worktree] [prompt]\n                    open a branch tab; optional prompt runs immediately\n/branches           list all tabs/branches\n/abort              abort the running agent\n/export [path]      export session to JSON\n/verbose            toggle verbose mode (show raw tool calls and output)\n/merge              merge this branch into its parent tab, then close\n/exit  /quit [--all] close branch tab, or exit the app\n!command            run shell command in worktree (output captured)\n$command            run interactive shell command (terminal handed to process)\n                    e.g.  !ls  !git diff  !cat file.py\n                          $vim file.py  $yazi  $less log.txt\n\nKeys (TUI only):\nEnter               submit\nCtrl-J              insert newline in editor\nCtrl-1 … Ctrl-9     jump directly to tab N\nCtrl-, / Ctrl-.     cycle through tabs\nCtrl-C              abort running agent\nCtrl-D              close branch tab (exit app if last tab)\nCtrl-R              recall last prompt into editor\n'
 
 class CommandEngine:
 
@@ -289,6 +290,15 @@ class CommandEngine:
             self._unsubscribers[key]()
             del self._unsubscribers[key]
 
+    def _find_parent_tab(self, tab: TabModel) -> TabModel | None:
+        if not tab.index_path:
+            return None
+        parent_path = tab.index_path[:-1]
+        for t in self.tabs:
+            if t.index_path == parent_path:
+                return t
+        return None
+
     async def handle_input(self, text: str) -> None:
         text = text.strip()
         if not text:
@@ -310,7 +320,7 @@ class CommandEngine:
         cmd, _, arg = text.partition(' ')
         cmd = cmd.lower().strip()
         arg = arg.strip()
-        handlers = {'/help': self._cmd_help, '/clear': self._cmd_clear, '/history': self._cmd_history, '/diff': self._cmd_diff, '/errors': self._cmd_errors, '/tools': self._cmd_tools, '/abort': self._cmd_abort, '/branch': self._cmd_branch, '/branches': self._cmd_branches, '/tab': self._cmd_tab, '/export': self._cmd_export, '/verbose': self._cmd_verbose, '/exit': self._cmd_exit, '/quit': self._cmd_exit}
+        handlers = {'/help': self._cmd_help, '/clear': self._cmd_clear, '/history': self._cmd_history, '/diff': self._cmd_diff, '/errors': self._cmd_errors, '/tools': self._cmd_tools, '/abort': self._cmd_abort, '/branch': self._cmd_branch, '/branches': self._cmd_branches, '/tab': self._cmd_tab, '/export': self._cmd_export, '/verbose': self._cmd_verbose, '/merge': self._cmd_merge, '/exit': self._cmd_exit, '/quit': self._cmd_exit}
         handler = handlers.get(cmd)
         if handler:
             await handler(arg)
@@ -330,6 +340,9 @@ class CommandEngine:
                 self.ui.show_error(f'Config error: {e}')
                 return
             tab = self.active_tab
+            if tab.is_running:
+                self.ui.show_error('Agent is running — /abort first before /clear --config.')
+                return
             old = tab.agent
             new_ctx = {k: v for k, v in old.ctx.items() if k != 'agent'}
             new_agent = Agent(system=cfg.get('system'), api=cfg.get('api'), model=cfg.get('model'), api_key=cfg.get('api_key'), base_url=cfg.get('base_url'), tool_names=cfg.get('tools'), extra_tool_classes=old._extra_tool_classes, ctx=new_ctx)
@@ -557,6 +570,36 @@ class CommandEngine:
         state = 'on' if self.verbose else 'off'
         self.ui.show_command_result('/verbose', f'Verbose mode {state}.')
 
+    async def _cmd_merge(self, arg: str) -> None:
+        tab = self.active_tab
+        if tab.is_main:
+            self.ui.show_error('Cannot /merge the main tab — it has no parent.')
+            return
+        if tab.is_running:
+            self.ui.show_error('Agent is running — /abort first.')
+            return
+        parent = self._find_parent_tab(tab)
+        if parent is None:
+            self.ui.show_error(f'Cannot find parent tab for {tab.title!r}.')
+            return
+        child_gwt = tab.agent.ctx.get('gwt')
+        parent_gwt = parent.agent.ctx.get('gwt')
+        if child_gwt is None or parent_gwt is None:
+            self.ui.show_error('Both tabs need git worktrees to merge.')
+            return
+        commit_worktree(child_gwt, tab.agent.messages)
+        from .gits import merge_branch_into_worktree
+        success, msg = merge_branch_into_worktree(parent_gwt, child_gwt)
+        if not success:
+            self.ui.show_error(f'Merge failed: {msg}')
+            return
+        new_parent_gwt, diff_stat = commit_worktree(parent_gwt, parent.agent.messages)
+        parent.agent.ctx['gwt'] = new_parent_gwt
+        self.ui.show_command_result('/merge', f'Merged {tab.title!r} into {parent.title!r}.\n' + (f'{diff_stat}' if diff_stat else '(no changes)'))
+        self._do_close_or_exit()
+        parent_idx = self.tabs.index(parent)
+        self.switch_tab(parent_idx)
+
     async def _cmd_exit(self, arg: str) -> None:
         if arg == '--all':
             summary = self._build_exit_summary()
@@ -636,6 +679,12 @@ class CommandEngine:
             tab = self.active_tab
             removed_index = self.active_index
             self.detach_agent(tab)
+            gwt_ref = tab.agent.ctx.get('gwt')
+            if gwt_ref and getattr(gwt_ref, 'worktree', None):
+                try:
+                    cleanup_worktree(gwt_ref, remove_branch=True)
+                except Exception:
+                    logger.error('Failed worktree cleanup')
             self.tabs.pop(removed_index)
             if self.active_index >= len(self.tabs):
                 self.active_index = len(self.tabs) - 1

{mlx_code-0.0.28 → mlx_code-0.0.30}/mlx_code/tools.py

@@ -386,6 +386,7 @@ class AgentTool(Tool):
     parameters = AgentParams
 
     async def execute(self, params: AgentParams, signal=None) -> dict:
+        from gits import create_worktree, commit_worktree, merge_branch_into_worktree
         parent = self.ctx['agent']
         overrides = {}
         if params.api is not None:
@@ -394,11 +395,23 @@ class AgentTool(Tool):
             overrides['system'] = params.system
         overrides['tool_names'] = params.tools
         child = parent.spawn(**overrides)
+        parent_gwt = parent.ctx.get('gwt')
+        parent_cwd = parent.ctx.get('cwd', os.getcwd())
+        repo_dir = parent_gwt.worktree if parent_gwt else parent_cwd
+        child_gwt = create_worktree(repo_dir, prefix='subagent')
+        if child_gwt is None:
+            return tout('Agent failed: could not create isolated worktree. Check .log.json for git errors.', True)
+        child.ctx['gwt'] = child_gwt
+        child.ctx['cwd'] = child_gwt.worktree
+        if 'env' in child.ctx:
+            child.ctx['env']['PWD'] = child_gwt.worktree
         if '_stream_log_fp' in parent.ctx:
             from .stream_log import StreamLogger
             StreamLogger.attach_to_child(child, parent.ctx, tool_name=f'sub-agent-{''.join(random.choices(string.ascii_letters + string.digits, k=2))}')
         try:
             result = await child.run(params.task)
+            commit_worktree(child_gwt, child.messages)
+            merge_branch_into_worktree(parent_gwt, child_gwt)
             texts = [b.get('text', '') for b in result['content'] if b.get('type') == 'text']
             combined = ''.join(texts).strip()
             if not combined:

{mlx_code-0.0.28 → mlx_code-0.0.30}/mlx_code/tui.py

@@ -234,7 +234,6 @@ class Tab(Vertical):
                     self._stream_blocks.append({'type': 'thinking', 'text': delta})
             self.refresh_stream()
         elif et == 'tool_start':
-            self._stream_blocks.append({'type': 'toolCall', 'name': payload.get('name', 'tool'), 'arguments': payload.get('args', {}), 'id': 'streaming'})
             self.refresh_stream()
         elif et == 'tool_end':
             if payload.get('is_error'):

{mlx_code-0.0.28 → mlx_code-0.0.30}/mlx_code/view_log.py

@@ -597,7 +597,7 @@ def tui(stdscr, entries, log_file, initial_filter='', initial_visible=None):
 def main():
     parser = argparse.ArgumentParser(description='TUI viewer for JSON log files')
     parser.add_argument('logfile', nargs='?', default='.log.json', help='Path to log file (default: .log.json)')
-    parser.add_argument('-f', '--filter', default=f'lvl:10;file:main,bats,repl,bare,gits,apis,tools', help='Initial filter string (same syntax as in UI)')
+    parser.add_argument('-f', '--filter', default=f'lvl:10;file:main,bats,repl,bare,tui,gits,apis,tools', help='Initial filter string (same syntax as in UI)')
     parser.add_argument('-o', '--out', dest='out', metavar='FILE', help='Write marked entries to FILE (JSON lines format) instead of stdout')
     args = parser.parse_args()
     log_path = args.logfile