refactor: workspace secrets-core + secrets-mcp MCP SaaS

- Split library (db/crypto/service) and MCP/Web/OAuth binary
- Add deploy examples and CI/docs updates

Made-with: Cursor

crates/secrets-core/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "secrets-core"
+version = "0.1.0"
+edition.workspace = true
+
+[lib]
+name = "secrets_core"
+path = "src/lib.rs"
+
+[dependencies]
+aes-gcm.workspace = true
+anyhow.workspace = true
+chrono.workspace = true
+rand.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+serde_yaml.workspace = true
+sha2.workspace = true
+sqlx.workspace = true
+toml.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+uuid.workspace = true
+
+[dev-dependencies]
+tempfile = "3"

crates/secrets-core/src/audit.rs

@@ -0,0 +1,37 @@
+use serde_json::Value;
+use sqlx::{Postgres, Transaction};
+
+/// Return the current OS user as the audit actor (falls back to empty string).
+pub fn current_actor() -> String {
+    std::env::var("USER").unwrap_or_default()
+}
+
+/// Write an audit entry within an existing transaction.
+pub async fn log_tx(
+    tx: &mut Transaction<'_, Postgres>,
+    action: &str,
+    namespace: &str,
+    kind: &str,
+    name: &str,
+    detail: Value,
+) {
+    let actor = current_actor();
+    let result: Result<_, sqlx::Error> = sqlx::query(
+        "INSERT INTO audit_log (action, namespace, kind, name, detail, actor) \
+         VALUES ($1, $2, $3, $4, $5, $6)",
+    )
+    .bind(action)
+    .bind(namespace)
+    .bind(kind)
+    .bind(name)
+    .bind(&detail)
+    .bind(&actor)
+    .execute(&mut **tx)
+    .await;
+
+    if let Err(e) = result {
+        tracing::warn!(error = %e, "failed to write audit log");
+    } else {
+        tracing::debug!(action, namespace, kind, name, actor, "audit logged");
+    }
+}

crates/secrets-core/src/config.rs

@@ -0,0 +1,20 @@
+use anyhow::Result;
+
+/// Resolve database URL from environment.
+/// Priority: `SECRETS_DATABASE_URL` env var → error.
+pub fn resolve_db_url(override_url: &str) -> Result<String> {
+    if !override_url.is_empty() {
+        return Ok(override_url.to_string());
+    }
+
+    if let Ok(url) = std::env::var("SECRETS_DATABASE_URL")
+        && !url.is_empty()
+    {
+        return Ok(url);
+    }
+
+    anyhow::bail!(
+        "Database not configured. Set the SECRETS_DATABASE_URL environment variable.\n\
+         Example: SECRETS_DATABASE_URL=postgres://user:pass@host:port/dbname"
+    )
+}

crates/secrets-core/src/crypto.rs

@@ -0,0 +1,207 @@
+use aes_gcm::{
+    Aes256Gcm, Key, Nonce,
+    aead::{Aead, AeadCore, KeyInit, OsRng},
+};
+use anyhow::{Context, Result, bail};
+use serde_json::Value;
+
+const NONCE_LEN: usize = 12;
+
+// ─── AES-256-GCM encrypt / decrypt ───────────────────────────────────────────
+
+/// Encrypt plaintext bytes with AES-256-GCM.
+/// Returns `nonce (12 B) || ciphertext+tag`.
+pub fn encrypt(master_key: &[u8; 32], plaintext: &[u8]) -> Result<Vec<u8>> {
+    let key = Key::<Aes256Gcm>::from_slice(master_key);
+    let cipher = Aes256Gcm::new(key);
+    let nonce = Aes256Gcm::generate_nonce(&mut OsRng);
+    let ciphertext = cipher
+        .encrypt(&nonce, plaintext)
+        .map_err(|e| anyhow::anyhow!("AES-256-GCM encryption failed: {}", e))?;
+    let mut out = Vec::with_capacity(NONCE_LEN + ciphertext.len());
+    out.extend_from_slice(&nonce);
+    out.extend_from_slice(&ciphertext);
+    Ok(out)
+}
+
+/// Decrypt `nonce (12 B) || ciphertext+tag` with AES-256-GCM.
+pub fn decrypt(master_key: &[u8; 32], data: &[u8]) -> Result<Vec<u8>> {
+    if data.len() < NONCE_LEN {
+        bail!(
+            "encrypted data too short ({}B); possibly corrupted",
+            data.len()
+        );
+    }
+    let (nonce_bytes, ciphertext) = data.split_at(NONCE_LEN);
+    let key = Key::<Aes256Gcm>::from_slice(master_key);
+    let cipher = Aes256Gcm::new(key);
+    let nonce = Nonce::from_slice(nonce_bytes);
+    cipher
+        .decrypt(nonce, ciphertext)
+        .map_err(|_| anyhow::anyhow!("decryption failed — wrong master key or corrupted data"))
+}
+
+// ─── JSON helpers ─────────────────────────────────────────────────────────────
+
+/// Serialize a JSON Value and encrypt it. Returns the encrypted blob.
+pub fn encrypt_json(master_key: &[u8; 32], value: &Value) -> Result<Vec<u8>> {
+    let bytes = serde_json::to_vec(value).context("serialize JSON for encryption")?;
+    encrypt(master_key, &bytes)
+}
+
+/// Decrypt an encrypted blob and deserialize it as a JSON Value.
+pub fn decrypt_json(master_key: &[u8; 32], data: &[u8]) -> Result<Value> {
+    let bytes = decrypt(master_key, data)?;
+    serde_json::from_slice(&bytes).context("deserialize decrypted JSON")
+}
+
+// ─── Per-user key management (DEPRECATED — kept only for migration) ───────────
+
+/// Generate a new random 32-byte per-user encryption key.
+#[allow(dead_code)]
+pub fn generate_user_key() -> [u8; 32] {
+    use aes_gcm::aead::rand_core::RngCore;
+    let mut key = [0u8; 32];
+    OsRng.fill_bytes(&mut key);
+    key
+}
+
+/// Wrap a per-user key with the server master key using AES-256-GCM.
+#[allow(dead_code)]
+pub fn wrap_user_key(server_master_key: &[u8; 32], user_key: &[u8; 32]) -> Result<Vec<u8>> {
+    encrypt(server_master_key, user_key.as_ref())
+}
+
+/// Unwrap a per-user key using the server master key.
+#[allow(dead_code)]
+pub fn unwrap_user_key(server_master_key: &[u8; 32], wrapped: &[u8]) -> Result<[u8; 32]> {
+    let bytes = decrypt(server_master_key, wrapped)?;
+    if bytes.len() != 32 {
+        bail!("unwrapped user key has unexpected length {}", bytes.len());
+    }
+    let mut key = [0u8; 32];
+    key.copy_from_slice(&bytes);
+    Ok(key)
+}
+
+// ─── Client-supplied key extraction ──────────────────────────────────────────
+
+/// Parse a 64-char hex string (from X-Encryption-Key header) into a 32-byte key.
+pub fn extract_key_from_hex(hex_str: &str) -> Result<[u8; 32]> {
+    let bytes = hex::decode_hex(hex_str.trim())?;
+    if bytes.len() != 32 {
+        bail!(
+            "X-Encryption-Key must be 64 hex chars (32 bytes), got {} bytes",
+            bytes.len()
+        );
+    }
+    let mut key = [0u8; 32];
+    key.copy_from_slice(&bytes);
+    Ok(key)
+}
+
+// ─── Server master key ────────────────────────────────────────────────────────
+
+/// Load the server master key from `SERVER_MASTER_KEY` environment variable (64 hex chars).
+pub fn load_master_key_auto() -> Result<[u8; 32]> {
+    let hex_str = std::env::var("SERVER_MASTER_KEY").map_err(|_| {
+        anyhow::anyhow!(
+            "SERVER_MASTER_KEY is not set. \
+             Generate one with: openssl rand -hex 32"
+        )
+    })?;
+
+    if hex_str.is_empty() {
+        bail!("SERVER_MASTER_KEY is set but empty");
+    }
+
+    let bytes = hex::decode_hex(hex_str.trim())?;
+    if bytes.len() != 32 {
+        bail!(
+            "SERVER_MASTER_KEY must be 64 hex chars (32 bytes), got {} bytes",
+            bytes.len()
+        );
+    }
+    let mut key = [0u8; 32];
+    key.copy_from_slice(&bytes);
+    Ok(key)
+}
+
+// ─── Public hex helpers ───────────────────────────────────────────────────────
+
+pub mod hex {
+    use anyhow::{Result, bail};
+
+    pub fn encode_hex(bytes: &[u8]) -> String {
+        bytes.iter().map(|b| format!("{:02x}", b)).collect()
+    }
+
+    pub fn decode_hex(s: &str) -> Result<Vec<u8>> {
+        let s = s.trim();
+        if !s.len().is_multiple_of(2) {
+            bail!("hex string has odd length");
+        }
+        (0..s.len())
+            .step_by(2)
+            .map(|i| u8::from_str_radix(&s[i..i + 2], 16).map_err(|e| anyhow::anyhow!("{}", e)))
+            .collect()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn roundtrip_encrypt_decrypt() {
+        let key = [0x42u8; 32];
+        let plaintext = b"hello world";
+        let enc = encrypt(&key, plaintext).unwrap();
+        let dec = decrypt(&key, &enc).unwrap();
+        assert_eq!(dec, plaintext);
+    }
+
+    #[test]
+    fn encrypt_produces_different_ciphertexts() {
+        let key = [0x42u8; 32];
+        let plaintext = b"hello world";
+        let enc1 = encrypt(&key, plaintext).unwrap();
+        let enc2 = encrypt(&key, plaintext).unwrap();
+        assert_ne!(enc1, enc2);
+    }
+
+    #[test]
+    fn wrong_key_fails_decryption() {
+        let key1 = [0x42u8; 32];
+        let key2 = [0x43u8; 32];
+        let enc = encrypt(&key1, b"secret").unwrap();
+        assert!(decrypt(&key2, &enc).is_err());
+    }
+
+    #[test]
+    fn json_roundtrip() {
+        let key = [0x42u8; 32];
+        let value = serde_json::json!({"token": "abc123", "password": "hunter2"});
+        let enc = encrypt_json(&key, &value).unwrap();
+        let dec = decrypt_json(&key, &enc).unwrap();
+        assert_eq!(dec, value);
+    }
+
+    #[test]
+    fn user_key_wrap_unwrap_roundtrip() {
+        let server_key = [0xABu8; 32];
+        let user_key = [0xCDu8; 32];
+        let wrapped = wrap_user_key(&server_key, &user_key).unwrap();
+        let unwrapped = unwrap_user_key(&server_key, &wrapped).unwrap();
+        assert_eq!(unwrapped, user_key);
+    }
+
+    #[test]
+    fn user_key_wrap_wrong_server_key_fails() {
+        let server_key1 = [0xABu8; 32];
+        let server_key2 = [0xEFu8; 32];
+        let user_key = [0xCDu8; 32];
+        let wrapped = wrap_user_key(&server_key1, &user_key).unwrap();
+        assert!(unwrap_user_key(&server_key2, &wrapped).is_err());
+    }
+}

crates/secrets-core/src/db.rs

@@ -0,0 +1,228 @@
+use anyhow::Result;
+use serde_json::Value;
+use sqlx::PgPool;
+use sqlx::postgres::PgPoolOptions;
+
+use crate::audit::current_actor;
+
+pub async fn create_pool(database_url: &str) -> Result<PgPool> {
+    tracing::debug!("connecting to database");
+    let pool = PgPoolOptions::new()
+        .max_connections(10)
+        .acquire_timeout(std::time::Duration::from_secs(5))
+        .connect(database_url)
+        .await?;
+    tracing::debug!("database connection established");
+    Ok(pool)
+}
+
+pub async fn migrate(pool: &PgPool) -> Result<()> {
+    tracing::debug!("running migrations");
+    sqlx::raw_sql(
+        r#"
+        -- ── entries: top-level entities ─────────────────────────────────────────
+        CREATE TABLE IF NOT EXISTS entries (
+            id          UUID PRIMARY KEY DEFAULT uuidv7(),
+            user_id     UUID,
+            namespace   VARCHAR(64)  NOT NULL,
+            kind        VARCHAR(64)  NOT NULL,
+            name        VARCHAR(256) NOT NULL,
+            tags        TEXT[]       NOT NULL DEFAULT '{}',
+            metadata    JSONB        NOT NULL DEFAULT '{}',
+            version     BIGINT       NOT NULL DEFAULT 1,
+            created_at  TIMESTAMPTZ  NOT NULL DEFAULT NOW(),
+            updated_at  TIMESTAMPTZ  NOT NULL DEFAULT NOW()
+        );
+
+        -- Legacy unique constraint without user_id (single-user mode)
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_entries_unique_legacy
+            ON entries(namespace, kind, name)
+            WHERE user_id IS NULL;
+
+        -- Multi-user unique constraint
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_entries_unique_user
+            ON entries(user_id, namespace, kind, name)
+            WHERE user_id IS NOT NULL;
+
+        CREATE INDEX IF NOT EXISTS idx_entries_namespace ON entries(namespace);
+        CREATE INDEX IF NOT EXISTS idx_entries_kind      ON entries(kind);
+        CREATE INDEX IF NOT EXISTS idx_entries_user_id   ON entries(user_id) WHERE user_id IS NOT NULL;
+        CREATE INDEX IF NOT EXISTS idx_entries_tags      ON entries USING GIN(tags);
+        CREATE INDEX IF NOT EXISTS idx_entries_metadata  ON entries USING GIN(metadata jsonb_path_ops);
+
+        -- ── secrets: one row per encrypted field ─────────────────────────────────
+        CREATE TABLE IF NOT EXISTS secrets (
+            id          UUID PRIMARY KEY DEFAULT uuidv7(),
+            entry_id    UUID         NOT NULL REFERENCES entries(id) ON DELETE CASCADE,
+            field_name  VARCHAR(256) NOT NULL,
+            encrypted   BYTEA        NOT NULL DEFAULT '\x',
+            version     BIGINT       NOT NULL DEFAULT 1,
+            created_at  TIMESTAMPTZ  NOT NULL DEFAULT NOW(),
+            updated_at  TIMESTAMPTZ  NOT NULL DEFAULT NOW(),
+            UNIQUE(entry_id, field_name)
+        );
+
+        CREATE INDEX IF NOT EXISTS idx_secrets_entry_id ON secrets(entry_id);
+
+        -- ── audit_log: append-only operation log ─────────────────────────────────
+        CREATE TABLE IF NOT EXISTS audit_log (
+            id          BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+            action      VARCHAR(32)  NOT NULL,
+            namespace   VARCHAR(64)  NOT NULL,
+            kind        VARCHAR(64)  NOT NULL,
+            name        VARCHAR(256) NOT NULL,
+            detail      JSONB        NOT NULL DEFAULT '{}',
+            actor       VARCHAR(128) NOT NULL DEFAULT '',
+            created_at  TIMESTAMPTZ  NOT NULL DEFAULT NOW()
+        );
+
+        CREATE INDEX IF NOT EXISTS idx_audit_log_created  ON audit_log(created_at DESC);
+        CREATE INDEX IF NOT EXISTS idx_audit_log_ns_kind  ON audit_log(namespace, kind);
+
+        -- ── entries_history ───────────────────────────────────────────────────────
+        CREATE TABLE IF NOT EXISTS entries_history (
+            id          BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+            entry_id    UUID         NOT NULL,
+            namespace   VARCHAR(64)  NOT NULL,
+            kind        VARCHAR(64)  NOT NULL,
+            name        VARCHAR(256) NOT NULL,
+            version     BIGINT       NOT NULL,
+            action      VARCHAR(16)  NOT NULL,
+            tags        TEXT[]       NOT NULL DEFAULT '{}',
+            metadata    JSONB        NOT NULL DEFAULT '{}',
+            actor       VARCHAR(128) NOT NULL DEFAULT '',
+            created_at  TIMESTAMPTZ  NOT NULL DEFAULT NOW()
+        );
+
+        CREATE INDEX IF NOT EXISTS idx_entries_history_entry_id
+            ON entries_history(entry_id, version DESC);
+        CREATE INDEX IF NOT EXISTS idx_entries_history_ns_kind_name
+            ON entries_history(namespace, kind, name, version DESC);
+
+        -- ── secrets_history: field-level snapshot ────────────────────────────────
+        CREATE TABLE IF NOT EXISTS secrets_history (
+            id              BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+            entry_id        UUID         NOT NULL,
+            secret_id       UUID         NOT NULL,
+            entry_version   BIGINT       NOT NULL,
+            field_name      VARCHAR(256) NOT NULL,
+            encrypted       BYTEA        NOT NULL DEFAULT '\x',
+            action          VARCHAR(16)  NOT NULL,
+            actor           VARCHAR(128) NOT NULL DEFAULT '',
+            created_at      TIMESTAMPTZ  NOT NULL DEFAULT NOW()
+        );
+
+        CREATE INDEX IF NOT EXISTS idx_secrets_history_entry_id
+            ON secrets_history(entry_id, entry_version DESC);
+        CREATE INDEX IF NOT EXISTS idx_secrets_history_secret_id
+            ON secrets_history(secret_id);
+
+        -- ── users ─────────────────────────────────────────────────────────────────
+        CREATE TABLE IF NOT EXISTS users (
+            id          UUID PRIMARY KEY DEFAULT uuidv7(),
+            email       VARCHAR(256),
+            name        VARCHAR(256) NOT NULL DEFAULT '',
+            avatar_url  TEXT,
+            key_salt    BYTEA,
+            key_check   BYTEA,
+            key_params  JSONB,
+            api_key     TEXT UNIQUE,
+            created_at  TIMESTAMPTZ  NOT NULL DEFAULT NOW(),
+            updated_at  TIMESTAMPTZ  NOT NULL DEFAULT NOW()
+        );
+
+        -- ── oauth_accounts: per-provider identity links ───────────────────────────
+        CREATE TABLE IF NOT EXISTS oauth_accounts (
+            id          UUID PRIMARY KEY DEFAULT uuidv7(),
+            user_id     UUID         NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+            provider    VARCHAR(32)  NOT NULL,
+            provider_id VARCHAR(256) NOT NULL,
+            email       VARCHAR(256),
+            name        VARCHAR(256),
+            avatar_url  TEXT,
+            created_at  TIMESTAMPTZ  NOT NULL DEFAULT NOW(),
+            UNIQUE(provider, provider_id)
+        );
+
+        CREATE INDEX IF NOT EXISTS idx_oauth_accounts_user ON oauth_accounts(user_id);
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_oauth_accounts_user_provider
+            ON oauth_accounts(user_id, provider);
+        "#,
+    )
+    .execute(pool)
+    .await?;
+    tracing::debug!("migrations complete");
+    Ok(())
+}
+
+// ── Entry-level history snapshot ─────────────────────────────────────────────
+
+pub struct EntrySnapshotParams<'a> {
+    pub entry_id: uuid::Uuid,
+    pub namespace: &'a str,
+    pub kind: &'a str,
+    pub name: &'a str,
+    pub version: i64,
+    pub action: &'a str,
+    pub tags: &'a [String],
+    pub metadata: &'a Value,
+}
+
+pub async fn snapshot_entry_history(
+    tx: &mut sqlx::Transaction<'_, sqlx::Postgres>,
+    p: EntrySnapshotParams<'_>,
+) -> Result<()> {
+    let actor = current_actor();
+    sqlx::query(
+        "INSERT INTO entries_history \
+         (entry_id, namespace, kind, name, version, action, tags, metadata, actor) \
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
+    )
+    .bind(p.entry_id)
+    .bind(p.namespace)
+    .bind(p.kind)
+    .bind(p.name)
+    .bind(p.version)
+    .bind(p.action)
+    .bind(p.tags)
+    .bind(p.metadata)
+    .bind(&actor)
+    .execute(&mut **tx)
+    .await?;
+    Ok(())
+}
+
+// ── Secret field-level history snapshot ──────────────────────────────────────
+
+pub struct SecretSnapshotParams<'a> {
+    pub entry_id: uuid::Uuid,
+    pub secret_id: uuid::Uuid,
+    pub entry_version: i64,
+    pub field_name: &'a str,
+    pub encrypted: &'a [u8],
+    pub action: &'a str,
+}
+
+pub async fn snapshot_secret_history(
+    tx: &mut sqlx::Transaction<'_, sqlx::Postgres>,
+    p: SecretSnapshotParams<'_>,
+) -> Result<()> {
+    let actor = current_actor();
+    sqlx::query(
+        "INSERT INTO secrets_history \
+         (entry_id, secret_id, entry_version, field_name, encrypted, action, actor) \
+         VALUES ($1, $2, $3, $4, $5, $6, $7)",
+    )
+    .bind(p.entry_id)
+    .bind(p.secret_id)
+    .bind(p.entry_version)
+    .bind(p.field_name)
+    .bind(p.encrypted)
+    .bind(p.action)
+    .bind(&actor)
+    .execute(&mut **tx)
+    .await?;
+    Ok(())
+}
+
+// ── DB helpers ────────────────────────────────────────────────────────────────

crates/secrets-core/src/lib.rs

@@ -0,0 +1,6 @@
+pub mod audit;
+pub mod config;
+pub mod crypto;
+pub mod db;
+pub mod models;
+pub mod service;

crates/secrets-core/src/models.rs

