agent-memory-git 0.1.14__tar.gz → 0.1.16__tar.gz

{agent_memory_git-0.1.14 → agent_memory_git-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-memory-git
-Version: 0.1.14
+Version: 0.1.16
 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.14 → agent_memory_git-0.1.16}/pyproject.toml

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

{agent_memory_git-0.1.14 → agent_memory_git-0.1.16}/pyproject.toml.orig

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

{agent_memory_git-0.1.14 → agent_memory_git-0.1.16}/src/agent_memory/PROTOCOL.md

@@ -1,6 +1,6 @@
 # Shared memory
 
-You have a persistent memory that Claude Code and Codex share. Every memory is one Markdown file in a git repository. At the start of each session a hook injects a block titled "Shared memory index": it lists the memories relevant to the current folder and repository, and gives the memories directory, this session's staging directory and the path of the `mem` command. If the active profile changes while the session runs, a new index arrives with your next message and replaces the earlier one: from then on use only its memories and paths. If that block is missing, the memory system is not active in this session; ignore this section.
+You have a persistent memory that Claude Code and Codex share. Every memory is one Markdown file in a git repository. At the start of each session a hook injects a block titled "Shared memory index": it lists the memories relevant to the current folder and repository, and gives the memories directory, this session's staging directory and the path of the `mem` command. When the conversation holds more than one index, only the latest counts: use its memories and paths, its staging directory above all. A new one arrives with your next message when the active profile changes, and a session resumed, forked or continued from another starts with that session's index still in view. If that block is missing, the memory system is not active in this session; ignore this section.
 
 ## Reading
 

{agent_memory_git-0.1.14 → agent_memory_git-0.1.16}/src/agent_memory/capture.py

@@ -7,7 +7,7 @@ from pathlib import Path
 
 from . import frontmatter, gitsync, sessions, workdir
 from .context import detect
-from .store import memories_dir, normalize, read, staging_dir
+from .store import load_all, memories_dir, normalize, read, staging_dir
 from .util import atomic_write, id_path, log, new_id, now, now_iso
 
 SESSION_FILE = ".session.json"
@@ -124,6 +124,49 @@ def promote(data_dir, sdir, session=None):
     return count
 
 
+PLACE_KEYS = ("cwd", "original_cwd", "git_root", "git_remote", "git_branch", "git_commit")
+
+
+def relocated(source, ctx):
+    """`source` moved to the project `ctx` points at (a context from relocate()), in the order _source() writes."""
+    items = [(k, v) for k, v in source.items() if k not in PLACE_KEYS]
+    place = [(k, ctx[k]) for k in PLACE_KEYS if k != "git_commit" and ctx.get(k)]
+    at = next((i for i, (k, _) in enumerate(items) if k == "transcript"), len(items))
+    return dict(items[:at] + place + items[at:])
+
+
+def rehome(data_dir, session):
+    """Move this session's `here` memories still filed under its throwaway folder to the project it worked in.
+
+    promote() decides from the transcript so far, which finds nothing when a memory is written before the
+    session touches a project folder on this machine; each later turn tries again. Returns how many moved.
+    """
+    ctx = session.get("ctx") or {}
+    tool, sid = session.get("tool"), session.get("session_id")
+    if not sid or not workdir.is_throwaway(ctx.get("cwd")):
+        return 0
+    left = [
+        m
+        for m in load_all(data_dir)
+        if m["scope"] == "here"
+        and m["source"].get("session_id") == sid
+        and m["source"].get("tool") == tool
+        and workdir.is_throwaway(m["source"].get("cwd"))
+        and not m["source"].get("original_cwd")
+    ]
+    if not left:
+        return 0
+    moved = relocate(ctx, session.get("transcript_path") or sessions.transcript_path(tool, sid))
+    if not moved.get("original_cwd"):
+        return 0  # still no project to point at
+    for m in left:
+        path = memories_dir(data_dir) / m["rel"]
+        meta, body = read(path)
+        meta["source"] = relocated(meta["source"], moved)
+        atomic_write(path, frontmatter.join(meta, body))
+    return len(left)
+
+
 def stamp_updates(data_dir):
     """Set `updated` on tracked memory files that were edited in place."""
     r = gitsync.git(data_dir, "status", "--porcelain", "-z", "--", "memories")
@@ -175,6 +218,7 @@ def flush(data_dir, sdir, final=False, lock_timeout=5.0):
             return False
         session = read_session(sdir)
         n = promote(data_dir, sdir, session)
+        rehome(data_dir, session)
         committed = commit(data_dir, session)
         if final and Path(sdir).is_dir() and not any(Path(sdir).glob("*.md")):
             shutil.rmtree(sdir, ignore_errors=True)
@@ -183,6 +227,31 @@ def flush(data_dir, sdir, final=False, lock_timeout=5.0):
         return committed
 
 
