rename key_agent to agent

Cargo.lock

···
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
+name = "agent"
+version = "1.0.0-beta.0"
+dependencies = [
+ "anyhow",
+ "base64",
+ "futures-util",
+ "nix 0.30.1",
+ "prost",
+ "prost-build",
+ "sha2",
+ "tokio",
+ "tokio-util",
+]
+
+[[package]]
 name = "aho-corasick"
 version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
-name = "convert_case"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
 name = "cpufeatures"
 version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "crc"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
 dependencies = [
  "crc-catalog",
 ]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 
 [[package]]
 name = "derive_more"
-version = "2.1.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "2.1.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version",
- "syn 2.0.111",
+ "syn 2.0.110",
  "unicode-xid",
 ]
 
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 dependencies = [
  "getrandom 0.3.3",
  "libc",
-]
-
-[[package]]
-name = "key_agent"
-version = "1.0.0-beta.0"
-dependencies = [
- "anyhow",
- "base64",
- "futures-util",
- "nix 0.30.1",
- "prost",
- "prost-build",
- "sha2",
- "tokio",
- "tokio-util",
 ]
 
 [[package]]
···
 name = "lib"
 version = "1.0.0-beta.0"
 dependencies = [
+ "agent",
  "aho-corasick",
  "anyhow",
  "base64",
···
  "gjson",
  "im",
  "itertools",
- "key_agent",
  "miette",
  "nix 0.30.1",
  "nix-compat",
···
  "sha2",
  "sqlx",
  "strip-ansi-escapes",
- "syn 2.0.111",
+ "syn 2.0.110",
  "tempdir",
  "termion",
  "thiserror 2.0.17",
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2"
 dependencies = [
  "proc-macro2",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.111",
+ "syn 2.0.110",
  "tempfile",
 ]
 
···
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.111",
+ "syn 2.0.110",
  "tokio",
  "url",
 ]
···
 
 [[package]]
 name = "syn"
-version = "2.0.111"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 
 [[package]]
 name = "tracing"
-version = "0.1.43"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
···
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.31"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.35"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
  "valuable",
···
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "nu-ansi-term",
  "sharded-slab",
···
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
  "synstructure",
 ]
 
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
  "synstructure",
 ]
 
···
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.110",
 ]
 
 [[package]]

Cargo.toml

···
 [workspace]
-members = ["wire/key_agent", "wire/lib", "wire/cli"]
+members = ["wire/agent", "wire/lib", "wire/cli"]
 resolver = "2"
 package.edition = "2024"
 package.version = "1.0.0-beta.0"

README.md

···
 │  │  └── Rust library containing business logic, consumed by `wire`
 │  ├── cli
 │  │  └── Rust binary, using `lib`
