feat(electrobun): agent execution layer — sidecar manager + message adapters + store
- SidecarManager: spawns claude/codex/ollama runners via Bun.spawn(), NDJSON stdio protocol, Claude CLI auto-detection, env stripping, AbortController stop, Deno/Node runtime detection - MessageAdapter: parses Claude stream-json, Codex ThreadEvent, Ollama chunks into common AgentMessage format - agent-store.svelte.ts: per-project reactive session state, RPC event listeners for agent.message/status/cost - AgentPane: wired to real sessions (start/stop/prompt), stop button, thinking/system message rendering - ProjectCard: status dot from real agent status, cost/tokens from store - 5 new RPC types (agent.start/stop/prompt/list + events)
This commit is contained in:
Hibryda
parent
95f1f8208f
commit
ef0183de7f
8 changed files with 1566 additions and 61 deletions
345
ui-electrobun/src/mainview/agent-store.svelte.ts
Normal file
345
ui-electrobun/src/mainview/agent-store.svelte.ts
Normal file
|
|
@ -0,0 +1,345 @@
|
|||
/**
|
||||
* Agent session store — manages per-project agent state and RPC communication.
|
||||
*
|
||||
* Listens for agent.message, agent.status, agent.cost events from Bun process.
|
||||
* Exposes reactive Svelte 5 rune state per project.
|
||||
*/
|
||||
|
||||
import { electrobun, appRpc } from './main.ts';
|
||||
|
||||
// ── Types ────────────────────────────────────────────────────────────────────
|
||||
|
||||
export type AgentStatus = 'idle' | 'running' | 'done' | 'error';
|
||||
export type MsgRole = 'user' | 'assistant' | 'tool-call' | 'tool-result' | 'thinking' | 'system';
|
||||
|
||||
export interface AgentMessage {
|
||||
id: string;
|
||||
role: MsgRole;
|
||||
content: string;
|
||||
toolName?: string;
|
||||
toolInput?: string;
|
||||
toolPath?: string;
|
||||
timestamp: number;
|
||||
}
|
||||
|
||||
export interface AgentSession {
|
||||
sessionId: string;
|
||||
projectId: string;
|
||||
provider: string;
|
||||
status: AgentStatus;
|
||||
messages: AgentMessage[];
|
||||
costUsd: number;
|
||||
inputTokens: number;
|
||||
outputTokens: number;
|
||||
model: string;
|
||||
error?: string;
|
||||
}
|
||||
|
||||
interface StartOptions {
|
||||
cwd?: string;
|
||||
model?: string;
|
||||
systemPrompt?: string;
|
||||
maxTurns?: number;
|
||||
permissionMode?: string;
|
||||
claudeConfigDir?: string;
|
||||
extraEnv?: Record<string, string>;
|
||||
}
|
||||
|
||||
// ── Internal state ───────────────────────────────────────────────────────────
|
||||
|
||||
// Map projectId -> sessionId for lookup
|
||||
const projectSessionMap = new Map<string, string>();
|
||||
|
||||
// Map sessionId -> reactive session state
|
||||
let sessions = $state<Record<string, AgentSession>>({});
|
||||
|
||||
// ── RPC event listeners (registered once) ────────────────────────────────────
|
||||
|
||||
let listenersRegistered = false;
|
||||
|
||||
function ensureListeners() {
|
||||
if (listenersRegistered) return;
|
||||
listenersRegistered = true;
|
||||
|
||||
// agent.message — raw messages from sidecar, converted to display format
|
||||
electrobun.rpc?.addMessageListener('agent.message', (payload: {
|
||||
sessionId: string;
|
||||
messages: Array<{
|
||||
id: string;
|
||||
type: string;
|
||||
parentId?: string;
|
||||
content: unknown;
|
||||
timestamp: number;
|
||||
}>;
|
||||
}) => {
|
||||
const session = sessions[payload.sessionId];
|
||||
if (!session) return;
|
||||
|
||||
const converted: AgentMessage[] = [];
|
||||
for (const raw of payload.messages) {
|
||||
const msg = convertRawMessage(raw);
|
||||
if (msg) converted.push(msg);
|
||||
}
|
||||
|
||||
if (converted.length > 0) {
|
||||
session.messages = [...session.messages, ...converted];
|
||||
}
|
||||
});
|
||||
|
||||
// agent.status — session status changes
|
||||
electrobun.rpc?.addMessageListener('agent.status', (payload: {
|
||||
sessionId: string;
|
||||
status: string;
|
||||
error?: string;
|
||||
}) => {
|
||||
const session = sessions[payload.sessionId];
|
||||
if (!session) return;
|
||||
|
||||
session.status = normalizeStatus(payload.status);
|
||||
if (payload.error) session.error = payload.error;
|
||||
});
|
||||
|
||||
// agent.cost — token/cost updates
|
||||
electrobun.rpc?.addMessageListener('agent.cost', (payload: {
|
||||
sessionId: string;
|
||||
costUsd: number;
|
||||
inputTokens: number;
|
||||
outputTokens: number;
|
||||
}) => {
|
||||
const session = sessions[payload.sessionId];
|
||||
if (!session) return;
|
||||
|
||||
session.costUsd = payload.costUsd;
|
||||
session.inputTokens = payload.inputTokens;
|
||||
session.outputTokens = payload.outputTokens;
|
||||
});
|
||||
}
|
||||
|
||||
// ── Message conversion ───────────────────────────────────────────────────────
|
||||
|
||||
function convertRawMessage(raw: {
|
||||
id: string;
|
||||
type: string;
|
||||
parentId?: string;
|
||||
content: unknown;
|
||||
timestamp: number;
|
||||
}): AgentMessage | null {
|
||||
const c = raw.content as Record<string, unknown> | undefined;
|
||||
|
||||
switch (raw.type) {
|
||||
case 'text':
|
||||
return {
|
||||
id: raw.id,
|
||||
role: 'assistant',
|
||||
content: String(c?.text ?? ''),
|
||||
timestamp: raw.timestamp,
|
||||
};
|
||||
|
||||
case 'thinking':
|
||||
return {
|
||||
id: raw.id,
|
||||
role: 'thinking',
|
||||
content: String(c?.text ?? ''),
|
||||
timestamp: raw.timestamp,
|
||||
};
|
||||
|
||||
case 'tool_call': {
|
||||
const name = String(c?.name ?? 'Tool');
|
||||
const input = c?.input as Record<string, unknown> | undefined;
|
||||
// Extract file path from common tool input patterns
|
||||
const path = extractToolPath(name, input);
|
||||
return {
|
||||
id: raw.id,
|
||||
role: 'tool-call',
|
||||
content: formatToolInput(name, input),
|
||||
toolName: name,
|
||||
toolInput: JSON.stringify(input, null, 2),
|
||||
toolPath: path,
|
||||
timestamp: raw.timestamp,
|
||||
};
|
||||
}
|
||||
|
||||
case 'tool_result': {
|
||||
const output = c?.output;
|
||||
const text = typeof output === 'string'
|
||||
? output
|
||||
: JSON.stringify(output, null, 2);
|
||||
return {
|
||||
id: raw.id,
|
||||
role: 'tool-result',
|
||||
content: truncateOutput(text, 500),
|
||||
timestamp: raw.timestamp,
|
||||
};
|
||||
}
|
||||
|
||||
case 'init': {
|
||||
const model = String(c?.model ?? '');
|
||||
// Update session model from init message
|
||||
const sid = String(c?.sessionId ?? '');
|
||||
for (const s of Object.values(sessions)) {
|
||||
if (s.sessionId === raw.id || (sid && s.sessionId.includes(sid.slice(0, 8)))) {
|
||||
if (model) s.model = model;
|
||||
}
|
||||
}
|
||||
return {
|
||||
id: raw.id,
|
||||
role: 'system',
|
||||
content: `Session initialized${model ? ` (${model})` : ''}`,
|
||||
timestamp: raw.timestamp,
|
||||
};
|
||||
}
|
||||
|
||||
case 'error':
|
||||
return {
|
||||
id: raw.id,
|
||||
role: 'system',
|
||||
content: `Error: ${String(c?.message ?? 'Unknown error')}`,
|
||||
timestamp: raw.timestamp,
|
||||
};
|
||||
|
||||
case 'cost':
|
||||
case 'status':
|
||||
case 'compaction':
|
||||
case 'unknown':
|
||||
return null;
|
||||
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function extractToolPath(name: string, input: Record<string, unknown> | undefined): string | undefined {
|
||||
if (!input) return undefined;
|
||||
// Common patterns: file_path, path, command (for Bash)
|
||||
if (typeof input.file_path === 'string') return input.file_path;
|
||||
if (typeof input.path === 'string') return input.path;
|
||||
if (name === 'Bash' && typeof input.command === 'string') {
|
||||
return input.command.length > 80 ? input.command.slice(0, 80) + '...' : input.command;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
function formatToolInput(name: string, input: Record<string, unknown> | undefined): string {
|
||||
if (!input) return '';
|
||||
if (name === 'Bash' && typeof input.command === 'string') return input.command;
|
||||
if (typeof input.file_path === 'string') return input.file_path;
|
||||
return JSON.stringify(input, null, 2);
|
||||
}
|
||||
|
||||
function truncateOutput(text: string, maxLines: number): string {
|
||||
const lines = text.split('\n');
|
||||
if (lines.length <= maxLines) return text;
|
||||
return lines.slice(0, maxLines).join('\n') + `\n... (${lines.length - maxLines} more lines)`;
|
||||
}
|
||||
|
||||
function normalizeStatus(status: string): AgentStatus {
|
||||
if (status === 'running' || status === 'idle' || status === 'done' || status === 'error') {
|
||||
return status;
|
||||
}
|
||||
return 'idle';
|
||||
}
|
||||
|
||||
// ── Public API ───────────────────────────────────────────────────────────────
|
||||
|
||||
/** Start an agent session for a project. */
|
||||
export async function startAgent(
|
||||
projectId: string,
|
||||
provider: string,
|
||||
prompt: string,
|
||||
options: StartOptions = {},
|
||||
): Promise<{ ok: boolean; error?: string }> {
|
||||
ensureListeners();
|
||||
|
||||
const sessionId = `${projectId}-${Date.now()}`;
|
||||
|
||||
// Create reactive session state
|
||||
sessions[sessionId] = {
|
||||
sessionId,
|
||||
projectId,
|
||||
provider,
|
||||
status: 'running',
|
||||
messages: [{
|
||||
id: `${sessionId}-user-0`,
|
||||
role: 'user',
|
||||
content: prompt,
|
||||
timestamp: Date.now(),
|
||||
}],
|
||||
costUsd: 0,
|
||||
inputTokens: 0,
|
||||
outputTokens: 0,
|
||||
model: options.model ?? 'claude-opus-4-5',
|
||||
};
|
||||
|
||||
projectSessionMap.set(projectId, sessionId);
|
||||
|
||||
const result = await appRpc.request['agent.start']({
|
||||
sessionId,
|
||||
provider: provider as 'claude' | 'codex' | 'ollama',
|
||||
prompt,
|
||||
cwd: options.cwd,
|
||||
model: options.model,
|
||||
systemPrompt: options.systemPrompt,
|
||||
maxTurns: options.maxTurns,
|
||||
permissionMode: options.permissionMode,
|
||||
claudeConfigDir: options.claudeConfigDir,
|
||||
extraEnv: options.extraEnv,
|
||||
});
|
||||
|
||||
if (!result.ok) {
|
||||
sessions[sessionId].status = 'error';
|
||||
sessions[sessionId].error = result.error;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/** Stop a running agent session for a project. */
|
||||
export async function stopAgent(projectId: string): Promise<{ ok: boolean; error?: string }> {
|
||||
const sessionId = projectSessionMap.get(projectId);
|
||||
if (!sessionId) return { ok: false, error: 'No session for project' };
|
||||
|
||||
const result = await appRpc.request['agent.stop']({ sessionId });
|
||||
|
||||
if (result.ok) {
|
||||
const session = sessions[sessionId];
|
||||
if (session) session.status = 'done';
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/** Send a follow-up prompt to a running session. */
|
||||
export async function sendPrompt(projectId: string, prompt: string): Promise<{ ok: boolean; error?: string }> {
|
||||
const sessionId = projectSessionMap.get(projectId);
|
||||
if (!sessionId) return { ok: false, error: 'No session for project' };
|
||||
|
||||
const session = sessions[sessionId];
|
||||
if (!session) return { ok: false, error: 'Session not found' };
|
||||
|
||||
// Add user message immediately
|
||||
session.messages = [...session.messages, {
|
||||
id: `${sessionId}-user-${Date.now()}`,
|
||||
role: 'user',
|
||||
content: prompt,
|
||||
timestamp: Date.now(),
|
||||
}];
|
||||
|
||||
session.status = 'running';
|
||||
|
||||
return appRpc.request['agent.prompt']({ sessionId, prompt });
|
||||
}
|
||||
|
||||
/** Get the current session for a project (reactive). */
|
||||
export function getSession(projectId: string): AgentSession | undefined {
|
||||
const sessionId = projectSessionMap.get(projectId);
|
||||
if (!sessionId) return undefined;
|
||||
return sessions[sessionId];
|
||||
}
|
||||
|
||||
/** Check if a project has an active session. */
|
||||
export function hasSession(projectId: string): boolean {
|
||||
return projectSessionMap.has(projectId);
|
||||
}
|
||||
|
||||
/** Initialize listeners on module load. */
|
||||
ensureListeners();
|
||||
Loading…
Add table
Add a link
Reference in a new issue