agent-memory-cli 0.1.2__tar.gz → 0.1.4__tar.gz

{agent_memory_cli-0.1.2 → agent_memory_cli-0.1.4}/CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to agent-memory are documented in this file. The format
 follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and the
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.1.4 - 2026-10-26
+
+### Fixed
+
+- `pull` and `push` sync one at a time per home and never abort a rebase they did not start ([sync](docs/commands.md#sync)).
+- `pull` with only unpushed commits no longer also reports "already synced" ([sync](docs/commands.md#sync)).
+- `startup --pull` no longer publishes a debrief or event another agent wrote ([startup](docs/commands.md#startup)).
+- `pull` and `push` update past untracked files the incoming commits do not touch, so SessionStart keeps pulling ([sync](docs/commands.md#sync)).
+- `doctor` on Python 3.14 reports a debrief record it cannot inspect as unreadable, not as an irregular file ([doctor](docs/commands.md#doctor)).
+- `enable` starts a new memory repository on `main` even where git's `init.defaultBranch` is `master` ([sync](docs/commands.md#sync)).
+
+## 0.1.3 - 2026-09-29
+
+### Fixed
+
+- `pull`, `push`, and SessionStart sync can resolve homes with local memory changes behind upstream ([sync](docs/commands.md#sync)).
+
 ## 0.1.2 - 2026-09-17
 
 ### Added

{agent_memory_cli-0.1.2 → agent_memory_cli-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: agent-memory-cli
-Version: 0.1.2
+Version: 0.1.4
 Summary: Cross-session memory for coding agents: plain files, git-native, no server
 Project-URL: Homepage, https://github.com/kiloloop/agent-memory
 Project-URL: Source, https://github.com/kiloloop/agent-memory
@@ -105,7 +105,7 @@ Python 3.10+ is required; sync needs git 2.25+, hooks use Bash, and
    agent-memory enable --remote git@github.com:YOUR_ORG/agent-memory-store.git
    agent-memory push --agent codex
    # After another machine pushes, with a clean local tree:
-   agent-memory pull
+   agent-memory pull --agent claude
    ```
 
    Elsewhere, `agent-memory clone <remote-url> --home <local-home>`, then repeat
@@ -141,13 +141,14 @@ points into a home's `projects/` tree. Project selection uses `--project` or a
 matching binding/marker. OACP is not required.
 
 Sync makes the home a git repository with an allowlist and `.oacp-memory-repo`
-marker. `push` commits selected paths; `pull` fast-forwards a clean tree that
-is not ahead or diverged. No merges; keys and setup receipts stay local.
-Network verbs time out after 30 seconds.
+marker. `push` and `pull --agent NAME` commit selected paths, rebase when behind,
+and deliver. A plain `pull` updates a clean tree and reports unpushed commits.
+Conflicts abort the rebase and retain local commits. Keys and setup receipts
+stay local. Network and rebase operations time out after 30 seconds.
 
 `setup` installs a SessionStart hook and memory workflow. `startup` lists
 metadata for the four project files, then the three curated org files; it
-injects no content. `--pull` refreshes first, warning on failure. The workflow
+injects no content. `--pull` commits and syncs first under the runtime identity, warning on failure. The workflow
 tells the agent to run `recall` for an 8,000-character bounded read. Raise
 `--max-chars` or read remaining files directly when cut. `capture` records
 decisions during work. At the end, update threads and debt, optionally publish

{agent_memory_cli-0.1.2 → agent_memory_cli-0.1.4}/README.md

@@ -75,7 +75,7 @@ Python 3.10+ is required; sync needs git 2.25+, hooks use Bash, and
    agent-memory enable --remote git@github.com:YOUR_ORG/agent-memory-store.git
    agent-memory push --agent codex
    # After another machine pushes, with a clean local tree:
-   agent-memory pull
+   agent-memory pull --agent claude
    ```
 
    Elsewhere, `agent-memory clone <remote-url> --home <local-home>`, then repeat
@@ -111,13 +111,14 @@ points into a home's `projects/` tree. Project selection uses `--project` or a
 matching binding/marker. OACP is not required.
 
 Sync makes the home a git repository with an allowlist and `.oacp-memory-repo`
-marker. `push` commits selected paths; `pull` fast-forwards a clean tree that
-is not ahead or diverged. No merges; keys and setup receipts stay local.
-Network verbs time out after 30 seconds.
+marker. `push` and `pull --agent NAME` commit selected paths, rebase when behind,
+and deliver. A plain `pull` updates a clean tree and reports unpushed commits.
+Conflicts abort the rebase and retain local commits. Keys and setup receipts
+stay local. Network and rebase operations time out after 30 seconds.
 
 `setup` installs a SessionStart hook and memory workflow. `startup` lists
 metadata for the four project files, then the three curated org files; it
-injects no content. `--pull` refreshes first, warning on failure. The workflow
+injects no content. `--pull` commits and syncs first under the runtime identity, warning on failure. The workflow
 tells the agent to run `recall` for an 8,000-character bounded read. Raise
 `--max-chars` or read remaining files directly when cut. `capture` records
 decisions during work. At the end, update threads and debt, optionally publish

{agent_memory_cli-0.1.2 → agent_memory_cli-0.1.4}/src/agent_memory/__init__.py

@@ -4,6 +4,6 @@
 
 from .home import HomeError, HomeResolution, resolve_home
 
-__version__ = "0.1.2"
+__version__ = "0.1.4"
 
 __all__ = ["HomeError", "HomeResolution", "__version__", "resolve_home"]

{agent_memory_cli-0.1.2 → agent_memory_cli-0.1.4}/src/agent_memory/cli.py

@@ -92,7 +92,7 @@ def build_parser() -> argparse.ArgumentParser:
     clone_ = add("clone", _clone, "Clone a memory repository into the home.")
     clone_.add_argument("url", help="git remote URL to clone")
     clone_.add_argument("--force", action="store_true", help="move a non-empty home aside before cloning")
-    add("pull", _pull, "Fast-forward the home from its upstream when the tree is clean and not ahead.")
+    add("pull", _pull, "Update from upstream; with --agent, commit allowlisted changes and deliver them too.", agent)
     add("push", _push, "Commit the allowlisted memory changes and push them when a remote exists.", agent)
     add("disable", _disable, "Remove the sync marker; the repository stays in place.")
     for name, handler, help_text, positional, positional_help in (
@@ -121,7 +121,7 @@ def build_parser() -> argparse.ArgumentParser:
         "startup",
         _startup,
         "Print the session-start manifest: the memory files to read, in order, with their readability, size and "
-        "age, and where the sync stands. Content is never included. With --pull, fast-forward the home first.",
+        "age, and where the sync stands. Content is never included. With --pull, commit and sync memory under the runtime identity first.",
     )
     startup_.add_argument("--runtime", choices=startup.RUNTIMES, required=True, help="shape the output for this runtime's hook")
     startup_.add_argument("--project", metavar="ID", help="the project tier to list (default: the one the binding or marker names)")
@@ -297,7 +297,7 @@ def _clone(args: argparse.Namespace) -> int:
 
 
 def _pull(args: argparse.Namespace) -> int:
-    return _report(sync.pull(resolve_home(args.home).path))
+    return _report(sync.pull(resolve_home(args.home).path, agent=args.agent))
 
 
 def _push(args: argparse.Namespace) -> int:

{agent_memory_cli-0.1.2 → agent_memory_cli-0.1.4}/src/agent_memory/doctor.py

@@ -237,7 +237,7 @@ def check_org_memory(home: Path) -> Category:
         for name in sorted(dirnames):
             entry = current / name
             try:
-                is_link = entry.is_symlink()
+                is_link = stat.S_ISLNK(os.lstat(entry).st_mode)
             except OSError as exc:
                 walk_errors.append(f"{_relative(entry)}: {exc.__class__.__name__}")
                 continue
@@ -258,16 +258,18 @@ def check_org_memory(home: Path) -> Category:
             staging.append(rel)
             continue
         # The namespace holds regular files reached without following links;
-        # a classification failure surfaces, never raises.
+        # a classification failure surfaces, never raises. lstat, not the
+        # pathlib predicates: since Python 3.14 those answer False on any
+        # OSError, so a record that could not be inspected would read as irregular.
         try:
-            if file_path.is_symlink():
-                irregular.append(f"{rel} (symlink)")
-                continue
-            regular = file_path.is_file()
+            mode = os.lstat(file_path).st_mode
         except OSError as exc:
             walk_errors.append(f"{rel}: {exc.__class__.__name__}")
             continue
-        if not regular:
+        if stat.S_ISLNK(mode):
+            irregular.append(f"{rel} (symlink)")
+            continue
+        if not stat.S_ISREG(mode):
             irregular.append(f"{rel} (not a regular file)")
             continue
         total += 1

{agent_memory_cli-0.1.2 → agent_memory_cli-0.1.4}/src/agent_memory/startup.py

@@ -14,6 +14,12 @@ files, both from the layout table; ``events/``, ``debriefs/`` and
 ``archive/`` are excluded), and the rendered text is cut at a character
 budget with a notice, so a hook can never flood a session.
 
+With ``--pull`` the session's runtime is the publishing identity, and a
+path another agent wrote is not its to publish: a debrief names its agent in
+its filename and an event in its frontmatter, so either one, when it names
+someone else, is held for that agent's own session. Files that carry no
+author (the curated org files, the project tier) publish as before.
+
 Output shapes: ``--json`` is the manifest itself, ``schema_version`` first;
 the default is what the runtime's hook expects on stdout: plain text for
 claude, whose session start takes stdout as context, and the hook JSON
@@ -28,8 +34,9 @@ import stat
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Sequence, Tuple
 
-from . import layout, sync
+from . import debrief, events, layout, sync
 from .git_runner import GitRunner, run_git
+from .publication import WriterError
 
 SCHEMA_VERSION = 1
 RUNTIME_CLAUDE = "claude"
@@ -46,6 +53,8 @@ RESULT_OK = "ok"
 RESULT_DEGRADED = "degraded"
 PULL_NOT_REQUESTED = "not_requested"
 PULL_ERROR = "error"
+#: The most of an event the author check reads; the frontmatter sits at its head.
+_EVENT_HEAD_BYTES = 64 * 1024
 
 
 def build_manifest(
@@ -72,7 +81,7 @@ def build_manifest(
     warnings: List[str] = list(notes)
     files: List[Dict[str, Any]] = []
 
-    sync_info, pull_info = _sync(home, pull, runner, warnings)
+    sync_info, pull_info = _sync(home, pull, runner, warnings, runtime)
     if project is not None:
         try:
             layout.validate_project_name(project)
@@ -154,14 +163,14 @@ def _entry(home: Path, path: Path, tier: str, name: str) -> Dict[str, Any]:
 
 
 def _sync(
-    home: Path, pull: bool, runner: Optional[GitRunner], warnings: List[str]
+    home: Path, pull: bool, runner: Optional[GitRunner], warnings: List[str], runtime: str
 ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
     marker = sync.is_configured(home)
     info: Dict[str, Any] = {"marker": marker, "last_commit_at_utc": None}
     pull_info: Dict[str, Any] = {"requested": pull, "status": PULL_NOT_REQUESTED, "ok": True, "lines": []}
     if pull:
         try:
-            outcome = sync.pull(home, runner=runner)
+            outcome = sync.pull(home, agent=runtime, runner=runner, hold=lambda path: _held(home, path, runtime))
             pull_info = {"requested": True, "status": outcome.status, "ok": outcome.ok, "lines": list(outcome.lines)}
         except (sync.SyncError, OSError) as exc:
             pull_info = {"requested": True, "status": PULL_ERROR, "ok": False, "lines": [f"memory pull: {exc}"]}
@@ -176,6 +185,40 @@ def _sync(
     return info, pull_info
 
 
+def _held(home: Path, relative: str, runtime: str) -> bool:
+    """Whether ``relative`` names an author other than ``runtime``; no author named means not held."""
+    author = author_of(home, relative)
+    return author is not None and author != runtime
+
+
+def author_of(home: Path, relative: str) -> Optional[str]:
+    """The agent a memory path names as its author, or ``None`` when it names none.
+
+    A debrief, ``org-memory/debriefs/<project>/<YYYY>/<MM>/<YYYYMMDD>-<agent>-<session>.md``,
+    names it in the filename: the session id has no dash, so the last dash
+    splits the agent from it whatever dashes the agent's own name carries. An
+    event, ``org-memory/events/<name>.md``, names it in the frontmatter
+    ``agent:`` field. Anything else, and anything that does not parse, names
+    no one.
+    """
+    parts = relative.split("/")
+    if parts[:2] == [layout.ORG.pattern, "debriefs"] and len(parts) == 6 and parts[5].endswith(".md"):
+        date, _, rest = parts[5][: -len(".md")].partition("-")
+        agent, _, session = rest.rpartition("-")
+        if len(date) == 8 and date.isdigit() and debrief.SESSION_RE.match(session) and debrief.AGENT_RE.match(agent):
+            return agent
+        return None
+    if parts[:2] == [layout.ORG.pattern, events.EVENTS_DIR] and len(parts) == 3 and parts[2].endswith(".md"):
+        try:
+            with open(home / relative, "rb") as handle:
+                frontmatter, _ = debrief.split_record(handle.read(_EVENT_HEAD_BYTES))
+        except (OSError, ValueError, WriterError):
+            return None
+        agent = frontmatter.get("agent", "")
+        return agent if debrief.AGENT_RE.match(agent) else None
+    return None
+
+
 # --- rendering --------------------------------------------------------------