j-cli 12.9.71

A fast CLI tool for alias management, daily reports, and productivity
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
use super::chat_app::ChatApp;
use crate::command::chat::infra::sandbox::Sandbox;
use crate::command::chat::remote::protocol::WsOutbound;
use crate::command::chat::storage::{
    ChatMessage, MessageRole, PlanStatePersist, SandboxStatePersist, SessionEvent, SessionPaths,
    SubAgentSnapshotPersist, TeammateSnapshotPersist, append_event_to_path, append_session_event,
    generate_session_id, load_display_session, load_hooks_state, load_plan_state,
    load_sandbox_state, load_session_meta_file, load_skills_state, load_tasks_state,
    load_teammates_state, load_todos_state, save_hooks_state, save_plan_state, save_sandbox_state,
    save_session_meta_file, save_skills_state, save_subagents_state, save_tasks_state,
    save_teammates_state, save_todos_state,
};
use crate::command::chat::teammate::TeammateStatusPersist;
use crate::command::chat::tools::derived_shared::SubAgentStatus;
use crate::util::safe_lock;
use std::sync::atomic::Ordering;

impl ChatApp {
    /// 将 context_messages 中尚未持久化的新消息追加到 JSONL(按 turn 原子提交)。
    ///
    /// 从 `persisted_message_count` 开始扫描未持久化区间,只 append 到最后一个
    /// "安全切点"——该位置之前的每一条 `assistant(tool_calls)` 都已配齐对应数量的
    /// `tool_result`。半完成的 tool_call 尾部留到下次 persist,避免 jsonl 里出现
    /// 孤立的 tool_call 或 tool_result。
    pub(super) fn persist_new_messages(&mut self) {
        let start = self.persisted_message_count;
        let context = safe_lock(&self.context_messages, "persist_new_messages");
        if start >= context.len() {
            return;
        }

        let mut pending: i64 = 0;
        let mut last_safe = start;
        for (i, msg) in context[start..].iter().enumerate() {
            let abs = start + i;
            match msg.role {
                MessageRole::Assistant => {
                    if let Some(ref tcs) = msg.tool_calls {
                        pending += tcs.len() as i64;
                    } else if pending == 0 {
                        last_safe = abs + 1;
                    }
                }
                MessageRole::Tool => {
                    pending -= 1;
                    if pending <= 0 {
                        // 防御性 clamp:历史遗留的 orphan tool result 可能让 pending 变负
                        pending = 0;
                        last_safe = abs + 1;
                    }
                }
                MessageRole::User | MessageRole::System => {
                    if pending == 0 {
                        last_safe = abs + 1;
                    }
                }
            }
        }

        if last_safe > start {
            let msgs: Vec<_> = context[start..last_safe].to_vec();
            // 释放锁再写磁盘
            drop(context);
            for msg in msgs {
                append_session_event(&self.session_id, &SessionEvent::msg(msg));
            }
            self.persisted_message_count = last_safe;
        }
    }

    /// 将 display_messages 中尚未持久化的新消息追加到 display.jsonl。
    ///
    /// 与 `persist_new_messages()` 不同,display 消息按推入顺序即完整配对,
    /// 无需安全切点算法,直接全量 append。
    pub(super) fn persist_new_display_messages(&mut self) {
        let display = safe_lock(&self.display_messages, "persist_display");
        let start = self.persisted_display_count;
        if start >= display.len() {
            return;
        }
        let path = SessionPaths::new(&self.session_id).display();
        for msg in &display[start..] {
            append_event_to_path(&path, &SessionEvent::msg(msg.clone()));
        }
        self.persisted_display_count = display.len();
    }

