Skip to content

feat(edda-ledger): add error context enrichment across ledger, serve, and CLI #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fagemx merged 1 commit into from
Mar 27, 2026
+193 −92
Merged

feat(edda-ledger): add error context enrichment across ledger, serve, and CLI #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions crates/edda-cli/src/cmd_bridge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use anyhow::Context;
use clap::Subcommand;
use std::io::Read;
use std::path::Path;
Expand Down Expand Up @@ -537,7 +538,7 @@ pub fn decide(
edda_bridge_claude::peers::write_binding(&project_id, &session_id, &label, key, value);

// 2. Write to workspace ledger (permanent)
let ledger = edda_ledger::Ledger::open(repo_root)?;
let ledger = edda_ledger::Ledger::open(repo_root).context("cmd_bridge: opening ledger")?;
let _lock = edda_ledger::lock::WorkspaceLock::acquire(&ledger.paths)?;
let branch = ledger.head_branch()?;
let parent_hash = ledger.last_event_hash()?;
Expand Down Expand Up @@ -1013,7 +1014,8 @@ fn write_accepted_to_ledger(
repo_root: &Path,
decisions: &[edda_bridge_claude::bg_extract::ExtractedDecision],
) -> anyhow::Result<()> {
let ledger = edda_ledger::Ledger::open(repo_root)?;
let ledger = edda_ledger::Ledger::open(repo_root)
.context("cmd_bridge::write_accepted_to_ledger: opening ledger")?;
let _lock = edda_ledger::lock::WorkspaceLock::acquire(&ledger.paths)?;
let branch = ledger.head_branch()?;

Expand Down
16 changes: 8 additions & 8 deletions crates/edda-cli/src/cmd_draft.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ pub struct ProposeParams<'a> {
}

pub fn propose(p: ProposeParams<'_>) -> anyhow::Result<()> {
let ledger = Ledger::open(p.repo_root)?;
let ledger = Ledger::open(p.repo_root).context("cmd_draft::propose: opening ledger")?;
let _lock = WorkspaceLock::acquire(&ledger.paths)?;

let branch = ledger.head_branch()?;
Expand Down Expand Up @@ -756,7 +756,7 @@ pub fn propose(p: ProposeParams<'_>) -> anyhow::Result<()> {
}

pub fn show(repo_root: &Path, id: &str) -> anyhow::Result<()> {
let ledger = Ledger::open(repo_root)?;
let ledger = Ledger::open(repo_root).context("cmd_draft::show: opening ledger")?;
let _lock = WorkspaceLock::acquire(&ledger.paths)?;

let draft = read_draft(&ledger, id)?;
Expand All @@ -765,7 +765,7 @@ pub fn show(repo_root: &Path, id: &str) -> anyhow::Result<()> {
}

pub fn list(repo_root: &Path, json: bool) -> anyhow::Result<()> {
let ledger = Ledger::open(repo_root)?;
let ledger = Ledger::open(repo_root).context("cmd_draft::list: opening ledger")?;
let _lock = WorkspaceLock::acquire(&ledger.paths)?;

let dir = &ledger.paths.drafts_dir;
Expand Down Expand Up @@ -857,7 +857,7 @@ pub fn inbox(
role: Option<&str>,
json: bool,
) -> anyhow::Result<()> {
let ledger = Ledger::open(repo_root)?;
let ledger = Ledger::open(repo_root).context("cmd_draft::inbox: opening ledger")?;
let _lock = WorkspaceLock::acquire(&ledger.paths)?;

let dir = &ledger.paths.drafts_dir;
Expand Down Expand Up @@ -952,7 +952,7 @@ pub fn approve(
note: &str,
stage_id: Option<&str>,
) -> anyhow::Result<()> {
let ledger = Ledger::open(repo_root)?;
let ledger = Ledger::open(repo_root).context("cmd_draft::approve: opening ledger")?;
let _lock = WorkspaceLock::acquire(&ledger.paths)?;

let mut draft = read_draft(&ledger, id)?;
Expand Down Expand Up @@ -1121,7 +1121,7 @@ pub fn reject(
note: &str,
stage_id: Option<&str>,
) -> anyhow::Result<()> {
let ledger = Ledger::open(repo_root)?;
let ledger = Ledger::open(repo_root).context("cmd_draft::reject: opening ledger")?;
let _lock = WorkspaceLock::acquire(&ledger.paths)?;

let mut draft = read_draft(&ledger, id)?;
Expand Down Expand Up @@ -1250,7 +1250,7 @@ pub fn reject(
}

pub fn apply(repo_root: &Path, id: &str, dry_run: bool, delete_after: bool) -> anyhow::Result<()> {
let ledger = Ledger::open(repo_root)?;
let ledger = Ledger::open(repo_root).context("cmd_draft::apply: opening ledger")?;
let _lock = WorkspaceLock::acquire(&ledger.paths)?;

let mut draft = read_draft(&ledger, id)?;
Expand Down Expand Up @@ -1375,7 +1375,7 @@ pub fn apply(repo_root: &Path, id: &str, dry_run: bool, delete_after: bool) -> a
}

pub fn delete(repo_root: &Path, id: &str) -> anyhow::Result<()> {
let ledger = Ledger::open(repo_root)?;
let ledger = Ledger::open(repo_root).context("cmd_draft::delete: opening ledger")?;
let _lock = WorkspaceLock::acquire(&ledger.paths)?;

let path = draft_path(&ledger, id);
Expand Down
11 changes: 7 additions & 4 deletions crates/edda-cli/src/cmd_pair.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use anyhow::Context;
use clap::Subcommand;
use edda_ledger::device_token::{generate_device_token, hash_token};
use std::path::Path;
Expand Down Expand Up @@ -35,7 +36,7 @@ fn execute_new(repo_root: &Path, name: &str) -> anyhow::Result<()> {
anyhow::bail!("device name cannot be empty");
}

let ledger = edda_ledger::Ledger::open(repo_root)?;
let ledger = edda_ledger::Ledger::open(repo_root).context("cmd_pair::new: opening ledger")?;

// Check for duplicate name
let existing = ledger.list_device_tokens()?;
Expand Down Expand Up @@ -108,7 +109,7 @@ fn execute_new(repo_root: &Path, name: &str) -> anyhow::Result<()> {
}

fn execute_list(repo_root: &Path) -> anyhow::Result<()> {
let ledger = edda_ledger::Ledger::open(repo_root)?;
let ledger = edda_ledger::Ledger::open(repo_root).context("cmd_pair::list: opening ledger")?;
let tokens = ledger.list_device_tokens()?;

if tokens.is_empty() {
Expand Down Expand Up @@ -142,7 +143,8 @@ fn execute_list(repo_root: &Path) -> anyhow::Result<()> {
}

fn execute_revoke(repo_root: &Path, name: &str) -> anyhow::Result<()> {
let ledger = edda_ledger::Ledger::open(repo_root)?;
let ledger =
edda_ledger::Ledger::open(repo_root).context("cmd_pair::revoke: opening ledger")?;

// Check the token exists before writing the ledger event
let existing = ledger.list_device_tokens()?;
Expand Down Expand Up @@ -187,7 +189,8 @@ fn execute_revoke(repo_root: &Path, name: &str) -> anyhow::Result<()> {
}

fn execute_revoke_all(repo_root: &Path) -> anyhow::Result<()> {
let ledger = edda_ledger::Ledger::open(repo_root)?;
let ledger =
edda_ledger::Ledger::open(repo_root).context("cmd_pair::revoke_all: opening ledger")?;

let event_id = format!("evt_{}", ulid::Ulid::new());
let branch = ledger.head_branch()?;
Expand Down
Loading
Loading