@team-agent/installer 0.4.4 → 0.4.6

package/crates/team-agent/src/provider/adapter.rs

@@ -438,6 +438,23 @@ impl ProviderAdapter for BasicProviderAdapter {
     ) -> Result<CommandPlan, ProviderError> {
         match self.provider {
             Provider::Claude | Provider::ClaudeCode => {
+                // 0.4.7 (B1 verified, restart partial resume): RESTORE
+                // `--session-id <uuid>` on Claude fresh spawn. B1 confirmed
+                // Claude ≥ 2.1.185 honours the framework-supplied --session-id
+                // and creates a transcript at that id. The earlier 0.4.6
+                // P0 removal (commit 9feafc31) is reverted; the actual issue
+                // it tried to fix (leader-marker pollution) is addressed
+                // separately in commit d39b5104 (leader session exclusion
+                // in capture/repair).
+                //
+                // Fresh path: --session-id <expected> → Claude writes
+                // transcript at that id → capture/restart restore use the
+                // SAME id we predicted, so apply-time backing-store check
+                // passes immediately (no cwd+spawned_at attribution race).
+                //
+                // Resume path unchanged — `build_resume_command_plan` uses
+                // `--resume <existing_id>` on a session id that already has
+                // a real transcript.
                 let expected = next_session_token();
                 let managed = ctx.profile_launch.is_some_and(|profile| profile.managed_mcp_config);
                 let projects_root = ctx
@@ -458,9 +475,7 @@ impl ProviderAdapter for BasicProviderAdapter {
                 // Layer 1 self-healing (architect probe 2026-06-22, claude help
                 // `-n, --name <name>`): pass `--name <agent_id>` so the
                 // resume picker and on-disk `~/.claude/sessions/*.json name`
-                // field carry our role label. This is a secondary diagnostic
-                // hint — primary restart key remains `session_id + backing
-                // store revalidation` (see provider/session/resume.rs).
+                // field carry our role label.
                 if let Some(agent_id) = ctx.agent_id_hint {
                     if !agent_id.is_empty() {
                         argv.push("--name".to_string());
@@ -1045,6 +1060,18 @@ fn scan_session_candidates_once(
         };
         let positive_agent_id_match = candidate_text_has_team_agent_id(&text, context);
         let agent_path_match = candidate_path_matches_agent_id(&path, context);
+        // P0 (lane-046-capture-gap): Claude leader transcripts must NEVER be
+        // returned as a worker capture candidate. The macmini repro showed a
+        // 590MB leader transcript (sessionId=ea059b82, customTitle="claude
+        // leader") being attributed to a fresh release-engineer worker via the
+        // cwd+spawned_at time window. Filter by leader marker in the head
+        // records — limited to Claude/ClaudeCode (codex/copilot transcripts
+        // don't use customTitle/agentName the same way).
+        if matches!(provider, Provider::Claude | Provider::ClaudeCode)
+            && claude_records_have_leader_marker(&records)
+        {
+            continue;
+        }
         out.push(CapturedSessionCandidate {
             captured: CapturedSession {
                 session_id: session_id.map(SessionId::new),
@@ -1181,13 +1208,36 @@ fn parse_spawned_at(raw: &str) -> Option<std::time::SystemTime> {
 /// `collect_optional_candidate_files` 对不存在目录是 no-op)。
 fn claude_projects_dir_for_cwd(home: &Path, spawn_cwd: &Path) -> Option<PathBuf> {
     let canonical = std::fs::canonicalize(spawn_cwd).unwrap_or_else(|_| spawn_cwd.to_path_buf());
-    let encoded = canonical.to_string_lossy().replace('/', "-");
+    let encoded = encode_claude_projects_dir(&canonical.to_string_lossy());
     if encoded.is_empty() {
         return None;
     }
     Some(home.join(".claude").join("projects").join(encoded))
 }
 
+/// 0.4.6 Stage 4: Claude CLI's project-dir encoding rule. Collapse every
+/// non-ASCII-alphanumeric character (slashes, dots, spaces, punctuation,
+/// non-ASCII codepoints like Chinese) into a single `-`. The pre-fix
+/// implementation only replaced `/` → `-` which silently produced wrong
+/// directory names for any cwd containing Chinese / spaces / dots
+/// (`/Users/alauda/.../agent前沿探索/多agent协作` produced raw UTF-8 while
+/// Claude actually creates `-Users-alauda-...-agent------agent--`).
+///
+/// Note: each non-alnum CHARACTER produces one `-`. A 2-char Chinese word
+/// like "协作" becomes 2 dashes. Adjacent non-alnums each contribute one
+/// dash (Claude does NOT collapse runs).
+fn encode_claude_projects_dir(path: &str) -> String {
+    let mut out = String::with_capacity(path.len());
+    for c in path.chars() {
+        if c.is_ascii_alphanumeric() {
+            out.push(c);
+        } else {
+            out.push('-');
+        }
+    }
+    out
+}
+
 /// §C4 cr verdict — copilot session 真相源 sqlite 点查。
 ///
 /// 路径:`<HOME>/.copilot/session-store.db`,sessions 表(id/cwd/created_at/updated_at)
@@ -1909,6 +1959,53 @@ fn current_team_agent_command() -> String {
     "/usr/local/bin/team-agent".to_string()
 }
 
+/// P0 (lane-046-capture-gap): detect Claude leader transcripts by their head
+/// marker records. A leader transcript head contains records of the form
+/// `{"type":"custom-title","customTitle":"claude leader",...}` or
+/// `{"type":"agent-name","agentName":"claude leader",...}` written when the
+/// leader pane starts. Workers must never be attributed to such transcripts.
+/// E57 (lane-046-capture-gap postflight): expose the Claude leader-marker
+/// scanner for the event-log repair path. `recover_resume_session_from_events`
+/// must apply the SAME marker filter the capture allocator applies, otherwise
+/// a stale `session.captured` event from a pre-fix run still pulls the leader
+/// transcript onto a worker on the next restart.
+///
+/// Returns `true` ONLY for Claude/ClaudeCode providers when the rollout file's
+/// head records carry `customTitle == "claude leader"` or `agentName ==
+/// "claude leader"` (case-insensitive). Other providers always return `false`
+/// — codex/copilot transcripts don't use those fields the same way.
+pub(crate) fn rollout_path_has_claude_leader_marker(
+    provider: crate::provider::Provider,
+    rollout_path: &Path,
+) -> bool {
+    if !matches!(
+        provider,
+        crate::provider::Provider::Claude | crate::provider::Provider::ClaudeCode
+    ) {
+        return false;
+    }
+    let Ok(text) = read_head_text(rollout_path, CAPTURE_HEAD_BYTES) else {
+        return false;
+    };
+    let records = parse_session_records(&text);
+    claude_records_have_leader_marker(&records)
+}
+
+fn claude_records_have_leader_marker(records: &[serde_json::Value]) -> bool {
+    records.iter().any(|record| {
+        let custom_title = record
+            .get("customTitle")
+            .and_then(serde_json::Value::as_str)
+            .map(str::to_ascii_lowercase);
+        let agent_name = record
+            .get("agentName")
+            .and_then(serde_json::Value::as_str)
+            .map(str::to_ascii_lowercase);
+        matches!(custom_title.as_deref(), Some("claude leader"))
+            || matches!(agent_name.as_deref(), Some("claude leader"))
+    })
+}
+
 fn has_cwd_field(record: &serde_json::Value) -> bool {
     record_cwd(record).is_some()
 }
@@ -1952,6 +2049,70 @@ fn next_session_token() -> String {
     )
 }
 
+#[cfg(test)]
+mod lane_046_leader_marker_tests {
+    use super::*;
+
+    #[test]
+    fn claude_leader_marker_in_custom_title_is_detected() {
+        let records = vec![serde_json::json!({
+            "type": "custom-title",
+            "customTitle": "claude leader",
+            "sessionId": "ea059b82",
+        })];
+        assert!(
+            claude_records_have_leader_marker(&records),
+            "customTitle=='claude leader' must be detected as leader marker"
+        );
+    }
+
+    #[test]
+    fn claude_leader_marker_in_agent_name_is_detected() {
+        let records = vec![serde_json::json!({
+            "type": "agent-name",
+            "agentName": "claude leader",
+            "sessionId": "ea059b82",
+        })];
+        assert!(
+            claude_records_have_leader_marker(&records),
+            "agentName=='claude leader' must be detected as leader marker"
+        );
+    }
+
+    #[test]
+    fn claude_worker_records_have_no_leader_marker() {
+        let records = vec![
+            serde_json::json!({
+                "type": "custom-title",
+                "customTitle": "claude release-engineer",
+                "sessionId": "abc12345",
+            }),
+            serde_json::json!({
+                "type": "user",
+                "content": "Team Agent message from leader: do X",
+                "sessionId": "abc12345",
+            }),
+        ];
+        assert!(
+            !claude_records_have_leader_marker(&records),
+            "worker transcripts must NOT be flagged as leader marker (the \
+             literal 'claude leader' in user content does not count — only \
+             customTitle/agentName fields)"
+        );
+    }
+
+    #[test]
+    fn claude_leader_marker_is_case_insensitive() {
+        let records = vec![serde_json::json!({
+            "customTitle": "Claude Leader",
+        })];
+        assert!(
+            claude_records_have_leader_marker(&records),
+            "leader marker detection must be case-insensitive"
+        );
+    }
+}
+
 #[cfg(test)]
 mod e6_session_attribution_tests {
     #![allow(clippy::unwrap_used)]
@@ -1988,11 +2149,44 @@ mod e6_session_attribution_tests {
         let cwd = tmp_root("encode");
         let got = claude_projects_dir_for_cwd(home, &cwd).unwrap();
         let canon = std::fs::canonicalize(&cwd).unwrap();
-        let expected_leaf = canon.to_string_lossy().replace('/', "-");
+        let expected_leaf = encode_claude_projects_dir(&canon.to_string_lossy());
         assert_eq!(got, home.join(".claude").join("projects").join(expected_leaf));
         let _ = std::fs::remove_dir_all(&cwd);
     }
 
+    /// **0.4.6 Stage 4 RED**: encode every non-[A-Za-z0-9] character to `-`,
+    /// matching Claude CLI's actual project-dir naming rule. Pre-fix code
+    /// only replaced `/` → `-` and silently produced wrong directories for
+    /// non-ASCII / dotted / spaced cwds — invisible to the scanner.
+    #[test]
+    fn encode_claude_projects_dir_parity_with_real_claude_naming() {
+        // Pure-ASCII parity (the pre-fix happy path).
+        assert_eq!(
+            encode_claude_projects_dir("/Users/alauda/code"),
+            "-Users-alauda-code"
+        );
+        // The user's actual project root (Chinese):
+        //   /Users/alauda/Documents/code/agent前沿探索/多agent协作
+        // Each Chinese character → one `-`. "前沿探索"=4 chars → 4 dashes,
+        // "多agent协作" = "多"+"agent"+"协作" = 1 + (alphanumeric kept) + 2.
+        assert_eq!(
+            encode_claude_projects_dir(
+                "/Users/alauda/Documents/code/agent前沿探索/多agent协作"
+            ),
+            "-Users-alauda-Documents-code-agent------agent--"
+        );
+        // Dots and spaces also collapse.
+        assert_eq!(
+            encode_claude_projects_dir("/Users/foo bar.baz/v1.2"),
+            "-Users-foo-bar-baz-v1-2"
+        );
+        // Hidden directory ".team" → "-team".
+        assert_eq!(
+            encode_claude_projects_dir("/proj/.team/runtime"),
+            "-proj--team-runtime"
+        );
+    }
+
     #[test]
     fn parse_spawned_at_rfc3339_roundtrips_and_rejects_junk() {
         assert!(parse_spawned_at("2026-06-10T21:40:00+00:00").is_some());