@@ -0,0 +1,249 @@
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use std::collections::BTreeMap;
+use uuid::Uuid;
+
+/// A top-level entry (server, service, key, …).
+/// Sensitive fields are stored separately in `secrets`.
+#[derive(Debug, Serialize, Deserialize, sqlx::FromRow)]
+pub struct Entry {
+    pub id: Uuid,
+    pub namespace: String,
+    pub kind: String,
+    pub name: String,
+    pub tags: Vec<String>,
+    pub metadata: Value,
+    pub version: i64,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+}
+
+/// A single encrypted field belonging to an Entry.
+#[derive(Debug, Serialize, Deserialize, sqlx::FromRow)]
+pub struct SecretField {
+    pub id: Uuid,
+    pub entry_id: Uuid,
+    pub field_name: String,
+    /// AES-256-GCM ciphertext: nonce(12B) || ciphertext+tag
+    pub encrypted: Vec<u8>,
+    pub version: i64,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+}
+
+// ── Internal query row types (shared across commands) ─────────────────────────
+
+/// Minimal entry row fetched for write operations (add / update / delete / rollback).
+#[derive(Debug, sqlx::FromRow)]
+pub struct EntryRow {
+    pub id: Uuid,
+    pub version: i64,
+    pub tags: Vec<String>,
+    pub metadata: Value,
+}
+
+/// Minimal secret field row fetched before snapshots or cascade deletes.
+#[derive(Debug, sqlx::FromRow)]
+pub struct SecretFieldRow {
+    pub id: Uuid,
+    pub field_name: String,
+    pub encrypted: Vec<u8>,
+}
+
+// ── Export / Import types ──────────────────────────────────────────────────────
+
+/// Supported file formats for export/import.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum ExportFormat {
+    Json,
+    Toml,
+    Yaml,
+}
+
+impl std::str::FromStr for ExportFormat {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_lowercase().as_str() {
+            "json" => Ok(Self::Json),
+            "toml" => Ok(Self::Toml),
+            "yaml" | "yml" => Ok(Self::Yaml),
+            other => anyhow::bail!("Unknown format '{}'. Expected: json, toml, or yaml", other),
+        }
+    }
+}
+
+impl ExportFormat {
+    /// Infer format from file extension (.json / .toml / .yaml / .yml).
+    pub fn from_extension(path: &str) -> anyhow::Result<Self> {
+        let ext = path.rsplit('.').next().unwrap_or("").to_lowercase();
+        ext.parse().map_err(|_| {
+            anyhow::anyhow!(
+                "Cannot infer format from extension '.{}'. Use --format json|toml|yaml",
+                ext
+            )
+        })
+    }
+
+    /// Serialize ExportData to a string in this format.
+    pub fn serialize(&self, data: &ExportData) -> anyhow::Result<String> {
+        match self {
+            Self::Json => Ok(serde_json::to_string_pretty(data)?),
+            Self::Toml => {
+                let toml_val = json_to_toml_value(&serde_json::to_value(data)?)?;
+                toml::to_string_pretty(&toml_val)
+                    .map_err(|e| anyhow::anyhow!("TOML serialization failed: {}", e))
+            }
+            Self::Yaml => serde_yaml::to_string(data)
+                .map_err(|e| anyhow::anyhow!("YAML serialization failed: {}", e)),
+        }
+    }
+
+    /// Deserialize ExportData from a string in this format.
+    pub fn deserialize(&self, content: &str) -> anyhow::Result<ExportData> {
+        match self {
+            Self::Json => Ok(serde_json::from_str(content)?),
+            Self::Toml => {
+                let toml_val: toml::Value = toml::from_str(content)
+                    .map_err(|e| anyhow::anyhow!("TOML parse error: {}", e))?;
+                let json_val = toml_to_json_value(&toml_val);
+                Ok(serde_json::from_value(json_val)?)
+            }
+            Self::Yaml => serde_yaml::from_str(content)
+                .map_err(|e| anyhow::anyhow!("YAML parse error: {}", e)),
+        }
+    }
+}
+
+/// Top-level structure for export/import files.
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ExportData {
+    pub version: u32,
+    pub exported_at: String,
+    pub entries: Vec<ExportEntry>,
+}
+
+/// A single entry with decrypted secrets for export/import.
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ExportEntry {
+    pub namespace: String,
+    pub kind: String,
+    pub name: String,
+    #[serde(default)]
+    pub tags: Vec<String>,
+    #[serde(default)]
+    pub metadata: Value,
+    /// Decrypted secret fields. None means no secrets in this export (--no-secrets).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub secrets: Option<BTreeMap<String, Value>>,
+}
+
+// ── Multi-user models ──────────────────────────────────────────────────────────
+
+/// A registered user (created on first OAuth login).
+#[derive(Debug, Serialize, Deserialize, sqlx::FromRow)]
+pub struct User {
+    pub id: Uuid,
+    pub email: Option<String>,
+    pub name: String,
+    pub avatar_url: Option<String>,
+    /// PBKDF2 salt (32 B). NULL until user sets up passphrase.
+    pub key_salt: Option<Vec<u8>>,
+    /// AES-256-GCM encryption of the known constant "secrets-mcp-key-check".
+    /// Used to verify the passphrase without storing the key itself.
+    pub key_check: Option<Vec<u8>>,
+    /// Key derivation parameters, e.g. {"alg":"pbkdf2-sha256","iterations":600000}.
+    pub key_params: Option<serde_json::Value>,
+    /// Plaintext API key for MCP Bearer authentication. Auto-created on first login.
+    pub api_key: Option<String>,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+}
+
+/// An OAuth account linked to a user.
+#[derive(Debug, Serialize, Deserialize, sqlx::FromRow)]
+pub struct OauthAccount {
+    pub id: Uuid,
+    pub user_id: Uuid,
+    pub provider: String,
+    pub provider_id: String,
+    pub email: Option<String>,
+    pub name: Option<String>,
+    pub avatar_url: Option<String>,
+    pub created_at: DateTime<Utc>,
+}
+
+// ── TOML ↔ JSON value conversion ──────────────────────────────────────────────
+
+/// Convert a serde_json Value to a toml Value.
+/// `null` values are filtered out (TOML does not support null).
+/// Mixed-type arrays are serialised as JSON strings.
+pub fn json_to_toml_value(v: &Value) -> anyhow::Result<toml::Value> {
+    match v {
+        Value::Null => anyhow::bail!("TOML does not support null values"),
+        Value::Bool(b) => Ok(toml::Value::Boolean(*b)),
+        Value::Number(n) => {
+            if let Some(i) = n.as_i64() {
+                Ok(toml::Value::Integer(i))
+            } else if let Some(f) = n.as_f64() {
+                Ok(toml::Value::Float(f))
+            } else {
+                anyhow::bail!("unsupported number: {}", n)
+            }
+        }
+        Value::String(s) => Ok(toml::Value::String(s.clone())),
+        Value::Array(arr) => {
+            let items: anyhow::Result<Vec<toml::Value>> =
+                arr.iter().map(json_to_toml_value).collect();
+            match items {
+                Ok(vals) => Ok(toml::Value::Array(vals)),
+                Err(e) => {
+                    tracing::debug!(error = %e, "mixed-type array; falling back to JSON string");
+                    Ok(toml::Value::String(serde_json::to_string(v)?))
+                }
+            }
+        }
+        Value::Object(map) => {
+            let mut toml_map = toml::map::Map::new();
+            for (k, val) in map {
+                if val.is_null() {
+                    // Skip null entries
+                    continue;
+                }
+                match json_to_toml_value(val) {
+                    Ok(tv) => {
+                        toml_map.insert(k.clone(), tv);
+                    }
+                    Err(e) => {
+                        tracing::debug!(key = %k, error = %e, "field not representable in TOML; falling back to JSON string");
+                        toml_map
+                            .insert(k.clone(), toml::Value::String(serde_json::to_string(val)?));
+                    }
+                }
+            }
+            Ok(toml::Value::Table(toml_map))
+        }
+    }
+}
+
+/// Convert a toml Value back to a serde_json Value.
+pub fn toml_to_json_value(v: &toml::Value) -> Value {
+    match v {
+        toml::Value::Boolean(b) => Value::Bool(*b),
+        toml::Value::Integer(i) => Value::Number((*i).into()),
+        toml::Value::Float(f) => serde_json::Number::from_f64(*f)
+            .map(Value::Number)
+            .unwrap_or(Value::Null),
+        toml::Value::String(s) => Value::String(s.clone()),
+        toml::Value::Datetime(dt) => Value::String(dt.to_string()),
+        toml::Value::Array(arr) => Value::Array(arr.iter().map(toml_to_json_value).collect()),
+        toml::Value::Table(map) => {
+            let obj: serde_json::Map<String, Value> = map
+                .iter()
+                .map(|(k, v)| (k.clone(), toml_to_json_value(v)))
+                .collect();
+            Value::Object(obj)
+        }
+    }
+}

crates/secrets-core/src/service/add.rs

@@ -0,0 +1,383 @@
+use anyhow::Result;
+use serde_json::{Map, Value};
+use sqlx::PgPool;
+use std::fs;
+use uuid::Uuid;
+
+use crate::crypto;
+use crate::db;
+use crate::models::EntryRow;
+
+// ── Key/value parsing helpers ─────────────────────────────────────────────────
+
+pub fn parse_kv(entry: &str) -> Result<(Vec<String>, Value)> {
+    if let Some((key, json_str)) = entry.split_once(":=") {
+        let val: Value = serde_json::from_str(json_str).map_err(|e| {
+            anyhow::anyhow!(
+                "Invalid JSON value for key '{}': {} (use key=value for plain strings)",
+                key,
+                e
+            )
+        })?;
+        return Ok((parse_key_path(key)?, val));
+    }
+
+    if let Some((key, raw_val)) = entry.split_once('=') {
+        let value = if let Some(path) = raw_val.strip_prefix('@') {
+            fs::read_to_string(path)
+                .map_err(|e| anyhow::anyhow!("Failed to read file '{}': {}", path, e))?
+        } else {
+            raw_val.to_string()
+        };
+        return Ok((parse_key_path(key)?, Value::String(value)));
+    }
+
+    if let Some((key, path)) = entry.split_once('@') {
+        let value = fs::read_to_string(path)
+            .map_err(|e| anyhow::anyhow!("Failed to read file '{}': {}", path, e))?;
+        return Ok((parse_key_path(key)?, Value::String(value)));
+    }
+
+    anyhow::bail!(
+        "Invalid format '{}'. Expected: key=value, key=@file, nested:key@file, or key:=<json>",
+        entry
+    )
+}
+
+pub fn build_json(entries: &[String]) -> Result<Value> {
+    let mut map = Map::new();
+    for entry in entries {
+        let (path, value) = parse_kv(entry)?;
+        insert_path(&mut map, &path, value)?;
+    }
+    Ok(Value::Object(map))
+}
+
+pub fn key_path_to_string(path: &[String]) -> String {
+    path.join(":")
+}
+
+pub fn collect_key_paths(entries: &[String]) -> Result<Vec<String>> {
+    entries
+        .iter()
+        .map(|entry| parse_kv(entry).map(|(path, _)| key_path_to_string(&path)))
+        .collect()
+}
+
+pub fn collect_field_paths(entries: &[String]) -> Result<Vec<String>> {
+    entries
+        .iter()
+        .map(|entry| parse_key_path(entry).map(|path| key_path_to_string(&path)))
+        .collect()
+}
+
+pub fn parse_key_path(key: &str) -> Result<Vec<String>> {
+    let path: Vec<String> = key
+        .split(':')
+        .map(str::trim)
+        .map(ToOwned::to_owned)
+        .collect();
+
+    if path.is_empty() || path.iter().any(|part| part.is_empty()) {
+        anyhow::bail!(
+            "Invalid key path '{}'. Use non-empty segments like 'credentials:content'.",
+            key
+        );
+    }
+    Ok(path)
+}
+
+pub fn insert_path(map: &mut Map<String, Value>, path: &[String], value: Value) -> Result<()> {
+    if path.is_empty() {
+        anyhow::bail!("Key path cannot be empty");
+    }
+    if path.len() == 1 {
+        map.insert(path[0].clone(), value);
+        return Ok(());
+    }
+    let head = path[0].clone();
+    let tail = &path[1..];
+    match map.entry(head.clone()) {
+        serde_json::map::Entry::Vacant(entry) => {
+            let mut child = Map::new();
+            insert_path(&mut child, tail, value)?;
+            entry.insert(Value::Object(child));
+        }
+        serde_json::map::Entry::Occupied(mut entry) => match entry.get_mut() {
+            Value::Object(child) => insert_path(child, tail, value)?,
+            _ => {
+                anyhow::bail!(
+                    "Cannot set nested key '{}' because '{}' is already a non-object value",
+                    key_path_to_string(path),
+                    head
+                );
+            }
+        },
+    }
+    Ok(())
+}
+
+pub fn remove_path(map: &mut Map<String, Value>, path: &[String]) -> Result<bool> {
+    if path.is_empty() {
+        anyhow::bail!("Key path cannot be empty");
+    }
+    if path.len() == 1 {
+        return Ok(map.remove(&path[0]).is_some());
+    }
+    let Some(value) = map.get_mut(&path[0]) else {
+        return Ok(false);
+    };
+    let Value::Object(child) = value else {
+        return Ok(false);
+    };
+    let removed = remove_path(child, &path[1..])?;
+    if child.is_empty() {
+        map.remove(&path[0]);
+    }
+    Ok(removed)
+}
+
+pub fn flatten_json_fields(prefix: &str, value: &Value) -> Vec<(String, Value)> {
+    match value {
+        Value::Object(map) => {
+            let mut out = Vec::new();
+            for (k, v) in map {
+                let full_key = if prefix.is_empty() {
+                    k.clone()
+                } else {
+                    format!("{}.{}", prefix, k)
+                };
+                out.extend(flatten_json_fields(&full_key, v));
+            }
+            out
+        }
+        other => vec![(prefix.to_string(), other.clone())],
+    }
+}
+
+// ── AddResult ─────────────────────────────────────────────────────────────────
+
+#[derive(Debug, serde::Serialize)]
+pub struct AddResult {
+    pub namespace: String,
+    pub kind: String,
+    pub name: String,
+    pub tags: Vec<String>,
+    pub meta_keys: Vec<String>,
+    pub secret_keys: Vec<String>,
+}
+
+pub struct AddParams<'a> {
+    pub namespace: &'a str,
+    pub kind: &'a str,
+    pub name: &'a str,
+    pub tags: &'a [String],
+    pub meta_entries: &'a [String],
+    pub secret_entries: &'a [String],
+    /// Optional user_id for multi-user isolation (None = single-user CLI mode)
+    pub user_id: Option<Uuid>,
+}
+
+pub async fn run(pool: &PgPool, params: AddParams<'_>, master_key: &[u8; 32]) -> Result<AddResult> {
+    let metadata = build_json(params.meta_entries)?;
+    let secret_json = build_json(params.secret_entries)?;
+    let meta_keys = collect_key_paths(params.meta_entries)?;
+    let secret_keys = collect_key_paths(params.secret_entries)?;
+
+    let mut tx = pool.begin().await?;
+
+    // Fetch existing entry (user-scoped or global depending on user_id)
+    let existing: Option<EntryRow> = if let Some(uid) = params.user_id {
+        sqlx::query_as(
+            "SELECT id, version, tags, metadata FROM entries \
+             WHERE user_id = $1 AND namespace = $2 AND kind = $3 AND name = $4",
+        )
+        .bind(uid)
+        .bind(params.namespace)
+        .bind(params.kind)
+        .bind(params.name)
+        .fetch_optional(&mut *tx)
+        .await?
+    } else {
+        sqlx::query_as(
+            "SELECT id, version, tags, metadata FROM entries \
+             WHERE user_id IS NULL AND namespace = $1 AND kind = $2 AND name = $3",
+        )
+        .bind(params.namespace)
+        .bind(params.kind)
+        .bind(params.name)
+        .fetch_optional(&mut *tx)
+        .await?
+    };
+
+    if let Some(ref ex) = existing
+        && let Err(e) = db::snapshot_entry_history(
+            &mut tx,
+            db::EntrySnapshotParams {
+                entry_id: ex.id,
+                namespace: params.namespace,
+                kind: params.kind,
+                name: params.name,
+                version: ex.version,
+                action: "add",
+                tags: &ex.tags,
+                metadata: &ex.metadata,
+            },
+        )
+        .await
+    {
+        tracing::warn!(error = %e, "failed to snapshot entry history before upsert");
+    }
+
+    let entry_id: Uuid = if let Some(uid) = params.user_id {
+        sqlx::query_scalar(
+            r#"INSERT INTO entries (user_id, namespace, kind, name, tags, metadata, version, updated_at)
+               VALUES ($1, $2, $3, $4, $5, $6, 1, NOW())
+               ON CONFLICT (user_id, namespace, kind, name) WHERE user_id IS NOT NULL
+               DO UPDATE SET
+                   tags       = EXCLUDED.tags,
+                   metadata   = EXCLUDED.metadata,
+                   version    = entries.version + 1,
+                   updated_at = NOW()
+               RETURNING id"#,
+        )
+        .bind(uid)
+        .bind(params.namespace)
+        .bind(params.kind)
+        .bind(params.name)
+        .bind(params.tags)
+        .bind(&metadata)
+        .fetch_one(&mut *tx)
+        .await?
+    } else {
+        sqlx::query_scalar(
+            r#"INSERT INTO entries (namespace, kind, name, tags, metadata, version, updated_at)
+               VALUES ($1, $2, $3, $4, $5, 1, NOW())
+               ON CONFLICT (namespace, kind, name) WHERE user_id IS NULL
+               DO UPDATE SET
+                   tags       = EXCLUDED.tags,
+                   metadata   = EXCLUDED.metadata,
+                   version    = entries.version + 1,
+                   updated_at = NOW()
+               RETURNING id"#,
+        )
+        .bind(params.namespace)
+        .bind(params.kind)
+        .bind(params.name)
+        .bind(params.tags)
+        .bind(&metadata)
+        .fetch_one(&mut *tx)
+        .await?
+    };
+
+    let new_entry_version: i64 = sqlx::query_scalar("SELECT version FROM entries WHERE id = $1")
+        .bind(entry_id)
+        .fetch_one(&mut *tx)
+        .await?;
+
+    if existing.is_some() {
+        #[derive(sqlx::FromRow)]
+        struct ExistingField {
+            id: Uuid,
+            field_name: String,
+            encrypted: Vec<u8>,
+        }
+        let existing_fields: Vec<ExistingField> =
+            sqlx::query_as("SELECT id, field_name, encrypted FROM secrets WHERE entry_id = $1")
+                .bind(entry_id)
+                .fetch_all(&mut *tx)
+                .await?;
+
+        for f in &existing_fields {
+            if let Err(e) = db::snapshot_secret_history(
+                &mut tx,
+                db::SecretSnapshotParams {
+                    entry_id,
+                    secret_id: f.id,
+                    entry_version: new_entry_version - 1,
+                    field_name: &f.field_name,
+                    encrypted: &f.encrypted,
+                    action: "add",
+                },
+            )
+            .await
+            {
+                tracing::warn!(error = %e, "failed to snapshot secret field history");
+            }
+        }
+
+        sqlx::query("DELETE FROM secrets WHERE entry_id = $1")
+            .bind(entry_id)
+            .execute(&mut *tx)
+            .await?;
+    }
+
+    let flat_fields = flatten_json_fields("", &secret_json);
+    for (field_name, field_value) in &flat_fields {
+        let encrypted = crypto::encrypt_json(master_key, field_value)?;
+        sqlx::query("INSERT INTO secrets (entry_id, field_name, encrypted) VALUES ($1, $2, $3)")
+            .bind(entry_id)
+            .bind(field_name)
+            .bind(&encrypted)
+            .execute(&mut *tx)
+            .await?;
+    }
+
+    crate::audit::log_tx(
+        &mut tx,
+        "add",
+        params.namespace,
+        params.kind,
+        params.name,
+        serde_json::json!({
+            "tags": params.tags,
+            "meta_keys": meta_keys,
+            "secret_keys": secret_keys,
+        }),
+    )
+    .await;
+
+    tx.commit().await?;
+
+    Ok(AddResult {
+        namespace: params.namespace.to_string(),
+        kind: params.kind.to_string(),
+        name: params.name.to_string(),
+        tags: params.tags.to_vec(),
+        meta_keys,
+        secret_keys,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_nested_file_shorthand() {
+        use std::io::Write;
+        let mut f = tempfile::NamedTempFile::new().unwrap();
+        writeln!(f, "line1\nline2").unwrap();
+        let path = f.path().to_str().unwrap().to_string();
+        let entry = format!("credentials:content@{}", path);
+        let (path_parts, value) = parse_kv(&entry).unwrap();
+        assert_eq!(key_path_to_string(&path_parts), "credentials:content");
+        assert!(matches!(value, Value::String(_)));
+    }
+
+    #[test]
+    fn flatten_json_fields_nested() {
+        let v = serde_json::json!({
+            "username": "root",
+            "credentials": {
+                "type": "ssh",
+                "content": "pem"
+            }
+        });
+        let mut fields = flatten_json_fields("", &v);
+        fields.sort_by(|a, b| a.0.cmp(&b.0));
+        assert_eq!(fields[0].0, "credentials.content");
+        assert_eq!(fields[1].0, "credentials.type");
+        assert_eq!(fields[2].0, "username");
+    }
+}

crates/secrets-core/src/service/api_key.rs

@@ -0,0 +1,55 @@
+use anyhow::Result;
+use sqlx::PgPool;
+use uuid::Uuid;
+
+const KEY_PREFIX: &str = "sk_";
+
+/// Generate a new API key: `sk_<64 hex chars>` = 67 characters total.
+pub fn generate_api_key() -> String {
+    use rand::RngExt;
+    let mut bytes = [0u8; 32];
+    rand::rng().fill(&mut bytes);
+    let hex: String = bytes.iter().map(|b| format!("{:02x}", b)).collect();
+    format!("{}{}", KEY_PREFIX, hex)
+}
+
+/// Return the user's existing API key, or generate and store a new one if NULL.
+pub async fn ensure_api_key(pool: &PgPool, user_id: Uuid) -> Result<String> {
+    let existing: Option<(Option<String>,)> =
+        sqlx::query_as("SELECT api_key FROM users WHERE id = $1")
+            .bind(user_id)
+            .fetch_optional(pool)
+            .await?;
+
+    if let Some((Some(key),)) = existing {
+        return Ok(key);
+    }
+
+    let new_key = generate_api_key();
+    sqlx::query("UPDATE users SET api_key = $1 WHERE id = $2")
+        .bind(&new_key)
+        .bind(user_id)
+        .execute(pool)
+        .await?;
+    Ok(new_key)
+}
+
+/// Generate a fresh API key for the user, replacing the old one.
+pub async fn regenerate_api_key(pool: &PgPool, user_id: Uuid) -> Result<String> {
+    let new_key = generate_api_key();
+    sqlx::query("UPDATE users SET api_key = $1 WHERE id = $2")
+        .bind(&new_key)
+        .bind(user_id)
+        .execute(pool)
+        .await?;
+    Ok(new_key)
+}
+
+/// Validate a Bearer token. Returns the `user_id` if the key matches.
+pub async fn validate_api_key(pool: &PgPool, raw_key: &str) -> Result<Option<Uuid>> {
+    let row: Option<(Uuid,)> = sqlx::query_as("SELECT id FROM users WHERE api_key = $1")
+        .bind(raw_key)
+        .fetch_optional(pool)
+        .await?;
+    Ok(row.map(|(id,)| id))
+}

crates/secrets-core/src/service/delete.rs

@@ -0,0 +1,268 @@
+use anyhow::Result;
+use serde_json::json;
+use sqlx::PgPool;
+use uuid::Uuid;
+
+use crate::db;
+use crate::models::{EntryRow, SecretFieldRow};
+
+#[derive(Debug, serde::Serialize)]
+pub struct DeletedEntry {
+    pub namespace: String,
+    pub kind: String,
+    pub name: String,
+}
+
+#[derive(Debug, serde::Serialize)]
+pub struct DeleteResult {
+    pub deleted: Vec<DeletedEntry>,
+    pub dry_run: bool,
+}
+
+pub struct DeleteParams<'a> {
+    pub namespace: &'a str,
+    pub kind: Option<&'a str>,
+    pub name: Option<&'a str>,
+    pub dry_run: bool,
+    pub user_id: Option<Uuid>,
+}
+
+pub async fn run(pool: &PgPool, params: DeleteParams<'_>) -> Result<DeleteResult> {
+    match params.name {
+        Some(name) => {
+            let kind = params
+                .kind
+                .ok_or_else(|| anyhow::anyhow!("--kind is required when --name is specified"))?;
+            delete_one(pool, params.namespace, kind, name, params.user_id).await
+        }
+        None => {
+            delete_bulk(
+                pool,
+                params.namespace,
+                params.kind,
+                params.dry_run,
+                params.user_id,
+            )
+            .await
+        }
+    }
+}
+
+async fn delete_one(
+    pool: &PgPool,
+    namespace: &str,
+    kind: &str,
+    name: &str,
+    user_id: Option<Uuid>,
+) -> Result<DeleteResult> {
+    let mut tx = pool.begin().await?;
+
+    let row: Option<EntryRow> = if let Some(uid) = user_id {
+        sqlx::query_as(
+            "SELECT id, version, tags, metadata FROM entries \
+             WHERE user_id = $1 AND namespace = $2 AND kind = $3 AND name = $4 FOR UPDATE",
+        )
+        .bind(uid)
+        .bind(namespace)
+        .bind(kind)
+        .bind(name)
+        .fetch_optional(&mut *tx)
+        .await?
+    } else {
+        sqlx::query_as(
+            "SELECT id, version, tags, metadata FROM entries \
+             WHERE user_id IS NULL AND namespace = $1 AND kind = $2 AND name = $3 FOR UPDATE",
+        )
+        .bind(namespace)
+        .bind(kind)
+        .bind(name)
+        .fetch_optional(&mut *tx)
+        .await?
+    };
+
+    let Some(row) = row else {
+        tx.rollback().await?;
+        return Ok(DeleteResult {
+            deleted: vec![],
+            dry_run: false,
+        });
+    };
+
+    snapshot_and_delete(&mut tx, namespace, kind, name, &row).await?;
+    crate::audit::log_tx(&mut tx, "delete", namespace, kind, name, json!({})).await;
+    tx.commit().await?;
+
+    Ok(DeleteResult {
+        deleted: vec![DeletedEntry {
+            namespace: namespace.to_string(),
+            kind: kind.to_string(),
+            name: name.to_string(),
+        }],
+        dry_run: false,
+    })
+}
+
+async fn delete_bulk(
+    pool: &PgPool,
+    namespace: &str,
+    kind: Option<&str>,
+    dry_run: bool,
+    user_id: Option<Uuid>,
+) -> Result<DeleteResult> {
+    #[derive(Debug, sqlx::FromRow)]
+    struct FullEntryRow {
+        id: Uuid,
+        version: i64,
+        kind: String,
+        name: String,
+        metadata: serde_json::Value,
+        tags: Vec<String>,
+    }
+
+    let rows: Vec<FullEntryRow> = match (user_id, kind) {
+        (Some(uid), Some(k)) => {
+            sqlx::query_as(
+                "SELECT id, version, kind, name, metadata, tags FROM entries \
+             WHERE user_id = $1 AND namespace = $2 AND kind = $3 ORDER BY name",
+            )
+            .bind(uid)
+            .bind(namespace)
+            .bind(k)
+            .fetch_all(pool)
+            .await?
+        }
+        (Some(uid), None) => {
+            sqlx::query_as(
+                "SELECT id, version, kind, name, metadata, tags FROM entries \
+             WHERE user_id = $1 AND namespace = $2 ORDER BY kind, name",
+            )
+            .bind(uid)
+            .bind(namespace)
+            .fetch_all(pool)
+            .await?
+        }
+        (None, Some(k)) => {
+            sqlx::query_as(
+                "SELECT id, version, kind, name, metadata, tags FROM entries \
+             WHERE user_id IS NULL AND namespace = $1 AND kind = $2 ORDER BY name",
+            )
+            .bind(namespace)
+            .bind(k)
+            .fetch_all(pool)
+            .await?
+        }
+        (None, None) => {
+            sqlx::query_as(
+                "SELECT id, version, kind, name, metadata, tags FROM entries \
+             WHERE user_id IS NULL AND namespace = $1 ORDER BY kind, name",
+            )
+            .bind(namespace)
+            .fetch_all(pool)
+            .await?
+        }
+    };
+
+    if dry_run {
+        let deleted = rows
+            .iter()
+            .map(|r| DeletedEntry {
+                namespace: namespace.to_string(),
+                kind: r.kind.clone(),
+                name: r.name.clone(),
+            })
+            .collect();
+        return Ok(DeleteResult {
+            deleted,
+            dry_run: true,
+        });
+    }
+
+    let mut deleted = Vec::with_capacity(rows.len());
+    for row in &rows {
+        let entry_row = EntryRow {
+            id: row.id,
+            version: row.version,
+            tags: row.tags.clone(),
+            metadata: row.metadata.clone(),
+        };
+        let mut tx = pool.begin().await?;
+        snapshot_and_delete(&mut tx, namespace, &row.kind, &row.name, &entry_row).await?;
+        crate::audit::log_tx(
+            &mut tx,
+            "delete",
+            namespace,
+            &row.kind,
+            &row.name,
+            json!({"bulk": true}),
+        )
+        .await;
+        tx.commit().await?;
+        deleted.push(DeletedEntry {
+            namespace: namespace.to_string(),
+            kind: row.kind.clone(),
+            name: row.name.clone(),
+        });
+    }
+
+    Ok(DeleteResult {
+        deleted,
+        dry_run: false,
+    })
+}
+
+async fn snapshot_and_delete(
+    tx: &mut sqlx::Transaction<'_, sqlx::Postgres>,
+    namespace: &str,
+    kind: &str,
+    name: &str,
+    row: &EntryRow,
+) -> Result<()> {
+    if let Err(e) = db::snapshot_entry_history(
+        tx,
+        db::EntrySnapshotParams {
+            entry_id: row.id,
+            namespace,
+            kind,
+            name,
+            version: row.version,
+            action: "delete",
+            tags: &row.tags,
+            metadata: &row.metadata,
+        },
+    )
+    .await
+    {
+        tracing::warn!(error = %e, "failed to snapshot entry history before delete");
+    }
+
+    let fields: Vec<SecretFieldRow> =
+        sqlx::query_as("SELECT id, field_name, encrypted FROM secrets WHERE entry_id = $1")
+            .bind(row.id)
+            .fetch_all(&mut **tx)
+            .await?;
+
+    for f in &fields {
+        if let Err(e) = db::snapshot_secret_history(
+            tx,
+            db::SecretSnapshotParams {
+                entry_id: row.id,
+                secret_id: f.id,
+                entry_version: row.version,
+                field_name: &f.field_name,
+                encrypted: &f.encrypted,
+                action: "delete",
+            },
+        )
+        .await
+        {
+            tracing::warn!(error = %e, "failed to snapshot secret history before delete");
+        }
+    }
+
+    sqlx::query("DELETE FROM entries WHERE id = $1")
+        .bind(row.id)
+        .execute(&mut **tx)
+        .await?;
+
+    Ok(())
+}

crates/secrets-core/src/service/env_map.rs

@@ -0,0 +1,124 @@
+use anyhow::Result;
+use serde_json::Value;
+use sqlx::PgPool;
+use std::collections::HashMap;
+use uuid::Uuid;
+
+use crate::crypto;
+use crate::models::Entry;
+use crate::service::search::{fetch_entries, fetch_secrets_for_entries};
+
+/// Build an env variable map from entry secrets (for dry-run preview or injection).
+#[allow(clippy::too_many_arguments)]
+pub async fn build_env_map(
+    pool: &PgPool,
+    namespace: Option<&str>,
+    kind: Option<&str>,
+    name: Option<&str>,
+    tags: &[String],
+    only_fields: &[String],
+    prefix: &str,
+    master_key: &[u8; 32],
+    user_id: Option<Uuid>,
+) -> Result<HashMap<String, String>> {
+    let entries = fetch_entries(pool, namespace, kind, name, tags, None, user_id).await?;
+
+    let mut combined: HashMap<String, String> = HashMap::new();
+
+    for entry in &entries {
+        let entry_map = build_entry_env_map(pool, entry, only_fields, prefix, master_key).await?;
+        combined.extend(entry_map);
+    }
+
+    Ok(combined)
+}
+
+async fn build_entry_env_map(
+    pool: &PgPool,
+    entry: &Entry,
+    only_fields: &[String],
+    prefix: &str,
+    master_key: &[u8; 32],
+) -> Result<HashMap<String, String>> {
+    let entry_ids = vec![entry.id];
+    let secrets_map = fetch_secrets_for_entries(pool, &entry_ids).await?;
+    let all_fields = secrets_map.get(&entry.id).map(Vec::as_slice).unwrap_or(&[]);
+
+    let fields: Vec<_> = if only_fields.is_empty() {
+        all_fields.iter().collect()
+    } else {
+        all_fields
+            .iter()
+            .filter(|f| only_fields.contains(&f.field_name))
+            .collect()
+    };
+
+    let effective_prefix = env_prefix(entry, prefix);
+    let mut map = HashMap::new();
+
+    for f in fields {
+        let decrypted = crypto::decrypt_json(master_key, &f.encrypted)?;
+        let key = format!(
+            "{}_{}",
+            effective_prefix,
+            f.field_name.to_uppercase().replace(['-', '.'], "_")
+        );
+        map.insert(key, json_to_env_string(&decrypted));
+    }
+
+    // Resolve key_ref
+    if let Some(key_ref) = entry.metadata.get("key_ref").and_then(|v| v.as_str()) {
+        let key_entries = fetch_entries(
+            pool,
+            Some(&entry.namespace),
+            Some("key"),
+            Some(key_ref),
+            &[],
+            None,
+            None,
+        )
+        .await?;
+
+        if let Some(key_entry) = key_entries.first() {
+            let key_ids = vec![key_entry.id];
+            let key_fields_map = fetch_secrets_for_entries(pool, &key_ids).await?;
+            let empty = vec![];
+            let key_fields = key_fields_map.get(&key_entry.id).unwrap_or(&empty);
+            let key_prefix = env_prefix(key_entry, prefix);
+            for f in key_fields {
+                let decrypted = crypto::decrypt_json(master_key, &f.encrypted)?;
+                let key_var = format!(
+                    "{}_{}",
+                    key_prefix,
+                    f.field_name.to_uppercase().replace(['-', '.'], "_")
+                );
+                map.insert(key_var, json_to_env_string(&decrypted));
+            }
+        } else {
+            tracing::warn!(key_ref, "key_ref target not found");
+        }
+    }
+
+    Ok(map)
+}
+
+fn env_prefix(entry: &Entry, prefix: &str) -> String {
+    let name_part = entry.name.to_uppercase().replace(['-', '.', ' '], "_");
+    if prefix.is_empty() {
+        name_part
+    } else {
+        format!(
+            "{}_{}",
+            prefix.to_uppercase().replace(['-', '.', ' '], "_"),
+            name_part
+        )
+    }
+}
+
+fn json_to_env_string(v: &Value) -> String {
+    match v {
+        Value::String(s) => s.clone(),
+        Value::Null => String::new(),
+        other => other.to_string(),
+    }
+}

crates/secrets-core/src/service/export.rs

@@ -0,0 +1,139 @@
+use anyhow::Result;
+use serde_json::Value;
+use sqlx::PgPool;
+use std::collections::{BTreeMap, HashMap};
+use uuid::Uuid;
+
+use crate::crypto;
+use crate::models::{ExportData, ExportEntry, ExportFormat};
+use crate::service::search::{fetch_entries, fetch_secrets_for_entries};
+
+pub struct ExportParams<'a> {
+    pub namespace: Option<&'a str>,
+    pub kind: Option<&'a str>,
+    pub name: Option<&'a str>,
+    pub tags: &'a [String],
+    pub query: Option<&'a str>,
+    pub no_secrets: bool,
+    pub user_id: Option<Uuid>,
+}
+
+pub async fn export(
+    pool: &PgPool,
+    params: ExportParams<'_>,
+    master_key: Option<&[u8; 32]>,
+) -> Result<ExportData> {
+    let entries = fetch_entries(
+        pool,
+        params.namespace,
+        params.kind,
+        params.name,
+        params.tags,
+        params.query,
+        params.user_id,
+    )
+    .await?;
+
+    let entry_ids: Vec<Uuid> = entries.iter().map(|e| e.id).collect();
+    let secrets_map: HashMap<Uuid, Vec<_>> = if !params.no_secrets && !entry_ids.is_empty() {
+        fetch_secrets_for_entries(pool, &entry_ids).await?
+    } else {
+        HashMap::new()
+    };
+
+    let mut export_entries: Vec<ExportEntry> = Vec::with_capacity(entries.len());
+    for entry in &entries {
+        let secrets = if params.no_secrets {
+            None
+        } else {
+            let fields = secrets_map.get(&entry.id).map(Vec::as_slice).unwrap_or(&[]);
+            if fields.is_empty() {
+                Some(BTreeMap::new())
+            } else {
+                let mk = master_key
+                    .ok_or_else(|| anyhow::anyhow!("master key required to decrypt secrets"))?;
+                let mut map = BTreeMap::new();
+                for f in fields {
+                    let decrypted = crypto::decrypt_json(mk, &f.encrypted)?;
+                    map.insert(f.field_name.clone(), decrypted);
+                }
+                Some(map)
+            }
+        };
+
+        export_entries.push(ExportEntry {
+            namespace: entry.namespace.clone(),
+            kind: entry.kind.clone(),
+            name: entry.name.clone(),
+            tags: entry.tags.clone(),
+            metadata: entry.metadata.clone(),
+            secrets,
+        });
+    }
+
+    Ok(ExportData {
+        version: 1,
+        exported_at: chrono::Utc::now().format("%Y-%m-%dT%H:%M:%SZ").to_string(),
+        entries: export_entries,
+    })
+}
+
+pub async fn export_to_file(
+    pool: &PgPool,
+    params: ExportParams<'_>,
+    master_key: Option<&[u8; 32]>,
+    file_path: &str,
+    format_override: Option<&str>,
+) -> Result<usize> {
+    let format = if let Some(f) = format_override {
+        f.parse::<ExportFormat>()?
+    } else {
+        ExportFormat::from_extension(file_path).unwrap_or(ExportFormat::Json)
+    };
+
+    let data = export(pool, params, master_key).await?;
+    let count = data.entries.len();
+    let serialized = format.serialize(&data)?;
+    std::fs::write(file_path, &serialized)?;
+    Ok(count)
+}
+
+pub async fn export_to_string(
+    pool: &PgPool,
+    params: ExportParams<'_>,
+    master_key: Option<&[u8; 32]>,
+    format: &str,
+) -> Result<String> {
+    let fmt = format.parse::<ExportFormat>()?;
+    let data = export(pool, params, master_key).await?;
+    fmt.serialize(&data)
+}
+
+// ── Build helpers for re-encoding values as CLI-style entries ─────────────────
+
+pub fn build_meta_entries(metadata: &Value) -> Vec<String> {
+    let mut entries = Vec::new();
+    if let Some(obj) = metadata.as_object() {
+        for (k, v) in obj {
+            entries.push(value_to_kv_entry(k, v));
+        }
+    }
+    entries
+}
+
+pub fn build_secret_entries(secrets: Option<&BTreeMap<String, Value>>) -> Vec<String> {
+    let mut entries = Vec::new();
+    if let Some(map) = secrets {
+        for (k, v) in map {
+            entries.push(value_to_kv_entry(k, v));
+        }
+    }
+    entries
+}
+
+pub fn value_to_kv_entry(key: &str, value: &Value) -> String {
+    match value {
+        Value::String(s) => format!("{}={}", key, s),
+        other => format!("{}:={}", key, other),
+    }
+}

