Fix remote control auth environment

Author: lijiuyang.5137

src/runner.rs

@@ -223,7 +223,7 @@ fn spawn_tty_process(
         args: args.to_vec(),
         cwd: cwd.to_path_buf(),
         env: env.clone(),
-        unset_env: interactive_claude_unset_env(),
+        unset_env: interactive_claude_unset_env(args),
     })
 }
 
@@ -234,15 +234,42 @@ fn interactive_claude_env() -> HashMap<String, String> {
     ])
 }
 
-fn interactive_claude_unset_env() -> Vec<String> {
-    [
+fn interactive_claude_unset_env(args: &[String]) -> Vec<String> {
+    let mut keys = [
         "CLAUDE_CODE_ENTRYPOINT",
         "CLAUDE_AGENT_SDK_VERSION",
         "NO_COLOR",
     ]
     .into_iter()
     .map(ToOwned::to_owned)
-    .collect()
+    .collect::<Vec<_>>();
+    if enables_remote_control(args) {
+        if std::env::var_os("CLAUDE_CODE_OAUTH_TOKEN").is_some() {
+            logging::event(
+                "env_unset reason=remote_control_full_scope name=CLAUDE_CODE_OAUTH_TOKEN",
+            );
+        }
+        keys.push("CLAUDE_CODE_OAUTH_TOKEN".to_owned());
+    }
+    keys
+}
+
+fn enables_remote_control(args: &[String]) -> bool {
+    let mut enabled = false;
+    for arg in args {
+        if arg == "--no-chrome" {
+            enabled = false;
+        } else if matches!(
+            arg.as_str(),
+            "--chrome" | "--remote-control" | "--remote" | "--rc"
+        ) || arg.starts_with("--remote-control=")
+            || arg.starts_with("--remote=")
+            || arg.starts_with("--rc=")
+        {
+            enabled = true;
+        }
+    }
+    enabled
 }
 
 fn is_bad_resume_startup_error(error: &CcttyError) -> bool {

tests/cctty_cli.rs

@@ -159,6 +159,7 @@ fn interactive_claude_gets_terminal_env_not_sdk_transport_env() {
         .env("CLAUDE_CODE_ENTRYPOINT", "sdk-py")
         .env("CLAUDE_AGENT_SDK_VERSION", "0.0.0")
         .env("CLAUDE_AGENT_SDK_SKIP_VERSION_CHECK", "1")
+        .env("CLAUDE_CODE_OAUTH_TOKEN", "synthetic-setup-token")
         .current_dir(workspace.path())
         .args(["--print", "--output-format", "stream-json", "Say OK"])
         .assert()
@@ -171,6 +172,36 @@ fn interactive_claude_gets_terminal_env_not_sdk_transport_env() {
     assert_eq!(env["NO_COLOR"], Value::Null);
     assert_eq!(env["CLAUDE_CODE_ENTRYPOINT"], Value::Null);
     assert_eq!(env["CLAUDE_AGENT_SDK_VERSION"], Value::Null);
+    assert_eq!(env["CLAUDE_CODE_OAUTH_TOKEN"], "synthetic-setup-token");
+}
+
+#[test]
+fn remote_control_uses_login_auth_instead_of_inference_only_oauth_env() {
+    let fixture = FakeClaude::new();
+    let workspace = tempfile::tempdir().unwrap();
+    let config_dir = tempfile::tempdir().unwrap();
+    let env_path = tempfile::NamedTempFile::new().unwrap();
+
+    Command::cargo_bin("cctty")
+        .unwrap()
+        .env("CCTTY_CLAUDE_PATH", fixture.path())
+        .env("CLAUDE_CONFIG_DIR", config_dir.path())
+        .env("FAKE_CLAUDE_ENV_PATH", env_path.path())
+        .env("CLAUDE_CODE_OAUTH_TOKEN", "synthetic-setup-token")
+        .current_dir(workspace.path())
+        .args([
+            "--print",
+            "--output-format",
+            "stream-json",
+            "--chrome",
+            "Say OK",
+        ])
+        .assert()
+        .success();
+
+    let env: Value =
+        serde_json::from_str(&std::fs::read_to_string(env_path.path()).unwrap()).unwrap();
+    assert_eq!(env["CLAUDE_CODE_OAUTH_TOKEN"], Value::Null);
 }
 
 #[test]

tests/support/mod.rs

@@ -54,6 +54,7 @@ if env_path:
         "CLAUDE_CODE_ENTRYPOINT",
         "CLAUDE_AGENT_SDK_VERSION",
         "CLAUDE_AGENT_SDK_SKIP_VERSION_CHECK",
+        "CLAUDE_CODE_OAUTH_TOKEN",
     ]
     Path(env_path).write_text(json.dumps({key: os.environ.get(key) for key in keys}), encoding="utf-8")