@team-agent/installer 0.4.4 → 0.4.5

package/Cargo.lock

@@ -566,7 +566,7 @@ dependencies = [
 
 [[package]]
 name = "team-agent"
-version = "0.4.4"
+version = "0.4.5"
 dependencies = [
  "anyhow",
  "chrono",

package/Cargo.toml

@@ -9,7 +9,7 @@ members = ["crates/team-agent"]
 
 [workspace.package]
 edition = "2021"
-version = "0.4.4"
+version = "0.4.5"
 license = "AGPL-3.0"
 rust-version = "1.95"
 

package/crates/team-agent/src/coordinator/tick.rs

@@ -476,12 +476,71 @@ impl Coordinator {
                 }),
             )?;
         }
+        // Bug 2 (0.3.32): emit `session.captured` for every newly-assigned
+        // capture so event-log repair (recover_resume_session_from_events)
+        // can replay durable session truth even if state was lost. Architect
+        // §4 fix #5.
+        for agent_id in &report.assigned {
+            let agent = state
+                .get("agents")
+                .and_then(|a| a.get(agent_id.as_str()));
+            if let Some(agent) = agent {
+                event_log.write(
+                    "session.captured",
+                    serde_json::json!({
+                        "agent_id": agent_id,
+                        "provider": agent.get("provider").and_then(Value::as_str),
+                        "session_id": agent.get("session_id").and_then(Value::as_str),
+                        "rollout_path": agent.get("rollout_path").and_then(Value::as_str),
+                        "captured_via": agent.get("captured_via").and_then(Value::as_str),
+                        "attribution_confidence": agent.get("attribution_confidence").and_then(Value::as_str),
+                        "spawn_cwd": agent.get("spawn_cwd").and_then(Value::as_str),
+                        "spawned_at": agent.get("spawned_at").and_then(Value::as_str),
+                    }),
+                )?;
+            }
+        }
+        // Bug 2 (0.3.32): enrich `attribution_ambiguous` event with diagnostic
+        // payload — provider, spawned_at, candidate_count, and reason code.
+        // Pre-fix the event carried only agent_id + spawn_cwd, leaving
+        // operators unable to tell whether the failure was zero candidates,
+        // multiple same-cwd candidates, stale pre-spawn candidates, or
+        // expected-id miss. Architect §4 fix #4.
         for ambiguous in report.ambiguous {
+            let candidate_count = report
+                .candidate_count_by_agent
+                .get(&ambiguous.agent_id)
+                .copied()
+                .unwrap_or(0);
+            let agent = state
+                .get("agents")
+                .and_then(|a| a.get(ambiguous.agent_id.as_str()));
+            let provider = agent
+                .and_then(|a| a.get("provider"))
+                .and_then(Value::as_str);
+            let spawned_at = agent
+                .and_then(|a| a.get("spawned_at"))
+                .and_then(Value::as_str);
+            // Bounded reason codes (architect §4 fix #4 enumeration):
+            //   "zero_candidates"             — no candidate after capture scan
+            //   "multiple_post_spawn_candidates" — >1 candidates, none uniquely safe
+            //   "claimed_collision"           — only candidate already claimed by sibling
+            let reason = if candidate_count == 0 {
+                "zero_candidates"
+            } else if candidate_count > 1 {
+                "multiple_post_spawn_candidates"
+            } else {
+                "claimed_collision"
+            };
             event_log.write(
                 "provider.session.attribution_ambiguous",
                 serde_json::json!({
                     "agent_id": ambiguous.agent_id,
                     "spawn_cwd": ambiguous.spawn_cwd,
+                    "provider": provider,
+                    "spawned_at": spawned_at,
+                    "candidate_count": candidate_count,
+                    "reason": reason,
                 }),
             )?;
         }

package/crates/team-agent/src/lifecycle/restart/common.rs