crates/secrets-core/src/service/get_secret.rs

@@ -0,0 +1,79 @@
+use anyhow::Result;
+use serde_json::Value;
+use sqlx::PgPool;
+use std::collections::HashMap;
+use uuid::Uuid;
+
+use crate::crypto;
+use crate::service::search::{fetch_entries, fetch_secrets_for_entries};
+
+/// Decrypt a single named field from an entry.
+pub async fn get_secret_field(
+    pool: &PgPool,
+    namespace: &str,
+    kind: &str,
+    name: &str,
+    field_name: &str,
+    master_key: &[u8; 32],
+    user_id: Option<Uuid>,
+) -> Result<Value> {
+    let entries = fetch_entries(
+        pool,
+        Some(namespace),
+        Some(kind),
+        Some(name),
+        &[],
+        None,
+        user_id,
+    )
+    .await?;
+    let entry = entries
+        .first()
+        .ok_or_else(|| anyhow::anyhow!("Not found: [{}/{}] {}", namespace, kind, name))?;
+
+    let entry_ids = vec![entry.id];
+    let secrets_map = fetch_secrets_for_entries(pool, &entry_ids).await?;
+    let fields = secrets_map.get(&entry.id).map(Vec::as_slice).unwrap_or(&[]);
+
+    let field = fields
+        .iter()
+        .find(|f| f.field_name == field_name)
+        .ok_or_else(|| anyhow::anyhow!("Secret field '{}' not found", field_name))?;
+
+    crypto::decrypt_json(master_key, &field.encrypted)
+}
+
+/// Decrypt all secret fields from an entry. Returns a map field_name → decrypted Value.
+pub async fn get_all_secrets(
+    pool: &PgPool,
+    namespace: &str,
+    kind: &str,
+    name: &str,
+    master_key: &[u8; 32],
+    user_id: Option<Uuid>,
+) -> Result<HashMap<String, Value>> {
+    let entries = fetch_entries(
+        pool,
+        Some(namespace),
+        Some(kind),
+        Some(name),
+        &[],
+        None,
+        user_id,
+    )
+    .await?;
+    let entry = entries
+        .first()
+        .ok_or_else(|| anyhow::anyhow!("Not found: [{}/{}] {}", namespace, kind, name))?;
+
+    let entry_ids = vec![entry.id];
+    let secrets_map = fetch_secrets_for_entries(pool, &entry_ids).await?;
+    let fields = secrets_map.get(&entry.id).map(Vec::as_slice).unwrap_or(&[]);
+
+    let mut map = HashMap::new();
+    for f in fields {
+        let decrypted = crypto::decrypt_json(master_key, &f.encrypted)?;
+        map.insert(f.field_name.clone(), decrypted);
+    }
+    Ok(map)
+}

crates/secrets-core/src/service/history.rs

@@ -0,0 +1,63 @@
+use anyhow::Result;
+use serde_json::Value;
+use sqlx::PgPool;
+use uuid::Uuid;
+
+#[derive(Debug, serde::Serialize)]
+pub struct HistoryEntry {
+    pub version: i64,
+    pub action: String,
+    pub actor: String,
+    pub created_at: String,
+}
+
+pub async fn run(
+    pool: &PgPool,
+    namespace: &str,
+    kind: &str,
+    name: &str,
+    limit: u32,
+    _user_id: Option<Uuid>,
+) -> Result<Vec<HistoryEntry>> {
+    #[derive(sqlx::FromRow)]
+    struct Row {
+        version: i64,
+        action: String,
+        actor: String,
+        created_at: chrono::DateTime<chrono::Utc>,
+    }
+
+    let rows: Vec<Row> = sqlx::query_as(
+        "SELECT version, action, actor, created_at FROM entries_history \
+         WHERE namespace = $1 AND kind = $2 AND name = $3 \
+         ORDER BY id DESC LIMIT $4",
+    )
+    .bind(namespace)
+    .bind(kind)
+    .bind(name)
+    .bind(limit as i64)
+    .fetch_all(pool)
+    .await?;
+
+    Ok(rows
+        .into_iter()
+        .map(|r| HistoryEntry {
+            version: r.version,
+            action: r.action,
+            actor: r.actor,
+            created_at: r.created_at.format("%Y-%m-%dT%H:%M:%SZ").to_string(),
+        })
+        .collect())
+}
+
+pub async fn run_json(
+    pool: &PgPool,
+    namespace: &str,
+    kind: &str,
+    name: &str,
+    limit: u32,
+    user_id: Option<Uuid>,
+) -> Result<Value> {
+    let entries = run(pool, namespace, kind, name, limit, user_id).await?;
+    Ok(serde_json::to_value(entries)?)
+}

crates/secrets-core/src/service/import.rs

@@ -0,0 +1,123 @@
+use anyhow::Result;
+use sqlx::PgPool;
+use uuid::Uuid;
+
+use crate::models::ExportFormat;
+use crate::service::add::{AddParams, run as add_run};
+use crate::service::export::{build_meta_entries, build_secret_entries};
+
+#[derive(Debug, serde::Serialize)]
+pub struct ImportSummary {
+    pub total: usize,
+    pub inserted: usize,
+    pub skipped: usize,
+    pub failed: usize,
+    pub dry_run: bool,
+}
+
+pub struct ImportParams<'a> {
+    pub file: &'a str,
+    pub force: bool,
+    pub dry_run: bool,
+    pub user_id: Option<Uuid>,
+}
+
+pub async fn run(
+    pool: &PgPool,
+    params: ImportParams<'_>,
+    master_key: &[u8; 32],
+) -> Result<ImportSummary> {
+    let format = ExportFormat::from_extension(params.file)?;
+    let content = std::fs::read_to_string(params.file)
+        .map_err(|e| anyhow::anyhow!("Cannot read file '{}': {}", params.file, e))?;
+    let data = format.deserialize(&content)?;
+
+    if data.version != 1 {
+        anyhow::bail!(
+            "Unsupported export version {}. Only version 1 is supported.",
+            data.version
+        );
+    }
+
+    let total = data.entries.len();
+    let mut inserted = 0usize;
+    let mut skipped = 0usize;
+    let mut failed = 0usize;
+
+    for entry in &data.entries {
+        let exists: bool = sqlx::query_scalar(
+            "SELECT EXISTS(SELECT 1 FROM entries \
+             WHERE namespace = $1 AND kind = $2 AND name = $3 AND user_id IS NOT DISTINCT FROM $4)",
+        )
+        .bind(&entry.namespace)
+        .bind(&entry.kind)
+        .bind(&entry.name)
+        .bind(params.user_id)
+        .fetch_one(pool)
+        .await
+        .unwrap_or(false);
+
+        if exists && !params.force {
+            return Err(anyhow::anyhow!(
+                "Import aborted: conflict on [{}/{}/{}]",
+                entry.namespace,
+                entry.kind,
+                entry.name
+            ));
+        }
+
+        if params.dry_run {
+            if exists {
+                skipped += 1;
+            } else {
+                inserted += 1;
+            }
+            continue;
+        }
+
+        let secret_entries = build_secret_entries(entry.secrets.as_ref());
+        let meta_entries = build_meta_entries(&entry.metadata);
+
+        match add_run(
+            pool,
+            AddParams {
+                namespace: &entry.namespace,
+                kind: &entry.kind,
+                name: &entry.name,
+                tags: &entry.tags,
+                meta_entries: &meta_entries,
+                secret_entries: &secret_entries,
+                user_id: params.user_id,
+            },
+            master_key,
+        )
+        .await
+        {
+            Ok(_) => {
+                inserted += 1;
+            }
+            Err(e) => {
+                tracing::error!(
+                    namespace = entry.namespace,
+                    kind = entry.kind,
+                    name = entry.name,
+                    error = %e,
+                    "failed to import entry"
+                );
+                failed += 1;
+            }
+        }
+    }
+
+    if failed > 0 {
+        return Err(anyhow::anyhow!("{} record(s) failed to import", failed));
+    }
+
+    Ok(ImportSummary {
+        total,
+        inserted,
+        skipped,
+        failed,
+        dry_run: params.dry_run,
+    })
+}

crates/secrets-core/src/service/mod.rs

@@ -0,0 +1,12 @@
+pub mod add;
+pub mod api_key;
+pub mod delete;
+pub mod env_map;
+pub mod export;
+pub mod get_secret;
+pub mod history;
+pub mod import;
+pub mod rollback;
+pub mod search;
+pub mod update;
+pub mod user;

crates/secrets-core/src/service/rollback.rs

