ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-12 21:53:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(agents): restrict harness tool authority"

Browse Source 
This reverts commit aacbcaacc8.
This commit is contained in:
joshavant
2026-08-07 13:52:04 -05:00
committed by Josh Avant
parent 2c8923fe94
commit 2751bc8991
18 changed files with 46 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/codex/src/app-server/dynamic-tool-build-state.ts
+1 -1
View File
@@ -1,7 +1,7 @@
type OpenClawCodingToolsFactory =
(typeof import("openclaw/plugin-sdk/agent-harness"))["createOpenClawCodingTools"];
type AgentHarnessCodingToolsFactory =
(typeof import("openclaw/plugin-sdk/agent-harness-tool-authority-runtime"))["createOpenClawCodingToolsForAgentHarness"];
(typeof import("openclaw/plugin-sdk/agent-harness-tool-runtime"))["createOpenClawCodingToolsForAgentHarness"];
/** Mutable dependency seam shared by dynamic-tool construction and its behavioral tests. */
export const dynamicToolBuildState: {
extensions/codex/src/app-server/dynamic-tool-build.lazy-import.test.ts
+2 -2
View File
@@ -1,13 +1,13 @@
import { afterEach, expect, it, vi } from "vitest";
afterEach(() => {
vi.doUnmock("openclaw/plugin-sdk/agent-harness-tool-authority-runtime");
vi.doUnmock("openclaw/plugin-sdk/agent-harness-tool-runtime");
vi.resetModules();
});
it("does not load the private tool builder before a tool-capable turn", async () => {
let toolBuilderImports = 0;
vi.doMock("openclaw/plugin-sdk/agent-harness-tool-authority-runtime", () => {
vi.doMock("openclaw/plugin-sdk/agent-harness-tool-runtime", () => {
toolBuilderImports += 1;
return {
createOpenClawCodingToolsForAgentHarness: vi.fn(() => []),
extensions/codex/src/app-server/dynamic-tool-build.ts
+1 -1
View File
@@ -235,7 +235,7 @@ export async function buildDynamicTools(input: DynamicToolBuildParams) {
const agentHarnessCodingToolsFactory = injectedOpenClawCodingToolsFactory
? undefined
: (dynamicToolBuildState.agentHarnessCodingToolsFactory ??
(await import("openclaw/plugin-sdk/agent-harness-tool-authority-runtime"))
(await import("openclaw/plugin-sdk/agent-harness-tool-runtime"))
.createOpenClawCodingToolsForAgentHarness);
const createOpenClawCodingTools =
injectedOpenClawCodingToolsFactory ??
extensions/codex/src/app-server/side-question.test.ts
+1 -1
View File
@@ -100,7 +100,7 @@ vi.mock("./provider-capabilities.js", () => ({
resolveCodexProviderWebSearchSupportForClientMock(...args),
}));
vi.mock("openclaw/plugin-sdk/agent-harness-tool-authority-runtime", () => ({
vi.mock("openclaw/plugin-sdk/agent-harness-tool-runtime", () => ({
createOpenClawCodingToolsForAgentHarnessSideQuestion: (params: unknown, options: unknown) =>
createOpenClawCodingToolsForSideQuestionMock(params, options),
}));
extensions/codex/src/app-server/side-question.ts
+1 -1
View File
@@ -938,7 +938,7 @@ async function createCodexSideToolBridge(input: {
let tools: AnyAgentTool[] = [];
if (supportsModelTools(runtimeModel)) {
const { createOpenClawCodingToolsForAgentHarnessSideQuestion } =
await import("openclaw/plugin-sdk/agent-harness-tool-authority-runtime");
await import("openclaw/plugin-sdk/agent-harness-tool-runtime");
const sandboxSessionKey =
input.params.sandboxSessionKey?.trim() ||
input.params.sessionKey?.trim() ||
extensions/copilot/src/tool-bridge.lazy-import.test.ts
-43
View File
@@ -1,43 +0,0 @@
import { afterEach, expect, it, vi } from "vitest";
afterEach(() => {
vi.doUnmock("openclaw/plugin-sdk/agent-harness-tool-authority-runtime");
vi.resetModules();
});
it("loads the private tool builder only after the tool-construction guard", async () => {
let toolBuilderImports = 0;
vi.doMock("openclaw/plugin-sdk/agent-harness-tool-authority-runtime", () => {
toolBuilderImports += 1;
return {
createOpenClawCodingToolsForAgentHarness: vi.fn(() => []),
};
});
const { createCopilotToolBridge } = await import("./tool-bridge.js");
expect(toolBuilderImports).toBe(0);
await expect(
createCopilotToolBridge({
admittedAttempt: {} as never,
agentId: "agent-1",
attemptParams: { disableTools: true } as never,
modelId: "gpt-4o",
modelProvider: "github-copilot",
sessionId: "session-1",
}),
).resolves.toEqual({ codeModeEngaged: false, sdkTools: [], sourceTools: [] });
expect(toolBuilderImports).toBe(0);
await expect(
createCopilotToolBridge({
admittedAttempt: {} as never,
agentId: "agent-1",
attemptParams: {} as never,
modelId: "gpt-4o",
modelProvider: "github-copilot",
sessionId: "session-1",
}),
).resolves.toMatchObject({ sdkTools: [], sourceTools: [] });
expect(toolBuilderImports).toBe(1);
});
extensions/copilot/src/tool-bridge.ts
+6 -6
View File
@@ -22,7 +22,10 @@ import {
resolveModelAuthMode,
sanitizeToolResult,
} from "openclaw/plugin-sdk/agent-harness-runtime";
import { createAgentHarnessToolSurfaceRuntime } from "openclaw/plugin-sdk/agent-harness-tool-runtime";
import {
createAgentHarnessToolSurfaceRuntime,
createOpenClawCodingToolsForAgentHarness,
} from "openclaw/plugin-sdk/agent-harness-tool-runtime";
type CreateOpenClawCodingTools =
(typeof import("openclaw/plugin-sdk/agent-harness"))["createOpenClawCodingTools"];
@@ -201,11 +204,8 @@ export async function createCopilotToolBridge(
const createOpenClawCodingTools =
input.createOpenClawCodingTools ??
(admittedAttempt
? async (options: OpenClawCodingToolsOptions) => {
const { createOpenClawCodingToolsForAgentHarness } =
await import("openclaw/plugin-sdk/agent-harness-tool-authority-runtime");
return createOpenClawCodingToolsForAgentHarness(admittedAttempt, options);
}
? (options: OpenClawCodingToolsOptions) =>
createOpenClawCodingToolsForAgentHarness(admittedAttempt, options)
: (await import("openclaw/plugin-sdk/agent-harness")).createOpenClawCodingTools);
const toolSurfaceRuntime = createAgentHarnessToolSurfaceRuntime({
extensions/tsconfig.package-boundary.paths.json
-3
View File
@@ -134,9 +134,6 @@
"openclaw/plugin-sdk/agent-harness-exec-review-runtime": [
"../packages/plugin-sdk/dist/src/plugin-sdk/agent-harness-exec-review-runtime.d.ts"
],
"openclaw/plugin-sdk/agent-harness-tool-authority-runtime": [
"../packages/plugin-sdk/dist/src/plugin-sdk/agent-harness-tool-authority-runtime.d.ts"
],
"openclaw/plugin-sdk/agent-harness-tool-runtime": [
"../packages/plugin-sdk/dist/src/plugin-sdk/agent-harness-tool-runtime.d.ts"
],
extensions/xai/tsconfig.json
-3
View File
@@ -131,9 +131,6 @@
"openclaw/plugin-sdk/agent-harness-exec-review-runtime": [
"../../packages/plugin-sdk/dist/src/plugin-sdk/agent-harness-exec-review-runtime.d.ts"
],
"openclaw/plugin-sdk/agent-harness-tool-authority-runtime": [
"../../packages/plugin-sdk/dist/src/plugin-sdk/agent-harness-tool-authority-runtime.d.ts"
],
"openclaw/plugin-sdk/agent-harness-tool-runtime": [
"../../packages/plugin-sdk/dist/src/plugin-sdk/agent-harness-tool-runtime.d.ts"
],
package.json
-1
View File
@@ -48,7 +48,6 @@
"!dist/plugin-sdk/agent-core.d.ts",
"!dist/plugin-sdk/agent-harness-exec-review-runtime.d.ts",
"!dist/plugin-sdk/agent-harness-task-runtime.d.ts",
"!dist/plugin-sdk/agent-harness-tool-authority-runtime.d.ts",
"!dist/plugin-sdk/agent-harness-tool-runtime.d.ts",
"!dist/plugin-sdk/agent-runtime-test-contracts.js",
"!dist/plugin-sdk/agent-runtime-test-contracts.d.ts",
scripts/lib/plugin-sdk-entries.mjs
+1 -8
View File
@@ -84,10 +84,6 @@ export const packagedPrivatePluginSdkRuntimeEntrypoints =
productionPluginSdkEntrypointSet.has(entry),
);
const ownerRestrictedPrivatePluginSdkRuntimeEntrypointSet = new Set([
"agent-harness-tool-authority-runtime",
]);
/** Private entrypoints reserved for local tests and QA builds. */
const nonProductionPrivatePluginSdkEntrypoints = privateLocalOnlyPluginSdkEntrypoints.filter(
(entry) => !productionPluginSdkEntrypointSet.has(entry),
@@ -135,10 +131,7 @@ export function buildPluginSdkPackageExports() {
],
];
}
if (
packagedPrivatePluginSdkRuntimeEntrypoints.includes(entry) &&
!ownerRestrictedPrivatePluginSdkRuntimeEntrypointSet.has(entry)
) {
if (packagedPrivatePluginSdkRuntimeEntrypoints.includes(entry)) {
// Official plugins ship separately but execute against the host's private runtime.
// Their declarations stay pack-excluded by listUnpackagedPrivatePluginSdkDistArtifacts.
return [
scripts/lib/plugin-sdk-entrypoints.json
-1
View File
@@ -107,7 +107,6 @@
"agent-harness",
"agent-harness-exec-review-runtime",
"agent-harness-runtime",
"agent-harness-tool-authority-runtime",
"agent-harness-tool-runtime",
"hook-runtime",
"html-entity-runtime",
scripts/lib/plugin-sdk-private-local-only-subpaths.json
-1
View File
@@ -8,7 +8,6 @@
"agent-core",
"agent-harness-exec-review-runtime",
"agent-harness-task-runtime",
"agent-harness-tool-authority-runtime",
"agent-harness-tool-runtime",
"agent-runtime-test-contracts",
"agent-sessions",
src/plugin-sdk/agent-harness-tool-authority-runtime.ts
-34
View File
@@ -1,34 +0,0 @@
import {
createOpenClawCodingToolsForAgentHarness as createCoreOpenClawCodingToolsForAgentHarness,
createOpenClawCodingToolsForAgentHarnessSideQuestion as createCoreOpenClawCodingToolsForAgentHarnessSideQuestion,
} from "../agents/agent-tools-internal.js";
import type {
AgentHarnessSideQuestionParams,
EmbeddedRunAttemptParams,
} from "./agent-harness-runtime.js";
type OpenClawCodingToolsOptions = NonNullable<
Parameters<typeof import("./agent-harness.js").createOpenClawCodingTools>[0]
>;
/**
* Build tools for the exact host-admitted attempt without exposing its private
* execution attribution to plugin code.
*/
export function createOpenClawCodingToolsForAgentHarness(
attempt: EmbeddedRunAttemptParams,
options?: OpenClawCodingToolsOptions,
): ReturnType<typeof createCoreOpenClawCodingToolsForAgentHarness> {
return createCoreOpenClawCodingToolsForAgentHarness(attempt, options);
}
/**
* Build tools for the exact host-admitted side-question request without
* exposing its private execution attribution to plugin code.
*/
export function createOpenClawCodingToolsForAgentHarnessSideQuestion(
params: AgentHarnessSideQuestionParams,
options?: OpenClawCodingToolsOptions,
): ReturnType<typeof createCoreOpenClawCodingToolsForAgentHarnessSideQuestion> {
return createCoreOpenClawCodingToolsForAgentHarnessSideQuestion(params, options);
}
src/plugin-sdk/agent-harness-tool-runtime.ts
+33 -3
View File
@@ -1,13 +1,21 @@
import {
createOpenClawCodingToolsForAgentHarness as createCoreOpenClawCodingToolsForAgentHarness,
createOpenClawCodingToolsForAgentHarnessSideQuestion as createCoreOpenClawCodingToolsForAgentHarnessSideQuestion,
} from "../agents/agent-tools-internal.js";
/**
* Focused runtime SDK subpath for native harness tool-surface routing.
* Packaged private runtime facade for official harness plugins.
*
* Keep tool-search and code-mode dependencies out of the lightweight harness
* lifecycle facade used during plugin startup.
* This subpath is local-only and declaration-excluded. Keep tool-search and
* code-mode dependencies out of the lightweight startup lifecycle facade.
*/
import {
createAgentHarnessToolSurfaceRuntime as createCoreAgentHarnessToolSurfaceRuntime,
type AgentHarnessToolSurfaceRuntime as CoreAgentHarnessToolSurfaceRuntime,
} from "../agents/harness/tool-surface-bridge.js";
import type {
AgentHarnessSideQuestionParams,
EmbeddedRunAttemptParams,
} from "./agent-harness-runtime.js";
type OpenClawCodingToolsOptions = NonNullable<
Parameters<typeof import("./agent-harness.js").createOpenClawCodingTools>[0]
@@ -33,3 +41,25 @@ export function createAgentHarnessToolSurfaceRuntime(
): AgentHarnessToolSurfaceRuntime {
return createCoreAgentHarnessToolSurfaceRuntime(params);
}
/**
* Build tools for the exact host-admitted attempt without exposing its private
* execution attribution to plugin code.
*/
export function createOpenClawCodingToolsForAgentHarness(
attempt: EmbeddedRunAttemptParams,
options?: OpenClawCodingToolsOptions,
): ReturnType<typeof createCoreOpenClawCodingToolsForAgentHarness> {
return createCoreOpenClawCodingToolsForAgentHarness(attempt, options);
}
/**
* Build tools for the exact host-admitted side-question request without
* exposing its private execution attribution to plugin code.
*/
export function createOpenClawCodingToolsForAgentHarnessSideQuestion(
params: AgentHarnessSideQuestionParams,
options?: OpenClawCodingToolsOptions,
): ReturnType<typeof createCoreOpenClawCodingToolsForAgentHarnessSideQuestion> {
return createCoreOpenClawCodingToolsForAgentHarnessSideQuestion(params, options);
}
src/plugins/contracts/plugin-sdk-package-contract-guardrails.test.ts
-20
View File
@@ -817,26 +817,6 @@ describe("plugin-sdk package contract guardrails", () => {
});
});
it("keeps the agent harness tool authority runtime owner-restricted", () => {
const entrypoint = "agent-harness-tool-authority-runtime";
const localOnly = new Set(privateLocalOnlyPluginSdkEntrypoints);
const packageExports = new Set(collectPluginSdkPackageExports());
const typedExports = collectTypedPluginSdkPackageExports();
const excludedDeclarations = collectPackExcludedPluginSdkDeclarations();
expect({
localOnly: localOnly.has(entrypoint),
packageExport: packageExports.has(entrypoint),
typedExport: typedExports.has(entrypoint),
declarationExcluded: excludedDeclarations.has(entrypoint),
}).toEqual({
localOnly: true,
packageExport: false,
typedExport: false,
declarationExcluded: true,
});
});
it("keeps configured local-origin fetch helpers out of deprecated infra-runtime", () => {
const source = fs.readFileSync(resolve(REPO_ROOT, "src/plugin-sdk/infra-runtime.ts"), "utf8");
src/plugins/sdk-alias.test.ts
-100
View File
@@ -654,106 +654,6 @@ describe("plugin sdk alias helpers", () => {
expect(shadowCodexSubpaths).toEqual(["core"]);
});
it("aliases harness tool authority only for trusted official harness plugins", () => {
const fixture = createPluginSdkAliasFixture({
packageExports: {
"./plugin-sdk/core": { default: "./dist/plugin-sdk/core.js" },
},
});
const authoritySubpath = "agent-harness-tool-authority-runtime";
const sourceAuthorityPath = path.join(
fixture.root,
"src",
"plugin-sdk",
`${authoritySubpath}.ts`,
);
const distAuthorityPath = path.join(
fixture.root,
"dist",
"plugin-sdk",
`${authoritySubpath}.js`,
);
fs.writeFileSync(
path.join(fixture.root, "scripts", "lib", "plugin-sdk-private-local-only-subpaths.json"),
JSON.stringify([authoritySubpath], null, 2),
"utf-8",
);
fs.writeFileSync(sourceAuthorityPath, "export const authority = true;\n", "utf-8");
fs.writeFileSync(distAuthorityPath, "export const authority = true;\n", "utf-8");
const sourceCodexEntry = writePluginEntry(
fixture.root,
bundledPluginFile("codex", "src/index.ts"),
);
const sourceCopilotEntry = writePluginEntry(
fixture.root,
bundledPluginFile("copilot", "src/index.ts"),
);
const sourceOtherEntry = writePluginEntry(
fixture.root,
bundledPluginFile("demo", "src/index.ts"),
);
const { packageRoot: installedCodexRoot, pluginEntry: installedCodexEntry } =
writeInstalledPluginEntry({
installRoot: path.join(makeTempDir(), ".openclaw", "npm"),
packageName: "@openclaw/codex",
});
const { packageRoot: installedCopilotRoot, pluginEntry: installedCopilotEntry } =
writeInstalledPluginEntry({
installRoot: path.join(makeTempDir(), ".openclaw", "npm"),
packageName: "@openclaw/copilot",
});
const { packageRoot: installedOtherRoot, pluginEntry: installedOtherEntry } =
writeInstalledPluginEntry({
installRoot: path.join(makeTempDir(), ".openclaw", "npm"),
packageName: "@openclaw/demo",
});
const sourceCodexAliases = buildPluginLoaderAliasMap(sourceCodexEntry);
const sourceCopilotAliases = buildPluginLoaderAliasMap(sourceCopilotEntry);
const sourceOtherAliases = buildPluginLoaderAliasMap(sourceOtherEntry);
const installedCodexAliases = withCwd(installedCodexRoot, () =>
buildPluginLoaderAliasMap(
installedCodexEntry,
path.join(fixture.root, "openclaw.mjs"),
undefined,
"dist",
),
);
const installedCopilotAliases = withCwd(installedCopilotRoot, () =>
buildPluginLoaderAliasMap(
installedCopilotEntry,
path.join(fixture.root, "openclaw.mjs"),
undefined,
"dist",
),
);
const installedOtherAliases = withCwd(installedOtherRoot, () =>
buildPluginLoaderAliasMap(
installedOtherEntry,
path.join(fixture.root, "openclaw.mjs"),
undefined,
"dist",
),
);
const specifier = `openclaw/plugin-sdk/${authoritySubpath}`;
expect(fs.realpathSync(sourceCodexAliases[specifier] ?? "")).toBe(
fs.realpathSync(sourceAuthorityPath),
);
expect(fs.realpathSync(sourceCopilotAliases[specifier] ?? "")).toBe(
fs.realpathSync(sourceAuthorityPath),
);
expect(fs.realpathSync(installedCodexAliases[specifier] ?? "")).toBe(
fs.realpathSync(distAuthorityPath),
);
expect(fs.realpathSync(installedCopilotAliases[specifier] ?? "")).toBe(
fs.realpathSync(distAuthorityPath),
);
expect(sourceOtherAliases[specifier]).toBeUndefined();
expect(installedOtherAliases[specifier]).toBeUndefined();
});
it("does not reuse a non-private cached subpath list after private qa gets enabled", () => {
const fixture = createPluginSdkAliasFixture({
packageExports: {
src/plugins/sdk-alias.ts
-8
View File
@@ -419,7 +419,6 @@ const cachedWorkspacePackageAliasMaps = new PluginLruCache<Record<string, string
const PLUGIN_SDK_PACKAGE_NAMES = ["openclaw/plugin-sdk", "@openclaw/plugin-sdk"] as const;
const CODEX_MCP_PROJECTION_PLUGIN_SDK_SUBPATH = "codex-mcp-projection";
const CODEX_SESSION_TRANSCRIPT_PLUGIN_SDK_SUBPATH = "codex-session-transcript-runtime";
const AGENT_HARNESS_TOOL_AUTHORITY_PLUGIN_SDK_SUBPATH = "agent-harness-tool-authority-runtime";
const OLLAMA_CONFIGURED_LOCAL_ORIGIN_RUNTIME_PLUGIN_SDK_SUBPATH = "ssrf-runtime-internal";
const PRIVATE_QA_ONLY_PLUGIN_SDK_SUBPATHS = new Set([
"agent-runtime-test-contracts",
@@ -458,17 +457,10 @@ const PRIVATE_PLUGIN_SDK_SUBPATH_OWNERS: readonly PrivatePluginSdkSubpathOwner[]
officialInstalledPackageName: "@openclaw/codex",
allowPrivateQaCli: true,
subpaths: [
AGENT_HARNESS_TOOL_AUTHORITY_PLUGIN_SDK_SUBPATH,
CODEX_MCP_PROJECTION_PLUGIN_SDK_SUBPATH,
CODEX_SESSION_TRANSCRIPT_PLUGIN_SDK_SUBPATH,
],
},
{
bundledPluginId: "copilot",
officialInstalledPackageName: "@openclaw/copilot",
allowPrivateQaCli: false,
subpaths: [AGENT_HARNESS_TOOL_AUTHORITY_PLUGIN_SDK_SUBPATH],
},
{
bundledPluginId: "ollama",
allowPrivateQaCli: false,