Skip to content

armgit / Wake

Public Imported from GitHub
0

All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.

Rust

fix(devin): fall back to every node on a broken chain and count unknown nodes

Corey Chiu0a150bedf050
diff --git a/crates/wake-core/src/adapters/devin.rs b/crates/wake-core/src/adapters/devin.rs
index 5d5f83b..7ea1e1b 100644
--- a/crates/wake-core/src/adapters/devin.rs
+++ b/crates/wake-core/src/adapters/devin.rs
@@ -132,7 +132,7 @@ impl DevinAdapter {
})
}
- fn parse(&self, r: &SessionFileRef) -> Result<(SessionMeta, Vec<TranscriptMessage>)> {
+ fn parse(&self, r: &SessionFileRef) -> Result<(SessionMeta, Decoded)> {
if Path::new(strip_virtual_path(&r.file_path)) != self.db.as_path() {
return Err(anyhow!("devin database is outside adapter roots"));
}
@@ -144,9 +144,9 @@ impl DevinAdapter {
.ok_or_else(|| anyhow!("devin session {} not in db", r.native_id))?;
let nodes = query_nodes(&ro.conn, &r.native_id)?;
let chain = main_chain(nodes, row.main_chain_id);
- let (messages, tokens) = decode_nodes(chain, &row.model);
- let meta = build_meta(r, &row, &messages, tokens);
- Ok((meta, messages))
+ let decoded = decode_nodes(chain, &row.model);
+ let meta = build_meta(r, &row, &decoded.messages, decoded.tokens);
+ Ok((meta, decoded))
}
}
@@ -276,33 +276,28 @@ fn main_chain(rows: Vec<DevinNode>, leaf: Option<i64>) -> Vec<DevinNode> {
.enumerate()
.map(|(i, n)| (n.node_id, i))
.collect();
- let Some(mut cur) = by_id.get(&leaf).copied() else {
+ let Some(&start) = by_id.get(&leaf) else {
return rows;
};
- let mut rev: Vec<DevinNode> = Vec::new();
- loop {
- if rev.len() == rows.len() {
- return rows;
- }
- let node = DevinNode {
- node_id: rows[cur].node_id,
- parent_node_id: rows[cur].parent_node_id,
- chat_message: rows[cur].chat_message.clone(),
- created_ms: rows[cur].created_ms,
- };
- match node.parent_node_id.and_then(|p| by_id.get(&p)).copied() {
- Some(parent) => {
- rev.push(node);
- cur = parent;
- }
- None => {
- rev.push(node);
- break;
+ // 先按下标走完整条链,确认走得到根再搬节点
+ let mut chain = vec![start];
+ let mut cur = start;
+ while let Some(parent) = rows[cur].parent_node_id {
+ match by_id.get(&parent) {
+ // 链不可能比全部节点还长,再长就是成环
+ Some(&ix) if chain.len() < rows.len() => {
+ chain.push(ix);
+ cur = ix;
}
+ _ => return rows,
}
}
- rev.reverse();
- rev
+ let mut slots: Vec<Option<DevinNode>> = rows.into_iter().map(Some).collect();
+ chain
+ .iter()
+ .rev()
+ .filter_map(|&ix| slots[ix].take())
+ .collect()
}
/// compaction 请求的正文特征(Devin 把摘要写成隐藏辅助会话,也内联进主链)
@@ -348,15 +343,24 @@ fn metric_i64(metrics: &Value, key: &str) -> i64 {
metrics.get(key).and_then(Value::as_i64).unwrap_or(0)
}
-/// 主链逐节点解码;返回 (消息, token 合计)。token 在消息取舍之外单独累计:
-/// content 为空但消耗了 token 的 assistant 收尾节点照样入账
-fn decode_nodes(chain: Vec<DevinNode>, session_model: &str) -> (Vec<TranscriptMessage>, i64) {
+struct Decoded {
+ messages: Vec<TranscriptMessage>,
+ /// 在消息取舍之外单独累计:content 为空但消耗了 token 的 assistant 收尾节点照样入账
+ tokens: i64,
+ /// 解不开的 chat_message 与词汇表外的 role:格式漂移的金丝雀
+ unknown: u32,
+}
+
+/// 主链逐节点解码
+fn decode_nodes(chain: Vec<DevinNode>, session_model: &str) -> Decoded {
let mut messages: Vec<TranscriptMessage> = Vec::new();
let mut tokens = 0i64;
+ let mut unknown = 0u32;
// tool_call_id → (消息下标, tool_calls 下标)
let mut by_id: HashMap<String, (usize, usize)> = HashMap::new();
for node in chain {
let Ok(v) = serde_json::from_str::<Value>(&node.chat_message) else {
+ unknown += 1;
continue;
};
if let Some(metrics) = v.pointer("/metadata/metrics") {
@@ -439,11 +443,15 @@ fn decode_nodes(chain: Vec<DevinNode>, session_model: &str) -> (Vec<TranscriptMe
msg.kind = MessageKind::Meta;
messages.push(msg);
}
- _ => {}
+ _ => unknown += 1,
}
}
assign_seq(&mut messages);
- (messages, tokens)
+ Decoded {
+ messages,
+ tokens,
+ unknown,
+ }
}
impl AgentAdapter for DevinAdapter {
@@ -475,17 +483,21 @@ impl AgentAdapter for DevinAdapter {
}
fn parse_session(&self, r: &SessionFileRef) -> Result<ParsedSession> {
- let (meta, messages) = self.parse(r)?;
- Ok(ParsedSession::derive(meta, &messages, 0))
+ let (meta, decoded) = self.parse(r)?;
+ Ok(ParsedSession::derive(
+ meta,
+ &decoded.messages,
+ decoded.unknown,
+ ))
}
fn parse_transcript(&self, r: &SessionFileRef) -> Result<ParsedTranscript> {
- let (meta, messages) = self.parse(r)?;
+ let (meta, decoded) = self.parse(r)?;
Ok(ParsedTranscript {
meta,
- mainline: messages,
+ mainline: decoded.messages,
sidechains: Vec::new(),
- unknown_line_count: 0,
+ unknown_line_count: decoded.unknown,
})
}
diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rs
index f5bb09e..3a88e43 100644
--- a/crates/wake-core/tests/adapter_contracts.rs
+++ b/crates/wake-core/tests/adapter_contracts.rs
@@ -2935,6 +2935,54 @@ fn devin_degrades_on_old_schema() {
assert_eq!(s.meta.tokens_used, Some(15));
}
+/// 主链走不到根(叶子的父节点不在库里)就退回全部节点,不给半截链;解不开的
+/// chat_message 与词汇表外的 role 计进 unknown(格式漂移的金丝雀)
+#[test]
+fn devin_broken_chain_falls_back_and_counts_unknown_nodes() {
+ setup();
+ let home = tempfile::tempdir().unwrap();
+ let db_dir = home.path().join("cli");
+ fs::create_dir_all(&db_dir).unwrap();
+ let conn = rusqlite::Connection::open(db_dir.join("sessions.db")).unwrap();
+ conn.execute_batch(
+ r#"
+ CREATE TABLE sessions (id TEXT PRIMARY KEY, working_directory TEXT NOT NULL,
+ model TEXT NOT NULL, created_at INTEGER NOT NULL,
+ last_activity_at INTEGER NOT NULL, title TEXT,
+ main_chain_id INTEGER, hidden INTEGER NOT NULL DEFAULT 0);
+ CREATE TABLE message_nodes (row_id INTEGER PRIMARY KEY, session_id TEXT NOT NULL,
+ node_id INTEGER NOT NULL, parent_node_id INTEGER,
+ chat_message TEXT NOT NULL, created_at INTEGER NOT NULL);
+ INSERT INTO sessions VALUES ('gap-1','/work/gap','swe-2',1789000000,1789000005,'gap',5,0);
+ INSERT INTO message_nodes (session_id, node_id, parent_node_id, chat_message, created_at) VALUES
+ ('gap-1',1,NULL,'{"role":"user","content":"第一句"}',1789000001),
+ ('gap-1',2,1,'{"role":"assistant","content":"第一句的回答"}',1789000002),
+ ('gap-1',3,2,'{"role":"developer","content":"没见过的角色"}',1789000003),
+ ('gap-1',4,3,'{ torn',1789000004),
+ ('gap-1',5,99,'{"role":"assistant","content":"父节点 99 不在库里"}',1789000005);
+ "#,
+ )
+ .unwrap();
+ drop(conn);
+
+ let adapter = DevinAdapter::new().with_custom_root(home.path().to_path_buf());
+ let refs = adapter.list_session_files().unwrap();
+ let t = adapter.parse_transcript(&refs[0]).unwrap();
+ assert_eq!(
+ t.mainline
+ .iter()
+ .map(|m| m.text.as_str())
+ .collect::<Vec<_>>(),
+ ["第一句", "第一句的回答", "父节点 99 不在库里"],
+ "只剩叶子那一句就把前面的对话丢了"
+ );
+ assert_eq!(t.unknown_line_count, 2, "没见过的 role + 写坏的 JSON");
+ assert_eq!(
+ adapter.parse_session(&refs[0]).unwrap().unknown_line_count,
+ 2
+ );
+}
+
/// 自定义 location:`cli/sessions.db` 与 `cli` 层在入库前上提到数据根
/// (normalize_custom_root),孤立库拷贝原样进构造器
#[test]
diff --git a/crates/wake/src/theme.rs b/crates/wake/src/theme.rs
index e01e91b..523cb15 100644
--- a/crates/wake/src/theme.rs
+++ b/crates/wake/src/theme.rs
@@ -110,8 +110,8 @@ pub fn agent_series_color(agent: wake_core::models::AgentId) -> u32 {
Zcode => 0x8B95A5,
// app 图标像素 "C" 的紫(取自内嵌 PNG),比 Kiro 的电光紫灰、暗
CraftAgents => 0x9570BE,
- // 官方图标的蓝色
- Devin => 0x55A8E8,
+ // 图标渐变顶端的天蓝(取自内嵌 PNG);蓝色家族挤,这一档离 Gemini / Cursor 最远
+ Devin => 0x3BB3F1,
}
}