@@ -0,0 +1,229 @@
+use anyhow::Result;
+use serde_json::Value;
+use sqlx::PgPool;
+use uuid::Uuid;
+
+use crate::crypto;
+use crate::db;
+
+#[derive(Debug, serde::Serialize)]
+pub struct RollbackResult {
+    pub namespace: String,
+    pub kind: String,
+    pub name: String,
+    pub restored_version: i64,
+}
+
+pub async fn run(
+    pool: &PgPool,
+    namespace: &str,
+    kind: &str,
+    name: &str,
+    to_version: Option<i64>,
+    master_key: &[u8; 32],
+    _user_id: Option<Uuid>,
+) -> Result<RollbackResult> {
+    #[derive(sqlx::FromRow)]
+    struct EntryHistoryRow {
+        entry_id: Uuid,
+        version: i64,
+        action: String,
+        tags: Vec<String>,
+        metadata: Value,
+    }
+
+    let snap: Option<EntryHistoryRow> = if let Some(ver) = to_version {
+        sqlx::query_as(
+            "SELECT entry_id, version, action, tags, metadata FROM entries_history \
+             WHERE namespace = $1 AND kind = $2 AND name = $3 AND version = $4 \
+             ORDER BY id DESC LIMIT 1",
+        )
+        .bind(namespace)
+        .bind(kind)
+        .bind(name)
+        .bind(ver)
+        .fetch_optional(pool)
+        .await?
+    } else {
+        sqlx::query_as(
+            "SELECT entry_id, version, action, tags, metadata FROM entries_history \
+             WHERE namespace = $1 AND kind = $2 AND name = $3 ORDER BY id DESC LIMIT 1",
+        )
+        .bind(namespace)
+        .bind(kind)
+        .bind(name)
+        .fetch_optional(pool)
+        .await?
+    };
+
+    let snap = snap.ok_or_else(|| {
+        anyhow::anyhow!(
+            "No history found for [{}/{}] {}{}.",
+            namespace,
+            kind,
+            name,
+            to_version
+                .map(|v| format!(" at version {}", v))
+                .unwrap_or_default()
+        )
+    })?;
+
+    #[derive(sqlx::FromRow)]
+    struct SecretHistoryRow {
+        secret_id: Uuid,
+        field_name: String,
+        encrypted: Vec<u8>,
+        action: String,
+    }
+
+    let field_snaps: Vec<SecretHistoryRow> = sqlx::query_as(
+        "SELECT secret_id, field_name, encrypted, action FROM secrets_history \
+         WHERE entry_id = $1 AND entry_version = $2 ORDER BY field_name",
+    )
+    .bind(snap.entry_id)
+    .bind(snap.version)
+    .fetch_all(pool)
+    .await?;
+
+    for f in &field_snaps {
+        if f.action != "delete" && !f.encrypted.is_empty() {
+            crypto::decrypt_json(master_key, &f.encrypted).map_err(|e| {
+                anyhow::anyhow!(
+                    "Cannot decrypt snapshot for field '{}': {}",
+                    f.field_name,
+                    e
+                )
+            })?;
+        }
+    }
+
+    let mut tx = pool.begin().await?;
+
+    #[derive(sqlx::FromRow)]
+    struct LiveEntry {
+        id: Uuid,
+        version: i64,
+        tags: Vec<String>,
+        metadata: Value,
+    }
+    let live: Option<LiveEntry> = sqlx::query_as(
+        "SELECT id, version, tags, metadata FROM entries \
+         WHERE namespace = $1 AND kind = $2 AND name = $3 FOR UPDATE",
+    )
+    .bind(namespace)
+    .bind(kind)
+    .bind(name)
+    .fetch_optional(&mut *tx)
+    .await?;
+
+    if let Some(ref lr) = live {
+        if let Err(e) = db::snapshot_entry_history(
+            &mut tx,
+            db::EntrySnapshotParams {
+                entry_id: lr.id,
+                namespace,
+                kind,
+                name,
+                version: lr.version,
+                action: "rollback",
+                tags: &lr.tags,
+                metadata: &lr.metadata,
+            },
+        )
+        .await
+        {
+            tracing::warn!(error = %e, "failed to snapshot entry before rollback");
+        }
+
+        #[derive(sqlx::FromRow)]
+        struct LiveField {
+            id: Uuid,
+            field_name: String,
+            encrypted: Vec<u8>,
+        }
+        let live_fields: Vec<LiveField> =
+            sqlx::query_as("SELECT id, field_name, encrypted FROM secrets WHERE entry_id = $1")
+                .bind(lr.id)
+                .fetch_all(&mut *tx)
+                .await?;
+
+        for f in &live_fields {
+            if let Err(e) = db::snapshot_secret_history(
+                &mut tx,
+                db::SecretSnapshotParams {
+                    entry_id: lr.id,
+                    secret_id: f.id,
+                    entry_version: lr.version,
+                    field_name: &f.field_name,
+                    encrypted: &f.encrypted,
+                    action: "rollback",
+                },
+            )
+            .await
+            {
+                tracing::warn!(error = %e, "failed to snapshot secret field before rollback");
+            }
+        }
+    }
+
+    sqlx::query(
+        "INSERT INTO entries (id, namespace, kind, name, tags, metadata, version, updated_at) \
+         VALUES ($1, $2, $3, $4, $5, $6, $7, NOW()) \
+         ON CONFLICT (namespace, kind, name) WHERE user_id IS NULL DO UPDATE SET \
+             tags = EXCLUDED.tags, metadata = EXCLUDED.metadata, \
+             version = entries.version + 1, updated_at = NOW()",
+    )
+    .bind(snap.entry_id)
+    .bind(namespace)
+    .bind(kind)
+    .bind(name)
+    .bind(&snap.tags)
+    .bind(&snap.metadata)
+    .bind(snap.version)
+    .execute(&mut *tx)
+    .await?;
+
+    sqlx::query("DELETE FROM secrets WHERE entry_id = $1")
+        .bind(snap.entry_id)
+        .execute(&mut *tx)
+        .await?;
+
+    for f in &field_snaps {
+        if f.action == "delete" {
+            continue;
+        }
+        sqlx::query(
+            "INSERT INTO secrets (id, entry_id, field_name, encrypted) VALUES ($1, $2, $3, $4) \
+             ON CONFLICT (entry_id, field_name) DO UPDATE SET \
+                 encrypted = EXCLUDED.encrypted, version = secrets.version + 1, updated_at = NOW()",
+        )
+        .bind(f.secret_id)
+        .bind(snap.entry_id)
+        .bind(&f.field_name)
+        .bind(&f.encrypted)
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    crate::audit::log_tx(
+        &mut tx,
+        "rollback",
+        namespace,
+        kind,
+        name,
+        serde_json::json!({
+            "restored_version": snap.version,
+            "original_action": snap.action,
+        }),
+    )
+    .await;
+
+    tx.commit().await?;
+
+    Ok(RollbackResult {
+        namespace: namespace.to_string(),
+        kind: kind.to_string(),
+        name: name.to_string(),
+        restored_version: snap.version,
+    })
+}

crates/secrets-core/src/service/search.rs

@@ -0,0 +1,241 @@
+use anyhow::Result;
+use serde_json::Value;
+use sqlx::PgPool;
+use std::collections::HashMap;
+use uuid::Uuid;
+
+use crate::models::{Entry, SecretField};
+
+pub const FETCH_ALL_LIMIT: u32 = 100_000;
+
+pub struct SearchParams<'a> {
+    pub namespace: Option<&'a str>,
+    pub kind: Option<&'a str>,
+    pub name: Option<&'a str>,
+    pub tags: &'a [String],
+    pub query: Option<&'a str>,
+    pub sort: &'a str,
+    pub limit: u32,
+    pub offset: u32,
+    /// Multi-user: filter by this user_id. None = single-user / no filter.
+    pub user_id: Option<Uuid>,
+}
+
+#[derive(Debug, serde::Serialize)]
+pub struct SearchResult {
+    pub entries: Vec<Entry>,
+    pub secret_schemas: HashMap<Uuid, Vec<SecretField>>,
+}
+
+pub async fn run(pool: &PgPool, params: SearchParams<'_>) -> Result<SearchResult> {
+    let entries = fetch_entries_paged(pool, &params).await?;
+    let entry_ids: Vec<Uuid> = entries.iter().map(|e| e.id).collect();
+    let secret_schemas = if !entry_ids.is_empty() {
+        fetch_secret_schemas(pool, &entry_ids).await?
+    } else {
+        HashMap::new()
+    };
+    Ok(SearchResult {
+        entries,
+        secret_schemas,
+    })
+}
+
+/// Fetch entries matching the given filters — returns all matching entries up to FETCH_ALL_LIMIT.
+pub async fn fetch_entries(
+    pool: &PgPool,
+    namespace: Option<&str>,
+    kind: Option<&str>,
+    name: Option<&str>,
+    tags: &[String],
+    query: Option<&str>,
+    user_id: Option<Uuid>,
+) -> Result<Vec<Entry>> {
+    let params = SearchParams {
+        namespace,
+        kind,
+        name,
+        tags,
+        query,
+        sort: "name",
+        limit: FETCH_ALL_LIMIT,
+        offset: 0,
+        user_id,
+    };
+    fetch_entries_paged(pool, &params).await
+}
+
+async fn fetch_entries_paged(pool: &PgPool, a: &SearchParams<'_>) -> Result<Vec<Entry>> {
+    let mut conditions: Vec<String> = Vec::new();
+    let mut idx: i32 = 1;
+
+    // user_id filtering — always comes first when present
+    if a.user_id.is_some() {
+        conditions.push(format!("user_id = ${}", idx));
+        idx += 1;
+    } else {
+        conditions.push("user_id IS NULL".to_string());
+    }
+
+    if a.namespace.is_some() {
+        conditions.push(format!("namespace = ${}", idx));
+        idx += 1;
+    }
+    if a.kind.is_some() {
+        conditions.push(format!("kind = ${}", idx));
+        idx += 1;
+    }
+    if a.name.is_some() {
+        conditions.push(format!("name = ${}", idx));
+        idx += 1;
+    }
+    if !a.tags.is_empty() {
+        let placeholders: Vec<String> = a
+            .tags
+            .iter()
+            .map(|_| {
+                let p = format!("${}", idx);
+                idx += 1;
+                p
+            })
+            .collect();
+        conditions.push(format!(
+            "tags @> ARRAY[{}]::text[]",
+            placeholders.join(", ")
+        ));
+    }
+    if a.query.is_some() {
+        conditions.push(format!(
+            "(name ILIKE ${i} ESCAPE '\\' OR namespace ILIKE ${i} ESCAPE '\\' \
+             OR kind ILIKE ${i} ESCAPE '\\' OR metadata::text ILIKE ${i} ESCAPE '\\' \
+             OR EXISTS (SELECT 1 FROM unnest(tags) t WHERE t ILIKE ${i} ESCAPE '\\'))",
+            i = idx
+        ));
+        idx += 1;
+    }
+
+    let order = match a.sort {
+        "updated" => "updated_at DESC",
+        "created" => "created_at DESC",
+        _ => "name ASC",
+    };
+
+    let limit_idx = idx;
+    idx += 1;
+    let offset_idx = idx;
+
+    let where_clause = if conditions.is_empty() {
+        String::new()
+    } else {
+        format!("WHERE {}", conditions.join(" AND "))
+    };
+
+    let sql = format!(
+        "SELECT id, COALESCE(user_id, '00000000-0000-0000-0000-000000000000'::uuid) AS user_id, \
+         namespace, kind, name, tags, metadata, version, created_at, updated_at \
+         FROM entries {where_clause} ORDER BY {order} LIMIT ${limit_idx} OFFSET ${offset_idx}"
+    );
+
+    let mut q = sqlx::query_as::<_, EntryRaw>(&sql);
+
+    if let Some(uid) = a.user_id {
+        q = q.bind(uid);
+    }
+    if let Some(v) = a.namespace {
+        q = q.bind(v);
+    }
+    if let Some(v) = a.kind {
+        q = q.bind(v);
+    }
+    if let Some(v) = a.name {
+        q = q.bind(v);
+    }
+    for tag in a.tags {
+        q = q.bind(tag);
+    }
+    if let Some(v) = a.query {
+        let pattern = format!("%{}%", v.replace('%', "\\%").replace('_', "\\_"));
+        q = q.bind(pattern);
+    }
+    q = q.bind(a.limit as i64).bind(a.offset as i64);
+
+    let rows = q.fetch_all(pool).await?;
+    Ok(rows.into_iter().map(Entry::from).collect())
+}
+
+/// Fetch secret field names for a set of entry ids (no decryption).
+pub async fn fetch_secret_schemas(
+    pool: &PgPool,
+    entry_ids: &[Uuid],
+) -> Result<HashMap<Uuid, Vec<SecretField>>> {
+    if entry_ids.is_empty() {
+        return Ok(HashMap::new());
+    }
+    let fields: Vec<SecretField> = sqlx::query_as(
+        "SELECT * FROM secrets WHERE entry_id = ANY($1) ORDER BY entry_id, field_name",
+    )
+    .bind(entry_ids)
+    .fetch_all(pool)
+    .await?;
+
+    let mut map: HashMap<Uuid, Vec<SecretField>> = HashMap::new();
+    for f in fields {
+        map.entry(f.entry_id).or_default().push(f);
+    }
+    Ok(map)
+}
+
+/// Fetch all secret fields (including encrypted bytes) for a set of entry ids.
+pub async fn fetch_secrets_for_entries(
+    pool: &PgPool,
+    entry_ids: &[Uuid],
+) -> Result<HashMap<Uuid, Vec<SecretField>>> {
+    if entry_ids.is_empty() {
+        return Ok(HashMap::new());
+    }
+    let fields: Vec<SecretField> = sqlx::query_as(
+        "SELECT * FROM secrets WHERE entry_id = ANY($1) ORDER BY entry_id, field_name",
+    )
+    .bind(entry_ids)
+    .fetch_all(pool)
+    .await?;
+
+    let mut map: HashMap<Uuid, Vec<SecretField>> = HashMap::new();
+    for f in fields {
+        map.entry(f.entry_id).or_default().push(f);
+    }
+    Ok(map)
+}
+
+// ── Internal raw row (because user_id is nullable in DB) ─────────────────────
+
+#[derive(sqlx::FromRow)]
+struct EntryRaw {
+    id: Uuid,
+    #[allow(dead_code)] // Selected for row shape; Entry model has no user_id field
+    user_id: Uuid,
+    namespace: String,
+    kind: String,
+    name: String,
+    tags: Vec<String>,
+    metadata: Value,
+    version: i64,
+    created_at: chrono::DateTime<chrono::Utc>,
+    updated_at: chrono::DateTime<chrono::Utc>,
+}
+
+impl From<EntryRaw> for Entry {
+    fn from(r: EntryRaw) -> Self {
+        Entry {
+            id: r.id,
+            namespace: r.namespace,
+            kind: r.kind,
+            name: r.name,
+            tags: r.tags,
+            metadata: r.metadata,
+            version: r.version,
+            created_at: r.created_at,
+            updated_at: r.updated_at,
+        }
+    }
+}

crates/secrets-core/src/service/update.rs

@@ -0,0 +1,271 @@
+use anyhow::Result;
+use serde_json::{Map, Value};
+use sqlx::PgPool;
+use uuid::Uuid;
+
+use crate::crypto;
+use crate::db;
+use crate::models::EntryRow;
+use crate::service::add::{
+    collect_field_paths, collect_key_paths, flatten_json_fields, insert_path, parse_key_path,
+    parse_kv, remove_path,
+};
+
+#[derive(Debug, serde::Serialize)]
+pub struct UpdateResult {
+    pub namespace: String,
+    pub kind: String,
+    pub name: String,
+    pub add_tags: Vec<String>,
+    pub remove_tags: Vec<String>,
+    pub meta_keys: Vec<String>,
+    pub remove_meta: Vec<String>,
+    pub secret_keys: Vec<String>,
+    pub remove_secrets: Vec<String>,
+}
+
+pub struct UpdateParams<'a> {
+    pub namespace: &'a str,
+    pub kind: &'a str,
+    pub name: &'a str,
+    pub add_tags: &'a [String],
+    pub remove_tags: &'a [String],
+    pub meta_entries: &'a [String],
+    pub remove_meta: &'a [String],
+    pub secret_entries: &'a [String],
+    pub remove_secrets: &'a [String],
+    pub user_id: Option<Uuid>,
+}
+
+pub async fn run(
+    pool: &PgPool,
+    params: UpdateParams<'_>,
+    master_key: &[u8; 32],
+) -> Result<UpdateResult> {
+    let mut tx = pool.begin().await?;
+
+    let row: Option<EntryRow> = if let Some(uid) = params.user_id {
+        sqlx::query_as(
+            "SELECT id, version, tags, metadata FROM entries \
+             WHERE user_id = $1 AND namespace = $2 AND kind = $3 AND name = $4 FOR UPDATE",
+        )
+        .bind(uid)
+        .bind(params.namespace)
+        .bind(params.kind)
+        .bind(params.name)
+        .fetch_optional(&mut *tx)
+        .await?
+    } else {
+        sqlx::query_as(
+            "SELECT id, version, tags, metadata FROM entries \
+             WHERE user_id IS NULL AND namespace = $1 AND kind = $2 AND name = $3 FOR UPDATE",
+        )
+        .bind(params.namespace)
+        .bind(params.kind)
+        .bind(params.name)
+        .fetch_optional(&mut *tx)
+        .await?
+    };
+
+    let row = row.ok_or_else(|| {
+        anyhow::anyhow!(
+            "Not found: [{}/{}] {}. Use `add` to create it first.",
+            params.namespace,
+            params.kind,
+            params.name
+        )
+    })?;
+
+    if let Err(e) = db::snapshot_entry_history(
+        &mut tx,
+        db::EntrySnapshotParams {
+            entry_id: row.id,
+            namespace: params.namespace,
+            kind: params.kind,
+            name: params.name,
+            version: row.version,
+            action: "update",
+            tags: &row.tags,
+            metadata: &row.metadata,
+        },
+    )
+    .await
+    {
+        tracing::warn!(error = %e, "failed to snapshot entry history before update");
+    }
+
+    let mut tags: Vec<String> = row.tags.clone();
+    for t in params.add_tags {
+        if !tags.contains(t) {
+            tags.push(t.clone());
+        }
+    }
+    tags.retain(|t| !params.remove_tags.contains(t));
+
+    let mut meta_map: Map<String, Value> = match row.metadata.clone() {
+        Value::Object(m) => m,
+        _ => Map::new(),
+    };
+    for entry in params.meta_entries {
+        let (path, value) = parse_kv(entry)?;
+        insert_path(&mut meta_map, &path, value)?;
+    }
+    for key in params.remove_meta {
+        let path = parse_key_path(key)?;
+        remove_path(&mut meta_map, &path)?;
+    }
+    let metadata = Value::Object(meta_map);
+
+    let result = sqlx::query(
+        "UPDATE entries SET tags = $1, metadata = $2, version = version + 1, updated_at = NOW() \
+         WHERE id = $3 AND version = $4",
+    )
+    .bind(&tags)
+    .bind(&metadata)
+    .bind(row.id)
+    .bind(row.version)
+    .execute(&mut *tx)
+    .await?;
+
+    if result.rows_affected() == 0 {
+        tx.rollback().await?;
+        anyhow::bail!(
+            "Concurrent modification detected for [{}/{}] {}. Please retry.",
+            params.namespace,
+            params.kind,
+            params.name
+        );
+    }
+
+    let new_version = row.version + 1;
+
+    for entry in params.secret_entries {
+        let (path, field_value) = parse_kv(entry)?;
+        let flat = flatten_json_fields("", &{
+            let mut m = Map::new();
+            insert_path(&mut m, &path, field_value)?;
+            Value::Object(m)
+        });
+
+        for (field_name, fv) in &flat {
+            let encrypted = crypto::encrypt_json(master_key, fv)?;
+
+            #[derive(sqlx::FromRow)]
+            struct ExistingField {
+                id: Uuid,
+                encrypted: Vec<u8>,
+            }
+            let ef: Option<ExistingField> = sqlx::query_as(
+                "SELECT id, encrypted FROM secrets WHERE entry_id = $1 AND field_name = $2",
+            )
+            .bind(row.id)
+            .bind(field_name)
+            .fetch_optional(&mut *tx)
+            .await?;
+
+            if let Some(ef) = &ef
+                && let Err(e) = db::snapshot_secret_history(
+                    &mut tx,
+                    db::SecretSnapshotParams {
+                        entry_id: row.id,
+                        secret_id: ef.id,
+                        entry_version: row.version,
+                        field_name,
+                        encrypted: &ef.encrypted,
+                        action: "update",
+                    },
+                )
+                .await
+            {
+                tracing::warn!(error = %e, "failed to snapshot secret field history");
+            }
+
+            sqlx::query(
+                "INSERT INTO secrets (entry_id, field_name, encrypted) VALUES ($1, $2, $3) \
+                 ON CONFLICT (entry_id, field_name) DO UPDATE SET \
+                     encrypted = EXCLUDED.encrypted, version = secrets.version + 1, updated_at = NOW()",
+            )
+            .bind(row.id)
+            .bind(field_name)
+            .bind(&encrypted)
+            .execute(&mut *tx)
+            .await?;
+        }
+    }
+
+    for key in params.remove_secrets {
+        let path = parse_key_path(key)?;
+        let field_name = path.join(".");
+
+        #[derive(sqlx::FromRow)]
+        struct FieldToDelete {
+            id: Uuid,
+            encrypted: Vec<u8>,
+        }
+        let field: Option<FieldToDelete> = sqlx::query_as(
+            "SELECT id, encrypted FROM secrets WHERE entry_id = $1 AND field_name = $2",
+        )
+        .bind(row.id)
+        .bind(&field_name)
+        .fetch_optional(&mut *tx)
+        .await?;
+
+        if let Some(f) = field {
+            if let Err(e) = db::snapshot_secret_history(
+                &mut tx,
+                db::SecretSnapshotParams {
+                    entry_id: row.id,
+                    secret_id: f.id,
+                    entry_version: new_version,
+                    field_name: &field_name,
+                    encrypted: &f.encrypted,
+                    action: "delete",
+                },
+            )
+            .await
+            {
+                tracing::warn!(error = %e, "failed to snapshot secret field history before delete");
+            }
+            sqlx::query("DELETE FROM secrets WHERE id = $1")
+                .bind(f.id)
+                .execute(&mut *tx)
+                .await?;
+        }
+    }
+
+    let meta_keys = collect_key_paths(params.meta_entries)?;
+    let remove_meta_keys = collect_field_paths(params.remove_meta)?;
+    let secret_keys = collect_key_paths(params.secret_entries)?;
+    let remove_secret_keys = collect_field_paths(params.remove_secrets)?;
+
+    crate::audit::log_tx(
+        &mut tx,
+        "update",
+        params.namespace,
+        params.kind,
+        params.name,
+        serde_json::json!({
+            "add_tags": params.add_tags,
+            "remove_tags": params.remove_tags,
+            "meta_keys": meta_keys,
+            "remove_meta": remove_meta_keys,
+            "secret_keys": secret_keys,
+            "remove_secrets": remove_secret_keys,
+        }),
+    )
+    .await;
+
+    tx.commit().await?;
+
+    Ok(UpdateResult {
+        namespace: params.namespace.to_string(),
+        kind: params.kind.to_string(),
+        name: params.name.to_string(),
+        add_tags: params.add_tags.to_vec(),
+        remove_tags: params.remove_tags.to_vec(),
+        meta_keys,
+        remove_meta: remove_meta_keys,
+        secret_keys,
+        remove_secrets: remove_secret_keys,
+    })
+}

crates/secrets-core/src/service/user.rs

