@team-agent/installer 0.5.92 → 0.5.94

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

@@ -68,13 +68,16 @@ use crate::transport::{
     tmux_spawn_argv, AttachOutcome, BackendKind, BusySignalKind, CaptureRange,
     CaptureSampleOutcome, CapturedText, InjectPayload, InjectReport, InjectStage,
     InjectVerification, InputSurfaceProbe, Key, PaneField, PaneId, PaneInfo, PaneMode,
-    QueryOutcome, SessionName, SetEnvOutcome, SpawnResult, SubmitAttemptObservation,
-    SubmitConsumptionReason, SubmitDiagnostics, SubmitObserver, SubmitVerification, Target,
-    Transport, TransportError, TurnVerification, WindowName,
+    QueryOutcome, SessionName, SessionOwner, SetEnvOutcome, SpawnResult,
+    SubmitAttemptObservation, SubmitConsumptionReason, SubmitDiagnostics, SubmitObserver,
+    SubmitVerification, Target, Transport, TransportError, TurnVerification, WindowName,
 };
 
 pub const PANE_BINDING_NONCE_METADATA_KEY: &str = "TEAM_AGENT_PANE_BINDING_NONCE";
 const TMUX_PANE_BINDING_NONCE_OPTION: &str = "@team_agent_pane_binding_nonce";
+const TMUX_SESSION_OWNER_WORKSPACE_OPTION: &str = "@team_agent_owner_workspace";
+const TMUX_SESSION_OWNER_TEAM_OPTION: &str = "@team_agent_owner_team";
+const TMUX_SESSION_OWNER_GENERATION_OPTION: &str = "@team_agent_owner_generation";
 
 /// Result of running an external command — the typed output of the OS edge.
 #[derive(Debug, Clone)]
@@ -351,6 +354,87 @@ impl TmuxBackend {
         }
     }
 
+    fn set_session_owner_marker(
+        &self,
+        session: &SessionName,
+        workspace: &Path,
+        team: &str,
+        generation: &str,
+    ) -> Result<(), TransportError> {
+        let workspace = workspace
+            .canonicalize()
+            .unwrap_or_else(|_| workspace.to_path_buf())
+            .to_string_lossy()
+            .into_owned();
+        for (option, value) in [
+            (TMUX_SESSION_OWNER_WORKSPACE_OPTION, workspace),
+            (TMUX_SESSION_OWNER_TEAM_OPTION, team.to_string()),
+            (TMUX_SESSION_OWNER_GENERATION_OPTION, generation.to_string()),
+        ] {
+            let argv = self.tmux_argv(&[
+                "tmux".to_string(),
+                "set-option".to_string(),
+                "-t".to_string(),
+                session.as_str().to_string(),
+                option.to_string(),
+                value,
+            ]);
+            let output = self.runner.run(&argv)?;
+            if !output.success {
+                return Err(subprocess_error(argv, output));
+            }
+        }
+        Ok(())
+    }
+
+    fn read_session_owner_option(
+        &self,
+        session: &SessionName,
+        option: &str,
+    ) -> Result<Option<String>, TransportError> {
+        let argv = self.tmux_argv(&[
+            "tmux".to_string(),
+            "show-options".to_string(),
+            "-qv".to_string(),
+            "-t".to_string(),
+            session.as_str().to_string(),
+            option.to_string(),
+        ]);
+        let output = self.runner.run(&argv)?;
+        if !output.success {
+            return Ok(None);
+        }
+        let value = output.stdout.trim();
+        Ok((!value.is_empty()).then(|| value.to_string()))
+    }
+
+    fn read_session_owner_marker(
+        &self,
+        session: &SessionName,
+    ) -> Result<Option<SessionOwner>, TransportError> {
+        let Some(workspace) = self.read_session_owner_option(
+            session,
+            TMUX_SESSION_OWNER_WORKSPACE_OPTION,
+        )? else {
+            return Ok(None);
+        };
+        let Some(team) = self.read_session_owner_option(session, TMUX_SESSION_OWNER_TEAM_OPTION)?
+        else {
+            return Ok(None);
+        };
+        let Some(generation) = self.read_session_owner_option(
+            session,
+            TMUX_SESSION_OWNER_GENERATION_OPTION,
+        )? else {
+            return Ok(None);
+        };
+        Ok(Some(SessionOwner {
+            workspace,
+            team,
+            generation,
+        }))
+    }
+
     /// ---
     /// purpose: 把 leader 认领的绑定 nonce 写进 pane 级 tmux 用户选项,给「这个 pane 实例是不是我绑的那个」留可核凭据
     /// params:
@@ -2986,6 +3070,32 @@ impl Transport for TmuxBackend {
             .map(|endpoint| endpoint.as_endpoint().to_string())
     }
 
