Skip to content

Commit d22e19d

Browse files
style: denser readable formatting (rustfmt 140, compact CSS rules)
Reduce line count without one-file minification: wider rustfmt for daemon-rs and compact leaf CSS declaration blocks while preserving selectors and behavior. Tests remain green. Co-authored-by: AdityaG <AdityaVG13@users.noreply.github.com>
1 parent d5d77be commit d22e19d

170 files changed

Lines changed: 5095 additions & 15309 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

daemon-rs/rustfmt.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
edition = "2021"
2+
max_width = 140
3+
use_small_heuristics = "Max"
4+
fn_params_layout = "Compressed"
5+
struct_lit_width = 80
6+
struct_variant_width = 80
7+
array_width = 100
8+
chain_width = 100

daemon-rs/src/admin/mod.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,8 @@ pub struct RollbackStats {
1111
pub applied: bool,
1212
pub already_rolled_back: bool,
1313
}
14-
pub fn rollback_session_by_id(
15-
conn: &Connection,
16-
session_id: &str,
17-
apply: bool,
18-
) -> rusqlite::Result<RollbackStats> {
19-
let mut stats = RollbackStats {
20-
session_id: session_id.to_string(),
21-
..Default::default()
22-
};
14+
pub fn rollback_session_by_id(conn: &Connection, session_id: &str, apply: bool) -> rusqlite::Result<RollbackStats> {
15+
let mut stats = RollbackStats { session_id: session_id.to_string(), ..Default::default() };
2316
let session_row: Option<(String, String)> = conn
2417
.query_row(
2518
"SELECT agent, started_at FROM sessions
@@ -70,9 +63,7 @@ pub fn rollback_session_by_id(
7063
)?;
7164
stats.memories_affected = active_memories;
7265
stats.decisions_affected = active_decisions;
73-
stats.already_rolled_back = active_memories == 0
74-
&& active_decisions == 0
75-
&& (prior_rolled_memories > 0 || prior_rolled_decisions > 0);
66+
stats.already_rolled_back = active_memories == 0 && active_decisions == 0 && (prior_rolled_memories > 0 || prior_rolled_decisions > 0);
7667
if !apply {
7768
return Ok(stats);
7869
}

daemon-rs/src/admin/tests/mod.rs

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -82,64 +82,29 @@ fn dry_run_counts_without_writing() {
8282
assert_eq!(stats.memories_affected, 2);
8383
assert_eq!(stats.decisions_affected, 1);
8484
assert!(!stats.applied);
85-
let active: i64 = conn
86-
.query_row(
87-
"SELECT COUNT(*) FROM memories WHERE status = 'active'",
88-
[],
89-
|r| r.get(0),
90-
)
91-
.unwrap();
85+
let active: i64 = conn.query_row("SELECT COUNT(*) FROM memories WHERE status = 'active'", [], |r| r.get(0)).unwrap();
9286
assert_eq!(active, 2);
9387
}
9488
#[test]
9589
fn apply_flips_statuses_and_excludes_older_rows() {
9690
let conn = setup();
9791
seed_session(&conn, "claude", "sess-1", "2026-04-24T00:00:00Z");
9892
seed_memory(&conn, "claude", "old", "2026-04-23T23:59:00Z", "active");
99-
seed_memory(
100-
&conn,
101-
"codex",
102-
"other-agent",
103-
"2026-04-24T00:05:00Z",
104-
"active",
105-
);
93+
seed_memory(&conn, "codex", "other-agent", "2026-04-24T00:05:00Z", "active");
10694
seed_memory(&conn, "claude", "m1", "2026-04-24T00:05:00Z", "active");
10795
seed_memory(&conn, "claude", "m2", "2026-04-24T00:10:00Z", "active");
108-
seed_memory(
109-
&conn,
110-
"claude",
111-
"pre-rolled",
112-
"2026-04-24T00:07:00Z",
113-
ROLLED_BACK_STATUS,
114-
);
96+
seed_memory(&conn, "claude", "pre-rolled", "2026-04-24T00:07:00Z", ROLLED_BACK_STATUS);
11597
seed_decision(&conn, "claude", "d1", "2026-04-24T00:06:00Z");
11698
let stats = rollback_session_by_id(&conn, "sess-1", true).unwrap();
117-
assert_eq!(
118-
stats.memories_affected, 2,
119-
"only the 2 active in-session memories"
120-
);
99+
assert_eq!(stats.memories_affected, 2, "only the 2 active in-session memories");
121100
assert_eq!(stats.decisions_affected, 1);
122101
assert!(stats.applied);
123-
let old_status: String = conn
124-
.query_row("SELECT status FROM memories WHERE text = 'old'", [], |r| {
125-
r.get(0)
126-
})
127-
.unwrap();
102+
let old_status: String = conn.query_row("SELECT status FROM memories WHERE text = 'old'", [], |r| r.get(0)).unwrap();
128103
assert_eq!(old_status, "active");
129-
let other_status: String = conn
130-
.query_row(
131-
"SELECT status FROM memories WHERE text = 'other-agent'",
132-
[],
133-
|r| r.get(0),
134-
)
135-
.unwrap();
104+
let other_status: String = conn.query_row("SELECT status FROM memories WHERE text = 'other-agent'", [], |r| r.get(0)).unwrap();
136105
assert_eq!(other_status, "active");
137106
let rolled: i64 = conn
138-
.query_row(
139-
"SELECT COUNT(*) FROM memories WHERE source_agent = 'claude' AND status = ?1",
140-
params![ROLLED_BACK_STATUS],
141-
|r| r.get(0),
142-
)
107+
.query_row("SELECT COUNT(*) FROM memories WHERE source_agent = 'claude' AND status = ?1", params![ROLLED_BACK_STATUS], |r| r.get(0))
143108
.unwrap();
144109
assert_eq!(rolled, 3); // pre-rolled + 2 freshly rolled
145110
}

daemon-rs/src/aging.rs

Lines changed: 61 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ fn age_memories_to_recent(conn: &Connection) -> usize {
3535
)
3636
.and_then(|mut stmt| {
3737
let mapped = stmt.query_map(params![FRESH_DAYS], |row| {
38-
Ok((
39-
row.get::<_, i64>(0)?,
40-
row.get::<_, String>(1)?,
41-
row.get::<_, Option<String>>(2)?,
42-
))
38+
Ok((row.get::<_, i64>(0)?, row.get::<_, String>(1)?, row.get::<_, Option<String>>(2)?))
4339
})?;
4440
Ok(mapped.flatten().collect())
4541
})
@@ -51,9 +47,10 @@ fn age_memories_to_recent(conn: &Connection) -> usize {
5147
}
5248
}
5349
let compressed = compress_to_key_points(&text);
54-
let _=conn.execute(
55-
"UPDATE memories SET compressed_text = ?1, age_tier = 'recent', updated_at = datetime('now') WHERE id = ?2",params![compressed,id]
56-
,);
50+
let _ = conn.execute(
51+
"UPDATE memories SET compressed_text = ?1, age_tier = 'recent', updated_at = datetime('now') WHERE id = ?2",
52+
params![compressed, id],
53+
);
5754
count += 1;
5855
}
5956
count
@@ -69,11 +66,7 @@ fn age_memories_to_old(conn: &Connection) -> usize {
6966
)
7067
.and_then(|mut stmt| {
7168
let mapped = stmt.query_map(params![RECENT_DAYS], |row| {
72-
Ok((
73-
row.get::<_, i64>(0)?,
74-
row.get::<_, String>(1)?,
75-
row.get::<_, Option<String>>(2)?,
76-
))
69+
Ok((row.get::<_, i64>(0)?, row.get::<_, String>(1)?, row.get::<_, Option<String>>(2)?))
7770
})?;
7871
Ok(mapped.flatten().collect())
7972
})
@@ -85,20 +78,23 @@ fn age_memories_to_old(conn: &Connection) -> usize {
8578
}
8679
}
8780
let compressed = compress_to_one_liner(&text);
88-
let _=conn.
89-
execute("UPDATE memories SET compressed_text = ?1, age_tier = 'old', updated_at = datetime('now') WHERE id = ?2",params![
90-
compressed,id],);
81+
let _ = conn.execute(
82+
"UPDATE memories SET compressed_text = ?1, age_tier = 'old', updated_at = datetime('now') WHERE id = ?2",
83+
params![compressed, id],
84+
);
9185
count += 1;
9286
}
9387
count
9488
}
9589
fn archive_ancient_memories(conn: &Connection) -> usize {
9690
conn.execute(
97-
"UPDATE memories SET status = 'archived', age_tier = 'ancient', updated_at = datetime('now') \
91+
"UPDATE memories SET status = 'archived', age_tier = 'ancient', updated_at = datetime('now') \
9892
WHERE status = 'active' AND pinned = 0 \
9993
AND age_tier = 'old' \
100-
AND julianday('now') - julianday(COALESCE(updated_at, created_at)) > ?1"
101-
,params![OLD_DAYS],).unwrap_or(0)
94+
AND julianday('now') - julianday(COALESCE(updated_at, created_at)) > ?1",
95+
params![OLD_DAYS],
96+
)
97+
.unwrap_or(0)
10298
}
10399
fn age_decisions_to_recent(conn: &Connection) -> usize {
104100
let mut count = 0;
@@ -111,11 +107,7 @@ fn age_decisions_to_recent(conn: &Connection) -> usize {
111107
)
112108
.and_then(|mut stmt| {
113109
let mapped = stmt.query_map(params![FRESH_DAYS], |row| {
114-
Ok((
115-
row.get::<_, i64>(0)?,
116-
row.get::<_, String>(1)?,
117-
row.get::<_, Option<String>>(2)?,
118-
))
110+
Ok((row.get::<_, i64>(0)?, row.get::<_, String>(1)?, row.get::<_, Option<String>>(2)?))
119111
})?;
120112
Ok(mapped.flatten().collect())
121113
})
@@ -126,9 +118,10 @@ fn age_decisions_to_recent(conn: &Connection) -> usize {
126118
None => decision,
127119
};
128120
let compressed = compress_to_key_points(&full);
129-
let _=conn.
130-
execute("UPDATE decisions SET compressed_text = ?1, age_tier = 'recent', updated_at = datetime('now') WHERE id = ?2",params![
131-
compressed,id],);
121+
let _ = conn.execute(
122+
"UPDATE decisions SET compressed_text = ?1, age_tier = 'recent', updated_at = datetime('now') WHERE id = ?2",
123+
params![compressed, id],
124+
);
132125
count += 1;
133126
}
134127
count
@@ -144,11 +137,7 @@ fn age_decisions_to_old(conn: &Connection) -> usize {
144137
)
145138
.and_then(|mut stmt| {
146139
let mapped = stmt.query_map(params![RECENT_DAYS], |row| {
147-
Ok((
148-
row.get::<_, i64>(0)?,
149-
row.get::<_, String>(1)?,
150-
row.get::<_, Option<String>>(2)?,
151-
))
140+
Ok((row.get::<_, i64>(0)?, row.get::<_, String>(1)?, row.get::<_, Option<String>>(2)?))
152141
})?;
153142
Ok(mapped.flatten().collect())
154143
})
@@ -159,27 +148,26 @@ fn age_decisions_to_old(conn: &Connection) -> usize {
159148
None => decision,
160149
};
161150
let compressed = compress_to_one_liner(&full);
162-
let _=conn
163-
.execute("UPDATE decisions SET compressed_text = ?1, age_tier = 'old', updated_at = datetime('now') WHERE id = ?2",params![
164-
compressed,id],);
151+
let _ = conn.execute(
152+
"UPDATE decisions SET compressed_text = ?1, age_tier = 'old', updated_at = datetime('now') WHERE id = ?2",
153+
params![compressed, id],
154+
);
165155
count += 1;
166156
}
167157
count
168158
}
169159
fn archive_ancient_decisions(conn: &Connection) -> usize {
170160
conn.execute(
171-
"UPDATE decisions SET status = 'archived', age_tier = 'ancient', updated_at = datetime('now') \
161+
"UPDATE decisions SET status = 'archived', age_tier = 'ancient', updated_at = datetime('now') \
172162
WHERE status = 'active' AND pinned = 0 \
173163
AND age_tier = 'old' \
174-
AND julianday('now') - julianday(COALESCE(updated_at, created_at)) > ?1"
175-
,params![OLD_DAYS],).unwrap_or(0)
164+
AND julianday('now') - julianday(COALESCE(updated_at, created_at)) > ?1",
165+
params![OLD_DAYS],
166+
)
167+
.unwrap_or(0)
176168
}
177169
fn compress_to_key_points(text: &str) -> String {
178-
let sentences: Vec<&str> = text
179-
.split(['.', '\n'])
180-
.map(|s| s.trim())
181-
.filter(|s| s.len() > 5)
182-
.collect();
170+
let sentences: Vec<&str> = text.split(['.', '\n']).map(|s| s.trim()).filter(|s| s.len() > 5).collect();
183171
if sentences.len() <= 2 {
184172
return text.chars().take(300).collect();
185173
}
@@ -218,52 +206,55 @@ fn compress_to_key_points(text: &str) -> String {
218206
}
219207
}
220208
fn compress_to_one_liner(text: &str) -> String {
221-
let first_sentence = text
222-
.split(['.', '\n'])
223-
.map(|s| s.trim())
224-
.find(|s| s.len() > 5)
225-
.unwrap_or(text);
209+
let first_sentence = text.split(['.', '\n']).map(|s| s.trim()).find(|s| s.len() > 5).unwrap_or(text);
226210
first_sentence.chars().take(120).collect()
227211
}
228212
fn gc_low_score(conn: &Connection) -> usize {
229213
let mut count = 0usize;
230-
count+=conn.execute
231-
(
232-
"UPDATE memories SET status = 'archived', age_tier = 'ancient', updated_at = datetime('now') \
214+
count += conn
215+
.execute(
216+
"UPDATE memories SET status = 'archived', age_tier = 'ancient', updated_at = datetime('now') \
233217
WHERE status = 'active' AND pinned = 0 \
234218
AND score < ?1 \
235-
AND julianday('now') - julianday(COALESCE(last_accessed, created_at)) > ?2"
236-
,params![GC_SCORE_THRESHOLD,GC_MIN_DAYS],).unwrap_or(0);
237-
count+=conn.execute(
238-
"UPDATE decisions SET status = 'archived', age_tier = 'ancient', updated_at = datetime('now') \
219+
AND julianday('now') - julianday(COALESCE(last_accessed, created_at)) > ?2",
220+
params![GC_SCORE_THRESHOLD, GC_MIN_DAYS],
221+
)
222+
.unwrap_or(0);
223+
count += conn
224+
.execute(
225+
"UPDATE decisions SET status = 'archived', age_tier = 'ancient', updated_at = datetime('now') \
239226
WHERE status = 'active' AND pinned = 0 \
240227
AND score < ?1 \
241-
AND julianday('now') - julianday(COALESCE(last_accessed, created_at)) > ?2"
242-
,params![GC_SCORE_THRESHOLD,GC_MIN_DAYS],).unwrap_or(0);
228+
AND julianday('now') - julianday(COALESCE(last_accessed, created_at)) > ?2",
229+
params![GC_SCORE_THRESHOLD, GC_MIN_DAYS],
230+
)
231+
.unwrap_or(0);
243232
if count > 0 {
244233
eprintln!("[aging] GC archived {count} low-score entries (score < {GC_SCORE_THRESHOLD})");
245234
}
246235
count
247236
}
248237
fn cleanup_orphaned_embeddings(conn: &Connection) -> usize {
249238
let mut count = 0usize;
250-
count+=conn.execute(
251-
"DELETE FROM embeddings WHERE target_type = 'memory' \
252-
AND NOT EXISTS (SELECT 1 FROM memories m WHERE m.id = embeddings.target_id AND m.status = 'active')"
253-
,[],).unwrap_or(0);
254-
count+=conn.execute(
255-
"DELETE FROM embeddings WHERE target_type = 'decision' \
256-
AND NOT EXISTS (SELECT 1 FROM decisions d WHERE d.id = embeddings.target_id AND d.status = 'active')"
257-
,[],).unwrap_or(0);
239+
count += conn
240+
.execute(
241+
"DELETE FROM embeddings WHERE target_type = 'memory' \
242+
AND NOT EXISTS (SELECT 1 FROM memories m WHERE m.id = embeddings.target_id AND m.status = 'active')",
243+
[],
244+
)
245+
.unwrap_or(0);
246+
count += conn
247+
.execute(
248+
"DELETE FROM embeddings WHERE target_type = 'decision' \
249+
AND NOT EXISTS (SELECT 1 FROM decisions d WHERE d.id = embeddings.target_id AND d.status = 'active')",
250+
[],
251+
)
252+
.unwrap_or(0);
258253
count
259254
}
260255
pub fn get_display_text(text: &str, compressed_text: &Option<String>, age_tier: &str) -> String {
261256
match age_tier {
262257
"fresh" => text.to_string(),
263-
_ => compressed_text
264-
.as_ref()
265-
.filter(|c| !c.is_empty())
266-
.cloned()
267-
.unwrap_or_else(|| text.to_string()),
258+
_ => compressed_text.as_ref().filter(|c| !c.is_empty()).cloned().unwrap_or_else(|| text.to_string()),
268259
}
269260
}

0 commit comments

Comments
 (0)