@@ -0,0 +1,213 @@
+use anyhow::Result;
+use serde_json::Value;
+use sqlx::PgPool;
+use uuid::Uuid;
+
+use crate::models::{OauthAccount, User};
+
+pub struct OAuthProfile {
+    pub provider: String,
+    pub provider_id: String,
+    pub email: Option<String>,
+    pub name: Option<String>,
+    pub avatar_url: Option<String>,
+}
+
+/// Find or create a user from an OAuth profile.
+/// Returns (user, is_new) where is_new indicates first-time registration.
+pub async fn find_or_create_user(pool: &PgPool, profile: OAuthProfile) -> Result<(User, bool)> {
+    // Check if this OAuth account already exists
+    let existing: Option<OauthAccount> = sqlx::query_as(
+        "SELECT id, user_id, provider, provider_id, email, name, avatar_url, created_at \
+         FROM oauth_accounts WHERE provider = $1 AND provider_id = $2",
+    )
+    .bind(&profile.provider)
+    .bind(&profile.provider_id)
+    .fetch_optional(pool)
+    .await?;
+
+    if let Some(oa) = existing {
+        let user: User = sqlx::query_as(
+            "SELECT id, email, name, avatar_url, key_salt, key_check, key_params, api_key, created_at, updated_at \
+             FROM users WHERE id = $1",
+        )
+        .bind(oa.user_id)
+        .fetch_one(pool)
+        .await?;
+        return Ok((user, false));
+    }
+
+    // New user — create records (no key yet; user sets passphrase on dashboard)
+    let display_name = profile
+        .name
+        .clone()
+        .unwrap_or_else(|| profile.email.clone().unwrap_or_else(|| "User".to_string()));
+
+    let mut tx = pool.begin().await?;
+
+    let user: User = sqlx::query_as(
+        "INSERT INTO users (email, name, avatar_url) \
+         VALUES ($1, $2, $3) \
+         RETURNING id, email, name, avatar_url, key_salt, key_check, key_params, api_key, created_at, updated_at",
+    )
+    .bind(&profile.email)
+    .bind(&display_name)
+    .bind(&profile.avatar_url)
+    .fetch_one(&mut *tx)
+    .await?;
+
+    sqlx::query(
+        "INSERT INTO oauth_accounts (user_id, provider, provider_id, email, name, avatar_url) \
+         VALUES ($1, $2, $3, $4, $5, $6)",
+    )
+    .bind(user.id)
+    .bind(&profile.provider)
+    .bind(&profile.provider_id)
+    .bind(&profile.email)
+    .bind(&profile.name)
+    .bind(&profile.avatar_url)
+    .execute(&mut *tx)
+    .await?;
+
+    tx.commit().await?;
+
+    Ok((user, true))
+}
+
+/// Store the PBKDF2 salt, key_check, and params for a user's passphrase setup.
+pub async fn update_user_key_setup(
+    pool: &PgPool,
+    user_id: Uuid,
+    key_salt: &[u8],
+    key_check: &[u8],
+    key_params: &Value,
+) -> Result<()> {
+    sqlx::query(
+        "UPDATE users SET key_salt = $1, key_check = $2, key_params = $3, updated_at = NOW() \
+         WHERE id = $4",
+    )
+    .bind(key_salt)
+    .bind(key_check)
+    .bind(key_params)
+    .bind(user_id)
+    .execute(pool)
+    .await?;
+    Ok(())
+}
+
+/// Fetch a user by ID.
+pub async fn get_user_by_id(pool: &PgPool, user_id: Uuid) -> Result<Option<User>> {
+    let user = sqlx::query_as(
+        "SELECT id, email, name, avatar_url, key_salt, key_check, key_params, api_key, created_at, updated_at \
+         FROM users WHERE id = $1",
+    )
+    .bind(user_id)
+    .fetch_optional(pool)
+    .await?;
+    Ok(user)
+}
+
+/// List all OAuth accounts linked to a user.
+pub async fn list_oauth_accounts(pool: &PgPool, user_id: Uuid) -> Result<Vec<OauthAccount>> {
+    let accounts = sqlx::query_as(
+        "SELECT id, user_id, provider, provider_id, email, name, avatar_url, created_at \
+         FROM oauth_accounts WHERE user_id = $1 ORDER BY created_at",
+    )
+    .bind(user_id)
+    .fetch_all(pool)
+    .await?;
+    Ok(accounts)
+}
+
+/// Bind an additional OAuth account to an existing user.
+pub async fn bind_oauth_account(
+    pool: &PgPool,
+    user_id: Uuid,
+    profile: OAuthProfile,
+) -> Result<OauthAccount> {
+    // Check if this provider_id is already linked to someone else
+    let conflict: Option<(Uuid,)> = sqlx::query_as(
+        "SELECT user_id FROM oauth_accounts WHERE provider = $1 AND provider_id = $2",
+    )
+    .bind(&profile.provider)
+    .bind(&profile.provider_id)
+    .fetch_optional(pool)
+    .await?;
+
+    if let Some((existing_user_id,)) = conflict {
+        if existing_user_id != user_id {
+            anyhow::bail!(
+                "This {} account is already linked to a different user",
+                profile.provider
+            );
+        }
+        anyhow::bail!(
+            "This {} account is already linked to your account",
+            profile.provider
+        );
+    }
+
+    let existing_provider_for_user: Option<(String,)> = sqlx::query_as(
+        "SELECT provider_id FROM oauth_accounts WHERE user_id = $1 AND provider = $2",
+    )
+    .bind(user_id)
+    .bind(&profile.provider)
+    .fetch_optional(pool)
+    .await?;
+
+    if existing_provider_for_user.is_some() {
+        anyhow::bail!(
+            "You already linked a {} account. Unlink the other provider instead of binding multiple {} accounts.",
+            profile.provider,
+            profile.provider
+        );
+    }
+
+    let account: OauthAccount = sqlx::query_as(
+        "INSERT INTO oauth_accounts (user_id, provider, provider_id, email, name, avatar_url) \
+         VALUES ($1, $2, $3, $4, $5, $6) \
+         RETURNING id, user_id, provider, provider_id, email, name, avatar_url, created_at",
+    )
+    .bind(user_id)
+    .bind(&profile.provider)
+    .bind(&profile.provider_id)
+    .bind(&profile.email)
+    .bind(&profile.name)
+    .bind(&profile.avatar_url)
+    .fetch_one(pool)
+    .await?;
+
+    Ok(account)
+}
+
+/// Unbind an OAuth account. Ensures at least one remains and blocks unlinking the current login provider.
+pub async fn unbind_oauth_account(
+    pool: &PgPool,
+    user_id: Uuid,
+    provider: &str,
+    current_login_provider: Option<&str>,
+) -> Result<()> {
+    if current_login_provider == Some(provider) {
+        anyhow::bail!(
+            "Cannot unlink the {} account you are currently using to sign in",
+            provider
+        );
+    }
+
+    let count: i64 = sqlx::query_scalar("SELECT COUNT(*) FROM oauth_accounts WHERE user_id = $1")
+        .bind(user_id)
+        .fetch_one(pool)
+        .await?;
+
+    if count <= 1 {
+        anyhow::bail!("Cannot unbind the last OAuth account. Please link another account first.");
+    }
+
+    sqlx::query("DELETE FROM oauth_accounts WHERE user_id = $1 AND provider = $2")
+        .bind(user_id)
+        .bind(provider)
+        .execute(pool)
+        .await?;
+
+    Ok(())
+}

crates/secrets-mcp/Cargo.toml

@@ -0,0 +1,44 @@
+[package]
+name = "secrets-mcp"
+version = "0.1.0"
+edition.workspace = true
+
+[[bin]]
+name = "secrets-mcp"
+path = "src/main.rs"
+
+[dependencies]
+secrets-core = { path = "../secrets-core" }
+
+# MCP
+rmcp = { version = "1", features = ["server", "macros", "transport-streamable-http-server", "schemars"] }
+
+# Web framework
+axum = "0.8"
+axum-extra = { version = "0.10", features = ["typed-header"] }
+tower = "0.5"
+tower-http = { version = "0.6", features = ["cors"] }
+tower-sessions = "0.14"
+
+# OAuth (manual token exchange via reqwest)
+reqwest.workspace = true
+
+# Templating - render templates manually to avoid integration crate issues
+askama = "0.13"
+
+# Common
+anyhow.workspace = true
+chrono.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sha2.workspace = true
+rand.workspace = true
+sqlx.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+uuid.workspace = true
+dotenvy.workspace = true
+urlencoding = "2"
+schemars = "1"
+http = "1"

crates/secrets-mcp/src/auth.rs

@@ -0,0 +1,114 @@
+use std::net::SocketAddr;
+
+use axum::{
+    extract::{ConnectInfo, Request, State},
+    http::StatusCode,
+    middleware::Next,
+    response::Response,
+};
+use sqlx::PgPool;
+use uuid::Uuid;
+
+use secrets_core::service::api_key::validate_api_key;
+
+/// Injected into request extensions after Bearer token validation.
+#[derive(Clone, Debug)]
+pub struct AuthUser {
+    pub user_id: Uuid,
+}
+
+fn log_client_ip(req: &Request) -> Option<String> {
+    if let Some(first) = req
+        .headers()
+        .get("x-forwarded-for")
+        .and_then(|v| v.to_str().ok())
+        .and_then(|s| s.split(',').next())
+    {
+        let s = first.trim();
+        if !s.is_empty() {
+            return Some(s.to_string());
+        }
+    }
+    req.extensions()
+        .get::<ConnectInfo<SocketAddr>>()
+        .map(|c| c.ip().to_string())
+}
+
+/// Axum middleware that validates Bearer API keys for the /mcp route.
+/// Passes all non-MCP paths through without authentication.
+pub async fn bearer_auth_middleware(
+    State(pool): State<PgPool>,
+    req: Request,
+    next: Next,
+) -> Result<Response, StatusCode> {
+    let path = req.uri().path();
+    let method = req.method().as_str();
+    let client_ip = log_client_ip(&req);
+
+    // Only authenticate /mcp paths
+    if !path.starts_with("/mcp") {
+        return Ok(next.run(req).await);
+    }
+
+    // Allow OPTIONS (CORS preflight) through
+    if req.method() == axum::http::Method::OPTIONS {
+        return Ok(next.run(req).await);
+    }
+
+    let auth_header = req
+        .headers()
+        .get(axum::http::header::AUTHORIZATION)
+        .and_then(|v| v.to_str().ok());
+
+    let raw_key = match auth_header {
+        Some(h) if h.starts_with("Bearer ") => h.trim_start_matches("Bearer ").trim(),
+        Some(_) => {
+            tracing::warn!(
+                method,
+                path,
+                client_ip = client_ip.as_deref(),
+                "invalid Authorization header format on /mcp (expected Bearer …)"
+            );
+            return Err(StatusCode::UNAUTHORIZED);
+        }
+        None => {
+            tracing::warn!(
+                method,
+                path,
+                client_ip = client_ip.as_deref(),
+                "missing Authorization header on /mcp"
+            );
+            return Err(StatusCode::UNAUTHORIZED);
+        }
+    };
+
+    match validate_api_key(&pool, raw_key).await {
+        Ok(Some(user_id)) => {
+            tracing::debug!(?user_id, "api key authenticated");
+            let mut req = req;
+            req.extensions_mut().insert(AuthUser { user_id });
+            Ok(next.run(req).await)
+        }
+        Ok(None) => {
+            tracing::warn!(
+                method,
+                path,
+                client_ip = client_ip.as_deref(),
+                key_prefix = %&raw_key.chars().take(12).collect::<String>(),
+                key_len = raw_key.len(),
+                "invalid api key (not found in database — e.g. revoked key or DB was reset; update MCP client Bearer token)"
+            );
+            Err(StatusCode::UNAUTHORIZED)
+        }
+        Err(e) => {
+            tracing::error!(
+                method,
+                path,
+                client_ip = client_ip.as_deref(),
+                error = %e,
+                "api key validation error"
+            );
+            Err(StatusCode::INTERNAL_SERVER_ERROR)
+        }
+    }
+}

crates/secrets-mcp/src/main.rs

@@ -0,0 +1,155 @@
+mod auth;
+mod oauth;
+mod tools;
+mod web;
+
+use std::net::SocketAddr;
+use std::sync::Arc;
+
+use anyhow::{Context, Result};
+use axum::Router;
+use rmcp::transport::streamable_http_server::{
+    StreamableHttpService, session::local::LocalSessionManager,
+};
+use sqlx::PgPool;
+use tower_http::cors::{Any, CorsLayer};
+use tower_sessions::cookie::SameSite;
+use tower_sessions::{MemoryStore, SessionManagerLayer};
+use tracing_subscriber::EnvFilter;
+
+use secrets_core::config::resolve_db_url;
+use secrets_core::db::{create_pool, migrate};
+
+use crate::oauth::OAuthConfig;
+use crate::tools::SecretsService;
+
+/// Shared application state injected into web routes and middleware.
+#[derive(Clone)]
+pub struct AppState {
+    pub pool: PgPool,
+    pub google_config: Option<OAuthConfig>,
+    pub base_url: String,
+    pub http_client: reqwest::Client,
+}
+
+fn load_env_var(name: &str) -> Option<String> {
+    std::env::var(name).ok().filter(|s| !s.is_empty())
+}
+
+fn load_oauth_config(prefix: &str, base_url: &str, path: &str) -> Option<OAuthConfig> {
+    let client_id = load_env_var(&format!("{}_CLIENT_ID", prefix))?;
+    let client_secret = load_env_var(&format!("{}_CLIENT_SECRET", prefix))?;
+    Some(OAuthConfig {
+        client_id,
+        client_secret,
+        redirect_uri: format!("{}{}", base_url, path),
+    })
+}
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    // Load .env if present
+    let _ = dotenvy::dotenv();
+
+    tracing_subscriber::fmt()
+        .with_env_filter(
+            EnvFilter::try_from_default_env().unwrap_or_else(|_| "secrets_mcp=info".into()),
+        )
+        .init();
+
+    // ── Database ──────────────────────────────────────────────────────────────
+    let db_url = resolve_db_url("")
+        .context("Database not configured. Set SECRETS_DATABASE_URL environment variable.")?;
+    let pool = create_pool(&db_url)
+        .await
+        .context("failed to connect to database")?;
+    migrate(&pool)
+        .await
+        .context("failed to run database migrations")?;
+    tracing::info!("Database connected and migrated");
+
+    // ── Configuration ─────────────────────────────────────────────────────────
+    let base_url = load_env_var("BASE_URL").unwrap_or_else(|| "http://localhost:9315".to_string());
+    let bind_addr = load_env_var("SECRETS_MCP_BIND").unwrap_or_else(|| "0.0.0.0:9315".to_string());
+
+    // ── OAuth providers ───────────────────────────────────────────────────────
+    let google_config = load_oauth_config("GOOGLE", &base_url, "/auth/google/callback");
+
+    if google_config.is_none() {
+        tracing::warn!(
+            "No OAuth providers configured. Set GOOGLE_CLIENT_ID/GOOGLE_CLIENT_SECRET to enable login."
+        );
+    }
+
+    // ── Session store ─────────────────────────────────────────────────────────
+    let session_store = MemoryStore::default();
+    // Strict would drop the session cookie on redirect from Google → our origin (cross-site nav).
+    let session_layer = SessionManagerLayer::new(session_store)
+        .with_secure(base_url.starts_with("https://"))
+        .with_same_site(SameSite::Lax);
+
+    // ── App state ─────────────────────────────────────────────────────────────
+    let app_state = AppState {
+        pool: pool.clone(),
+        google_config,
+        base_url: base_url.clone(),
+        http_client: reqwest::Client::builder()
+            .timeout(std::time::Duration::from_secs(15))
+            .build()
+            .context("failed to build HTTP client")?,
+    };
+
+    // ── MCP service ───────────────────────────────────────────────────────────
+    let pool_arc = Arc::new(pool.clone());
+
+    let mcp_service = StreamableHttpService::new(
+        move || {
+            let p = pool_arc.clone();
+            Ok(SecretsService::new(p))
+        },
+        LocalSessionManager::default().into(),
+        Default::default(),
+    );
+
+    // ── Router ────────────────────────────────────────────────────────────────
+    let cors = CorsLayer::new()
+        .allow_origin(Any)
+        .allow_methods(Any)
+        .allow_headers(Any);
+
+    let router = Router::new()
+        .merge(web::web_router())
+        .nest_service("/mcp", mcp_service)
+        .layer(axum::middleware::from_fn_with_state(
+            pool,
+            auth::bearer_auth_middleware,
+        ))
+        .layer(session_layer)
+        .layer(cors)
+        .with_state(app_state);
+
+    // ── Start server ──────────────────────────────────────────────────────────
+    let listener = tokio::net::TcpListener::bind(&bind_addr)
+        .await
+        .with_context(|| format!("failed to bind to {}", bind_addr))?;
+
+    tracing::info!("Secrets MCP Server listening on http://{}", bind_addr);
+    tracing::info!("MCP endpoint: {}/mcp", base_url);
+
+    axum::serve(
+        listener,
+        router.into_make_service_with_connect_info::<SocketAddr>(),
+    )
+    .with_graceful_shutdown(shutdown_signal())
+    .await
+    .context("server error")?;
+
+    Ok(())
+}
+
+async fn shutdown_signal() {
+    tokio::signal::ctrl_c()
+        .await
+        .expect("failed to install CTRL+C signal handler");
+    tracing::info!("Shutting down gracefully...");
+}

crates/secrets-mcp/src/oauth/google.rs

@@ -0,0 +1,66 @@
+use anyhow::{Context, Result};
+use serde::Deserialize;
+
+use super::{OAuthConfig, OAuthUserInfo};
+
+#[derive(Deserialize)]
+struct TokenResponse {
+    access_token: String,
+    #[allow(dead_code)]
+    token_type: String,
+    #[allow(dead_code)]
+    id_token: Option<String>,
+}
+
+#[derive(Deserialize)]
+struct UserInfo {
+    sub: String,
+    email: Option<String>,
+    name: Option<String>,
+    picture: Option<String>,
+}
+
+/// Exchange authorization code for tokens and fetch user profile.
+pub async fn exchange_code(
+    client: &reqwest::Client,
+    config: &OAuthConfig,
+    code: &str,
+) -> Result<OAuthUserInfo> {
+    let token_resp: TokenResponse = client
+        .post("https://oauth2.googleapis.com/token")
+        .form(&[
+            ("code", code),
+            ("client_id", &config.client_id),
+            ("client_secret", &config.client_secret),
+            ("redirect_uri", &config.redirect_uri),
+            ("grant_type", "authorization_code"),
+        ])
+        .send()
+        .await
+        .context("failed to exchange Google code")?
+        .error_for_status()
+        .context("Google token endpoint error")?
+        .json()
+        .await
+        .context("failed to parse Google token response")?;
+
+    let user: UserInfo = client
+        .get("https://openidconnect.googleapis.com/v1/userinfo")
+        .bearer_auth(&token_resp.access_token)
+        .send()
+        .await
+        .context("failed to fetch Google userinfo")?
+        .error_for_status()
+        .context("Google userinfo endpoint error")?
+        .json()
+        .await
+        .context("failed to parse Google userinfo")?;
+
+    Ok(OAuthUserInfo {
+        provider: "google".to_string(),
+        provider_id: user.sub,
+        email: user.email,
+        name: user.name,
+        avatar_url: user.picture,
+    })
+}

crates/secrets-mcp/src/oauth/mod.rs

@@ -0,0 +1,45 @@
+pub mod google;
+pub mod wechat; // not yet implemented — placeholder for future WeChat integration
+
+use serde::{Deserialize, Serialize};
+
+/// Normalized OAuth user profile from any provider.
+#[derive(Debug, Clone)]
+pub struct OAuthUserInfo {
+    pub provider: String,
+    pub provider_id: String,
+    pub email: Option<String>,
+    pub name: Option<String>,
+    pub avatar_url: Option<String>,
+}
+
+/// OAuth provider configuration.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct OAuthConfig {
+    pub client_id: String,
+    pub client_secret: String,
+    pub redirect_uri: String,
+}
+
+/// Build the Google authorization URL.
+pub fn google_auth_url(config: &OAuthConfig, state: &str) -> String {
+    format!(
+        "https://accounts.google.com/o/oauth2/v2/auth\
+         ?client_id={}\
+         &redirect_uri={}\
+         &response_type=code\
+         &scope=openid%20email%20profile\
+         &state={}\
+         &access_type=offline",
+        urlencoding::encode(&config.client_id),
+        urlencoding::encode(&config.redirect_uri),
+        urlencoding::encode(state),
+    )
+}
+
+pub fn random_state() -> String {
+    use rand::RngExt;
+    let mut bytes = [0u8; 16];
+    rand::rng().fill(&mut bytes);
+    bytes.iter().map(|b| format!("{:02x}", b)).collect()
+}

crates/secrets-mcp/src/oauth/wechat.rs

@@ -0,0 +1,18 @@
+use super::{OAuthConfig, OAuthUserInfo};
+/// WeChat OAuth — not yet implemented.
+///
+/// This module is a placeholder for future WeChat Open Platform integration.
+/// When ready, implement `exchange_code` following the non-standard WeChat OAuth 2.0 flow:
+/// - Token exchange uses a GET request (not POST)
+/// - Preferred user identifier is `unionid` (cross-app), falling back to `openid`
+/// - Docs: https://developers.weixin.qq.com/doc/oplatform/Website_App/WeChat_Login/Wechat_Login.html
+use anyhow::{Result, bail};
+
+#[allow(dead_code)]
+pub async fn exchange_code(
+    _client: &reqwest::Client,
+    _config: &OAuthConfig,
+    _code: &str,
+) -> Result<OAuthUserInfo> {
+    bail!("WeChat login is not yet implemented")
+}

crates/secrets-mcp/src/tools.rs