    /// 保存当前 session 的所有状态到磁盘
    pub fn save_session_state(&self) {
        let sid = &self.session_id;

        // 1. Teammates
        if let Ok(mgr) = self.teammate_manager.lock() {
            let mut final_snapshots: Vec<TeammateSnapshotPersist> = Vec::new();
            let recovered = mgr.recovered_teammates_snapshot();

            for (name, handle) in &mgr.teammates {
                let status = handle
                    .status
                    .lock()
                    .map(|s| s.clone().into())
                    .unwrap_or(TeammateStatusPersist::Cancelled);
                let pending = handle
                    .broadcast_inbox
                    .lock()
                    .map(|m| m.clone())
                    .unwrap_or_default();
                let current_tool = handle.current_tool.lock().ok().and_then(|t| t.clone());
                let final_status = if handle.running()
                    && !matches!(
                        status,
                        TeammateStatusPersist::Completed
                            | TeammateStatusPersist::Cancelled
                            | TeammateStatusPersist::Error(_)
                    ) {
                    TeammateStatusPersist::Cancelled
                } else {
                    status
                };
                let (prompt, worktree, worktree_branch, inherit_permissions) = recovered
                    .get(name)
                    .map(|r| {
                        (
                            r.prompt.clone(),
                            r.worktree,
                            r.worktree_branch.clone(),
                            r.inherit_permissions,
                        )
                    })
                    .unwrap_or_default();
                final_snapshots.push(TeammateSnapshotPersist {
                    name: name.clone(),
                    role: handle.role.clone(),
                    prompt,
                    worktree,
                    worktree_branch,
                    inherit_permissions,
                    status: final_status,
                    broadcast_inbox: pending,
                    tool_calls_count: handle.tool_calls_count.load(Ordering::Relaxed),
                    current_tool,
                    work_done: handle.work_done.load(Ordering::Relaxed),
                });
            }

            for (name, r) in recovered {
                if !final_snapshots.iter().any(|s| s.name == name) {
                    final_snapshots.push(r);
                }
            }

            save_teammates_state(sid, &final_snapshots);
        }

        // 2. SubAgents
        let subagent_snapshots: Vec<SubAgentSnapshotPersist> = self
            .sub_agent_tracker
            .display_snapshots()
            .into_iter()
            .map(|s| {
                let status_str = match s.status {
                    SubAgentStatus::Initializing => "initializing",
                    SubAgentStatus::Thinking => "thinking",
                    SubAgentStatus::Working => "working",
                    SubAgentStatus::Retrying { .. } => "retrying",
                    SubAgentStatus::Completed => "completed",
                    SubAgentStatus::Cancelled => "cancelled",
                    SubAgentStatus::Error(_) => "error",
                };
                SubAgentSnapshotPersist {
                    id: s.id.clone(),
                    description: s.description,
                    mode: s.mode.to_string(),
                    status: status_str.to_string(),
                    current_tool: s.current_tool,
                    tool_calls_count: s.tool_calls_count,
                    current_round: s.current_round,
                    started_at_epoch: 0,
                    transcript_file: format!("subagents/{}/transcript.jsonl", s.id),
                }
            })
            .collect();
        save_subagents_state(sid, &subagent_snapshots);

        // 3. Tasks
        save_tasks_state(sid, &self.task_manager.list_tasks());

        // 4. Todos
        save_todos_state(sid, &self.todo_manager.list_todos());

        // 5. Plan
        {
            let plan_state = &self.tool_registry.plan_mode_state;
            let (active, plan_file_path) = plan_state.get_state();
            let plan_content = plan_file_path
                .as_ref()
                .and_then(|p| std::fs::read_to_string(p).ok());
            save_plan_state(
                sid,
                &PlanStatePersist {
                    active,
                    plan_file_path,
                    plan_content,
                },
            );
        }

        // 6. InvokedSkills
        if let Ok(skills) = self.invoked_skills.lock() {
            save_skills_state(sid, &skills.clone());
        }

        // 7. Session Hooks
        if let Ok(mgr) = self.hook_manager.lock() {
            let snapshot = mgr.session_hooks_snapshot();
            save_hooks_state(sid, &snapshot);
        }

        // 8. Sandbox
        save_sandbox_state(
            sid,
            &SandboxStatePersist {
                extra_safe_dirs: self.sandbox.extra_safe_dirs(),
            },
        );

        // 9. auto_approve → session.json
        if let Some(mut meta) = load_session_meta_file(sid)
            && meta.auto_approve != self.ui.auto_approve
        {
            meta.auto_approve = self.ui.auto_approve;
            save_session_meta_file(&meta);
        }
    }

    /// 从磁盘恢复当前 session_id 的所有状态
    pub fn restore_session_state(&mut self) {
        let sid = self.session_id.clone();
        let sid = sid.as_str();

        // 0. auto_approve ← session.json
        if let Some(meta) = load_session_meta_file(sid) {
            self.ui.auto_approve = meta.auto_approve;
        }

        // 1. InvokedSkills
        if let Some(skills) = load_skills_state(sid)
            && let Ok(mut map) = self.invoked_skills.lock()
        {
            *map = skills;
        }

        // 2. Tasks
        if let Some(tasks) = load_tasks_state(sid) {
            self.task_manager.replace_all(tasks);
        }

        // 3. Todos
        if let Some(todos) = load_todos_state(sid) {
            self.todo_manager.replace_all(todos);
        }

        // 4. Plan
        if let Some(plan) = load_plan_state(sid) {
            let plan_state = &self.tool_registry.plan_mode_state;
            if plan.active
                && let Some(ref path) = plan.plan_file_path
            {
                if !std::path::Path::new(path).exists()
                    && let Some(ref content) = plan.plan_content
                {
                    if let Some(parent) = std::path::Path::new(path).parent() {
                        let _ = std::fs::create_dir_all(parent);
                    }
                    let _ = std::fs::write(path, content);
                }
                let _ = plan_state.enter(path);
            }
        }

        // 5. Session Hooks
        if let Some(hooks) = load_hooks_state(sid)
            && let Ok(mut mgr) = self.hook_manager.lock()
        {
            mgr.restore_session_hooks(&hooks);
        }

        // 6. Sandbox
        if let Some(sandbox) = load_sandbox_state(sid) {
            self.sandbox
                .restore_extra_safe_dirs(sandbox.extra_safe_dirs);
        }

        // 7. Teammates
        if let Some(teammates) = load_teammates_state(sid)
            && let Ok(mut mgr) = self.teammate_manager.lock()
        {
            mgr.set_recovered_teammates(teammates);
        }

        // Teammates 状态已通过 set_recovered_teammates 恢复,无需额外处理 transcript。
        // 主 transcript(transcript.jsonl)已包含所有来源的消息(Main/Teammate/SubAgent),
        // 它们在实时运行时通过 push_both/各自推送 → display_messages(UI)/ context_messages(LLM)写入,
        // 顺序正确。无需从独立 transcript 重新合成消息。
    }

