Skip to content

Commit ae0be38

Browse files
author
Yogthos
committed
style: cargo fmt
1 parent 0674fb4 commit ae0be38

7 files changed

Lines changed: 31 additions & 20 deletions

File tree

PLAN_LEARNING.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Hermes has four layers that work together. We port all of them, adapted:
5858

5959
---
6060

61-
## Phase 0 — Per-Project `.dirge/` Storage Infrastructure
61+
## Phase 0 — Per-Project `.dirge/` Storage Infrastructure and Review
6262

6363
**Goal**: establish the `.dirge/` directory as the per-project equivalent
6464
of `~/.hermes/`. Every other phase writes into this tree.
@@ -82,6 +82,12 @@ or explicit override via `DIRGE_PROJECT_ROOT` env var).
8282

8383
**Risk**: zero. Pure path resolution.
8484

85+
We need to review current features like memories to identified ones that would be
86+
logically replaced by this system and flag anything that would be duplicate for
87+
removal after. If the features serve a different purpose then keep them. If they
88+
conflict or duplicate functionality we are introducing then remove or merge functionality
89+
as is sensible.
90+
8591
---
8692

8793
## Phase 1 — SQLite Session Database with FTS5

src/agent/agent_loop/integration.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ mod tests {
611611
Box::pin(futures::stream::iter(vec![StreamEvent::Done {
612612
reason,
613613
message: msg,
614-
usage: None,
614+
usage: None,
615615
}]))
616616
})
617617
}
@@ -770,7 +770,7 @@ mod tests {
770770
Box::pin(futures::stream::iter(vec![StreamEvent::Done {
771771
reason,
772772
message: msg,
773-
usage: None,
773+
usage: None,
774774
}]))
775775
});
776776

@@ -911,7 +911,7 @@ mod tests {
911911
Box::pin(futures::stream::iter(vec![StreamEvent::Done {
912912
reason: StopReason::Stop,
913913
message: msg,
914-
usage: None,
914+
usage: None,
915915
}]))
916916
});
917917

src/agent/agent_loop/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ pub use integration::{
6363
};
6464
pub use message::{
6565
AssistantMessage, ContentBlock, DeltaPhase, LoopEvent, LoopMessage, StopReason, StreamEvent,
66-
TokenUsage,
67-
ToolResultMessage, UserMessage,
66+
TokenUsage, ToolResultMessage, UserMessage,
6867
};
6968
#[cfg(feature = "plugin")]
7069
pub use plugin_hooks::{after_hook_from_plugin_manager, before_hook_from_plugin_manager};

src/agent/agent_loop/run.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ mod tests {
716716
Box::pin(futures::stream::iter(vec![StreamEvent::Done {
717717
reason,
718718
message: msg,
719-
usage: None,
719+
usage: None,
720720
}]))
721721
})
722722
}
@@ -959,7 +959,7 @@ mod tests {
959959
Box::pin(futures::stream::iter(vec![StreamEvent::Done {
960960
reason,
961961
message: msg,
962-
usage: None,
962+
usage: None,
963963
}]))
964964
});
965965

@@ -1069,7 +1069,7 @@ mod tests {
10691069
Box::pin(futures::stream::iter(vec![StreamEvent::Done {
10701070
reason: StopReason::ToolUse,
10711071
message: msg,
1072-
usage: None,
1072+
usage: None,
10731073
}]))
10741074
});
10751075

@@ -1107,7 +1107,7 @@ mod tests {
11071107
Box::pin(futures::stream::iter(vec![StreamEvent::Done {
11081108
reason: StopReason::ToolUse,
11091109
message: msg,
1110-
usage: None,
1110+
usage: None,
11111111
}]))
11121112
});
11131113

@@ -1160,7 +1160,7 @@ mod tests {
11601160
Box::pin(futures::stream::iter(vec![StreamEvent::Done {
11611161
reason,
11621162
message: msg,
1163-
usage: None,
1163+
usage: None,
11641164
}]))
11651165
});
11661166

@@ -1239,7 +1239,7 @@ mod tests {
12391239
Box::pin(futures::stream::iter(vec![StreamEvent::Done {
12401240
reason,
12411241
message: msg,
1242-
usage: None,
1242+
usage: None,
12431243
}]))
12441244
});
12451245

@@ -1485,7 +1485,7 @@ mod tests {
14851485
crate::agent::agent_loop::message::StreamEvent::Done {
14861486
reason,
14871487
message: msg,
1488-
usage: None,
1488+
usage: None,
14891489
},
14901490
]))
14911491
});
@@ -1583,7 +1583,7 @@ mod tests {
15831583
crate::agent::agent_loop::message::StreamEvent::Done {
15841584
reason,
15851585
message: msg,
1586-
usage: None,
1586+
usage: None,
15871587
},
15881588
]))
15891589
});

src/agent/agent_loop/schema_flatten.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ pub fn nest_arguments(flat_args: &Value) -> Value {
6666
let mut out = serde_json::Map::new();
6767
for (key, value) in map {
6868
let path: Vec<String> = split_flat_key(key);
69-
set_by_path(&mut out, path.iter().map(|s| s.as_str()).collect(), value.clone());
69+
set_by_path(
70+
&mut out,
71+
path.iter().map(|s| s.as_str()).collect(),
72+
value.clone(),
73+
);
7074
}
7175
Value::Object(out)
7276
}
@@ -170,9 +174,7 @@ fn set_by_path(target: &mut serde_json::Map<String, Value>, path: Vec<&str>, val
170174
if i == last {
171175
cur.insert(key.to_string(), value.clone());
172176
} else {
173-
let needs_object = cur
174-
.get(&key.to_string())
175-
.map_or(true, |v| !v.is_object());
177+
let needs_object = cur.get(&key.to_string()).map_or(true, |v| !v.is_object());
176178
if needs_object {
177179
// Conflicting or missing intermediate — overwrite with object.
178180
if cur.get(&key.to_string()).is_some() {

src/agent/agent_loop/steering.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ mod tests {
406406
Box::pin(futures::stream::iter(vec![StreamEvent::Done {
407407
reason,
408408
message: msg,
409-
usage: None,
409+
usage: None,
410410
}]))
411411
});
412412

src/agent/agent_loop/stream.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,11 @@ pub async fn stream_assistant_response(
208208
})
209209
.await;
210210
}
211-
StreamEvent::Done { reason, message, usage } => {
211+
StreamEvent::Done {
212+
reason,
213+
message,
214+
usage,
215+
} => {
212216
let mut finalised = message;
213217
finalised.stop_reason = reason;
214218
finalize(context, &finalised, added_partial, emit).await;

0 commit comments

Comments
 (0)