@ai-sdk/harness-opencode 1.0.153 → 1.0.155
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +20 -0
- package/dist/bridge/index.mjs +29 -32
- package/dist/bridge/index.mjs.map +1 -1
- package/dist/bridge/package.json +1 -0
- package/dist/bridge/pnpm-lock.yaml +117 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +53 -8
- package/dist/index.js.map +1 -1
- package/package.json +5 -4
- package/src/bridge/index.ts +58 -53
- package/src/bridge/opencode-path.ts +3 -1
- package/src/bridge/package.json +1 -0
- package/src/bridge/pnpm-lock.yaml +117 -0
- package/src/opencode-bridge-protocol.ts +33 -11
- package/src/opencode-harness.ts +49 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @ai-sdk/harness-opencode
|
|
2
2
|
|
|
3
|
+
## 1.0.155
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [130e871]
|
|
8
|
+
- @ai-sdk/provider@4.0.28
|
|
9
|
+
- @ai-sdk/harness@1.0.153
|
|
10
|
+
- @ai-sdk/provider-utils@5.0.61
|
|
11
|
+
|
|
12
|
+
## 1.0.154
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- 4131de3: feat(harness-opencode): support native built-in tool filtering
|
|
17
|
+
- 3f0c878: fix(harness-opencode): continue turns paused for a tool approval or tool result instead of hanging
|
|
18
|
+
- 25ec1b2: fix(harness-opencode): install `ripgrep` universally via NPM
|
|
19
|
+
- Updated dependencies [2e89fa4]
|
|
20
|
+
- @ai-sdk/provider-utils@5.0.60
|
|
21
|
+
- @ai-sdk/harness@1.0.152
|
|
22
|
+
|
|
3
23
|
## 1.0.153
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
package/dist/bridge/index.mjs
CHANGED
|
@@ -6,6 +6,7 @@ import { WebSocketServer } from "ws";
|
|
|
6
6
|
import path from "node:path";
|
|
7
7
|
import { isDeepStrictEqual } from "node:util";
|
|
8
8
|
import { createOpencodeClient, createOpencodeServer } from "@opencode-ai/sdk/v2";
|
|
9
|
+
import { rgPath } from "@vscode/ripgrep";
|
|
9
10
|
import { createServer } from "node:http";
|
|
10
11
|
//#region ../harness/dist/bridge/index.js
|
|
11
12
|
const DEBUG_LEVEL_WEIGHT = {
|
|
@@ -1564,8 +1565,12 @@ function openCodeErrorFromValue(value) {
|
|
|
1564
1565
|
//#endregion
|
|
1565
1566
|
//#region src/bridge/opencode-path.ts
|
|
1566
1567
|
const fallbackPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
|
|
1567
|
-
function
|
|
1568
|
-
env.PATH = [
|
|
1568
|
+
function configureOpenCodePath({ bootstrapDir, env }) {
|
|
1569
|
+
env.PATH = [
|
|
1570
|
+
path.join(bootstrapDir, "node_modules", ".bin"),
|
|
1571
|
+
env.PATH || fallbackPath,
|
|
1572
|
+
path.dirname(rgPath)
|
|
1573
|
+
].join(path.delimiter);
|
|
1569
1574
|
}
|
|
1570
1575
|
//#endregion
|
|
1571
1576
|
//#region src/bridge/opencode-server-auth.ts
|
|
@@ -1798,9 +1803,10 @@ const OPENCODE_TO_WIRE = {
|
|
|
1798
1803
|
askUserQuestions: "question",
|
|
1799
1804
|
subtask: "agent"
|
|
1800
1805
|
};
|
|
1801
|
-
const
|
|
1802
|
-
|
|
1803
|
-
|
|
1806
|
+
const BUILTIN_TOOL_PERMISSION = {
|
|
1807
|
+
askUserQuestions: "question",
|
|
1808
|
+
read: "read",
|
|
1809
|
+
write: "edit",
|
|
1804
1810
|
edit: "edit",
|
|
1805
1811
|
bash: "bash",
|
|
1806
1812
|
glob: "glob",
|
|
@@ -1809,7 +1815,7 @@ const PUBLIC_TO_NATIVE = {
|
|
|
1809
1815
|
webfetch: "webfetch",
|
|
1810
1816
|
skill: "skill",
|
|
1811
1817
|
todowrite: "todowrite",
|
|
1812
|
-
agent: "
|
|
1818
|
+
agent: "task"
|
|
1813
1819
|
};
|
|
1814
1820
|
const TOOL_KIND = {
|
|
1815
1821
|
read: "readonly",
|
|
@@ -1836,7 +1842,7 @@ const runtime = {
|
|
|
1836
1842
|
};
|
|
1837
1843
|
let currentHostInputTracker;
|
|
1838
1844
|
let currentTurn;
|
|
1839
|
-
|
|
1845
|
+
configureOpenCodePath({
|
|
1840
1846
|
bootstrapDir,
|
|
1841
1847
|
env
|
|
1842
1848
|
});
|
|
@@ -1908,7 +1914,7 @@ async function switchSessionModel({ client, sessionId, start }) {
|
|
|
1908
1914
|
if (response.error != null) throw response.error;
|
|
1909
1915
|
}
|
|
1910
1916
|
async function ensureRuntime({ start }) {
|
|
1911
|
-
if (runtime.client && isDeepStrictEqual(runtime.openCodeConfig, start.openCodeConfig)) return;
|
|
1917
|
+
if (runtime.client && isDeepStrictEqual(runtime.openCodeConfig, start.openCodeConfig) && isDeepStrictEqual(runtime.inactiveBuiltinToolNames, start.inactiveBuiltinToolNames)) return;
|
|
1912
1918
|
closeRuntime();
|
|
1913
1919
|
try {
|
|
1914
1920
|
if (start.tools && start.tools.length > 0) {
|
|
@@ -1936,6 +1942,7 @@ async function ensureRuntime({ start }) {
|
|
|
1936
1942
|
const mcpServers = asOpenCodeObject((await runtime.client.mcp.status()).data) ?? {};
|
|
1937
1943
|
runtime.mcpToolPrefixes = new Set(Object.entries(mcpServers).filter(([serverName, status]) => serverName !== "harness-tools" && asOpenCodeObject(status)?.status === "connected").map(([serverName]) => `${sanitizeMcpToolName(serverName)}_`));
|
|
1938
1944
|
runtime.openCodeConfig = structuredClone(start.openCodeConfig);
|
|
1945
|
+
runtime.inactiveBuiltinToolNames = structuredClone(start.inactiveBuiltinToolNames);
|
|
1939
1946
|
} catch (error) {
|
|
1940
1947
|
closeRuntime();
|
|
1941
1948
|
throw error;
|
|
@@ -1948,6 +1955,7 @@ function closeRuntime() {
|
|
|
1948
1955
|
runtime.client = void 0;
|
|
1949
1956
|
runtime.relay = void 0;
|
|
1950
1957
|
runtime.openCodeConfig = void 0;
|
|
1958
|
+
runtime.inactiveBuiltinToolNames = void 0;
|
|
1951
1959
|
runtime.toolNames = /* @__PURE__ */ new Set();
|
|
1952
1960
|
runtime.mcpToolPrefixes = /* @__PURE__ */ new Set();
|
|
1953
1961
|
}
|
|
@@ -1972,13 +1980,8 @@ function buildOpenCodeConfig({ start, relayPort, toolSchemasPath }) {
|
|
|
1972
1980
|
};
|
|
1973
1981
|
if (start.model) config.model = start.model;
|
|
1974
1982
|
if (skillsDir) config.skills = { paths: [skillsDir] };
|
|
1975
|
-
const inactiveToolNames = resolveInactiveBuiltinToolNames(start);
|
|
1976
1983
|
const permission = config.permission;
|
|
1977
|
-
for (const toolName of
|
|
1978
|
-
const permissionName = toPermissionToolName(PUBLIC_TO_NATIVE[toolName] ?? toolName);
|
|
1979
|
-
if (permissionName === "ls") permission.list = "ask";
|
|
1980
|
-
else permission[permissionName] = "ask";
|
|
1981
|
-
}
|
|
1984
|
+
for (const toolName of start.inactiveBuiltinToolNames ?? []) permission[BUILTIN_TOOL_PERMISSION[toolName]] = "deny";
|
|
1982
1985
|
const provider = buildProviderConfig(start);
|
|
1983
1986
|
if (provider) config.provider = provider;
|
|
1984
1987
|
const mcp = { ...start.mcpServers };
|
|
@@ -2220,7 +2223,7 @@ async function runPrompt({ client, sessionId, start, turn, emit }) {
|
|
|
2220
2223
|
client,
|
|
2221
2224
|
sessionId,
|
|
2222
2225
|
permissionMode: start.permissionMode,
|
|
2223
|
-
|
|
2226
|
+
inactiveBuiltinToolNames: start.inactiveBuiltinToolNames,
|
|
2224
2227
|
turn,
|
|
2225
2228
|
state,
|
|
2226
2229
|
hostInputTracker,
|
|
@@ -2403,7 +2406,7 @@ async function runCompaction({ client, sessionId, start, turn, emit }) {
|
|
|
2403
2406
|
client,
|
|
2404
2407
|
sessionId,
|
|
2405
2408
|
permissionMode: start.permissionMode,
|
|
2406
|
-
|
|
2409
|
+
inactiveBuiltinToolNames: start.inactiveBuiltinToolNames,
|
|
2407
2410
|
turn,
|
|
2408
2411
|
state: createTranslationState(),
|
|
2409
2412
|
emit: (msg) => {
|
|
@@ -2452,7 +2455,7 @@ async function runCompaction({ client, sessionId, start, turn, emit }) {
|
|
|
2452
2455
|
harnessMetadata: { opencode: { missingSummary: true } }
|
|
2453
2456
|
});
|
|
2454
2457
|
}
|
|
2455
|
-
async function consumeEvents({ client, sessionId, permissionMode,
|
|
2458
|
+
async function consumeEvents({ client, sessionId, permissionMode, inactiveBuiltinToolNames, turn, state, hostInputTracker, emit, signal, onSubscribed, onEvent }) {
|
|
2456
2459
|
const stream = await subscribeLegacyEvents({
|
|
2457
2460
|
client,
|
|
2458
2461
|
signal
|
|
@@ -2605,7 +2608,7 @@ async function consumeEvents({ client, sessionId, permissionMode, builtinToolFil
|
|
|
2605
2608
|
client,
|
|
2606
2609
|
sessionId: scopedSessionId,
|
|
2607
2610
|
permissionMode,
|
|
2608
|
-
|
|
2611
|
+
inactiveBuiltinToolNames,
|
|
2609
2612
|
turn,
|
|
2610
2613
|
emit,
|
|
2611
2614
|
event,
|
|
@@ -2615,7 +2618,7 @@ async function consumeEvents({ client, sessionId, permissionMode, builtinToolFil
|
|
|
2615
2618
|
client,
|
|
2616
2619
|
sessionId: scopedSessionId,
|
|
2617
2620
|
permissionMode,
|
|
2618
|
-
|
|
2621
|
+
inactiveBuiltinToolNames,
|
|
2619
2622
|
turn,
|
|
2620
2623
|
emit,
|
|
2621
2624
|
event,
|
|
@@ -2678,7 +2681,7 @@ async function handleQuestion({ client, turn, emit, event, waitFor }) {
|
|
|
2678
2681
|
function sanitizeMcpToolName(value) {
|
|
2679
2682
|
return value.replace(/[^a-zA-Z0-9_-]/g, "_");
|
|
2680
2683
|
}
|
|
2681
|
-
async function handlePermissionV2({ client, sessionId, permissionMode,
|
|
2684
|
+
async function handlePermissionV2({ client, sessionId, permissionMode, inactiveBuiltinToolNames, turn, emit, event, waitFor }) {
|
|
2682
2685
|
const props = event.properties ?? {};
|
|
2683
2686
|
const requestID = String(props.id ?? "");
|
|
2684
2687
|
if (!requestID) return;
|
|
@@ -2688,7 +2691,7 @@ async function handlePermissionV2({ client, sessionId, permissionMode, builtinTo
|
|
|
2688
2691
|
requestID,
|
|
2689
2692
|
toolCallId: String(props.source?.callID ?? requestID),
|
|
2690
2693
|
permissionMode,
|
|
2691
|
-
|
|
2694
|
+
inactiveBuiltinToolNames,
|
|
2692
2695
|
turn,
|
|
2693
2696
|
emit,
|
|
2694
2697
|
waitFor
|
|
@@ -2700,7 +2703,7 @@ async function handlePermissionV2({ client, sessionId, permissionMode, builtinTo
|
|
|
2700
2703
|
...reply.message ? { message: reply.message } : {}
|
|
2701
2704
|
});
|
|
2702
2705
|
}
|
|
2703
|
-
async function handlePermission({ client, sessionId, permissionMode,
|
|
2706
|
+
async function handlePermission({ client, sessionId, permissionMode, inactiveBuiltinToolNames, turn, emit, event, waitFor }) {
|
|
2704
2707
|
const props = event.properties ?? {};
|
|
2705
2708
|
const requestID = String(props.id ?? "");
|
|
2706
2709
|
if (!requestID) return;
|
|
@@ -2711,7 +2714,7 @@ async function handlePermission({ client, sessionId, permissionMode, builtinTool
|
|
|
2711
2714
|
requestID,
|
|
2712
2715
|
toolCallId: String(tool?.callID ?? requestID),
|
|
2713
2716
|
permissionMode,
|
|
2714
|
-
|
|
2717
|
+
inactiveBuiltinToolNames,
|
|
2715
2718
|
turn,
|
|
2716
2719
|
emit,
|
|
2717
2720
|
waitFor
|
|
@@ -2723,7 +2726,7 @@ async function handlePermission({ client, sessionId, permissionMode, builtinTool
|
|
|
2723
2726
|
...reply.message ? { message: reply.message } : {}
|
|
2724
2727
|
});
|
|
2725
2728
|
}
|
|
2726
|
-
async function selectPermissionReply({ action, resources, requestID, toolCallId, permissionMode,
|
|
2729
|
+
async function selectPermissionReply({ action, resources, requestID, toolCallId, permissionMode, inactiveBuiltinToolNames, turn, emit, waitFor }) {
|
|
2727
2730
|
const requestApproval = async () => {
|
|
2728
2731
|
const wait = waitFor?.({
|
|
2729
2732
|
toolCallId,
|
|
@@ -2735,7 +2738,7 @@ async function selectPermissionReply({ action, resources, requestID, toolCallId,
|
|
|
2735
2738
|
const toolName = toPermissionToolName(action);
|
|
2736
2739
|
if (isBuiltinToolInactive({
|
|
2737
2740
|
toolName,
|
|
2738
|
-
|
|
2741
|
+
inactiveBuiltinToolNames
|
|
2739
2742
|
})) {
|
|
2740
2743
|
emit({
|
|
2741
2744
|
type: "tool-approval-request",
|
|
@@ -2779,14 +2782,8 @@ function toPermissionToolName(action) {
|
|
|
2779
2782
|
if (normalized.includes("read")) return "read";
|
|
2780
2783
|
return toWireToolName(normalized);
|
|
2781
2784
|
}
|
|
2782
|
-
function resolveInactiveBuiltinToolNames(start) {
|
|
2783
|
-
const toolFiltering = start.builtinToolFiltering;
|
|
2784
|
-
if (toolFiltering == null) return [];
|
|
2785
|
-
return toolFiltering.mode === "allow" ? Object.keys(PUBLIC_TO_NATIVE).filter((name) => !toolFiltering.toolNames.includes(name)) : toolFiltering.toolNames;
|
|
2786
|
-
}
|
|
2787
2785
|
function isBuiltinToolInactive(input) {
|
|
2788
|
-
|
|
2789
|
-
return input.toolFiltering.mode === "allow" ? !input.toolFiltering.toolNames.includes(input.toolName) : input.toolFiltering.toolNames.includes(input.toolName);
|
|
2786
|
+
return input.inactiveBuiltinToolNames?.some((toolName) => toolName === input.toolName) ?? false;
|
|
2790
2787
|
}
|
|
2791
2788
|
function isExternalPath(resource) {
|
|
2792
2789
|
if (!path.isAbsolute(resource)) return false;
|