@team-agent/installer 0.5.45 → 0.5.46

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

@@ -39,6 +39,36 @@ struct MockCommandRunner {
     default: MockResp,
 }
 
+/// Models the real build-before-destroy overlap: the spawn command creates `%new`, while a
+/// name-based lookup still resolves the same-named old window `%old`.
+struct SameNameSpawnRunner {
+    recorded: RecordedArgv,
+}
+
+impl CommandRunner for SameNameSpawnRunner {
+    fn run(&self, argv: &[String]) -> Result<CommandOutput, std::io::Error> {
+        self.recorded.lock().unwrap().push(argv.to_vec());
+        let output = match argv.get(1).map(String::as_str) {
+            Some("new-window") => ok("%new\n"),
+            Some("display-message") => ok("%old\n"),
+            Some("list-panes") => ok(
+                "%old\tteamsess\t0\tdeveloper\t0\t/dev/ttys001\tnode\t1\t/work/dir\t1\t0\t101\n\
+                 %new\tteamsess\t1\tdeveloper\t0\t/dev/ttys002\tnode\t1\t/work/dir\t1\t0\t202\n",
+            ),
+            _ => fail(64, "unexpected scripted tmux command"),
+        };
+        Ok(output)
+    }
+
+    fn run_with_stdin(
+        &self,
+        argv: &[String],
+        _stdin: &str,
+    ) -> Result<CommandOutput, std::io::Error> {
+        self.run(argv)
+    }
+}
+
 impl CommandRunner for MockCommandRunner {
     fn run(&self, argv: &[String]) -> Result<CommandOutput, std::io::Error> {
         self.recorded.lock().unwrap().push(argv.to_vec());
@@ -366,8 +396,7 @@ fn spawn_first_frames_via_new_session_builder_and_parses_pane_id() {
     let (be, rec) = backend_with(
         MockResp::Out(ok("")),
         vec![
-            MockResp::Out(ok("")),
-            MockResp::Out(ok("%3")),
+            MockResp::Out(ok("%3\n")),
             MockResp::Out(ok(pane_inventory)),
         ],
     );
@@ -383,7 +412,8 @@ fn spawn_first_frames_via_new_session_builder_and_parses_pane_id() {
             &env,
         )
         .expect("spawn_first");
-    let argv = rec.lock().unwrap()[0].clone();
+    let calls = rec.lock().unwrap().clone();
+    let argv = calls[0].clone();
     let cmd = argv.last().expect("the sh -lc command string").clone();
     assert_eq!(
         argv,
@@ -400,6 +430,12 @@ fn spawn_first_frames_via_new_session_builder_and_parses_pane_id() {
         "SpawnResult.pane_id must parse from the tmux output"
     );
     assert_eq!(result.child_pid, Some(123));
+    assert!(
+        calls
+            .iter()
+            .all(|call| call.get(1).is_none_or(|arg| arg != "display-message")),
+        "spawn_first identity must come from new-session stdout, never a display-message lookup; calls={calls:?}"
+    );
 }
 
 #[test]
@@ -408,8 +444,7 @@ fn spawn_into_frames_via_new_window_builder() {
     let (be, rec) = backend_with(
         MockResp::Out(ok("")),
         vec![
-            MockResp::Out(ok("")),
-            MockResp::Out(ok("%4")),
+            MockResp::Out(ok("%4\n")),
             MockResp::Out(ok(pane_inventory)),
         ],
     );
@@ -424,7 +459,8 @@ fn spawn_into_frames_via_new_window_builder() {
             &BTreeMap::new(),
         )
         .expect("spawn_into");
-    let argv = rec.lock().unwrap()[0].clone();
+    let calls = rec.lock().unwrap().clone();
+    let argv = calls[0].clone();
     let cmd = argv.last().expect("the sh -lc command string").clone();
     assert_eq!(
             argv,
@@ -432,16 +468,58 @@ fn spawn_into_frames_via_new_window_builder() {
             "spawn_into must frame via tmux_spawn_argv first=false (new-window -t <s> -n <w> sh -lc <cmd>)"
         );
     assert_eq!(result.pane_id.as_str(), "%4");
+    assert!(
+        calls
+            .iter()
+            .all(|call| call.get(1).is_none_or(|arg| arg != "display-message")),
+        "spawn_into identity must come from new-window stdout, never a display-message lookup; calls={calls:?}"
+    );
+}
+
+#[test]
+fn spawn_into_same_named_replacement_returns_identity_created_by_spawn_command() {
+    let recorded = Arc::new(Mutex::new(Vec::new()));
+    let be = TmuxBackend::with_runner(Box::new(SameNameSpawnRunner {
+        recorded: Arc::clone(&recorded),
+    }));
+
+    let result = be
+        .spawn_into(
+            &SessionName::new("teamsess"),
+            &WindowName::new("developer"),
+            &svec(&["provider-bin"]),
+            Path::new("/work/dir"),
+            &BTreeMap::new(),
+        )
+        .expect("same-name replacement spawn");
+    let calls = recorded.lock().unwrap().clone();
+    let name_based_identity_lookup = calls.iter().any(|call| {
+        call.get(1).is_some_and(|arg| arg == "display-message")
+            && call
+                .iter()
+                .position(|arg| arg == "-t")
+                .and_then(|index| call.get(index + 1))
+                .is_some_and(|target| target == "teamsess:developer")
+    });
+
+    assert_eq!(
+        result.pane_id.as_str(),
+        "%new",
+        "spawn_into must return the pane identity atomically emitted by this new-window command, not the same-named old window; calls={calls:?}"
+    );
+    assert!(
+        !name_based_identity_lookup,
+        "spawn identity must not be re-derived through ambiguous session:window display-message; calls={calls:?}"
+    );
 }
 
 #[test]
-fn spawn_with_command_refuses_display_message_pane_owned_by_other_window() {
+fn spawn_with_command_refuses_spawn_pane_owned_by_other_window() {
     let pane_inventory = "%5\tteamsess\t1\tw2\t0\t/dev/ttys005\tnode\t1\t/work/dir\t1\t0\t125\n";
     let (be, _rec) = backend_with(
         MockResp::Out(ok("")),
         vec![
-            MockResp::Out(ok("")),
-            MockResp::Out(ok("%5")),
+            MockResp::Out(ok("%5\n")),
             MockResp::Out(ok(pane_inventory)),
         ],
     );
@@ -453,7 +531,7 @@ fn spawn_with_command_refuses_display_message_pane_owned_by_other_window() {
             Path::new("/work/dir"),
             &BTreeMap::new(),
         )
-        .expect_err("display-message fallback to w2 pane must fail closed");
+        .expect_err("spawn stdout pane owned by w2 must fail closed");
     let msg = err.to_string();
     assert!(
         msg.contains("requested=teamsess:w1")
@@ -463,6 +541,34 @@ fn spawn_with_command_refuses_display_message_pane_owned_by_other_window() {
     );
 }
 
+#[test]
+fn spawn_with_command_empty_stdout_fails_closed_without_identity_fallback() {
+    let (be, rec) = backend_with(MockResp::Out(ok("")), vec![MockResp::Out(ok(""))]);
+    let err = be
+        .spawn_into(
+            &SessionName::new("teamsess"),
+            &WindowName::new("developer"),
+            &svec(&["provider-bin"]),
+            Path::new("/work/dir"),
+            &BTreeMap::new(),
+        )
+        .expect_err("empty new-window stdout must fail closed");
+    let msg = err.to_string().to_ascii_lowercase();
+    let calls = rec.lock().unwrap().clone();
+    let used_identity_fallback = calls
+        .iter()
+        .any(|call| call.get(1).is_some_and(|arg| arg == "display-message"));
+
+    assert!(
+        msg.contains("spawn") && (msg.contains("empty") || msg.contains("no pane id")),
+        "empty spawn stdout error must name the missing spawn identity; error={err}; calls={calls:?}"
+    );
+    assert!(
+        !used_identity_fallback,
+        "empty spawn stdout must not fall back to ambiguous display-message identity lookup; calls={calls:?}"
+    );
+}
+
 #[test]
 fn spawn_split_selects_even_horizontal_not_tiled() {
     let (be, rec) = backend_with(

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

@@ -765,25 +765,14 @@ impl TmuxBackend {
         first: bool,
     ) -> Result<SpawnResult, TransportError> {
         let spawn_argv = tmux_spawn_argv(session, window, command, first);
-        self.run_spawn(&spawn_argv)?;
-        let pane_argv = vec![
-            "tmux".to_string(),
-            "display-message".to_string(),
-            "-p".to_string(),
-            "-t".to_string(),
-            format!("{}:{}", session.as_str(), window.as_str()),
-            "#{pane_id}".to_string(),
-        ];
-        let output = self.run_spawn(&pane_argv)?;
+        let output = self.run_spawn(&spawn_argv)?;
         let pane = output.stdout.trim();
-        // T3-5 (harvest §1): never fabricate a `%0` pane id on an empty reply — a fake
-        // pane id mis-addresses every later inject/capture/kill. Surface the miss.
         if pane.is_empty() {
             return Err(TransportError::Subprocess {
-                argv: pane_argv,
+                argv: spawn_argv,
                 code: output.code,
                 stderr: format!(
-                    "tmux display-message returned no pane id for {}:{}",
+                    "tmux spawn returned no pane id for {}:{}",
                     session.as_str(),
                     window.as_str()
                 ),
@@ -822,10 +811,10 @@ impl TmuxBackend {
             })
             .unwrap_or_else(|| "<missing-from-list-targets>".to_string());
         Err(TransportError::Subprocess {
-            argv: pane_argv,
+            argv: spawn_argv,
             code: output.code,
             stderr: format!(
-                "tmux spawn pane ownership mismatch: requested={}:{} observed_pane={} observed={}",
+                "tmux spawn pane identity mismatch: requested={}:{} observed_pane={} observed={}",
                 session.as_str(),
                 window.as_str(),
                 pane_id.as_str(),

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

@@ -238,6 +238,9 @@ fn spawn_first_returns_stable_addressable_target_then_reachable() {
             "tmux",
             "new-session",
             "-d",
+            "-P",
+            "-F",
+            "#{pane_id}",
             "-s",
             "team-sess",
             "-n",
@@ -287,6 +290,9 @@ fn spawn_into_then_list_targets_enumerates_it() {
             "tmux",
             "new-window",
             "-d",
+            "-P",
+            "-F",
+            "#{pane_id}",
             "-t",
             "team-sess",
             "-n",

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

@@ -918,8 +918,8 @@ pub fn tmux_query_argv(pane: &PaneId, field: PaneField) -> Vec<String> {
 
 /// spawn argv:首个 session 用 new-session,后续 worker 用 new-window。
 /// golden(terminal.py:44-45 / runtime.py:1019-1020):
-///   first → `new-session -d -s <s> -n <w> sh -lc <cmd>`
-///   into  → `new-window -t <s> -n <w> sh -lc <cmd>`
+///   first → `new-session -d -P -F #{pane_id} -s <s> -n <w> sh -lc <cmd>`
+///   into  → `new-window -d -P -F #{pane_id} -t <s> -n <w> sh -lc <cmd>`
 /// `argv` 被组装成单条 `sh -lc` 命令字符串(provider 启动行)。
 pub fn tmux_spawn_argv(
     session: &SessionName,
@@ -932,6 +932,9 @@ pub fn tmux_spawn_argv(
             "tmux".to_string(),
             "new-session".to_string(),
             "-d".to_string(),
+            "-P".to_string(),
+            "-F".to_string(),
+            "#{pane_id}".to_string(),
             "-s".to_string(),
             session.as_str().to_string(),
             "-n".to_string(),
@@ -952,6 +955,9 @@ pub fn tmux_spawn_argv(
             "tmux".to_string(),
             "new-window".to_string(),
             "-d".to_string(),
+            "-P".to_string(),
+            "-F".to_string(),
+            "#{pane_id}".to_string(),
             "-t".to_string(),
             session.as_str().to_string(),
             "-n".to_string(),

package/package.json

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