From 0d97bca40a602172fd6cb828dfc8fcc51c1b4118 Mon Sep 17 00:00:00 2001 From: jesse-merhi <79823012+jesse-merhi@users.noreply.github.com> Date: Tue, 11 Aug 2026 12:10:58 +1000 Subject: [PATCH] fix(gateway): align policy acknowledgement contracts --- src/cli/install-policy-warning-acknowledgement.test.ts | 2 ++ src/plugins/install-shared.test.ts | 1 + src/plugins/management-service-install-policy.test.ts | 6 ++---- src/plugins/test-helpers/install-policy-warning.ts | 8 +++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/cli/install-policy-warning-acknowledgement.test.ts b/src/cli/install-policy-warning-acknowledgement.test.ts index fce30414fd53..83d3bf39eb25 100644 --- a/src/cli/install-policy-warning-acknowledgement.test.ts +++ b/src/cli/install-policy-warning-acknowledgement.test.ts @@ -48,6 +48,7 @@ describe("resolveInstallPolicyWarningAcknowledgementCliOptions", () => { targetName: "demo\npkg", targetType: "plugin", requestMode: fixture.requestMode, + warningFingerprint: "review-required", scan: { requestKind: "plugin-npm", originType: "plugin-npm", @@ -78,6 +79,7 @@ describe("resolveInstallPolicyWarningAcknowledgementCliOptions", () => { targetName: "demo", targetType: "skill", requestMode: "install", + warningFingerprint: "review-required", scan: { requestKind: "skill-install", originType: "skill-managed-install", diff --git a/src/plugins/install-shared.test.ts b/src/plugins/install-shared.test.ts index 6af8521ed8fd..d15ee36a9fb8 100644 --- a/src/plugins/install-shared.test.ts +++ b/src/plugins/install-shared.test.ts @@ -17,6 +17,7 @@ describe("installPluginDirectoryIntoExtensions", () => { fs.mkdirSync(sourceDir, { recursive: true }); fs.writeFileSync(path.join(sourceDir, "index.js"), "export default {};\n"); const installPolicyWarning = { + warningFingerprint: "review-installed-dependency-tree", scan: { requestKind: "plugin-archive" as const, originType: "plugin-dependency-tree", diff --git a/src/plugins/management-service-install-policy.test.ts b/src/plugins/management-service-install-policy.test.ts index ad13d6d85011..8b0dd2284670 100644 --- a/src/plugins/management-service-install-policy.test.ts +++ b/src/plugins/management-service-install-policy.test.ts @@ -1,8 +1,8 @@ import { expectDefined } from "@openclaw/normalization-core"; import { beforeEach, describe, expect, it, vi } from "vitest"; import type { + InstallSafetyOverrides, InstallPolicyWarningAcknowledgementRequest, - InstallPolicyWarningAcknowledgementResult, InstallPolicyWarningOccurrence, } from "./install-security-scan.types.js"; import { @@ -248,9 +248,7 @@ describe("plugin management install-policy acknowledgements", () => { const acknowledge = expectDefined( ( call[0] as { - onInstallPolicyWarning?: ( - request: InstallPolicyWarningAcknowledgementRequest, - ) => Promise; + onInstallPolicyWarning?: InstallSafetyOverrides["onInstallPolicyWarning"]; } ).onInstallPolicyWarning, "install-policy acknowledgement callback", diff --git a/src/plugins/test-helpers/install-policy-warning.ts b/src/plugins/test-helpers/install-policy-warning.ts index 8248604b0b1d..55664aea8eea 100644 --- a/src/plugins/test-helpers/install-policy-warning.ts +++ b/src/plugins/test-helpers/install-policy-warning.ts @@ -1,12 +1,12 @@ import { expectDefined } from "@openclaw/normalization-core"; import { expect } from "vitest"; import type { + InstallSafetyOverrides, InstallPolicyWarningAcknowledgementRequest, - InstallPolicyWarningAcknowledgementResult, InstallPolicyWarningOccurrence, } from "../install-security-scan.types.js"; -export const officialDiffsWarningOccurrence: InstallPolicyWarningOccurrence = { +const officialDiffsWarningOccurrence: InstallPolicyWarningOccurrence = { warningFingerprint: "review-diffs-warning", scan: { requestKind: "plugin-archive", @@ -22,9 +22,7 @@ export const officialDiffsWarningOccurrence: InstallPolicyWarningOccurrence = { }; type InstallPolicyWarningCall = { - onInstallPolicyWarning?: ( - request: InstallPolicyWarningAcknowledgementRequest, - ) => Promise; + onInstallPolicyWarning?: InstallSafetyOverrides["onInstallPolicyWarning"]; }; export const officialDiffsWarningRequest = {