dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

fix: resolve merge conflict artifacts from story-86 merge

Browse Source 
- 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 <noreply@anthropic.com>
This commit is contained in:
Dave
2026-02-24 12:33:31 +00:00
parent 041b52530e
commit 557b6e9267
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/api/client.ts
View File

@@ -59,7 +59,7 @@ export type WsResponse =
message: string; message: string;
} }
/** `.story_kit/project.toml` was modified; re-fetch the agent roster. */ /** `.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 }; | { type: "tool_activity"; tool_name: string };
export interface ProviderConfig { export interface ProviderConfig {

3
server/src/llm/providers/claude_code.rs
View File

@@ -1091,6 +1091,9 @@ mod tests {
#[test] #[test]
fn claude_code_provider_new() { fn claude_code_provider_new() {
let _provider = ClaudeCodeProvider::new(); let _provider = ClaudeCodeProvider::new();
}
#[test]
fn handle_stream_event_tool_use_start_sends_activity() { fn handle_stream_event_tool_use_start_sends_activity() {
let (tx, _rx) = tokio::sync::mpsc::unbounded_channel::<String>(); let (tx, _rx) = tokio::sync::mpsc::unbounded_channel::<String>();
let (atx, mut arx) = tokio::sync::mpsc::unbounded_channel::<String>(); let (atx, mut arx) = tokio::sync::mpsc::unbounded_channel::<String>();