+    fn set_session_owner(
+        &self,
+        session: &SessionName,
+        workspace: &Path,
+        team: &str,
+    ) -> Result<(), TransportError> {
+        self.set_session_owner_marker(session, workspace, team, session.as_str())
+    }
+
+    fn set_session_owner_with_generation(
+        &self,
+        session: &SessionName,
+        workspace: &Path,
+        team: &str,
+        generation: &str,
+    ) -> Result<(), TransportError> {
+        self.set_session_owner_marker(session, workspace, team, generation)
+    }
+
+    fn session_owner(
+        &self,
+        session: &SessionName,
+    ) -> Result<Option<SessionOwner>, TransportError> {
+        self.read_session_owner_marker(session)
+    }
+
     fn spawn_first(
         &self,
         session: &SessionName,

package/crates/team-agent/src/transport/test_support.rs

@@ -55,6 +55,7 @@ struct OfflineState {
     /// 0.4.x (CR C-3 / CR C-5): pre-staged `query(PaneField::PaneCurrentCommand)`
     /// answer keyed by pane id. Used by leader provider health tests.
     pane_current_commands: BTreeMap<String, String>,
+    session_owner: Option<super::SessionOwner>,
 }
 
 impl Default for OfflineState {
@@ -81,6 +82,7 @@ impl Default for OfflineState {
             capture_text: BTreeMap::new(),
             capture_ranges: Vec::new(),
             pane_current_commands: BTreeMap::new(),
+            session_owner: None,
         }
     }
 }
@@ -159,6 +161,27 @@ impl OfflineTransport {
         self
     }
 
+    pub fn with_session_owner(
+        self,
+        workspace: &Path,
+        team: impl Into<String>,
+        generation: impl Into<String>,
+    ) -> Self {
+        let workspace = workspace
+            .canonicalize()
+            .unwrap_or_else(|_| workspace.to_path_buf())
+            .to_string_lossy()
+            .into_owned();
+        self.with_state(|state| {
+            state.session_owner = Some(super::SessionOwner {
+                workspace,
+                team: team.into(),
+                generation: generation.into(),
+            });
+        });
+        self
+    }
+
     /// U1-B: stage a `list_targets()` error to model tmux server jitter. While set,
     /// every call returns `Err(TransportError::MuxUnavailable{detail})`. Pass an
     /// empty string to clear via re-builder if needed.
@@ -532,6 +555,13 @@ impl Transport for OfflineTransport {
         }))
     }
 
+    fn session_owner(
+        &self,
+        _session: &SessionName,
+    ) -> Result<Option<super::SessionOwner>, TransportError> {
+        Ok(self.with_state(|state| state.session_owner.clone()))
+    }
+
     fn list_windows(&self, _session: &SessionName) -> Result<Vec<WindowName>, TransportError> {
         Ok(self.with_state(|state| {
             state.calls.push("list_windows");

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

@@ -325,6 +325,13 @@ pub struct SpawnResult {
 
 /// 全局枚举的一行(身份地基)。`leader_env` 在 tmux 后端靠反向读进程 env,在
 /// WezTerm/ConPTY 后端靠正向登记表投影(§4a)。
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct SessionOwner {
+    pub workspace: String,
+    pub team: String,
+    pub generation: String,
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PaneInfo {
     pub pane_id: PaneId,
@@ -1000,6 +1007,40 @@ pub trait Transport: Send + Sync {
     /// wezterm=`cli list --format json` + 正向登记表;conpty=daemon 内存表(仅自有,§4a)。
     fn list_targets(&self) -> Result<Vec<PaneInfo>, TransportError>;
 
+    /// Write an owner marker at the session scope after a new session is created.
+    /// Backends without a session-local metadata primitive may no-op, but then
+    /// shutdown must treat the missing marker as unknown and refuse destructive work.
+    fn set_session_owner(
+        &self,
+        _session: &SessionName,
+        _workspace: &Path,
+        _team: &str,
+    ) -> Result<(), TransportError> {
+        Ok(())
+    }
+
+    /// Write owner metadata including the launch generation when the backend
+    /// can persist one.  The default preserves compatibility for non-tmux
+    /// transports, which remain Unknown on reads.
+    fn set_session_owner_with_generation(
+        &self,
+        session: &SessionName,
+        workspace: &Path,
+        team: &str,
+        _generation: &str,
+    ) -> Result<(), TransportError> {
+        self.set_session_owner(session, workspace, team)
+    }
+
+    /// Read the session-local owner marker. `None` is an unknown/legacy session,
+    /// never proof that the caller owns it.
+    fn session_owner(
+        &self,
+        _session: &SessionName,
+    ) -> Result<Option<SessionOwner>, TransportError> {
+        Ok(None)
+    }
+
     fn has_session(&self, session: &SessionName) -> Result<bool, TransportError>;
 
     fn list_windows(&self, session: &SessionName) -> Result<Vec<WindowName>, TransportError>;

package/package.json

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