mirror of
https://github.com/harivansh-afk/sandbox-agent.git
synced 2026-04-16 21:03:46 +00:00
feat: add interactive permission prompt UI to Inspector
Add permission request handling to the Inspector UI so users can Allow, Always Allow, or Reject tool calls that require permissions instead of having them auto-cancelled. Wires up SDK onPermissionRequest/respondPermission through App → ChatPanel → ChatMessages with proper toolCallId-to-pendingId mapping. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Nathan Flurry
parent
1720b6d0ba
commit
e8ffd78ac0
27 changed files with 812 additions and 563 deletions
|
|
@ -129,7 +129,6 @@ export interface SessionCreateRequest {
|
|||
sessionInit?: Omit<NewSessionRequest, "_meta">;
|
||||
model?: string;
|
||||
mode?: string;
|
||||
permissionMode?: string;
|
||||
thoughtLevel?: string;
|
||||
}
|
||||
|
||||
|
|
@ -139,7 +138,6 @@ export interface SessionResumeOrCreateRequest {
|
|||
sessionInit?: Omit<NewSessionRequest, "_meta">;
|
||||
model?: string;
|
||||
mode?: string;
|
||||
permissionMode?: string;
|
||||
thoughtLevel?: string;
|
||||
}
|
||||
|
||||
|
|
@ -321,14 +319,14 @@ export class Session {
|
|||
return this;
|
||||
}
|
||||
|
||||
async send(method: string, params: Record<string, unknown> = {}, options: SessionSendOptions = {}): Promise<unknown> {
|
||||
const updated = await this.sandbox.sendSessionMethod(this.id, method, params, options);
|
||||
async rawSend(method: string, params: Record<string, unknown> = {}, options: SessionSendOptions = {}): Promise<unknown> {
|
||||
const updated = await this.sandbox.rawSendSessionMethod(this.id, method, params, options);
|
||||
this.apply(updated.session.toRecord());
|
||||
return updated.response;
|
||||
}
|
||||
|
||||
async prompt(prompt: PromptRequest["prompt"]): Promise<PromptResponse> {
|
||||
const response = await this.send("session/prompt", { prompt });
|
||||
const response = await this.rawSend("session/prompt", { prompt });
|
||||
return response as PromptResponse;
|
||||
}
|
||||
|
||||
|
|
@ -338,14 +336,6 @@ export class Session {
|
|||
return updated.response;
|
||||
}
|
||||
|
||||
async setPermissionMode(
|
||||
permissionMode: string,
|
||||
): Promise<SetSessionModeResponse | SetSessionConfigOptionResponse | void> {
|
||||
const updated = await this.sandbox.setSessionPermissionMode(this.id, permissionMode);
|
||||
this.apply(updated.session.toRecord());
|
||||
return updated.response;
|
||||
}
|
||||
|
||||
async setConfigOption(configId: string, value: string): Promise<SetSessionConfigOptionResponse> {
|
||||
const updated = await this.sandbox.setSessionConfigOption(this.id, configId, value);
|
||||
this.apply(updated.session.toRecord());
|
||||
|
|
@ -380,12 +370,12 @@ export class Session {
|
|||
return this.sandbox.onPermissionRequest(this.id, listener);
|
||||
}
|
||||
|
||||
async replyPermission(permissionId: string, reply: PermissionReply): Promise<void> {
|
||||
await this.sandbox.replyPermission(permissionId, reply);
|
||||
async respondPermission(permissionId: string, reply: PermissionReply): Promise<void> {
|
||||
await this.sandbox.respondPermission(permissionId, reply);
|
||||
}
|
||||
|
||||
async respondToPermission(permissionId: string, response: RequestPermissionResponse): Promise<void> {
|
||||
await this.sandbox.respondToPermission(permissionId, response);
|
||||
async rawRespondPermission(permissionId: string, response: RequestPermissionResponse): Promise<void> {
|
||||
await this.sandbox.rawRespondPermission(permissionId, response);
|
||||
}
|
||||
|
||||
toRecord(): SessionRecord {
|
||||
|
|
@ -1026,15 +1016,11 @@ export class SandboxAgent {
|
|||
this.nextSessionEventIndexBySession.set(record.id, 1);
|
||||
live.bindSession(record.id, record.agentSessionId);
|
||||
let session = this.upsertSessionHandle(record);
|
||||
assertNoConflictingPermissionMode(request.mode, request.permissionMode);
|
||||
|
||||
try {
|
||||
if (request.mode) {
|
||||
session = (await this.setSessionMode(session.id, request.mode)).session;
|
||||
}
|
||||
if (request.permissionMode) {
|
||||
session = (await this.setSessionPermissionMode(session.id, request.permissionMode)).session;
|
||||
}
|
||||
if (request.model) {
|
||||
session = (await this.setSessionModel(session.id, request.model)).session;
|
||||
}
|
||||
|
|
@ -1089,13 +1075,9 @@ export class SandboxAgent {
|
|||
const existing = await this.persist.getSession(request.id);
|
||||
if (existing) {
|
||||
let session = await this.resumeSession(existing.id);
|
||||
assertNoConflictingPermissionMode(request.mode, request.permissionMode);
|
||||
if (request.mode) {
|
||||
session = (await this.setSessionMode(session.id, request.mode)).session;
|
||||
}
|
||||
if (request.permissionMode) {
|
||||
session = (await this.setSessionPermissionMode(session.id, request.permissionMode)).session;
|
||||
}
|
||||
if (request.model) {
|
||||
session = (await this.setSessionModel(session.id, request.model)).session;
|
||||
}
|
||||
|
|
@ -1211,24 +1193,6 @@ export class SandboxAgent {
|
|||
return this.setSessionCategoryValue(sessionId, "model", model);
|
||||
}
|
||||
|
||||
async setSessionPermissionMode(
|
||||
sessionId: string,
|
||||
permissionMode: string,
|
||||
): Promise<{ session: Session; response: SetSessionModeResponse | SetSessionConfigOptionResponse | void }> {
|
||||
const resolvedValue = permissionMode.trim();
|
||||
if (!resolvedValue) {
|
||||
throw new Error("setSessionPermissionMode requires a non-empty permissionMode");
|
||||
}
|
||||
|
||||
const options = await this.getSessionConfigOptions(sessionId);
|
||||
const permissionOption = findConfigOptionByCategory(options, "permission_mode");
|
||||
if (permissionOption) {
|
||||
return this.setSessionConfigOption(sessionId, permissionOption.id, resolvedValue);
|
||||
}
|
||||
|
||||
return this.setSessionMode(sessionId, resolvedValue);
|
||||
}
|
||||
|
||||
async setSessionThoughtLevel(
|
||||
sessionId: string,
|
||||
thoughtLevel: string,
|
||||
|
|
@ -1318,7 +1282,7 @@ export class SandboxAgent {
|
|||
return updated;
|
||||
}
|
||||
|
||||
async sendSessionMethod(
|
||||
async rawSendSessionMethod(
|
||||
sessionId: string,
|
||||
method: string,
|
||||
params: Record<string, unknown>,
|
||||
|
|
@ -1470,7 +1434,7 @@ export class SandboxAgent {
|
|||
};
|
||||
}
|
||||
|
||||
async replyPermission(permissionId: string, reply: PermissionReply): Promise<void> {
|
||||
async respondPermission(permissionId: string, reply: PermissionReply): Promise<void> {
|
||||
const pending = this.pendingPermissionRequests.get(permissionId);
|
||||
if (!pending) {
|
||||
throw new Error(`permission '${permissionId}' not found`);
|
||||
|
|
@ -1480,7 +1444,7 @@ export class SandboxAgent {
|
|||
this.resolvePendingPermission(permissionId, response);
|
||||
}
|
||||
|
||||
async respondToPermission(permissionId: string, response: RequestPermissionResponse): Promise<void> {
|
||||
async rawRespondPermission(permissionId: string, response: RequestPermissionResponse): Promise<void> {
|
||||
if (!this.pendingPermissionRequests.has(permissionId)) {
|
||||
throw new Error(`permission '${permissionId}' not found`);
|
||||
}
|
||||
|
|
@ -2719,16 +2683,6 @@ function cloneModes(value: SessionModeState | null | undefined): SessionModeStat
|
|||
return JSON.parse(JSON.stringify(value)) as SessionModeState;
|
||||
}
|
||||
|
||||
function assertNoConflictingPermissionMode(mode: string | undefined, permissionMode: string | undefined): void {
|
||||
if (!mode || !permissionMode) {
|
||||
return;
|
||||
}
|
||||
if (mode.trim() === permissionMode.trim()) {
|
||||
return;
|
||||
}
|
||||
throw new Error("createSession/resumeOrCreate received conflicting values for mode and permissionMode");
|
||||
}
|
||||
|
||||
function availablePermissionReplies(options: PermissionOption[]): PermissionReply[] {
|
||||
const replies = new Set<PermissionReply>();
|
||||
for (const option of options) {
|
||||
|
|
|
|||
|
|
@ -515,7 +515,7 @@ describe("Integration: TypeScript SDK flat session API", () => {
|
|||
await expect(session.send("session/cancel")).rejects.toThrow(
|
||||
"Use destroySession(sessionId) instead.",
|
||||
);
|
||||
await expect(sdk.sendSessionMethod(session.id, "session/cancel", {})).rejects.toThrow(
|
||||
await expect(sdk.rawSendSessionMethod(session.id, "session/cancel", {})).rejects.toThrow(
|
||||
"Use destroySession(sessionId) instead.",
|
||||
);
|
||||
|
||||
|
|
@ -578,42 +578,6 @@ describe("Integration: TypeScript SDK flat session API", () => {
|
|||
await sdk.dispose();
|
||||
});
|
||||
|
||||
it("supports permissionMode as a first-class session helper", async () => {
|
||||
const sdk = await SandboxAgent.connect({
|
||||
baseUrl,
|
||||
token,
|
||||
});
|
||||
|
||||
const session = await sdk.createSession({
|
||||
agent: "mock",
|
||||
permissionMode: "plan",
|
||||
});
|
||||
|
||||
expect((await session.getModes())?.currentModeId).toBe("plan");
|
||||
|
||||
await session.setPermissionMode("normal");
|
||||
expect((await session.getModes())?.currentModeId).toBe("normal");
|
||||
|
||||
await sdk.dispose();
|
||||
});
|
||||
|
||||
it("rejects conflicting mode and permissionMode values", async () => {
|
||||
const sdk = await SandboxAgent.connect({
|
||||
baseUrl,
|
||||
token,
|
||||
});
|
||||
|
||||
await expect(
|
||||
sdk.createSession({
|
||||
agent: "mock",
|
||||
mode: "normal",
|
||||
permissionMode: "plan",
|
||||
}),
|
||||
).rejects.toThrow("conflicting values");
|
||||
|
||||
await sdk.dispose();
|
||||
});
|
||||
|
||||
it("setThoughtLevel happy path switches to a valid thought level", async () => {
|
||||
const sdk = await SandboxAgent.connect({
|
||||
baseUrl,
|
||||
|
|
@ -674,7 +638,7 @@ describe("Integration: TypeScript SDK flat session API", () => {
|
|||
const offPermissions = session.onPermissionRequest((request) => {
|
||||
permissionIds.push(request.id);
|
||||
const reply = permissionIds.length === 1 ? "reject" : "always";
|
||||
void session.replyPermission(request.id, reply);
|
||||
void session.respondPermission(request.id, reply);
|
||||
});
|
||||
|
||||
const offEvents = session.onEvent((event) => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue