agent-memory-git 0.1.4__tar.gz → 0.1.5__tar.gz

{agent_memory_git-0.1.4 → agent_memory_git-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-memory-git
-Version: 0.1.4
+Version: 0.1.5
 Summary: Shared, git-backed memory for Claude Code and Codex.
 Keywords: claude-code,codex,memory,agents,git
 Author: Shichao Song

{agent_memory_git-0.1.4 → agent_memory_git-0.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-memory-git"
-version = "0.1.4"
+version = "0.1.5"
 description = "Shared, git-backed memory for Claude Code and Codex."
 readme = "README.md"
 license = "MIT"

{agent_memory_git-0.1.4 → agent_memory_git-0.1.5}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "agent-memory-git"
-version = "0.1.4"
+version = "0.1.5"
 description = "Shared, git-backed memory for Claude Code and Codex."
 readme = "README.md"
 license = "MIT"

{agent_memory_git-0.1.4 → agent_memory_git-0.1.5}/src/agent_memory/config.py

@@ -14,9 +14,21 @@ CONFIG_FILE = CONFIG_DIR / "config.json"
 PROTOCOL_COPY = CONFIG_DIR / "PROTOCOL.md"  # what Claude Code imports; `mem install` refreshes it
 
 
+def _python():
+    """This interpreter, as the `python` beside it when that is the same file. Whether `mem` was
+    started as python3 or python3.11 (uv has changed its entry scripts) then leaves the hook
+    commands alone, so `mem install` does not rewrite them and Codex does not ask to trust them again."""
+    exe = Path(sys.executable)
+    try:
+        plain = exe.with_name("python")
+        return str(plain) if plain != exe and plain.samefile(exe) else sys.executable
+    except (OSError, ValueError):  # no `python` beside it, or no sys.executable at all
+        return sys.executable
+
+
 def mem_command():
     """The argv that runs `mem` with this interpreter, for hooks and background sync."""
-    return [sys.executable, "-m", "agent_memory"]
+    return [_python(), "-m", "agent_memory"]
 
 
 def _mem_path():

{agent_memory_git-0.1.4 → agent_memory_git-0.1.5}/src/agent_memory/update.py

@@ -8,10 +8,12 @@ import datetime as _dt
 import importlib.metadata
 import json
 import re
+import shlex
 import shutil
 import subprocess
 import sys
 import time
+import tomllib
 import urllib.request
 from pathlib import Path
 
@@ -21,9 +23,8 @@ PACKAGE = "agent-memory-git"
 INDEX = f"https://pypi.org/pypi/{PACKAGE}/json"
 CHECK_EVERY = 24 * 3600
 CACHE_NAME = "update-check.json"
-# how to update, by how this copy was installed
+# how to update, by how this copy was installed; for `uv tool` it depends on the install, see upgrade_args
 COMMANDS = {
-    "uv-tool": f"uv tool upgrade {PACKAGE} && mem install",
     "uvx": f'uvx --refresh --from "{PACKAGE}[ui]" mem ui',
     "dev": "git pull && (cd web && npm ci && npm run build) && mem install",  # run in the checkout
     "other": f'pip install -U "{PACKAGE}[ui]" && mem install',
@@ -34,6 +35,13 @@ def _cache():
     return config.CONFIG_DIR / CACHE_NAME
 
 
+def _cached():
+    try:
+        return json.loads(_cache().read_text("utf-8"))
+    except (OSError, ValueError):
+        return {}
+
+
 def current():
     try:
         return importlib.metadata.version(PACKAGE)
@@ -81,7 +89,7 @@ def _inside(path, root):
 
 
 def how_installed():
-    """'uv-tool' when `uv tool upgrade` can update this copy; else 'dev', 'uvx' or 'other'."""
+    """'uv-tool' when uv can update this copy in place; else 'dev', 'uvx' or 'other'."""
     try:
         direct = importlib.metadata.distribution(PACKAGE).read_text("direct_url.json")
     except importlib.metadata.PackageNotFoundError:
@@ -97,13 +105,48 @@ def how_installed():
     return "other"
 
 
+def _receipt():
+    """What `uv tool install` was given for this copy, from the receipt uv keeps in its environment."""
+    try:
+        return tomllib.loads((Path(sys.prefix) / "uv-receipt.toml").read_text("utf-8")).get("tool", {})
+    except (OSError, ValueError):
+        return {}
+
+
+def _requirement(req, specifier=True):
+    extras = f"[{','.join(req['extras'])}]" if req.get("extras") else ""
+    return req["name"] + extras + (req.get("specifier", "") if specifier else "")
+
+
+def upgrade_args():
+    """The uv arguments that update this `uv tool` install. `uv tool upgrade` keeps a version given at
+    install time (`agent-memory-git==0.1.3`), so such an install is installed again without it,
+    keeping its extras, its Python and the packages added with `--with`."""
+    tool = _receipt()
+    reqs = tool.get("requirements", [])
+    ours = next((r for r in reqs if r.get("name") == PACKAGE), {})
+    simple = set(tool) <= {"requirements", "python", "entrypoints"} and all(
+        set(r) <= {"name", "extras", "specifier"} for r in reqs
+    )  # nothing a plain `uv tool install` would lose, such as a custom index or a git source
+    if not (ours.get("specifier") and simple):
+        return ["tool", "upgrade", PACKAGE]
+    args = ["tool", "install", "--upgrade", _requirement(ours, specifier=False)]
+    if tool.get("python"):
+        args += ["--python", tool["python"]]
+    for r in reqs:
+        if r is not ours:
+            args += ["--with", _requirement(r)]
+    return args
+
+
+def _uv_command(args):
+    return f"{shlex.join(['uv', *args])} && mem install"
+
+
 def status(force=False):
     """What the page shows: this version, the latest one known, and how to update."""
     auto = config.load().get("check_updates", True)
-    try:
-        cached = json.loads(_cache().read_text("utf-8"))
-    except (OSError, ValueError):
-        cached = {}
+    cached = _cached()
     if force or (auto and time.time() - cached.get("checked", 0) > CHECK_EVERY):
         latest = fetch_latest()
         if latest:
@@ -119,7 +162,7 @@ def status(force=False):
         "checked": _dt.datetime.fromtimestamp(checked).astimezone().isoformat() if checked else None,
         "auto": auto,
         "method": method,
-        "command": COMMANDS[method],
+        "command": _uv_command(upgrade_args()) if method == "uv-tool" else COMMANDS[method],
         "oneClick": method == "uv-tool",
     }
 
@@ -130,27 +173,39 @@ def _tail(*outputs, lines=12):
 
 
 def upgrade():
-    """`uv tool upgrade`, then `mem install` from the upgraded code. Returns what happened."""
+    """The uv update (see upgrade_args), then `mem install` from the upgraded code. Returns what happened."""
     if how_installed() != "uv-tool":
         return {"ok": False, "error": "This copy was not installed with `uv tool`; update it with the command shown."}
     before = current()
-    up = subprocess.run([shutil.which("uv"), "tool", "upgrade", PACKAGE], capture_output=True, text=True, timeout=600)
+    args = upgrade_args()
+    up = subprocess.run([shutil.which("uv"), *args], capture_output=True, text=True, timeout=600)
     if up.returncode != 0:
-        return {"ok": False, "error": "uv tool upgrade failed.", "log": _tail(up.stdout, up.stderr)}
+        return {"ok": False, "error": f"`{shlex.join(['uv', *args])}` failed.", "log": _tail(up.stdout, up.stderr)}
     # a new process, so both run the upgraded code
     after = subprocess.run(
         [sys.executable, "-c", f"import importlib.metadata as m; print(m.version({PACKAGE!r}))"],
         capture_output=True,
         text=True,
     ).stdout.strip()
+    if after in ("", before):  # nothing new installed, so nothing for mem install to refresh
+        known = _cached().get("latest")
+        missed = newer(known, before)  # e.g. a version bound uv kept; its output says why
+        return {
+            "ok": not missed,
+            "from": before,
+            "to": before,
+            "changed": False,
+            "error": f"uv did not install {known}; its output is below." if missed else None,
+            "log": _tail(up.stdout, up.stderr),
+        }
     inst = subprocess.run(
         [sys.executable, "-m", "agent_memory", "install"], capture_output=True, text=True, timeout=120
     )
     return {
         "ok": inst.returncode == 0,
         "from": before,
-        "to": after or before,
-        "changed": bool(after) and after != before,
+        "to": after,
+        "changed": True,
         "error": None if inst.returncode == 0 else "mem install failed after the upgrade.",
         "log": _tail(up.stdout, up.stderr, inst.stdout, inst.stderr),
     }