@team-agent/installer 0.5.52 → 0.5.54

package/crates/team-agent/src/db/message_store.rs

@@ -85,6 +85,7 @@ pub struct NotificationClaimParams<'a> {
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum MessageRowStatus {
     Accepted,
+    StoredOnly,
     QueuedUntilLeaderAttach,
     QueuedCoordinatorUnavailable,
 }
@@ -93,6 +94,7 @@ impl MessageRowStatus {
     pub const fn as_str(self) -> &'static str {
         match self {
             Self::Accepted => "accepted",
+            Self::StoredOnly => "stored_only",
             Self::QueuedUntilLeaderAttach => "queued_until_leader_attach",
             Self::QueuedCoordinatorUnavailable => "queued_coordinator_unavailable",
         }
@@ -111,6 +113,7 @@ pub struct PersistMessageInput<'a> {
     pub requires_ack: bool,
     pub status: MessageRowStatus,
     pub content: &'a str,
+    pub presentation: &'a str,
     pub error: Option<&'a str>,
 }
 
@@ -182,9 +185,9 @@ impl MessageStore {
         conn.execute(
             "insert into messages(
                 message_id, owner_team_id, task_id, sender, recipient, reply_to, requires_ack,
-                status, content, artifact_refs, created_at, updated_at, delivered_at,
+                status, content, presentation, artifact_refs, created_at, updated_at, delivered_at,
                 acknowledged_at, error, delivery_attempts
-            ) values (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, '[]', ?10, ?10, null, null, ?11, 0)",
+            ) values (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, '[]', ?11, ?11, null, null, ?12, 0)",
             params![
                 message_id,
                 input.owner_team_id,
@@ -195,6 +198,7 @@ impl MessageStore {
                 if input.requires_ack { 1 } else { 0 },
                 input.status.as_str(),
                 input.content,
+                input.presentation,
                 now,
                 input.error,
             ],
@@ -226,6 +230,7 @@ impl MessageStore {
             requires_ack,
             status: MessageRowStatus::Accepted,
             content,
+            presentation: r#"{"sink":"leader","class":"message"}"#,
             error: None,
         })
     }
@@ -259,6 +264,7 @@ impl MessageStore {
             requires_ack,
             status: MessageRowStatus::Accepted,
             content,
+            presentation: r#"{"sink":"leader","class":"message"}"#,
             error: None,
         })
     }
@@ -809,6 +815,29 @@ mod tests {
         assert_eq!(status_of(&read(&s), &mid), "failed");
     }
 
+    #[test]
+    fn claim_for_delivery_never_claims_stored_only_presentation() {
+        let s = store();
+        let mid = s
+            .persist_message(PersistMessageInput {
+                message_id: None,
+                owner_team_id: Some("team-a"),
+                task_id: None,
+                sender: "worker",
+                recipient: "leader",
+                reply_to: None,
+                requires_ack: false,
+                status: MessageRowStatus::StoredOnly,
+                content: "casefile evidence",
+                presentation: r#"{"sink":"casefile","class":"stage_result"}"#,
+                error: None,
+            })
+            .unwrap();
+        assert!(!s.claim_for_delivery(&mid).unwrap());
+        assert_eq!(status_of(&read(&s), &mid), "stored_only");
+        assert_eq!(col_i64(&read(&s), &mid, "delivery_attempts"), 0);
+    }
+
     // ───────────────────────────── mark state machine ─────────────────────────────
 
     #[test]

package/crates/team-agent/src/db/migration.rs

