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

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

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

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

@@ -164,6 +164,18 @@ def git_new_branch(worktree: str, branch_name: str) -> LedgerPoint:
     logger.info('Created branch %s at %s', full_name, sha[:8])
     return point
 
+def git_new_branch_at(worktree: str, branch_name: str, ref: str) -> LedgerPoint:
+    git_add_filtered(worktree)
+    if _git(worktree, 'status', '--porcelain'):
+        _git(worktree, 'commit', '--allow-empty', '-m', 'snapshot')
+    sha = _git(worktree, 'rev-parse', ref)
+    full_name = f'{branch_name}--{sha[:12]}'
+    _git(worktree, 'branch', full_name, sha)
+    _git(worktree, 'switch', full_name)
+    point = LedgerPoint(branch=full_name, commit=sha, worktree=worktree)
+    logger.info('Created branch %s at %s (from ref %s)', full_name, sha[:8], ref)
+    return point
+
 def git_switch_branch(worktree: str, branch_name: str) -> LedgerPoint:
     git_add_filtered(worktree)
     if _git(worktree, 'status', '--porcelain'):
@@ -227,4 +239,44 @@ def get_commit_history_with_stats(worktree: str, limit: int=50) -> list[dict]:
         return commits
     except Exception as e:
         logger.warning(f'get_commit_history_with_stats failed: {e}')
-        return []
+        return []
+
+def find_rev_commit(worktree: str, n: int) -> str | None:
+    try:
+        result = subprocess.run(['git', 'log', '--format=COMMIT:%H%n%b%nEND_BODY', '-n', '500'], cwd=worktree, capture_output=True, text=True, check=True)
+        output = result.stdout
+        best_exact: str | None = None
+        best_below: str | None = None
+        current_sha: str | None = None
+        body_lines: list[str] = []
+        for line in output.splitlines():
+            if line.startswith('COMMIT:'):
+                if current_sha is not None:
+                    body = '\n'.join(body_lines)
+                    count = body.count('"role": "user"')
+                    if count == n and best_exact is None:
+                        best_exact = current_sha
+                    if count < n and best_below is None:
+                        best_below = current_sha
+                current_sha = line[7:]
+                body_lines = []
+            elif line == 'END_BODY':
+                pass
+            else:
+                body_lines.append(line)
+        if current_sha is not None:
+            body = '\n'.join(body_lines)
+            count = body.count('"role": "user"')
+            if count == n and best_exact is None:
+                best_exact = current_sha
+            if count < n and best_below is None:
+                best_below = current_sha
+        chosen = best_exact or best_below
+        if chosen:
+            logger.info('find_rev_commit(n=%d): chose %s (exact=%s, below=%s)', n, chosen[:8], bool(best_exact), bool(best_below))
+        else:
+            logger.warning('find_rev_commit(n=%d): no suitable commit found', n)
+        return chosen
+    except Exception as e:
+        logger.warning('find_rev_commit failed: %s', e)
+        return None

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

@@ -1,5 +1,6 @@
 from __future__ import annotations
 import asyncio
+import copy
 import datetime
 import json
 import os
@@ -12,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_switch_branch, GitError, get_commit_history_with_stats
+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 .tools import Tool, validate_tool_call, DEFAULT_TOOLS
 from .apis import resolve_api
 logger = logging.getLogger(__name__)
@@ -54,7 +55,6 @@ class Agent:
         return Agent(**kwargs)
 
     def branch(self) -> 'Agent':
-        import copy
         child = self.spawn(tool_names=[t.name for t in self.tools])
         child.messages = copy.deepcopy(self.messages)
         return child
@@ -212,7 +212,7 @@ def render_history(messages: list[dict]) -> Table:
                 continue
             tbl.add_row(RichText(prefix, style=style), RichText(escape(text), style=style))
     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 [prompt]              open a branch tab; optional prompt runs immediately\n  /branch --as-worktree [prompt]  same but in a private worktree dir\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 = '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'
 
 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)]
@@ -339,20 +339,20 @@ class Tab(Vertical):
             self._cache_count = len(self.agent.messages)
             self.query_one('#cache', Static).update(render_history(self.agent.messages))
             scroll = self.query_one('#scroll', VerticalScroll)