-│  └── key_agent
+│  └── agent
 │     └── Rust binary ran on a target node. receives key file bytes and metadata w/ protobuf over SSH stdin
 ├── doc
 │  └── a [vitepress](https://vitepress.dev/) site

doc/guides/keys.md

···
 Otherwise, you may see errors such as:
 
 ```
-error: cannot add path '/nix/store/...-wire-tool-key_agent-x86_64-linux-...' because it lacks a signature by a trusted key
+error: cannot add path '/nix/store/...-wire-tool-agent-x86_64-linux-...' because it lacks a signature by a trusted key
 ```
 
 This is a requirement because `nix copy` is used to copy the binary.

doc/guides/non-root-user.md

···
  INFO eval_hive: evaluating hive Flake("/path/to/hive")
 ...
  INFO media | step="Upload key @ NoFilter" progress="3/4"
-deploy-user@node:22 | Authenticate for "sudo /nix/store/.../bin/key_agent":
+deploy-user@node:22 | Authenticate for "sudo /nix/store/.../bin/agent":
 [sudo] password for deploy-user:
 ```
 

flake.nix

···
         ./nix/shells.nix
         ./nix/tests.nix
         ./wire/cli
-        ./wire/key_agent
+        ./wire/agent
         ./doc
         ./tests/nix
         ./runtime

justfile

···
     cargo build --profile profiling --features dhat-heap
     @echo 'dhat binaries in target/profiling'
     @echo 'Example:'
-    @echo 'WIRE_KEY_AGENT=/nix/store/...-key_agent-0.1.0 PROJECT/target/profiling/wire apply ...'
+    @echo 'WIRE_AGENT=/nix/store/...-agent-0.1.0 PROJECT/target/profiling/wire apply ...'

nix/tests.nix

···
 
           installPhaseCommand = ''
             mkdir -p $out
-            cp $(ls target/debug/deps/{wire,lib,key_agent}-* | grep -v "\.d") $out
+            cp $(ls target/debug/deps/{wire,lib,agent}-* | grep -v "\.d") $out
           '';
         }
         // commonArgs

wire/agent/default.nix

···
+{
+  perSystem =
+    {
+      buildRustProgram,
+      system,
+      ...
+    }:
+    {
+      packages = {
+        agent = buildRustProgram {
+          name = "agent";
+          pname = "wire-tool-agent-${system}";
+          cargoExtraArgs = "-p agent";
+        };
+      };
+    };
+}

wire/cli/default.nix

···
     let
       cleanSystem = system: lib.replaceStrings [ "-" ] [ "_" ] system;
       agents = lib.strings.concatMapStrings (
-        system: "--set WIRE_KEY_AGENT_${cleanSystem system} ${(getSystem system).packages.agent} "
+        system: "--set WIRE_AGENT_${cleanSystem system} ${(getSystem system).packages.agent} "
       ) (import inputs.linux-systems);
     in
     {
···
             pkgs.makeWrapper
           ];
           postBuild = ''
-            wrapProgram $out/bin/wire --set WIRE_KEY_AGENT_${cleanSystem system} ${self'.packages.agent}
+            wrapProgram $out/bin/wire --set WIRE_AGENT_${cleanSystem system} ${self'.packages.agent}
           '';
           meta.mainProgram = "wire";
         };

wire/key_agent/Cargo.toml wire/agent/Cargo.toml

···
 [package]
-name = "key_agent"
+name = "agent"
 edition.workspace = true
 version.workspace = true
 

wire/key_agent/default.nix

···
-{
-  perSystem =
-    {
-      buildRustProgram,
-      system,
-      ...
-    }:
-    {
-      packages = {
-        agent = buildRustProgram {
-          name = "key_agent";
-          pname = "wire-tool-key_agent-${system}";
-          cargoExtraArgs = "-p key_agent";
-        };
-      };
-    };
-}

wire/key_agent/src/keys.proto wire/agent/src/keys.proto

···
 
 syntax = "proto3";
 
-package key_agent.keys;
+package agent.keys;
 
 message KeySpec {
   string destination = 1;

wire/key_agent/src/lib.rs wire/agent/src/lib.rs

···
 // Copyright 2024-2025 wire Contributors
 
 pub mod keys {
-    include!(concat!(env!("OUT_DIR"), "/key_agent.keys.rs"));
+    include!(concat!(env!("OUT_DIR"), "/agent.keys.rs"));
 }

wire/key_agent/src/main.rs wire/agent/src/main.rs

···
 use base64::Engine;
 use base64::prelude::BASE64_STANDARD;
 use futures_util::stream::StreamExt;
-use key_agent::keys::KeySpec;
+use agent::keys::KeySpec;
 use nix::unistd::{Group, User};
 use prost::Message;
 use prost::bytes::Bytes;

wire/lib/Cargo.toml

···
 im = { workspace = true }
 thiserror = "2.0.17"
 derive_more = { version = "2.0.1", features = ["display"] }
-key_agent = { path = "../key_agent" }
+agent = { path = "../agent" }
 futures = "0.3.31"
 prost = { workspace = true }
 gethostname = "1.1.0"

wire/lib/src/hive/node.rs

···
     pub evaluation: Option<Derivation>,
     pub evaluation_rx: Option<oneshot::Receiver<Result<Derivation, HiveLibError>>>,
     pub build: Option<String>,
-    pub key_agent_directory: Option<String>,
+    pub agent_directory: Option<String>,
 }
 
 pub struct Context<'a> {

wire/lib/src/hive/steps/keys.rs

···
     }
 }
 
-async fn process_key(key: &Key) -> Result<(key_agent::keys::KeySpec, Vec<u8>), KeyError> {
+async fn process_key(key: &Key) -> Result<(agent::keys::KeySpec, Vec<u8>), KeyError> {
     let mut reader = create_reader(key).await?;
 
     let mut buf = Vec::new();
···
     debug!("Staging push to {}", destination.clone().display());
 
     Ok((
-        key_agent::keys::KeySpec {
+        agent::keys::KeySpec {
             length: buf
                 .len()
                 .try_into()
···
 
     #[instrument(skip_all, name = "keys")]
     async fn execute(&self, ctx: &mut Context<'_>) -> Result<(), HiveLibError> {
-        let agent_directory = ctx.state.key_agent_directory.as_ref().unwrap();
+        let agent_directory = ctx.state.agent_directory.as_ref().unwrap();
 
         let futures = ctx
             .node
···
             return Ok(());
         }
 
-        let command_string = format!("{agent_directory}/bin/key_agent");
+        let command_string = format!("{agent_directory}/bin/agent");
 
         let mut child = run_command(
             &CommandArguments::new(command_string, ctx.modifiers)
···
     #[instrument(skip_all, name = "push_agent")]
     async fn execute(&self, ctx: &mut Context<'_>) -> Result<(), HiveLibError> {
         let arg_name = format!(
-            "WIRE_KEY_AGENT_{platform}",
+            "WIRE_AGENT_{platform}",
             platform = ctx.node.host_platform.replace('-', "_")
         );
 
···
             push(ctx, Push::Path(&agent_directory)).await?;
         }
 
-        ctx.state.key_agent_directory = Some(agent_directory);
+        ctx.state.agent_directory = Some(agent_directory);
 
         Ok(())
     }