From 557b6e9267c85a1a5ebe0c4d2d302ad3586b3187 Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 24 Feb 2026 12:33:31 +0000 Subject: [PATCH] fix: resolve merge conflict artifacts from story-86 merge - Add missing closing brace and #[test] attr between test functions in claude_code.rs - Remove premature semicolon in TypeScript union type in client.ts Co-Authored-By: Claude Opus 4.6 --- frontend/src/api/client.ts | 2 +- server/src/llm/providers/claude_code.rs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/api/client.ts b/frontend/src/api/client.ts index daabdfe..7fffe9f 100644 --- a/frontend/src/api/client.ts +++ b/frontend/src/api/client.ts @@ -59,7 +59,7 @@ export type WsResponse = message: string; } /** `.story_kit/project.toml` was modified; re-fetch the agent roster. */ - | { type: "agent_config_changed" }; + | { type: "agent_config_changed" } | { type: "tool_activity"; tool_name: string }; export interface ProviderConfig { diff --git a/server/src/llm/providers/claude_code.rs b/server/src/llm/providers/claude_code.rs index 3ca8bfc..5183d71 100644 --- a/server/src/llm/providers/claude_code.rs +++ b/server/src/llm/providers/claude_code.rs @@ -1091,6 +1091,9 @@ mod tests { #[test] fn claude_code_provider_new() { let _provider = ClaudeCodeProvider::new(); + } + + #[test] fn handle_stream_event_tool_use_start_sends_activity() { let (tx, _rx) = tokio::sync::mpsc::unbounded_channel::(); let (atx, mut arx) = tokio::sync::mpsc::unbounded_channel::();