mini-code-cli 0.1.1.1__py3-none-any.whl → 0.1.1.2__py3-none-any.whl

mini_code_cli/agent_loop.py

@@ -267,6 +267,42 @@ def _compaction_trigger(messages, token_limit, reserved_output_tokens, current_t
     return False, ""
 
 
+def _in_flight_tail(messages):
+    """Return the messages of the turn that is still in flight, or ``[]``.
+
+    Compaction rewrites the transcript, so whatever it drops is gone from the
+    conversation *and* from everything saved afterwards. The last turn is not
+    finished work, though: it is either the instruction being answered right now
+    (the transcript ends with a ``user`` message) or the tool exchange the model
+    is waiting on (it ends with a ``tool`` result). Either way it has to be
+    carried across verbatim, or the model answers the summary instead of the
+    user's request -- and the typed line never reaches the recorder, the new
+    segment or a later restore.
+
+    The suffix starts at the last ``user`` message, which always begins a
+    self-contained turn: every ``assistant`` tool call inside it is followed by
+    its ``tool`` results, so the slice is a valid transcript on its own.
+
+    ``[]`` when the transcript already ends with an ``assistant`` reply: that
+    turn is answered, and re-sending it would ask the model to answer it twice.
+    """
+    if not messages:
+        return []
+    last = messages[-1]
+    if not isinstance(last, dict) or last.get("role") == "assistant":
+        return []
+    for index in range(len(messages) - 1, -1, -1):
+        message = messages[index]
+        if isinstance(message, dict) and message.get("role") == "user":
+            return list(messages[index:])
+    return []
+
+
+def _plural(count, noun, suffix="s"):
+    """``"1 message"`` / ``"4 messages"`` -- for messages the user reads."""
+    return f"{count} {noun}" + ("" if count == 1 else suffix)
+
+
 def maybe_compact(messages, server_url, model, api_key, llm_timeout, token_stats,
                   history_index=0, token_limit=None, reserved_output_tokens=0,
                   current_tokens=None, plan_hook=None, console=None):
@@ -279,7 +315,9 @@ def maybe_compact(messages, server_url, model, api_key, llm_timeout, token_stats
     against ``token_limit``. Nothing else triggers compaction: in particular the
     number of messages is not a criterion. Compaction is then done by asking the
     LLM to summarize the history and replacing the old turns with that summary,
-    keeping the original system prompt as the first message. The compaction call
+    keeping the original system prompt as the first message *and the turn that is
+    still in flight* (see :func:`_in_flight_tail`) verbatim after it -- a summary
+    of the user's current request is not the request. The compaction call
     itself is a single, tool-free request, so it cannot trigger further tool
     calls or recurse into compaction.
 
@@ -289,10 +327,12 @@ def maybe_compact(messages, server_url, model, api_key, llm_timeout, token_stats
     ``plan_hook`` is an optional callable the caller supplies only when running
     under plan mode (in practice ``AgentSession._handle_compaction``). After the
     summary is built the hook re-injects the running goal + plan so the compacted
-    messages carry them forward. It receives the compacted list and must update it
-    *in place*, because that list is what gets returned to the caller. Passing it in -- instead of referencing the
-    owning session -- keeps ``maybe_compact`` a small, module-level, network-free
-    helper that the test-suite can import and exercise directly.
+    messages carry them forward. It receives the compacted list *and* the
+    in-flight tail (see below) and must update the compacted list in place,
+    because that list is what gets returned to the caller. Passing it in --
+    instead of referencing the owning session -- keeps ``maybe_compact`` a
+    small, module-level, network-free helper that the test-suite can import and
+    exercise directly.
     """
     # ``console`` defaults to None so callers may omit it, but every branch below
     # reports through a console. Falling back to the shared one keeps the
@@ -311,8 +351,20 @@ def maybe_compact(messages, server_url, model, api_key, llm_timeout, token_stats
         # bare messages would crash them.
         return messages, False, history_index
 
+    # The turn this step is answering -- the instruction just typed, or the tool
+    # exchange the model is waiting on -- is carried across the rollover (see
+    # :func:`_in_flight_tail`). It is computed *before* the slow summary call so
+    # the console can tell the user right away that nothing they just sent is at
+    # stake; a compaction note that stays silent about that is exactly what makes
+    # the rollover look like it might have eaten the message.
+    tail = _in_flight_tail(messages)
+    kept_note = (f" The current turn ({_plural(len(tail), 'message')}) is kept "
+                 f"verbatim." if tail else "")
+
     try:
-        console.note(f"Compacting conversation history ({reason}) -> summary...", "warn")
+        console.note(
+            f"Compacting the conversation: {_plural(len(messages), 'message')} "
+            f"-> a summary ({reason}).{kept_note}", "warn")
         summary_prompt = prompts.compaction_prompt(messages)
 
         # The summariser sometimes answers with nothing at all. An empty summary
@@ -324,7 +376,7 @@ def maybe_compact(messages, server_url, model, api_key, llm_timeout, token_stats
         # the over-cap transcript was retried, and paid for, on every step.
         summary = ""
         for attempt in (1, 2):
-            console.start_thinking("compacting")
+            console.start_thinking("compacting history")
             try:
                 reply, _, compact_usage, _ = utils.unpack_llm_result(
                     utils.call_openai_server(
@@ -347,9 +399,14 @@ def maybe_compact(messages, server_url, model, api_key, llm_timeout, token_stats
                 console.note("The summariser returned an empty summary; retrying once.", "warn")
 
         if not summary:
+            # Say plainly what did *not* happen: nothing was dropped and the
+            # segment did not move -- only the shrink did, so the next request
+            # may still be too large.
             console.note(
                 f"Could not compact history: the summariser returned an empty "
-                f"summary twice. Keeping all {len(messages)} messages "
+                f"summary twice. Keeping all {_plural(len(messages), 'message')} "
+                f"and history_{history_index}.json as they are -- nothing was "
+                f"lost, but the next request may still be too large "
                 f"({reason}).", "warn")
             return messages, False, history_index
 
@@ -362,22 +419,56 @@ def maybe_compact(messages, server_url, model, api_key, llm_timeout, token_stats
             "content": f"Here is a summary of our earlier conversation so far:\n{summary}",
         })
 
+        # The turn in flight has to survive the rollover. Compaction runs at the
+        # *start* of a step, so ``messages`` normally ends with the user message
+        # this step is meant to answer, or with the tool result the model is
+        # waiting on. Replacing the transcript with just (system, summary)
+        # therefore dropped the user's instruction on the floor: the model
+        # answered the summary -- "Understood. What would you like me to do?" --
+        # and the typed line never reached the new segment, the recorder or a
+        # later restore (it survived only inside the *closed* segment, which no
+        # recorder record points at any more). ``tail`` was computed before the
+        # summary call so the opening note could already promise this.
+
         # In plan mode, re-inject the running plan + current goal so a
         # compaction (which would otherwise drop them) keeps the model
         # working against the goal it is still trying to finish. The hook is
         # wired in only when the caller runs under plan mode; otherwise
-        # compaction degrades to a plain summary.
+        # compaction degrades to a plain summary. It is also handed the tail so
+        # it can restate the *real* instruction rather than the summary text.
         if plan_hook is not None:
-            plan_hook(compacted)
-
-        console.note(f"History compacted to {len(compacted)} messages.", "warn")
+            plan_hook(compacted, tail)
+
+        # ... and only then the live turn, so the user's actual instruction
+        # reads as the most recent thing the model has to act on.
+        compacted.extend(tail)
+
+        # What the user is shown has to answer the three questions a rollover
+        # raises: *what* was folded away (the summary itself), *how much* (the
+        # closing segment's message count, and what the new one starts with),
+        # and *where it went* (which segment file was closed and which was
+        # started).
+        console.note(f"Summary preview: {utils.oneline(summary, 120)}", "warn")
+        kept = (f"summary + {_plural(len(tail), 'kept message')}" if tail
+                else "summary only")
+        # Phrased as "old segment -> new segment" rather than "N messages -> M
+        # messages": the replacement can be *longer* than what it replaced (a
+        # system prompt, the summary and the kept turn), and a bare pair of
+        # counts that sometimes grows reads like a bug.
+        console.note(
+            f"Compacted history_{history_index}.json "
+            f"({_plural(len(messages), 'message')}) into a summary; "
+            f"history_{history_index + 1}.json now starts with "
+            f"{_plural(len(compacted), 'message')} ({kept}).", "warn")
         # A new segment (history_index + 1) is started on compaction: the
         # compacted messages are its snapshot, and every later turn appends
         # to it. The caller records a single high-level 'summary' turn for
         # this index so the recorder stays flat across the rollover.
         return compacted, True, history_index + 1
     except Exception as e:
-        console.note(f"Failed to compact history: {e}", "error")
+        console.note(
+            f"Failed to compact history: {e}. Keeping all "
+            f"{_plural(len(messages), 'message')} unchanged.", "error")
 
     return messages, False, history_index
 
@@ -427,6 +518,11 @@ class AgentSession:
 
         self.plan_mode = bool(getattr(self.args, "plan", False))
 
+        # The good-bye box is printed once, from shutdown(). Several exits
+        # funnel through there (quit, exit, EOF, a /quit command) and a repeated
+        # box would read like a second session had ended.
+        self._farewell_shown = False
+
         # Token accounting. ``token_stats`` covers the *current history
         # segment* and is reset when compaction rolls over to a new one;
         # ``total_usage`` is the whole-session accumulator and never decreases.
@@ -1263,8 +1359,12 @@ class AgentSession:
             return
         except KeyboardInterrupt:
             self.console.note("Interrupting: Mini Code Exiting...", "error")
+            self.shutdown(farewell=False)
+            return
         except Exception as e:
             self.console.note(f"Exception {e}. Exiting...", "error")
+            self.shutdown(farewell=False)
+            return
         self.shutdown()
 
     def _emit_tip(self):
@@ -1508,7 +1608,7 @@ class AgentSession:
         return True
 
 
-    def _handle_compaction(self, compacted):
+    def _handle_compaction(self, compacted, tail=()):
         """Re-inject goal + plan into the compacted messages (plan mode).
 
         Plan-mode counterpart to the plan handling inside :meth:`maybe_compact`,
@@ -1516,7 +1616,8 @@ class AgentSession:
         a network-free module-level helper. The loop wires in this method only
         when plan mode is on; it re-injects the goal + plan via
         :meth:`_apply_plan_to_compacted`, which also rewrites the tracking files
-        to match.
+        to match. ``tail`` is the turn that is still in flight, which
+        ``maybe_compact`` appends after the hook's messages.
 
         The hook must update ``compacted`` **in place**: ``maybe_compact``
         returns *that* list to the caller, which then assigns it to
@@ -1524,9 +1625,9 @@ class AgentSession:
         discarded a moment later, silently dropping the goal and plan -- which is
         exactly what happened before this was a slice assignment.
         """
-        compacted[:] = self._apply_plan_to_compacted(compacted)
+        compacted[:] = self._apply_plan_to_compacted(compacted, tail)
 
-    def _apply_plan_to_compacted(self, messages):
+    def _apply_plan_to_compacted(self, messages, tail=()):
         """Re-inject the current goal + plan after a history compaction.
 
         Compaction replaces the transcript with a summary, which would otherwise
@@ -1534,16 +1635,18 @@ class AgentSession:
         back off disk and append them as fresh user turns so the model keeps
         working against the goal it is still trying to finish. The goal is
         appended last so it reads as the most recent instruction the model
-        should act on.
+        should act on -- ``maybe_compact`` then appends the in-flight turn, which
+        is the same instruction verbatim.
         """
         plan_text = self.plan_manager.read_plan()
         goal_text = self.plan_manager.read_goal()
 
-        # Recover the user's latest instruction from the pre-compaction tail, in
-        # case the loop had not recorded a goal yet, so there is always a goal to
-        # restate after compaction.
+        # Recover the user's latest instruction from the *in-flight turn* -- not
+        # from ``messages``, which by now holds the summary -- so a session that
+        # compacts before its goal was recorded still restates the real
+        # instruction instead of the summary text.
         current_input = None
-        for m in reversed(messages):
+        for m in reversed(list(tail or ())):
             if m.get("role") == "user":
                 current_input = m.get("content")
                 break
@@ -1931,8 +2034,15 @@ class AgentSession:
             self.console.note(
                 f"Saved usage to: {usage_path} (session total: {total_path})", "info")
 
-    def shutdown(self):
-        """Persist and print a final summary (called on quit / exit)."""
+    def shutdown(self, farewell=True):
+        """Persist and print a final summary (called on quit / exit).
+
+        ``farewell=False`` is used by the interrupt / fatal paths in :meth:`run`,
+        which have already told the user (in red) that the session is being torn
+        down: a cheerful "thanks and here is your state" box on top of a crash is
+        the wrong note, and the state it would recap is the state that just
+        failed.
+        """
         self._persist()
         segments = history_segment_indices(self.session_dir)
         # List what is really on disk. The old message claimed
@@ -1948,7 +2058,62 @@ class AgentSession:
         self.console.note(
             f"Saved session to {self.cache_dir}/{self.unique_id}/ "
             f"({present} + summary_history.json).", "ok")
-        self.console.usage_summary(self.total_usage)
+        # The detailed per-field usage block is verbose-only (the console
+        # documents it that way); in the quiet default view the good-bye box
+        # below carries the same totals, so nothing is lost by leaving it out.
+        if self.console.verbose:
+            self.console.usage_summary(self.total_usage)
+        if farewell:
+            self._farewell(segments)
+
+    def _farewell(self, segments=None):
+        """Print the good-bye box: version, sign-off and what the session left.
+
+        Printed once (see ``_farewell_shown``) and only on a normal exit. It
+        restates the state in one glanceable place -- the same facts the user
+        would otherwise have to piece together from the save note, ``/history``
+        and the (verbose-only) usage readout, which in the quiet default view
+        means they saw none of it.
+        """
+        if self._farewell_shown:
+            return
+        self._farewell_shown = True
+        from . import __version__ as version
+
+        if segments is None:
+            segments = history_segment_indices(self.session_dir)
+        if not segments:
+            where = f"history_{self.history_index}.json"
+        elif len(segments) == 1:
+            where = f"history_{segments[0]}.json"
+        else:
+            where = f"history_{segments[0]}..{segments[-1]}.json"
+
+        turns = len(self.summary)
+        usage = self.total_usage or {}
+
+        def count(key):
+            # A display detail on the exit path must never raise: a server that
+            # reported ``null`` usage leaves a None here, and crashing while
+            # saying goodbye would be the worst possible time to fail.
+            try:
+                return int(usage.get(key) or 0)
+            except (TypeError, ValueError):
+                return 0
+
+        rows = [
+            ("session id", self.unique_id),
+            ("saved under", f"{self.cache_dir}/{self.unique_id}/"),
+            ("history", f"{where} (segment {self.history_index}), "
+                        f"{_plural(len(self.messages), 'message')}"),
+            ("conversation", _plural(turns, "recorded turn")),
+            ("tokens", f"{count('prompt_tokens'):,} in / "
+                       f"{count('completion_tokens'):,} out "
+                       f"({count('total_tokens'):,} total)"),
+            ("calls", f"{count('llm_calls'):,} LLM, "
+                      f"{count('tool_calls'):,} tool"),
+        ]
+        self.console.farewell(version, rows)
 
     # -- single LLM turn ---------------------------------------------------
 
@@ -2000,14 +2165,19 @@ class AgentSession:
                              self.history_index)
             except Exception as e:
                 self.console.note(
-                    f"Could not save the closed history segment: {e}", "warn")
+                    f"Could not save the closed history segment "
+                    f"history_{self.history_index}.json: {e}. The compacted "
+                    f"conversation is unaffected, but /reset back into that "
+                    f"segment may be incomplete.", "warn")
             self.history_index = new_index
             self.token_stats = empty_usage()
             # Snapshot the compacted messages into the new segment so its turns
             # are preserved, and record the summary as the first turn of it.
             save_history(self.messages, self.cache_dir, self.unique_id, self.history_index)
             self._record_turn(
-                f"summary: history compacted to {len(self.messages)} messages",
+                f"summary: history_{new_index - 1}.json "
+                f"({_plural(len(closing_messages), 'message')}) compacted into a "
+                f"summary; history_{self.history_index}.json started",
                 self.messages)
 
         # Show a "… thinking" spinner while the LLM works (in-place, non-scrolling;

mini_code_cli/ui.py

@@ -739,6 +739,32 @@ class Console:
         ]
         self.banner(f"MiniCodeCLI v{version}", lines, fg="cyan")
 
+    def farewell(self, version, rows, sign_off=None):
+        """Render the exit banner: a sign-off plus a summary of the session state.
+
+        Deliberately narrower than :meth:`welcome`. Everything the welcome banner
+        shows is about how the session *will* run -- server, model, permissions,
+        allowed dir -- and all of it is irrelevant once the session is over. What
+        the user can still act on is what the session *left behind*: which
+        folder it was saved in, which history segments exist, how much was said
+        and what it cost. So the box carries only the version, a good-bye line
+        and those ``rows``.
+
+        ``rows`` is a list of ``(label, value)`` pairs, laid out in a single
+        colon-aligned column like the welcome banner; the caller supplies the
+        pairs because it owns the state (the console stays free of session
+        policy).
+        """
+        label_w = max((len(str(label)) for label, _ in rows), default=0)
+        lines = [sign_off or "Goodbye, and thanks for using MiniCodeCLI!", ""]
+        lines += [f"{str(label).ljust(label_w)} : {value}" for label, value in rows]
+        # Yellow, not the welcome banner's cyan: this is the one box that
+        # *closes* the session, so it reads as a distinct, valedictory note
+        # rather than the startup banner reappearing. Colours only apply on a
+        # colour-capable TTY (see :meth:`box`), so piped/ASCII output is
+        # unchanged.
+        self.banner(f"MiniCodeCLI v{version} - goodbye", lines, fg="yellow")
+
     def announce_api_key(self, present):
         if present:
             self.note("API key found (MINI_CODE_API_KEY).", "ok")

{mini_code_cli-0.1.1.1.dist-info → mini_code_cli-0.1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mini-code-cli
-Version: 0.1.1.1
+Version: 0.1.1.2
 Summary: Mini Coding Agent. Allows you to easily experiment with a small coding agent.
 Author-email: Nikolai Rozanov <nikolai.rozanov@gmail.com>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -970,6 +970,28 @@ reserve (`--max-tokens`). Unset (default) it is derived from the model's context
 output reserve and a safety margin. Lower it to compact sooner, raise it to compact later — there
 is no message-count cap to configure.
 
+Compaction replaces the older turns with a summary, but it always carries the **turn in flight**
+across the rollover: the message you just typed (or, mid-turn, the tool call the model is
+waiting on) is kept verbatim after the summary. So a compaction that fires just as you send an
+instruction cannot swallow it — the model still answers what you asked, and the turn stays in
+the session file, in `/history` and in a later restore.
+
+Because a rollover leaves no trace in the transcript (the old turns really are gone), the
+console says in plain terms what happened — all of it without `--verbose`:
+
+```
+[!] Compacting the conversation: 42 messages -> a summary (51000 tokens in, 8192 reserved for the reply > 52000 budget). The current turn (1 message) is kept verbatim.
+[!] Summary preview: The user asked for a token-based compaction trigger, then fixed ...
+[!] Compacted history_0.json (42 messages) into a summary; history_1.json now starts with 3 messages (summary + 1 kept message).
+```
+
+So you can see *what* was folded away (a preview of the summary itself), *how much* (the
+message count of the segment that was closed), *where it went* (`history_0.json` closed,
+`history_1.json` started) and that nothing you just typed was lost. If the summariser answers
+with an empty summary twice, or the call fails, compaction is abandoned and the note says so
+explicitly — "nothing was lost, but the next request may still be too large" — with the
+transcript and the segment left untouched.
+
 
 ## Serving a model locally
 

{mini_code_cli-0.1.1.1.dist-info → mini_code_cli-0.1.1.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mini_code_cli/__init__.py,sha256=8J8l-IE6HHp-ib_LWbxbj4Hw7cH_7YWMa16j-aI9W7g,1420
-mini_code_cli/agent_loop.py,sha256=G0ETw_6hitNEH9EaYqsyRsH5yNW96fLgphKzqiCGWmE,106279
+mini_code_cli/agent_loop.py,sha256=HhQmZ5QbE1pqTPHDKbe7GjTGMS8vbtqA2wd52gNqx4k,115180
 mini_code_cli/config.py,sha256=TnvEkD31m9g3Zly8Q8TU9xCWE_Nx7He0FGo5F7IrDgE,9560
 mini_code_cli/permissions.py,sha256=uQpQlUtQyVICpjUqdh9QQ_mgl51hZrGLHJzQR9vG124,2017
 mini_code_cli/persistence.py,sha256=35rUqOvh0RKFgHoNzDghdXlbDofRxeK_t7M2_JuHcXc,22287
@@ -11,14 +11,14 @@ mini_code_cli/shell_safety_utils.py,sha256=5E126vGnG7iIuTZe_R5JrxB_zxZpMKGe_pilz
 mini_code_cli/skills.py,sha256=Y6gltBE6dcOgRIBolOVUXAQYuhXbUn9heOSj9f0tz_Q,17717
 mini_code_cli/tokens.py,sha256=eMA42Lazy1ng0OOB0KgvSHHWgxDjGkLvF2qUVllky80,5236
 mini_code_cli/tools.py,sha256=dypVWHnNII6pIyf90H_mcLTqNiJPdW7cFex3n6xXw_I,27043
-mini_code_cli/ui.py,sha256=VtN6In4TfdAJ2Yrxp8lEyJYpbzIf8kFXOplK7K-6W8k,38848
+mini_code_cli/ui.py,sha256=89YAADOqTOM6ReFQbKo7hGNppgdzmuf5yKgJY5Obomc,40390
 mini_code_cli/utils.py,sha256=LCzwq4_BSjWvLv-A0Z9_RXEwBt8lHWoJHMJs0Pf6miQ,8880
 mini_code_cli/subagents/__init__.py,sha256=3fgcwY0pNq5iW29OxLPtSA3H5IKXhl2LUhwbBjLUDuU,1884
 mini_code_cli/subagents/base.py,sha256=z3Zl8ABLXFOnEKCV9SgripsegVP1Go95z8OW2O_VstM,16259
 mini_code_cli/subagents/builtin.py,sha256=knpQ1-U_Lp55HqUYPziMg4mca-F7b8v7z-VN9qU16CE,8038
-mini_code_cli-0.1.1.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-mini_code_cli-0.1.1.1.dist-info/METADATA,sha256=l8LfWDQvCCP-q53TdnkFLXBK_KkGT9-yQgULRpKOoMw,56632
-mini_code_cli-0.1.1.1.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
-mini_code_cli-0.1.1.1.dist-info/entry_points.txt,sha256=MwDp5UbXpI7wodSmOSYL8_nKutnBiyp96ZDDtaX7x14,60
-mini_code_cli-0.1.1.1.dist-info/top_level.txt,sha256=3Hb6PpNkJYXvzDKXuuFJRvzCdsTRh0TuRWz-ScJ6qV0,14
-mini_code_cli-0.1.1.1.dist-info/RECORD,,
+mini_code_cli-0.1.1.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+mini_code_cli-0.1.1.2.dist-info/METADATA,sha256=aJ53M27Ss7cP_wQ2yB4JFAGD2sT9GbQKe8yiaI5BmcA,58131
+mini_code_cli-0.1.1.2.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+mini_code_cli-0.1.1.2.dist-info/entry_points.txt,sha256=MwDp5UbXpI7wodSmOSYL8_nKutnBiyp96ZDDtaX7x14,60
+mini_code_cli-0.1.1.2.dist-info/top_level.txt,sha256=3Hb6PpNkJYXvzDKXuuFJRvzCdsTRh0TuRWz-ScJ6qV0,14
+mini_code_cli-0.1.1.2.dist-info/RECORD,,