lmin/zmo-cli
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Normalize instance lifecycle wiring (#25501)

Browse Source
This commit is contained in:
Kit Langton
2026-05-02 20:39:20 -04:00
committed by GitHub
parent a6464062b7
commit 7d91d3b1ed
71 changed files with 852 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
packages/opencode/test/config/config.test.ts
View File

@@ -7,6 +7,7 @@ import { ConfigParse } from "../../src/config/parse"
import { EffectFlock } from "@opencode-ai/core/util/effect-flock"
import { Instance } from "../../src/project/instance"
import { WithInstance } from "../../src/project/with-instance"
import { Auth } from "../../src/auth"
import { Account } from "../../src/account/account"
import { AccessToken, AccountID, OrgID } from "../../src/account/schema"
@@ -113,7 +114,7 @@ async function check(map: (dir: string) => string) {
$schema: "https://opencode.ai/config.json",
snapshot: false,
})
await Instance.provide({
await WithInstance.provide({
directory: map(tmp.path),
fn: async () => {
const cfg = await load()
@@ -131,7 +132,7 @@ async function check(map: (dir: string) => string) {
test("loads config with defaults when no files exist", async () => {
await using tmp = await tmpdir()
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -150,7 +151,7 @@ test("loads JSON config file", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -169,7 +170,7 @@ test("loads shell config field", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -191,7 +192,7 @@ test("updates config and preserves empty shell sentinel", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
await save({ shell: "" })
@@ -269,7 +270,7 @@ test("loads formatter boolean config", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -287,7 +288,7 @@ test("loads lsp boolean config", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -324,7 +325,7 @@ test("ignores legacy tui keys in opencode config", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -349,7 +350,7 @@ test("loads JSONC config file", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -377,7 +378,7 @@ test("jsonc overrides json in the same directory", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -400,7 +401,7 @@ test("handles environment variable substitution", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -432,7 +433,7 @@ test("preserves env variables when adding $schema to config", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -529,7 +530,7 @@ test("handles file inclusion substitution", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -548,7 +549,7 @@ test("handles file inclusion with replacement tokens", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -604,7 +605,7 @@ test("handles agent configuration", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -635,7 +636,7 @@ test("treats agent variant as model-scoped setting (not provider option)", async
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -665,7 +666,7 @@ test("handles command configuration", async () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -690,7 +691,7 @@ test("migrates autoshare to share field", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -717,7 +718,7 @@ test("migrates mode field to agent field", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -749,7 +750,7 @@ Test agent prompt`,
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -782,7 +783,7 @@ Ordered permissions`,
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -820,7 +821,7 @@ Nested agent prompt`,
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -869,7 +870,7 @@ Nested command template`,
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -914,7 +915,7 @@ Nested command template`,
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -934,7 +935,7 @@ Nested command template`,
test("updates config and writes to file", async () => {
await using tmp = await tmpdir()
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const newConfig = { model: "updated/model" }
@@ -948,7 +949,7 @@ test("updates config and writes to file", async () => {
test("gets config directories", async () => {
await using tmp = await tmpdir()
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const dirs = await listDirs()
@@ -978,7 +979,7 @@ test("does not try to install dependencies in read-only OPENCODE_CONFIG_DIR", as
process.env.OPENCODE_CONFIG_DIR = tmp.extra
try {
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
await load()
@@ -1013,7 +1014,7 @@ test("installs dependencies in writable OPENCODE_CONFIG_DIR", async () => {
)
try {
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
await Effect.runPromise(Config.Service.use((svc) => svc.get()).pipe(Effect.scoped, Effect.provide(testLayer)))
@@ -1146,7 +1147,7 @@ Helper subagent prompt`,
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1185,7 +1186,7 @@ test("merges instructions arrays from global and local configs", async () => {
},
})
await Instance.provide({
await WithInstance.provide({
directory: path.join(tmp.path, "project"),
fn: async () => {
const config = await load()
@@ -1224,7 +1225,7 @@ test("deduplicates duplicate instructions from global and local configs", async
},
})
await Instance.provide({
await WithInstance.provide({
directory: path.join(tmp.path, "project"),
fn: async () => {
const config = await load()
@@ -1359,7 +1360,7 @@ test("migrates legacy tools config to permissions - allow", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1390,7 +1391,7 @@ test("migrates legacy tools config to permissions - deny", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1420,7 +1421,7 @@ test("migrates legacy write tool to edit permission", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1452,7 +1453,7 @@ test("managed settings override user settings", async () => {
share: "disabled",
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1480,7 +1481,7 @@ test("managed settings override project settings", async () => {
disabled_providers: ["openai"],
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1500,7 +1501,7 @@ test("missing managed settings file is not an error", async () => {
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1527,7 +1528,7 @@ test("migrates legacy edit tool to edit permission", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1556,7 +1557,7 @@ test("migrates legacy patch tool to edit permission", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1588,7 +1589,7 @@ test("migrates mixed legacy tools config", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1623,7 +1624,7 @@ test("merges legacy tools with existing permission config", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1660,7 +1661,7 @@ test("permission config preserves user key order", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1743,7 +1744,7 @@ test("project config can override MCP server enabled status", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1799,7 +1800,7 @@ test("MCP config deep merges preserving base config properties", async () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -1850,7 +1851,7 @@ test("local .opencode config can override MCP from project config", async () =>
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -2139,7 +2140,7 @@ describe("OPENCODE_DISABLE_PROJECT_CONFIG", () => {
)
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -2170,7 +2171,7 @@ describe("OPENCODE_DISABLE_PROJECT_CONFIG", () => {
await Filesystem.write(path.join(opencodeDir, "test-cmd.md"), "# Test Command\nThis is a test command.")
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const directories = await listDirs()
@@ -2194,7 +2195,7 @@ describe("OPENCODE_DISABLE_PROJECT_CONFIG", () => {
try {
await using tmp = await tmpdir()
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
// Should still get default config (from global or defaults)
@@ -2236,7 +2237,7 @@ describe("OPENCODE_DISABLE_PROJECT_CONFIG", () => {
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
// The relative instruction should be skipped without error
@@ -2296,7 +2297,7 @@ describe("OPENCODE_DISABLE_PROJECT_CONFIG", () => {
process.env["OPENCODE_DISABLE_PROJECT_CONFIG"] = "true"
process.env["OPENCODE_CONFIG_DIR"] = configDirTmp.path
await Instance.provide({
await WithInstance.provide({
directory: projectTmp.path,
fn: async () => {
const config = await load()
@@ -2331,7 +2332,7 @@ describe("OPENCODE_CONFIG_CONTENT token substitution", () => {
try {
await using tmp = await tmpdir()
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()
@@ -2365,7 +2366,7 @@ describe("OPENCODE_CONFIG_CONTENT token substitution", () => {
})
},
})
await Instance.provide({
await WithInstance.provide({
directory: tmp.path,
fn: async () => {
const config = await load()