-            self.app.call_after_refresh(scroll.scroll_end, animate=False)
+            if scroll.max_scroll_y - scroll.scroll_y < 3:
+                self.app.call_after_refresh(scroll.scroll_end, animate=False)
 
     def refresh_stream(self) -> None:
         msgs = []
         if self._stream_blocks:
             msgs.append({'role': 'assistant', 'content': self._stream_blocks})
-        if self._command_blocks and False:
-            msgs.extend(self._command_blocks)
         if not msgs:
             msgs.extend(self._command_blocks)
         if msgs:
             self.query_one('#stream', Static).update(render_history(msgs))
             scroll = self.query_one('#scroll', VerticalScroll)
-            self.app.call_after_refresh(scroll.scroll_end, animate=False)
+            if scroll.max_scroll_y - scroll.scroll_y < 3:
+                self.app.call_after_refresh(scroll.scroll_end, animate=False)
         else:
             self.query_one('#stream', Static).update('')
 
@@ -453,6 +453,7 @@ class ReplApp(App[None]):
         self._unsubscribers: dict[int, Callable] = {}
         self._pending_init = init_prompt.strip() if init_prompt else None
         self._confirm_close = False
+        self._exit_summary: list[dict] | None = None
         self._attach_agent(self.tabs[0])
 
     def compose(self) -> ComposeResult:
@@ -626,18 +627,41 @@ class ReplApp(App[None]):
                 self.query_one('#helpbar', HelpBar).show_error('Nothing is running.')
         elif cmd == '/branch':
             as_worktree = False
+            rev_n: int | None = None
             prompt = arg
-            if '--as-worktree' in arg:
+            if '--as-worktree' in prompt:
                 as_worktree = True
-                prompt = arg.replace('--as-worktree', '').strip()
+                prompt = prompt.replace('--as-worktree', '').strip()
+            rev_match = re.search('--rev\\s+(\\d+)', prompt)
+            if rev_match:
+                rev_n = int(rev_match.group(1))
+                prompt = (prompt[:rev_match.start()] + prompt[rev_match.end():]).strip()
             parent = self.active_tab
+            all_msgs = parent.agent.messages
+            user_indices = [i for i, m in enumerate(all_msgs) if m.get('role') == 'user']
+            if rev_n is not None:
+                if rev_n < 1 or rev_n > len(user_indices):
+                    self.query_one('#helpbar', HelpBar).show_error(f'--rev {rev_n}: must be between 1 and {len(user_indices)}' + (' (no user turns yet)' if not user_indices else ''))
+                    return
+                cut_at = user_indices[rev_n - 1]
+                sliced_messages = copy.deepcopy(all_msgs[:cut_at])
+            else:
+                sliced_messages = copy.deepcopy(all_msgs)
             child = parent.agent.branch()
+            child.messages = sliced_messages
             index_path, title = _branch_index_title(parent.index_path, self.tabs)
             owns_worktree = False
             gwt = child.ctx.get('gwt')
             if as_worktree:
                 repo_dir = gwt.worktree if gwt else child.ctx.get('cwd', os.getcwd())
-                new_gwt = create_worktree(repo_dir, prefix=title)
+                ref = 'HEAD'
+                if rev_n is not None and gwt:
+                    target_sha = find_rev_commit(gwt.worktree, rev_n - 1)
+                    if target_sha:
+                        ref = target_sha
+                    else:
+                        self.query_one('#helpbar', HelpBar).show_error(f'--rev {rev_n}: no matching commit found; file state will be HEAD')
+                new_gwt = create_worktree(repo_dir, prefix=title, ref=ref)
                 if new_gwt is None:
                     self.query_one('#helpbar', HelpBar).show_error(f'git worktree creation failed for {title!r}')
                     return
@@ -648,7 +672,15 @@ class ReplApp(App[None]):
                 owns_worktree = True
             elif gwt:
                 try:
-                    new_gwt = git_new_branch(gwt.worktree, title)
+                    if rev_n is not None:
+                        target_sha = find_rev_commit(gwt.worktree, rev_n - 1)
+                        if target_sha:
+                            new_gwt = git_new_branch_at(gwt.worktree, title, target_sha)
+                        else:
+                            self.query_one('#helpbar', HelpBar).show_error(f'--rev {rev_n}: no matching commit found; file state will be HEAD')
+                            new_gwt = git_new_branch(gwt.worktree, title)
+                    else:
+                        new_gwt = git_new_branch(gwt.worktree, title)
                     child.ctx['gwt'] = new_gwt
                 except GitError as exc:
                     logger.warning('git_new_branch failed for tab %r: %s', title, exc)
