Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Submit only changed Agent capability overrides

Daniel0744feed9f96
diff --git a/app/src/config/tabs/ai/aiCapabilityPolicy.test.ts b/app/src/config/tabs/ai/aiCapabilityPolicy.test.ts
index 976b7fc98b..7bf6861846 100644
--- a/app/src/config/tabs/ai/aiCapabilityPolicy.test.ts
+++ b/app/src/config/tabs/ai/aiCapabilityPolicy.test.ts
@@ -1,94 +1,77 @@
import * as assert from "node:assert/strict";
import test from "node:test";
import {
+ IAgentApprovalOverridePatch,
IAgentApprovalPolicy,
- approvalOverridesForPatch,
- capabilityOverridesForPatch,
+ actionApprovalPatch,
+ approvalOverridePatch,
+ capabilityOverridesPatch,
getCapabilityActionApproval,
resolveCapabilityApproval,
- updateCapabilityActionApproval,
- updateCapabilityApproval,
} from "./aiCapabilityPolicy";
-const newPolicy = (): IAgentApprovalPolicy => ({default: "risk", overrides: {}});
-
-test("capability approval preserves action overrides", () => {
- let policy = updateCapabilityActionApproval(newPolicy(), "native/backend/search", "semantic", "allow");
- policy = updateCapabilityApproval(policy, "native/backend/search", "confirm");
-
- assert.equal(resolveCapabilityApproval(policy, "native/backend/search", "fulltext"), "confirm");
- assert.equal(resolveCapabilityApproval(policy, "native/backend/search", "semantic"), "allow");
- assert.deepEqual(policy.overrides["native/backend/search"], {
- default: "confirm",
- actions: {semantic: "allow"},
- });
-});
-
-test("capability approval inherits the policy default without dropping action overrides", () => {
+test("capability approval resolves action overrides before the capability and policy defaults", () => {
const policy: IAgentApprovalPolicy = {
default: "risk",
- overrides: {
- "native/backend/search": {
- default: "confirm",
- actions: {semantic: "allow"},
- },
- },
+ overrides: {"native/backend/search": {default: "confirm", actions: {semantic: "allow"}}},
};
- const updated = updateCapabilityApproval(policy, "native/backend/search", "risk");
-
- assert.deepEqual(updated.overrides["native/backend/search"], {
- default: "",
- actions: {semantic: "allow"},
- });
- assert.equal(resolveCapabilityApproval(updated, "native/backend/search", "fulltext"), "risk");
- assert.equal(resolveCapabilityApproval(updated, "native/backend/search", "semantic"), "allow");
-});
-test("action approval distinguishes inheritance from explicit decisions", () => {
- let policy = updateCapabilityApproval(newPolicy(), "native/backend/search", "confirm");
- assert.equal(getCapabilityActionApproval(policy, "native/backend/search", "fulltext"), "");
+ assert.equal(resolveCapabilityApproval(policy, "native/backend/search", "semantic"), "allow");
assert.equal(resolveCapabilityApproval(policy, "native/backend/search", "fulltext"), "confirm");
-
- policy = updateCapabilityActionApproval(policy, "native/backend/search", "fulltext", "risk");
- assert.equal(getCapabilityActionApproval(policy, "native/backend/search", "fulltext"), "risk");
- assert.equal(resolveCapabilityApproval(policy, "native/backend/search", "fulltext"), "risk");
-
- policy = updateCapabilityActionApproval(policy, "native/backend/search", "fulltext", "");
+ assert.equal(resolveCapabilityApproval(policy, "native/backend/block"), "risk");
assert.equal(getCapabilityActionApproval(policy, "native/backend/search", "fulltext"), "");
- assert.equal(resolveCapabilityApproval(policy, "native/backend/search", "fulltext"), "confirm");
});
-test("empty inherited approval entries are removed", () => {
- let policy = updateCapabilityActionApproval(newPolicy(), "native/backend/search", "fulltext", "confirm");
- policy = updateCapabilityActionApproval(policy, "native/backend/search", "fulltext", "");
+test("capability toggles patch only the changed entries", () => {
+ // 恢复默认时写入空决策,由内核规范化清除;未改动的条目不能出现在补丁里。
+ assert.deepEqual(capabilityOverridesPatch("allow", ["native/backend/asset"], "allow"),
+ {"native/backend/asset": ""});
+ assert.deepEqual(capabilityOverridesPatch("allow", ["native/backend/asset", "native/backend/block"], "deny"),
+ {"native/backend/asset": "deny", "native/backend/block": "deny"});
+});
+
+test("consecutive capability changes do not undo each other", () => {
+ // 第一次保存返回前,两次操作都基于同一份旧配置生成补丁。
+ const stale = {default: "allow", overrides: {"native/backend/asset": "deny"}};
+ const enable = capabilityOverridesPatch(stale.default, ["native/backend/asset"], "allow");
+ const disable = capabilityOverridesPatch(stale.default, ["native/backend/block"], "deny");
+ const merged = {...stale.overrides, ...enable, ...disable};
- assert.equal(policy.overrides["native/backend/search"], undefined);
+ // 后一次补丁不包含 asset,合并后不会把刚恢复的能力重新禁用。
+ assert.deepEqual(merged, {"native/backend/asset": "", "native/backend/block": "deny"});
});
-test("removed capability overrides are submitted as empty decisions", () => {
- // 设置补丁按对象合并,省略的键不会从 overrides 中移除,被删除的条目必须改写为空决策交给内核清除。
- assert.deepEqual(capabilityOverridesForPatch({asset: "deny", block: "deny"}, {block: "deny"}),
- {asset: "", block: "deny"});
- assert.deepEqual(capabilityOverridesForPatch({}, {asset: "allow"}), {asset: "allow"});
+test("approval patches only carry the changed decision", () => {
+ assert.deepEqual(approvalOverridePatch("risk", "risk"), {default: ""});
+ assert.deepEqual(approvalOverridePatch("risk", "confirm"), {default: "confirm"});
+ assert.deepEqual(actionApprovalPatch("semantic", "allow"), {actions: {semantic: "allow"}});
+ assert.deepEqual(actionApprovalPatch("semantic", ""), {actions: {semantic: ""}});
});
-test("removed approval overrides are submitted as empty decisions", () => {
- const policy: IAgentApprovalPolicy = {
+test("consecutive approval changes do not undo each other", () => {
+ const stale: IAgentApprovalPolicy = {
default: "risk",
- overrides: {
- "native/backend/search": {default: "confirm", actions: {semantic: "allow"}},
- "native/backend/block": {default: "allow", actions: {}},
- },
+ overrides: {"native/backend/asset": {default: "confirm", actions: {semantic: "allow"}}},
+ };
+ // 模拟设置补丁的对象合并。
+ const merge = (policy: IAgentApprovalPolicy, patch: Record<string, IAgentApprovalOverridePatch>):
+ IAgentApprovalPolicy => {
+ const overrides = {...policy.overrides};
+ Object.entries(patch).forEach(([id, change]) => {
+ const current = overrides[id] || {default: "", actions: {}};
+ overrides[id] = {
+ default: change.default ?? current.default,
+ actions: {...current.actions, ...change.actions},
+ };
+ });
+ return {...policy, overrides};
};
- const actionRemoved = updateCapabilityActionApproval(policy, "native/backend/search", "semantic", "");
- assert.deepEqual(approvalOverridesForPatch(policy.overrides, actionRemoved.overrides), {
- "native/backend/search": {default: "confirm", actions: {semantic: ""}},
- "native/backend/block": {default: "allow", actions: {}},
- });
+ const resetAsset = merge(stale, {"native/backend/asset": approvalOverridePatch(stale.default, "risk")});
+ const merged = merge(resetAsset, {"native/backend/block": actionApprovalPatch("rename", "allow")});
- const entryRemoved = updateCapabilityApproval(policy, "native/backend/block", "risk");
- assert.equal(entryRemoved.overrides["native/backend/block"], undefined);
- assert.deepEqual(approvalOverridesForPatch(policy.overrides, entryRemoved.overrides)["native/backend/block"],
- {default: "", actions: {}});
+ // 后一次补丁只带 block 的操作决策,asset 恢复默认后不会被旧快照改回去。
+ assert.equal(merged.overrides["native/backend/asset"].default, "");
+ assert.equal(merged.overrides["native/backend/asset"].actions.semantic, "allow");
+ assert.equal(merged.overrides["native/backend/block"].actions.rename, "allow");
});
diff --git a/app/src/config/tabs/ai/aiCapabilityPolicy.ts b/app/src/config/tabs/ai/aiCapabilityPolicy.ts
index 32c8d2dc44..7c14cb0876 100644
--- a/app/src/config/tabs/ai/aiCapabilityPolicy.ts
+++ b/app/src/config/tabs/ai/aiCapabilityPolicy.ts
@@ -1,5 +1,6 @@
export type AgentApprovalDecision = "risk" | "allow" | "confirm";
export type AgentActionApprovalDecision = "" | AgentApprovalDecision;
+export type CapabilityDecision = "allow" | "deny";
export interface IAgentApprovalOverride {
default: string;
@@ -11,6 +12,12 @@ export interface IAgentApprovalPolicy {
overrides: Record<string, IAgentApprovalOverride>;
}
+// 补丁只携带本次改动的键,其余覆盖项由设置补丁的合并保留。
+export interface IAgentApprovalOverridePatch {
+ default?: string;
+ actions?: Record<string, string>;
+}
+
export const resolveCapabilityApproval = (policy: IAgentApprovalPolicy, id: string, action = ""): string => {
const override = policy.overrides[id];
return override?.actions[action] || override?.default || policy.default;
@@ -19,77 +26,20 @@ export const resolveCapabilityApproval = (policy: IAgentApprovalPolicy, id: stri
export const getCapabilityActionApproval = (policy: IAgentApprovalPolicy, id: string, action: string):
string => policy.overrides[id]?.actions[action] || "";
-export const updateCapabilityApproval = (policy: IAgentApprovalPolicy, id: string,
- decision: AgentApprovalDecision): IAgentApprovalPolicy => {
- const overrides = {...policy.overrides};
- const current = overrides[id];
- const actions = {...current?.actions};
- if (decision === policy.default) {
- if (Object.keys(actions).length === 0) {
- delete overrides[id];
- } else {
- overrides[id] = {default: "", actions};
- }
- } else {
- overrides[id] = {default: decision, actions};
- }
- return {...policy, overrides};
-};
-
-export const updateCapabilityActionApproval = (policy: IAgentApprovalPolicy, id: string, action: string,
- decision: AgentActionApprovalDecision): IAgentApprovalPolicy => {
- const overrides = {...policy.overrides};
- const current = overrides[id];
- const actions = {...current?.actions};
- if (decision === "") {
- delete actions[action];
- } else {
- actions[action] = decision;
- }
- if (!current?.default && Object.keys(actions).length === 0) {
- delete overrides[id];
- } else {
- overrides[id] = {default: current?.default || "", actions};
- }
- return {...policy, overrides};
-};
-
-// 设置补丁按对象递归合并,省略的键不会从 overrides 中移除;删除操作改写为空决策,由内核规范化清除。
-export const capabilityOverridesForPatch = (current: Record<string, string>,
- next: Record<string, string>): Record<string, string> => {
- const overrides = {...next};
- Object.keys(current).forEach((id) => {
- if (!(id in overrides)) {
- overrides[id] = "";
- }
+// 能力开关只提交本次改动的条目;恢复默认时写入空决策,由内核规范化清除。
+export const capabilityOverridesPatch = (policyDefault: string, ids: string[], decision: CapabilityDecision):
+ Record<string, string> => {
+ const overrides: Record<string, string> = {};
+ ids.forEach((id) => {
+ overrides[id] = decision === policyDefault ? "" : decision;
});
return overrides;
};
-// 审批覆盖项同时包含默认决策和操作决策,整项删除或单个操作删除都改写为空决策。
-export const approvalOverridesForPatch = (current: Record<string, IAgentApprovalOverride>,
- next: Record<string, IAgentApprovalOverride>):
- Record<string, IAgentApprovalOverride> => {
- const overrides = {...next};
- Object.keys(current).forEach((id) => {
- const nextOverride = overrides[id];
- if (!nextOverride) {
- const actions: Record<string, string> = {};
- Object.keys(current[id].actions).forEach((action) => {
- actions[action] = "";
- });
- overrides[id] = {default: "", actions};
- return;
- }
- const removed = Object.keys(current[id].actions).filter((action) => !(action in nextOverride.actions));
- if (removed.length === 0) {
- return;
- }
- const actions = {...nextOverride.actions};
- removed.forEach((action) => {
- actions[action] = "";
- });
- overrides[id] = {...nextOverride, actions};
- });
- return overrides;
-};
+// 能力审批方式只提交该能力的默认决策,已有的操作决策由合并保留。
+export const approvalOverridePatch = (policyDefault: string, decision: AgentApprovalDecision):
+ IAgentApprovalOverridePatch => ({default: decision === policyDefault ? "" : decision});
+
+// 单个操作的审批方式只提交该操作,空决策表示跟随能力设置。
+export const actionApprovalPatch = (action: string, decision: AgentActionApprovalDecision):
+ IAgentApprovalOverridePatch => ({actions: {[action]: decision}});
diff --git a/app/src/config/tabs/ai/aiCapabilityUi.ts b/app/src/config/tabs/ai/aiCapabilityUi.ts
index 5d0a5e9fa1..d9439dd6a7 100644
--- a/app/src/config/tabs/ai/aiCapabilityUi.ts
+++ b/app/src/config/tabs/ai/aiCapabilityUi.ts
@@ -4,16 +4,16 @@ import {listCapabilityManifests} from "../../../layout/dock/agent/frontendCapabi
import {
AgentActionApprovalDecision,
AgentApprovalDecision,
- approvalOverridesForPatch,
- capabilityOverridesForPatch,
+ CapabilityDecision,
+ IAgentApprovalOverridePatch,
+ actionApprovalPatch,
+ approvalOverridePatch,
+ capabilityOverridesPatch,
getCapabilityActionApproval,
resolveCapabilityApproval,
- updateCapabilityActionApproval,
- updateCapabilityApproval,
} from "./aiCapabilityPolicy";
import {aiConfigApi} from "./aiRuntime";
-type CapabilityDecision = "allow" | "deny";
type CapabilityScope = "agent" | "mcp";
const escapeAttribute = (value: string) => escapeAttr(escapeHtml(value));
@@ -128,45 +128,28 @@ const addUnavailableCapabilities = (capabilities: ICapabilityInfo[], scope: Capa
});
};
-const saveCapabilityPolicy = (scope: CapabilityScope, policy: Config.ICapabilityPolicy, onApplied: () => void) => {
+const saveCapabilityPolicy = (scope: CapabilityScope, overrides: Record<string, string>, onApplied: () => void) => {
const path = scope === "agent" ? "agent.capabilityPolicy" : "mcp.exposurePolicy";
- const current = getCapabilityPolicy(scope);
- aiConfigApi.patch(path, {
- ...policy,
- overrides: capabilityOverridesForPatch(current.overrides, policy.overrides),
- }, onApplied);
+ aiConfigApi.patch(path, {overrides}, onApplied);
};
-const saveApprovalPolicy = (policy: Config.IAgent["approvalPolicy"], onApplied: () => void) => {
- aiConfigApi.patch("agent.approvalPolicy", {
- ...policy,
- overrides: approvalOverridesForPatch(getApprovalPolicy().overrides, policy.overrides),
- }, onApplied);
+// 仅提交本次改动的审批覆盖项,避免用旧快照覆盖其他能力的设置。
+const saveApprovalPolicy = (overrides: Record<string, IAgentApprovalOverridePatch>, onApplied: () => void) => {
+ aiConfigApi.patch("agent.approvalPolicy", {overrides}, onApplied);
};
const setCapabilitiesDecision = (scope: CapabilityScope, ids: string[], decision: CapabilityDecision,
onApplied: () => void) => {
- const policy = getCapabilityPolicy(scope);
- const overrides = {...policy.overrides};
- ids.forEach((id) => {
- if (decision === policy.default) {
- delete overrides[id];
- } else {
- overrides[id] = decision;
- }
- });
- saveCapabilityPolicy(scope, {...policy, overrides}, onApplied);
+ saveCapabilityPolicy(scope, capabilityOverridesPatch(getCapabilityPolicy(scope).default, ids, decision), onApplied);
};
const setCapabilityApproval = (id: string, decision: AgentApprovalDecision, onApplied: () => void) => {
- const policy = getApprovalPolicy();
- saveApprovalPolicy(updateCapabilityApproval(policy, id, decision), onApplied);
+ saveApprovalPolicy({[id]: approvalOverridePatch(getApprovalPolicy().default, decision)}, onApplied);
};
const setCapabilityActionApproval = (id: string, action: string, decision: AgentActionApprovalDecision,
onApplied: () => void) => {
- const policy = getApprovalPolicy();
- saveApprovalPolicy(updateCapabilityActionApproval(policy, id, action, decision), onApplied);
+ saveApprovalPolicy({[id]: actionApprovalPatch(action, decision)}, onApplied);
};
const capabilityMatches = (capability: ICapabilityInfo, query: string) => {
diff --git a/kernel/api/contract_setting_ai_capability_test.go b/kernel/api/contract_setting_ai_capability_test.go
index d86dc48862..9ae37fb5e7 100644
--- a/kernel/api/contract_setting_ai_capability_test.go
+++ b/kernel/api/contract_setting_ai_capability_test.go
@@ -8,8 +8,8 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
-// TestAPIContractSettingAICapabilityOverrideClear 验证能力开关的恢复协议:设置补丁不会删除省略的字典键,
-// 前端以空决策提交被删除的覆盖项,由内核规范化移除。
+// TestAPIContractSettingAICapabilityOverrideClear 验证能力开关的提交协议:前端只提交改动的条目,
+// 补丁合并保留其他覆盖项,恢复默认时写入的空决策由规范化清除。
func TestAPIContractSettingAICapabilityOverrideClear(t *testing.T) {
previousConf, previousReadOnly, previousConfDir := model.Conf, util.ReadOnly, util.ConfDir
t.Cleanup(func() { model.Conf, util.ReadOnly, util.ConfDir = previousConf, previousReadOnly, previousConfDir })
@@ -17,7 +17,7 @@ func TestAPIContractSettingAICapabilityOverrideClear(t *testing.T) {
model.Conf = model.NewAppConf()
model.Conf.AI.Store(conf.NewAI())
- const id = "native/backend/asset"
+ const id, otherID = "native/backend/asset", "native/backend/block"
patch := func(body string) {
t.Helper()
code, message, _ := settingContractRequest(t, "patch", patchSetting, body)
@@ -27,21 +27,22 @@ func TestAPIContractSettingAICapabilityOverrideClear(t *testing.T) {
}
policy := func() *conf.CapabilityPolicy { return model.Conf.AI.Load().Agent.CapabilityPolicy }
- patch(`{"ai":{"agent":{"capabilityPolicy":{"default":"allow","overrides":{"` + id + `":"deny"}}}}}`)
- if policy().Allows(id) {
- t.Fatal("capability was not disabled")
+ patch(`{"ai":{"agent":{"capabilityPolicy":{"overrides":{"` + id + `":"deny"}}}}}`)
+ patch(`{"ai":{"agent":{"capabilityPolicy":{"overrides":{"` + otherID + `":"deny"}}}}}`)
+ if policy().Allows(id) || policy().Allows(otherID) {
+ t.Fatal("partial patches must disable both capabilities and preserve each other")
}
- // 补丁按对象递归合并,省略该键不会移除已有覆盖项,因此不能靠省略条目恢复能力。
- patch(`{"ai":{"agent":{"capabilityPolicy":{"default":"allow","overrides":{}}}}}`)
- if policy().Allows(id) {
- t.Fatal("omitted overrides must not be removed by the patch merge")
- }
-
- patch(`{"ai":{"agent":{"capabilityPolicy":{"default":"allow","overrides":{"` + id + `":""}}}}}`)
+ patch(`{"ai":{"agent":{"capabilityPolicy":{"overrides":{"` + id + `":""}}}}}`)
if !policy().Allows(id) {
t.Fatal("empty decision did not restore the capability")
}
+ if policy().Allows(otherID) {
+ t.Fatal("restoring one capability must not clear another override")
+ }
+ if policy().Default != "allow" {
+ t.Fatalf("partial patch must keep the policy default: %s", policy().Default)
+ }
if _, exists := policy().Overrides[id]; exists {
t.Fatal("cleared override must be removed from the stored policy")
}