Add secrets provider vaults and remote import (#5429)

## Thinking Path

> - Paperclip orchestrates AI-agent companies and needs secrets handling
to work across local development, hosted operators, and governed agent
execution.
> - The affected subsystem is the company-scoped secrets control plane:
database schema, server services/routes, CLI workflows, and the Secrets
settings UI.
> - The gap was that secrets were local-only and operators could not
manage provider vaults or import existing remote references without
exposing plaintext.
> - This branch adds provider vault configuration plus an AWS Secrets
Manager remote-import path while preserving company boundaries, binding
context, and audit trails.
> - I kept the PR to a single branch PR, removed unrelated
lockfile/package drift, rebased the full branch onto the current
`public-gh/master`, and addressed fresh Greptile findings.
> - The benefit is a reviewable implementation of provider-backed
secrets with focused tests covering provider selection, import
conflicts, deleted secret reuse, rotation guards, and AWS signing
behavior.

## What Changed

- Added provider vault support for company secrets, including provider
config storage, default vault handling, health checks, binding usage,
access events, and remote import preview/commit.
- Added an AWS Secrets Manager provider using SigV4 request signing,
bounded request timeouts, namespace guardrails, cached runtime
credential resolution, and external-reference linking without plaintext
reads.
- Added Secrets UI surfaces for vault management and remote import, plus
CLI/API documentation for setup and operations.
- Stabilized routine webhook secret binding paths and SSH
environment-driver fixture bindings discovered during verification.
- Addressed Greptile and CI findings: no lockfile/package drift,
monotonic migration metadata, disabled-vault default races, soft-deleted
secret hiding/recreate behavior, remove behavior with disabled vaults,
soft-deleted external-reference re-import, non-active rotation guards,
managed-secret soft deletion through PATCH, and per-call AWS SDK
credential client churn.
- Rebased this branch onto `public-gh/master` at `0e1a5828` and
force-pushed with lease to keep this as the single PR for the branch.

## Verification

- `git fetch public-gh master`
- `git rebase public-gh/master`
- `git diff --name-only public-gh/master...HEAD | grep
'^pnpm-lock\.yaml$' || true` confirmed `pnpm-lock.yaml` is not in the PR
diff.
- Confirmed migration ordering: master ends at `0081_optimal_dormammu`;
this PR adds `0082_dry_vision` and
`0083_company_secret_provider_configs`.
- Inspected migrations for repeat safety: new tables/indexes use `IF NOT
EXISTS`; foreign keys are guarded by `DO $$ ... IF NOT EXISTS`; column
additions use `ADD COLUMN IF NOT EXISTS`.
- `pnpm -r typecheck` passed before the Greptile follow-up commits.
- `pnpm test:run` ran the full stable Vitest path before the Greptile
follow-up commits; it completed with 3 timing-related failures under
parallel load: `codex-local-execute.test.ts`,
`cursor-local-execute.test.ts`, and `environment-service.test.ts`.
- `pnpm --filter @paperclipai/server exec vitest run
src/__tests__/codex-local-execute.test.ts
src/__tests__/cursor-local-execute.test.ts
src/__tests__/environment-service.test.ts` passed on targeted rerun
(`24/24`).
- `pnpm build` passed before the Greptile follow-up commits. Vite
reported existing chunk-size/dynamic-import warnings.
- After Greptile follow-up commits: `pnpm --filter @paperclipai/server
exec vitest run src/__tests__/secrets-service.test.ts` passed (`26/26`).
- After Greptile follow-up commits: `pnpm --filter @paperclipai/server
exec vitest run src/__tests__/aws-secrets-manager-provider.test.ts
src/__tests__/secrets-service.test.ts` passed (`39/39`).
- After Greptile follow-up commits: `pnpm --filter @paperclipai/server
typecheck` passed.
- Captured Storybook screenshots from `ui/storybook-static` for visual
review.
- Latest PR checks on `5ca3a5cf`: `policy`, serialized server suites
1/4-4/4, `Canary Dry Run`, `e2e`, `security/snyk`, and `Greptile Review`
pass; aggregate `verify` is still registering the completed child
checks.
- Greptile review loop continued through the latest requested pass; all
Greptile review threads are resolved and the latest `Greptile Review`
check on `5ca3a5cf` passed with 0 comments added.

## Screenshots

Before: the provider-vault and remote-import surfaces did not exist on
`master`; these are after-state screenshots from the Storybook fixtures.

![Secrets
inventory](https://raw.githubusercontent.com/paperclipai/paperclip/PAP-2339-secrets-make-a-plan/doc/pr/5429/secrets-inventory.png)

![Secret binding
picker](https://raw.githubusercontent.com/paperclipai/paperclip/PAP-2339-secrets-make-a-plan/doc/pr/5429/secret-binding-picker.png)

![Environment editor with
secrets](https://raw.githubusercontent.com/paperclipai/paperclip/PAP-2339-secrets-make-a-plan/doc/pr/5429/env-editor-with-secrets.png)

## Risks

- Migration risk: this adds new secret provider tables and extends
existing secret rows. The migrations were checked for monotonic ordering
and idempotent guards, but reviewers should still inspect upgrade
behavior carefully.
- Provider risk: AWS support uses direct SigV4 requests. Automated tests
cover signing, request timeouts, vault-config selection, namespace
guardrails, pending-version archival, sanitized provider errors, and
service-level cleanup paths. A real-vault AWS smoke test remains
deployment validation for an operator with AWS credentials rather than
an unverified merge blocker in this local branch.
- UI risk: the Secrets page and import dialog are large new surfaces;
screenshots are included above for reviewer inspection.
- Verification risk: the full local stable test command hit
parallel-load timing failures, although the exact failed files passed
when rerun directly.
- Operational risk: remote import intentionally avoids plaintext reads;
operators must understand that imported external references resolve at
runtime and may fail if AWS permissions change.

> For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and
discuss it in `#dev` before opening the PR. Feature PRs that overlap
with planned core work may need to be redirected — check the roadmap
first. See `CONTRIBUTING.md`.

## Model Used

- OpenAI Codex, GPT-5 coding agent with local shell/tool use in the
Paperclip worktree. Exact context-window size was not exposed by the
runtime.

## Checklist

- [x] I have included a thinking path that traces from project context
to this change
- [x] I have specified the model used (with version and capability
details)
- [x] I have checked ROADMAP.md and confirmed this PR does not duplicate
planned core work
- [ ] I have run tests locally and they pass
- [x] I have added or updated tests where applicable
- [x] If this change affects the UI, I have included before/after
screenshots
- [x] I have updated relevant documentation to reflect my changes
- [x] I have considered and documented any risks above
- [x] I will address all Greptile and reviewer comments before
requesting merge

---------

Co-authored-by: Paperclip <noreply@paperclip.ing>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

ui/src/pages/Secrets.render.test.tsx

@@ -0,0 +1,308 @@
+// @vitest-environment jsdom
+
+import { act } from "react";
+import { createRoot } from "react-dom/client";
+import { MemoryRouter } from "react-router-dom";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import type { CompanySecretProviderConfig, SecretProviderDescriptor } from "@paperclipai/shared";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ProviderVaultsTab, Secrets } from "./Secrets";
+
+const mockSecretsApi = vi.hoisted(() => ({
+  list: vi.fn(),
+  providers: vi.fn(),
+  providerHealth: vi.fn(),
+  providerConfigs: vi.fn(),
+  createProviderConfig: vi.fn(),
+  updateProviderConfig: vi.fn(),
+  disableProviderConfig: vi.fn(),
+  setDefaultProviderConfig: vi.fn(),
+  checkProviderConfigHealth: vi.fn(),
+  create: vi.fn(),
+  update: vi.fn(),
+  rotate: vi.fn(),
+  disable: vi.fn(),
+  enable: vi.fn(),
+  archive: vi.fn(),
+  remove: vi.fn(),
+  usage: vi.fn(),
+  accessEvents: vi.fn(),
+}));
+
+const mockSetBreadcrumbs = vi.hoisted(() => vi.fn());
+const mockPushToast = vi.hoisted(() => vi.fn());
+
+vi.mock("../api/secrets", () => ({
+  secretsApi: mockSecretsApi,
+}));
+
+vi.mock("../context/CompanyContext", () => ({
+  useCompany: () => ({
+    selectedCompanyId: "company-1",
+  }),
+}));
+
+vi.mock("../context/BreadcrumbContext", () => ({
+  useBreadcrumbs: () => ({
+    setBreadcrumbs: mockSetBreadcrumbs,
+  }),
+}));
+
+vi.mock("../context/ToastContext", () => ({
+  useToast: () => ({
+    pushToast: mockPushToast,
+  }),
+  useToastActions: () => ({
+    pushToast: mockPushToast,
+  }),
+}));
+
+vi.mock("../context/SidebarContext", () => ({
+  useSidebar: () => ({
+    isMobile: false,
+  }),
+}));
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
+
+const providers: SecretProviderDescriptor[] = [
+  {
+    id: "local_encrypted",
+    label: "Local encrypted",
+    requiresExternalRef: false,
+    supportsManagedValues: true,
+    supportsExternalReferences: false,
+    configured: true,
+  },
+  {
+    id: "aws_secrets_manager",
+    label: "AWS Secrets Manager",
+    requiresExternalRef: false,
+    supportsManagedValues: true,
+    supportsExternalReferences: true,
+    configured: true,
+  },
+  {
+    id: "gcp_secret_manager",
+    label: "GCP Secret Manager",
+    requiresExternalRef: false,
+    supportsManagedValues: false,
+    supportsExternalReferences: true,
+    configured: false,
+  },
+  {
+    id: "vault",
+    label: "Vault",
+    requiresExternalRef: false,
+    supportsManagedValues: false,
+    supportsExternalReferences: true,
+    configured: false,
+  },
+];
+
+const providerConfigs = [
+  {
+    id: "vault-local",
+    provider: "local_encrypted",
+    displayName: "Local default",
+    status: "ready",
+    isDefault: true,
+    healthStatus: "ready",
+    healthCheckedAt: null,
+    healthMessage: null,
+    healthDetails: null,
+  },
+  {
+    id: "vault-aws",
+    provider: "aws_secrets_manager",
+    displayName: "AWS production",
+    status: "ready",
+    isDefault: false,
+    healthStatus: null,
+    healthCheckedAt: null,
+    healthMessage: null,
+    healthDetails: null,
+  },
+] satisfies Partial<CompanySecretProviderConfig>[];
+
+async function flushReact() {
+  await act(async () => {
+    await Promise.resolve();
+    await new Promise((resolve) => window.setTimeout(resolve, 0));
+  });
+}
+
+describe("Secrets page layout", () => {
+  let container: HTMLDivElement;
+
+  beforeEach(() => {
+    container = document.createElement("div");
+    document.body.appendChild(container);
+
+    mockSecretsApi.list.mockResolvedValue([]);
+    mockSecretsApi.providers.mockResolvedValue(providers);
+    mockSecretsApi.providerHealth.mockResolvedValue({
+      providers: [
+        {
+          provider: "local_encrypted",
+          status: "warn",
+          message: "Local encrypted provider has a warning.",
+          warnings: ["Backup reminder"],
+        },
+      ],
+    });
+    mockSecretsApi.providerConfigs.mockResolvedValue(providerConfigs);
+  });
+
+  afterEach(() => {
+    container.remove();
+    document.body.innerHTML = "";
+    vi.clearAllMocks();
+  });
+
+  it("uses the shared search/filter/tab affordances and keeps vault sections quiet", async () => {
+    const root = createRoot(container);
+    const queryClient = new QueryClient({
+      defaultOptions: { queries: { retry: false } },
+    });
+
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <Secrets />
+        </QueryClientProvider>,
+      );
+    });
+    await flushReact();
+    await flushReact();
+
+    expect(container.querySelector('input[data-page-search-target="true"][aria-label="Search secrets"]')).not.toBeNull();
+    expect(container.textContent).toContain("Use secrets by binding them to runtime environment variables.");
+    expect(container.textContent).toContain("GH_TOKEN");
+    expect(container.querySelectorAll("select")).toHaveLength(0);
+    expect(container.textContent).not.toContain("Provider warnings detected");
+    expect(container.textContent).not.toContain("2/2 active");
+
+    await act(async () => {
+      root.unmount();
+    });
+
+    const vaultRoot = createRoot(container);
+    await act(async () => {
+      vaultRoot.render(
+        <ProviderVaultsTab
+          providers={providers}
+          providerConfigs={providerConfigs as CompanySecretProviderConfig[]}
+          loading={false}
+          error={null}
+          onRetry={vi.fn()}
+          onCreate={vi.fn()}
+          onEdit={vi.fn()}
+          onDisable={vi.fn()}
+          onSetDefault={vi.fn()}
+          onHealthCheck={vi.fn()}
+          pendingActionId={null}
+        />,
+      );
+    });
+    await flushReact();
+
+    expect(container.querySelector('a[href="#provider-vaults-local_encrypted"]')).not.toBeNull();
+    expect(container.textContent).toContain("AWS production");
+    expect(container.textContent).not.toContain("Managed writes");
+    expect(container.textContent).not.toContain("External refs");
+
+    await act(async () => {
+      vaultRoot.unmount();
+    });
+  });
+
+  it("opens reference details from the secrets table count", async () => {
+    mockSecretsApi.list.mockResolvedValue([
+      {
+        id: "secret-openai",
+        companyId: "company-1",
+        key: "openai_api_key",
+        name: "OPENAI_API_KEY",
+        provider: "local_encrypted",
+        status: "active",
+        managedMode: "paperclip_managed",
+        externalRef: null,
+        providerConfigId: null,
+        providerMetadata: null,
+        latestVersion: 1,
+        description: null,
+        lastResolvedAt: null,
+        lastRotatedAt: null,
+        deletedAt: null,
+        createdByAgentId: null,
+        createdByUserId: "user-1",
+        referenceCount: 2,
+        createdAt: new Date("2026-05-06T00:00:00.000Z"),
+        updatedAt: new Date("2026-05-06T00:00:00.000Z"),
+      },
+    ]);
+    mockSecretsApi.usage.mockResolvedValue({
+      secretId: "secret-openai",
+      bindings: [
+        {
+          id: "binding-agent",
+          companyId: "company-1",
+          secretId: "secret-openai",
+          targetType: "agent",
+          targetId: "agent-1",
+          configPath: "env.OPENAI_API_KEY",
+          versionSelector: "latest",
+          required: true,
+          label: null,
+          target: {
+            type: "agent",
+            id: "agent-1",
+            label: "CodexCoder",
+            href: "/agents/codexcoder",
+            status: "idle",
+          },
+          createdAt: new Date("2026-05-06T00:00:00.000Z"),
+          updatedAt: new Date("2026-05-06T00:00:00.000Z"),
+        },
+      ],
+    });
+
+    const root = createRoot(container);
+    const queryClient = new QueryClient({
+      defaultOptions: { queries: { retry: false } },
+    });
+
+    await act(async () => {
+      root.render(
+        <MemoryRouter>
+          <QueryClientProvider client={queryClient}>
+            <Secrets />
+          </QueryClientProvider>
+        </MemoryRouter>,
+      );
+    });
+    await flushReact();
+    await flushReact();
+
+    const referencesButton = container.querySelector(
+      'button[aria-label="View references for OPENAI_API_KEY"]',
+    ) as HTMLButtonElement | null;
+    expect(referencesButton?.textContent).toBe("2");
+
+    await act(async () => {
+      referencesButton?.click();
+    });
+    await flushReact();
+
+    expect(mockSecretsApi.usage).toHaveBeenCalledWith("secret-openai");
+    expect(document.body.textContent).toContain("Secret references");
+    expect(document.body.textContent).toContain("CodexCoder");
+    expect(document.body.textContent).toContain("env.OPENAI_API_KEY");
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+});

ui/src/pages/Secrets.test.ts

@@ -0,0 +1,129 @@
+// @vitest-environment jsdom
+
+import { describe, expect, it } from "vitest";
+import type { SecretProviderDescriptor } from "@paperclipai/shared";
+import {
+  getAwsManagedPathPreview,
+  getCreateProviderBlockReason,
+  getDefaultProviderConfigId,
+  getProviderConfigBlockReason,
+} from "./Secrets";
+import type { SecretProviderHealthResponse } from "../api/secrets";
+
+const awsProvider: SecretProviderDescriptor = {
+  id: "aws_secrets_manager",
+  label: "AWS Secrets Manager",
+  requiresExternalRef: false,
+  supportsManagedValues: true,
+  supportsExternalReferences: true,
+  configured: true,
+};
+
+describe("Secrets page provider helpers", () => {
+  it("previews the derived AWS managed path from provider health details", () => {
+    const health: SecretProviderHealthResponse = {
+      providers: [
+        {
+          provider: "aws_secrets_manager",
+          status: "ok",
+          message: "AWS Secrets Manager provider is configured",
+          details: {
+            prefix: "paperclip",
+            deploymentId: "prod-us-1",
+          },
+        },
+      ],
+    };
+
+    expect(
+      getAwsManagedPathPreview({
+        provider: awsProvider,
+        health,
+        companyId: "company-123",
+        secretKeySource: "Anthropic API Key",
+      }),
+    ).toBe("paperclip/prod-us-1/company-123/anthropic-api-key");
+  });
+
+  it("blocks unconfigured providers before create submission", () => {
+    expect(
+      getCreateProviderBlockReason(
+        { ...awsProvider, configured: false },
+        "managed",
+        null,
+      ),
+    ).toBe("AWS Secrets Manager is not configured in this deployment.");
+  });
+
+  it("uses provider health copy when an unconfigured provider reports missing bootstrap inputs", () => {
+    const health: SecretProviderHealthResponse = {
+      providers: [
+        {
+          provider: "aws_secrets_manager",
+          status: "warn",
+          message:
+            "AWS Secrets Manager provider is not ready: missing PAPERCLIP_SECRETS_AWS_DEPLOYMENT_ID.",
+        },
+      ],
+    };
+
+    expect(
+      getCreateProviderBlockReason(
+        { ...awsProvider, configured: false },
+        "managed",
+        health,
+      ),
+    ).toBe(
+      "AWS Secrets Manager is not configured in this deployment. AWS Secrets Manager provider is not ready: missing PAPERCLIP_SECRETS_AWS_DEPLOYMENT_ID.",
+    );
+  });
+
+  it("blocks provider modes the backend does not support", () => {
+    expect(
+      getCreateProviderBlockReason(
+        {
+          id: "local_encrypted",
+          label: "Local encrypted (default)",
+          requiresExternalRef: false,
+          supportsManagedValues: true,
+          supportsExternalReferences: false,
+          configured: true,
+        },
+        "external",
+        null,
+      ),
+    ).toBe("Local encrypted (default) does not support linked external references.");
+  });
+
+  it("chooses the ready default provider vault for a provider", () => {
+    expect(
+      getDefaultProviderConfigId(
+        [
+          {
+            id: "draft",
+            provider: "aws_secrets_manager",
+            status: "disabled",
+            isDefault: true,
+          },
+          {
+            id: "prod",
+            provider: "aws_secrets_manager",
+            status: "ready",
+            isDefault: true,
+          },
+        ] as never,
+        "aws_secrets_manager",
+      ),
+    ).toBe("prod");
+  });
+
+  it("explains why coming-soon provider vaults cannot be selected", () => {
+    expect(
+      getProviderConfigBlockReason({
+        id: "vault-draft",
+        provider: "vault",
+        status: "coming_soon",
+      } as never),
+    ).toBe("This provider vault is saved as draft metadata only.");
+  });
+});

ui/src/pages/secrets/ImportFromVaultDialog.test.tsx

@@ -0,0 +1,820 @@
+// @vitest-environment jsdom
+
+import { act } from "react";
+import { createRoot } from "react-dom/client";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import type {
+  CompanySecret,
+  CompanySecretProviderConfig,
+  RemoteSecretImportCandidate,
+  RemoteSecretImportPreviewResult,
+  RemoteSecretImportResult,
+} from "@paperclipai/shared";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ApiError } from "../../api/client";
+
+const mockSecretsApi = vi.hoisted(() => ({
+  remoteImportPreview: vi.fn(),
+  remoteImport: vi.fn(),
+}));
+
+const mockPushToast = vi.hoisted(() => vi.fn());
+
+vi.mock("../../api/secrets", () => ({
+  secretsApi: mockSecretsApi,
+}));
+
+vi.mock("../../context/ToastContext", () => ({
+  useToastActions: () => ({
+    pushToast: mockPushToast,
+    dismissToast: vi.fn(),
+    clearToasts: vi.fn(),
+  }),
+}));
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
+
+import { ImportFromVaultDialog } from "./ImportFromVaultDialog";
+
+const awsVault: CompanySecretProviderConfig = {
+  id: "vault-aws",
+  companyId: "company-1",
+  provider: "aws_secrets_manager",
+  displayName: "AWS production",
+  status: "ready",
+  isDefault: true,
+  config: { region: "us-east-1" },
+  healthStatus: null,
+  healthCheckedAt: null,
+  healthMessage: null,
+  healthDetails: null,
+  disabledAt: null,
+  createdByAgentId: null,
+  createdByUserId: null,
+  createdAt: new Date(),
+  updatedAt: new Date(),
+};
+
+function makeCandidate(
+  overrides: Partial<RemoteSecretImportCandidate> = {},
+): RemoteSecretImportCandidate {
+  return {
+    externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:prod/foo-AbCdEf",
+    remoteName: "prod/foo",
+    name: "prod/foo",
+    key: "prod-foo",
+    providerVersionRef: null,
+    providerMetadata: { name: "prod/foo" },
+    status: "ready",
+    importable: true,
+    conflicts: [],
+    ...overrides,
+  };
+}
+
+function makePreview(
+  candidates: RemoteSecretImportCandidate[],
+  nextToken: string | null = null,
+): RemoteSecretImportPreviewResult {
+  return {
+    providerConfigId: awsVault.id,
+    provider: "aws_secrets_manager",
+    nextToken,
+    candidates,
+  };
+}
+
+async function flush() {
+  await act(async () => {
+    await Promise.resolve();
+    await new Promise((resolve) => window.setTimeout(resolve, 0));
+  });
+}
+
+async function flushDebounce() {
+  await act(async () => {
+    await new Promise((resolve) => window.setTimeout(resolve, 300));
+  });
+}
+
+function makeWrapper() {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false } },
+  });
+  return { queryClient };
+}
+
+describe("ImportFromVaultDialog", () => {
+  let container: HTMLDivElement;
+
+  beforeEach(() => {
+    container = document.createElement("div");
+    document.body.appendChild(container);
+  });
+
+  afterEach(() => {
+    container.remove();
+    document.body.innerHTML = "";
+    vi.clearAllMocks();
+  });
+
+  it("loads candidates and selects rows, persisting through pagination", async () => {
+    mockSecretsApi.remoteImportPreview
+      .mockResolvedValueOnce(
+        makePreview(
+          [
+            makeCandidate({
+              externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:prod/stripe-ABC",
+              remoteName: "prod/stripe",
+              name: "prod/stripe",
+              key: "prod-stripe",
+            }),
+            makeCandidate({
+              externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:prod/openai-XYZ",
+              remoteName: "prod/openai",
+              name: "prod/openai",
+              key: "prod-openai",
+            }),
+          ],
+          "page-2",
+        ),
+      )
+      .mockResolvedValueOnce(
+        makePreview(
+          [
+            makeCandidate({
+              externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:prod/sendgrid-Q9",
+              remoteName: "prod/sendgrid",
+              name: "prod/sendgrid",
+              key: "prod-sendgrid",
+            }),
+          ],
+          null,
+        ),
+      );
+
+    const { queryClient } = makeWrapper();
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <ImportFromVaultDialog
+            open
+            onOpenChange={vi.fn()}
+            companyId="company-1"
+            providerConfigs={[awsVault]}
+            existingSecrets={[]}
+          />
+        </QueryClientProvider>,
+      );
+    });
+    await flush();
+    await flush();
+
+    const tableBody = document.querySelector('[data-testid="vault-table-body"]');
+    expect(tableBody).not.toBeNull();
+    expect(document.body.textContent).toContain("prod/stripe");
+    expect(document.body.textContent).toContain("prod/openai");
+
+    // Select stripe via row click
+    const stripeRow = document.querySelector(
+      '[data-testid="vault-row-arn:aws:secretsmanager:us-east-1:1:secret:prod/stripe-ABC"]',
+    ) as HTMLElement | null;
+    expect(stripeRow).not.toBeNull();
+    await act(async () => {
+      stripeRow?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+    });
+    await flush();
+    expect(document.body.textContent).toContain("1 selected");
+
+    // Load more page
+    const loadMore = document.querySelector('[data-testid="vault-load-more"]') as HTMLButtonElement | null;
+    expect(loadMore).not.toBeNull();
+    await act(async () => {
+      loadMore!.click();
+    });
+    await flush();
+    await flush();
+
+    expect(document.body.textContent).toContain("prod/sendgrid");
+    // Selection persisted through pagination.
+    expect(document.body.textContent).toContain("1 selected");
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
+  it("disables checkboxes for already-imported (duplicate) rows and shows a conflict badge for conflicts", async () => {
+    mockSecretsApi.remoteImportPreview.mockResolvedValueOnce(
+      makePreview([
+        makeCandidate({
+          externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:prod/sendgrid-Q9",
+          remoteName: "prod/sendgrid",
+          name: "prod/sendgrid",
+          key: "prod-sendgrid",
+          status: "duplicate",
+          importable: false,
+          conflicts: [
+            { type: "exact_reference", message: "Already imported", existingSecretId: "secret-sg" },
+          ],
+        }),
+        makeCandidate({
+          externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:prod/openai-XYZ",
+          remoteName: "prod/openai",
+          name: "prod/openai",
+          key: "prod-openai",
+          status: "conflict",
+          importable: true,
+          conflicts: [
+            { type: "name", message: "Name already in use" },
+          ],
+        }),
+      ]),
+    );
+
+    const { queryClient } = makeWrapper();
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <ImportFromVaultDialog
+            open
+            onOpenChange={vi.fn()}
+            companyId="company-1"
+            providerConfigs={[awsVault]}
+            existingSecrets={[]}
+          />
+        </QueryClientProvider>,
+      );
+    });
+    await flush();
+    await flush();
+
+    const duplicateRow = document.querySelector(
+      '[data-testid="vault-row-arn:aws:secretsmanager:us-east-1:1:secret:prod/sendgrid-Q9"]',
+    );
+    expect(duplicateRow?.getAttribute("data-row-state")).toBe("duplicate");
+    const duplicateCheckbox = duplicateRow?.querySelector(
+      'button[role="checkbox"]',
+    ) as HTMLButtonElement | null;
+    expect(duplicateCheckbox?.getAttribute("data-disabled")).not.toBeNull();
+
+    expect(document.body.textContent).toContain("Conflict");
+    expect(document.body.textContent).toContain("Name already in use");
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
+  it("blocks import when a review row collides with an existing Paperclip secret", async () => {
+    const conflictCandidate = makeCandidate({
+      externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:prod/openai-XYZ",
+      remoteName: "prod/openai",
+      name: "OPENAI_API_KEY",
+      key: "openai_api_key",
+      status: "conflict",
+      conflicts: [{ type: "key", message: "Key already in use" }],
+    });
+    mockSecretsApi.remoteImportPreview.mockResolvedValueOnce(
+      makePreview([conflictCandidate]),
+    );
+
+    const existing: CompanySecret[] = [
+      {
+        id: "secret-existing",
+        companyId: "company-1",
+        key: "openai_api_key",
+        name: "OPENAI_API_KEY",
+        provider: "aws_secrets_manager",
+        status: "active",
+        managedMode: "external_reference",
+        externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:other-XYZ",
+        providerConfigId: awsVault.id,
+        providerMetadata: null,
+        latestVersion: 1,
+        description: null,
+        lastResolvedAt: null,
+        lastRotatedAt: null,
+        deletedAt: null,
+        createdByAgentId: null,
+        createdByUserId: null,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      },
+    ];
+
+    const { queryClient } = makeWrapper();
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <ImportFromVaultDialog
+            open
+            onOpenChange={vi.fn()}
+            companyId="company-1"
+            providerConfigs={[awsVault]}
+            existingSecrets={existing}
+          />
+        </QueryClientProvider>,
+      );
+    });
+    await flush();
+    await flush();
+
+    // Select the conflict row
+    const row = document.querySelector(
+      '[data-testid="vault-row-arn:aws:secretsmanager:us-east-1:1:secret:prod/openai-XYZ"]',
+    ) as HTMLElement | null;
+    await act(async () => {
+      row?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+    });
+    await flush();
+
+    // Click "Continue → Review" button.
+    const continueBtn = Array.from(document.querySelectorAll("button")).find(
+      (btn) => btn.textContent?.includes("Continue"),
+    );
+    expect(continueBtn).toBeTruthy();
+    await act(async () => {
+      continueBtn!.click();
+    });
+    await flush();
+
+    // Review step: error message visible, Import button disabled.
+    expect(document.body.textContent?.toLowerCase()).toContain("a paperclip secret already uses this");
+
+    const importBtn = Array.from(document.querySelectorAll("button")).find(
+      (btn) => btn.textContent?.startsWith("Import "),
+    ) as HTMLButtonElement | undefined;
+    expect(importBtn).toBeTruthy();
+    expect(importBtn?.disabled).toBe(true);
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
+  it("requires lowercase operator-entered keys during review", async () => {
+    const externalRef = "arn:aws:secretsmanager:us-east-1:1:secret:prod/openai-XYZ";
+    mockSecretsApi.remoteImportPreview.mockResolvedValueOnce(
+      makePreview([
+        makeCandidate({
+          externalRef,
+          remoteName: "prod/openai",
+          name: "OpenAI API key",
+          key: "openai-api-key",
+        }),
+      ]),
+    );
+
+    const { queryClient } = makeWrapper();
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <ImportFromVaultDialog
+            open
+            onOpenChange={vi.fn()}
+            companyId="company-1"
+            providerConfigs={[awsVault]}
+            existingSecrets={[]}
+          />
+        </QueryClientProvider>,
+      );
+    });
+    await flush();
+    await flush();
+
+    const row = document.querySelector(
+      `[data-testid="vault-row-${externalRef}"]`,
+    ) as HTMLElement | null;
+    await act(async () => {
+      row?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+    });
+    await flush();
+
+    const continueBtn = Array.from(document.querySelectorAll("button")).find(
+      (btn) => btn.textContent?.includes("Continue"),
+    );
+    await act(async () => {
+      continueBtn!.click();
+    });
+    await flush();
+
+    const keyInput = document.querySelector(
+      `[data-testid="review-key-${externalRef}"]`,
+    ) as HTMLInputElement | null;
+    const valueSetter = Object.getOwnPropertyDescriptor(
+      window.HTMLInputElement.prototype,
+      "value",
+    )?.set;
+    await act(async () => {
+      valueSetter?.call(keyInput, "MY_KEY");
+      keyInput!.dispatchEvent(new Event("input", { bubbles: true }));
+    });
+    await flush();
+
+    expect(document.body.textContent).toContain("lowercase letters");
+    const importBtn = Array.from(document.querySelectorAll("button")).find(
+      (btn) => btn.textContent?.startsWith("Import "),
+    ) as HTMLButtonElement | undefined;
+    expect(importBtn?.disabled).toBe(true);
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
+  it("submits the operator-entered review description", async () => {
+    const externalRef = "arn:aws:secretsmanager:us-east-1:1:secret:prod/openai-XYZ";
+    mockSecretsApi.remoteImportPreview.mockResolvedValueOnce(
+      makePreview([
+        makeCandidate({
+          externalRef,
+          remoteName: "prod/openai",
+          name: "OpenAI API key",
+          key: "openai-api-key",
+          providerMetadata: {
+            description: "Raw AWS description should not seed the review field",
+          },
+        }),
+      ]),
+    );
+    mockSecretsApi.remoteImport.mockResolvedValueOnce({
+      providerConfigId: awsVault.id,
+      provider: "aws_secrets_manager",
+      importedCount: 1,
+      skippedCount: 0,
+      errorCount: 0,
+      results: [
+        {
+          externalRef,
+          name: "OpenAI API key",
+          key: "openai-api-key",
+          status: "imported",
+          reason: null,
+          secretId: "secret-openai",
+          conflicts: [],
+        },
+      ],
+    });
+
+    const { queryClient } = makeWrapper();
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <ImportFromVaultDialog
+            open
+            onOpenChange={vi.fn()}
+            companyId="company-1"
+            providerConfigs={[awsVault]}
+            existingSecrets={[]}
+          />
+        </QueryClientProvider>,
+      );
+    });
+    await flush();
+    await flush();
+
+    const row = document.querySelector(
+      `[data-testid="vault-row-${externalRef}"]`,
+    ) as HTMLElement | null;
+    await act(async () => {
+      row?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+    });
+    await flush();
+
+    const continueBtn = Array.from(document.querySelectorAll("button")).find(
+      (btn) => btn.textContent?.includes("Continue"),
+    );
+    await act(async () => {
+      continueBtn!.click();
+    });
+    await flush();
+
+    const descriptionInput = document.querySelector(
+      `[data-testid="review-description-${externalRef}"]`,
+    ) as HTMLInputElement | null;
+    expect(descriptionInput?.value).toBe("");
+    const valueSetter = Object.getOwnPropertyDescriptor(
+      window.HTMLInputElement.prototype,
+      "value",
+    )?.set;
+    await act(async () => {
+      valueSetter?.call(descriptionInput, "Operator-entered OpenAI key");
+      descriptionInput!.dispatchEvent(new Event("input", { bubbles: true }));
+    });
+    await flush();
+
+    const importBtn = Array.from(document.querySelectorAll("button")).find(
+      (btn) => btn.textContent?.startsWith("Import "),
+    ) as HTMLButtonElement | undefined;
+    await act(async () => {
+      importBtn!.click();
+    });
+    await flush();
+    await flush();
+
+    expect(mockSecretsApi.remoteImport).toHaveBeenCalledWith("company-1", {
+      providerConfigId: awsVault.id,
+      secrets: [
+        expect.objectContaining({
+          externalRef,
+          description: "Operator-entered OpenAI key",
+          providerMetadata: null,
+        }),
+      ],
+    });
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
+  it("renders mixed import results (created/skipped/failed) and shows error reason", async () => {
+    mockSecretsApi.remoteImportPreview.mockResolvedValueOnce(
+      makePreview([
+        makeCandidate({
+          externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:a-AAA",
+          remoteName: "alpha",
+          name: "alpha",
+          key: "alpha",
+        }),
+        makeCandidate({
+          externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:b-BBB",
+          remoteName: "beta",
+          name: "beta",
+          key: "beta",
+        }),
+        makeCandidate({
+          externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:c-CCC",
+          remoteName: "gamma",
+          name: "gamma",
+          key: "gamma",
+        }),
+      ]),
+    );
+
+    const result: RemoteSecretImportResult = {
+      providerConfigId: awsVault.id,
+      provider: "aws_secrets_manager",
+      importedCount: 1,
+      skippedCount: 1,
+      errorCount: 1,
+      results: [
+        {
+          externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:a-AAA",
+          name: "alpha",
+          key: "alpha",
+          status: "imported",
+          reason: null,
+          secretId: "secret-alpha",
+          conflicts: [],
+        },
+        {
+          externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:b-BBB",
+          name: "beta",
+          key: "beta",
+          status: "skipped",
+          reason: "exact reference already imported",
+          secretId: null,
+          conflicts: [
+            { type: "exact_reference", message: "exact reference already imported" },
+          ],
+        },
+        {
+          externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:c-CCC",
+          name: "gamma",
+          key: "gamma",
+          status: "error",
+          reason: "AWS Secrets Manager denied the request. Check IAM permissions for this provider vault.",
+          secretId: null,
+          conflicts: [],
+        },
+      ],
+    };
+    mockSecretsApi.remoteImport.mockResolvedValueOnce(result);
+
+    const { queryClient } = makeWrapper();
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <ImportFromVaultDialog
+            open
+            onOpenChange={vi.fn()}
+            companyId="company-1"
+            providerConfigs={[awsVault]}
+            existingSecrets={[]}
+          />
+        </QueryClientProvider>,
+      );
+    });
+    await flush();
+    await flush();
+
+    // Select all loaded
+    const headerCheckbox = document.querySelector(
+      '[data-testid="vault-table-body"]',
+    )?.parentElement?.querySelector('thead button[role="checkbox"]') as HTMLButtonElement | null;
+    expect(headerCheckbox).toBeTruthy();
+    await act(async () => {
+      headerCheckbox!.click();
+    });
+    await flush();
+
+    // Continue
+    const continueBtn = Array.from(document.querySelectorAll("button")).find(
+      (btn) => btn.textContent?.includes("Continue"),
+    );
+    await act(async () => {
+      continueBtn!.click();
+    });
+    await flush();
+
+    // Import
+    const importBtn = Array.from(document.querySelectorAll("button")).find(
+      (btn) => btn.textContent?.startsWith("Import "),
+    ) as HTMLButtonElement | undefined;
+    expect(importBtn).toBeTruthy();
+    await act(async () => {
+      importBtn!.click();
+    });
+    await flush();
+    await flush();
+
+    expect(mockSecretsApi.remoteImport).toHaveBeenCalledTimes(1);
+    expect(document.body.textContent).toContain("Import complete");
+    expect(document.body.textContent).toContain("1 created");
+    expect(document.body.textContent).toContain("1 skipped");
+    expect(document.body.textContent).toContain("1 failed");
+    expect(document.body.textContent).toContain("AWS Secrets Manager denied the request");
+    expect(document.body.textContent).not.toContain("AccessDeniedException");
+    expect(document.body.textContent).not.toContain("123456789012");
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
+  it("shows an empty state when no AWS vault is configured", async () => {
+    const { queryClient } = makeWrapper();
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <ImportFromVaultDialog
+            open
+            onOpenChange={vi.fn()}
+            companyId="company-1"
+            providerConfigs={[]}
+            existingSecrets={[]}
+            onManageVaults={vi.fn()}
+          />
+        </QueryClientProvider>,
+      );
+    });
+    await flush();
+
+    expect(document.querySelector('[data-testid="select-empty-vaults"]')).not.toBeNull();
+    expect(mockSecretsApi.remoteImportPreview).not.toHaveBeenCalled();
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
+  it("shows a permission-error banner when AWS denies ListSecrets", async () => {
+    const error = Object.assign(new Error("AccessDeniedException"), {
+      name: "ApiError",
+      status: 403,
+      body: null,
+    });
+    mockSecretsApi.remoteImportPreview.mockRejectedValueOnce(error);
+
+    const { queryClient } = makeWrapper();
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <ImportFromVaultDialog
+            open
+            onOpenChange={vi.fn()}
+            companyId="company-1"
+            providerConfigs={[awsVault]}
+            existingSecrets={[]}
+          />
+        </QueryClientProvider>,
+      );
+    });
+    await flush();
+    await flush();
+
+    const banner = document.querySelector('[data-testid="preview-error-banner"]');
+    expect(banner).not.toBeNull();
+    expect(banner?.textContent).toContain("Could not load remote secrets");
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
+  it("renders sanitized preview provider errors without raw AWS exception text", async () => {
+    const rawProviderMessage =
+      "AccessDeniedException: User: arn:aws:sts::123456789012:assumed-role/prod/Paperclip is not authorized";
+    mockSecretsApi.remoteImportPreview.mockRejectedValueOnce(
+      new ApiError(
+        "AWS Secrets Manager denied the request. Check IAM permissions for this provider vault.",
+        403,
+        { error: "AWS Secrets Manager denied the request. Check IAM permissions for this provider vault.", details: { code: "access_denied" } },
+      ),
+    );
+
+    const { queryClient } = makeWrapper();
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <ImportFromVaultDialog
+            open
+            onOpenChange={vi.fn()}
+            companyId="company-1"
+            providerConfigs={[awsVault]}
+            existingSecrets={[]}
+          />
+        </QueryClientProvider>,
+      );
+    });
+    await flush();
+    await flush();
+
+    const banner = document.querySelector('[data-testid="preview-error-banner"]');
+    expect(banner).not.toBeNull();
+    expect(banner?.textContent).toContain("AWS denied list access");
+    expect(banner?.textContent).toContain("missing secretsmanager:ListSecrets");
+    expect(banner?.textContent).not.toContain(rawProviderMessage);
+    expect(banner?.textContent).not.toContain("arn:aws");
+    expect(banner?.textContent).not.toContain("123456789012");
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
+  it("debounces search and uses the new query for the next preview", async () => {
+    mockSecretsApi.remoteImportPreview
+      .mockResolvedValueOnce(makePreview([makeCandidate()]))
+      .mockResolvedValueOnce(makePreview([
+        makeCandidate({
+          externalRef: "arn:aws:secretsmanager:us-east-1:1:secret:stripe-XYZ",
+          remoteName: "stripe",
+          name: "stripe",
+          key: "stripe",
+        }),
+      ]));
+
+    const { queryClient } = makeWrapper();
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <ImportFromVaultDialog
+            open
+            onOpenChange={vi.fn()}
+            companyId="company-1"
+            providerConfigs={[awsVault]}
+            existingSecrets={[]}
+          />
+        </QueryClientProvider>,
+      );
+    });
+    await flush();
+    await flush();
+
+    const search = document.querySelector('[data-testid="vault-search"]') as HTMLInputElement;
+    expect(search).not.toBeNull();
+    const valueSetter = Object.getOwnPropertyDescriptor(
+      window.HTMLInputElement.prototype,
+      "value",
+    )?.set;
+    await act(async () => {
+      search.focus();
+      valueSetter?.call(search, "stripe");
+      search.dispatchEvent(new Event("input", { bubbles: true }));
+    });
+    await flushDebounce();
+    await flush();
+
+    expect(mockSecretsApi.remoteImportPreview).toHaveBeenCalledTimes(2);
+    const lastCall = mockSecretsApi.remoteImportPreview.mock.calls.at(-1);
+    expect(lastCall?.[1]).toMatchObject({ query: "stripe" });
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+});