refactor: streamline CLI integration tests and enhance command execution

Author: TrueNine

cli/integration-tests/command_contract.rs

@@ -1,77 +1,63 @@
 mod support;
 
-use std::fs;
+use serde_json::Value;
 
-use support::{current_package_version, not_implemented_message, run_tnmsc, TestDir};
+use support::{
+  current_package_version, install_packaged_cli_container, not_implemented_message, tnmsc_command,
+};
 
 #[test]
-fn help_lists_supported_commands() {
-  let result = run_tnmsc(&["help"], &support::workspace_root());
-  result.assert_success("tnmsc help");
+fn packaged_cli_contract_runs_inside_testcontainer() {
+  if !support::is_linux_x64_host() {
+    eprintln!("skipping packaged contract smoke on unsupported host");
+    return;
+  }
+
+  let container = install_packaged_cli_container();
 
+  let help = container.exec(&tnmsc_command(&["help"]));
+  help.assert_success("global tnmsc help");
   for expected in ["install", "dry-run", "clean", "plugins", "version", "help"] {
     assert!(
-      result.stdout.contains(expected),
+      help.stdout.contains(expected),
       "help output should include `{expected}`.\nstdout:\n{}",
-      result.stdout
+      help.stdout
     );
   }
-}
-
-#[test]
-fn version_matches_workspace_version() {
-  let result = run_tnmsc(&["version"], &support::workspace_root());
-  result.assert_success("tnmsc version");
-
-  assert_eq!(result.stdout.trim(), current_package_version());
-}
 
-#[test]
-fn plugins_lists_core_output_adaptors() {
-  let result = run_tnmsc(&["plugins"], &support::workspace_root());
-  result.assert_success("tnmsc plugins");
+  let version = container.exec(&tnmsc_command(&["version"]));
+  version.assert_success("global tnmsc version");
+  assert_eq!(version.stdout.trim(), current_package_version());
 
+  let plugins = container.exec(&tnmsc_command(&["plugins"]));
+  plugins.assert_success("global tnmsc plugins");
   for expected in [
     "CodexCLIOutputAdaptor",
     "ClaudeCodeCLIOutputAdaptor",
     "TraeOutputAdaptor",
     "OpencodeCLIOutputAdaptor",
   ] {
     assert!(
-      result.stdout.contains(expected),
+      plugins.stdout.contains(expected),
       "plugins output should include `{expected}`.\nstdout:\n{}",
-      result.stdout
+      plugins.stdout
     );
   }
-}
-
-#[test]
-fn schema_output_writes_valid_json_in_integration_sandbox() {
-  let temp_dir = TestDir::new("tnmsc-schema-contract");
-  let schema_path = temp_dir.path().join("tnmsc.schema.json");
-  let schema_path_arg = schema_path.to_string_lossy().into_owned();
 
-  let result = run_tnmsc(
-    &["schema", "--output", &schema_path_arg],
-    &support::workspace_root(),
-  );
-  result.assert_success("tnmsc schema --output");
+  let schema_output_path = "/tmp/tnmsc.schema.json";
+  let schema = container.exec(&tnmsc_command(&["schema", "--output", schema_output_path]));
+  schema.assert_success("global tnmsc schema --output");
 
-  let content = fs::read_to_string(&schema_path)
-    .unwrap_or_else(|error| panic!("failed to read {}: {error}", schema_path.display()));
-  let parsed: serde_json::Value = serde_json::from_str(&content)
+  let schema_file = container.exec(&format!("cat {}", support::quote_shell(schema_output_path)));
+  schema_file.assert_success("read schema output");
+  let parsed: Value = serde_json::from_str(&schema_file.stdout)
     .unwrap_or_else(|error| panic!("schema output should be valid JSON: {error}"));
-
   let object = parsed
     .as_object()
     .expect("schema output should be a top-level JSON object");
-
   assert!(object.contains_key("$schema"));
   assert!(object.contains_key("properties"));
-}
 
-#[test]
-fn install_like_commands_fail_with_not_implemented_contract() {
   for (args, command_name, display) in [
     (&[][..], "install", "tnmsc"),
     (&["install"][..], "install", "tnmsc install"),
@@ -83,7 +69,7 @@ fn install_like_commands_fail_with_not_implemented_contract() {
       "tnmsc clean --dry-run",
     ),
   ] {
-    let result = run_tnmsc(args, &support::workspace_root());
+    let result = container.exec(&tnmsc_command(args));
     result.assert_failure(display);
 
     let expected = not_implemented_message(command_name);

cli/integration-tests/packaging_smoke.rs

@@ -5,7 +5,7 @@ use std::fs;
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 
-use support::{pack_cli_artifacts, quote_shell, TestContainer};
+use support::install_packaged_cli_container;
 
 #[test]
 fn packaging_smoke_covers_release_binary_and_global_install() {
@@ -48,16 +48,7 @@ fn packaging_smoke_covers_release_binary_and_global_install() {
     );
   }
 
-  let artifacts = pack_cli_artifacts();
-  let container = TestContainer::start(&artifacts);
-
-  let install_command = format!(
-    "corepack enable && corepack prepare pnpm@{} --activate && pnpm add -g {} {}",
-    quote_shell(support::pnpm_version()),
-    quote_shell("/artifacts/cli.tgz"),
-    quote_shell("/artifacts/linux-x64-gnu.tgz")
-  );
-  container.exec_success(&install_command);
+  let container = install_packaged_cli_container();
 
   let help = container.exec("tnmsc help");
   help.assert_success("global tnmsc help");

cli/integration-tests/support/mod.rs

@@ -329,6 +329,28 @@ pub fn pack_cli_artifacts() -> PackedArtifacts {
   }
 }
 
+pub fn install_packaged_cli_container() -> TestContainer {
+  let artifacts = pack_cli_artifacts();
+  let container = TestContainer::start(&artifacts);
+  let install_command = format!(
+    "corepack enable && corepack prepare pnpm@{} --activate && pnpm add -g {} {}",
+    quote_shell(pnpm_version()),
+    quote_shell("/artifacts/cli.tgz"),
+    quote_shell("/artifacts/linux-x64-gnu.tgz")
+  );
+  container.exec_success(&install_command);
+  container
+}
+
+pub fn tnmsc_command(args: &[&str]) -> String {
+  let mut command = String::from("tnmsc");
+  for arg in args {
+    command.push(' ');
+    command.push_str(&quote_shell(arg));
+  }
+  command
+}
+
 pub fn quote_shell(value: &str) -> String {
   format!("'{}'", value.replace('\'', "'\"'\"'"))
 }

mcp/src/main.rs

@@ -1,9 +1,9 @@
 use std::io::{BufRead, Write};
 
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 use tnmsc::{
-  get_prompt, list_prompts, upsert_prompt_source, write_prompt_artifacts, ListPromptsOptions,
-  PromptServiceOptions, UpsertPromptSourceInput, WritePromptArtifactsInput,
+  ListPromptsOptions, PromptServiceOptions, UpsertPromptSourceInput, WritePromptArtifactsInput,
+  get_prompt, list_prompts, upsert_prompt_source, write_prompt_artifacts,
 };
 
 const SERVER_NAME: &str = "@truenine/memory-sync-mcp";