mlx-code 0.0.17__tar.gz → 0.0.18__tar.gz

{mlx_code-0.0.17 → mlx_code-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlx-code
-Version: 0.0.17
+Version: 0.0.18
 Summary: Coding Agent for Mac
 Home-page: https://josefalbers.github.io/mlx-code/
 Author: J Joe
@@ -20,6 +20,7 @@ Requires-Dist: rich>=15.0.0
 Provides-Extra: all
 Requires-Dist: python-lsp-server[all]; extra == "all"
 Requires-Dist: GitPython; extra == "all"
+Requires-Dist: pygments; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{mlx_code-0.0.17 → mlx_code-0.0.18}/mlx_code/gits.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 import json
 import logging
 import os
+import re
 import shutil
 import subprocess
 import uuid
@@ -25,9 +26,10 @@ def _git(cwd: str, *args: str, check: bool=True) -> str:
 def _make_commit_message(messages) -> str:
     if isinstance(messages, str):
         return messages
-    last_user = next((m['content'] for m in reversed(messages) if m.get('role') == 'user'), None)
+    filtered = [m for m in messages if m.get('role') != 'commit']
+    last_user = next((m['content'] for m in reversed(filtered) if m.get('role') == 'user'), None)
     title = last_user.replace('\n', ' ').strip()[:30] if isinstance(last_user, str) else ''
-    return f'{title}\n\n{json.dumps(messages, indent=2, ensure_ascii=False)}'
+    return f'{title}\n\n{json.dumps(filtered, indent=2, ensure_ascii=False)}'
 
 def _parse_messages_from_commit(raw: str) -> list[dict]:
     if not raw or raw in ('snapshot', 'update'):
@@ -89,17 +91,18 @@ def create_worktree(repo_dir: str, *, worktree_dir: str | None=None, ref: str='H
         logger.exception('create_worktree failed: %s', e)
         return None
 
-def commit_worktree(point: LedgerPoint | None, message: str='update') -> LedgerPoint | None:
+def commit_worktree(point: LedgerPoint | None, message: str='update') -> tuple[LedgerPoint | None, str]:
     if point is None:
-        return None
+        return (None, '')
     try:
         git_add_filtered(point.worktree)
         if not _git(point.worktree, 'status', '--porcelain'):
             sha = _git(point.worktree, 'rev-parse', 'HEAD', check=False) or point.commit
-            return LedgerPoint(branch=point.branch, commit=sha, worktree=point.worktree)
-        diff_info = ''
+            return (LedgerPoint(branch=point.branch, commit=sha, worktree=point.worktree), '')
+        diff_stat = ''
         try:
             stat = _git(point.worktree, 'diff', '--stat', 'HEAD')
+            diff_stat = stat
             patch = _git(point.worktree, 'diff', 'HEAD')
             diff_info = f'\n--- DIFF STAT ---\n{stat}\n--- PATCH ---\n{patch}'
         except Exception as de:
@@ -108,10 +111,10 @@ def commit_worktree(point: LedgerPoint | None, message: str='update') -> LedgerP
         new_sha = _git(point.worktree, 'rev-parse', 'HEAD')
         new_point = LedgerPoint(branch=point.branch, commit=new_sha, worktree=point.worktree)
         logger.info('%s%s', new_point, diff_info)
-        return new_point
+        return (new_point, diff_stat)
     except Exception as e:
         logger.exception('commit_worktree failed: %s', e)
-        return None
+        return (None, '')
 
 def cleanup_worktree(point: LedgerPoint, *, remove_branch: bool=False) -> None:
     root = _git(point.worktree, 'rev-parse', '--show-toplevel', check=False) or None
@@ -279,4 +282,34 @@ def find_rev_commit(worktree: str, n: int) -> str | None:
         return chosen
     except Exception as e:
         logger.warning('find_rev_commit failed: %s', e)
-        return None
+        return None
+
+def get_diff_between_refs(worktree: str, ref1: str='HEAD~1', ref2: str='HEAD') -> str:
+    try:
+        return _git(worktree, 'diff', ref1, ref2)
+    except GitError:
+        try:
+            return _git(worktree, 'diff', '4b825dc642cb6eb9a060e54bf899d15d4a0d0e1d', ref2)
+        except GitError as e2:
+            raise GitError(f'Could not diff {ref1}..{ref2}: {e2}') from e2
+
+def resolve_ref_short(worktree: str, ref: str) -> str:
+    try:
+        return _git(worktree, 'rev-parse', '--short', ref, check=False)
+    except GitError:
+        return ''
+
+def get_branch_base_sha(worktree: str) -> str | None:
+    branch = _git(worktree, 'symbolic-ref', '--short', 'HEAD', check=False)
+    if branch:
+        match = re.search('--([0-9a-f]{12})', branch)
+        if match:
+            sha_part = match.group(1)
+            try:
+                full_sha = _git(worktree, 'rev-parse', sha_part, check=False)
+                if full_sha:
+                    return full_sha
+            except GitError:
+                pass
+    root_sha = _git(worktree, 'rev-list', '--max-parents=0', 'HEAD', check=False)
+    return root_sha or None

{mlx_code-0.0.17 → mlx_code-0.0.18}/mlx_code/repl.py

@@ -13,7 +13,7 @@ import time
 import logging
 import urllib.parse
 from typing import Any, Callable, Literal
-from .gits import create_worktree, commit_worktree, resume_worktree, cleanup_worktree, git_new_branch, git_new_branch_at, git_switch_branch, GitError, get_commit_history_with_stats, find_rev_commit
+from .gits import create_worktree, commit_worktree, resume_worktree, cleanup_worktree, git_new_branch, git_new_branch_at, git_switch_branch, GitError, get_commit_history_with_stats, find_rev_commit, get_diff_between_refs, get_branch_base_sha, resolve_ref_short
 from .tools import Tool, validate_tool_call, DEFAULT_TOOLS
 from .apis import resolve_api
 logger = logging.getLogger(__name__)
@@ -26,6 +26,7 @@ from textual.widgets import ContentSwitcher, Static, TextArea
 from rich.text import Text as RichText
 from rich.table import Table
 from rich.markup import escape
+from rich.markdown import Markdown
 
 class Agent:
 
@@ -101,7 +102,8 @@ class Agent:
         final: dict = {'role': 'assistant', 'content': [], 'stop_reason': 'error', 'error_message': 'no turns ran', 'usage': {'input': 0, 'output': 0, 'cache_read': 0, 'cache_write': 0}}
         while True:
             await self._emit({'type': 'turn_start', 'payload': {}})
-            es = await self.api.stream(self.messages, self.system, self.tools)
+            api_messages = [m for m in self.messages if m.get('role') != 'commit']
+            es = await self.api.stream(api_messages, self.system, self.tools)
             async for event in es:
                 if event['type'] in ('text_delta', 'thinking_delta', 'error'):
                     await self._emit({'type': event['type'], 'payload': event['payload']})
@@ -133,7 +135,12 @@ class Agent:
                             r['content'].insert(0, {'type': 'text', 'text': warn})
             self.messages.extend(results)
             await self._emit({'type': 'tool_results_ready', 'payload': {}})
-            self.ctx['gwt'] = commit_worktree(self.ctx['gwt'], self.messages)
+            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
@@ -168,6 +175,81 @@ def _branch_index_title(parent_path: tuple[int, ...], existing_tabs: list) -> tu
 def _clean_block_text(text: str) -> str:
     return text.lstrip('\n').rstrip()
 
+def _render_commit_diff(text: str) -> RichText:
+    rt = RichText()
+    lines = text.split('\n')
+    for i, line in enumerate(lines):
+        if not line.strip():
+            continue
+        if line.lstrip().startswith('[') and ']' in line:
+            rt.append(line, style='bold cyan')
+        elif 'files changed' in line or 'file changed' in line:
+            rt.append(line, style='dim')
+        elif '|' in line:
+            pipe_idx = line.index('|')
+            rt.append(line[:pipe_idx + 1])
+            for ch in line[pipe_idx + 1:]:
+                if ch == '+':
+                    rt.append(ch, style='green')
+                elif ch == '-':
+                    rt.append(ch, style='red')
+                else:
+                    rt.append(ch, style='dim')
+        else:
+            rt.append(line, style='dim')
+        if i < len(lines) - 1:
+            rt.append('\n')
+    return rt
+
+def _render_split_diff(diff_text: str, ref1_label: str='HEAD~1', ref2_label: str='HEAD') -> Table:
+    tbl = Table(show_header=True, box=None, expand=True, padding=0, show_lines=False, pad_edge=False)
+    tbl.add_column(f' ◇ {ref1_label} ', style='red', ratio=1, width=1)
+    tbl.add_column(f' ◇ {ref2_label} ', style='green', ratio=1, width=1)
+
+    def _flush(left, right):
+        maxlen = max(len(left), len(right))
+        left += [''] * (maxlen - len(left))
+        right += [''] * (maxlen - len(right))
+        for l, r in zip(left, right):
+            l_style = 'bold red' if l.startswith('-') else 'dim' if l else ''
+            r_style = 'bold green' if r.startswith('+') else 'dim' if r else ''
+            tbl.add_row(RichText(escape(l), style=l_style), RichText(escape(r), style=r_style))
+        left.clear()
+        right.clear()
+    left_lines = []
+    right_lines = []
+    in_hunk = False
+    for line in diff_text.split('\n'):
+        if line.startswith('diff --git'):
+            _flush(left_lines, right_lines)
+            in_hunk = False
+            match = re.search('b/(.*)', line)
+            fname = match.group(1) if match else line
+            tbl.add_row(RichText(f'--- a/{fname}', style='bold cyan'), RichText(f'+++ b/{fname}', style='bold cyan'))
+        elif line.startswith('@@'):
+            _flush(left_lines, right_lines)
+            in_hunk = True
+            tbl.add_row(RichText(escape(line), style='bold yellow'), RichText(escape(line), style='bold yellow'))
+        elif not in_hunk:
+            if line.startswith('---') or line.startswith('+++'):
+                continue
+            _flush(left_lines, right_lines)
+            if line.strip():
+                tbl.add_row(RichText(escape(line), style='dim cyan'), RichText('', style='dim'))
+        elif line.startswith('-'):
+            left_lines.append(line)
+        elif line.startswith('+'):
+            right_lines.append(line)
+        elif line.startswith(' '):
+            _flush(left_lines, right_lines)
+            tbl.add_row(RichText(escape(line), style='dim'), RichText(escape(line), style='dim'))
+        else:
+            _flush(left_lines, right_lines)
+            if line.strip():
+                tbl.add_row(RichText(escape(line), style='dim'), RichText(escape(line), style='dim'))
+    _flush(left_lines, right_lines)
+    return tbl
+
 def render_history(messages: list[dict]) -> Table:
     tbl = Table(show_header=False, show_lines=False, box=None, pad_edge=False, expand=True, padding=0)
     tbl.add_column(width=2)
@@ -176,7 +258,9 @@ def render_history(messages: list[dict]) -> Table:
         role = msg.get('role')
         content = msg.get('content')
         is_error = msg.get('is_error', False)
-        if isinstance(content, str):
+        if isinstance(content, (Table, RichText)):
+            blocks = [{'type': 'renderable', 'renderable': content}]
+        elif isinstance(content, str):
             blocks = [{'type': 'text', 'text': content}]
         elif isinstance(content, list):
             blocks = content
@@ -186,8 +270,11 @@ def render_history(messages: list[dict]) -> Table:
             b_type = block.get('type', 'text')
             text = block.get('text', '') or block.get('thinking', '')
             prefix, style = ('', '')
+            render_as_md = False
             if is_error:
                 prefix, style = ('✗', 'bold red')
+            elif role == 'commit':
+                prefix, style = ('◇', 'cyan')
             elif role == 'user':
                 prefix, style = ('≫', 'bold green')
             elif role == 'system':
@@ -198,6 +285,7 @@ def render_history(messages: list[dict]) -> Table:
                 prefix, style = ('◌', 'dim italic')
             elif role == 'toolResult':
                 prefix, style = ('→', 'dim yellow')
+                render_as_md = True
             elif b_type == 'toolCall':
                 prefix, style = ('⚙', 'yellow')
                 args = block.get('arguments', {})
@@ -207,12 +295,26 @@ def render_history(messages: list[dict]) -> Table:
             elif role == 'assistant':
                 prefix, style = ('○', '')
                 text = re.sub('\\s*<tool_call>.*?</tool_call>\\s*', '', text, flags=re.DOTALL).strip()
+                render_as_md = True
             text = _clean_block_text(text)
+            if b_type == 'renderable':
+                prefix, style = ('✓', 'blue')
+                body = block.get('renderable')
+                tbl.add_row(RichText(prefix, style=style), body)
+                continue
             if not text:
                 continue
-            tbl.add_row(RichText(prefix, style=style), RichText(escape(text), style=style))
+            if role == 'commit':
+                body = _render_commit_diff(text)
+                tbl.add_row(RichText('◇', style='cyan'), body)
+                continue
+            if render_as_md:
+                body = Markdown(text)
+            else:
+                body = RichText(escape(text), style=style)
+            tbl.add_row(RichText(prefix, style=style), body)
     return tbl
-REPL_HELP = 'Commands:\n  /help               show this message\n  /clear              clear conversation (transcript + agent memory)\n  /history            show full conversation transcript\n  /history --raw      show raw API message log (debug)\n  /errors             show timestamped error log for this tab\n  /tools              list active tools\n  /branch [--rev N] [--as-worktree] [prompt]\n                      open a branch tab; optional prompt runs immediately\n    --rev N           branch from just before the N-th user turn;\n                      messages 1…N-1 are kept, N onward are discarded.\n                      if a prompt is given it becomes the new turn N.\n                      file state is restored to the nearest git checkpoint\n                      at or before turn N-1 (best-effort).\n    --as-worktree     give the branch its own private worktree directory\n  /abort              abort the running agent\n  /export [path]      export session to JSON\n  /exit  /quit        close branch tab, or exit the app\n\nKeys:\n  Enter               submit\n  Ctrl-J              insert newline in editor\n  Alt-1 … Alt-9       jump directly to tab N\n  Tab / Shift-Tab     cycle through tabs\n  Ctrl-C              abort running agent\n  Ctrl-D              close branch tab, or exit app\n  Ctrl-R              recall last prompt into editor\n'
+REPL_HELP = '\nCommands:\n/help               show this message\n/clear              clear conversation (transcript + agent memory)\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] [--as-worktree] [prompt]\n                    open a branch tab; optional prompt runs immediately\n/abort              abort the running agent\n/export [path]      export session to JSON\n/exit  /quit        close branch tab, or exit the app\n!command            run shell command in worktree (output captured in TUI)\n!!command           run interactive shell command (TUI suspends, terminal handed to process)\n                    e.g.  !ls  !git diff  !cat file.py\n                          !!vim file.py  !!yazi  !!less log.txt\nKeys:\nEnter               submit\nCtrl-J              insert newline in editor\nAlt-1 … Alt-9       jump directly to tab N\nTab / Shift-Tab     cycle through tabs\nCtrl-C              abort running agent\nCtrl-D              close branch tab, or exit app\nCtrl-R              recall last prompt into editor\n'
 
 class InputBox(TextArea):
     BINDINGS = [Binding('ctrl+j', 'insert_newline', 'New line', show=False), Binding('enter', 'submit_text', 'Submit', show=False, priority=True), Binding('ctrl+r', 'recall_last', 'Recall', show=False), Binding('ctrl+d', 'request_close', 'Exit', show=False, priority=True)]
@@ -317,6 +419,8 @@ class Tab(Vertical):
             self.refresh_cache()
             self._stream_blocks = []
             self.refresh_stream()
+        elif et == 'commit':
+            self.refresh_cache()
         elif et == 'error':
             err = str(payload.get('error', payload))
             self._stream_blocks.append({'type': 'text', 'text': err, 'is_error': True})
@@ -424,7 +528,7 @@ class StatusBar(Static):
 class HelpBar(Static):
 
     def __init__(self, **kwargs):
-        self._idle_text = RichText('/help  Ctrl-J newline  Alt-1…9 tabs  Ctrl-C abort  Ctrl-D exit  Ctrl-R recall', style='dim')
+        self._idle_text = RichText('/help  !cmd  !!interactive  Ctrl-J newline  Alt-1…9 tabs  Ctrl-C abort  Ctrl-D exit', style='dim')
         super().__init__(self._idle_text, **kwargs)
 
     def show_idle(self) -> None:
@@ -492,7 +596,7 @@ class ReplApp(App[None]):
 
         async def on_event(event: dict) -> None:
             tab.apply_event(event)
-            if event['type'] in ('agent_start', 'agent_end', 'turn_end'):
+            if event['type'] in ('agent_start', 'agent_end', 'turn_end', 'commit'):
                 self._refresh_chrome()
         self._unsubscribers[key] = tab.agent.subscribe(on_event)
 
@@ -517,6 +621,12 @@ class ReplApp(App[None]):
         tab.errors.clear()
         tab.last_error = ''
         self.query_one('#helpbar', HelpBar).show_idle()
+        if text.startswith('!'):
+            command = text[1:].strip()
+            if not command:
+                return
+            await self._run_shell_command(tab, command)
+            return
         if text.startswith('/'):
             await self._handle_command(tab, text)
             return
@@ -542,6 +652,25 @@ class ReplApp(App[None]):
                 tab.status = 'idle'
             self._refresh_chrome()
 
+    async def _run_shell_command(self, tab: Tab, command: str) -> None:
+        if not command:
+            return
+        if command.startswith('cd ') or command == 'cd':
+            tab.show_command(f'!{command}', 'Not allowed — use /branch or set cwd in context')
+            return
+        gwt = tab.agent.ctx.get('gwt')
+        cwd = gwt.worktree if gwt and getattr(gwt, 'worktree', None) else tab.agent.ctx.get('cwd') or os.getcwd()
+        env = tab.agent.ctx.get('env')
+        try:
+            proc = await asyncio.create_subprocess_shell(command, cwd=cwd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.STDOUT, env=env if env else None)
+            stdout, _ = await proc.communicate()
+            output = stdout.decode(errors='replace').rstrip('\n')
+            if proc.returncode and proc.returncode != 0:
+                output += f'\n[exit {proc.returncode}]'
+            tab.show_command(f'!{command}', output or '(no output)')
+        except Exception as e:
+            tab.show_command(f'!{command}', f'Error: {e}')
+
     async def _handle_command(self, tab: Tab, text: str) -> None:
         cmd, _, arg = text.partition(' ')
         cmd = cmd.lower().strip()
@@ -605,9 +734,42 @@ class ReplApp(App[None]):
                                     line += f'\n     {file_lines}'
                         lines.append(line)
                     tab.show_command(text, '\n'.join(lines))
+        elif cmd == '/diff':
+            gwt = tab.agent.ctx.get('gwt')
+            if not gwt or not getattr(gwt, 'worktree', None):
+                self.query_one('#helpbar', HelpBar).show_error('No git worktree available for this tab.')
+                return
+            ref1 = 'HEAD~1'
+            ref2 = 'HEAD'
+            is_all = '--all' in arg
+            if is_all:
+                base = get_branch_base_sha(gwt.worktree)
+                if base:
+                    ref1 = base
+                else:
+                    self.query_one('#helpbar', HelpBar).show_error('Could not determine base commit for --all.')
+                    return
+            ref1_short = resolve_ref_short(gwt.worktree, ref1)
+            ref2_short = resolve_ref_short(gwt.worktree, ref2)
+            if is_all:
+                ref1_label = f'base ({ref1_short})' if ref1_short else 'base'
+            else:
+                ref1_label = f'HEAD~1 ({ref1_short})' if ref1_short else 'HEAD~1'
+            ref2_label = f'HEAD ({ref2_short})' if ref2_short else 'HEAD'
+            try:
+                diff_text = get_diff_between_refs(gwt.worktree, ref1, ref2)
+            except GitError as e:
+                self.query_one('#helpbar', HelpBar).show_error(f'Git diff failed: {e}')
+                return
+            if not diff_text.strip():
+                tab.show_command(text, f'No differences between {ref1_label} and {ref2_label}.')
+                return
+            renderable = _render_split_diff(diff_text, ref1_label, ref2_label)
+            tab._command_blocks.extend([{'role': 'user', 'content': text}, {'role': 'command', 'content': renderable}])
+            tab.refresh_stream()
         elif cmd == '/errors':
             if not tab.errors:
-                tab.show_command('No errors recorded.')
+                tab.show_command(text, 'No errors recorded.')
             else:
                 lines = [f'{ts}  {msg}' for ts, msg in tab.errors[-30:]]
                 tab.show_command(text, 'Error log\n' + '\n'.join(lines))

{mlx_code-0.0.17 → mlx_code-0.0.18}/mlx_code.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlx-code
-Version: 0.0.17
+Version: 0.0.18
 Summary: Coding Agent for Mac
 Home-page: https://josefalbers.github.io/mlx-code/
 Author: J Joe
@@ -20,6 +20,7 @@ Requires-Dist: rich>=15.0.0
 Provides-Extra: all
 Requires-Dist: python-lsp-server[all]; extra == "all"
 Requires-Dist: GitPython; extra == "all"
+Requires-Dist: pygments; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{mlx_code-0.0.17 → mlx_code-0.0.18}/mlx_code.egg-info/requires.txt

@@ -9,3 +9,4 @@ mlx-lm>=0.31.3
 [all]
 python-lsp-server[all]
 GitPython
+pygments

{mlx_code-0.0.17 → mlx_code-0.0.18}/setup.py

@@ -11,7 +11,7 @@ setup(
     author_email="albersj66@gmail.com",
     author="J Joe",
     license="Apache-2.0",
-    version="0.0.17",
+    version="0.0.18",
     readme="README.md",
     description="Coding Agent for Mac",
     long_description=open("README.md").read(),
@@ -28,6 +28,7 @@ setup(
     extras_require={"all": [
         "python-lsp-server[all]",
         "GitPython", 
+        "pygments",
     ]},
     packages=find_packages(),
     entry_points={