@@ -672,10 +704,18 @@ class ReplApp(App[None]):
             except OSError as exc:
                 self.query_one('#helpbar', HelpBar).show_error(f'Export failed: {exc}')
         elif cmd in {'/exit', '/quit'}:
-            self._do_close_or_exit()
+            self._exit_with_summary(tab)
         else:
             self.query_one('#helpbar', HelpBar).show_error(f'Unknown command: {cmd!r}  — try /help')
 
+    def _exit_with_summary(self, exit_tab: Tab) -> None:
+        summary = []
+        for t in self.tabs:
+            gwt = t.agent.ctx.get('gwt')
+            summary.append({'title': t.title, 'branch': gwt.branch if gwt else None, 'worktree': gwt.worktree if gwt else None, 'is_exit_tab': t is exit_tab})
+        self._exit_summary = summary
+        self.exit()
+
     def _switch_to(self, idx: int) -> None:
         if not 0 <= idx < len(self.tabs):
             return
@@ -729,25 +769,7 @@ class ReplApp(App[None]):
             if tab.running_task:
                 tab.running_task.cancel()
         self._confirm_close = False
-        if tab.is_main and len(self.tabs) == 1:
-            self.exit()
-            return
-        if tab.is_main:
-            self.query_one('#helpbar', HelpBar).show_error('Close all branch tabs first, then Ctrl-D to exit.')
-            return
-        if (unsub := self._unsubscribers.pop(id(tab.agent), None)):
-            unsub()
-        if tab.owns_worktree:
-            gwt = tab.agent.ctx.get('gwt')
-            if gwt:
-                try:
-                    cleanup_worktree(gwt)
-                except Exception as exc:
-                    logger.warning('cleanup_worktree failed for %r: %s', tab.title, exc)
-        tab.remove()
-        self.tabs.pop(self.active_index)
-        self.active_index = max(0, min(self.active_index, len(self.tabs) - 1))
-        self._switch_to(self.active_index)
+        self._exit_with_summary(tab)
 
     def action_abort_agent(self) -> None:
         tab = self.active_tab
@@ -762,15 +784,16 @@ async def _stream_to_stdout(agent: Agent, user_input: str) -> None:
     if text:
         print(text)
 
-async def repl(agent, init_prompt=None) -> None:
+async def repl(agent, init_prompt=None) -> ReplApp:
     is_tty = sys.stdin.isatty() and sys.stdout.isatty()
     if not is_tty:
         user_input = (init_prompt if init_prompt is not None else sys.stdin.read()).strip()
         if user_input:
             await _stream_to_stdout(agent, user_input)
-        return
+        return None
     app = ReplApp(agent, init_prompt=init_prompt)
     await app.run_async()
+    return app
 
 def collect_skills(skills_dir, skills=None):
     skills = [] if skills is None else skills
@@ -836,8 +859,9 @@ def run_repl(*, base_url=None, model=None, api: Literal['claude', 'codex', 'gemi
         if resume_messages:
             agent.messages = list(resume_messages)
             print(f'[resumed {len(resume_messages)} messages from checkpoint]')
+        app_instance = None
         try:
-            asyncio.run(repl(agent, init_prompt=init_prompt))
+            app_instance = asyncio.run(repl(agent, init_prompt=init_prompt))
         finally:
             if log_fp:
                 log_fp.close()
@@ -847,8 +871,16 @@ def run_repl(*, base_url=None, model=None, api: Literal['claude', 'codex', 'gemi
                 logger.warning('Could not restore original cwd %r: %s', _orig_cwd, exc)
             os.environ.clear()
             os.environ.update(_orig_environ)
+            if app_instance and hasattr(app_instance, '_exit_summary') and app_instance._exit_summary:
+                print('\n--- Session Exit Summary ---')
+                for item in app_instance._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}')
 
 def main():
+    import argparse
     from .util import setup_logger
     setup_logger(log_file='.log.json')
     parser = argparse.ArgumentParser(description='mlx-code REPL')

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

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

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

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