@@ -26,6 +26,7 @@ pub const MANAGED_TABLE_LAYOUTS: &[(&str, &[&str])] = &[
             "requires_ack",
             "status",
             "content",
+            "presentation",
             "artifact_refs",
             "created_at",
             "updated_at",
@@ -121,7 +122,7 @@ pub const MANAGED_TABLE_LAYOUTS: &[(&str, &[&str])] = &[
 
 /// rebuild / 建缺表用的 DDL 模板(`schema_migration.py:CREATE_TABLE_SQL`,`__TABLE__` 占位)。
 const CREATE_TABLE_TEMPLATES: &[(&str, &str)] = &[
-    ("messages", "create table if not exists __TABLE__ (\n          message_id text primary key,\n          owner_team_id text,\n          task_id text,\n          sender text,\n          recipient text,\n          reply_to text,\n          requires_ack integer,\n          status text,\n          content text,\n          artifact_refs text,\n          created_at text,\n          updated_at text,\n          delivered_at text,\n          acknowledged_at text,\n          error text,\n          delivery_attempts integer not null default 0\n        )"),
+    ("messages", "create table if not exists __TABLE__ (\n          message_id text primary key,\n          owner_team_id text,\n          task_id text,\n          sender text,\n          recipient text,\n          reply_to text,\n          requires_ack integer,\n          status text,\n          content text,\n          presentation text not null default '{\"sink\":\"leader\",\"class\":\"message\"}',\n          artifact_refs text,\n          created_at text,\n          updated_at text,\n          delivered_at text,\n          acknowledged_at text,\n          error text,\n          delivery_attempts integer not null default 0\n        )"),
     ("results", "create table if not exists __TABLE__ (\n          result_id text primary key,\n          owner_team_id text,\n          task_id text not null,\n          agent_id text not null,\n          envelope text not null,\n          status text not null,\n          created_at text not null\n        )"),
     ("scheduled_events", "create table if not exists __TABLE__ (\n          id integer primary key,\n          owner_team_id text,\n          due_at text not null,\n          target text not null,\n          kind text not null,\n          payload_json text not null,\n          status text not null,\n          created_at text not null,\n          fired_at text,\n          result_json text\n        )"),
     ("delivery_tokens", "create table if not exists __TABLE__ (\n          message_id text primary key,\n          unique_token text not null,\n          injected_at text not null,\n          visible_at text,\n          consumed_at text,\n          failed_at text,\n          failure_reason text\n        )"),
@@ -641,11 +642,11 @@ mod tests {
         assert_eq!(m1, "t");
         drop(conn);
 
-        // 迁移后 diagnosis = ok / user_version=3。
+        // 迁移后 diagnosis = ok / current user_version。
         let after = schema_diagnosis(&path, SCHEMA_VERSION).unwrap();
         assert!(after.ok);
         assert_eq!(after.status, "ok");
-        assert_eq!(after.user_version, 3);
+        assert_eq!(after.user_version, SCHEMA_VERSION);
 
         // 备份文件已写(team.db.pre-migration-*-from-v1.bak)。
         let runtime = path.parent().unwrap();
@@ -670,7 +671,7 @@ mod tests {
         let d = schema_diagnosis(&path, SCHEMA_VERSION).unwrap();
         assert!(d.ok);
         assert_eq!(d.status, "ok");
-        assert_eq!(d.user_version, 3);
+        assert_eq!(d.user_version, SCHEMA_VERSION);
     }
 
     #[test]
@@ -788,7 +789,7 @@ mod tests {
         initialize_schema(&conn, Some(&path)).unwrap();
         let cols = table_layout(&conn, "messages").unwrap();
         assert!(!cols.iter().any(|c| c == "legacy_junk"), "废列应被丢弃");
-        assert_eq!(cols.len(), 16);
+        assert_eq!(cols.len(), 17);
         assert_eq!(table_count(&conn, "messages").unwrap(), 1);
     }
 
@@ -846,7 +847,7 @@ mod tests {
                 rebuilds,
             } => {
                 assert!(diagnosis.ok);
-                assert_eq!(diagnosis.user_version, 3);
+                assert_eq!(diagnosis.user_version, SCHEMA_VERSION);
                 assert_eq!(rebuilds.len(), 8);
             }
             other => panic!("expected Fixed, got {other:?}"),

package/crates/team-agent/src/db/schema.rs

@@ -12,11 +12,11 @@ use rusqlite::Connection;
 use crate::db::DbError;
 
 /// `schema.py:90`。
-pub const SCHEMA_VERSION: i64 = 3;
+pub const SCHEMA_VERSION: i64 = 4;
 
 /// 8 张表的 DDL(逐字照搬 `schema.py:initialize_schema` 的内联建表;含 `if not exists`)。
 /// 顺序与 Python 一致(leader_notification_log 在 ensure 块后创建)。
-const CREATE_MESSAGES: &str = "create table if not exists messages (\n              message_id text primary key,\n              owner_team_id text,\n              task_id text,\n              sender text,\n              recipient text,\n              reply_to text,\n              requires_ack integer,\n              status text,\n              content text,\n              artifact_refs text,\n              created_at text,\n              updated_at text,\n              delivered_at text,\n              acknowledged_at text,\n              error text,\n              delivery_attempts integer not null default 0\n            )";
+const CREATE_MESSAGES: &str = "create table if not exists messages (\n              message_id text primary key,\n              owner_team_id text,\n              task_id text,\n              sender text,\n              recipient text,\n              reply_to text,\n              requires_ack integer,\n              status text,\n              content text,\n              presentation text not null default '{\"sink\":\"leader\",\"class\":\"message\"}',\n              artifact_refs text,\n              created_at text,\n              updated_at text,\n              delivered_at text,\n              acknowledged_at text,\n              error text,\n              delivery_attempts integer not null default 0\n            )";
 const CREATE_RESULTS: &str = "create table if not exists results (\n              result_id text primary key,\n              owner_team_id text,\n              task_id text not null,\n              agent_id text not null,\n              envelope text not null,\n              status text not null,\n              created_at text not null\n            )";
 const CREATE_SCHEDULED_EVENTS: &str = "create table if not exists scheduled_events (\n              id integer primary key,\n              owner_team_id text,\n              due_at text not null,\n              target text not null,\n              kind text not null,\n              payload_json text not null,\n              status text not null,\n              created_at text not null,\n              fired_at text,\n              result_json text\n            )";
 const CREATE_DELIVERY_TOKENS: &str = "create table if not exists delivery_tokens (\n              message_id text primary key,\n              unique_token text not null,\n              injected_at text not null,\n              visible_at text,\n              consumed_at text,\n              failed_at text,\n              failure_reason text\n            )";
@@ -47,6 +47,7 @@ const MESSAGE_COLUMNS: &[&str] = &[
     "requires_ack",
     "status",
     "content",
+    "presentation",
     "artifact_refs",
     "created_at",
     "updated_at",
@@ -264,6 +265,10 @@ pub fn initialize_schema(
                 "owner_team_id",
                 "alter table messages add column owner_team_id text",
             ),
+            (
+                "presentation",
+                "alter table messages add column presentation text not null default '{\"sink\":\"leader\",\"class\":\"message\"}'",
+            ),
         ],
     )?;
     ensure_table_columns(
@@ -354,13 +359,13 @@ mod tests {
     }
 
     #[test]
-    fn user_version_is_three() {
+    fn user_version_is_four() {
         let conn = fresh();
         let v: i64 = conn
             .query_row("pragma user_version", [], |r| r.get(0))
             .unwrap();
         assert_eq!(v, SCHEMA_VERSION);
-        assert_eq!(v, 3);
+        assert_eq!(v, 4);
     }
 
     #[test]
@@ -378,6 +383,7 @@ mod tests {
                 "requires_ack",
                 "status",
                 "content",
+                "presentation",
                 "artifact_refs",
                 "created_at",
                 "updated_at",
@@ -394,7 +400,7 @@ mod tests {
         // initialize_schema 二次调用(if not exists / 无缺列)→ 不报错、schema 不变 + 索引仍在。
         let conn = fresh();
         initialize_schema(&conn, None).unwrap();
-        assert_eq!(table_layout(&conn, "messages").unwrap().len(), 16);
+        assert_eq!(table_layout(&conn, "messages").unwrap().len(), 17);
         let idx: i64 = conn
             .query_row(
                 "select count(*) from sqlite_master where type='index' and sql is not null",
@@ -422,6 +428,13 @@ mod tests {
                     ("requires_ack", "INTEGER", 0, None, 0),
                     ("status", "TEXT", 0, None, 0),
                     ("content", "TEXT", 0, None, 0),
+                    (
+                        "presentation",
+                        "TEXT",
+                        1,
+                        Some("'{\"sink\":\"leader\",\"class\":\"message\"}'"),
+                        0,
+                    ),
                     ("artifact_refs", "TEXT", 0, None, 0),
                     ("created_at", "TEXT", 0, None, 0),
                     ("updated_at", "TEXT", 0, None, 0),

package/crates/team-agent/src/diagnose/orphans.rs

@@ -48,6 +48,14 @@ impl OrphanScanScope {
             canonical_current_workspace: canonicalize_workspace(workspace),
         }
     }
+
+    fn workspace(&self) -> &Path {
+        match self {
+            Self::CurrentWorkspace {
+                canonical_current_workspace,
+            } => canonical_current_workspace,
+        }
+    }
 }
 
 fn canonicalize_workspace(workspace: &Path) -> PathBuf {
@@ -262,7 +270,7 @@ fn cleanup_report(report: ScanReport, scope: &OrphanScanScope) -> CleanupReport
             }
             continue;
         }
-        if kill_tmux_session(orphan) {
+        if kill_tmux_session(orphan, scope.workspace()) {
             killed.push(orphan_value(orphan, "killed"));
         } else {
             failed.push(orphan_value(orphan, "failed"));
@@ -790,14 +798,27 @@ fn orphan_value(orphan: &OrphanRecord, action: &str) -> Value {
     value
 }
 
-fn kill_tmux_session(orphan: &OrphanRecord) -> bool {
+fn kill_tmux_session(orphan: &OrphanRecord, audit_workspace: &Path) -> bool {
     let (Some(socket), Some(session)) = (&orphan.tmux_socket, &orphan.session) else {
         return false;
     };
     // Phase 1d Batch 6: factory tmux-socket-name helper. Explicit
     // tmux-only kill; conpty shim orphans are NOT routed here (design
     // §Batch 6).
-    crate::transport_factory::tmux_socket_name_transport(socket)
+    let transport = crate::transport_factory::tmux_socket_name_transport(socket);
+    let targets = vec![session.clone()];
+    if crate::kill_audit::pre_kill_audit(
+        &crate::event_log::EventLog::new(audit_workspace),
+        &transport,
+        "diagnose.orphans.tmux_session",
+        crate::kill_audit::KILL_SESSION,
+        &targets,
+    )
+    .is_err()
+    {
+        return false;
+    }
+    transport
         .kill_session(&SessionName::new(session.clone()))
         .is_ok()
 }

package/crates/team-agent/src/kill_audit.rs

@@ -0,0 +1,67 @@
+//! Durable, fail-closed observation immediately before destructive transport calls.
+
+use std::path::Path;
+
+use serde_json::json;
+
+use crate::event_log::{EventLog, EventLogError};
+use crate::transport::{BackendKind, Transport};
+
+pub(crate) const KILL_SERVER: &str = "kill-server";
+pub(crate) const KILL_SESSION: &str = "kill-session";
+
+pub(crate) fn pre_kill_audit(
+    event_log: &EventLog,
+    transport: &dyn Transport,
+    caller: &str,
+    action: &str,
+    targets: &[String],
+) -> Result<(), EventLogError> {
+    let endpoint = transport.tmux_endpoint();
+    let argv = destructive_argv(transport.kind(), endpoint.as_deref(), action, targets);
+    event_log.write(
+        "transport.pre_kill_audit",
+        json!({
+            "phase": "pre_call",
+            "caller": caller,
+            "caller_pid": std::process::id(),
+            "action": action,
+            "argv": argv,
+            "endpoint": endpoint,
+            "targets": targets,
+        }),
+    )?;
+    Ok(())
+}
+
+fn destructive_argv(
+    kind: BackendKind,
+    endpoint: Option<&str>,
+    action: &str,
+    targets: &[String],
+) -> Vec<String> {
+    let mut argv = if kind == BackendKind::Tmux {
+        let mut argv = vec!["tmux".to_string()];
+        if let Some(endpoint) = endpoint.filter(|endpoint| !endpoint.is_empty()) {
+            if endpoint != "default" {
+                argv.push(if Path::new(endpoint).is_absolute() {
+                    "-S".to_string()
+                } else {
+                    "-L".to_string()
+                });
+                argv.push(endpoint.to_string());
+            }
+        }
+        argv
+    } else {
+        vec![format!("{kind:?}").to_ascii_lowercase()]
+    };
+    argv.push(action.to_string());
+    if action == KILL_SESSION {
+        for target in targets {
+            argv.push("-t".to_string());
+            argv.push(target.clone());
+        }
+    }
+    argv
+}