Skip to content
Open
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
6 changes: 5 additions & 1 deletion packages/core/src/permission.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@ const layer = Layer.effect(
action: input.action,
resources: input.resources,
save: input.save,
metadata: input.metadata,
// Tools copy optional inputs straight into metadata; undefined values are not JSON and would
// fail the HttpApi response encoder when clients list pending requests.
metadata:
input.metadata &&
Object.fromEntries(Object.entries(input.metadata).filter(([, value]) => value !== undefined)),
source: input.source,
message,
}
Expand Down
29 changes: 28 additions & 1 deletion packages/core/test/permission.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect } from "bun:test"
import { Cause, Deferred, Effect, Fiber, Layer } from "effect"
import { Cause, Deferred, Effect, Fiber, Layer, Schema } from "effect"
import { Agent } from "@opencode-ai/core/agent"
import { Database } from "@opencode-ai/core/database/database"
import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
Expand Down Expand Up @@ -260,6 +260,33 @@ describe("Permission", () => {
}),
)

it.effect("drops undefined metadata values so pending requests encode as JSON", () =>
Effect.gen(function* () {
yield* setup()
// Tools copy optional model inputs straight into metadata, so omitted inputs arrive as undefined values.
const { service, request } = yield* waitForRequest({
action: "glob",
resources: ["/project"],
metadata: { root: "/project", path: undefined, hidden: undefined, limit: undefined },
})
expect(request.metadata).toStrictEqual({ root: "/project" })
expect(yield* service.forSession(request.sessionID)).toEqual([request])
// HttpApi encodes JSON success bodies through Schema.toCodecJson, which rejects undefined values in Unknown.
const encode = Schema.encodeEffect(Schema.toCodecJson(Schema.Struct({ data: Schema.Array(Permission.Request) })))
expect(yield* encode({ data: yield* service.forSession(request.sessionID) })).toEqual({
data: [
{
id: request.id,
sessionID: request.sessionID,
action: "glob",
resources: ["/project"],
metadata: { root: "/project" },
},
],
})
}),
)

it.effect("defects when an asked permission is declined", () =>
Effect.gen(function* () {
yield* setup()
Expand Down
Loading