@team-agent/installer 0.5.84 → 0.5.85

package/crates/team-agent/src/messaging/results.rs

@@ -130,6 +130,12 @@ fn collect_scoped(
     owner_team_id: Option<&str>,
 ) -> Result<serde_json::Value, MessagingError> {
     let paths = collect_paths(workspace)?;
+    #[cfg(test)]
+    collection_tests::boundary("before_lock")?;
+    // Serialize collectors, but do not hold a SQLite write transaction while
+    // committing state. A process exit releases this existing OS file lock.
+    let collection_lock =
+        crate::state::persist::acquire_result_collection_lock(&paths.run_workspace)?;
     let log = EventLog::new(&paths.run_workspace);
     let resolved_owner_team_id = match owner_team_id.filter(|team| !team.is_empty()) {
         Some(team) => Some(resolve_owner_team_for_read(
@@ -159,7 +165,11 @@ fn collect_scoped(
     let store = MessageStore::open(&paths.run_workspace)?;
     let conn = crate::db::schema::open_db(store.db_path())?;
     if let Some(path) = result_file {
+        #[cfg(test)]
+        collection_tests::boundary("before_ingest")?;
         ingest_result_file(&conn, path, owner_team_id)?;
+        #[cfg(test)]
+        collection_tests::boundary("after_ingest")?;
     }
     let sql = match owner_team_id {
         Some(_) => {
@@ -197,7 +207,7 @@ fn collect_scoped(
     let mut collected_results = Vec::new();
     let mut invalid_results = Vec::new();
     let mut fatal_invalid_results = 0usize;
-    let mut state_dirty = false;
+    let mut ready = Vec::new();
     let mut task_updates = Vec::new();
     for row in rows {
         let envelope: serde_json::Value = match serde_json::from_str(&row.envelope) {
@@ -242,25 +252,75 @@ fn collect_scoped(
             )?;
             continue;
         };
-        match owner_team_id {
-            Some(team) => {
-                conn.execute(
-                    "update results set status = 'collected' where result_id = ?1 and owner_team_id = ?2",
-                    params![row.result_id.as_str(), team],
-                )?;
-            }
-            None => {
-                conn.execute(
-                    "update results set status = 'collected' where result_id = ?1",
-                    params![row.result_id.as_str()],
-                )?;
-            }
-        }
         if scope == "task" {
-            mark_task_done(&mut state, &row.task_id, &row.result_id);
             task_updates.push((row.task_id.clone(), row.result_id.clone()));
-            state_dirty = true;
         }
+        ready.push((row, envelope, scope));
+    }
+    // Pending DB rows remain eligible until the complete task delta is durable.
+    // Preserve the original created_at/result_id order: its last row per task wins.
+    if !task_updates.is_empty() {
+        let mut task_winners = Vec::new();
+        let mut updated = std::collections::BTreeSet::new();
+        for (task_id, result_id) in task_updates.iter().rev() {
+            if updated.insert(task_id) {
+                task_winners.push((task_id.clone(), result_id.clone()));
+            }
+        }
+        #[cfg(test)]
+        collection_tests::boundary("before_state")?;
+        state = crate::state::repository::StateRepository::new(&paths.run_workspace).commit(
+            crate::state::repository::StateWriteIntent::ResultCollection { owner_team_id },
+            |latest| {
+                for (task_id, result_id) in &task_winners {
+                    let already_applied = latest
+                        .get("tasks")
+                        .and_then(serde_json::Value::as_array)
+                        .is_some_and(|tasks| {
+                            tasks.iter().any(|task| {
+                                task.get("id").and_then(serde_json::Value::as_str)
+                                    == Some(task_id.as_str())
+                                    && task.get("status").and_then(serde_json::Value::as_str)
+                                        == Some("done")
+                                    && task
+                                        .get("accepted_result_id")
+                                        .and_then(serde_json::Value::as_str)
+                                        == Some(result_id.as_str())
+                            })
+                        });
+                    if !already_applied {
+                        mark_task_done(latest, task_id, result_id);
+                    }
+                }
+            },
+        )?;
+        for (task_id, result_id) in &task_winners {
+            let applied = state
+                .get("tasks")
+                .and_then(serde_json::Value::as_array)
+                .is_some_and(|tasks| {
+                    tasks.iter().any(|task| {
+                        task.get("id").and_then(serde_json::Value::as_str) == Some(task_id.as_str())
+                            && task.get("status").and_then(serde_json::Value::as_str)
+                                == Some("done")
+                            && task
+                                .get("accepted_result_id")
+                                .and_then(serde_json::Value::as_str)
+                                == Some(result_id.as_str())
+                    })
+                });
+            if !applied {
+                return Err(MessagingError::Validation(format!(
+                    "task result projection missing after commit: task_id={task_id} result_id={result_id}"
+                )));
+            }
+        }
+        #[cfg(test)]
+        collection_tests::boundary("after_state")?;
+    }
+    for (row, envelope, scope) in ready {
+        #[cfg(test)]
+        collection_tests::boundary("before_event")?;
         log.write(
             "collect.result",
             serde_json::json!({
@@ -270,6 +330,29 @@ fn collect_scoped(
                 "scope": scope,
             }),
         )?;
+        #[cfg(test)]
+        collection_tests::boundary("after_event")?;
+        #[cfg(test)]
+        collection_tests::boundary("before_finalize")?;
+        let finalized = match owner_team_id {
+            Some(team) => {
+                conn.execute(
+                    "update results set status = 'collected' where result_id = ?1 and owner_team_id = ?2 and status not in ('collected', 'invalid')",
+                    params![row.result_id.as_str(), team],
+                )?
+            }
+            None => {
+                conn.execute(
+                    "update results set status = 'collected' where result_id = ?1 and status not in ('collected', 'invalid')",
+                    params![row.result_id.as_str()],
+                )?
+            }
+        };
+        #[cfg(test)]
+        collection_tests::boundary("after_finalize")?;
+        if finalized == 0 {
+            continue;
+        }
         collected.push(envelope.clone());
         let summary = serde_json::json!({
             "result_id": row.result_id,
@@ -286,17 +369,8 @@ fn collect_scoped(
         });
         collected_results.push(summary);
     }
-    if state_dirty {
-        state = crate::state::repository::StateRepository::new(&paths.run_workspace).commit(
-            crate::state::repository::StateWriteIntent::ResultCollection { owner_team_id },
-            |latest| {
-                for (task_id, result_id) in &task_updates {
-                    mark_task_done(latest, task_id, result_id);
-                }
-            },
-        )?;
-    }
     let counts = result_counts(&conn, owner_team_id)?;
+    drop(collection_lock);
     // results.py:157 — ensure_coordinator=true runs the REAL ensure step; the
     // `{ok:false,status:"not_required"}` literal is ONLY the ensure=false branch.
     let coordinator = if ensure_coordinator {
@@ -1483,6 +1557,9 @@ pub fn collect_results_and_notify_watchers(
     }))
 }
 
+#[cfg(test)]
+mod collection_tests;
+
 #[cfg(test)]
 mod tests {
     use super::{format_report_result_notification, report_result};

package/crates/team-agent/src/provider/adapters/copilot.rs

@@ -57,7 +57,7 @@ pub(crate) fn copilot_base_command(
 
 /// Translate `McpConfig.raw` canonical schema (`type`) into the copilot
 /// `mcp add`/`--additional-mcp-config` expected `transport` field
-/// (stdio|http|sse). Only the copilot adapter walks this translation —
+/// (stdio|http|sse). Shared by inline plans and lifecycle config files;
 /// claude/codex paths leave canonical schema untouched.
 pub(crate) fn copilot_translate_mcp_config(raw: &serde_json::Value) -> serde_json::Value {
     let Some(servers) = raw.as_object() else {

package/crates/team-agent/src/state/persist.rs

@@ -157,7 +157,7 @@ fn errno_name(errno: Option<i32>) -> Option<&'static str> {
 /// semantic mapping. The Batch 0 non-Unix `not_yet_implemented`
 /// fallback is now removed (CR C-2 fallback burn-down; grep guard
 /// `platform_fallback_burndown_batch0.rs` flipped in this batch).
-struct RuntimeLock {
+pub(crate) struct RuntimeLock {
     #[allow(dead_code)]
     file: std::fs::File,
 }
@@ -204,6 +204,20 @@ impl Drop for RuntimeLock {
     }
 }
 
+pub(crate) fn acquire_result_collection_lock(
+    run_workspace: &Path,
+) -> Result<RuntimeLock, StateError> {
+    RuntimeLock::acquire(run_workspace, "result-collection", 2.0)
+}
+
+#[cfg(test)]
+pub(crate) fn acquire_state_save_lock(
+    workspace: &Path,
+    timeout: f64,
+) -> Result<RuntimeLock, StateError> {
+    RuntimeLock::acquire(workspace, "state-save", timeout)
+}
+
 ///
 /// `save_runtime_state`(bug-084)。`state` 是 state.json 的内存 Value(插入序保留)。
 /// 注:Python 在此还调 `_migrate_state_identity`(identity slice 落地后接入;本 slice 不改 state 内容)。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-agent/installer",
-  "version": "0.5.84",
+  "version": "0.5.85",
   "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.5.84",
-    "@team-agent/cli-darwin-x64": "0.5.84",
-    "@team-agent/cli-linux-x64": "0.5.84"
+    "@team-agent/cli-darwin-arm64": "0.5.85",
+    "@team-agent/cli-darwin-x64": "0.5.85",
+    "@team-agent/cli-linux-x64": "0.5.85"
   },
   "scripts": {
     "postinstall": "node npm/bincheck.mjs",