@@ -0,0 +1,609 @@
+use std::sync::Arc;
+
+use anyhow::Result;
+use rmcp::{
+    RoleServer, ServerHandler,
+    handler::server::wrapper::Parameters,
+    model::{
+        CallToolResult, Content, Implementation, InitializeResult, ProtocolVersion,
+        ServerCapabilities,
+    },
+    service::RequestContext,
+    tool, tool_handler, tool_router,
+};
+use schemars::JsonSchema;
+use serde::Deserialize;
+use sqlx::PgPool;
+use uuid::Uuid;
+
+use secrets_core::service::{
+    add::{AddParams, run as svc_add},
+    delete::{DeleteParams, run as svc_delete},
+    export::{ExportParams, export as svc_export},
+    get_secret::{get_all_secrets, get_secret_field},
+    history::run as svc_history,
+    rollback::run as svc_rollback,
+    search::{SearchParams, run as svc_search},
+    update::{UpdateParams, run as svc_update},
+};
+
+use crate::auth::AuthUser;
+
+// ── Shared state ──────────────────────────────────────────────────────────────
+
+#[derive(Clone)]
+pub struct SecretsService {
+    pub pool: Arc<PgPool>,
+    pub tool_router: rmcp::handler::server::router::tool::ToolRouter<SecretsService>,
+}
+
+impl SecretsService {
+    pub fn new(pool: Arc<PgPool>) -> Self {
+        Self {
+            pool,
+            tool_router: Self::tool_router(),
+        }
+    }
+
+    /// Extract user_id from the HTTP request parts injected by auth middleware.
+    fn user_id_from_ctx(ctx: &RequestContext<RoleServer>) -> Result<Option<Uuid>, rmcp::ErrorData> {
+        let parts = ctx
+            .extensions
+            .get::<http::request::Parts>()
+            .ok_or_else(|| rmcp::ErrorData::internal_error("Missing HTTP parts", None))?;
+        Ok(parts.extensions.get::<AuthUser>().map(|a| a.user_id))
+    }
+
+    /// Get the authenticated user_id (returns error if not authenticated).
+    fn require_user_id(ctx: &RequestContext<RoleServer>) -> Result<Uuid, rmcp::ErrorData> {
+        let parts = ctx
+            .extensions
+            .get::<http::request::Parts>()
+            .ok_or_else(|| rmcp::ErrorData::internal_error("Missing HTTP parts", None))?;
+        parts
+            .extensions
+            .get::<AuthUser>()
+            .map(|a| a.user_id)
+            .ok_or_else(|| rmcp::ErrorData::invalid_request("Unauthorized: API key required", None))
+    }
+
+    /// Extract the 32-byte encryption key from the X-Encryption-Key request header.
+    /// The header value must be 64 lowercase hex characters (PBKDF2-derived key).
+    fn extract_enc_key(ctx: &RequestContext<RoleServer>) -> Result<[u8; 32], rmcp::ErrorData> {
+        let parts = ctx
+            .extensions
+            .get::<http::request::Parts>()
+            .ok_or_else(|| rmcp::ErrorData::internal_error("Missing HTTP parts", None))?;
+        let hex_str = parts
+            .headers
+            .get("x-encryption-key")
+            .ok_or_else(|| {
+                rmcp::ErrorData::invalid_request(
+                    "Missing X-Encryption-Key header. \
+                     Set this to your 64-char hex encryption key derived from your passphrase.",
+                    None,
+                )
+            })?
+            .to_str()
+            .map_err(|_| {
+                rmcp::ErrorData::invalid_request("Invalid X-Encryption-Key header value", None)
+            })?;
+        secrets_core::crypto::extract_key_from_hex(hex_str)
+            .map_err(|e| rmcp::ErrorData::invalid_request(e.to_string(), None))
+    }
+
+    /// Require both user_id and encryption key.
+    fn require_user_and_key(
+        ctx: &RequestContext<RoleServer>,
+    ) -> Result<(Uuid, [u8; 32]), rmcp::ErrorData> {
+        let user_id = Self::require_user_id(ctx)?;
+        let key = Self::extract_enc_key(ctx)?;
+        Ok((user_id, key))
+    }
+}
+
+// ── Tool parameter types ──────────────────────────────────────────────────────
+
+#[derive(Debug, Deserialize, JsonSchema)]
+struct SearchInput {
+    #[schemars(description = "Namespace filter (e.g. 'refining', 'ricnsmart')")]
+    namespace: Option<String>,
+    #[schemars(description = "Kind filter (e.g. 'server', 'service', 'key')")]
+    kind: Option<String>,
+    #[schemars(description = "Exact record name")]
+    name: Option<String>,
+    #[schemars(description = "Tag filters (all must match)")]
+    tags: Option<Vec<String>>,
+    #[schemars(description = "Fuzzy search across name, namespace, kind, tags, metadata")]
+    query: Option<String>,
+    #[schemars(description = "Return only summary fields (name/tags/desc/updated_at)")]
+    summary: Option<bool>,
+    #[schemars(description = "Sort order: 'name' (default), 'updated', 'created'")]
+    sort: Option<String>,
+    #[schemars(description = "Max results (default 20)")]
+    limit: Option<u32>,
+    #[schemars(description = "Pagination offset (default 0)")]
+    offset: Option<u32>,
+}
+
+#[derive(Debug, Deserialize, JsonSchema)]
+struct GetSecretInput {
+    #[schemars(description = "Namespace of the entry")]
+    namespace: String,
+    #[schemars(description = "Kind of the entry (e.g. 'server', 'service')")]
+    kind: String,
+    #[schemars(description = "Name of the entry")]
+    name: String,
+    #[schemars(description = "Specific field to retrieve. If omitted, returns all fields.")]
+    field: Option<String>,
+}
+
+#[derive(Debug, Deserialize, JsonSchema)]
+struct AddInput {
+    #[schemars(description = "Namespace")]
+    namespace: String,
+    #[schemars(description = "Kind (e.g. 'server', 'service', 'key')")]
+    kind: String,
+    #[schemars(description = "Unique name within namespace+kind")]
+    name: String,
+    #[schemars(description = "Tags for this entry")]
+    tags: Option<Vec<String>>,
+    #[schemars(description = "Metadata fields as 'key=value' or 'key:=json' strings")]
+    meta: Option<Vec<String>>,
+    #[schemars(description = "Secret fields as 'key=value' strings")]
+    secrets: Option<Vec<String>>,
+}
+
+#[derive(Debug, Deserialize, JsonSchema)]
+struct UpdateInput {
+    #[schemars(description = "Namespace")]
+    namespace: String,
+    #[schemars(description = "Kind")]
+    kind: String,
+    #[schemars(description = "Name")]
+    name: String,
+    #[schemars(description = "Tags to add")]
+    add_tags: Option<Vec<String>>,
+    #[schemars(description = "Tags to remove")]
+    remove_tags: Option<Vec<String>>,
+    #[schemars(description = "Metadata fields to update/add as 'key=value' strings")]
+    meta: Option<Vec<String>>,
+    #[schemars(description = "Metadata field keys to remove")]
+    remove_meta: Option<Vec<String>>,
+    #[schemars(description = "Secret fields to update/add as 'key=value' strings")]
+    secrets: Option<Vec<String>>,
+    #[schemars(description = "Secret field keys to remove")]
+    remove_secrets: Option<Vec<String>>,
+}
+
+#[derive(Debug, Deserialize, JsonSchema)]
+struct DeleteInput {
+    #[schemars(description = "Namespace")]
+    namespace: String,
+    #[schemars(description = "Kind filter (required for single delete)")]
+    kind: Option<String>,
+    #[schemars(description = "Exact name to delete. Omit for bulk delete by namespace+kind.")]
+    name: Option<String>,
+    #[schemars(description = "Preview deletions without writing")]
+    dry_run: Option<bool>,
+}
+
+#[derive(Debug, Deserialize, JsonSchema)]
+struct HistoryInput {
+    #[schemars(description = "Namespace")]
+    namespace: String,
+    #[schemars(description = "Kind")]
+    kind: String,
+    #[schemars(description = "Name")]
+    name: String,
+    #[schemars(description = "Max history entries to return (default 20)")]
+    limit: Option<u32>,
+}
+
+#[derive(Debug, Deserialize, JsonSchema)]
+struct RollbackInput {
+    #[schemars(description = "Namespace")]
+    namespace: String,
+    #[schemars(description = "Kind")]
+    kind: String,
+    #[schemars(description = "Name")]
+    name: String,
+    #[schemars(description = "Target version number. Omit to restore the most recent snapshot.")]
+    to_version: Option<i64>,
+}
+
+#[derive(Debug, Deserialize, JsonSchema)]
+struct ExportInput {
+    #[schemars(description = "Namespace filter")]
+    namespace: Option<String>,
+    #[schemars(description = "Kind filter")]
+    kind: Option<String>,
+    #[schemars(description = "Exact name filter")]
+    name: Option<String>,
+    #[schemars(description = "Tag filters")]
+    tags: Option<Vec<String>>,
+    #[schemars(description = "Fuzzy query")]
+    query: Option<String>,
+    #[schemars(description = "Export format: 'json' (default), 'toml', 'yaml'")]
+    format: Option<String>,
+}
+
+#[derive(Debug, Deserialize, JsonSchema)]
+struct EnvMapInput {
+    #[schemars(description = "Namespace filter")]
+    namespace: Option<String>,
+    #[schemars(description = "Kind filter")]
+    kind: Option<String>,
+    #[schemars(description = "Exact name filter")]
+    name: Option<String>,
+    #[schemars(description = "Tag filters")]
+    tags: Option<Vec<String>>,
+    #[schemars(description = "Only include these secret fields")]
+    only_fields: Option<Vec<String>>,
+    #[schemars(description = "Environment variable name prefix")]
+    prefix: Option<String>,
+}
+
+// ── Tool implementations ──────────────────────────────────────────────────────
+
+#[tool_router]
+impl SecretsService {
+    #[tool(
+        description = "Search entries in the secrets store. Returns entries with metadata and \
+        secret field names (not values). Use secrets_get to decrypt secret values."
+    )]
+    async fn secrets_search(
+        &self,
+        Parameters(input): Parameters<SearchInput>,
+        ctx: RequestContext<RoleServer>,
+    ) -> Result<CallToolResult, rmcp::ErrorData> {
+        let user_id = Self::user_id_from_ctx(&ctx)?;
+        let tags = input.tags.unwrap_or_default();
+        let result = svc_search(
+            &self.pool,
+            SearchParams {
+                namespace: input.namespace.as_deref(),
+                kind: input.kind.as_deref(),
+                name: input.name.as_deref(),
+                tags: &tags,
+                query: input.query.as_deref(),
+                sort: input.sort.as_deref().unwrap_or("name"),
+                limit: input.limit.unwrap_or(20),
+                offset: input.offset.unwrap_or(0),
+                user_id,
+            },
+        )
+        .await
+        .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+        let summary = input.summary.unwrap_or(false);
+        let entries: Vec<serde_json::Value> = result
+            .entries
+            .iter()
+            .map(|e| {
+                if summary {
+                    serde_json::json!({
+                        "namespace": e.namespace,
+                        "kind": e.kind,
+                        "name": e.name,
+                        "tags": e.tags,
+                        "desc": e.metadata.get("desc").or_else(|| e.metadata.get("url"))
+                            .and_then(|v| v.as_str()).unwrap_or(""),
+                        "updated_at": e.updated_at.format("%Y-%m-%dT%H:%M:%SZ").to_string(),
+                    })
+                } else {
+                    let schema: Vec<&str> = result
+                        .secret_schemas
+                        .get(&e.id)
+                        .map(|f| f.iter().map(|s| s.field_name.as_str()).collect())
+                        .unwrap_or_default();
+                    serde_json::json!({
+                        "id": e.id,
+                        "namespace": e.namespace,
+                        "kind": e.kind,
+                        "name": e.name,
+                        "tags": e.tags,
+                        "metadata": e.metadata,
+                        "secret_fields": schema,
+                        "version": e.version,
+                        "updated_at": e.updated_at.format("%Y-%m-%dT%H:%M:%SZ").to_string(),
+                    })
+                }
+            })
+            .collect();
+
+        let json = serde_json::to_string_pretty(&entries).unwrap_or_else(|_| "[]".to_string());
+        Ok(CallToolResult::success(vec![Content::text(json)]))
+    }
+
+    #[tool(
+        description = "Get decrypted secret field values for an entry. Requires your \
+        encryption key via X-Encryption-Key header (64 hex chars, PBKDF2-derived). \
+        Returns all fields, or a specific field if 'field' is provided."
+    )]
+    async fn secrets_get(
+        &self,
+        Parameters(input): Parameters<GetSecretInput>,
+        ctx: RequestContext<RoleServer>,
+    ) -> Result<CallToolResult, rmcp::ErrorData> {
+        let (user_id, user_key) = Self::require_user_and_key(&ctx)?;
+
+        if let Some(field_name) = &input.field {
+            let value = get_secret_field(
+                &self.pool,
+                &input.namespace,
+                &input.kind,
+                &input.name,
+                field_name,
+                &user_key,
+                Some(user_id),
+            )
+            .await
+            .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+            let result = serde_json::json!({ field_name: value });
+            let json = serde_json::to_string_pretty(&result).unwrap_or_default();
+            Ok(CallToolResult::success(vec![Content::text(json)]))
+        } else {
+            let secrets = get_all_secrets(
+                &self.pool,
+                &input.namespace,
+                &input.kind,
+                &input.name,
+                &user_key,
+                Some(user_id),
+            )
+            .await
+            .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+            let json = serde_json::to_string_pretty(&secrets).unwrap_or_default();
+            Ok(CallToolResult::success(vec![Content::text(json)]))
+        }
+    }
+
+    #[tool(
+        description = "Add or upsert an entry with metadata and encrypted secret fields. \
+        Requires X-Encryption-Key header. \
+        Meta and secret values use 'key=value', 'key=@file', or 'key:=<json>' format."
+    )]
+    async fn secrets_add(
+        &self,
+        Parameters(input): Parameters<AddInput>,
+        ctx: RequestContext<RoleServer>,
+    ) -> Result<CallToolResult, rmcp::ErrorData> {
+        let (user_id, user_key) = Self::require_user_and_key(&ctx)?;
+
+        let tags = input.tags.unwrap_or_default();
+        let meta = input.meta.unwrap_or_default();
+        let secrets = input.secrets.unwrap_or_default();
+
+        let result = svc_add(
+            &self.pool,
+            AddParams {
+                namespace: &input.namespace,
+                kind: &input.kind,
+                name: &input.name,
+                tags: &tags,
+                meta_entries: &meta,
+                secret_entries: &secrets,
+                user_id: Some(user_id),
+            },
+            &user_key,
+        )
+        .await
+        .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+        let json = serde_json::to_string_pretty(&result).unwrap_or_default();
+        Ok(CallToolResult::success(vec![Content::text(json)]))
+    }
+
+    #[tool(
+        description = "Incrementally update an existing entry. Requires X-Encryption-Key header. \
+        Only the fields you specify are changed; everything else is preserved."
+    )]
+    async fn secrets_update(
+        &self,
+        Parameters(input): Parameters<UpdateInput>,
+        ctx: RequestContext<RoleServer>,
+    ) -> Result<CallToolResult, rmcp::ErrorData> {
+        let (user_id, user_key) = Self::require_user_and_key(&ctx)?;
+
+        let add_tags = input.add_tags.unwrap_or_default();
+        let remove_tags = input.remove_tags.unwrap_or_default();
+        let meta = input.meta.unwrap_or_default();
+        let remove_meta = input.remove_meta.unwrap_or_default();
+        let secrets = input.secrets.unwrap_or_default();
+        let remove_secrets = input.remove_secrets.unwrap_or_default();
+
+        let result = svc_update(
+            &self.pool,
+            UpdateParams {
+                namespace: &input.namespace,
+                kind: &input.kind,
+                name: &input.name,
+                add_tags: &add_tags,
+                remove_tags: &remove_tags,
+                meta_entries: &meta,
+                remove_meta: &remove_meta,
+                secret_entries: &secrets,
+                remove_secrets: &remove_secrets,
+                user_id: Some(user_id),
+            },
+            &user_key,
+        )
+        .await
+        .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+        let json = serde_json::to_string_pretty(&result).unwrap_or_default();
+        Ok(CallToolResult::success(vec![Content::text(json)]))
+    }
+
+    #[tool(
+        description = "Delete one entry (specify namespace+kind+name) or bulk delete all \
+        entries matching namespace+kind. Use dry_run=true to preview."
+    )]
+    async fn secrets_delete(
+        &self,
+        Parameters(input): Parameters<DeleteInput>,
+        ctx: RequestContext<RoleServer>,
+    ) -> Result<CallToolResult, rmcp::ErrorData> {
+        let user_id = Self::user_id_from_ctx(&ctx)?;
+
+        let result = svc_delete(
+            &self.pool,
+            DeleteParams {
+                namespace: &input.namespace,
+                kind: input.kind.as_deref(),
+                name: input.name.as_deref(),
+                dry_run: input.dry_run.unwrap_or(false),
+                user_id,
+            },
+        )
+        .await
+        .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+        let json = serde_json::to_string_pretty(&result).unwrap_or_default();
+        Ok(CallToolResult::success(vec![Content::text(json)]))
+    }
+
+    #[tool(
+        description = "View change history for an entry. Returns a list of versions with \
+        actions and timestamps."
+    )]
+    async fn secrets_history(
+        &self,
+        Parameters(input): Parameters<HistoryInput>,
+        _ctx: RequestContext<RoleServer>,
+    ) -> Result<CallToolResult, rmcp::ErrorData> {
+        let result = svc_history(
+            &self.pool,
+            &input.namespace,
+            &input.kind,
+            &input.name,
+            input.limit.unwrap_or(20),
+            None,
+        )
+        .await
+        .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+        let json = serde_json::to_string_pretty(&result).unwrap_or_default();
+        Ok(CallToolResult::success(vec![Content::text(json)]))
+    }
+
+    #[tool(
+        description = "Rollback an entry to a previous version. Requires X-Encryption-Key header. \
+        Omit to_version to restore the most recent snapshot."
+    )]
+    async fn secrets_rollback(
+        &self,
+        Parameters(input): Parameters<RollbackInput>,
+        ctx: RequestContext<RoleServer>,
+    ) -> Result<CallToolResult, rmcp::ErrorData> {
+        let (user_id, user_key) = Self::require_user_and_key(&ctx)?;
+
+        let result = svc_rollback(
+            &self.pool,
+            &input.namespace,
+            &input.kind,
+            &input.name,
+            input.to_version,
+            &user_key,
+            Some(user_id),
+        )
+        .await
+        .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+        let json = serde_json::to_string_pretty(&result).unwrap_or_default();
+        Ok(CallToolResult::success(vec![Content::text(json)]))
+    }
+
+    #[tool(
+        description = "Export matching entries with decrypted secrets as JSON/TOML/YAML string. \
+        Requires X-Encryption-Key header. Useful for backup or data migration."
+    )]
+    async fn secrets_export(
+        &self,
+        Parameters(input): Parameters<ExportInput>,
+        ctx: RequestContext<RoleServer>,
+    ) -> Result<CallToolResult, rmcp::ErrorData> {
+        let (user_id, user_key) = Self::require_user_and_key(&ctx)?;
+        let tags = input.tags.unwrap_or_default();
+        let format = input.format.as_deref().unwrap_or("json");
+
+        let data = svc_export(
+            &self.pool,
+            ExportParams {
+                namespace: input.namespace.as_deref(),
+                kind: input.kind.as_deref(),
+                name: input.name.as_deref(),
+                tags: &tags,
+                query: input.query.as_deref(),
+                no_secrets: false,
+                user_id: Some(user_id),
+            },
+            Some(&user_key),
+        )
+        .await
+        .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+        let serialized = format
+            .parse::<secrets_core::models::ExportFormat>()
+            .and_then(|fmt| fmt.serialize(&data))
+            .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+        Ok(CallToolResult::success(vec![Content::text(serialized)]))
+    }
+
+    #[tool(
+        description = "Preview the environment variable mapping that would be injected when \
+        running a command. Requires X-Encryption-Key header. \
+        Shows variable names and sources, useful for debugging."
+    )]
+    async fn secrets_env_map(
+        &self,
+        Parameters(input): Parameters<EnvMapInput>,
+        ctx: RequestContext<RoleServer>,
+    ) -> Result<CallToolResult, rmcp::ErrorData> {
+        let (user_id, user_key) = Self::require_user_and_key(&ctx)?;
+        let tags = input.tags.unwrap_or_default();
+        let only_fields = input.only_fields.unwrap_or_default();
+
+        let env_map = secrets_core::service::env_map::build_env_map(
+            &self.pool,
+            input.namespace.as_deref(),
+            input.kind.as_deref(),
+            input.name.as_deref(),
+            &tags,
+            &only_fields,
+            input.prefix.as_deref().unwrap_or(""),
+            &user_key,
+            Some(user_id),
+        )
+        .await
+        .map_err(|e| rmcp::ErrorData::internal_error(e.to_string(), None))?;
+
+        let json = serde_json::to_string_pretty(&env_map).unwrap_or_default();
+        Ok(CallToolResult::success(vec![Content::text(json)]))
+    }
+}
+
+// ── ServerHandler ─────────────────────────────────────────────────────────────
+
+#[tool_handler]
+impl ServerHandler for SecretsService {
+    fn get_info(&self) -> InitializeResult {
+        let mut info = InitializeResult::new(ServerCapabilities::builder().enable_tools().build());
+        info.server_info = Implementation::new("secrets-mcp", env!("CARGO_PKG_VERSION"));
+        info.protocol_version = ProtocolVersion::V_2025_03_26;
+        info.instructions = Some(
+            "Manage cross-device secrets and configuration securely. \
+             Data is encrypted with your passphrase-derived key. \
+             Include your 64-char hex key in the X-Encryption-Key header for all read/write operations. \
+             Use secrets_search to discover entries (no key needed), \
+             secrets_get to decrypt secret values, \
+             and secrets_add/secrets_update to write encrypted secrets."
+                .to_string(),
+        );
+        info
+    }
+}

crates/secrets-mcp/src/web.rs

