Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix(config): let uninstall succeed when the marketplace is already gone (#4033)
Maximilian Roos74ad58ac6fc6
diff --git a/src/commands/config/codex.rs b/src/commands/config/codex.rsindex 0edc337c9..633173b0a 100644--- a/src/commands/config/codex.rs+++ b/src/commands/config/codex.rs@@ -1,5 +1,7 @@//! Codex plugin and marketplace management.+use std::path::PathBuf;+use anyhow::{Result, bail};use color_print::cformat;use worktrunk::styling::{eprintln, hint_message, progress_message, success_message};@@ -81,9 +83,10 @@ pub fn handle_codex_uninstall(yes: bool) -> Result<()> {"{}",progress_message("Removing Codex plugin marketplace..."));- super::run_plugin_cli(+ super::run_plugin_removal("codex",&["plugin", "marketplace", "remove", MARKETPLACE_NAME],+ is_marketplace_configured,)?;eprintln!("{}", success_message("Codex plugin & marketplace removed"));@@ -98,3 +101,51 @@ fn require_codex_cli() -> Result<()> {bail!("codex CLI not found. Install Codex first: https://developers.openai.com/codex/cli/");}++/// Codex's config root.+///+/// Honors `CODEX_HOME`, which relocates the whole tree away from `~/.codex`,+/// the same way `claude_config_dir` honors `CLAUDE_CONFIG_DIR`. They diverge+/// on one point deliberately: a leading `~/` is taken literally here rather+/// than expanded against the home directory, because a shell expands it before+/// the variable is set and nothing sets `CODEX_HOME` from a non-shell context.+fn codex_config_dir() -> Option<PathBuf> {+ match std::env::var("CODEX_HOME") {+ Ok(dir) if !dir.is_empty() => Some(PathBuf::from(dir)),+ _ => worktrunk::path::home_dir().map(|home| home.join(".codex")),+ }+}++/// Whether the worktrunk marketplace is configured in Codex, or `None` where+/// the config cannot answer.+///+/// `codex plugin marketplace remove` exits non-zero when the marketplace is+/// not configured, so uninstall needs to tell that from a removal that+/// genuinely failed. Codex records each one as a `[marketplaces.<name>]`+/// table in `config.toml`.+///+/// `None` is the same "cannot tell" the Claude reader returns: a `config.toml`+/// that will not read or parse, or whose `marketplaces` is not a table, cannot+/// say worktrunk's entry is gone.+///+/// It claims less than the Claude reader does, because less is available here.+/// A fresh `config.toml` legitimately has no `marketplaces` key at all, so a+/// key that was renamed or relocated is indistinguishable from a user who has+/// configured no marketplaces, and reads as a confident absence.+pub(super) fn is_marketplace_configured() -> Option<bool> {+ let path = codex_config_dir()?.join("config.toml");+ // `try_exists` so a directory we lack permission to stat is unknown rather+ // than the `false` that `exists` reports for it.+ if !path.try_exists().ok()? {+ return Some(false);+ }++ let content = std::fs::read_to_string(&path).ok()?;+ let config = content.parse::<toml::Table>().ok()?;+ match config.get("marketplaces") {+ None => Some(false),+ Some(marketplaces) => marketplaces+ .as_table()+ .map(|table| table.contains_key(MARKETPLACE_NAME)),+ }+}diff --git a/src/commands/config/mod.rs b/src/commands/config/mod.rsindex c3bb9b5b2..e21345522 100644--- a/src/commands/config/mod.rs+++ b/src/commands/config/mod.rs@@ -143,6 +143,38 @@ fn run_plugin_cli(program: &str, args: &[&str]) -> anyhow::Result<()> {Ok(())}+/// Run a removal whose goal is that the target is gone.+///+/// Both harnesses' `plugin marketplace remove` exits non-zero when the+/// marketplace is not configured, which is the state the removal is trying to+/// reach, so running `uninstall` twice would otherwise fail with nothing left+/// to do. Asking `still_configured` after the attempt tells that apart from a+/// removal that genuinely failed, which still surfaces the harness's own+/// stderr in the gutter.+///+/// Only a confident `Some(false)` drops the error. `None` — no home directory,+/// or a config that will not read, parse, or match the shape the reader knows+/// — keeps it, because a reader that cannot see the marketplace has not+/// established that the removal worked. Reporting success there would fail open+/// on exactly the silent case: a config whose shape changed under us would+/// swallow every genuine failure and print `Plugin & marketplace removed`.+///+/// The command runs either way, so the `?` preview lists what the uninstall+/// actually invokes.+fn run_plugin_removal(+ program: &str,+ args: &[&str],+ still_configured: impl Fn() -> Option<bool>,+) -> anyhow::Result<()> {+ match run_plugin_cli(program, args) {+ Ok(()) => Ok(()),+ Err(err) => match still_configured() {+ Some(false) => Ok(()),+ _ => Err(err),+ },+ }+}+#[cfg(test)]mod tests {use insta::assert_snapshot;diff --git a/src/commands/config/plugins.rs b/src/commands/config/plugins.rsindex 3a690ea0a..c9089e785 100644--- a/src/commands/config/plugins.rs+++ b/src/commands/config/plugins.rs@@ -7,7 +7,8 @@ use color_print::cformat;use worktrunk::styling::{eprintln, info_message, progress_message, success_message};use super::show::{- claude_config_dir, is_claude_available, is_plugin_installed, is_statusline_configured,+ claude_config_dir, is_claude_available, is_marketplace_configured, is_plugin_installed,+ is_statusline_configured,};use crate::output::prompt::{PromptResponse, prompt_yes_no_preview};@@ -76,7 +77,11 @@ pub fn handle_claude_uninstall(yes: bool) -> anyhow::Result<()> {"{}",progress_message("Removing Claude Code plugin marketplace..."));- super::run_plugin_cli("claude", &["plugin", "marketplace", "remove", "worktrunk"])?;+ super::run_plugin_removal(+ "claude",+ &["plugin", "marketplace", "remove", "worktrunk"],+ is_marketplace_configured,+ )?;eprintln!("{}", success_message("Plugin & marketplace removed"));diff --git a/src/commands/config/show.rs b/src/commands/config/show.rsindex d055bad1a..e1a6a78a9 100644--- a/src/commands/config/show.rs+++ b/src/commands/config/show.rs@@ -239,6 +239,43 @@ pub(super) fn is_plugin_installed() -> bool {.is_some()}+/// Whether the worktrunk marketplace is configured in Claude Code, or `None`+/// where the config cannot answer+///+/// Read from the same config tree as `is_plugin_installed`, and asked for the+/// same reason: `claude plugin marketplace remove` exits non-zero when the+/// marketplace is not there, so uninstall needs to tell that from a removal+/// that genuinely failed. `known_marketplaces.json` is keyed by marketplace+/// name.+///+/// The three-way answer is what keeps that safe. A file Claude Code has never+/// written records no marketplaces, so its absence is a confident no. A file+/// that exists and cannot be read, parsed, or recognized leaves the question+/// open, and `run_plugin_removal` keeps the harness's error rather than+/// reporting a removal it cannot confirm.+///+/// Recognizing the shape is the part that earns its keep. A key lookup alone+/// answers "absent" for any JSON that simply lacks it, so a file reshaped the+/// way the `installed_plugins.json` beside it wraps its map in a `version` key+/// would parse, miss, and report a confident no — every genuine failure+/// silently reported as success. Requiring every value to be a marketplace+/// object turns that reshape into `None` instead.+pub(super) fn is_marketplace_configured() -> Option<bool> {+ let path = claude_config_dir()?.join("plugins/known_marketplaces.json");+ // `try_exists` so a directory we lack permission to stat is unknown rather+ // than the `false` that `exists` reports for it.+ if !path.try_exists().ok()? {+ return Some(false);+ }++ let content = std::fs::read_to_string(&path).ok()?;+ let json = serde_json::from_str::<serde_json::Value>(&content).ok()?;+ let map = json.as_object()?;+ map.values()+ .all(serde_json::Value::is_object)+ .then(|| map.contains_key("worktrunk"))+}+/// Whether Claude Code's statusline runs worktrunk's.////// The question is which subcommand the configured command invokes, so it'sdiff --git a/src/testing/mod.rs b/src/testing/mod.rsindex 88c9e8d78..b474cd59e 100644--- a/src/testing/mod.rs+++ b/src/testing/mod.rs@@ -1192,6 +1192,11 @@ pub fn set_temp_home_env(cmd: &mut Command, home: &Path) {"PI_PROFILE","PI_CONFIG_DIR","PI_CODING_AGENT_DIR",+ // Codex resolves its config root from CODEX_HOME, falling back to+ // `$HOME/.codex` — which the temp home already pins. Dropping an+ // ambient value is all hermeticity needs, and unlike setting one it+ // keeps the variable out of every snapshot's env block.+ "CODEX_HOME",] {cmd.env_remove(var);}@@ -2237,6 +2242,50 @@ impl TestRepo {.unwrap();}+ /// Write Claude Code's marketplace record verbatim+ ///+ /// `known_marketplaces.json` is keyed by marketplace name, which is what+ /// `is_marketplace_configured` reads. The body is the caller's, since the+ /// three states that reader distinguishes — worktrunk present, a different+ /// marketplace present, and a file that will not parse — differ only in+ /// what this file holds.+ pub fn setup_claude_marketplaces(temp_home: &std::path::Path, body: &str) {+ let plugins_dir = temp_home.join(".claude/plugins");+ std::fs::create_dir_all(&plugins_dir).unwrap();+ std::fs::write(plugins_dir.join("known_marketplaces.json"), body).unwrap();+ }++ /// `known_marketplaces.json` holding the worktrunk marketplace+ pub const CLAUDE_MARKETPLACES_WITH_WORKTRUNK: &'static str =+ r#"{"worktrunk":{"source":{"source":"github","repo":"max-sixty/worktrunk"}}}"#;++ /// `known_marketplaces.json` holding some other marketplace+ ///+ /// The state a second `uninstall` lands in: the file exists because the+ /// user has other marketplaces, and worktrunk's entry is simply gone.+ pub const CLAUDE_MARKETPLACES_WITHOUT_WORKTRUNK: &'static str =+ r#"{"other":{"source":{"source":"github","repo":"someone/other"}}}"#;++ /// Write Codex's `config.toml` verbatim+ ///+ /// Codex keeps each marketplace as a `[marketplaces.<name>]` table there.+ /// Takes the config root rather than the home directory, since+ /// `CODEX_HOME` can move it off `~/.codex`.+ pub fn setup_codex_config(codex_dir: &std::path::Path, body: &str) {+ std::fs::create_dir_all(codex_dir).unwrap();+ std::fs::write(codex_dir.join("config.toml"), body).unwrap();+ }++ /// `config.toml` holding the worktrunk marketplace+ pub const CODEX_CONFIG_WITH_WORKTRUNK: &'static str = "[marketplaces.worktrunk]\nsource_type = \"git\"\nsource = \"https://github.com/max-sixty/worktrunk.git\"\n";++ /// `config.toml` a Codex user has after the marketplace is removed+ ///+ /// Codex keeps its model and other settings in this file, so it outlives+ /// the marketplace table — which is why a second `uninstall` reads a+ /// present config with no worktrunk entry rather than no config at all.+ pub const CODEX_CONFIG_WITHOUT_WORKTRUNK: &'static str = "model = \"gpt-5.5\"\n\n[marketplaces.other]\nsource_type = \"git\"\nsource = \"https://github.com/someone/other.git\"\n";+/// Setup the statusline as configured in Claude Code settings////// Creates the settings.json file with the wt statusline command.@@ -2360,6 +2409,56 @@ impl TestRepo {self.codex_installed = true;}+ /// Setup mock `claude` CLI whose only failing command is the marketplace+ /// removal+ ///+ /// Uninstall reads the config to tell "the marketplace was already gone"+ /// from a removal that genuinely failed, so the two cases need a mock that+ /// fails the removal and leaves every other step alone. Must call+ /// `setup_mock_ci_tools_unauthenticated()` first.+ pub fn setup_mock_claude_with_marketplace_remove_failing(&mut self) {+ let mock_bin = self+ .mock_bin_path+ .as_ref()+ .expect("call setup_mock_ci_tools_unauthenticated() first");++ MockConfig::new("claude")+ .command("plugin marketplace add", MockResponse::exit(0))+ .command(+ "plugin marketplace remove",+ MockResponse::exit(1).with_stderr("error: marketplace remove failed\n"),+ )+ .command("plugin install", MockResponse::exit(0))+ .command("plugin uninstall", MockResponse::exit(0))+ .write(mock_bin);++ self.claude_installed = true;+ }++ /// Setup mock `codex` CLI whose only failing command is the marketplace+ /// removal+ ///+ /// The Codex counterpart of+ /// `setup_mock_claude_with_marketplace_remove_failing`.+ pub fn setup_mock_codex_with_marketplace_remove_failing(&mut self) {+ let mock_bin = self+ .mock_bin_path+ .as_ref()+ .expect("call setup_mock_ci_tools_unauthenticated() first");++ MockConfig::new("codex")+ .command("plugin marketplace add", MockResponse::exit(0))+ .command(+ "plugin marketplace remove",+ MockResponse::exit(1).with_stderr("error: marketplace remove failed\n"),+ )+ .command("plugin add", MockResponse::exit(0))+ .command("plugin remove", MockResponse::exit(0))+ .write(mock_bin);++ self.codex_installed = true;+ }+/// Setup mock `codex` CLI whose marketplace commands succeed and whose/// plugin commands fail///diff --git a/tests/integration_tests/config_show.rs b/tests/integration_tests/config_show.rsindex fbf536fdb..514bd51ba 100644--- a/tests/integration_tests/config_show.rs+++ b/tests/integration_tests/config_show.rs@@ -4341,6 +4341,264 @@ fn test_plugins_codex_uninstall_plugin_remove_fails(mut repo: TestRepo, temp_hom});}+/// The marketplace removal's goal is that the marketplace is gone, so the+/// harness reporting it was never configured is that goal already met. Running+/// `uninstall` a second time hits exactly this, and used to fail with nothing+/// left to do.+#[rstest]+fn test_plugins_claude_uninstall_tolerates_absent_marketplace(+ mut repo: TestRepo,+ temp_home: TempDir,+) {+ repo.setup_mock_ci_tools_unauthenticated();+ repo.setup_mock_claude_with_marketplace_remove_failing();+ TestRepo::setup_plugin_installed(temp_home.path());+ // No `known_marketplaces.json`, so the marketplace the removal failed on+ // is already gone.++ let settings = setup_snapshot_settings_with_home(&repo, &temp_home);+ settings.bind(|| {+ let mut cmd = repo.wt_command();+ cmd.args(["config", "plugins", "claude", "uninstall", "--yes"])+ .current_dir(repo.root_path());+ set_temp_home_env(&mut cmd, temp_home.path());++ assert_cmd_snapshot!(cmd);+ });+}++/// The Claude counterpart of the key-absent case: `known_marketplaces.json`+/// exists because the user has other marketplaces, and worktrunk's entry is+/// gone.+#[rstest]+fn test_plugins_claude_uninstall_tolerates_marketplace_removed_from_config(+ mut repo: TestRepo,+ temp_home: TempDir,+) {+ repo.setup_mock_ci_tools_unauthenticated();+ repo.setup_mock_claude_with_marketplace_remove_failing();+ TestRepo::setup_plugin_installed(temp_home.path());+ TestRepo::setup_claude_marketplaces(+ temp_home.path(),+ TestRepo::CLAUDE_MARKETPLACES_WITHOUT_WORKTRUNK,+ );++ let settings = setup_snapshot_settings_with_home(&repo, &temp_home);+ settings.bind(|| {+ let mut cmd = repo.wt_command();+ cmd.args(["config", "plugins", "claude", "uninstall", "--yes"])+ .current_dir(repo.root_path());+ set_temp_home_env(&mut cmd, temp_home.path());++ assert_cmd_snapshot!(cmd);+ });+}++/// A `known_marketplaces.json` that will not parse cannot say the marketplace+/// is gone, so the removal's failure stands. This is the shape-drift guard: if+/// the file ever grows a wrapper the way `installed_plugins.json` has one,+/// uninstall reports the harness's error rather than a silent success.+#[rstest]+fn test_plugins_claude_uninstall_surfaces_failure_when_config_unreadable(+ mut repo: TestRepo,+ temp_home: TempDir,+) {+ repo.setup_mock_ci_tools_unauthenticated();+ repo.setup_mock_claude_with_marketplace_remove_failing();+ TestRepo::setup_plugin_installed(temp_home.path());+ TestRepo::setup_claude_marketplaces(temp_home.path(), "{\"worktrunk\":");++ let settings = setup_snapshot_settings_with_home(&repo, &temp_home);+ settings.bind(|| {+ let mut cmd = repo.wt_command();+ cmd.args(["config", "plugins", "claude", "uninstall", "--yes"])+ .current_dir(repo.root_path());+ set_temp_home_env(&mut cmd, temp_home.path());++ assert_cmd_snapshot!(cmd);+ });+}++/// A reshaped `known_marketplaces.json` parses cleanly and simply lacks the+/// key, so a lookup that only asked for the key would call the marketplace+/// gone and swallow the removal's failure — silently, for as long as the shape+/// held. Requiring every value to be a marketplace object makes it unknown.+#[rstest]+fn test_plugins_claude_uninstall_surfaces_failure_when_config_reshaped(+ mut repo: TestRepo,+ temp_home: TempDir,+) {+ repo.setup_mock_ci_tools_unauthenticated();+ repo.setup_mock_claude_with_marketplace_remove_failing();+ TestRepo::setup_plugin_installed(temp_home.path());+ // The shape `installed_plugins.json` already uses, applied to this file.+ TestRepo::setup_claude_marketplaces(+ temp_home.path(),+ r#"{"version":2,"marketplaces":{"worktrunk":{"source":"github"}}}"#,+ );++ let settings = setup_snapshot_settings_with_home(&repo, &temp_home);+ settings.bind(|| {+ let mut cmd = repo.wt_command();+ cmd.args(["config", "plugins", "claude", "uninstall", "--yes"])+ .current_dir(repo.root_path());+ set_temp_home_env(&mut cmd, temp_home.path());++ assert_cmd_snapshot!(cmd);+ });+}++/// The Codex counterpart, for the one shape it can rule out: `marketplaces`+/// present but not a table cannot say worktrunk's entry is absent.+#[rstest]+fn test_plugins_codex_uninstall_surfaces_failure_when_config_reshaped(+ mut repo: TestRepo,+ temp_home: TempDir,+) {+ repo.setup_mock_ci_tools_unauthenticated();+ repo.setup_mock_codex_with_marketplace_remove_failing();+ TestRepo::setup_codex_config(+ &temp_home.path().join(".codex"),+ "model = \"gpt-5.5\"\nmarketplaces = 3\n",+ );++ let settings = setup_snapshot_settings_with_home(&repo, &temp_home);+ settings.bind(|| {+ let mut cmd = repo.wt_command();+ cmd.args(["config", "plugins", "codex", "uninstall", "--yes"])+ .current_dir(repo.root_path());+ set_temp_home_env(&mut cmd, temp_home.path());++ assert_cmd_snapshot!(cmd);+ });+}++/// The Codex counterpart: a second `uninstall` succeeds.+#[rstest]+fn test_plugins_codex_uninstall_tolerates_absent_marketplace(+ mut repo: TestRepo,+ temp_home: TempDir,+) {+ repo.setup_mock_ci_tools_unauthenticated();+ repo.setup_mock_codex_with_marketplace_remove_failing();+ // No `config.toml`, so codex has no marketplace left to remove.++ let settings = setup_snapshot_settings_with_home(&repo, &temp_home);+ settings.bind(|| {+ let mut cmd = repo.wt_command();+ cmd.args(["config", "plugins", "codex", "uninstall", "--yes"])+ .current_dir(repo.root_path());+ set_temp_home_env(&mut cmd, temp_home.path());++ assert_cmd_snapshot!(cmd);+ });+}++/// The Codex counterpart: a marketplace that survives the removal still errors.+#[rstest]+fn test_plugins_codex_uninstall_surfaces_marketplace_remove_failure(+ mut repo: TestRepo,+ temp_home: TempDir,+) {+ repo.setup_mock_ci_tools_unauthenticated();+ repo.setup_mock_codex_with_marketplace_remove_failing();+ TestRepo::setup_codex_config(+ &temp_home.path().join(".codex"),+ TestRepo::CODEX_CONFIG_WITH_WORKTRUNK,+ );++ let settings = setup_snapshot_settings_with_home(&repo, &temp_home);+ settings.bind(|| {+ let mut cmd = repo.wt_command();+ cmd.args(["config", "plugins", "codex", "uninstall", "--yes"])+ .current_dir(repo.root_path());+ set_temp_home_env(&mut cmd, temp_home.path());++ assert_cmd_snapshot!(cmd);+ });+}++/// The state a second `uninstall` actually lands in: `config.toml` is still+/// there, holding the settings Codex keeps beside its marketplaces, and only+/// worktrunk's table is gone. That is the key-absent answer rather than the+/// missing-file one the test above covers.+#[rstest]+fn test_plugins_codex_uninstall_tolerates_marketplace_removed_from_config(+ mut repo: TestRepo,+ temp_home: TempDir,+) {+ repo.setup_mock_ci_tools_unauthenticated();+ repo.setup_mock_codex_with_marketplace_remove_failing();+ TestRepo::setup_codex_config(+ &temp_home.path().join(".codex"),+ TestRepo::CODEX_CONFIG_WITHOUT_WORKTRUNK,+ );++ let settings = setup_snapshot_settings_with_home(&repo, &temp_home);+ settings.bind(|| {+ let mut cmd = repo.wt_command();+ cmd.args(["config", "plugins", "codex", "uninstall", "--yes"])+ .current_dir(repo.root_path());+ set_temp_home_env(&mut cmd, temp_home.path());++ assert_cmd_snapshot!(cmd);+ });+}++/// A `config.toml` that will not parse cannot say the marketplace is gone, so+/// the removal's failure stands rather than being reported as success.+#[rstest]+fn test_plugins_codex_uninstall_surfaces_failure_when_config_unreadable(+ mut repo: TestRepo,+ temp_home: TempDir,+) {+ repo.setup_mock_ci_tools_unauthenticated();+ repo.setup_mock_codex_with_marketplace_remove_failing();+ TestRepo::setup_codex_config(+ &temp_home.path().join(".codex"),+ "[marketplaces.worktrunk\n",+ );++ let settings = setup_snapshot_settings_with_home(&repo, &temp_home);+ settings.bind(|| {+ let mut cmd = repo.wt_command();+ cmd.args(["config", "plugins", "codex", "uninstall", "--yes"])+ .current_dir(repo.root_path());+ set_temp_home_env(&mut cmd, temp_home.path());++ assert_cmd_snapshot!(cmd);+ });+}++/// `CODEX_HOME` moves the config Codex reads, so the marketplace lookup has to+/// follow it rather than the home directory. Asserted directly rather than by+/// snapshot, which would put the variable's temp path in the snapshot's env+/// block and trip the host-path guard.+#[rstest]+fn test_plugins_codex_uninstall_reads_codex_home(mut repo: TestRepo, temp_home: TempDir) {+ repo.setup_mock_ci_tools_unauthenticated();+ repo.setup_mock_codex_with_marketplace_remove_failing();++ // The marketplace is recorded under CODEX_HOME and nowhere else, so a+ // lookup that ignored the variable would find no config and read the+ // failed removal as "already gone".+ let codex_home = TempDir::new().unwrap();+ TestRepo::setup_codex_config(codex_home.path(), TestRepo::CODEX_CONFIG_WITH_WORKTRUNK);++ let mut cmd = repo.wt_command();+ cmd.args(["config", "plugins", "codex", "uninstall", "--yes"])+ .current_dir(repo.root_path());+ set_temp_home_env(&mut cmd, temp_home.path());+ cmd.env("CODEX_HOME", codex_home.path());++ let output = cmd.output().unwrap();+ assert!(+ !output.status.success(),+ "a marketplace still configured under CODEX_HOME must surface the removal failure: {}",+ String::from_utf8_lossy(&output.stderr)+ );+}+#[test]fn test_codex_plugin_metadata_is_valid_json() {let project_root = std::path::Path::new(env!("CARGO_MANIFEST_DIR"));@@ -5846,6 +6104,13 @@ fn test_plugins_claude_uninstall_second_step_fails(mut repo: TestRepo, temp_homerepo.setup_mock_ci_tools_unauthenticated();repo.setup_mock_claude_installed();TestRepo::setup_plugin_installed(temp_home.path());+ // The marketplace is still configured after the removal fails, which is+ // what makes this a genuine failure rather than the already-gone state+ // `test_plugins_claude_uninstall_tolerates_absent_marketplace` covers.+ TestRepo::setup_claude_marketplaces(+ temp_home.path(),+ TestRepo::CLAUDE_MARKETPLACES_WITH_WORKTRUNK,+ );// Plugin uninstall succeeds and only the marketplace removal that follows// it fails, so the error the command surfaces can come from nothing else.diff --git a/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_surfaces_failure_when_config_reshaped.snap b/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_surfaces_failure_when_config_reshaped.snapnew file mode 100644index 000000000..0b3f4b191--- /dev/null+++ b/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_surfaces_failure_when_config_reshaped.snap@@ -0,0 +1,68 @@+---+source: tests/integration_tests/config_show.rs+info:+ program: wt+ args:+ - config+ - plugins+ - claude+ - uninstall+ - "--yes"+ env:+ APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"+ CLICOLOR_FORCE: "1"+ COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test User+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"+ LANG: C+ LC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"+ PATH: "[PATH]"+ TERM: alacritty+ USERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "1"+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"+ WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"+---+success: false+exit_code: 1+----- stdout -----++----- stderr -----+[36m◎[39m [36mUninstalling plugin...[39m+[36m◎[39m [36mRemoving Claude Code plugin marketplace...[39m+[31m✗[39m [31mclaude plugin marketplace remove worktrunk failed (exit 1)[39m+[107m [0m error: marketplace remove faileddiff --git a/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_surfaces_failure_when_config_unreadable.snap b/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_surfaces_failure_when_config_unreadable.snapnew file mode 100644index 000000000..0b3f4b191--- /dev/null+++ b/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_surfaces_failure_when_config_unreadable.snap@@ -0,0 +1,68 @@+---+source: tests/integration_tests/config_show.rs+info:+ program: wt+ args:+ - config+ - plugins+ - claude+ - uninstall+ - "--yes"+ env:+ APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"+ CLICOLOR_FORCE: "1"+ COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test User+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"+ LANG: C+ LC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"+ PATH: "[PATH]"+ TERM: alacritty+ USERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "1"+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"+ WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"+---+success: false+exit_code: 1+----- stdout -----++----- stderr -----+[36m◎[39m [36mUninstalling plugin...[39m+[36m◎[39m [36mRemoving Claude Code plugin marketplace...[39m+[31m✗[39m [31mclaude plugin marketplace remove worktrunk failed (exit 1)[39m+[107m [0m error: marketplace remove faileddiff --git a/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_tolerates_absent_marketplace.snap b/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_tolerates_absent_marketplace.snapnew file mode 100644index 000000000..4b849b580--- /dev/null+++ b/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_tolerates_absent_marketplace.snap@@ -0,0 +1,67 @@+---+source: tests/integration_tests/config_show.rs+info:+ program: wt+ args:+ - config+ - plugins+ - claude+ - uninstall+ - "--yes"+ env:+ APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"+ CLICOLOR_FORCE: "1"+ COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test User+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"+ LANG: C+ LC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"+ PATH: "[PATH]"+ TERM: alacritty+ USERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "1"+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"+ WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"+---+success: true+exit_code: 0+----- stdout -----++----- stderr -----+[36m◎[39m [36mUninstalling plugin...[39m+[36m◎[39m [36mRemoving Claude Code plugin marketplace...[39m+[32m✓[39m [32mPlugin & marketplace removed[39mdiff --git a/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_tolerates_marketplace_removed_from_config.snap b/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_tolerates_marketplace_removed_from_config.snapnew file mode 100644index 000000000..4b849b580--- /dev/null+++ b/tests/snapshots/integration__integration_tests__config_show__plugins_claude_uninstall_tolerates_marketplace_removed_from_config.snap@@ -0,0 +1,67 @@+---+source: tests/integration_tests/config_show.rs+info:+ program: wt+ args:+ - config+ - plugins+ - claude+ - uninstall+ - "--yes"+ env:+ APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"+ CLICOLOR_FORCE: "1"+ COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test User+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"+ LANG: C+ LC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"+ PATH: "[PATH]"+ TERM: alacritty+ USERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "1"+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"+ WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"+---+success: true+exit_code: 0+----- stdout -----++----- stderr -----+[36m◎[39m [36mUninstalling plugin...[39m+[36m◎[39m [36mRemoving Claude Code plugin marketplace...[39m+[32m✓[39m [32mPlugin & marketplace removed[39mdiff --git a/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_surfaces_failure_when_config_reshaped.snap b/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_surfaces_failure_when_config_reshaped.snapnew file mode 100644index 000000000..e5134b06d--- /dev/null+++ b/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_surfaces_failure_when_config_reshaped.snap@@ -0,0 +1,68 @@+---+source: tests/integration_tests/config_show.rs+info:+ program: wt+ args:+ - config+ - plugins+ - codex+ - uninstall+ - "--yes"+ env:+ APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"+ CLICOLOR_FORCE: "1"+ COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test User+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"+ LANG: C+ LC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"+ PATH: "[PATH]"+ TERM: alacritty+ USERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"+ WORKTRUNK_TEST_CODEX_INSTALLED: "1"+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"+ WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"+---+success: false+exit_code: 1+----- stdout -----++----- stderr -----+[36m◎[39m [36mUninstalling plugin...[39m+[36m◎[39m [36mRemoving Codex plugin marketplace...[39m+[31m✗[39m [31mcodex plugin marketplace remove worktrunk failed (exit 1)[39m+[107m [0m error: marketplace remove faileddiff --git a/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_surfaces_failure_when_config_unreadable.snap b/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_surfaces_failure_when_config_unreadable.snapnew file mode 100644index 000000000..e5134b06d--- /dev/null+++ b/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_surfaces_failure_when_config_unreadable.snap@@ -0,0 +1,68 @@+---+source: tests/integration_tests/config_show.rs+info:+ program: wt+ args:+ - config+ - plugins+ - codex+ - uninstall+ - "--yes"+ env:+ APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"+ CLICOLOR_FORCE: "1"+ COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test User+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"+ LANG: C+ LC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"+ PATH: "[PATH]"+ TERM: alacritty+ USERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"+ WORKTRUNK_TEST_CODEX_INSTALLED: "1"+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"+ WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"+---+success: false+exit_code: 1+----- stdout -----++----- stderr -----+[36m◎[39m [36mUninstalling plugin...[39m+[36m◎[39m [36mRemoving Codex plugin marketplace...[39m+[31m✗[39m [31mcodex plugin marketplace remove worktrunk failed (exit 1)[39m+[107m [0m error: marketplace remove faileddiff --git a/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_surfaces_marketplace_remove_failure.snap b/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_surfaces_marketplace_remove_failure.snapnew file mode 100644index 000000000..e5134b06d--- /dev/null+++ b/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_surfaces_marketplace_remove_failure.snap@@ -0,0 +1,68 @@+---+source: tests/integration_tests/config_show.rs+info:+ program: wt+ args:+ - config+ - plugins+ - codex+ - uninstall+ - "--yes"+ env:+ APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"+ CLICOLOR_FORCE: "1"+ COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test User+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"+ LANG: C+ LC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"+ PATH: "[PATH]"+ TERM: alacritty+ USERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"+ WORKTRUNK_TEST_CODEX_INSTALLED: "1"+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"+ WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"+---+success: false+exit_code: 1+----- stdout -----++----- stderr -----+[36m◎[39m [36mUninstalling plugin...[39m+[36m◎[39m [36mRemoving Codex plugin marketplace...[39m+[31m✗[39m [31mcodex plugin marketplace remove worktrunk failed (exit 1)[39m+[107m [0m error: marketplace remove faileddiff --git a/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_tolerates_absent_marketplace.snap b/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_tolerates_absent_marketplace.snapnew file mode 100644index 000000000..4e86198f4--- /dev/null+++ b/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_tolerates_absent_marketplace.snap@@ -0,0 +1,67 @@+---+source: tests/integration_tests/config_show.rs+info:+ program: wt+ args:+ - config+ - plugins+ - codex+ - uninstall+ - "--yes"+ env:+ APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"+ CLICOLOR_FORCE: "1"+ COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test User+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"+ LANG: C+ LC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"+ PATH: "[PATH]"+ TERM: alacritty+ USERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"+ WORKTRUNK_TEST_CODEX_INSTALLED: "1"+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"+ WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"+---+success: true+exit_code: 0+----- stdout -----++----- stderr -----+[36m◎[39m [36mUninstalling plugin...[39m+[36m◎[39m [36mRemoving Codex plugin marketplace...[39m+[32m✓[39m [32mCodex plugin & marketplace removed[39mdiff --git a/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_tolerates_marketplace_removed_from_config.snap b/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_tolerates_marketplace_removed_from_config.snapnew file mode 100644index 000000000..4e86198f4--- /dev/null+++ b/tests/snapshots/integration__integration_tests__config_show__plugins_codex_uninstall_tolerates_marketplace_removed_from_config.snap@@ -0,0 +1,67 @@+---+source: tests/integration_tests/config_show.rs+info:+ program: wt+ args:+ - config+ - plugins+ - codex+ - uninstall+ - "--yes"+ env:+ APPDATA: "[TEST_CONFIG_HOME]"+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"+ CLICOLOR_FORCE: "1"+ COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_AUTHOR_EMAIL: [email protected]+ GIT_AUTHOR_NAME: Test User+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_EMAIL: [email protected]+ GIT_COMMITTER_NAME: Test User+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"+ LANG: C+ LC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"+ PATH: "[PATH]"+ TERM: alacritty+ USERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"+ WORKTRUNK_TEST_CODEX_INSTALLED: "1"+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"+ WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"+---+success: true+exit_code: 0+----- stdout -----++----- stderr -----+[36m◎[39m [36mUninstalling plugin...[39m+[36m◎[39m [36mRemoving Codex plugin marketplace...[39m+[32m✓[39m [32mCodex plugin & marketplace removed[39m