    /// 清除运行时状态(session 切换前调用)
    pub fn clear_runtime_state(&mut self) {
        if let Ok(mut mgr) = self.teammate_manager.lock() {
            mgr.stop_all();
            mgr.cleanup_finished();
            mgr.clear_recovered_teammates();
        }

        self.permission_queue.deny_all();
        self.plan_approval_queue.deny_all();

        self.task_manager.replace_all(Vec::new());
        self.todo_manager.replace_all(Vec::new());

        self.tool_registry.plan_mode_state.exit();

        if let Ok(mut skills) = self.invoked_skills.lock() {
            skills.clear();
        }

        if let Ok(mut mgr) = self.hook_manager.lock() {
            mgr.clear_session_hooks();
        }

        self.sandbox = Sandbox::new();
    }

    /// 清空对话(创建新会话)
    pub fn clear_session(&mut self) {
        self.persist_new_messages();
        self.persist_new_display_messages();
        self.save_session_state();
        self.clear_runtime_state();
        let new_id = generate_session_id();
        self.session_id = new_id.clone();
        if let Ok(mut s) = self.shared_session_id.lock() {
            *s = new_id.clone();
        }
        self.clear_channels();
        self.persisted_message_count = 0;
        self.persisted_display_count = 0;
        self.ui.scroll_offset = 0;
        self.ui.msg_lines_cache = None;
        if let Ok(mut ct) = self.context_tokens.lock() {
            *ct = 0;
        }
        let sync = self.build_sync_outbound();
        self.broadcast_ws(sync);
        self.broadcast_ws(WsOutbound::SessionSwitched { session_id: new_id });
        self.show_toast("已创建新对话", false);
    }

    /// 从加载的 context 消息重建双通道(会话恢复/切换/归档还原后调用)。
    ///
    /// 优先从 display.jsonl 读取 display 消息(独立格式,支持 tool_calls 结构体);
    /// 旧 session 无 display.jsonl 时,从 context 格式反推(strip XML 包裹)。
    pub fn rebuild_channels_from_loaded(&mut self, messages: Vec<ChatMessage>) {
        // 尝试从 display.jsonl 加载
        let display = load_display_session(&self.session_id);

        let display = if display.is_empty() && !messages.is_empty() {
            // fallback:旧 session,从 context 格式反推 display
            let mut display: Vec<ChatMessage> = Vec::with_capacity(messages.len());
            for msg in &messages {
                if let Some(ref sender) = msg.sender_name {
                    let clean_content = strip_agent_xml_tag(sender, &msg.content);
                    let mut display_msg = msg.clone();
                    display_msg.content = clean_content;
                    display.push(display_msg);
                } else {
                    display.push(msg.clone());
                }
            }
            display
        } else {
            display
        };

        // context 通道:直接 move messages(零 clone)
        {
            let mut cm = safe_lock(&self.context_messages, "rebuild_channels::context");
            *cm = messages;
        }
        {
            let mut dm = safe_lock(&self.display_messages, "rebuild_channels::display");
            *dm = display;
        }

        let ctx_len = safe_lock(&self.context_messages, "rebuild_channels::len").len();
        let disp_len = safe_lock(&self.display_messages, "rebuild_channels::disp_len").len();
        self.persisted_message_count = ctx_len;
        self.display_read_offset = disp_len;
        self.context_read_offset = ctx_len;
        self.persisted_display_count = disp_len;
        self.ui.msg_lines_cache = None;
    }

    /// 清空双通道 + offset(新建会话时调用)
    pub fn clear_channels(&mut self) {
        safe_lock(&self.display_messages, "clear_channels::display").clear();
        safe_lock(&self.context_messages, "clear_channels::context").clear();
        self.display_read_offset = 0;
        self.context_read_offset = 0;
        self.ui.msg_lines_cache = None;
    }

    /// 向双通道同时推送消息(display 用于 UI 渲染,context 用于 LLM + 持久化)。
    pub fn push_both_channels(&self, msg: ChatMessage) {
        safe_lock(&self.display_messages, "push_both_channels::display").push(msg.clone());
        safe_lock(&self.context_messages, "push_both_channels::context").push(msg);
    }
}

/// 去除 `<Sender>content</Sender>` XML 包裹,返回干净文本。
/// 如果 content 不以 `<Sender>` 开头,原样返回。
fn strip_agent_xml_tag(sender: &str, content: &str) -> String {
    let open_tag = format!("<{}>", sender);
    let close_tag = format!("</{}>", sender);
    if content.starts_with(&open_tag) && content.ends_with(&close_tag) {
        let inner = &content[open_tag.len()..content.len() - close_tag.len()];
        inner.to_string()
    } else {
        content.to_string()
    }
}