@@ -0,0 +1,494 @@
+use askama::Template;
+use axum::{
+    Json, Router,
+    extract::{Path, Query, State},
+    http::StatusCode,
+    response::{Html, IntoResponse, Redirect, Response},
+    routing::{get, post},
+};
+use serde::{Deserialize, Serialize};
+use tower_sessions::Session;
+use uuid::Uuid;
+
+use secrets_core::crypto::hex;
+use secrets_core::service::{
+    api_key::{ensure_api_key, regenerate_api_key},
+    user::{
+        OAuthProfile, bind_oauth_account, find_or_create_user, get_user_by_id,
+        unbind_oauth_account, update_user_key_setup,
+    },
+};
+
+use crate::AppState;
+use crate::oauth::{OAuthConfig, OAuthUserInfo, google_auth_url, random_state};
+
+const SESSION_USER_ID: &str = "user_id";
+const SESSION_OAUTH_STATE: &str = "oauth_state";
+const SESSION_OAUTH_BIND_MODE: &str = "oauth_bind_mode";
+const SESSION_LOGIN_PROVIDER: &str = "login_provider";
+
+// ── Template types ────────────────────────────────────────────────────────────
+
+#[derive(Template)]
+#[template(path = "login.html")]
+struct LoginTemplate {
+    has_google: bool,
+}
+
+#[derive(Template)]
+#[template(path = "dashboard.html")]
+struct DashboardTemplate {
+    user_name: String,
+    user_email: String,
+    has_passphrase: bool,
+    base_url: String,
+}
+
+// ── App state helpers ─────────────────────────────────────────────────────────
+
+fn google_cfg(state: &AppState) -> Option<&OAuthConfig> {
+    state.google_config.as_ref()
+}
+
+async fn current_user_id(session: &Session) -> Option<Uuid> {
+    session
+        .get::<String>(SESSION_USER_ID)
+        .await
+        .ok()
+        .flatten()
+        .and_then(|s| Uuid::parse_str(&s).ok())
+}
+
+// ── Routes ────────────────────────────────────────────────────────────────────
+
+pub fn web_router() -> Router<AppState> {
+    Router::new()
+        .route("/", get(login_page))
+        .route("/auth/google", get(auth_google))
+        .route("/auth/google/callback", get(auth_google_callback))
+        .route("/auth/logout", post(auth_logout))
+        .route("/dashboard", get(dashboard))
+        .route("/account/bind/google", get(account_bind_google))
+        .route(
+            "/account/bind/google/callback",
+            get(account_bind_google_callback),
+        )
+        .route("/account/unbind/{provider}", post(account_unbind))
+        .route("/api/key-salt", get(api_key_salt))
+        .route("/api/key-setup", post(api_key_setup))
+        .route("/api/apikey", get(api_apikey_get))
+        .route("/api/apikey/regenerate", post(api_apikey_regenerate))
+}
+
+// ── Login page ────────────────────────────────────────────────────────────────
+
+async fn login_page(
+    State(state): State<AppState>,
+    session: Session,
+) -> Result<Response, StatusCode> {
+    if let Some(_uid) = current_user_id(&session).await {
+        return Ok(Redirect::to("/dashboard").into_response());
+    }
+
+    let tmpl = LoginTemplate {
+        has_google: state.google_config.is_some(),
+    };
+    render_template(tmpl)
+}
+
+// ── Google OAuth ──────────────────────────────────────────────────────────────
+
+async fn auth_google(
+    State(state): State<AppState>,
+    session: Session,
+) -> Result<Response, StatusCode> {
+    let config = google_cfg(&state).ok_or(StatusCode::SERVICE_UNAVAILABLE)?;
+
+    let oauth_state = random_state();
+    session
+        .insert(SESSION_OAUTH_STATE, &oauth_state)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    let url = google_auth_url(config, &oauth_state);
+    Ok(Redirect::to(&url).into_response())
+}
+
+#[derive(Deserialize)]
+struct OAuthCallbackQuery {
+    code: Option<String>,
+    state: Option<String>,
+    error: Option<String>,
+}
+
+async fn auth_google_callback(
+    State(state): State<AppState>,
+    session: Session,
+    Query(params): Query<OAuthCallbackQuery>,
+) -> Result<Response, StatusCode> {
+    handle_oauth_callback(&state, &session, params, "google", |s, cfg, code| {
+        Box::pin(crate::oauth::google::exchange_code(
+            &s.http_client,
+            cfg,
+            code,
+        ))
+    })
+    .await
+}
+
+// ── Shared OAuth callback handler ─────────────────────────────────────────────
+
+async fn handle_oauth_callback<F>(
+    state: &AppState,
+    session: &Session,
+    params: OAuthCallbackQuery,
+    provider: &str,
+    exchange_fn: F,
+) -> Result<Response, StatusCode>
+where
+    F: for<'a> Fn(
+        &'a AppState,
+        &'a OAuthConfig,
+        &'a str,
+    ) -> std::pin::Pin<
+        Box<dyn std::future::Future<Output = anyhow::Result<OAuthUserInfo>> + Send + 'a>,
+    >,
+{
+    if let Some(err) = params.error {
+        tracing::warn!(provider, error = %err, "OAuth error");
+        return Ok(Redirect::to("/?error=oauth_error").into_response());
+    }
+
+    let Some(code) = params.code else {
+        tracing::warn!(provider, "OAuth callback missing code");
+        return Ok(Redirect::to("/?error=oauth_missing_code").into_response());
+    };
+    let Some(returned_state) = params.state.as_deref() else {
+        tracing::warn!(provider, "OAuth callback missing state");
+        return Ok(Redirect::to("/?error=oauth_missing_state").into_response());
+    };
+
+    let expected_state: Option<String> = session
+        .get(SESSION_OAUTH_STATE)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+    if expected_state.as_deref() != Some(returned_state) {
+        tracing::warn!(
+            provider,
+            expected_present = expected_state.is_some(),
+            "OAuth state mismatch (empty session often means SameSite=Strict or server restart)"
+        );
+        return Ok(Redirect::to("/?error=oauth_state").into_response());
+    }
+    session.remove::<String>(SESSION_OAUTH_STATE).await.ok();
+
+    let config = match provider {
+        "google" => state
+            .google_config
+            .as_ref()
+            .ok_or(StatusCode::SERVICE_UNAVAILABLE)?,
+        _ => return Err(StatusCode::BAD_REQUEST),
+    };
+
+    let user_info = exchange_fn(state, config, code.as_str())
+        .await
+        .map_err(|e| {
+            tracing::error!(provider, error = %e, "failed to exchange OAuth code");
+            StatusCode::INTERNAL_SERVER_ERROR
+        })?;
+
+    let bind_mode: bool = session
+        .get(SESSION_OAUTH_BIND_MODE)
+        .await
+        .unwrap_or(None)
+        .unwrap_or(false);
+
+    if bind_mode {
+        let user_id = current_user_id(session)
+            .await
+            .ok_or(StatusCode::UNAUTHORIZED)?;
+        session.remove::<bool>(SESSION_OAUTH_BIND_MODE).await.ok();
+
+        let profile = OAuthProfile {
+            provider: user_info.provider,
+            provider_id: user_info.provider_id,
+            email: user_info.email,
+            name: user_info.name,
+            avatar_url: user_info.avatar_url,
+        };
+
+        bind_oauth_account(&state.pool, user_id, profile)
+            .await
+            .map_err(|e| {
+                tracing::error!(error = %e, "failed to bind OAuth account");
+                StatusCode::INTERNAL_SERVER_ERROR
+            })?;
+
+        return Ok(Redirect::to("/dashboard?bound=1").into_response());
+    }
+
+    let profile = OAuthProfile {
+        provider: user_info.provider,
+        provider_id: user_info.provider_id,
+        email: user_info.email,
+        name: user_info.name,
+        avatar_url: user_info.avatar_url,
+    };
+
+    let (user, _is_new) = find_or_create_user(&state.pool, profile)
+        .await
+        .map_err(|e| {
+            tracing::error!(error = %e, "failed to find or create user");
+            StatusCode::INTERNAL_SERVER_ERROR
+        })?;
+
+    // Ensure the user has an API key (auto-creates on first login).
+    if let Err(e) = ensure_api_key(&state.pool, user.id).await {
+        tracing::warn!(error = %e, "failed to ensure api key for user");
+    }
+
+    session
+        .insert(SESSION_USER_ID, user.id.to_string())
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+    session
+        .insert(SESSION_LOGIN_PROVIDER, &provider)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    Ok(Redirect::to("/dashboard").into_response())
+}
+
+// ── Logout ────────────────────────────────────────────────────────────────────
+
+async fn auth_logout(session: Session) -> impl IntoResponse {
+    session.flush().await.ok();
+    Redirect::to("/")
+}
+
+// ── Dashboard ─────────────────────────────────────────────────────────────────
+
+async fn dashboard(
+    State(state): State<AppState>,
+    session: Session,
+) -> Result<Response, StatusCode> {
+    let user_id = current_user_id(&session)
+        .await
+        .ok_or(StatusCode::UNAUTHORIZED)?;
+
+    let user = get_user_by_id(&state.pool, user_id)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
+        .ok_or(StatusCode::UNAUTHORIZED)?;
+
+    let tmpl = DashboardTemplate {
+        user_name: user.name.clone(),
+        user_email: user.email.clone().unwrap_or_default(),
+        has_passphrase: user.key_salt.is_some(),
+        base_url: state.base_url.clone(),
+    };
+
+    render_template(tmpl)
+}
+
+// ── Account bind/unbind ───────────────────────────────────────────────────────
+
+async fn account_bind_google(
+    State(state): State<AppState>,
+    session: Session,
+) -> Result<Response, StatusCode> {
+    let _ = current_user_id(&session)
+        .await
+        .ok_or(StatusCode::UNAUTHORIZED)?;
+
+    session
+        .insert(SESSION_OAUTH_BIND_MODE, true)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    let redirect_uri = format!("{}/account/bind/google/callback", state.base_url);
+    let mut cfg = state
+        .google_config
+        .clone()
+        .ok_or(StatusCode::SERVICE_UNAVAILABLE)?;
+    cfg.redirect_uri = redirect_uri;
+    let st = random_state();
+    session.insert(SESSION_OAUTH_STATE, &st).await.ok();
+
+    Ok(Redirect::to(&google_auth_url(&cfg, &st)).into_response())
+}
+
+async fn account_bind_google_callback(
+    State(state): State<AppState>,
+    session: Session,
+    Query(params): Query<OAuthCallbackQuery>,
+) -> Result<Response, StatusCode> {
+    handle_oauth_callback(&state, &session, params, "google", |s, cfg, code| {
+        Box::pin(crate::oauth::google::exchange_code(
+            &s.http_client,
+            cfg,
+            code,
+        ))
+    })
+    .await
+}
+
+async fn account_unbind(
+    State(state): State<AppState>,
+    Path(provider): Path<String>,
+    session: Session,
+) -> Result<Response, StatusCode> {
+    let user_id = current_user_id(&session)
+        .await
+        .ok_or(StatusCode::UNAUTHORIZED)?;
+
+    let current_login_provider = session
+        .get::<String>(SESSION_LOGIN_PROVIDER)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    unbind_oauth_account(
+        &state.pool,
+        user_id,
+        &provider,
+        current_login_provider.as_deref(),
+    )
+    .await
+    .map_err(|e| {
+        tracing::warn!(error = %e, "failed to unbind oauth account");
+        StatusCode::BAD_REQUEST
+    })?;
+
+    Ok(Redirect::to("/dashboard?unbound=1").into_response())
+}
+
+// ── Passphrase / Key setup API ────────────────────────────────────────────────
+
+#[derive(Serialize)]
+struct KeySaltResponse {
+    has_passphrase: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    salt: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    key_check: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    params: Option<serde_json::Value>,
+}
+
+async fn api_key_salt(
+    State(state): State<AppState>,
+    session: Session,
+) -> Result<Json<KeySaltResponse>, StatusCode> {
+    let user_id = current_user_id(&session)
+        .await
+        .ok_or(StatusCode::UNAUTHORIZED)?;
+
+    let user = get_user_by_id(&state.pool, user_id)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
+        .ok_or(StatusCode::UNAUTHORIZED)?;
+
+    if user.key_salt.is_none() {
+        return Ok(Json(KeySaltResponse {
+            has_passphrase: false,
+            salt: None,
+            key_check: None,
+            params: None,
+        }));
+    }
+
+    Ok(Json(KeySaltResponse {
+        has_passphrase: true,
+        salt: user.key_salt.as_deref().map(hex::encode_hex),
+        key_check: user.key_check.as_deref().map(hex::encode_hex),
+        params: user.key_params,
+    }))
+}
+
+#[derive(Deserialize)]
+struct KeySetupRequest {
+    /// Hex-encoded 32-byte random salt
+    salt: String,
+    /// Hex-encoded AES-256-GCM encryption of "secrets-mcp-key-check" with the derived key
+    key_check: String,
+    /// Key derivation parameters, e.g. {"alg":"pbkdf2-sha256","iterations":600000}
+    params: serde_json::Value,
+}
+
+#[derive(Serialize)]
+struct KeySetupResponse {
+    ok: bool,
+}
+
+async fn api_key_setup(
+    State(state): State<AppState>,
+    session: Session,
+    Json(body): Json<KeySetupRequest>,
+) -> Result<Json<KeySetupResponse>, StatusCode> {
+    let user_id = current_user_id(&session)
+        .await
+        .ok_or(StatusCode::UNAUTHORIZED)?;
+
+    let salt = hex::decode_hex(&body.salt).map_err(|_| StatusCode::BAD_REQUEST)?;
+    let key_check = hex::decode_hex(&body.key_check).map_err(|_| StatusCode::BAD_REQUEST)?;
+
+    if salt.len() != 32 {
+        return Err(StatusCode::BAD_REQUEST);
+    }
+
+    update_user_key_setup(&state.pool, user_id, &salt, &key_check, &body.params)
+        .await
+        .map_err(|e| {
+            tracing::error!(error = %e, "failed to update key setup");
+            StatusCode::INTERNAL_SERVER_ERROR
+        })?;
+
+    Ok(Json(KeySetupResponse { ok: true }))
+}
+
+// ── API Key management ────────────────────────────────────────────────────────
+
+#[derive(Serialize)]
+struct ApiKeyResponse {
+    api_key: String,
+}
+
+async fn api_apikey_get(
+    State(state): State<AppState>,
+    session: Session,
+) -> Result<Json<ApiKeyResponse>, StatusCode> {
+    let user_id = current_user_id(&session)
+        .await
+        .ok_or(StatusCode::UNAUTHORIZED)?;
+
+    let api_key = ensure_api_key(&state.pool, user_id)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    Ok(Json(ApiKeyResponse { api_key }))
+}
+
+async fn api_apikey_regenerate(
+    State(state): State<AppState>,
+    session: Session,
+) -> Result<Json<ApiKeyResponse>, StatusCode> {
+    let user_id = current_user_id(&session)
+        .await
+        .ok_or(StatusCode::UNAUTHORIZED)?;
+
+    let api_key = regenerate_api_key(&state.pool, user_id)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    Ok(Json(ApiKeyResponse { api_key }))
+}
+
+// ── Helper ────────────────────────────────────────────────────────────────────
+
+fn render_template<T: Template>(tmpl: T) -> Result<Response, StatusCode> {
+    let html = tmpl.render().map_err(|e| {
+        tracing::error!(error = %e, "template render error");
+        StatusCode::INTERNAL_SERVER_ERROR
+    })?;
+    Ok(Html(html).into_response())
+}

crates/secrets-mcp/templates/dashboard.html

