Skip to content
Merged
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
5 changes: 4 additions & 1 deletion apps/claude-sdk-cli/src/AgentMessageHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ export class AgentMessageHandler {
}
case 'tool_approval_request':
this.#layout.transitionBlock('tools');
this.#layout.appendStreaming(`${formatToolSummary(msg.name, msg.input, this.#cwd, this.#store)}\n`);
if (!this.#usageBeforeTools) {
this.#usageBeforeTools = this.#lastUsage;
}
Expand Down Expand Up @@ -213,10 +212,14 @@ export class AgentMessageHandler {
}
this.#respond(msg.requestId, approved);
this.#layout.removePendingTool(msg.requestId);
const summary = formatToolSummary(msg.name, msg.input, this.#cwd, this.#store);
this.#layout.appendStreaming(`${summary} ${approved ? '✅' : '❌'}\n`);
} catch (err) {
this.#logger.error('Error', err);
this.#respond(msg.requestId, false);
this.#layout.removePendingTool(msg.requestId);
const catchSummary = formatToolSummary(msg.name, msg.input, this.#cwd, this.#store);
this.#layout.appendStreaming(`${catchSummary} 💥\n`);
}
}
}
62 changes: 62 additions & 0 deletions apps/claude-sdk-cli/test/AgentMessageHandler.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import type { AnyToolDefinition } from '@shellicar/claude-sdk';
import { describe, expect, it, vi } from 'vitest';
import { z } from 'zod';
import { AgentMessageHandler, type AgentMessageHandlerOptions } from '../src/AgentMessageHandler.js';
import type { AppLayout } from '../src/AppLayout.js';
import { logger } from '../src/logger.js';
Expand Down Expand Up @@ -235,6 +237,66 @@ describe('AgentMessageHandler — tool_error', () => {
});
});

// ---------------------------------------------------------------------------
// tool_approval_request
// ---------------------------------------------------------------------------

function makeTool(name: string, operation: AnyToolDefinition['operation']): AnyToolDefinition {
return {
name,
description: 'test',
operation,
input_schema: z.object({}),
input_examples: [],
handler: async () => ({}),
} as unknown as AnyToolDefinition;
}

describe('AgentMessageHandler — tool_approval_request', () => {
it('transitions to tools block', () => {
const layout = makeLayout();
makeHandler(layout).handle({ type: 'tool_approval_request', requestId: 'r1', name: 'Unknown', input: {} });
const expected = 'tools';
const actual = vi.mocked(layout.transitionBlock).mock.calls[0]?.[0];
expect(actual).toBe(expected);
});

it('records auto-denied decision synchronously when tool is not registered', () => {
const layout = makeLayout();
// empty tools → getPermission returns Deny for any unknown tool
makeHandler(layout).handle({ type: 'tool_approval_request', requestId: 'r1', name: 'Unknown', input: {} });
const text = vi.mocked(layout.appendStreaming).mock.calls[0]?.[0] ?? '';
expect(text).toContain('❌');
});

it('records auto-approved decision synchronously for a read tool', () => {
const layout = makeLayout();
const handler = makeHandler(layout, { tools: [makeTool('Find', 'read')] });
handler.handle({ type: 'tool_approval_request', requestId: 'r1', name: 'Find', input: {} });
const text = vi.mocked(layout.appendStreaming).mock.calls[0]?.[0] ?? '';
expect(text).toContain('✅');
});

it('records manual approval after user input for a delete tool', async () => {
const layout = makeLayout(); // requestApproval resolves true by default
const handler = makeHandler(layout, { tools: [makeTool('DeleteFile', 'delete')] });
handler.handle({ type: 'tool_approval_request', requestId: 'r1', name: 'DeleteFile', input: {} });
await Promise.resolve();
const text = vi.mocked(layout.appendStreaming).mock.calls[0]?.[0] ?? '';
expect(text).toContain('✅');
});

it('records manual denial after user input for a delete tool', async () => {
const layout = makeLayout();
vi.mocked(layout.requestApproval).mockResolvedValue(false);
const handler = makeHandler(layout, { tools: [makeTool('DeleteFile', 'delete')] });
handler.handle({ type: 'tool_approval_request', requestId: 'r1', name: 'DeleteFile', input: {} });
await Promise.resolve();
const text = vi.mocked(layout.appendStreaming).mock.calls[0]?.[0] ?? '';
expect(text).toContain('❌');
});
});

// ---------------------------------------------------------------------------
// message_usage
// ---------------------------------------------------------------------------
Expand Down
Loading