diff --git a/packages/core/src/credential.ts b/packages/core/src/credential.ts index 926337d7016..7ccd1bcbafc 100644 --- a/packages/core/src/credential.ts +++ b/packages/core/src/credential.ts @@ -51,7 +51,7 @@ export class Service extends Context.Service()("@opencode/Cr const layer = Layer.effect( Service, Effect.gen(function* () { - const { db } = yield* Database.Service + const db = (yield* Database.Service).db const decode = Schema.decodeUnknownSync(Value) const stored = (row: typeof CredentialTable.$inferSelect) => { if (!row.integration_id) return diff --git a/packages/core/src/database/v1-migration.bun.ts b/packages/core/src/database/v1-migration.bun.ts index a347cb12b1a..080dce8fa44 100644 --- a/packages/core/src/database/v1-migration.bun.ts +++ b/packages/core/src/database/v1-migration.bun.ts @@ -481,7 +481,7 @@ export function transformSession(input: TransformInput): TransformResult { export function status(): Effect.Effect { return Effect.gen(function* () { - const { db } = yield* Database.Service + const db = (yield* Database.Service).db if (!(yield* hasLegacySessions(db))) return { status: "completed" as const } const state = yield* readState(db) if (runtimeState.status === "running") return runtimeState @@ -523,7 +523,7 @@ function updateProgress(progress: Progress) { export function run(options: Options = {}): Effect.Effect { return lock.withPermit( Effect.gen(function* () { - const { db } = yield* Database.Service + const db = (yield* Database.Service).db const global = yield* Global.Service const state = yield* readState(db) if (state?.phase === "completed") return { status: "completed" as const } diff --git a/packages/core/src/effect/websocket-constructor.ts b/packages/core/src/effect/websocket-constructor.ts index 6ffc7af74bc..d72992c0f17 100644 --- a/packages/core/src/effect/websocket-constructor.ts +++ b/packages/core/src/effect/websocket-constructor.ts @@ -23,13 +23,13 @@ const environmentValue = (environment: Environment, name: string) => const bypassesProxy = (url: URL, value: string | undefined) => { if (!value) return false const port = url.port || (url.protocol === "wss:" ? "443" : "80") + const hostname = url.hostname.toLowerCase() return value.split(/[\s,]+/).some((entry) => { if (!entry) return false if (entry === "*") return true const match = entry.match(/^(.+?):(\d+)$/) if (match?.[2] && match[2] !== port) return false const host = (match?.[1] ?? entry).toLowerCase().replace(/^\*/, "") - const hostname = url.hostname.toLowerCase() return host.startsWith(".") ? hostname.endsWith(host) : hostname === host }) } diff --git a/packages/core/src/kv.ts b/packages/core/src/kv.ts index a8e01c2c6e7..d4cf15896af 100644 --- a/packages/core/src/kv.ts +++ b/packages/core/src/kv.ts @@ -36,7 +36,7 @@ export class Service extends Context.Service()("@opencode/KV const layer = Layer.effect( Service, Effect.gen(function* () { - const { db } = yield* Database.Service + const db = (yield* Database.Service).db return Service.of({ get: Effect.fn("KV.get")(function* (key) { return (yield* db diff --git a/packages/core/src/permission.ts b/packages/core/src/permission.ts index e5eff8b31b5..36140bf4fb0 100644 --- a/packages/core/src/permission.ts +++ b/packages/core/src/permission.ts @@ -177,7 +177,7 @@ const layer = Layer.effect( return false }) - function denied(input: AssertInput, rules: Permission.Ruleset) { + function denied(input: Pick, rules: Permission.Ruleset) { return input.resources.some((resource) => evaluate(input.action, resource, rules).effect === "deny") } @@ -301,12 +301,11 @@ const layer = Layer.effect( const rememberedRules = yield* savedRules() for (const [id, item] of pending) { - const input = { ...item.request } const rules = yield* configured(item.request.sessionID, item.agent).pipe( Effect.catchTag("Session.NotFoundError", () => Effect.succeed(undefined)), ) if (!rules) continue - if (denied(input, rules)) continue + if (denied(item.request, rules)) continue const effective = [...rules, ...rememberedRules] if ( !item.request.resources.every( diff --git a/packages/core/src/permission/saved.ts b/packages/core/src/permission/saved.ts index 576f59154fb..279d65c6649 100644 --- a/packages/core/src/permission/saved.ts +++ b/packages/core/src/permission/saved.ts @@ -37,7 +37,7 @@ export class Service extends Context.Service()("@opencode/Pe const layer = Layer.effect( Service, Effect.gen(function* () { - const { db } = yield* Database.Service + const db = (yield* Database.Service).db const list = Effect.fnUntraced(function* (input?: ListInput) { const rows = yield* db diff --git a/packages/core/src/project.ts b/packages/core/src/project.ts index 8a9ecd4737e..df7fa870fba 100644 --- a/packages/core/src/project.ts +++ b/packages/core/src/project.ts @@ -185,7 +185,7 @@ const layer = Layer.effect( return `${host.toLowerCase()}/${pathname}` } - const root = Effect.fnUntraced(function* (repo: Git.Repository) { + const rootCommit = Effect.fnUntraced(function* (repo: Git.Repository) { const root = (yield* git.history.rootCommits(repo))[0] return root ? ID.make(root) : undefined }) @@ -235,7 +235,7 @@ const layer = Layer.effect( const repo = yield* git.repo.discover(input) if (repo) { const previous = yield* cached(repo.commonDirectory) - const id = (yield* remote(repo)) ?? previous ?? (yield* root(repo)) + const id = (yield* remote(repo)) ?? previous ?? (yield* rootCommit(repo)) const canonical = repo.gitDirectory === repo.commonDirectory ? repo.worktree