@curie-agent/daemon 0.2.5 → 0.3.1

package/dist/src/jsonrpc-handler.js

@@ -2,7 +2,7 @@ import os, { homedir } from 'node:os';
 import path, { join } from 'node:path';
 import { readFileSync, existsSync, readdirSync, statSync, writeFileSync, mkdirSync, realpathSync } from 'node:fs';
 import { Method } from '@curie-agent/protocol';
-import { TurnLoop, parseReminderTime, listSnapshots, revertTo, createIdentityFiles } from '@curie-agent/core';
+import { TurnLoop, parseReminderTime, listSnapshots, revertTo, createIdentityFilesAuto } from '@curie-agent/core';
 import { listSkills, discoverAllSkills } from '@curie-agent/tools';
 import { executeCd } from './slash-cd.js';
 export class JsonRpcHandler {
@@ -199,7 +199,7 @@ export class JsonRpcHandler {
                         break;
                     }
                     if (text.startsWith('/')) {
-                        const targetSessionId = sessionId || this.sessionStore.create(process.cwd(), this.settingsManager.get().model_override || this.settingsManager.get().model, this.settingsManager.get().current_provider || 'unknown', type || 'webui').id;
+                        const targetSessionId = sessionId || this.sessionStore.create(process.cwd(), this.settingsManager.getActiveModel(), this.settingsManager.get().current_provider || 'unknown', type || 'webui').id;
                         // Wait 150ms to guarantee that the client has completed the HTTP roundtrip,
                         // received the sessionId, and successfully subscribed to WebSocket events
                         // before any synchronous slash command output is emitted.
@@ -216,7 +216,7 @@ export class JsonRpcHandler {
                     // The turn loop runs asynchronously in the background.
                     if (!sessionId) {
                         const settings = this.settingsManager.get();
-                        const session = this.sessionStore.create(process.cwd(), settings.model_override || settings.model, settings.current_provider || 'unknown', type || 'webui');
+                        const session = this.sessionStore.create(process.cwd(), settings.providers[settings.current_provider]?.model || settings.model, settings.current_provider || 'unknown', type || 'webui');
                         // Start turn loop in background — events stream via WS
                         if (this.daemonApp) {
                             this.daemonApp.channelManager.send(session.id, text, undefined, type || 'webui').then(res => {
@@ -412,7 +412,7 @@ export class JsonRpcHandler {
                     if (!message || !scheduledAt)
                         return this.paramError('message, scheduledAt');
                     if (this.daemonApp) {
-                        const mode = type === 'task' ? 'auto' : 'notify';
+                        const mode = type === 'task' ? 'agent' : 'notify';
                         const task = this.daemonApp.taskManager.create({ title: message, mode, scope: 'personal', scheduled_at: scheduledAt });
                         result = task;
                     }
@@ -488,7 +488,7 @@ export class JsonRpcHandler {
                     const userName = this.getStringParam(p, 'userName') || 'User';
                     const userTimezone = this.getStringParam(p, 'userTimezone') || 'UTC';
                     const userLanguages = this.getStringParam(p, 'userLanguages') || 'TypeScript, Python';
-                    createIdentityFiles({
+                    createIdentityFilesAuto({
                         provider: provider,
                         apiKey,
                         model,
@@ -509,7 +509,6 @@ export class JsonRpcHandler {
                     settings.current_provider = provider;
                     settings.model = model;
                     this.settingsManager.update(settings);
-                    this.settingsManager.save();
                     this.sharedEventBus?.emit({
                         type: 'config-changed',
                         id: Math.random().toString(36).substring(7),
@@ -517,16 +516,58 @@ export class JsonRpcHandler {
                         key: 'init',
                         value: true,
                     });
-                    result = { status: 'complete', files: ['SOUL.md', 'USER.md', 'AGENTS.md', 'MEMORY.md', 'TOOLS.md', 'HEARTBEAT.md'] };
+                    result = { status: 'complete', files: ['SOUL.md', 'USER.md', 'AGENTS.md', 'MEMORY.md', 'TOOLS.md', 'HEARTBEAT.md'], skills: ['deep-research', 'planning'] };
                     break;
                 }
                 // Not yet implemented
                 case Method.ORCHESTRA_PANES:
                 case Method.ORCHESTRA_BROADCAST:
-                case Method.WIKI_QUERY:
-                case Method.WIKI_PAGE_GET:
                     result = { status: 'not-implemented', method };
                     break;
+                // Wiki operations
+                case Method.WIKI_QUERY: {
+                    const { WikiManager } = await import('@curie-agent/wiki');
+                    const query = this.getStringParam(params, 'query');
+                    if (!query)
+                        return this.paramError('query');
+                    const wm = new WikiManager(this.settingsManager.get());
+                    wm.ensureStructure();
+                    result = wm.search(query);
+                    break;
+                }
+                case Method.WIKI_PAGE_GET: {
+                    const { WikiManager } = await import('@curie-agent/wiki');
+                    const slug = this.getStringParam(params, 'slug');
+                    if (!slug)
+                        return this.paramError('slug');
+                    const wm = new WikiManager(this.settingsManager.get());
+                    wm.ensureStructure();
+                    const content = wm.readPage(slug);
+                    result = content !== null ? { slug, content } : { error: `Page not found: ${slug}` };
+                    break;
+                }
+                case Method.WIKI_INGEST: {
+                    const { WikiManager } = await import('@curie-agent/wiki');
+                    const wm = new WikiManager(this.settingsManager.get());
+                    wm.ensureStructure();
+                    const pages = wm.listPages();
+                    result = { pages, index: wm.readIndex() };
+                    break;
+                }
+                case Method.WIKI_LINT: {
+                    const { WikiManager } = await import('@curie-agent/wiki');
+                    const wm = new WikiManager(this.settingsManager.get());
+                    wm.ensureStructure();
+                    result = wm.lintReport();
+                    break;
+                }
+                case Method.WIKI_GRAPH: {
+                    const { WikiManager } = await import('@curie-agent/wiki');
+                    const wm = new WikiManager(this.settingsManager.get());
+                    wm.ensureStructure();
+                    result = wm.graph();
+                    break;
+                }
                 // Subagent management
                 case Method.SUBAGENT_SPAWN: {
                     const p = params;
@@ -550,17 +591,12 @@ export class JsonRpcHandler {
                     const providerInstance = this.createProvider(spawnSettings);
                     // Resolve model for the subagent.
                     // - Explicit 'model' param from UI always wins.
-                    // - If spawning on a different provider, use that provider's default config (ignore model_override).
-                    // - If same provider as parent, inherit model_override if set.
+                    // - Otherwise use the target provider's configured model.
                     const effectiveModel = (() => {
                         if (model)
                             return model;
-                        if (providerName && providerName !== settings.current_provider) {
-                            // Different provider — use target's default, not parent's model_override
-                            return spawnSettings.providers?.[providerName]?.model || settings.model;
-                        }
-                        // Same provider — allow model_override to apply
-                        return spawnSettings.model_override || spawnSettings.model;
+                        const targetProvider = spawnSettings.providers?.[providerName || spawnSettings.current_provider];
+                        return targetProvider?.model || spawnSettings.model;
                     })();
                     const handle = await this.daemonApp.subagentExecutor.spawn({
                         provider: providerInstance,
@@ -691,7 +727,7 @@ export class JsonRpcHandler {
                     this.daemonApp.taskManager.load();
                     const task = this.daemonApp.taskManager.create({
                         title: instruction,
-                        mode: 'auto',
+                        mode: 'agent',
                         scope: 'personal',
                         scheduled_at: scheduledAtMs,
                         description: Object.keys(metadata).length > 0 ? JSON.stringify(metadata) : '',
@@ -705,6 +741,99 @@ export class JsonRpcHandler {
                     };
                     break;
                 }
+                // ---- Unified task (todo) management for Kanban board ----
+                case Method.TODO_LIST: {
+                    if (!this.daemonApp) {
+                        return { jsonrpc: '2.0', id, error: { code: -32603, message: 'Daemon not initialized' } };
+                    }
+                    this.daemonApp.taskManager.load();
+                    const p = (params || {});
+                    const filters = {};
+                    if (typeof p.status === 'string')
+                        filters.status = p.status;
+                    if (typeof p.mode === 'string')
+                        filters.mode = p.mode;
+                    if (typeof p.scope === 'string')
+                        filters.scope = p.scope;
+                    if (typeof p.priority === 'string')
+                        filters.priority = p.priority;
+                    result = this.daemonApp.taskManager.list(Object.keys(filters).length ? filters : undefined);
+                    break;
+                }
+                case Method.TODO_CREATE: {
+                    if (!this.daemonApp) {
+                        return { jsonrpc: '2.0', id, error: { code: -32603, message: 'Daemon not initialized' } };
+                    }
+                    this.daemonApp.taskManager.load();
+                    const p = params;
+                    const title = this.getStringParam(p, 'title') || '';
+                    if (!title)
+                        return this.paramError('title');
+                    const task = this.daemonApp.taskManager.create({
+                        title,
+                        description: this.getStringParam(p, 'description'),
+                        mode: typeof p.mode === 'string' ? p.mode : 'human',
+                        scope: typeof p.scope === 'string' ? p.scope : 'personal',
+                        priority: typeof p.priority === 'string' ? p.priority : 'medium',
+                        tags: Array.isArray(p.tags) ? p.tags : [],
+                        scheduled_at: typeof p.scheduled_at === 'number' ? p.scheduled_at : undefined,
+                    });
+                    // Override status if specified (create() sets default based on mode)
+                    if (typeof p.status === 'string') {
+                        this.daemonApp.taskManager.updateTaskStatus(task.id, p.status);
+                    }
+                    this.sharedEventBus?.emit({ type: 'todo-changed', id: crypto.randomUUID(), timestamp: Date.now(), action: 'created', taskId: task.id });
+                    result = this.daemonApp.taskManager.findTask(task.id);
+                    break;
+                }
+                case Method.TODO_UPDATE: {
+                    if (!this.daemonApp) {
+                        return { jsonrpc: '2.0', id, error: { code: -32603, message: 'Daemon not initialized' } };
+                    }
+                    this.daemonApp.taskManager.load();
+                    const p = params;
+                    const taskId = this.getStringParam(p, 'id');
+                    if (!taskId)
+                        return this.paramError('id');
+                    const task = this.daemonApp.taskManager.findTask(taskId);
+                    if (!task)
+                        return { jsonrpc: '2.0', id, error: { code: -32602, message: `Task ${taskId} not found` } };
+                    if (typeof p.status === 'string') {
+                        this.daemonApp.taskManager.updateTaskStatus(taskId, p.status);
+                    }
+                    if (typeof p.priority === 'string')
+                        task.priority = p.priority;
+                    if (typeof p.title === 'string')
+                        task.title = p.title;
+                    if (typeof p.description === 'string')
+                        task.description = p.description;
+                    if (Array.isArray(p.tags))
+                        task.tags = p.tags;
+                    if (typeof p.mode === 'string')
+                        task.mode = p.mode;
+                    if (typeof p.scope === 'string')
+                        task.scope = p.scope;
+                    if (typeof p.scheduled_at === 'number')
+                        task.scheduled_at = p.scheduled_at;
+                    this.daemonApp.taskManager.save();
+                    this.sharedEventBus?.emit({ type: 'todo-changed', id: crypto.randomUUID(), timestamp: Date.now(), action: 'updated', taskId });
+                    result = { ok: true, task: this.daemonApp.taskManager.findTask(taskId) };
+                    break;
+                }
+                case Method.TODO_REMOVE: {
+                    if (!this.daemonApp) {
+                        return { jsonrpc: '2.0', id, error: { code: -32603, message: 'Daemon not initialized' } };
+                    }
+                    this.daemonApp.taskManager.load();
+                    const p = params;
+                    const taskId = this.getStringParam(p, 'id');
+                    if (!taskId)
+                        return this.paramError('id');
+                    const removed = this.daemonApp.taskManager.removeTask(taskId);
+                    this.sharedEventBus?.emit({ type: 'todo-changed', id: crypto.randomUUID(), timestamp: Date.now(), action: 'removed', taskId });
+                    result = { removed };
+                    break;
+                }
                 default:
                     return { jsonrpc: '2.0', id, error: { code: -32601, message: `Method not found: ${method}` } };
             }
@@ -731,7 +860,7 @@ export class JsonRpcHandler {
         // Build the turn loop config
         const loop = new TurnLoop({
             provider,
-            model: settings.model_override || settings.model,
+            model: settings.providers[settings.current_provider]?.model || settings.model,
             tools: this.tools,
             cwd: sessionInfo?.cwd || join(homedir(), '.curie-agent'),
             settings,
@@ -744,11 +873,13 @@ export class JsonRpcHandler {
         }, this.sessionStore);
         // Store the loop for potential cancellation
         this.turnLoops.set(sessionId, loop);
-        // Bridge the turn loop's event bus to the shared daemon event bus
-        // so that WS clients receive real-time events.
+        // Bridge the turn loop's event bus to the shared daemon event bus.
+        // Note: 'approval-request' is NOT bridged — ApprovalTracker.register()
+        // emits it directly. In direct mode (no daemonApp), approval events
+        // are not tracked externally anyway.
         const eventTypes = [
             'user-prompt', 'assistant-delta', 'assistant-stop', 'tool-call',
-            'tool-result', 'approval-request', 'approval-decision', 'usage',
+            'tool-result', 'approval-decision', 'usage',
             'error', 'session-start', 'session-stop', 'hook', 'status',
             'session-resumed', 'context-warning', 'thinking-delta',
             // Subagent events
@@ -953,7 +1084,7 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
                         }
                     }
                     else {
-                        settings.model_override = args;
+                        pConfig.model = args;
                         settings.model = args;
                         this.settingsManager.update(settings);
                         this.sharedEventBus?.emit({
@@ -980,9 +1111,7 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
                             emitDelta(`Unknown provider: "${args}". Valid options are: ${valid.join(', ')}`);
                         }
                         else {
-                            settings.current_provider = provider;
-                            settings.model_override = undefined;
-                            this.settingsManager.update(settings);
+                            this.settingsManager.setCurrentProvider(provider);
                             this.sharedEventBus?.emit({
                                 type: 'config-changed',
                                 id: Math.random().toString(36).substring(7),
@@ -1303,29 +1432,40 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
                             ? activeLoop.eventBus.history()
                             : (this.sessionStore.loadEvents(sessionId) || []);
                         const usageEvents = history.filter((e) => e.type === 'usage');
-                        let input = 0;
-                        let output = 0;
-                        for (const e of usageEvents) {
-                            input += e.inputTokens || 0;
-                            output += e.outputTokens || 0;
-                        }
+                        const latestUsage = usageEvents[usageEvents.length - 1];
+                        const input = latestUsage ? (latestUsage.inputTokens || 0) : 0;
+                        const output = latestUsage ? (latestUsage.outputTokens || 0) : 0;
                         const model = settings.model || 'unknown';
                         const windowSize = settings.providers?.[settings.current_provider]?.model_context_window ?? 200000;
                         const pct = input > 0 ? Math.min(100, Math.round((input / windowSize) * 100)) : 0;
-                        const filled = Math.round((pct / 100) * 24);
-                        const bar = '█'.repeat(filled) + '░'.repeat(24 - filled);
-                        const fmt = (n) => (n >= 1000 ? `${Math.round(n / 1000)}k` : String(n));
+                        const fmt = (n) => {
+                            if (n >= 1_000_000)
+                                return `${(n / 1_000_000).toFixed(1)}m`;
+                            if (n >= 1_000)
+                                return `${(n / 1_000).toFixed(1)}k`;
+                            return String(n);
+                        };
                         if (input === 0 && output === 0) {
                             emitDelta(`No token data yet. Start a conversation to see context window usage.\n\nActive model: \`${model}\` (Max Context: \`${fmt(windowSize)}\` tokens).`);
                         }
                         else {
-                            const lines = [
-                                `### Context Window Usage (\`${model}\`):`,
-                                `\`${bar}\` **${pct}%** (${fmt(input)}/${fmt(windowSize)})`,
-                                `* **Tokens in**: \`${input.toLocaleString()}\``,
-                                `* **Tokens out**: \`${output.toLocaleString()}\``,
-                            ];
-                            emitDelta(lines.join('\n'));
+                            const barColor = pct > 80 ? 'var(--red)' : pct > 50 ? 'var(--yellow)' : 'var(--green)';
+                            const barGradient = pct > 80
+                                ? 'linear-gradient(90deg, var(--red), #e08070)'
+                                : pct > 50
+                                    ? 'linear-gradient(90deg, var(--yellow), #f0d090)'
+                                    : 'linear-gradient(90deg, var(--green), #c0d8a8)';
+                            emitDelta(`<div style="background:var(--s3);border-radius:8px;padding:12px;margin:8px 0">` +
+                                `<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:6px">` +
+                                `<span style="font-family:monospace;font-size:12px;color:var(--text)">Context Window (${model})</span>` +
+                                `<span style="font-family:monospace;font-size:13px;font-weight:bold;color:${barColor}">${pct}%</span>` +
+                                `</div>` +
+                                `<div style="background:var(--s2);border-radius:4px;height:8px;overflow:hidden">` +
+                                `<div style="width:${pct}%;height:100%;background:${barGradient};border-radius:4px"></div>` +
+                                `</div>` +
+                                `<div style="display:flex;justify-content:space-between;margin-top:8px;font-family:monospace;font-size:11px;color:var(--muted)">` +
+                                `<span>In: ${fmt(input)}</span><span>Out: ${fmt(output)}</span><span>Max: ${fmt(windowSize)}</span>` +
+                                `</div></div>`);
                         }
                     }
                     break;
@@ -1633,7 +1773,7 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
                                     emitDelta(`Could not parse scheduled time from: "${rest}". Try: \`at 7:55 do something\` or \`tomorrow at 9am do something\`.`);
                                 }
                                 else {
-                                    const task = this.daemonApp.taskManager.create({ title: parsed.message, mode: 'auto', scope: 'personal', scheduled_at: parsed.scheduledAt });
+                                    const task = this.daemonApp.taskManager.create({ title: parsed.message, mode: 'agent', scope: 'personal', scheduled_at: parsed.scheduledAt });
                                     const timeStr = new Date(task.scheduled_at).toLocaleString();
                                     emitDelta(`### Task Scheduled Successfully!
 * **Task ID**: \`${task.id}\`
@@ -1647,7 +1787,7 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
                             const filter = ['pending', 'executing', 'completed', 'failed', 'cancelled'].includes(rest.toLowerCase())
                                 ? rest.toLowerCase()
                                 : undefined;
-                            const tasks = this.daemonApp.taskManager.list({ mode: 'auto' });
+                            const tasks = this.daemonApp.taskManager.list({ mode: 'agent' });
                             if (tasks.length === 0) {
                                 emitDelta(filter ? `No tasks found with status **${filter}**.` : `No tasks scheduled yet. Use \`/task create\` to schedule a task.`);
                             }
@@ -1721,7 +1861,7 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
                     const hasAllowlist = raw && (Array.isArray(raw) ? raw.length > 0 : typeof raw === 'string' && raw.trim().length > 0);
                     const display = Array.isArray(raw) ? raw.join(', ') : raw;
                     lines.push(`* **Allowlist:** ${hasAllowlist ? `\`${display}\`` : '(empty)'}`);
-                    lines.push(`**Blocked:** \`${curieDir}/settings.json\` (API keys)`);
+                    lines.push(`**Blocked:** \`~/.curie-settings.json\` (API keys)`);
                     emitDelta(lines.join('\n'));
                     break;
                 }
@@ -1836,7 +1976,7 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
                         const provider = this.createProvider(settings);
                         const handle = await this.daemonApp.subagentExecutor.spawn({
                             provider,
-                            model: settings.model_override || settings.model,
+                            model: settings.providers[settings.current_provider]?.model || settings.model,
                             tools: this.tools,
                             cwd: join(homedir(), '.curie-agent'),
                             settings,
@@ -1862,11 +2002,11 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
                     const parts = args.trim().split(/\s+/);
                     const sub = parts[0]?.toLowerCase() || '';
                     const rest = parts.slice(1).join(' ').trim();
-                    // Detect mode keyword (auto/notify) from full args
+                    // Detect mode keyword (agent/notify) from full args
                     const fullArgsLower = args.toLowerCase();
-                    let mode = 'manual';
-                    if (/^auto\s/.test(fullArgsLower) || /^\bat\b/.test(fullArgsLower)) {
-                        mode = 'auto';
+                    let mode = 'human';
+                    if (/^agent\s/.test(fullArgsLower) || /^\bat\b/.test(fullArgsLower)) {
+                        mode = 'agent';
                     }
                     else if (/^notify\s/.test(fullArgsLower) || /remind\s/.test(fullArgsLower)) {
                         mode = 'notify';
@@ -1910,10 +2050,10 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
                                 const parsed = parseReminderTime(instruction);
                                 if (parsed) {
                                     instruction = parsed.message;
-                                    if (mode === 'auto') {
+                                    if (mode === 'agent') {
                                         const task = this.daemonApp.taskManager.create({
                                             title: instruction,
-                                            mode: 'auto', scope, scheduled_at: parsed.scheduledAt,
+                                            mode: 'agent', scope, scheduled_at: parsed.scheduledAt,
                                         });
                                         emitDelta(`**Task scheduled**: "${instruction}" at ${new Date(parsed.scheduledAt).toLocaleString()} (ID: \`${task.id.slice(0, 8)}...\`)`);
                                     }
@@ -2079,7 +2219,7 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
         }
         const settings = this.settingsManager.get();
         const provider = this.createProvider(settings);
-        const model = settings.model_override || settings.model;
+        const model = settings.providers[settings.current_provider]?.model || settings.model;
         const events = this.sessionStore.loadEvents(sessionId) || [];
         if (events.length === 0) {
             throw new Error('No events to compact');
@@ -2146,12 +2286,8 @@ Usage: \`/model window <tokens>\` (e.g., \`/model window 120000\`).`);
         const settings = this.settingsManager.get();
         const history = this.sessionStore.loadEvents(sessionId) || [];
         const usageEvents = history.filter((e) => e.type === 'usage');
-        let input = 0;
-        let output = 0;
-        for (const e of usageEvents) {
-            input += e.inputTokens || 0;
-            output += e.outputTokens || 0;
-        }
+        const latestUsage = usageEvents[usageEvents.length - 1];
+        const input = latestUsage?.inputTokens ?? 0;
         if (input === 0)
             return; // No token data yet
         const windowSize = settings.providers?.[settings.current_provider]?.model_context_window ?? 200000;