mlx-code 0.0.13__tar.gz → 0.0.14__tar.gz

{mlx_code-0.0.13 → mlx_code-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlx-code
-Version: 0.0.13
+Version: 0.0.14
 Summary: Coding Agent for Mac
 Home-page: https://josefalbers.github.io/mlx-code/
 Author: J Joe

{mlx_code-0.0.13 → mlx_code-0.0.14}/mlx_code/gits.py

@@ -177,4 +177,53 @@ def current_point(worktree_dir: str) -> LedgerPoint:
     worktree_dir = os.path.abspath(worktree_dir)
     branch = _git(worktree_dir, 'symbolic-ref', '--short', 'HEAD', check=False) or 'DETACHED'
     sha = _git(worktree_dir, 'rev-parse', 'HEAD', check=False)
-    return LedgerPoint(branch=branch, commit=sha, worktree=worktree_dir)
+    return LedgerPoint(branch=branch, commit=sha, worktree=worktree_dir)
+
+def get_commit_history_with_stats(worktree: str, limit: int=50) -> list[dict]:
+    try:
+        cmd = ['git', 'log', '--name-status', '--format=COMMIT:%H%nSHORT:%h%nREFS:%d%nSUBJECT:%s%nBODY_START%n%b%nBODY_END', f'-n{limit}']
+        result = subprocess.run(cmd, cwd=worktree, capture_output=True, text=True, check=True)
+        output = result.stdout.strip()
+        commits = []
+        current_commit = None
+        in_body = False
+        body_lines = []
+        for line in output.split('\n'):
+            if line.startswith('COMMIT:'):
+                if current_commit:
+                    body_text = '\n'.join(body_lines)
+                    current_commit['user_turns'] = body_text.count('"role": "user"')
+                    commits.append(current_commit)
+                current_commit = {'sha': line[7:], 'short_sha': '', 'refs': '', 'subject': '', 'files': []}
+                in_body = False
+                body_lines = []
+            elif line.startswith('SHORT:'):
+                if current_commit:
+                    current_commit['short_sha'] = line[6:]
+            elif line.startswith('REFS:'):
+                if current_commit:
+                    current_commit['refs'] = line[5:].strip()
+            elif line.startswith('SUBJECT:'):
+                if current_commit:
+                    current_commit['subject'] = line[8:]
+            elif line == 'BODY_START':
+                in_body = True
+            elif line == 'BODY_END':
+                in_body = False
+            elif current_commit:
+                if in_body:
+                    body_lines.append(line)
+                elif line.strip():
+                    parts = line.split('\t', 1)
+                    if len(parts) == 2:
+                        current_commit['files'].append(f'{parts[0]} {parts[1]}')
+                    else:
+                        current_commit['files'].append(line)
+        if current_commit:
+            body_text = '\n'.join(body_lines)
+            current_commit['user_turns'] = body_text.count('"role": "user"')
+            commits.append(current_commit)
+        return commits
+    except Exception as e:
+        logger.warning(f'get_commit_history_with_stats failed: {e}')
+        return []

{mlx_code-0.0.13 → mlx_code-0.0.14}/mlx_code/repl.py

@@ -12,7 +12,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_switch_branch, GitError
+from .gits import create_worktree, commit_worktree, resume_worktree, cleanup_worktree, git_new_branch, git_switch_branch, GitError, get_commit_history_with_stats
 from .tools import Tool, validate_tool_call, DEFAULT_TOOLS
 from .apis import resolve_api
 logger = logging.getLogger(__name__)
@@ -561,14 +561,48 @@ class ReplApp(App[None]):
                     tab.show_command(text, 'No prompts yet.')
                 else:
                     lines = []
+                    gwt = tab.agent.ctx.get('gwt')
+                    commit_stats = []
+                    if gwt and getattr(gwt, 'worktree', None):
+                        try:
+                            commit_stats = get_commit_history_with_stats(gwt.worktree, limit=len(user_msgs) + 5)
+                        except Exception as e:
+                            logger.warning(f'Failed to get commit stats: {e}')
+                    turn_commits = {}
+                    for c in commit_stats:
+                        turn = c.get('user_turns', 0)
+                        if turn > 0:
+                            if turn not in turn_commits:
+                                turn_commits[turn] = []
+                            turn_commits[turn].append(c)
                     for i, m in enumerate(user_msgs, 1):
                         content = m.get('content', '')
                         if isinstance(content, list):
-                            content = ''.join((b.get('text', '') for b in content if isinstance(b, dict) and b.get('type') == 'text'))
-                        content = re.sub('\\s+', ' ', content).strip()
+                            content = ' '.join((b.get('text', '') for b in content if isinstance(b, dict) and b.get('type') == 'text'))
+                        content = re.sub('\\s+', '  ', content).strip()
                         if len(content) > 100:
                             content = content[:100] + '…'
-                        lines.append(f'{i}. {content}')
+                        line = f'{i}. {content}'
+                        if i in turn_commits:
+                            for c in turn_commits[i]:
+                                ref_str = c.get('refs', '').strip(' ()')
+                                if ref_str.startswith('HEAD -> '):
+                                    ref_str = ref_str[8:]
+                                ref_str = ref_str.replace('HEAD, ', '').strip()
+                                hash_str = f'[{c['short_sha']}]'
+                                if ref_str:
+                                    hash_str += f' on {ref_str}'
+                                else:
+                                    hash_str += ' (detached)'
+                                line += f'\n   ↪ Commit {hash_str}'
+                                seen = set()
+                                unique_files = [f for f in c['files'] if not (f in seen or seen.add(f))]
+                                if unique_files:
+                                    file_lines = '\n     '.join(unique_files[:8])
+                                    if len(unique_files) > 8:
+                                        file_lines += f'\n     ... and {len(unique_files) - 8} more'
+                                    line += f'\n     {file_lines}'
+                        lines.append(line)
                     tab.show_command(text, '\n'.join(lines))
         elif cmd == '/errors':
             if not tab.errors:

{mlx_code-0.0.13 → mlx_code-0.0.14}/mlx_code.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlx-code
-Version: 0.0.13
+Version: 0.0.14
 Summary: Coding Agent for Mac
 Home-page: https://josefalbers.github.io/mlx-code/
 Author: J Joe

{mlx_code-0.0.13 → mlx_code-0.0.14}/setup.py

@@ -11,7 +11,7 @@ setup(
     author_email="albersj66@gmail.com",
     author="J Joe",
     license="Apache-2.0",
-    version="0.0.13",
+    version="0.0.14",
     readme="README.md",
     description="Coding Agent for Mac",
     long_description=open("README.md").read(),