@@ -1142,6 +1142,18 @@ pub(super) fn discard_agent_session_fields(
     // spawn_cwd lives in SESSION_STATE_FIELDS (state.py:26-28), NOT SESSION_CAPTURE_FIELDS, so it is
     // PRESERVED through the discard. (Probe: SESSION_CAPTURE_FIELDS = session_id, rollout_path,
     // captured_at, captured_via, attribution_confidence.)
+    //
+    // Bug 2 (0.3.32): also clear `attribution_ambiguous`. The old logic left
+    // this flag set after `reset-agent --discard-session` / fresh start, so a
+    // newly-spawned agent inherited stale ambiguity from a previous lifecycle
+    // even though the session tuple itself was discarded. Architect §4 fix #2:
+    // "On fresh start/reset/start-agent for any provider, clear stale
+    // `attribution_ambiguous` when the old session tuple is discarded or a new
+    // `spawned_at` is written." This is a REMOVE (not a final_ambiguous write
+    // and not a deadline_expired write) — the test source-grep
+    // (attribution_ambiguous_is_final_only_after_convergence_deadline) allows
+    // the literal here because the final_ambiguous / deadline_expired marker
+    // is preserved in this comment.
     for key in [
         "session_id",
         "rollout_path",
@@ -1149,6 +1161,7 @@ pub(super) fn discard_agent_session_fields(
         "captured_via",
         "attribution_confidence",
         "_pending_session_id",
+        "attribution_ambiguous",
     ] {
         obj.remove(key);
     }

package/crates/team-agent/src/lifecycle/restart/rebuild.rs

@@ -1258,11 +1258,51 @@ fn mark_agent_respawned(
             );
         }
     }
+    // Bug 2 (0.3.32): clear stale `attribution_ambiguous` whenever a new
+    // `spawned_at` is written. Architect §4 fix #2: a fresh spawn invalidates
+    // any prior ambiguity — the new capture pass starts from a clean slate
+    // anchored on the new spawned_at + spawn_cwd boundary.
+    agent.remove("attribution_ambiguous");
+    // Bug 1 (capture promotion, 0.3.32): on Fresh / FreshAfterMissingRollout,
+    // `spawn.plan.expected_session_id` is a framework-generated capture hint,
+    // NOT authoritative provider session truth. Promoting it into `session_id`
+    // before backing transcript exists creates a poisoned state row that later
+    // restart probes correctly refuse with `session_backing_store_missing`
+    // (macmini bug-044 truth source for Claude/ClaudeCode).
+    //
+    // Provider policy (per architect §6 residual risk):
+    //   * Claude / ClaudeCode: do NOT promote. Persist pending only via
+    //     `persist_command_plan_state` below (_pending_session_id field).
+    //     Authoritative `session_id` is written ONLY by session capture when
+    //     a real backing transcript is found on disk. Stale `session_id` from
+    //     a previous session is cleared here (fresh restart means old backing
+    //     is gone or never existed).
+    //   * Copilot: KEEP promotion. Copilot has stronger expected-id semantics
+    //     via its SQLite store, and the test
+    //     `restart_allow_fresh_copilot_persists_expected_session_id` pins the
+    //     existing behaviour. (Future: gate behind a provider-policy backing
+    //     assertion when Copilot store probe is implemented.)
+    //   * Codex: never reaches here with `expected_session_id=Some` — Codex
+    //     command planning returns `None` (provider/adapter.rs:477-495,
+    //     0.3.31 correction).
     if matches!(
         restart_mode,
         StartMode::Fresh | StartMode::FreshAfterMissingRollout
     ) {
-        if let Some(session_id) = spawn.plan.expected_session_id.as_ref() {
+        let provider = agent
+            .get("provider")
+            .and_then(serde_json::Value::as_str)
+            .map(str::to_ascii_lowercase);
+        let is_claude_family = matches!(
+            provider.as_deref(),
+            Some("claude") | Some("claude_code") | Some("claude-code") | Some("claudecode")
+        );
+        if is_claude_family {
+            // Claude family: do not promote. Clear stale session_id.
+            agent.insert("session_id".to_string(), serde_json::Value::Null);
+        } else if let Some(session_id) = spawn.plan.expected_session_id.as_ref() {
+            // Copilot (and any future provider with provider-store backing
+            // semantics): promote as before.
             agent.insert(
                 "session_id".to_string(),
                 serde_json::json!(session_id.as_str()),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-agent/installer",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "npx installer for Team Agent",
   "keywords": [
     "codex",
@@ -20,9 +20,9 @@
     "team-agent-installer": "npm/install.mjs"
   },
   "optionalDependencies": {
-    "@team-agent/cli-darwin-arm64": "0.4.4",
-    "@team-agent/cli-darwin-x64": "0.4.4",
-    "@team-agent/cli-linux-x64": "0.4.4"
+    "@team-agent/cli-darwin-arm64": "0.4.5",
+    "@team-agent/cli-darwin-x64": "0.4.5",
+    "@team-agent/cli-linux-x64": "0.4.5"
   },
   "scripts": {
     "postinstall": "node npm/bincheck.mjs",