Skip to content

Commit b9b3c3a

Browse files
committed
fix(cli): surface blocker lookup failures
1 parent 9810d98 commit b9b3c3a

2 files changed

Lines changed: 35 additions & 13 deletions

File tree

‎packages/cli/src/run/noninteractive.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -694,15 +694,13 @@ export async function runNonInteractivePrompt(input: Input) {
694694
if (interrupted) await input.client.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
695695

696696
const [permissions, forms, globals] = await Promise.all([
697-
input.client.permission.list({ sessionID: input.sessionID }).catch(() => undefined),
698-
input.client.session.form.list({ sessionID: input.sessionID }).catch(() => undefined),
697+
input.client.permission.list({ sessionID: input.sessionID }),
698+
input.client.session.form.list({ sessionID: input.sessionID }),
699699
input.attached
700700
? Promise.resolve(undefined)
701-
: input.client.form
702-
.list({
703-
location: { directory: input.location.directory },
704-
})
705-
.catch(() => undefined),
701+
: input.client.form.list({
702+
location: { directory: input.location.directory },
703+
}),
706704
])
707705
await Promise.all([
708706
...(permissions ?? []).map(replyPermission),

‎packages/cli/test/run/noninteractive.test.ts‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ function successfulGrep(inboxID: string): V2Event[] {
209209
async function run(input: {
210210
turn: (inboxID: string) => V2Event[]
211211
pendingForms?: FormInfo[]
212+
listError?: "permission" | "session-form" | "global-form"
212213
attached?: boolean
213214
format?: "default" | "json"
214215
compatibility?: "v1"
@@ -240,16 +241,23 @@ async function run(input: {
240241
}
241242
})()
242243
spyOn(sdk.event, "subscribe").mockImplementation(() => stream)
243-
spyOn(sdk.permission, "list").mockImplementation(() => ok([]) as never)
244+
spyOn(sdk.permission, "list").mockImplementation(
245+
() => (input.listError === "permission" ? Promise.reject(new Error("permission list failed")) : ok([])) as never,
246+
)
244247
spyOn(sdk.session.form, "list").mockImplementation(
245-
(request) => ok(input.pendingForms?.filter((item) => item.sessionID === request.sessionID) ?? []) as never,
248+
(request) =>
249+
(input.listError === "session-form"
250+
? Promise.reject(new Error("session form list failed"))
251+
: ok(input.pendingForms?.filter((item) => item.sessionID === request.sessionID) ?? [])) as never,
246252
)
247253
spyOn(sdk.form, "list").mockImplementation(
248254
() =>
249-
ok({
250-
location: { ...location, project: { id: "proj_1", directory: location.directory } },
251-
data: input.pendingForms?.filter((item) => item.sessionID === "global") ?? [],
252-
}) as never,
255+
(input.listError === "global-form"
256+
? Promise.reject(new Error("global form list failed"))
257+
: ok({
258+
location: { ...location, project: { id: "proj_1", directory: location.directory } },
259+
data: input.pendingForms?.filter((item) => item.sessionID === "global") ?? [],
260+
})) as never,
253261
)
254262
spyOn(sdk.session.form, "cancel").mockImplementation((request) => (input.cancel?.(request) ?? ok(undefined)) as never)
255263
let promptID = "msg_prompt"
@@ -450,6 +458,22 @@ describe("runNonInteractivePrompt", () => {
450458
)
451459
})
452460

461+
for (const { source, message } of [
462+
{ source: "permission", message: "permission list failed" },
463+
{ source: "session-form", message: "session form list failed" },
464+
{ source: "global-form", message: "global form list failed" },
465+
] as const) {
466+
test(`fails when ${source} lookup fails after prompt admission`, async () => {
467+
await expect(
468+
run({
469+
listError: source,
470+
turn: (messageID) => [prompted(messageID), settled()],
471+
wait: () => Promise.resolve(),
472+
}),
473+
).rejects.toThrow(message)
474+
})
475+
}
476+
453477
test("V1 JSON output flushes step_start before an unrelated step failure", async () => {
454478
const output = await capture({
455479
compatibility: "v1",

0 commit comments

Comments
 (0)