feat: orphan-branch storage, multi-agent log display, disable auto-amend (v0.1.17)

- finalize-ledger.py: write ledger to agentdiff-meta orphan branch via git
  plumbing (hash-object → mktree → commit-tree → update-ref); fall back to
  working-tree append if plumbing unavailable
- store.rs: read from agentdiff-meta:ledger.jsonl first, fall back to
  .agentdiff/ledger.jsonl for existing repos
- log.rs: group entries by commit, show all distinct agents per commit with
  their respective files (fixes multi-agent attribution display)
- config.rs: default auto_amend_ledger to false — stops amend noise on every
  commit

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: codeprakhar25

.agentdiff/ledger.jsonl

@@ -20,3 +20,4 @@
 {"agent":"human","author":"Prakhar Khatri","files_read":[],"files_touched":[".github/ISSUE_TEMPLATE/agent_support.yml",".github/ISSUE_TEMPLATE/bug_report.yml",".github/ISSUE_TEMPLATE/config.yml",".github/ISSUE_TEMPLATE/feature_request.yml",".github/PULL_REQUEST_TEMPLATE.md"],"flags":[],"lines":{".github/ISSUE_TEMPLATE/agent_support.yml":[[1,35]],".github/ISSUE_TEMPLATE/bug_report.yml":[[1,91]],".github/ISSUE_TEMPLATE/config.yml":[[1,5]],".github/ISSUE_TEMPLATE/feature_request.yml":[[1,25]],".github/PULL_REQUEST_TEMPLATE.md":[[1,25]]},"model":"human","prompt_excerpt":"","prompt_hash":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","session_id":"unknown","sha":"532365281bc340476452822acc4e25806b50eef8","sig":{"alg":"ed25519","key_id":"e73a216a1030275f","value":"g8/MHljohjPcSTesqWurcmhaMk9qyCT3fiLIBPmJ0KU3bAUhJvt3k0O26IggGxLRPLZ5mIank0xplDckd7SgBQ=="},"tool":"commit","ts":"2026-03-31T10:38:32+00:00"}
 {"sha":"9d10d5d3a9dbc2e0d30bc48e51ea8737c4967f35","ts":"2026-04-02T13:37:06+00:00","agent":"claude-code","model":"unknown","session_id":"6219267e-7119-45f9-92be-aa9967be8b22","author":"Prakhar Khatri","files_touched":[".github/workflows/agentdiff-policy.yml",".github/workflows/ci.yml","Cargo.lock","Cargo.toml","TODOS.md","scripts/prepare-ledger.py","scripts/vscode-extension/extension.js","src/cli.rs","src/commands/export.rs","src/commands/keys.rs","src/commands/ledger.rs","src/commands/mod.rs","src/commands/policy.rs","src/commands/sign_entry.rs","src/commands/status.rs","src/commands/verify.rs","src/data.rs","src/init.rs","src/keys.rs","src/main.rs","src/store.rs"],"lines":{".github/workflows/agentdiff-policy.yml":[[1,39]],".github/workflows/ci.yml":[[34,41]],"Cargo.lock":[[11,11],[16,16],[18,19],[21,21],[125,136],[255,260],[286,322],[360,384],[413,418],[574,584],[663,672],[748,756],[797,805],[825,830],[906,924],[931,936],[1480,1485]],"Cargo.toml":[[41,45]],"TODOS.md":[[1,52]],"scripts/prepare-ledger.py":[[139,145],[157,161],[186,198],[227,236],[270,277],[296,297]],"scripts/vscode-extension/extension.js":[[13,20],[120,123]],"src/cli.rs":[[56,74],[263,335]],"src/commands/export.rs":[[1,127]],"src/commands/keys.rs":[[1,16]],"src/commands/ledger.rs":[[152,152]],"src/commands/mod.rs":[[4,5],[9,9],[12,12],[14,14],[16,16]],"src/commands/policy.rs":[[1,323]],"src/commands/sign_entry.rs":[[1,58]],"src/commands/status.rs":[[1,138]],"src/commands/verify.rs":[[1,185]],"src/data.rs":[[111,121],[169,171]],"src/init.rs":[[281,283],[297,301]],"src/keys.rs":[[1,273]],"src/main.rs":[[6,6],[16,20],[28,28],[80,87]],"src/store.rs":[[120,168]]},"prompt_excerpt":"unknown","prompt_hash":"b23a6a8439c0dde5515893e7c90c1e3233b8616e634470f20dc4928bcf3609bc","files_read":[],"flags":[],"tool":"Edit","attribution":{"src/store.rs":{"agent":"copilot","model":"gpt-4o","session_id":"vscode-1775120273252","tool":"copilot-inline"}}}
 {"sha":"70c41424bb99a9fafb75584ce2416b83adf5cad8","ts":"2026-04-06T07:25:23+00:00","agent":"codex","model":"gpt-5.4","session_id":"019d550b-2f4d-7b01-b734-e177dfff304a","author":"Prakhar Khatri","files_touched":["Cargo.lock","Cargo.toml","scripts/capture-antigravity.py","scripts/capture-codex.py","scripts/capture-windsurf.py","scripts/prepare-ledger.py","scripts/vscode-extension/extension.js"],"lines":{"Cargo.lock":[[7,7],[11,11],[16,16],[18,19],[21,21],[125,136],[255,260],[286,322],[360,384],[413,418],[574,584],[663,672],[748,756],[797,805],[825,830],[906,924],[931,936],[1480,1485]],"Cargo.toml":[[3,3],[41,45]],"scripts/capture-antigravity.py":[[275,287]],"scripts/capture-codex.py":[[455,465],[475,476]],"scripts/capture-windsurf.py":[[145,155]],"scripts/prepare-ledger.py":[[139,145],[157,161],[186,198],[227,236],[270,277],[296,297]],"scripts/vscode-extension/extension.js":[[13,20],[120,123]]},"prompt_excerpt":"`use-cases` is the better channel if the post is about what people can do with it and why it matters. `api-projects` fits better if you want to emphasize imp...","prompt_hash":"c641b0b63aa4d7db929b051d190967982fb92c1b236ce9bac81a834c3cfdde79","files_read":[],"flags":[],"tool":"task_complete","mode":"agent","attribution":{"Cargo.toml":{"agent":"claude-code","model":"unknown","session_id":"6219267e-7119-45f9-92be-aa9967be8b22","tool":"Edit"}}}
+{"sha":"d755fd138a71bbe2f6794439816663b29df28eb3","ts":"2026-04-07T06:44:40+00:00","agent":"claude-code","model":"unknown","session_id":"6219267e-7119-45f9-92be-aa9967be8b22","author":"Prakhar Khatri","files_touched":["Cargo.lock","Cargo.toml","scripts/finalize-ledger.py","src/commands/log.rs","src/config.rs","src/store.rs"],"lines":{"Cargo.lock":[[7,7]],"Cargo.toml":[[3,3]],"scripts/finalize-ledger.py":[[3,7],[16,17],[42,142],[147,147],[179,186],[199,199],[223,233],[238,238]],"src/commands/log.rs":[[3,3],[6,6],[18,33],[37,37],[42,49],[51,51],[53,54],[61,63],[67,99],[101,101],[108,108]],"src/config.rs":[[42,42],[53,53]],"src/store.rs":[[21,43],[45,49],[103,106],[119,119],[140,186]]},"prompt_excerpt":"unknown","prompt_hash":"b23a6a8439c0dde5515893e7c90c1e3233b8616e634470f20dc4928bcf3609bc","files_read":[],"flags":[],"tool":"Edit"}

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "agentdiff"
-version = "0.1.16"
+version = "0.1.17"
 edition = "2024"
 rust-version = "1.85"
 description = "Audit and trace autonomous AI code contributions in git repositories"

Cargo.toml

@@ -1,6 +1,10 @@
 #!/usr/bin/env python3
 """
-Finalize pending ledger snapshot after commit and append to ledger.jsonl.
+Finalize pending ledger snapshot after commit.
+
+Writes to the agentdiff-meta branch (enterprise storage, no working-tree
+pollution) via git plumbing. Falls back to appending to ledger.jsonl on disk
+if the git plumbing fails (e.g. first-time setup, no git binary on PATH).
 
 Usage:
   finalize-ledger.py <repo_root> <pending_ledger> <pending_context> <ledger_path>
@@ -9,7 +13,8 @@
 import os
 import subprocess
 import sys
-from typing import List
+import tempfile
+from typing import List, Optional
 
 
 def run(cmd: List[str], cwd: str) -> subprocess.CompletedProcess:
@@ -34,24 +39,114 @@ def remove_if_exists(path: str) -> None:
         pass
 
 
-def sha_exists(ledger_path: str, sha: str) -> bool:
+def sha_in_content(content: str, sha: str) -> bool:
+    """Check if a SHA already exists in JSONL content."""
+    for raw in content.splitlines():
+        line = raw.strip()
+        if not line:
+            continue
+        try:
+            obj = json.loads(line)
+        except Exception:
+            continue
+        if isinstance(obj, dict) and obj.get("sha") == sha:
+            return True
+    return False
+
+
+def get_meta_branch_content(repo_root: str) -> Optional[str]:
+    """Read current ledger.jsonl from agentdiff-meta branch. Returns None if not found."""
+    res = run(["git", "show", "agentdiff-meta:ledger.jsonl"], cwd=repo_root)
+    if res.returncode == 0:
+        return res.stdout
+    return None
+
+
+def write_to_meta_branch(repo_root: str, new_content: str) -> bool:
+    """
+    Write new_content as ledger.jsonl on the agentdiff-meta branch using
+    git plumbing — no checkout, no working-tree changes.
+    Returns True on success.
+    """
+    tmp_path = None
+    try:
+        # Write content to a temp file so git can hash it.
+        with tempfile.NamedTemporaryFile(
+            mode="w", suffix=".jsonl", delete=False, encoding="utf-8"
+        ) as f:
+            f.write(new_content)
+            tmp_path = f.name
+
+        # Hash the file to get a blob SHA.
+        blob_res = run(["git", "hash-object", "-w", tmp_path], cwd=repo_root)
+        if blob_res.returncode != 0:
+            return False
+        blob_sha = blob_res.stdout.strip()
+
+        # Create a tree containing just ledger.jsonl.
+        tree_input = f"100644 blob {blob_sha}\tledger.jsonl\n"
+        tree_res = subprocess.run(
+            ["git", "mktree"],
+            input=tree_input,
+            text=True,
+            capture_output=True,
+            cwd=repo_root,
+        )
+        if tree_res.returncode != 0:
+            return False
+        tree_sha = tree_res.stdout.strip()
+
+        # Find parent commit if the branch already exists.
+        parent_res = run(
+            ["git", "rev-parse", "refs/heads/agentdiff-meta"], cwd=repo_root
+        )
+        parent_args: List[str] = []
+        if parent_res.returncode == 0:
+            parent_sha = parent_res.stdout.strip()
+            if parent_sha:
+                parent_args = ["-p", parent_sha]
+
+        # Get short SHA of the current HEAD for the commit message.
+        short_res = run(["git", "rev-parse", "--short", "HEAD"], cwd=repo_root)
+        short_sha = short_res.stdout.strip() if short_res.returncode == 0 else "?"
+
+        # Create the commit object.
+        commit_res = subprocess.run(
+            ["git", "commit-tree", tree_sha, "-m", f"agentdiff: {short_sha}"]
+            + parent_args,
+            text=True,
+            capture_output=True,
+            cwd=repo_root,
+        )
+        if commit_res.returncode != 0:
+            return False
+        commit_sha = commit_res.stdout.strip()
+
+        # Update the branch ref.
+        ref_res = run(
+            ["git", "update-ref", "refs/heads/agentdiff-meta", commit_sha],
+            cwd=repo_root,
+        )
+        return ref_res.returncode == 0
+
+    except Exception:
+        return False
+    finally:
+        if tmp_path and os.path.exists(tmp_path):
+            try:
+                os.unlink(tmp_path)
+            except Exception:
+                pass
+
+
+def sha_exists_on_disk(ledger_path: str, sha: str) -> bool:
     if not os.path.exists(ledger_path):
         return False
     try:
         with open(ledger_path, "r", encoding="utf-8") as f:
-            for raw in f:
-                line = raw.strip()
-                if not line:
-                    continue
-                try:
-                    obj = json.loads(line)
-                except Exception:
-                    continue
-                if isinstance(obj, dict) and obj.get("sha") == sha:
-                    return True
+            return sha_in_content(f.read(), sha)
     except Exception:
         return False
-    return False
 
 
 def main() -> int:
@@ -81,7 +176,14 @@ def main() -> int:
     if not sha:
         return 1
 
-    if sha_exists(ledger_path, sha):
+    # Check if SHA already recorded — try meta branch first, then disk file.
+    meta_content = get_meta_branch_content(repo_root)
+    if meta_content is not None:
+        if sha_in_content(meta_content, sha):
+            remove_if_exists(pending_ledger_path)
+            remove_if_exists(pending_context_path)
+            return 0
+    elif sha_exists_on_disk(ledger_path, sha):
         remove_if_exists(pending_ledger_path)
         remove_if_exists(pending_context_path)
         return 0
@@ -94,7 +196,7 @@ def main() -> int:
     author_res = run(["git", "show", "-s", "--format=%an", "HEAD"], cwd=repo_root)
     author = author_res.stdout.strip() if author_res.returncode == 0 else ""
 
-    entry = {
+    entry: dict = {
         "sha": sha,
         "ts": ts,
         "agent": str(pending.get("agent") or "human"),
@@ -118,14 +220,22 @@ def main() -> int:
     if isinstance(pending.get("attribution"), dict):
         entry["attribution"] = pending["attribution"]
 
+    entry = {k: v for (k, v) in entry.items() if v is not None}
+    entry_line = json.dumps(entry, separators=(",", ":")) + "\n"
+
+    # Try writing to agentdiff-meta branch (enterprise storage).
+    existing = meta_content if meta_content is not None else ""
+    if write_to_meta_branch(repo_root, existing + entry_line):
+        remove_if_exists(pending_ledger_path)
+        remove_if_exists(pending_context_path)
+        return 0
+
+    # Fallback: append to working-tree ledger.jsonl.
     parent = os.path.dirname(ledger_path)
     if parent:
         os.makedirs(parent, exist_ok=True)
-
-    entry = {k: v for (k, v) in entry.items() if v is not None}
-
     with open(ledger_path, "a", encoding="utf-8") as f:
-        f.write(json.dumps(entry, separators=(",", ":")) + "\n")
+        f.write(entry_line)
 
     remove_if_exists(pending_ledger_path)
     remove_if_exists(pending_context_path)

scripts/finalize-ledger.py

@@ -1,8 +1,9 @@
 use crate::cli::LogArgs;
 use crate::store::Store;
-use crate::util::{fmt_lines, fmt_prompt, fmt_time};
+use crate::util::{fmt_prompt, fmt_time};
 use anyhow::Result;
 use colored::Colorize;
+use std::collections::HashMap;
 
 pub fn run(store: &Store, args: &LogArgs) -> Result<()> {
     let mut entries = store.load_entries()?;
@@ -14,53 +15,98 @@ pub fn run(store: &Store, args: &LogArgs) -> Result<()> {
     entries.sort_by_key(|e| e.timestamp);
     entries.reverse(); // newest first
 
-    let display_entries = entries.iter().take(args.limit);
+    // Group by commit hash, preserving newest-first order.
+    let mut seen_commits: Vec<String> = Vec::new();
+    let mut by_commit: HashMap<String, Vec<usize>> = HashMap::new();
+    for (i, e) in entries.iter().enumerate() {
+        let key = if e.commit_hash.is_empty() {
+            "uncommitted".to_string()
+        } else {
+            e.commit_hash.clone()
+        };
+        if !by_commit.contains_key(&key) {
+            seen_commits.push(key.clone());
+        }
+        by_commit.entry(key).or_default().push(i);
+    }
+
+    let display_commits = seen_commits.iter().take(args.limit);
 
     println!();
     println!(
-        "  {} — last {} entries\n",
+        "  {} — last {} commits\n",
         "agentdiff log".cyan().bold(),
         args.limit
     );
 
-    for e in display_entries {
-        let agent_color = crate::util::agent_color_str(&e.agent);
-        let commit = if e.commit_hash.len() > 8 {
-            &e.commit_hash[..8]
+    for commit_key in display_commits {
+        let idxs = &by_commit[commit_key];
+        let first = &entries[idxs[0]];
+
+        let commit_short = if commit_key == "uncommitted" {
+            "untracked".to_string()
+        } else if commit_key.len() > 8 {
+            commit_key[..8].to_string()
         } else {
-            &e.commit_hash
+            commit_key.clone()
         };
-        let uncommitted = if !e.committed {
+
+        let uncommitted = if !first.committed {
             " (uncommitted)".yellow()
         } else {
             "".normal()
         };
 
         println!(
-            "  {} {} {:<12} {} → {}{}",
-            commit.dimmed(),
-            fmt_time(&e.timestamp.to_rfc3339()),
-            agent_color,
-            e.tool.dimmed(),
-            e.file,
+            "  {} {}{}",
+            commit_short.dimmed(),
+            fmt_time(&first.timestamp.to_rfc3339()),
             uncommitted
         );
 
+        // Group files by agent within this commit.
+        let mut agent_files: HashMap<&str, Vec<&str>> = HashMap::new();
+        for &i in idxs {
+            let e = &entries[i];
+            agent_files.entry(e.agent.as_str()).or_default().push(e.file.as_str());
+        }
+
+        if agent_files.len() > 1 {
+            // Multi-agent commit — show each agent with their files.
+            let mut agents: Vec<&str> = agent_files.keys().copied().collect();
+            agents.sort();
+            for agent in agents {
+                let files = &agent_files[agent];
+                let agent_col = crate::util::agent_color_str(agent);
+                let file_list = if files.len() <= 3 {
+                    files.join(", ")
+                } else {
+                    format!("{} +{} more", files[..3].join(", "), files.len() - 3)
+                };
+                println!("    {} {}", agent_col, file_list.dimmed());
+            }
+        } else {
+            // Single agent — compact file list.
+            let (agent, files) = agent_files.iter().next().unwrap();
+            let agent_col = crate::util::agent_color_str(agent);
+            let file_list = if files.len() <= 4 {
+                files.join(", ")
+            } else {
+                format!("{} +{} more", files[..4].join(", "), files.len() - 4)
+            };
+            println!("    {} {}", agent_col, file_list.dimmed());
+        }
+
         if args.full_prompt {
-            if let Some(ref prompt) = e.prompt {
+            if let Some(ref prompt) = first.prompt {
                 if !prompt.is_empty() && prompt != "unknown" {
                     println!("    Prompt: {}", fmt_prompt(prompt, 80));
                 }
             }
         }
 
-        println!(
-            "    Lines: {} | Model: {}",
-            fmt_lines(&e.lines),
-            e.model.dimmed()
-        );
+        println!();
     }
 
-    println!();
     Ok(())
 }

src/commands/log.rs

@@ -39,7 +39,7 @@ fn default_schema() -> String {
 }
 
 fn default_auto_amend_ledger() -> bool {
-    true
+    false
 }
 
 impl Default for Config {
@@ -50,7 +50,7 @@ impl Default for Config {
             scripts_dir: None,
             repos: Vec::new(),
             agent_aliases: std::collections::HashMap::new(),
-            auto_amend_ledger: true,
+            auto_amend_ledger: false,
         }
     }
 }