mlx-code 0.0.29__tar.gz → 0.0.31__tar.gz

{mlx_code-0.0.29 → mlx_code-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlx-code
-Version: 0.0.29
+Version: 0.0.31
 Summary: Coding Agent for Mac
 Home-page: https://josefalbers.github.io/mlx-code/
 Author: J Joe
@@ -15,13 +15,11 @@ License-File: LICENSE
 Requires-Dist: mlx-lm>=0.31.3; platform_system == "Darwin"
 Requires-Dist: httpx
 Requires-Dist: pydantic
-Requires-Dist: textual>=8.2.7
-Requires-Dist: rich>=15.0.0
-Requires-Dist: starlette
-Requires-Dist: uvicorn
 Provides-Extra: all
-Requires-Dist: python-lsp-server[all]; extra == "all"
-Requires-Dist: GitPython; extra == "all"
+Requires-Dist: starlette; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: textual>=8.2.7; extra == "all"
+Requires-Dist: rich>=15.0.0; extra == "all"
 Requires-Dist: pygments; extra == "all"
 Dynamic: author
 Dynamic: author-email
@@ -76,7 +74,7 @@ Agents:           ├───────────────────
              │  │ Gemini         │  │ Edit    Bash   │  │
              │  │ Claude         │  │ Grep    Find   │  │
              │  │ Codex          │  │ Ls      Skill  │  │
-             │  │ DeepSeek       │  │ Agent ─────────┼──┼───► Recursively spawns sub-Agents
+             │  │ DeepSeek       │  │ Agent ────────────────► Recursively spawns sub-Agents
              │  └────────────────┘  └────────────────┘  │     
              │  Git worktree                            │
              │  (isolation + session state)             │
@@ -108,10 +106,10 @@ result = await agent.run('refactor utils.py to use dataclasses')
 
 ```bash
 # ephemeral run (no installation)
-uvx --from mlx-code mlc
+uvx --from mlx-code[all] mlc
 
 # or install into the current environment
-pip install mlx-code
+pip install mlx-code[all]
 
 # launch
 mlc                              # with a local MLX model
@@ -483,6 +481,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 +547,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.29 → mlx_code-0.0.31}/README.md

@@ -38,7 +38,7 @@ Agents:           ├───────────────────
              │  │ Gemini         │  │ Edit    Bash   │  │
              │  │ Claude         │  │ Grep    Find   │  │
              │  │ Codex          │  │ Ls      Skill  │  │
-             │  │ DeepSeek       │  │ Agent ─────────┼──┼───► Recursively spawns sub-Agents
+             │  │ DeepSeek       │  │ Agent ────────────────► Recursively spawns sub-Agents
              │  └────────────────┘  └────────────────┘  │     
              │  Git worktree                            │
              │  (isolation + session state)             │
@@ -70,10 +70,10 @@ result = await agent.run('refactor utils.py to use dataclasses')
 
 ```bash
 # ephemeral run (no installation)
-uvx --from mlx-code mlc
+uvx --from mlx-code[all] mlc
 
 # or install into the current environment
-pip install mlx-code
+pip install mlx-code[all]
 
 # launch
 mlc                              # with a local MLX model
@@ -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.29 → mlx_code-0.0.31}/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.29 → mlx_code-0.0.31}/mlx_code/bats.py

@@ -294,6 +294,26 @@ def make_batch_app(model_name: str, cache_dir: str='.cache'):
             n_cached = sum((1 for _ in pc.cache_dir.glob('*.safetensors')))
         return JSONResponse({'status': 'ok', 'model': model_name, 'active_sequences': len(state['active']), 'prefix_cache_files': n_cached})
     return Starlette(routes=[Route('/v1/models', list_models, methods=['GET']), Route('/v1/messages/count_tokens', count_tokens, methods=['POST']), Route('/v1/chat/completions', generate_endpoint, methods=['POST']), Route('/v1/messages', generate_endpoint, methods=['POST']), Route('/v1/responses', generate_endpoint, methods=['POST']), Route('/v1beta/models/{rest:path}', generate_endpoint, methods=['POST']), Route('/generate', simple_generate, methods=['POST']), Route('/health', health, methods=['GET'])], lifespan=lifespan)
