Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/opencode/src/config/variable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ function dir(input: ParseSource) {
export async function substitute(input: SubstituteInput) {
const missing = input.missing ?? "error"
let text = input.text.replace(/\{env:([^}]+)\}/g, (_, varName) => {
return (input.env?.[varName] ?? process.env[varName]) || ""
const value = (input.env?.[varName] ?? process.env[varName]) || ""
return JSON.stringify(value).slice(1, -1)
})

const fileMatches = Array.from(text.matchAll(/\{file:[^}]+\}/g))
Expand Down
22 changes: 22 additions & 0 deletions packages/opencode/test/config/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,28 @@ it.instance("handles environment variable substitution", () =>
),
)

it.instance("escapes environment variable substitution inside JSON keys", () =>
withProcessEnv(
"TEST_WIN_PATH",
"C:\\Users\\me\\AppData\\Roaming\\MyApp\\config",
Effect.gen(function* () {
const test = yield* TestInstance
yield* writeConfigEffect(test.directory, {
$schema: "https://opencode.ai/config.json",
permission: {
external_directory: {
"{env:TEST_WIN_PATH}/**": "allow",
},
},
})
const config = yield* Config.use.get()
expect(config.permission?.external_directory).toEqual({
"C:\\Users\\me\\AppData\\Roaming\\MyApp\\config/**": "allow",
})
}),
),
)

it.instance("preserves env variables when adding $schema to config", () =>
withProcessEnv(
"PRESERVE_VAR",
Expand Down
Loading