@@ -0,0 +1,725 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Secrets</title>
+    <style>
+        *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;600&family=Inter:wght@400;500;600&display=swap');
+        :root {
+            --bg: #0d1117; --surface: #161b22; --surface2: #21262d;
+            --border: #30363d; --text: #e6edf3; --text-muted: #8b949e;
+            --accent: #58a6ff; --accent-hover: #79b8ff;
+            --danger: #f85149; --success: #3fb950; --warn: #d29922;
+        }
+        body { background: var(--bg); color: var(--text); font-family: 'Inter', sans-serif; min-height: 100vh; }
+
+        /* Nav */
+        .nav { background: var(--surface); border-bottom: 1px solid var(--border);
+               padding: 0 24px; display: flex; align-items: center; gap: 12px; height: 52px; }
+        .nav-logo { font-family: 'JetBrains Mono', monospace; font-size: 15px; font-weight: 600;
+                    color: var(--text); text-decoration: none; }
+        .nav-logo span { color: var(--accent); }
+        .nav-spacer { flex: 1; }
+        .nav-user { font-size: 13px; color: var(--text-muted); }
+        .lang-bar { display: flex; gap: 2px; background: var(--surface2); border-radius: 6px; padding: 2px; }
+        .lang-btn { padding: 3px 9px; border: none; background: none; color: var(--text-muted);
+                    font-size: 12px; cursor: pointer; border-radius: 4px; }
+        .lang-btn.active { background: var(--border); color: var(--text); }
+        .btn-sign-out { padding: 5px 12px; border-radius: 6px; border: 1px solid var(--border);
+                        background: none; color: var(--text); font-size: 12px; cursor: pointer; }
+        .btn-sign-out:hover { background: var(--surface2); }
+
+        /* Main */
+        .main { display: flex; justify-content: center; align-items: flex-start;
+                padding: 48px 24px; min-height: calc(100vh - 52px); }
+        .card { background: var(--surface); border: 1px solid var(--border); border-radius: 12px;
+                padding: 32px; width: 100%; max-width: 980px; }
+        .card-title { font-size: 18px; font-weight: 600; margin-bottom: 6px; }
+        .card-sub { font-size: 13px; color: var(--text-muted); line-height: 1.6; margin-bottom: 24px; }
+        .info-box { background: var(--surface2); border: 1px solid var(--border); border-radius: 8px;
+                    padding: 12px 14px; margin-bottom: 18px; }
+        .info-title { font-size: 12px; font-weight: 600; color: var(--text); margin-bottom: 8px; }
+        .info-line { font-size: 12px; color: var(--text-muted); line-height: 1.6; }
+        /* Form */
+        .field { margin-bottom: 12px; }
+        .field label { display: block; font-size: 12px; color: var(--text-muted); margin-bottom: 5px; }
+        .field input { width: 100%; background: var(--bg); border: 1px solid var(--border);
+                       color: var(--text); padding: 9px 12px; border-radius: 6px;
+                       font-size: 13px; outline: none; }
+        .field input:focus { border-color: var(--accent); }
+        .error-msg { color: var(--danger); font-size: 12px; margin-top: 6px; display: none; }
+
+        /* Buttons */
+        .btn-primary { display: inline-flex; align-items: center; gap: 6px; width: 100%;
+                       justify-content: center; padding: 10px 20px; border-radius: 7px;
+                       border: none; background: var(--accent); color: #0d1117;
+                       font-size: 14px; font-weight: 600; cursor: pointer; transition: background 0.15s; }
+        .btn-primary:hover { background: var(--accent-hover); }
+        .btn-primary:disabled { opacity: 0.5; cursor: not-allowed; }
+        .btn-sm { display: inline-flex; align-items: center; gap: 4px; padding: 5px 12px;
+                  border-radius: 5px; border: 1px solid var(--border); background: none;
+                  color: var(--text-muted); font-size: 12px; cursor: pointer; }
+        .btn-sm:hover { color: var(--text); border-color: var(--text-muted); }
+        .btn-copy { display: flex; align-items: center; gap: 8px; width: 100%; justify-content: center;
+                    padding: 11px 20px; border-radius: 7px; border: 1px solid var(--success);
+                    background: rgba(63,185,80,0.1); color: var(--success);
+                    font-size: 14px; font-weight: 600; cursor: pointer; transition: all 0.15s; }
+        .btn-copy:hover { background: rgba(63,185,80,0.2); }
+        .btn-copy.copied { background: var(--success); color: #0d1117; border-color: var(--success); }
+
+        .support-row { display: flex; gap: 8px; margin-bottom: 12px; flex-wrap: wrap; }
+        .support-chip { display: inline-flex; align-items: center; padding: 6px 10px; border-radius: 999px;
+                        border: 1px solid var(--border); background: var(--surface2);
+                        color: var(--text-muted); font-size: 12px; }
+
+        /* Config box */
+        .config-wrap { position: relative; margin-bottom: 14px; }
+        .config-box { background: var(--bg); border: 1px solid var(--border); border-radius: 8px;
+                      padding: 16px; font-family: 'JetBrains Mono', monospace; font-size: 11px;
+                      line-height: 1.7; color: var(--text); overflow-x: auto; white-space: pre; }
+        .config-box.locked { color: var(--text-muted); filter: blur(3px); user-select: none;
+                             pointer-events: none; }
+        .config-key { color: #79c0ff; }
+        .config-str { color: #a5d6ff; }
+        .config-val { color: var(--accent); }
+
+        /* Divider */
+        .divider { border: none; border-top: 1px solid var(--border); margin: 20px 0; }
+
+        /* Actions row */
+        .actions-row { display: flex; gap: 8px; flex-wrap: wrap; justify-content: center; }
+
+        /* Spinner */
+        .spinner { display: inline-block; width: 14px; height: 14px; border: 2px solid rgba(13,17,23,0.3);
+                   border-top-color: #0d1117; border-radius: 50%; animation: spin 0.7s linear infinite; }
+        @keyframes spin { to { transform: rotate(360deg); } }
+
+        /* Modal */
+        .modal-bd { display: none; position: fixed; inset: 0; background: rgba(0,0,0,0.75);
+                    z-index: 100; align-items: center; justify-content: center; }
+        .modal-bd.open { display: flex; }
+        .modal { background: var(--surface); border: 1px solid var(--border); border-radius: 12px;
+                 padding: 28px; width: 100%; max-width: 420px; }
+        .modal h3 { font-size: 16px; font-weight: 600; margin-bottom: 16px; }
+        .modal-actions { display: flex; gap: 8px; margin-top: 16px; }
+        .btn-modal-ok { flex: 1; padding: 8px; border-radius: 6px; border: none;
+                        background: var(--accent); color: #0d1117; font-size: 13px;
+                        font-weight: 600; cursor: pointer; }
+        .btn-modal-ok:hover { background: var(--accent-hover); }
+        .btn-modal-cancel { padding: 8px 16px; border-radius: 6px; border: 1px solid var(--border);
+                            background: none; color: var(--text); font-size: 13px; cursor: pointer; }
+        .btn-modal-cancel:hover { background: var(--surface2); }
+    </style>
+</head>
+<body data-has-passphrase="{{ has_passphrase }}" data-base-url="{{ base_url }}">
+
+<nav class="nav">
+    <a href="/dashboard" class="nav-logo"><span>secrets</span></a>
+    <span class="nav-spacer"></span>
+    <span class="nav-user">{{ user_name }}{% if !user_email.is_empty() %} · {{ user_email }}{% endif %}</span>
+    <div class="lang-bar">
+        <button class="lang-btn" onclick="setLang('zh-CN')">简</button>
+        <button class="lang-btn" onclick="setLang('zh-TW')">繁</button>
+        <button class="lang-btn" onclick="setLang('en')">EN</button>
+    </div>
+    <form action="/auth/logout" method="post" style="display:inline">
+        <button type="submit" class="btn-sign-out" data-i18n="signOut">退出</button>
+    </form>
+</nav>
+
+<div class="main">
+<div class="card">
+
+    <!-- ── Locked state ──────────────────────────────────────────────────── -->
+    <div id="locked-view">
+        <div class="card-title" data-i18n="lockedTitle">获取 MCP 配置</div>
+        <div class="card-sub" data-i18n="lockedSub">输入加密密码，派生密钥后生成完整的 MCP 配置，可直接复制到 AI 客户端。</div>
+        <div class="info-box">
+            <div class="info-title" data-i18n="aboutTitle">说明</div>
+            <div class="info-line" data-i18n="aboutApiKey">API Key 用于身份认证，告诉服务端“你是谁”。</div>
+        </div>
+        <div class="support-row" aria-label="Supported clients">
+            <span class="support-chip">Cursor</span>
+            <span class="support-chip">Claude Code</span>
+            <span class="support-chip">Codex</span>
+            <span class="support-chip">Gemini CLI</span>
+        </div>
+
+        <!-- placeholder config -->
+        <div class="config-wrap">
+            <div class="config-box locked" id="placeholder-config"></div>
+        </div>
+
+        <!-- Setup form (no passphrase yet) -->
+        <div id="setup-form" style="display:none">
+            <div class="field">
+                <label data-i18n="labelPassphrase">加密密码</label>
+                <input type="password" id="setup-pass1" data-i18n-ph="phPassphrase">
+            </div>
+            <div class="field">
+                <label data-i18n="labelConfirm">确认密码</label>
+                <input type="password" id="setup-pass2" data-i18n-ph="phConfirm">
+            </div>
+            <div class="error-msg" id="setup-error"></div>
+            <button class="btn-primary" id="setup-btn" onclick="doSetup()">
+                <span data-i18n="btnSetup">设置并获取配置</span>
+            </button>
+            <p style="font-size:11px;color:var(--text-muted);text-align:center;margin-top:10px" data-i18n="setupNote">
+                密码不会上传服务器。遗忘后数据将无法恢复。
+            </p>
+        </div>
+
+        <!-- Unlock form (passphrase already set) -->
+        <div id="unlock-form" style="display:none">
+            <div class="field">
+                <label data-i18n="labelPassphrase">加密密码</label>
+                <input type="password" id="unlock-pass" data-i18n-ph="phPassphrase">
+            </div>
+            <div class="error-msg" id="unlock-error"></div>
+            <button class="btn-primary" id="unlock-btn" onclick="doUnlock()">
+                <span data-i18n="btnUnlock">解锁并获取配置</span>
+            </button>
+        </div>
+    </div>
+
+    <!-- ── Unlocked state ────────────────────────────────────────────────── -->
+    <div id="unlocked-view" style="display:none">
+        <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:6px">
+            <div class="card-title" data-i18n="unlockedTitle">MCP 配置</div>
+            <span style="font-size:12px;color:var(--success)">✓ <span data-i18n="ready">已就绪</span></span>
+        </div>
+        <div class="card-sub" data-i18n="unlockedSub">复制以下配置到 AI 客户端的 mcp.json 文件。</div>
+        <div class="support-row" aria-label="Supported clients" style="margin-bottom:20px">
+            <span class="support-chip">Cursor</span>
+            <span class="support-chip">Claude Code</span>
+            <span class="support-chip">Codex</span>
+            <span class="support-chip">Gemini CLI</span>
+        </div>
+
+        <div class="config-wrap">
+            <pre class="config-box" id="real-config"></pre>
+        </div>
+
+        <div style="display:flex;gap:10px;flex-wrap:wrap">
+            <button class="btn-copy" id="copy-full-btn" onclick="copyFullConfig()" style="flex:1">
+                <span id="copy-full-text" data-i18n="btnCopyFull">复制全部 mcp.json</span>
+            </button>
+            <button class="btn-copy" id="copy-secrets-btn" onclick="copySecretsConfig()" style="flex:1">
+                <span id="copy-secrets-text" data-i18n="btnCopySecrets">复制 secrets 配置</span>
+            </button>
+        </div>
+
+        <hr class="divider">
+
+        <div class="actions-row">
+            <button class="btn-sm" onclick="clearAndLock()" data-i18n="btnClear">清除本地加密密钥</button>
+            <button class="btn-sm" onclick="openChangeModal()" data-i18n="btnChangePass">更换密码</button>
+            <button class="btn-sm" onclick="confirmRegenerate()" data-i18n="btnRegen">重新生成 API Key</button>
+        </div>
+    </div>
+
+</div>
+</div>
+
+<!-- ── Change passphrase modal ──────────────────────────────────────────────── -->
+<div class="modal-bd" id="change-modal">
+    <div class="modal">
+        <h3 data-i18n="changeTitle">更换密码</h3>
+        <div class="field">
+            <label data-i18n="labelNew">新密码</label>
+            <input type="password" id="change-pass1" data-i18n-ph="phPassphrase">
+        </div>
+        <div class="field">
+            <label data-i18n="labelConfirm">确认</label>
+            <input type="password" id="change-pass2" data-i18n-ph="phConfirm">
+        </div>
+        <div class="error-msg" id="change-error"></div>
+        <div class="modal-actions">
+            <button class="btn-modal-ok" id="change-btn" onclick="doChange()" data-i18n="btnChange">确认更换</button>
+            <button class="btn-modal-cancel" onclick="closeChangeModal()" data-i18n="btnCancel">取消</button>
+        </div>
+    </div>
+</div>
+
+<script>
+// ── i18n ───────────────────────────────────────────────────────────────────────
+
+const T = {
+    'zh-CN': {
+        signOut: '退出',
+        lockedTitle: '获取 MCP 配置',
+        lockedSub: '输入加密密码，派生密钥后生成完整的 MCP 配置，可用于 Cursor、Claude Code、Codex 和 Gemini CLI。',
+        aboutTitle: '说明',
+        aboutApiKey: 'API Key 用于身份认证，告诉服务端“你是谁”。',
+        labelPassphrase: '加密密码',
+        labelConfirm: '确认密码',
+        labelNew: '新密码',
+        phPassphrase: '输入密码…',
+        phConfirm: '再次输入…',
+        btnSetup: '设置并获取配置',
+        btnUnlock: '解锁并获取配置',
+        setupNote: '密码不会上传服务器。遗忘后数据将无法恢复。',
+        errEmpty: '密码不能为空。',
+        errShort: '密码至少需要 8 个字符。',
+        errMismatch: '两次输入不一致。',
+        errWrong: '密码错误，请重试。',
+        unlockedTitle: 'MCP 配置',
+        unlockedSub: '复制以下 `mcp.json` 风格配置，并按目标客户端需要自行调整字段名。',
+        ready: '已就绪',
+        btnCopyFull: '复制完整 mcp.json',
+        btnCopySecrets: '复制 secrets 条目',
+        btnCopied: '已复制！',
+        btnClear: '清除本地加密密钥',
+        btnChangePass: '更换密码',
+        btnRegen: '重新生成 API Key',
+        changeTitle: '更换密码',
+        btnChange: '确认更换',
+        btnCancel: '取消',
+        regenConfirm: '重新生成 API Key 后，当前 Key 立即失效，需同步更新 AI 客户端配置。确认继续？',
+        regenFailed: '重新生成失败，请刷新页面重试。',
+    },
+    'zh-TW': {
+        signOut: '登出',
+        lockedTitle: '取得 MCP 設定',
+        lockedSub: '輸入加密密碼，派生金鑰後生成完整的 MCP 設定，可用於 Cursor、Claude Code、Codex 與 Gemini CLI。',
+        aboutTitle: '說明',
+        aboutApiKey: 'API Key 用於身份驗證，告訴服務端「你是誰」。',
+        labelPassphrase: '加密密碼',
+        labelConfirm: '確認密碼',
+        labelNew: '新密碼',
+        phPassphrase: '輸入密碼…',
+        phConfirm: '再次輸入…',
+        btnSetup: '設定並取得設定',
+        btnUnlock: '解鎖並取得設定',
+        setupNote: '密碼不會上傳伺服器。遺忘後資料將無法復原。',
+        errEmpty: '密碼不能為空。',
+        errShort: '密碼至少需要 8 個字元。',
+        errMismatch: '兩次輸入不一致。',
+        errWrong: '密碼錯誤，請重試。',
+        unlockedTitle: 'MCP 設定',
+        unlockedSub: '複製以下 `mcp.json` 風格設定，並依目標用戶端需要自行調整欄位名稱。',
+        ready: '已就緒',
+        btnCopyFull: '複製完整 mcp.json',
+        btnCopySecrets: '複製 secrets 項目',
+        btnCopied: '已複製！',
+        btnClear: '清除本地加密金鑰',
+        btnChangePass: '更換密碼',
+        btnRegen: '重新產生 API Key',
+        changeTitle: '更換密碼',
+        btnChange: '確認更換',
+        btnCancel: '取消',
+        regenConfirm: '重新產生 API Key 後，目前 Key 立即失效，需同步更新 AI 用戶端設定。確認繼續？',
+        regenFailed: '重新產生失敗，請重新整理頁面再試。',
+    },
+    'en': {
+        signOut: 'Sign out',
+        lockedTitle: 'Get MCP Config',
+        lockedSub: 'Enter your encryption password to derive your key and generate an MCP config for Cursor, Claude Code, Codex, and Gemini CLI.',
+        aboutTitle: 'About',
+        aboutApiKey: 'The API key is used for authentication and tells the server who you are.',
+        labelPassphrase: 'Encryption password',
+        labelConfirm: 'Confirm password',
+        labelNew: 'New password',
+        phPassphrase: 'Enter password…',
+        phConfirm: 'Repeat password…',
+        btnSetup: 'Set up & get config',
+        btnUnlock: 'Unlock & get config',
+        setupNote: 'Your password never leaves this device. If forgotten, encrypted data cannot be recovered.',
+        errEmpty: 'Password cannot be empty.',
+        errShort: 'Password must be at least 8 characters.',
+        errMismatch: 'Passwords do not match.',
+        errWrong: 'Incorrect password, please try again.',
+        unlockedTitle: 'MCP Config',
+        unlockedSub: 'Copy the `mcp.json`-style config below and adapt field names if your client expects a different schema.',
+        ready: 'Ready',
+        btnCopyFull: 'Copy full mcp.json',
+        btnCopySecrets: 'Copy secrets entry',
+        btnCopied: 'Copied!',
+        btnClear: 'Clear local encryption key',
+        btnChangePass: 'Change password',
+        btnRegen: 'Regenerate API key',
+        changeTitle: 'Change password',
+        btnChange: 'Confirm',
+        btnCancel: 'Cancel',
+        regenConfirm: 'Regenerating will immediately invalidate your current API key. You will need to update your AI client config. Continue?',
+        regenFailed: 'Regeneration failed. Please refresh and try again.',
+    }
+};
+
+let currentLang = localStorage.getItem('lang') || 'zh-CN';
+
+function t(key) { return T[currentLang][key] || T['en'][key] || key; }
+
+function applyLang() {
+    document.documentElement.lang = currentLang;
+    document.querySelectorAll('[data-i18n]').forEach(el => {
+        const key = el.getAttribute('data-i18n');
+        el.textContent = t(key);
+    });
+    document.querySelectorAll('[data-i18n-ph]').forEach(el => {
+        el.placeholder = t(el.getAttribute('data-i18n-ph'));
+    });
+    document.querySelectorAll('.lang-btn').forEach(btn => {
+        const map = { 'zh-CN': '简', 'zh-TW': '繁', 'en': 'EN' };
+        btn.classList.toggle('active', btn.textContent === map[currentLang]);
+    });
+    // Rebuild placeholder config (language affects nothing but triggers re-render)
+    renderPlaceholderConfig();
+    // Rebuild real config if unlocked
+    if (currentEncKey && currentApiKey) renderRealConfig();
+}
+
+function setLang(lang) {
+    currentLang = lang;
+    localStorage.setItem('lang', lang);
+    applyLang();
+}
+
+// ── Constants ──────────────────────────────────────────────────────────────────
+
+const HAS_PASSPHRASE = document.body.dataset.hasPassphrase === 'true';
+const BASE_URL = document.body.dataset.baseUrl;
+const KEY_CHECK_PLAINTEXT = 'secrets-mcp-key-check';
+const PBKDF2_ITERATIONS = 600000;
+const ENC = new TextEncoder();
+let currentEncKey = null;
+let currentApiKey = null;
+
+// ── Placeholder config ─────────────────────────────────────────────────────────
+
+function renderPlaceholderConfig() {
+    document.getElementById('placeholder-config').textContent =
+        buildConfigText('sk_' + '•'.repeat(64), '•'.repeat(64));
+}
+
+function buildBaseServerConfig(apiKey, encKey) {
+    return {
+        url: BASE_URL + '/mcp',
+        headers: {
+            Authorization: 'Bearer ' + apiKey,
+            'X-Encryption-Key': encKey
+        }
+    };
+}
+
+function buildSecretsEntryObject(apiKey, encKey) {
+    return buildBaseServerConfig(apiKey, encKey);
+}
+
+function buildConfigText(apiKey, encKey) {
+    return JSON.stringify({ mcpServers: { secrets: buildSecretsEntryObject(apiKey, encKey) } }, null, 2);
+}
+
+function buildSecretsConfigText(apiKey, encKey) {
+    const wrapped = JSON.stringify({
+        secrets: buildSecretsEntryObject(apiKey, encKey)
+    }, null, 2);
+    const lines = wrapped.split('\n');
+    return lines.length < 3 ? wrapped : lines.slice(1, -1).join('\n');
+}
+
+// ── Unlock / Setup flow ───────────────────────────────────────────────────────
+
+function showLockedView() {
+    document.getElementById('locked-view').style.display = '';
+    document.getElementById('unlocked-view').style.display = 'none';
+    if (HAS_PASSPHRASE) {
+        document.getElementById('setup-form').style.display = 'none';
+        document.getElementById('unlock-form').style.display = '';
+        setTimeout(() => document.getElementById('unlock-pass').focus(), 50);
+    } else {
+        document.getElementById('setup-form').style.display = '';
+        document.getElementById('unlock-form').style.display = 'none';
+        setTimeout(() => document.getElementById('setup-pass1').focus(), 50);
+    }
+}
+
+async function showUnlockedView(encKeyHex, apiKey) {
+    currentEncKey = encKeyHex;
+    currentApiKey = apiKey;
+    sessionStorage.setItem('enc_key', encKeyHex);
+    renderRealConfig();
+    document.getElementById('locked-view').style.display = 'none';
+    document.getElementById('unlocked-view').style.display = '';
+}
+
+function renderRealConfig() {
+    document.getElementById('real-config').textContent =
+        buildConfigText(currentApiKey, currentEncKey);
+}
+
+function clearAndLock() {
+    sessionStorage.removeItem('enc_key');
+    currentEncKey = null;
+    currentApiKey = null;
+    showLockedView();
+}
+
+// ── Web Crypto helpers ─────────────────────────────────────────────────────────
+
+async function deriveKey(passphrase, saltBytes, extractable = false) {
+    const km = await crypto.subtle.importKey('raw', ENC.encode(passphrase), 'PBKDF2', false, ['deriveKey']);
+    return crypto.subtle.deriveKey(
+        { name: 'PBKDF2', salt: saltBytes, iterations: PBKDF2_ITERATIONS, hash: 'SHA-256' },
+        km, { name: 'AES-GCM', length: 256 }, extractable, ['encrypt', 'decrypt']
+    );
+}
+
+async function exportKeyHex(cryptoKey) {
+    const raw = await crypto.subtle.exportKey('raw', cryptoKey);
+    return Array.from(new Uint8Array(raw)).map(b => b.toString(16).padStart(2, '0')).join('');
+}
+
+function hexToBytes(hex) {
+    const b = new Uint8Array(hex.length / 2);
+    for (let i = 0; i < hex.length; i += 2) b[i / 2] = parseInt(hex.slice(i, i + 2), 16);
+    return b;
+}
+
+function bytesToHex(bytes) {
+    return Array.from(bytes).map(b => b.toString(16).padStart(2, '0')).join('');
+}
+
+async function encryptKeyCheck(cryptoKey) {
+    const nonce = crypto.getRandomValues(new Uint8Array(12));
+    const ct = await crypto.subtle.encrypt({ name: 'AES-GCM', iv: nonce }, cryptoKey, ENC.encode(KEY_CHECK_PLAINTEXT));
+    const out = new Uint8Array(12 + ct.byteLength);
+    out.set(nonce); out.set(new Uint8Array(ct), 12);
+    return bytesToHex(out);
+}
+
+async function verifyKeyCheck(cryptoKey, keyCheckHex) {
+    try {
+        const b = hexToBytes(keyCheckHex);
+        const plain = await crypto.subtle.decrypt({ name: 'AES-GCM', iv: b.slice(0, 12) }, cryptoKey, b.slice(12));
+        return new TextDecoder().decode(plain) === KEY_CHECK_PLAINTEXT;
+    } catch { return false; }
+}
+
+// ── Passphrase setup (first time) ─────────────────────────────────────────────
+
+function setBtnLoading(id, loading, labelKey) {
+    const btn = document.getElementById(id);
+    btn.disabled = loading;
+    btn.innerHTML = loading
+        ? '<span class="spinner"></span>'
+        : `<span data-i18n="${labelKey}">${t(labelKey)}</span>`;
+}
+
+async function doSetup() {
+    const pass1 = document.getElementById('setup-pass1').value;
+    const pass2 = document.getElementById('setup-pass2').value;
+    const errEl = document.getElementById('setup-error');
+    errEl.style.display = 'none';
+
+    if (!pass1) { showErr(errEl, t('errEmpty')); return; }
+    if (pass1.length < 8) { showErr(errEl, t('errShort')); return; }
+    if (pass1 !== pass2) { showErr(errEl, t('errMismatch')); return; }
+
+    setBtnLoading('setup-btn', true, 'btnSetup');
+    try {
+        const salt = crypto.getRandomValues(new Uint8Array(32));
+        const cryptoKey = await deriveKey(pass1, salt, true);
+        const keyCheckHex = await encryptKeyCheck(cryptoKey);
+        const hexKey = await exportKeyHex(cryptoKey);
+
+        const resp = await fetch('/api/key-setup', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                salt: bytesToHex(salt),
+                key_check: keyCheckHex,
+                params: { alg: 'pbkdf2-sha256', iterations: PBKDF2_ITERATIONS }
+            })
+        });
+        if (!resp.ok) throw new Error('HTTP ' + resp.status);
+
+        const apiKey = await fetchApiKey();
+        await showUnlockedView(hexKey, apiKey);
+    } catch (e) {
+        showErr(errEl, 'Error: ' + e.message);
+    } finally {
+        setBtnLoading('setup-btn', false, 'btnSetup');
+    }
+}
+
+// ── Passphrase unlock ──────────────────────────────────────────────────────────
+
+async function doUnlock() {
+    const pass = document.getElementById('unlock-pass').value;
+    const errEl = document.getElementById('unlock-error');
+    errEl.style.display = 'none';
+
+    if (!pass) { showErr(errEl, t('errEmpty')); return; }
+
+    setBtnLoading('unlock-btn', true, 'btnUnlock');
+    try {
+        const saltResp = await fetch('/api/key-salt');
+        if (!saltResp.ok) throw new Error('HTTP ' + saltResp.status);
+        const saltData = await saltResp.json();
+
+        const cryptoKey = await deriveKey(pass, hexToBytes(saltData.salt), true);
+        const valid = await verifyKeyCheck(cryptoKey, saltData.key_check);
+        if (!valid) { showErr(errEl, t('errWrong')); return; }
+
+        const hexKey = await exportKeyHex(cryptoKey);
+        const apiKey = await fetchApiKey();
+        await showUnlockedView(hexKey, apiKey);
+    } catch (e) {
+        showErr(errEl, 'Error: ' + e.message);
+    } finally {
+        setBtnLoading('unlock-btn', false, 'btnUnlock');
+    }
+}
+
+// ── Copy config ────────────────────────────────────────────────────────────────
+
+async function copyFullConfig() {
+    await copyWithFeedback(
+        document.getElementById('real-config').textContent,
+        'copy-full-btn',
+        'copy-full-text',
+        'btnCopyFull'
+    );
+}
+
+async function copySecretsConfig() {
+    await copyWithFeedback(
+        buildSecretsConfigText(currentApiKey, currentEncKey),
+        'copy-secrets-btn',
+        'copy-secrets-text',
+        'btnCopySecrets'
+    );
+}
+
+async function copyWithFeedback(text, btnId, textId, resetLabelKey) {
+    await navigator.clipboard.writeText(text);
+    const btn = document.getElementById(btnId);
+    const textEl = document.getElementById(textId);
+    btn.classList.add('copied');
+    textEl.textContent = t('btnCopied');
+    setTimeout(() => {
+        btn.classList.remove('copied');
+        textEl.textContent = t(resetLabelKey);
+    }, 2500);
+}
+
+// ── Regenerate API key ─────────────────────────────────────────────────────────
+
+async function confirmRegenerate() {
+    if (!confirm(t('regenConfirm'))) return;
+    try {
+        const resp = await fetch('/api/apikey/regenerate', { method: 'POST' });
+        if (!resp.ok) throw new Error();
+        const data = await resp.json();
+        currentApiKey = data.api_key;
+        renderRealConfig();
+    } catch {
+        alert(t('regenFailed'));
+    }
+}
+
+// ── Change passphrase modal ────────────────────────────────────────────────────
+
+function openChangeModal() {
+    document.getElementById('change-pass1').value = '';
+    document.getElementById('change-pass2').value = '';
+    document.getElementById('change-error').style.display = 'none';
+    document.getElementById('change-modal').classList.add('open');
+    setTimeout(() => document.getElementById('change-pass1').focus(), 50);
+}
+
+function closeChangeModal() {
+    document.getElementById('change-modal').classList.remove('open');
+}
+
+async function doChange() {
+    const pass1 = document.getElementById('change-pass1').value;
+    const pass2 = document.getElementById('change-pass2').value;
+    const errEl = document.getElementById('change-error');
+    errEl.style.display = 'none';
+
+    if (!pass1) { showErr(errEl, t('errEmpty')); return; }
+    if (pass1.length < 8) { showErr(errEl, t('errShort')); return; }
+    if (pass1 !== pass2) { showErr(errEl, t('errMismatch')); return; }
+
+    const btn = document.getElementById('change-btn');
+    btn.disabled = true;
+    btn.innerHTML = '<span class="spinner" style="border-top-color:#0d1117"></span>';
+    try {
+        const salt = crypto.getRandomValues(new Uint8Array(32));
+        const cryptoKey = await deriveKey(pass1, salt, true);
+        const keyCheckHex = await encryptKeyCheck(cryptoKey);
+        const hexKey = await exportKeyHex(cryptoKey);
+
+        const resp = await fetch('/api/key-setup', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                salt: bytesToHex(salt),
+                key_check: keyCheckHex,
+                params: { alg: 'pbkdf2-sha256', iterations: PBKDF2_ITERATIONS }
+            })
+        });
+        if (!resp.ok) throw new Error('HTTP ' + resp.status);
+
+        currentEncKey = hexKey;
+        sessionStorage.setItem('enc_key', hexKey);
+        renderRealConfig();
+        closeChangeModal();
+    } catch (e) {
+        showErr(errEl, 'Error: ' + e.message);
+    } finally {
+        btn.disabled = false;
+        btn.textContent = t('btnChange');
+    }
+}
+
+// ── Fetch API key ──────────────────────────────────────────────────────────────
+
+async function fetchApiKey() {
+    const resp = await fetch('/api/apikey');
+    if (!resp.ok) throw new Error('Failed to load API key');
+    const data = await resp.json();
+    return data.api_key;
+}
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+
+function showErr(el, msg) {
+    el.textContent = msg;
+    el.style.display = 'block';
+}
+
+// ── Keyboard shortcuts ─────────────────────────────────────────────────────────
+
+document.addEventListener('keydown', e => {
+    if (e.key === 'Escape') closeChangeModal();
+    if (e.key === 'Enter') {
+        if (document.getElementById('change-modal').classList.contains('open')) { doChange(); return; }
+        if (document.getElementById('unlock-form').style.display !== 'none' &&
+            document.getElementById('locked-view').style.display !== 'none') { doUnlock(); return; }
+        if (document.getElementById('setup-form').style.display !== 'none' &&
+            document.getElementById('locked-view').style.display !== 'none') { doSetup(); return; }
+    }
+});
+
+// ── Init ───────────────────────────────────────────────────────────────────────
+
+(async function init() {
+    applyLang();
+    const savedKey = sessionStorage.getItem('enc_key');
+    if (savedKey) {
+        try {
+            const apiKey = await fetchApiKey();
+            await showUnlockedView(savedKey, apiKey);
+            return;
+        } catch { /* fall through to locked */ }
+    }
+    showLockedView();
+})();
+</script>
+</body>
+</html>

crates/secrets-mcp/templates/login.html

@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Secrets — Sign In</title>
+    <style>
+        *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;600&family=Inter:wght@400;500;600&display=swap');
+        :root {
+            --bg: #0d1117;
+            --surface: #161b22;
+            --border: #30363d;
+            --text: #e6edf3;
+            --text-muted: #8b949e;
+            --accent: #58a6ff;
+            --accent-hover: #79b8ff;
+            --google: #4285f4;
+        }
+        body { background: var(--bg); color: var(--text); font-family: 'Inter', sans-serif;
+               min-height: 100vh; display: flex; align-items: center; justify-content: center; }
+        .card {
+            background: var(--surface); border: 1px solid var(--border); border-radius: 12px;
+            padding: 48px 40px; width: 100%; max-width: 400px;
+            box-shadow: 0 8px 32px rgba(0,0,0,0.4);
+        }
+        .topbar { display: flex; justify-content: flex-end; margin-bottom: 20px; }
+        .lang-bar { display: flex; gap: 2px; background: rgba(255,255,255,0.04); border-radius: 6px; padding: 2px; }
+        .lang-btn { padding: 3px 9px; border: none; background: none; color: var(--text-muted);
+                    font-size: 12px; cursor: pointer; border-radius: 4px; }
+        .lang-btn.active { background: var(--border); color: var(--text); }
+        .logo { display: flex; align-items: center; gap: 10px; margin-bottom: 32px; }
+        .logo-icon { font-family: 'JetBrains Mono', monospace; font-size: 24px; color: var(--accent); }
+        .logo-text { font-family: 'JetBrains Mono', monospace; font-size: 18px; font-weight: 600; }
+        h1 { font-size: 22px; font-weight: 600; margin-bottom: 8px; }
+        .subtitle { color: var(--text-muted); font-size: 14px; margin-bottom: 32px; }
+        .btn {
+            display: flex; align-items: center; justify-content: center; gap: 12px;
+            width: 100%; padding: 12px 20px; border: 1px solid var(--border); border-radius: 8px;
+            background: var(--surface); color: var(--text); font-size: 14px; font-weight: 500;
+            cursor: pointer; text-decoration: none; transition: all 0.2s;
+        }
+        .btn:hover { background: var(--border); border-color: var(--text-muted); }
+        .btn + .btn { margin-top: 12px; }
+        .btn svg { flex-shrink: 0; }
+        .footer { margin-top: 28px; text-align: center; color: var(--text-muted); font-size: 12px; }
+        .footer a { color: var(--accent); text-decoration: none; }
+    </style>
+</head>
+<body>
+    <div class="card">
+        <div class="topbar">
+            <div class="lang-bar">
+                <button class="lang-btn" onclick="setLang('zh-CN')">简</button>
+                <button class="lang-btn" onclick="setLang('zh-TW')">繁</button>
+                <button class="lang-btn" onclick="setLang('en')">EN</button>
+            </div>
+        </div>
+        <div class="logo">
+            <span class="logo-icon">🔐</span>
+            <span class="logo-text">secrets</span>
+        </div>
+        <h1 data-i18n="title">登录</h1>
+        <p class="subtitle" data-i18n="subtitle">安全管理你的跨设备 secrets。</p>
+
+        {% if has_google %}
+        <a href="/auth/google" class="btn">
+            <svg width="18" height="18" viewBox="0 0 18 18" fill="none">
+                <path d="M17.64 9.2c0-.637-.057-1.251-.164-1.84H9v3.481h4.844a4.14 4.14 0 01-1.796 2.716v2.259h2.908c1.702-1.567 2.684-3.875 2.684-6.615z" fill="#4285F4"/>
+                <path d="M9 18c2.43 0 4.467-.806 5.956-2.18l-2.908-2.259c-.806.54-1.837.86-3.048.86-2.344 0-4.328-1.584-5.036-3.711H.957v2.332A8.997 8.997 0 009 18z" fill="#34A853"/>
+                <path d="M3.964 10.71A5.41 5.41 0 013.682 9c0-.593.102-1.17.282-1.71V4.958H.957A8.996 8.996 0 000 9c0 1.452.348 2.827.957 4.042l3.007-2.332z" fill="#FBBC05"/>
+                <path d="M9 3.58c1.321 0 2.508.454 3.44 1.345l2.582-2.58C13.463.891 11.426 0 9 0A8.997 8.997 0 00.957 4.958L3.964 7.29C4.672 5.163 6.656 3.58 9 3.58z" fill="#EA4335"/>
+            </svg>
+            <span data-i18n="google">使用 Google 登录</span>
+        </a>
+        {% endif %}
+
+        {% if !has_google %}
+        <p style="text-align:center; color: var(--text-muted); font-size: 14px;" data-i18n="noProviders">
+            未配置登录方式，请联系管理员。
+        </p>
+        {% endif %}
+    </div>
+    <script>
+    const T = {
+        'zh-CN': {
+            title: '登录',
+            subtitle: '安全管理你的跨设备 secrets。',
+            google: '使用 Google 登录',
+            noProviders: '未配置登录方式，请联系管理员。',
+        },
+        'zh-TW': {
+            title: '登入',
+            subtitle: '安全管理你的跨裝置 secrets。',
+            google: '使用 Google 登入',
+            noProviders: '尚未設定登入方式，請聯絡管理員。',
+        },
+        'en': {
+            title: 'Sign in',
+            subtitle: 'Manage your cross-device secrets securely.',
+            google: 'Continue with Google',
+            noProviders: 'No login providers configured. Please contact your administrator.',
+        }
+    };
+
+    let currentLang = localStorage.getItem('lang') || 'zh-CN';
+
+    function t(key) { return T[currentLang][key] || T['en'][key] || key; }
+
+    function applyLang() {
+        document.documentElement.lang = currentLang;
+        document.querySelectorAll('[data-i18n]').forEach(el => {
+            const key = el.getAttribute('data-i18n');
+            el.textContent = t(key);
+        });
+        document.querySelectorAll('.lang-btn').forEach(btn => {
+            const map = { 'zh-CN': '简', 'zh-TW': '繁', 'en': 'EN' };
+            btn.classList.toggle('active', btn.textContent === map[currentLang]);
+        });
+    }
+
+    function setLang(lang) {
+        currentLang = lang;
+        localStorage.setItem('lang', lang);
+        applyLang();
+    }
+
+    applyLang();
+    </script>
+</body>
+</html>