@ai-sdk/harness-opencode 1.0.176 → 1.0.178
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 +32 -0
- package/dist/bridge/host-tool-mcp.mjs.map +1 -1
- package/dist/bridge/index.mjs +303 -39
- package/dist/bridge/index.mjs.map +1 -1
- package/dist/index.d.ts +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +40 -21
- package/dist/index.js.map +1 -1
- package/package.json +4 -4
- package/src/bridge/index.ts +244 -33
- package/src/bridge/opencode-project-isolation.ts +71 -0
- package/src/bridge/permission-paths.ts +168 -0
- package/src/opencode-auth.ts +25 -7
- package/src/opencode-bridge-protocol.ts +1 -0
- package/src/opencode-harness.ts +13 -1
- package/src/opencode-subscription.ts +26 -14
package/dist/index.d.ts
CHANGED
|
@@ -39,6 +39,12 @@ type OpenCodeHarnessSettings = {
|
|
|
39
39
|
*/
|
|
40
40
|
readonly portEndpoint?: HarnessV1PortEndpoint;
|
|
41
41
|
readonly startupTimeoutMs?: number;
|
|
42
|
+
/**
|
|
43
|
+
* Abort a running turn when its host disconnects and does not reconnect
|
|
44
|
+
* within this many milliseconds, so the turn stops spending. A suspended
|
|
45
|
+
* turn is exempt. Unset keeps the turn running until it finishes.
|
|
46
|
+
*/
|
|
47
|
+
readonly hostDisconnectTimeoutMs?: number;
|
|
42
48
|
/**
|
|
43
49
|
* Configures reconnection attempts after an established bridge connection
|
|
44
50
|
* drops. The reconnect window includes connection establishment and
|
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":";;;;;
|
|
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":";;;;;KAqNY,6BAA6B;;;KCvH7B;WACD,OAAO;;;;;;WAMP,uBAAuB;;;;;;WAMvB,iBAAiB;;;;;WAKjB,aAAa;WACb;;;;;;WAMA;WACA;;;;;WAKA,eAAe;WACf;;;;;;WAMA;;;;;;;WAOA,YAAY;;;;;WAKZ,kBAAkB;;cAKvB;;;;;;;;;;;;;QA0pC4lhB;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBA1hC30hB,eACd,WAAU,0BACT,iBAAiB;;;qBCrRP;;;;;;;qBCIA,oCAAQ;;;;;;;;;;;;;QAO+51D;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
|
@@ -142,12 +142,24 @@ function createOpenCodeRequestTransformations({ env: environment, sandboxEnv: sa
|
|
|
142
142
|
environmentVariableName: "OPENCODE_API_KEY",
|
|
143
143
|
matchUrl: "https://opencode.ai/zen/go/v1"
|
|
144
144
|
});
|
|
145
|
-
case "gitlab":
|
|
146
|
-
environment
|
|
147
|
-
sandboxEnvironment
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
145
|
+
case "gitlab": {
|
|
146
|
+
const credential = environment.GITLAB_TOKEN;
|
|
147
|
+
const sandboxCredential = sandboxEnvironment.GITLAB_TOKEN;
|
|
148
|
+
if (credential == null || sandboxCredential == null) return [];
|
|
149
|
+
const requestUrl = new URL(`${environment.GITLAB_INSTANCE_URL ?? "https://gitlab.com"}/api/v4/ai/third_party_agents/direct_access`);
|
|
150
|
+
return [{
|
|
151
|
+
match: {
|
|
152
|
+
host: requestUrl.hostname,
|
|
153
|
+
path: { exact: requestUrl.pathname },
|
|
154
|
+
method: ["POST"],
|
|
155
|
+
headers: [{
|
|
156
|
+
key: { exact: "Authorization" },
|
|
157
|
+
value: { exact: `Bearer ${sandboxCredential}` }
|
|
158
|
+
}]
|
|
159
|
+
},
|
|
160
|
+
transform: { headers: { Authorization: `Bearer ${credential}` } }
|
|
161
|
+
}];
|
|
162
|
+
}
|
|
151
163
|
}
|
|
152
164
|
}
|
|
153
165
|
function resolveOpenCodeProvider({ model, provider }) {
|
|
@@ -436,6 +448,7 @@ async function resolveOpenCodeAuthentication({ auth, model, provider, processEnv
|
|
|
436
448
|
async function readOpenCodeSubscription({ providerId, env = process.env, homeDirectory = homedir(), platform = process.platform, fetch }) {
|
|
437
449
|
if (!isSubscriptionProvider(providerId)) return void 0;
|
|
438
450
|
const stored = await readStore({
|
|
451
|
+
providerId,
|
|
439
452
|
env,
|
|
440
453
|
homeDirectory,
|
|
441
454
|
platform
|
|
@@ -668,23 +681,26 @@ async function extractOpenAIAccountId(accessToken) {
|
|
|
668
681
|
const accountId = auth.chatgpt_account_id;
|
|
669
682
|
return typeof accountId === "string" ? accountId : void 0;
|
|
670
683
|
}
|
|
671
|
-
async function readStore({ env, homeDirectory, platform }) {
|
|
684
|
+
async function readStore({ providerId, env, homeDirectory, platform }) {
|
|
672
685
|
if (env.OPENCODE_AUTH_CONTENT != null) {
|
|
673
686
|
const parsed = await safeParseJSON({ text: env.OPENCODE_AUTH_CONTENT });
|
|
674
687
|
return parsed.success && isRecord(parsed.value) ? { value: parsed.value } : void 0;
|
|
675
688
|
}
|
|
676
|
-
const
|
|
677
|
-
const
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
value
|
|
686
|
-
|
|
687
|
-
|
|
689
|
+
const authPaths = env.XDG_DATA_HOME != null ? [join(env.XDG_DATA_HOME, "opencode", "auth.json")] : [join(homeDirectory, ".local", "share", "opencode", "auth.json"), ...isWindows(platform) ? [join(homeDirectory, ".opencode", "auth.json")] : []];
|
|
690
|
+
for (const authPath of authPaths) {
|
|
691
|
+
const text = await readFile(authPath, "utf8").catch(() => void 0);
|
|
692
|
+
if (text == null) continue;
|
|
693
|
+
const parsed = await safeParseJSON({ text });
|
|
694
|
+
if (!parsed.success || !isRecord(parsed.value)) continue;
|
|
695
|
+
if (!isRecord(parsed.value[providerId])) continue;
|
|
696
|
+
return {
|
|
697
|
+
value: parsed.value,
|
|
698
|
+
write: (value) => writeStore({
|
|
699
|
+
authPath,
|
|
700
|
+
value
|
|
701
|
+
})
|
|
702
|
+
};
|
|
703
|
+
}
|
|
688
704
|
}
|
|
689
705
|
async function writeStore({ authPath, value }) {
|
|
690
706
|
await mkdir(dirname(authPath), { recursive: true });
|
|
@@ -715,6 +731,7 @@ const openCodeBuiltinToolNameSchema = z.enum([
|
|
|
715
731
|
]);
|
|
716
732
|
const startMessageSchema = harnessV1BridgeStartBaseSchema.omit({ builtinToolFiltering: true }).extend({
|
|
717
733
|
prompt: harnessPromptContentSchema,
|
|
734
|
+
readableSkillRoots: z.array(z.string()).optional(),
|
|
718
735
|
operation: z.enum(["prompt", "compact"]).optional(),
|
|
719
736
|
provider: z.string().optional(),
|
|
720
737
|
variant: z.string().optional(),
|
|
@@ -729,7 +746,7 @@ const startMessageSchema = harnessV1BridgeStartBaseSchema.omit({ builtinToolFilt
|
|
|
729
746
|
z.discriminatedUnion("type", [startMessageSchema, ...harnessV1BridgeInboundCommandSchemas]);
|
|
730
747
|
//#endregion
|
|
731
748
|
//#region src/version.ts
|
|
732
|
-
const VERSION = "1.0.
|
|
749
|
+
const VERSION = "1.0.178";
|
|
733
750
|
//#endregion
|
|
734
751
|
//#region src/opencode-harness.ts
|
|
735
752
|
/**
|
|
@@ -1045,7 +1062,7 @@ function createOpenCode(settings = {}) {
|
|
|
1045
1062
|
abortSignal: startOpts.abortSignal
|
|
1046
1063
|
});
|
|
1047
1064
|
const proc = await toolSafeSandboxSession.spawn({
|
|
1048
|
-
command: `node ${shellQuote(`${bootstrapDir}/bridge.mjs`)} --workdir ${shellQuote(workDir)} --bridge-state-dir ${shellQuote(bridgeStateDir)} --bootstrap-dir ${shellQuote(bootstrapDir)} --skills-dir ${shellQuote(skillsDir)}`,
|
|
1065
|
+
command: `node ${shellQuote(`${bootstrapDir}/bridge.mjs`)} --workdir ${shellQuote(workDir)} --bridge-state-dir ${shellQuote(bridgeStateDir)} --bootstrap-dir ${shellQuote(bootstrapDir)} --skills-dir ${shellQuote(skillsDir)}${settings.hostDisconnectTimeoutMs !== void 0 ? ` --host-disconnect-timeout-ms ${shellQuote(String(settings.hostDisconnectTimeoutMs))}` : ""}`,
|
|
1049
1066
|
env,
|
|
1050
1067
|
abortSignal: startOpts.abortSignal
|
|
1051
1068
|
});
|
|
@@ -1353,6 +1370,7 @@ function createSession({ sessionId, channel, proc, provider, reasoningVariant, o
|
|
|
1353
1370
|
...promptOpts.responseFormat == null ? {} : { responseFormat: promptOpts.responseFormat },
|
|
1354
1371
|
...promptOpts.instructions ? { instructions: promptOpts.instructions } : {},
|
|
1355
1372
|
skillsChanged: skillWriteResult.changed,
|
|
1373
|
+
readableSkillRoots: promptOpts.skills.map((skill) => `${sandboxHomeDir}/.agents/skills/${skill.name}`),
|
|
1356
1374
|
...startBase(turnModel)
|
|
1357
1375
|
});
|
|
1358
1376
|
pendingResumeSessionId = void 0;
|
|
@@ -1378,6 +1396,7 @@ function createSession({ sessionId, channel, proc, provider, reasoningVariant, o
|
|
|
1378
1396
|
...continueOpts.responseFormat == null ? {} : { responseFormat: continueOpts.responseFormat },
|
|
1379
1397
|
...continueOpts.instructions ? { instructions: continueOpts.instructions } : {},
|
|
1380
1398
|
skillsChanged: skillWriteResult.changed,
|
|
1399
|
+
readableSkillRoots: continueOpts.skills.map((skill) => `${sandboxHomeDir}/.agents/skills/${skill.name}`),
|
|
1381
1400
|
...startBase(turnModel)
|
|
1382
1401
|
});
|
|
1383
1402
|
pendingResumeSessionId = void 0;
|