substratum-cli 0.2.4__tar.gz → 0.2.6__tar.gz

{substratum_cli-0.2.4 → substratum_cli-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: substratum-cli
-Version: 0.2.4
+Version: 0.2.6
 Summary: Substratum: verified-or-refused code, with provenance. The terminal over the comprehension engine.
 Author: Substratum
 License: LicenseRef-Proprietary

{substratum_cli-0.2.4 → substratum_cli-0.2.6}/substratum_cli/__init__.py

@@ -5,4 +5,4 @@ Import budget: this package is stdlib-only; the ONLY module reaching into backen
 """
 # SINGLE SOURCE OF TRUTH for the release version. pyproject reads this (dynamic version), the boot shows
 # it, and the update-check compares against it. To cut a release, bump ONLY this line, then publish.
-__version__ = "0.2.4"
+__version__ = "0.2.6"

{substratum_cli-0.2.4 → substratum_cli-0.2.6}/substratum_cli/_boot.py

@@ -56,7 +56,8 @@ def seal(lib_name: str, version: str) -> tuple[str, str]:
 
 
 def render(name, census, langs, substrate, substrate_note, substrate_ok, standing, version,
-           color=True, ascii_mode=False, logged_in=True, update_to="", seal_key="") -> list[str]:
+           color=True, ascii_mode=False, logged_in=True, update_to="", seal_key="",
+           update_cmd="pip install --upgrade substratum-cli") -> list[str]:
     """Return the boot lines. `substrate` is the HONEST name of the intelligence serving this session
     (the hosted engine version, or 'not connected') -- NEVER a local path. `substrate_note`/`_ok` render
     the connection state. `seal_key` is the stable identity the self-certificate hashes."""
@@ -157,7 +158,7 @@ def render(name, census, langs, substrate, substrate_note, substrate_ok, standin
     if update_to:                           # a pip package cannot self-update; hand over the one command
         arrow = "^" if ascii_mode else "↑"
         out += ["    " + c(GO, f"{arrow} update") + c(LAB, f"  Substratum {update_to} is available")
-                + c(CH, f"   {dot}   ") + c(GO, "pip install --upgrade substratum-cli")]
+                + c(CH, f"   {dot}   ") + c(GO, update_cmd)]
     if not logged_in:
         out += ["    " + c(GO, "login") + c(LAB, "  to ") + c(DAT, "fix") + c(LAB, " and ") + c(DAT, "write")
                 + c(LAB, " code (connects the engine)")

{substratum_cli-0.2.4 → substratum_cli-0.2.6}/substratum_cli/_update.py

@@ -40,6 +40,30 @@ def available(current: str) -> str:
     return latest if latest and _version_tuple(latest) > _version_tuple(current) else ""
 
 
+def upgrade_command() -> str:
+    """The exact command that updates THIS install. pipx installs each app into an isolated venv under
+    a `pipx` path, where `pip install --upgrade` is a no-op -- so a nag that always says "pip" is wrong
+    for the primary (pipx) install path our docs recommend. Detect the install method from the runtime
+    location and hand the right command; if the location is somehow unreadable, name both so the user is
+    never stuck. Pure, no network, never raises."""
+    try:
+        import sys
+        parts = [getattr(sys, "prefix", "") or "", getattr(sys, "executable", "") or ""]
+        try:
+            parts.append(os.path.dirname(os.path.abspath(__file__)))
+        except Exception:
+            pass
+        hay = "/".join(p for p in parts if p).replace("\\", "/").lower()
+        if not hay:
+            return "pipx upgrade substratum-cli   (or)   pip install --upgrade substratum-cli"
+        # pipx venvs live at .../pipx/venvs/<app>/...; the `/pipx/` path segment is the reliable signal.
+        if "/pipx/" in ("/" + hay + "/") or "pipx/venvs" in hay:
+            return "pipx upgrade substratum-cli"
+        return "pip install --upgrade substratum-cli"
+    except Exception:
+        return "pipx upgrade substratum-cli   (or)   pip install --upgrade substratum-cli"
+
+
 def engine_version() -> str:
     """The HOSTED engine's substrate version from the last check (cached), or "". This is what actually
     serves fix/write for a thin client, so the boot shows THIS -- never a local path."""

{substratum_cli-0.2.4 → substratum_cli-0.2.6}/substratum_cli/session.py

@@ -114,6 +114,7 @@ class Session:
         logged_in = account.is_logged_in()
         _update.refresh_async()                    # refresh the update cache in the background (next session)
         update_to = _update.available(_cver)       # instant read from cache; "" if none or unknown
+        update_cmd = _update.upgrade_command()     # the RIGHT command for this install (pipx vs pip)
 
         # HONEST substrate: which intelligence actually serves fix/write this session, and in which mode.
         # Two real deployment modes: HOSTED (thin client -> engine on Fly) and AIRGAPPED-LOCAL (engine +
@@ -141,7 +142,8 @@ class Session:
         if S.seal_cols() >= 84:
             for ln in _boot.render(name, census, "py · go · ts", substrate, sub_note, sub_ok,
                                    st, "0.1.0", color=self.color, ascii_mode=ascii_mode,
-                                   logged_in=logged_in, update_to=update_to, seal_key=seal_key):
+                                   logged_in=logged_in, update_to=update_to, seal_key=seal_key,
+                                   update_cmd=update_cmd):
                 self._say(ln)
             return
         # compact identity (narrow pane): the mark + a lime-railed status
@@ -161,7 +163,7 @@ class Session:
             self._say(f"  {rail} " + bits)
         if update_to:
             self._say("  " + pn("update", S.GOLD)
-                      + pn(f"  {update_to}: pip install --upgrade substratum-cli", S.LABEL))
+                      + pn(f"  {update_to}: {update_cmd}", S.LABEL))
         if not logged_in:
             self._say("  " + pn("login", S.GOLD) + pn("  to fix and write code", S.LABEL))
         self._say("  " + pn("help", S.GOLD) + pn("  for commands", S.LABEL))
@@ -619,6 +621,7 @@ class Session:
         self.banner()
         from . import style as S
         prompt = (S.GOLD + S.g("brand") + " " + S.RESET) if self.color else (S.g("brand") + " ")
+        exit_hints = 0
         while True:
             try:
                 line = input(prompt)
@@ -626,7 +629,13 @@ class Session:
                 sys.stdout.write("\n")
                 _leave()
             except KeyboardInterrupt:
+                # Ctrl-C clears the current line (readline behavior); it does NOT exit. Users spam it
+                # trying to leave and just get blank lines, so surface the real exit the first few
+                # times, then stay quiet for power users who use Ctrl-C to clear a half-typed line.
                 sys.stdout.write("\n")
+                if exit_hints < 3:
+                    self._say("  Ctrl-C clears the line. to leave, type  /exit  (or press Ctrl-D)", _DIM)
+                    exit_hints += 1
                 continue
             try:
                 res, keep = self.handle(line)

{substratum_cli-0.2.4 → substratum_cli-0.2.6}/substratum_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: substratum-cli
-Version: 0.2.4
+Version: 0.2.6
 Summary: Substratum: verified-or-refused code, with provenance. The terminal over the comprehension engine.
 Author: Substratum
 License: LicenseRef-Proprietary