+
+class BatchServer:
+    import uvicorn
+
+    def __init__(self, app, host: str, port: int):
+        config = uvicorn.Config(app, host=host, port=port, loop='asyncio', log_level='warning')
+        self._server = uvicorn.Server(config)
+        self.host = host
+        self.port = port
+
+    def serve_forever(self):
+        self._server.run()
+
+    @property
+    def started(self) -> bool:
+        return self._server.started
+
+def make_batch_server(host: str, port: int, model, cache_dir: str='.cache') -> BatchServer:
+    app = make_batch_app(model, cache_dir=cache_dir)
+    return BatchServer(app, host, port)
 if __name__ == '__main__':
     import uvicorn
     uvicorn.run(make_batch_app('mlx-community/Qwen3.5-4B-OptiQ-4bit'), host='0.0.0.0', port=8000)

{mlx_code-0.0.29 → mlx_code-0.0.31}/mlx_code/gits.py

@@ -9,7 +9,6 @@ import uuid
 from dataclasses import dataclass
 from pathlib import Path
 logger = logging.getLogger(__name__)
-_ADD_EXCLUDES = ['_*', '*.bin', '*.gguf', '*.safetensors', '*.pt', '*.pth', '.cache/', '.log.json', '*.egg-info/', '.eggs/', 'build/', 'dist/', '__pycache__/', '*.pyc', '*.pyo', '*.pyd', '.pytest_cache/', '.tox/', '.nox/', '.coverage', 'htmlcov/', '.venv/', 'venv/', 'env/', '.DS_Store', 'Thumbs.db']
 
 class GitError(RuntimeError):
     pass
@@ -57,11 +56,22 @@ def _count_user_turns(commit_body: str) -> int:
     if messages:
         return sum((1 for m in messages if m.get('role') == 'user'))
     return 0
+_ADD_EXCLUDES = ['_*', '_*/', '*.bin', '*.gguf', '*.safetensors', '*.pt', '*.pth', '.cache/', '.log.json', '*.egg-info/', '.eggs/', 'build/', 'dist/', '__pycache__/', '*.pyc', '*.pyo', '*.pyd', '.pytest_cache/', '.tox/', '.nox/', '.coverage', 'htmlcov/', '.venv/', 'venv/', 'env/', '.DS_Store', 'Thumbs.db']
+
+def _exclude_pathspecs(patterns: list[str]) -> list[str]:
+    specs = []
+    for p in patterns:
+        if p.endswith('/'):
+            name = p[:-1]
+            specs.append(f':(exclude,glob)**/{name}/**')
+        else:
+            specs.append(f':(exclude,glob)**/{p}')
+    return specs
 
 def git_add_filtered(cwd: str) -> None:
-    excludes = [f':(exclude){p}' for p in _ADD_EXCLUDES]
+    excludes = _exclude_pathspecs(_ADD_EXCLUDES)
     try:
-        _git(cwd, 'add', '-A', '--', '.', *excludes)
+        _git(cwd, '-c', 'advice.addIgnoredFile=false', 'add', '-A', '--', '.', *excludes)
     except GitError as e:
         logger.warning('git add warning (ignored): %s', e)
 
