@ai-sdk/harness-opencode 1.0.179 → 1.0.182
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 +26 -0
- package/dist/bridge/host-tool-mcp.mjs.map +1 -1
- package/dist/bridge/index.mjs +71 -8
- package/dist/bridge/index.mjs.map +1 -1
- package/dist/bridge/package.json +3 -3
- package/dist/bridge/pnpm-lockfile.yaml +163 -153
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +19 -17
- package/dist/index.js.map +1 -1
- package/package.json +5 -5
- package/src/bridge/package.json +3 -3
- package/src/opencode-harness.ts +21 -19
package/dist/index.d.ts
CHANGED
|
@@ -58,8 +58,8 @@ type OpenCodeHarnessSettings = {
|
|
|
58
58
|
*/
|
|
59
59
|
readonly reconnect?: SandboxChannelReconnectOptions;
|
|
60
60
|
/**
|
|
61
|
-
*
|
|
62
|
-
*
|
|
61
|
+
* @deprecated Sandbox bridge authentication now uses adapter-generated
|
|
62
|
+
* Ed25519 keys. This setting is ignored and emits a warning.
|
|
63
63
|
*/
|
|
64
64
|
readonly mintBridgeToken?: HarnessV1MintBridgeTokenCallback;
|
|
65
65
|
};
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","names":["SandboxSession"],"sources":["../src/opencode-auth.ts","../src/opencode-harness.ts","../src/version.ts","../src/index.ts"],"mappings":";;;;;;;;;;KA0NY,6BAA6B;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","names":["SandboxSession"],"sources":["../src/opencode-auth.ts","../src/opencode-harness.ts","../src/version.ts","../src/index.ts"],"mappings":";;;;;;;;;;KA0NY,6BAA6B;;;KC1H7B;WACD,OAAO;;;;;;WAMP,uBAAuB;;;;;;WAMvB,iBAAiB;;;;;WAKjB,aAAa;WACb;;;;;;WAMA;WACA;;;;;WAKA,eAAe;WACf;;;;;;WAMA;;;;;;;WAOA,YAAY;;;;;WAMZ,kBAAkB;;cAKvB;;;;;;;;;;;;;QAypCy1gB;QAAoC;;;UAAmE;UAAsC;;QAAiE;QAA2C;;;;;;;;;;;QAAzP;QAAoC;;;UAAmE;UAAsC;;QAAiE;QAA2C;;;;;;;;;;;;;;;UAAzP;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;;;;;UAAzP;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;UAA4K;;;;;;UAAgJ;;;;;;;;;;;;QAAhJ;;;;;;QAAgJ;;;;;;;;;;;;QAArjB;QAAoC;;;UAAmE;UAAsC;;QAAiE;QAA2C;;;;;;;;QAA4K;;;;;;QAAgJ;;;;;;;;;;;;;;;;;;UAArjB;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;;;;;;;;;;;;;;;QAAzP;QAAoC;;;UAAmE;UAAsC;;QAAiE;QAA2C;;;;;;;;;;;QAAzP;QAAoC;;;UAAmE;UAAsC;;QAAiE;QAA2C;;;;;;;;;;;;;;;UAAzP;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;;;;;UAAzP;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;UAA4K;;;;;;UAAgJ;;;;;;;;;;;;QAAhJ;;;;;;QAAgJ;;;;;;;;;;;;;;;;;;;UAArjB;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAzhCxkhB,eACd,WAAU,0BACT,iBAAiB;;;qBCxRP;;;;;;;qBCIA,oCAAQ;;;;;;;;;;;;;QAO+21D;QAAoC;;;UAAmE;UAAsC;;QAAiE;QAA2C;;;;;;;;;;;QAAzP;QAAoC;;;UAAmE;UAAsC;;QAAiE;QAA2C;;;;;;;;;;;;;;;UAAzP;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;;;;;UAAzP;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;UAA4K;;;;;;UAAgJ;;;;;;;;;;;;QAAhJ;;;;;;QAAgJ;;;;;;;;;;;;QAArjB;QAAoC;;;UAAmE;UAAsC;;QAAiE;QAA2C;;;;;;;;QAA4K;;;;;;QAAgJ;;;;;;;;;;;;;;;;;;UAArjB;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;;;;;;;;;;;;;;;QAAzP;QAAoC;;;UAAmE;UAAsC;;QAAiE;QAA2C;;;;;;;;;;;QAAzP;QAAoC;;;UAAmE;UAAsC;;QAAiE;QAA2C;;;;;;;;;;;;;;;UAAzP;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;;;;;UAAzP;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C;;;;;;;;;UAA4K;;;;;;UAAgJ;;;;;;;;;;;;QAAhJ;;;;;;QAAgJ;;;;;;;;;;;;;;;;;;;UAArjB;UAAoC;;;YAAmE;YAAsC;;UAAiE;UAA2C"}
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path, { dirname, join } from "node:path";
|
|
2
2
|
import { HARNESS_V1_BUILTIN_TOOLS, HarnessCapabilityUnsupportedError, commonTool, harnessSessionDataDirectoryPath, harnessStateDirectoryPath, harnessV1BridgeInboundCommandSchemas, harnessV1BridgeOutboundMessageSchema, harnessV1BridgeStartBaseSchema, harnessV1DiagnosticFromBridgeFrame, isHarnessV1BuiltinToolIncluded } from "@ai-sdk/harness";
|
|
3
|
-
import { SandboxChannel, applyCredentialForwarding, classifyDiskLog, createBridgeErrorHandler, createBridgeStartupError,
|
|
3
|
+
import { BRIDGE_AUTH_PUBLIC_KEY_ENV, SandboxChannel, applyCredentialForwarding, classifyDiskLog, createBridgeAuthKeyPair, createBridgeErrorHandler, createBridgeStartupError, createBridgeWebSocketConnect, createCredentialRequestTransformation, createReadBridgeAsset, drainBridgeProcessStream, experimental_createBridgeUserMessageSubmitter, extractHarnessPromptContent, forwardBridgeProcessStream, getAiGatewayAuthFromEnv, getRestrictedSandboxSession, harnessPromptContentSchema, isAccessTokenExpiringSoon, isHarnessAuthenticationEnvironment, isWindows, markBridgeStarting, parseJwtPayload, refreshOAuthAccessToken, resolveBridgeEndpoint, resolveBridgePort, resolveSandboxCredentialEnvironment, resolveSandboxHomeDir, shellQuote, validateBridgeSandboxSettings, waitForBridgeReady, warnCredentialBrokeringUnavailable, warnMintBridgeTokenIgnored, writeSkills } from "@ai-sdk/harness/utils";
|
|
4
4
|
import { isRecord, safeParseJSON, tool } from "@ai-sdk/provider-utils";
|
|
5
5
|
import { WebSocket } from "ws";
|
|
6
6
|
import { z } from "zod/v4";
|
|
@@ -747,7 +747,7 @@ const startMessageSchema = harnessV1BridgeStartBaseSchema.omit({ builtinToolFilt
|
|
|
747
747
|
z.discriminatedUnion("type", [startMessageSchema, ...harnessV1BridgeInboundCommandSchemas]);
|
|
748
748
|
//#endregion
|
|
749
749
|
//#region src/version.ts
|
|
750
|
-
const VERSION = "1.0.
|
|
750
|
+
const VERSION = "1.0.182";
|
|
751
751
|
//#endregion
|
|
752
752
|
//#region src/opencode-harness.ts
|
|
753
753
|
/**
|
|
@@ -851,7 +851,7 @@ const OPENCODE_BUILTIN_TOOLS = {
|
|
|
851
851
|
const OPENCODE_BUILTIN_TOOL_NAMES = Object.keys(OPENCODE_BUILTIN_TOOLS);
|
|
852
852
|
const openCodeBridgeCoordsSchema = z.object({
|
|
853
853
|
port: z.number(),
|
|
854
|
-
|
|
854
|
+
privateKey: z.string(),
|
|
855
855
|
lastSeenEventId: z.number(),
|
|
856
856
|
sandboxId: z.string().optional()
|
|
857
857
|
});
|
|
@@ -861,6 +861,10 @@ const openCodeResumeStateSchema = z.object({
|
|
|
861
861
|
sandboxCredentialEnvironment: z.record(z.string(), z.string()).optional()
|
|
862
862
|
});
|
|
863
863
|
function createOpenCode(settings = {}) {
|
|
864
|
+
warnMintBridgeTokenIgnored({
|
|
865
|
+
harnessId: "opencode",
|
|
866
|
+
mintBridgeToken: settings.mintBridgeToken
|
|
867
|
+
});
|
|
864
868
|
if (settings.mcpServers != null && Object.prototype.hasOwnProperty.call(settings.mcpServers, "harness-tools")) throw new Error("OpenCode MCP server name \"harness-tools\" is reserved for HarnessAgent tools.");
|
|
865
869
|
return {
|
|
866
870
|
specificationVersion: "harness-v1",
|
|
@@ -877,10 +881,8 @@ function createOpenCode(settings = {}) {
|
|
|
877
881
|
const sandboxId = "id" in sandboxSession ? sandboxSession.id : void 0;
|
|
878
882
|
validateBridgeSandboxSettings({
|
|
879
883
|
sandboxSession,
|
|
880
|
-
sandboxId,
|
|
881
884
|
portOverride: settings.port,
|
|
882
|
-
portEndpointOverride: settings.portEndpoint
|
|
883
|
-
mintBridgeToken: settings.mintBridgeToken
|
|
885
|
+
portEndpointOverride: settings.portEndpoint
|
|
884
886
|
});
|
|
885
887
|
const lifecycleState = startOpts.continueFrom ?? startOpts.resumeFrom;
|
|
886
888
|
const isResume = lifecycleState != null;
|
|
@@ -972,13 +974,13 @@ function createOpenCode(settings = {}) {
|
|
|
972
974
|
const attachEndpoint = await resolveBridgeEndpoint({
|
|
973
975
|
sandboxSession,
|
|
974
976
|
port: coords.port,
|
|
975
|
-
portEndpointOverride: settings.portEndpoint
|
|
976
|
-
token: coords.token
|
|
977
|
+
portEndpointOverride: settings.portEndpoint
|
|
977
978
|
});
|
|
978
979
|
let supportsUserMessageResponses = false;
|
|
979
980
|
const attachChannel = new SandboxChannel({
|
|
980
981
|
connect: createBridgeWebSocketConnect({
|
|
981
982
|
endpoint: attachEndpoint,
|
|
983
|
+
privateKey: coords.privateKey,
|
|
982
984
|
webSocketConstructor: WebSocket,
|
|
983
985
|
onHello: (hello) => {
|
|
984
986
|
supportsUserMessageResponses = hello.capabilities?.experimental_userMessageResponses === true;
|
|
@@ -1005,7 +1007,7 @@ function createOpenCode(settings = {}) {
|
|
|
1005
1007
|
seedResumeSessionOnFirstPrompt: false,
|
|
1006
1008
|
rerunContinue: false,
|
|
1007
1009
|
bridgePort: coords.port,
|
|
1008
|
-
|
|
1010
|
+
bridgePrivateKey: coords.privateKey,
|
|
1009
1011
|
sandboxId,
|
|
1010
1012
|
sandboxCredentialEnvironment,
|
|
1011
1013
|
debug: startOpts.observability?.debug,
|
|
@@ -1029,7 +1031,7 @@ function createOpenCode(settings = {}) {
|
|
|
1029
1031
|
sandboxSession,
|
|
1030
1032
|
portOverride: settings.port
|
|
1031
1033
|
});
|
|
1032
|
-
const
|
|
1034
|
+
const bridgeAuth = createBridgeAuthKeyPair();
|
|
1033
1035
|
const forwardedAuthEnvironment = credentialsBrokered ? sandboxAuthEnvironment : await applyCredentialForwarding({
|
|
1034
1036
|
environment: sandboxAuthEnvironment,
|
|
1035
1037
|
credentialEnvironmentVariables: OPENCODE_CREDENTIAL_ENVIRONMENT_VARIABLES,
|
|
@@ -1048,7 +1050,7 @@ function createOpenCode(settings = {}) {
|
|
|
1048
1050
|
accessToken: subscriptionAccessToken
|
|
1049
1051
|
}) },
|
|
1050
1052
|
AI_SDK_HARNESS_CLIENT_APP: OPENCODE_CLIENT_APP,
|
|
1051
|
-
|
|
1053
|
+
[BRIDGE_AUTH_PUBLIC_KEY_ENV]: bridgeAuth.publicKey,
|
|
1052
1054
|
BRIDGE_WS_PORT: String(port),
|
|
1053
1055
|
...respawnStrategy === "replay" ? { BRIDGE_REPLAY_FROM_DISK: "1" } : {}
|
|
1054
1056
|
};
|
|
@@ -1100,13 +1102,13 @@ function createOpenCode(settings = {}) {
|
|
|
1100
1102
|
const bridgeEndpoint = await resolveBridgeEndpoint({
|
|
1101
1103
|
sandboxSession,
|
|
1102
1104
|
port: boundPort,
|
|
1103
|
-
portEndpointOverride: settings.portEndpoint
|
|
1104
|
-
token
|
|
1105
|
+
portEndpointOverride: settings.portEndpoint
|
|
1105
1106
|
});
|
|
1106
1107
|
let supportsUserMessageResponses = false;
|
|
1107
1108
|
const channel = new SandboxChannel({
|
|
1108
1109
|
connect: createBridgeWebSocketConnect({
|
|
1109
1110
|
endpoint: bridgeEndpoint,
|
|
1111
|
+
privateKey: bridgeAuth.privateKey,
|
|
1110
1112
|
webSocketConstructor: WebSocket,
|
|
1111
1113
|
openRetryTimeoutMs: timeoutMs,
|
|
1112
1114
|
startAbortSignal: startOpts.abortSignal,
|
|
@@ -1135,7 +1137,7 @@ function createOpenCode(settings = {}) {
|
|
|
1135
1137
|
seedResumeSessionOnFirstPrompt: respawnStrategy !== void 0,
|
|
1136
1138
|
rerunContinue: respawnStrategy === "rerun",
|
|
1137
1139
|
bridgePort: boundPort,
|
|
1138
|
-
|
|
1140
|
+
bridgePrivateKey: bridgeAuth.privateKey,
|
|
1139
1141
|
sandboxId,
|
|
1140
1142
|
sandboxCredentialEnvironment,
|
|
1141
1143
|
debug: startOpts.observability?.debug,
|
|
@@ -1167,7 +1169,7 @@ function resolveInactiveBuiltinToolNames(toolFiltering) {
|
|
|
1167
1169
|
toolFiltering
|
|
1168
1170
|
}));
|
|
1169
1171
|
}
|
|
1170
|
-
function createSession({ sessionId, channel, proc, provider, reasoningVariant, openCodeConfig, mcpServers, headers, openCodeSessionId, isResume, seedResumeSessionOnFirstPrompt, rerunContinue, bridgePort,
|
|
1172
|
+
function createSession({ sessionId, channel, proc, provider, reasoningVariant, openCodeConfig, mcpServers, headers, openCodeSessionId, isResume, seedResumeSessionOnFirstPrompt, rerunContinue, bridgePort, bridgePrivateKey, sandboxId, sandboxCredentialEnvironment, debug, permissionMode, builtinToolFiltering, sandbox, sandboxHomeDir, transformModel, supportsUserMessageResponses }) {
|
|
1171
1173
|
let stopped = false;
|
|
1172
1174
|
let stopPromise;
|
|
1173
1175
|
let latestOpenCodeSessionId = openCodeSessionId;
|
|
@@ -1440,7 +1442,7 @@ function createSession({ sessionId, channel, proc, provider, reasoningVariant, o
|
|
|
1440
1442
|
...sandboxCredentialEnvironment == null ? {} : { sandboxCredentialEnvironment },
|
|
1441
1443
|
bridge: {
|
|
1442
1444
|
port: bridgePort,
|
|
1443
|
-
|
|
1445
|
+
privateKey: bridgePrivateKey,
|
|
1444
1446
|
lastSeenEventId,
|
|
1445
1447
|
...sandboxId == null ? {} : { sandboxId }
|
|
1446
1448
|
}
|
|
@@ -1530,7 +1532,7 @@ function createSession({ sessionId, channel, proc, provider, reasoningVariant, o
|
|
|
1530
1532
|
...sandboxCredentialEnvironment == null ? {} : { sandboxCredentialEnvironment },
|
|
1531
1533
|
bridge: {
|
|
1532
1534
|
port: bridgePort,
|
|
1533
|
-
|
|
1535
|
+
privateKey: bridgePrivateKey,
|
|
1534
1536
|
lastSeenEventId,
|
|
1535
1537
|
...sandboxId == null ? {} : { sandboxId }
|
|
1536
1538
|
}
|