+TOOLS = ("claude-code", "codex")  # the prefixes of staging folder names: <tool>-<session id>
+
+
+def adopt(sdir):
+    """Session info for a staging folder that has none, from its name and that session's transcript.
+
+    An agent can write into a staging folder that is not its session's own, such as the one named in the older
+    index of a session it was continued from; the folder it makes has no .session.json, and without this the
+    memories in it are committed with no provenance at all. They are credited to the folder's session.
+    """
+    name = Path(sdir).name
+    tool = next((t for t in TOOLS if name.startswith(t + "-")), None)
+    if not tool:
+        return
+    sid = name[len(tool) + 1 :]
+    transcript = sessions.transcript_path(tool, sid)
+    info = {"tool": tool, "session_id": sid, "transcript_path": transcript}
+    folder = sessions.cwd(tool, sid, transcript)
+    if folder:
+        ctx = detect(folder)
+        ctx.pop("git_commit", None)  # HEAD now, not what the session saw
+        info["ctx"] = ctx
+    write_session(sdir, info)
+
+
 def recover_orphans(data_dir, keep=None):
     """Promote staging dirs left by sessions that ended without a final flush."""
     root = staging_dir(data_dir)
@@ -196,6 +265,8 @@ def recover_orphans(data_dir, keep=None):
         age = time.time() - (marker.stat().st_mtime if marker.exists() else sdir.stat().st_mtime)
         has_files = any(sdir.glob("*.md"))
         if has_files and age > ORPHAN_AGE:
+            if not marker.exists():
+                adopt(sdir)
             committed |= flush(data_dir, sdir, final=True, lock_timeout=1.0)
         elif not has_files and age > STALE_AGE:
             shutil.rmtree(sdir, ignore_errors=True)

{agent_memory_git-0.1.14 → agent_memory_git-0.1.16}/src/agent_memory/cli.py

@@ -129,12 +129,7 @@ def cmd_relocate(args):
         if args.dry_run:
             continue
         meta, body = store.read(mdir / m["rel"])
-        source = dict(meta.get("source") or {})
-        for key in ("cwd", "git_root", "git_remote", "git_branch"):
-            source.pop(key, None)
-            if ctx.get(key):
-                source[key] = ctx[key]
-        source["original_cwd"] = ctx["original_cwd"]
+        source = capture.relocated(dict(meta.get("source") or {}), ctx)
         if transcript:
             source.setdefault("transcript", transcript)
         meta["source"] = source
@@ -274,11 +269,12 @@ def cmd_profile(args):
                 _switched(found[pid]["name"])
             _access_note()
         elif args.action == "remove":
-            found, _ = profiles.listing()
+            found, before = profiles.listing()
             pid = profiles.find(args.profile, found)
             active = profiles.remove(pid)
             print(f"removed {found[pid]['name']}; {profiles.short(found[pid]['data_dir'])} is left as it is")
-            _switched(profiles.listing()[0][active]["name"])
+            if active != before:  # only removing the active profile switches sessions to another
+                _switched(profiles.listing()[0][active]["name"])
             _access_note()
         else:
             for p in profiles.summary()["profiles"]:

{agent_memory_git-0.1.14 → agent_memory_git-0.1.16}/src/agent_memory/sessions.py

@@ -53,6 +53,26 @@ def transcript_path(tool, session_id):
     return str(hits[0]) if hits else ""
 
 
+def cwd(tool, session_id, transcript=None):
+    """The folder a session ran in: Codex's thread record, or the first Claude transcript line that names one."""
+    if tool == "codex":
+        return _codex_thread(session_id, "cwd")
+    try:
+        with open(transcript, encoding="utf-8", errors="replace") as f:
+            for raw in f:
+                if '"cwd"' not in raw:
+                    continue
+                try:
+                    found = json.loads(raw).get("cwd")
+                except ValueError:
+                    continue
+                if found:
+                    return found
+    except (OSError, TypeError):
+        pass
+    return ""
+
+
 def title(tool, session_id, transcript=None):
     if tool == "codex":
         name = _codex_title(session_id)

{agent_memory_git-0.1.14 → agent_memory_git-0.1.16}/src/agent_memory/webui/js/views/list.js

@@ -52,7 +52,7 @@ function facet(def) {
       ${options.map((o) => {
         const on = values.includes(o.value);
         return html`<button type="button" role="menuitemcheckbox" class="${cx("menu-item", !o.count && !on && "faint")}"${attrs({ "aria-checked": String(on), "data-act": "toggle", "data-arg": `${def.key}:${o.value}`, "data-key": `${def.key}:${o.value}` })}>
-          <span class="tick">${on ? icon("check", "", 3) : ""}</span><span class="grow">${o.label}</span><span class="count">${o.count}</span></button>`;
+          <span class="tick">${on ? icon("check", "", 3) : ""}</span><span class="grow truncate"${attrs({ title: o.label })}>${o.label}</span><span class="count">${o.count}</span></button>`;
       })}
     </div>
     ${values.length ? html`<div class="menu-foot"><button type="button" class="menu-wide" data-act="setList" data-arg="${def.key}">Clear ${def.label.toLowerCase()}</button></div>` : ""}`;
@@ -73,7 +73,7 @@ function added() {
       ${opts.map((o) => {
         const on = v === o.value;
         return html`<button type="button" role="radio" class="${cx("menu-item", !o.count && !on && "faint")}"${attrs({ "aria-checked": String(on), "data-act": "setAdded", "data-arg": on ? "" : o.value })}>
-          <span class="radio">${on ? html`<i></i>` : ""}</span><span class="grow">${o.label}</span><span class="count">${o.count}</span></button>`;
+          <span class="radio">${on ? html`<i></i>` : ""}</span><span class="grow truncate"${attrs({ title: o.label })}>${o.label}</span><span class="count">${o.count}</span></button>`;
       })}
     </div>
     <div class="menu-range">