@@ -83,7 +93,7 @@ def create_worktree(repo_dir: str, *, worktree_dir: str | None=None, ref: str='H
             root = repo_dir
             gi = os.path.join(root, '.gitignore')
             if not os.path.exists(gi):
-                Path(gi).write_text('\n'.join(['_log.json']))
+                Path(gi).write_text('\n'.join(['.log.json']))
         if not _git(root, 'config', 'user.email', check=False):
             _git(root, 'config', 'user.email', 'agent@local')
         if not _git(root, 'config', 'user.name', check=False):
@@ -349,4 +359,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.29 → mlx_code-0.0.31}/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
@@ -889,11 +890,12 @@ def _serve_cache(host, port, model, cache, system, tools, skips, *, fixed_port=F
                 raise
 
 def _serve_batch(host, port, model, cache_dir='.cache', *, fixed_port=False):
-    import uvicorn
-    from .bats import make_batch_app
+    try:
+        from .bats import make_batch_server
+    except ImportError:
+        print('[warning] uvicorn not installed — batch engine requires: pip install mlx-code[all]')
+        return _serve_cache(host, port, model, cache_dir, None, None, None, fixed_port=fixed_port)
     import socket
-    import time
-    app = make_batch_app(model, cache_dir=cache_dir)
     while True:
         try:
             with socket.socket() as s:
@@ -908,24 +910,10 @@ def _serve_batch(host, port, model, cache_dir='.cache', *, fixed_port=False):
                 raise
         else:
             break
-    config = uvicorn.Config(app, host=host, port=port, loop='asyncio', log_level='warning')
-    uv_server = uvicorn.Server(config)
-    t = threading.Thread(target=uv_server.run, daemon=True)
-    t.start()
-    start_time = time.time()
-    notified = False
-    while True:
-        try:
-            with socket.create_connection((host, port), timeout=0.1):
-                break
-        except OSError:
-            if not notified and time.time() - start_time > 3.0:
-                logger.info('Waiting for batch server to start (model may be downloading)...')
-                notified = True
-            time.sleep(0.2)
+    server = make_batch_server(host, port, model, cache_dir=cache_dir)
     url = f'http://{host}:{port}'
     logger.debug(f'Batch server bound to {url}')
-    return (uv_server, url)
+    return (server, url)
 
 def main():
     parser = argparse.ArgumentParser(description='mlx-code MAIN')
@@ -966,28 +954,20 @@ def main():
         else:
             server, url = _serve_cache(host=args.host, port=port, model=args.model, cache=cache, system=None if args.leash in ('none', 'noapi') else args.system, tools=args.tools, skips=args.skips, fixed_port=fixed_port, gwt=gwt)
         if args.leash == 'none':
-            if args.engine == 'batch':
-                try:
-                    threading.Event().wait()
-                except KeyboardInterrupt:
-                    print('\nShutting down server...')
-            else:
-                try:
-                    server.serve_forever()
-                except KeyboardInterrupt:
-                    print('\nShutting down server...')
-                    server.server_close()
+            try:
+                server.serve_forever()
+            except KeyboardInterrupt:
+                print('\nShutting down server...')
+                server.server_close()
         else:
-            if args.engine == 'cache':
-                threading.Thread(target=server.serve_forever, daemon=True).start()
+            threading.Thread(target=server.serve_forever, daemon=True).start()
+            while not getattr(server, 'started', True):
+                time.sleep(0.05)
             if args.leash == 'noapi':
-                if args.web:
-                    from .web import run_web
-                    web_port = args.web_port if args.web_port is not None else port + 80
-                    run_web(base_url=url, api=args.leash, repo=cwd, env=env, system=args.system, tool_names=args.tools, sdir=args.skill, init_prompt=args.prompt, resume=args.resume, stream=args.stream, host=args.host, port=web_port)
-                else:
-                    from .repl import run_repl
-                    run_repl(base_url=url, api=args.leash, repo=cwd, env=env, system=args.system, tool_names=args.tools, sdir=args.skill, init_prompt=args.prompt, resume=args.resume, stream=args.stream, bare=args.bare)
+                ui_mode = 'web' if args.web else 'bare' if args.bare else 'tui'
+                web_port = args.web_port if args.web_port is not None else port + 80
+                from .repl import run_repl
+                run_repl(base_url=url, api=args.leash, repo=cwd, env=env, system=args.system, tool_names=args.tools, sdir=args.skill, init_prompt=args.prompt, resume=args.resume, stream=args.stream, ui_mode=ui_mode, web_host=args.host, web_port=web_port)
             else:
                 env['GOOGLE_GEMINI_BASE_URL'] = url
                 env['GEMINI_API_KEY'] = 'mc'

{mlx_code-0.0.29 → mlx_code-0.0.31}/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
@@ -693,9 +742,9 @@ _AGENT_ENV_ALLOWLIST: re.Pattern = re.compile('\n    ^(\n    PATH\n    | MANPATH
 def _make_agent_env(base: dict[str, str]) -> dict[str, str]:
     return {k: v for k, v in base.items() if _AGENT_ENV_ALLOWLIST.match(k)}
 
-async def repl(engine: CommandEngine, init_prompt=None, bare=False):
+async def repl(engine: CommandEngine, init_prompt=None, ui_mode='tui'):
     is_tty = sys.stdin.isatty() and sys.stdout.isatty()
-    if bare and is_tty:
+    if ui_mode == 'bare' and is_tty:
         from .bare import BareRepl
         r = BareRepl(engine, init_prompt=init_prompt)
         await r.run()
@@ -705,12 +754,21 @@ async def repl(engine: CommandEngine, init_prompt=None, bare=False):
         if user_input:
             await _stream_to_stdout(engine.active_tab.agent, user_input)
         return None
-    from .tui import ReplApp
-    app = ReplApp(engine, init_prompt=init_prompt)
-    await app.run_async()
-    return app
-
-def run_repl(*, base_url=None, model=None, api: Literal['claude', 'codex', 'gemini', 'deepseek', 'noapi']='noapi', system='', sdir=None, skills=None, env=None, tool_names=None, extra_tool_classes=None, api_key=None, gwt=None, ctx=None, init_prompt=None, resume_messages=None, repo=None, resume=None, stream=None, bare=False):
+    if ui_mode == 'tui':
+        try:
+            from .tui import ReplApp
+        except ImportError:
+            print('[warning] textual/rich not installed — falling back to bare.\n         Install TUI deps with:  pip install mlx-code[all]')
+            from .bare import BareRepl
+            r = BareRepl(engine, init_prompt=init_prompt)
+            await r.run()
+            return None
+        app = ReplApp(engine, init_prompt=init_prompt)
+        await app.run_async()
+        return app
+    return None
+
+def run_repl(*, base_url=None, model=None, api='noapi', system='', sdir=None, skills=None, env=None, tool_names=None, extra_tool_classes=None, api_key=None, gwt=None, ctx=None, init_prompt=None, resume_messages=None, repo=None, resume=None, stream=None, ui_mode='tui', web_host='127.0.0.1', web_port=8080):
     repo = os.path.abspath(repo or os.getcwd())
     with tempfile.TemporaryDirectory(dir=tempfile.gettempdir()) as _home:
         if gwt is None:
@@ -736,9 +794,6 @@ def run_repl(*, base_url=None, model=None, api: Literal['claude', 'codex', 'gemi
         system = '\n\n'.join(filter(None, [system, skill_prompt]))
         merged_ctx = {'cwd': cwd, 'user_cwd': user_cwd, 'skills': skills, 'gwt': gwt, 'env': agent_env, **(ctx or {})}
         agent = Agent(system=system, api=api, model=model, tool_names=tool_names, extra_tool_classes=extra_tool_classes, api_key=api_key, base_url=base_url, ctx=merged_ctx)
-        engine = CommandEngine()
-        main_tab = TabModel(agent, title='main', is_main=True)
-        engine.tabs = [main_tab]
         log_fp = None
         if stream is not None:
             from .stream_log import StreamLogger
@@ -751,26 +806,35 @@ def run_repl(*, base_url=None, model=None, api: Literal['claude', 'codex', 'gemi
             agent.messages = list(resume_messages)
             print(f'[resumed {len(resume_messages)} messages from checkpoint]')
         try:
-            asyncio.run(repl(engine, init_prompt=init_prompt, bare=bare))
+            if ui_mode == 'web':
+                try:
+                    from .web import run_web
+                except ImportError:
+                    print('[warning] starlette/uvicorn not installed — falling back to bare.\n         Install web deps with:  pip install mlx-code[all]')
+                    engine = CommandEngine()
+                    main_tab = TabModel(agent, title='main', is_main=True)
+                    engine.tabs = [main_tab]
+                    asyncio.run(repl(engine, init_prompt=init_prompt, ui_mode='bare'))
+                else:
+                    run_web(agent=agent, init_prompt=init_prompt, web_host=web_host, web_port=web_port)
+            else:
+                engine = CommandEngine()
+                main_tab = TabModel(agent, title='main', is_main=True)
+                engine.tabs = [main_tab]
+                asyncio.run(repl(engine, init_prompt=init_prompt, ui_mode=ui_mode))
         finally:
             if log_fp:
                 log_fp.close()
-            cleaned: set[str] = set()
-            for tab in engine.tabs:
-                gwt_ref = tab.agent.ctx.get('gwt')
-                if gwt_ref and getattr(gwt_ref, 'worktree', None) and (gwt_ref.worktree not in cleaned):
-                    cleaned.add(gwt_ref.worktree)
-                    try:
-                        cleanup_worktree(gwt_ref)
-                    except Exception:
-                        pass
-            if engine.exit_summary:
-                print('\n--- Session Exit Summary ---')
-                for item in engine.exit_summary:
-                    title = item['title']
-                    branch = item['branch'] or '(no branch)'
-                    marker = ' * <-- exit origin' if item['is_exit_tab'] else ''
-                    print(f'  {title} ({branch}){marker}')
+            if 'engine' in locals() and hasattr(engine, 'tabs'):
+                cleaned: set[str] = set()
+                for tab in engine.tabs:
+                    gwt_ref = tab.agent.ctx.get('gwt')
+                    if gwt_ref and getattr(gwt_ref, 'worktree', None) and (gwt_ref.worktree not in cleaned):
+                        cleaned.add(gwt_ref.worktree)
+                        try:
+                            cleanup_worktree(gwt_ref)
+                        except Exception:
+                            pass
 
 def main():
     import argparse

{mlx_code-0.0.29 → mlx_code-0.0.31}/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.29 → mlx_code-0.0.31}/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'):