Repository navigation
Add OpenCode 2 harness support #34
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0902035
feat: add OpenCode 2 harness support
jeremyfelder 594cdaf
fix(ci): read opencode2 token usage from session API
jeremyfelder 1991c4b
Merge remote-tracking branch 'origin/main' into feat/opencode2
jeremyfelder e23e413
fix: honor gateway endpoints and harden OpenCode config copies
jeremyfelder File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,6 +57,7 @@ | |
| "omp", | ||
| "openclaw", | ||
| "opencode", | ||
| "opencode2", | ||
| "pi", | ||
| "prime-agent", | ||
| "prime-intellect" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| import fs from "node:fs/promises"; | ||
| import type { Dirent, Stats } from "node:fs"; | ||
| import path from "node:path"; | ||
| import { json5Serializer } from "../serializers.js"; | ||
| import type { LaunchFile } from "../types.js"; | ||
| import { asPlainObject } from "./helpers.js"; | ||
|
|
||
| export const OPENCODE_CONFIG_FILES = ["config.json", "opencode.json", "opencode.jsonc"] as const; | ||
| const GENERATED_DIRECTORIES = new Set([".git", "node_modules"]); | ||
| const PRIVATE_FILES = new Set(["service.json", "auth.json", "mcp-auth.json"]); | ||
|
|
||
| function isPrivateFile(name: string): boolean { | ||
| return PRIVATE_FILES.has(name) || name === ".env" || name.startsWith(".env."); | ||
| } | ||
|
|
||
| export async function readOpenCodeConfig(configRoot: string): Promise<Record<string, unknown>> { | ||
| let config: Record<string, unknown> = {}; | ||
| for (const fileName of OPENCODE_CONFIG_FILES) { | ||
| const contents = await readOptionalFile(path.join(configRoot, fileName), "utf8"); | ||
| if (contents === undefined) continue; | ||
| const parsed = json5Serializer.parse(contents) as Record<string, unknown>; | ||
| config = mergeConfig(config, parsed); | ||
| } | ||
| return config; | ||
| } | ||
|
|
||
| export function mergeConfig( | ||
| base: Record<string, unknown>, | ||
| override: Record<string, unknown> | ||
| ): Record<string, unknown> { | ||
| const merged = { ...base }; | ||
| for (const [key, value] of Object.entries(override)) { | ||
| const baseObject = asPlainObject(merged[key]); | ||
| const overrideObject = asPlainObject(value); | ||
| merged[key] = baseObject && overrideObject | ||
| ? mergeConfig(baseObject, overrideObject) | ||
| : value; | ||
| } | ||
| return merged; | ||
| } | ||
|
|
||
| export async function collectUserConfigFiles(srcRoot: string, destRoot: string): Promise<LaunchFile[]> { | ||
| const files: LaunchFile[] = []; | ||
| const entries = await readOptionalDirectory(srcRoot); | ||
| if (!entries) return files; | ||
|
|
||
| const configFiles = new Set<string>(OPENCODE_CONFIG_FILES); | ||
| const ancestors = new Set([await fs.realpath(srcRoot)]); | ||
| for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { | ||
| if (configFiles.has(entry.name) || GENERATED_DIRECTORIES.has(entry.name) || isPrivateFile(entry.name)) continue; | ||
| await collectPath( | ||
| path.join(srcRoot, entry.name), | ||
| path.join(destRoot, entry.name), | ||
| files, | ||
| ancestors | ||
| ); | ||
| } | ||
| return files; | ||
| } | ||
|
|
||
| async function collectPath( | ||
| srcPath: string, | ||
| destPath: string, | ||
| files: LaunchFile[], | ||
| ancestorDirectories: Set<string> | ||
| ): Promise<void> { | ||
| const stats = await readOptionalStats(srcPath); | ||
| if (!stats || stats.isSymbolicLink()) return; | ||
| if (stats.isFile()) { | ||
| files.push({ path: destPath, contents: await fs.readFile(srcPath) }); | ||
| return; | ||
| } | ||
| if (!stats.isDirectory()) return; | ||
|
|
||
| const realPath = await fs.realpath(srcPath); | ||
| if (ancestorDirectories.has(realPath)) return; | ||
| const nextAncestors = new Set(ancestorDirectories).add(realPath); | ||
| const entries = await fs.readdir(srcPath, { withFileTypes: true }); | ||
| for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { | ||
| if (GENERATED_DIRECTORIES.has(entry.name) || isPrivateFile(entry.name)) continue; | ||
| await collectPath( | ||
| path.join(srcPath, entry.name), | ||
| path.join(destPath, entry.name), | ||
| files, | ||
| nextAncestors | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| async function readOptionalDirectory(dirPath: string): Promise<Dirent[] | undefined> { | ||
| try { | ||
| return await fs.readdir(dirPath, { withFileTypes: true }); | ||
| } catch (error) { | ||
| if (isMissingPathError(error)) return undefined; | ||
| throw error; | ||
| } | ||
| } | ||
|
|
||
| async function readOptionalFile(filePath: string, encoding: "utf8"): Promise<string | undefined> { | ||
| try { | ||
| return await fs.readFile(filePath, encoding); | ||
| } catch (error) { | ||
| if (isMissingPathError(error)) return undefined; | ||
| throw error; | ||
| } | ||
| } | ||
|
|
||
| async function readOptionalStats(filePath: string): Promise<Stats | undefined> { | ||
| try { | ||
| return await fs.lstat(filePath); | ||
| } catch (error) { | ||
| if (isMissingPathError(error)) return undefined; | ||
| throw error; | ||
| } | ||
| } | ||
|
|
||
| function isMissingPathError(error: unknown): error is NodeJS.ErrnoException { | ||
| return error instanceof Error && "code" in error && | ||
| (error.code === "ENOENT" || error.code === "ENOTDIR"); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.