@loicngr/kobo 1.5.7 → 1.6.1

package/dist/server/services/content-migration-service.js

@@ -0,0 +1,155 @@
+import { nanoid } from 'nanoid';
+import { createParserState, parseClaudeLine } from './agent/engines/claude-code/stream-parser.js';
+import { createPreMigrationBackup } from './db-backup-service.js';
+import { broadcastAll } from './websocket-service.js';
+const internal = { state: 'idle', total: 0, processed: 0 };
+let isRunning = false;
+function snapshot() {
+    switch (internal.state) {
+        case 'idle':
+            return { state: 'idle' };
+        case 'backing-up':
+            return { state: 'backing-up', startedAt: internal.startedAt ?? new Date(0).toISOString() };
+        case 'running':
+            return {
+                state: 'running',
+                total: internal.total,
+                processed: internal.processed,
+                startedAt: internal.startedAt ?? new Date(0).toISOString(),
+                ...(internal.backupPath !== undefined ? { backupPath: internal.backupPath } : {}),
+            };
+        case 'done':
+            return {
+                state: 'done',
+                total: internal.total,
+                processed: internal.processed,
+                startedAt: internal.startedAt ?? new Date(0).toISOString(),
+                finishedAt: internal.finishedAt ?? new Date(0).toISOString(),
+                ...(internal.backupPath !== undefined ? { backupPath: internal.backupPath } : {}),
+            };
+        case 'error':
+            return {
+                state: 'error',
+                errorMessage: internal.errorMessage ?? 'Unknown error',
+                ...(internal.startedAt !== undefined ? { startedAt: internal.startedAt } : {}),
+                ...(internal.backupPath !== undefined ? { backupPath: internal.backupPath } : {}),
+                ...(internal.total > 0 ? { total: internal.total } : {}),
+                ...(internal.processed > 0 ? { processed: internal.processed } : {}),
+            };
+    }
+}
+export function getContentMigrationStatus() {
+    return snapshot();
+}
+export async function runContentMigrationIfNeeded(db, dbPath) {
+    if (isRunning)
+        return;
+    isRunning = true;
+    try {
+        const row = db
+            .prepare("SELECT COUNT(*) AS c FROM ws_events WHERE type IN ('agent:output', 'agent:stderr', 'agent:status')")
+            .get();
+        if (row.c === 0) {
+            internal.state = 'idle';
+            isRunning = false;
+            return;
+        }
+        internal.state = 'backing-up';
+        internal.startedAt = new Date().toISOString();
+        broadcastStatus();
+        const backup = await createPreMigrationBackup(db, dbPath, 'v10');
+        internal.backupPath = backup.created ?? undefined;
+        internal.state = 'running';
+        internal.total = row.c;
+        internal.processed = 0;
+        broadcastStatus();
+        await processLoop(db);
+        internal.state = 'done';
+        internal.finishedAt = new Date().toISOString();
+        broadcastStatus();
+    }
+    catch (err) {
+        internal.state = 'error';
+        internal.errorMessage = err instanceof Error ? err.message : String(err);
+        broadcastStatus();
+        throw err;
+    }
+    finally {
+        isRunning = false;
+    }
+}
+function broadcastStatus() {
+    // Content-migration events are global (no workspace context) — use broadcastAll so every
+    // connected WS client receives them regardless of their workspace subscriptions.
+    broadcastAll(internal.state === 'error' ? 'migration:error' : 'migration:progress', getContentMigrationStatus());
+}
+async function processLoop(db) {
+    const batchSize = 500;
+    const selectStmt = db.prepare("SELECT id, workspace_id, type, payload, session_id, created_at FROM ws_events WHERE type IN ('agent:output', 'agent:stderr', 'agent:status') ORDER BY created_at ASC LIMIT ?");
+    const insertStmt = db.prepare('INSERT INTO ws_events (id, workspace_id, type, payload, session_id, created_at) VALUES (?, ?, ?, ?, ?, ?)');
+    const deleteStmt = db.prepare('DELETE FROM ws_events WHERE id = ?');
+    while (true) {
+        const rows = selectStmt.all(batchSize);
+        if (rows.length === 0)
+            break;
+        db.transaction(() => {
+            for (const r of rows) {
+                const events = convertRow(r.type, r.payload, { workspaceId: r.workspace_id });
+                for (const ev of events) {
+                    insertStmt.run(nanoid(), r.workspace_id, 'agent:event', JSON.stringify(ev), r.session_id, r.created_at);
+                }
+                deleteStmt.run(r.id);
+            }
+        })();
+        internal.processed += rows.length;
+        broadcastStatus();
+        // Yield to the event loop
+        await new Promise((resolve) => setImmediate(resolve));
+    }
+}
+export function convertRow(type, payload, context) {
+    if (type === 'agent:status')
+        return []; // redundant — re-derivable from session events
+    if (type === 'agent:stderr') {
+        // Drop: the new engine only logs non-quota stderr via console.warn and
+        // does not persist it. Converting legacy stderr rows to error events
+        // would surface every historical Claude CLI warning ("no stdin data in
+        // 3s…", debug lines) as a UI-blocking banner. Quota-bearing stderr is
+        // handled live by the engine's backoff path, not via replay.
+        return [];
+    }
+    if (type === 'agent:output') {
+        try {
+            const parsed = JSON.parse(payload);
+            // The legacy payload may be either the raw Claude NDJSON already-parsed object,
+            // or a wrapper { type: 'raw', content: '...' } for non-JSON output. Handle both.
+            if (parsed && typeof parsed === 'object' && parsed.type === 'raw') {
+                return [{ kind: 'message:raw', content: String(parsed.content ?? '') }];
+            }
+            const state = createParserState();
+            const { events } = parseClaudeLine(JSON.stringify(parsed), state);
+            return events;
+        }
+        catch {
+            // Log enough to debug (first 200 chars of the bad payload + the owning
+            // workspace id when the caller passed one). We intentionally do not log
+            // the full payload to keep the console readable on noisy migrations.
+            const preview = payload.length > 200 ? `${payload.slice(0, 200)}…` : payload;
+            const ctx = context?.workspaceId ? ` (workspace=${context.workspaceId})` : '';
+            console.warn(`[content-migration] Could not parse agent:output payload${ctx}, falling back to message:raw. Preview: ${preview}`);
+            return [{ kind: 'message:raw', content: payload }];
+        }
+    }
+    return [];
+}
+/** Test-only. */
+export function _resetStatusForTest() {
+    internal.state = 'idle';
+    internal.total = 0;
+    internal.processed = 0;
+    internal.errorMessage = undefined;
+    internal.startedAt = undefined;
+    internal.finishedAt = undefined;
+    internal.backupPath = undefined;
+    isRunning = false;
+}

package/dist/server/services/db-backup-service.js

@@ -64,3 +64,18 @@ export async function createDailyDbBackupIfNeeded(db, dbPath, keepCount = DEFAUL
     }
     return result;
 }
+const PREMIGRATION_PREFIX = 'kobo.db.premigration-';
+export async function createPreMigrationBackup(db, dbPath, tag) {
+    const dir = path.dirname(dbPath);
+    const stamp = new Date().toISOString().replace(/[:.]/g, '-');
+    backupSequence += 1;
+    const backupPath = path.join(dir, `${PREMIGRATION_PREFIX}${tag}-${stamp}-${backupSequence}`);
+    try {
+        await db.backup(backupPath);
+        return { created: backupPath, deleted: [] };
+    }
+    catch (err) {
+        console.error('[kobo] Pre-migration backup failed:', err);
+        throw err;
+    }
+}

package/dist/server/services/websocket-service.js

@@ -3,9 +3,6 @@ import { getDb } from '../db/index.js';
 // ── State ──────────────────────────────────────────────────────────────────────
 /** Maps each WS client to the set of workspaceIds they are subscribed to */
 const clients = new Map();
-/** Per-workspace emit counter for periodic cleanup. */
-const emitCounters = new Map();
-const EMIT_CLEANUP_THRESHOLD = 2000;
 let messageHandler = null;
 /** Register the handler that processes routed WS messages (e.g. chat:message, workspace:start). */
 export function setMessageHandler(handler) {
@@ -56,7 +53,7 @@ export function handleConnection(ws) {
                 handleSyncRequest(ws, lastEventId, workspaceIds);
                 break;
             }
-            // Routed messages — delegated to agent-manager via messageHandler
+            // Routed messages — delegated to the orchestrator via messageHandler
             case 'chat:message':
             case 'workspace:start':
             case 'workspace:stop':
@@ -102,15 +99,6 @@ export function emit(workspaceId, type, payload, sessionId) {
     try {
         const db = getDb();
         db.prepare('INSERT INTO ws_events (id, workspace_id, type, payload, session_id, created_at) VALUES (?, ?, ?, ?, ?, ?)').run(id, workspaceId, type, JSON.stringify(payload), sessionId ?? null, createdAt);
-        // Periodic cleanup — trigger when emit threshold is reached
-        const count = (emitCounters.get(workspaceId) ?? 0) + 1;
-        if (count >= EMIT_CLEANUP_THRESHOLD) {
-            cleanupOldEvents(workspaceId);
-            emitCounters.set(workspaceId, 0);
-        }
-        else {
-            emitCounters.set(workspaceId, count);
-        }
     }
     catch (err) {
         console.error(`[websocket-service] Failed to persist event (workspace=${workspaceId}, type=${type}):`, err);
@@ -118,10 +106,20 @@ export function emit(workspaceId, type, payload, sessionId) {
     // Build the event object to send
     const event = { id, workspaceId, type, payload, sessionId, createdAt };
     const message = JSON.stringify(event);
-    // Broadcast to subscribed clients
+    // Broadcast to subscribed clients. Wrap `.send` in try/catch so a dropped
+    // client doesn't throw and abort delivery to the remaining subscribers.
+    let emitSendErrorLogged = false;
     for (const [ws, subs] of clients) {
         if (subs.has(workspaceId) && ws.readyState === 1 /* WebSocket.OPEN */) {
-            ws.send(message);
+            try {
+                ws.send(message);
+            }
+            catch (err) {
+                if (!emitSendErrorLogged) {
+                    console.warn(`[ws] emit send failed (workspace=${workspaceId}, type=${type}):`, err);
+                    emitSendErrorLogged = true;
+                }
+            }
         }
     }
     return id;
@@ -135,9 +133,18 @@ export function emitEphemeral(workspaceId, type, payload) {
     const createdAt = new Date().toISOString();
     const event = { id, workspaceId, type, payload, createdAt };
     const message = JSON.stringify(event);
+    let sendErrorLogged = false;
     for (const [ws, subs] of clients) {
         if (subs.has(workspaceId) && ws.readyState === 1 /* WebSocket.OPEN */) {
-            ws.send(message);
+            try {
+                ws.send(message);
+            }
+            catch (err) {
+                if (!sendErrorLogged) {
+                    console.warn(`[ws] emitEphemeral send failed (workspace=${workspaceId}, type=${type}):`, err);
+                    sendErrorLogged = true;
+                }
+            }
         }
     }
 }
@@ -161,8 +168,16 @@ export function handleSyncRequest(ws, lastEventId, workspaceIds) {
     // Build a query with placeholders for all subscribed workspaces
     const placeholders = resolvedIds.map(() => '?').join(', ');
     let rows;
+    // Initial window size: on a fresh connection (no lastEventId), we only
+    // replay the most recent slice of history. The client fetches older
+    // events on-demand via GET /api/workspaces/:id/events as the user scrolls
+    // up. This keeps first-paint fast on long-lived workspaces with tens of
+    // thousands of events without ever deleting anything from the DB.
+    const INITIAL_WINDOW = 300;
     if (lastEventId) {
-        // Get the rowid of the last event to compare ordering
+        // Resume path: replay every event strictly after the cursor (delta
+        // since last seen). If the cursor is stale/unknown, fall back to the
+        // recent window rather than streaming the entire history.
         const lastRow = db.prepare('SELECT rowid FROM ws_events WHERE id = ?').get(lastEventId);
         if (lastRow) {
             rows = db
@@ -170,17 +185,18 @@ export function handleSyncRequest(ws, lastEventId, workspaceIds) {
                 .all(...resolvedIds, lastRow.rowid);
         }
         else {
-            // lastEventId not found — send events capped to avoid unbounded memory usage
             rows = db
-                .prepare(`SELECT * FROM ws_events WHERE workspace_id IN (${placeholders}) ORDER BY rowid ASC LIMIT 10000`)
-                .all(...resolvedIds);
+                .prepare(`SELECT * FROM ws_events WHERE workspace_id IN (${placeholders}) ORDER BY rowid DESC LIMIT ?`)
+                .all(...resolvedIds, INITIAL_WINDOW);
+            rows.reverse();
         }
     }
     else {
-        // No lastEventId — send all events (capped to avoid unbounded memory usage)
+        // Fresh connect: most recent INITIAL_WINDOW events, in chronological order.
         rows = db
-            .prepare(`SELECT * FROM ws_events WHERE workspace_id IN (${placeholders}) ORDER BY rowid ASC LIMIT 10000`)
-            .all(...resolvedIds);
+            .prepare(`SELECT * FROM ws_events WHERE workspace_id IN (${placeholders}) ORDER BY rowid DESC LIMIT ?`)
+            .all(...resolvedIds, INITIAL_WINDOW);
+        rows.reverse();
     }
     const events = rows.map((row) => {
         let parsedPayload;
@@ -188,6 +204,11 @@ export function handleSyncRequest(ws, lastEventId, workspaceIds) {
             parsedPayload = JSON.parse(row.payload);
         }
         catch {
+            console.error('[ws] corrupt ws_events row, falling back to raw:', {
+                id: row.id,
+                workspace_id: row.workspace_id,
+                type: row.type,
+            });
             parsedPayload = { raw: row.payload };
         }
         return {
@@ -200,30 +221,6 @@ export function handleSyncRequest(ws, lastEventId, workspaceIds) {
         };
     });
     ws.send(JSON.stringify({ type: 'sync:response', payload: { events } }));
-    // Trigger cleanup when the event count is high to prevent unbounded growth
-    const CLEANUP_THRESHOLD = 5000;
-    if (rows.length >= CLEANUP_THRESHOLD) {
-        for (const wid of resolvedIds) {
-            cleanupOldEvents(wid);
-        }
-    }
-}
-// ── Cleanup ────────────────────────────────────────────────────────────────────
-/**
- * Delete old events keeping only the last N (default 1000) per workspace.
- */
-export function cleanupOldEvents(workspaceId, keepCount = 1000) {
-    const db = getDb();
-    db.prepare(`
-    DELETE FROM ws_events
-    WHERE workspace_id = ?
-      AND rowid NOT IN (
-        SELECT rowid FROM ws_events
-        WHERE workspace_id = ?
-        ORDER BY rowid DESC
-        LIMIT ?
-      )
-  `).run(workspaceId, workspaceId, keepCount);
 }
 // ── Utilities ──────────────────────────────────────────────────────────────────
 /**
@@ -239,10 +236,44 @@ export function getClientCount() {
 export function _getClients() {
     return clients;
 }
+// ── Global broadcast ───────────────────────────────────────────────────────────
+/**
+ * Broadcast an ephemeral event to every connected WebSocket client,
+ * regardless of which workspaces they have subscribed to. Used for
+ * global events like migration progress.
+ */
+export function broadcastAll(type, payload) {
+    const message = JSON.stringify({ type, payload });
+    let sendErrorLogged = false;
+    for (const client of clients.keys()) {
+        if (client.readyState === 1 /* WebSocket.OPEN */) {
+            try {
+                client.send(message);
+            }
+            catch (err) {
+                // client dropped; next iteration will fail its .readyState check.
+                // Log the first occurrence so real regressions surface without
+                // flooding the console if many clients die at once.
+                if (!sendErrorLogged) {
+                    console.warn('[ws] broadcastAll send failed:', err);
+                    sendErrorLogged = true;
+                }
+            }
+        }
+    }
+}
 /**
- * Get the internal emit counters map — exposed for testing only.
+ * Return a mutable set view of connected clients — exposed for testing only.
+ * Adding/removing clients via this handle registers/unregisters them with the
+ * internal `clients` map so helpers like `broadcastAll` see them.
  * @internal
  */
-export function _getEmitCounters() {
-    return emitCounters;
+export function _connectionsForTest() {
+    return {
+        add: (ws) => {
+            if (!clients.has(ws))
+                clients.set(ws, new Set());
+        },
+        delete: (ws) => clients.delete(ws),
+    };
 }

package/dist/server/services/workspace-service.js

@@ -11,6 +11,11 @@ const VALID_TRANSITIONS = {
     error: ['idle', 'executing', 'brainstorming', 'extracting'],
     quota: ['idle', 'executing'],
 };
+// NOTE: `engine` is stored as a plain TEXT column and returned as a `string` on
+// the `Workspace` interface rather than the stricter `EngineId` union. The DB
+// is untyped, so we intentionally do not narrow here — validation against
+// `listEngines()` is expected to happen at workspace creation (see the
+// routes/engines handler) and when resolving an engine at agent-start time.
 function mapWorkspace(row) {
     return {
         id: row.id,
@@ -29,6 +34,7 @@ function mapWorkspace(row) {
         archivedAt: row.archived_at,
         favoritedAt: row.favorited_at,
         tags: parseTags(row.tags),
+        engine: row.engine ?? 'claude-code',
         createdAt: row.created_at,
         updatedAt: row.updated_at,
     };
@@ -65,9 +71,9 @@ export function createWorkspace(data) {
     const now = new Date().toISOString();
     const id = nanoid();
     db.prepare(`
-    INSERT INTO workspaces (id, name, project_path, source_branch, working_branch, status, notion_url, notion_page_id, model, reasoning_effort, permission_mode, created_at, updated_at)
-    VALUES (?, ?, ?, ?, ?, 'created', ?, ?, ?, ?, ?, ?, ?)
-  `).run(id, data.name, data.projectPath, data.sourceBranch, data.workingBranch, data.notionUrl ?? null, data.notionPageId ?? null, data.model ?? 'claude-opus-4-7', data.reasoningEffort ?? 'auto', data.permissionMode ?? 'auto-accept', now, now);
+    INSERT INTO workspaces (id, name, project_path, source_branch, working_branch, status, notion_url, notion_page_id, model, reasoning_effort, permission_mode, engine, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, 'created', ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(id, data.name, data.projectPath, data.sourceBranch, data.workingBranch, data.notionUrl ?? null, data.notionPageId ?? null, data.model ?? 'claude-opus-4-7', data.reasoningEffort ?? 'auto', data.permissionMode ?? 'auto-accept', data.engine ?? 'claude-code', now, now);
     return getWorkspace(id);
 }
 /** Fetch a single workspace by ID, or null if not found. */
@@ -336,7 +342,7 @@ function mapSession(row) {
         id: row.id,
         workspaceId: row.workspace_id,
         pid: row.pid,
-        claudeSessionId: row.claude_session_id,
+        engineSessionId: row.engine_session_id,
         status: row.status,
         startedAt: row.started_at,
         endedAt: row.ended_at,
@@ -389,7 +395,7 @@ export function createIdleSession(workspaceId) {
         id,
         workspaceId,
         pid: null,
-        claudeSessionId: null,
+        engineSessionId: null,
         status: 'idle',
         startedAt: now,
         endedAt: null,

package/dist/server/utils/git-ops.js

@@ -1,5 +1,5 @@
 import { execFile as execFileCb, execFileSync } from 'node:child_process';
-import { readFileSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { promisify } from 'node:util';
 const execFileAsync = promisify(execFileCb);
@@ -133,7 +133,47 @@ export function pullBranch(repoPath, branchName, remote = 'origin') {
         throw new Error(`Failed to pull branch '${branchName}' from '${remote}': ${message}`);
     }
 }
-/** Rebase the current branch onto the given base branch. Fetches origin first to get latest changes. */
+/** Thrown when a rebase or merge produces conflicts. Leaves the repo in the mid-operation state
+ *  so the caller can decide between abort and agent-assisted resolution. */
+export class GitConflictError extends Error {
+    operation;
+    files;
+    constructor(operation, files) {
+        super(`${operation} produced ${files.length} conflicted file(s)`);
+        this.name = 'GitConflictError';
+        this.operation = operation;
+        this.files = files;
+    }
+}
+/** List files currently in a conflicted state (unmerged paths). */
+export function getConflictedFiles(repoPath) {
+    try {
+        const output = git(repoPath, ['diff', '--name-only', '--diff-filter=U']);
+        return output
+            .split('\n')
+            .map((f) => f.trim())
+            .filter(Boolean);
+    }
+    catch {
+        return [];
+    }
+}
+/** Detect whether a merge or rebase is currently in progress in the worktree. */
+export function getOngoingGitOperation(repoPath) {
+    try {
+        const gitDir = git(repoPath, ['rev-parse', '--git-dir']);
+        const dir = gitDir.startsWith('/') ? gitDir : join(repoPath, gitDir);
+        if (existsSync(join(dir, 'MERGE_HEAD')))
+            return 'merge';
+        if (existsSync(join(dir, 'rebase-merge')) || existsSync(join(dir, 'rebase-apply')))
+            return 'rebase';
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+/** Rebase the current branch onto the given base branch. Fetches origin first. Leaves conflicts in place. */
 export function rebaseBranch(repoPath, baseBranch) {
     try {
         git(repoPath, ['fetch', 'origin', baseBranch]);
@@ -145,17 +185,46 @@ export function rebaseBranch(repoPath, baseBranch) {
         git(repoPath, ['rebase', `origin/${baseBranch}`]);
     }
     catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        // Abort the rebase if it fails (conflicts etc.)
-        try {
-            git(repoPath, ['rebase', '--abort']);
-        }
-        catch {
-            /* best-effort */
+        const conflicted = getConflictedFiles(repoPath);
+        if (conflicted.length > 0 || getOngoingGitOperation(repoPath) === 'rebase') {
+            // Leave the rebase in progress so the caller can abort or request agent-assisted resolution.
+            throw new GitConflictError('rebase', conflicted);
         }
+        const message = err instanceof Error ? err.message : String(err);
         throw new Error(`Rebase onto '${baseBranch}' failed: ${message}`);
     }
 }
+/** Merge `origin/<baseBranch>` into the current branch. Fetches first. Leaves conflicts in place. */
+export function mergeBranch(repoPath, baseBranch) {
+    try {
+        git(repoPath, ['fetch', 'origin', baseBranch]);
+    }
+    catch {
+        // offline — continue with local ref
+    }
+    try {
+        git(repoPath, ['merge', '--no-ff', '--no-edit', `origin/${baseBranch}`]);
+    }
+    catch (err) {
+        const conflicted = getConflictedFiles(repoPath);
+        if (conflicted.length > 0 || getOngoingGitOperation(repoPath) === 'merge') {
+            throw new GitConflictError('merge', conflicted);
+        }
+        const message = err instanceof Error ? err.message : String(err);
+        throw new Error(`Merge of 'origin/${baseBranch}' failed: ${message}`);
+    }
+}
+/** Abort an in-progress merge or rebase. No-op if nothing is in progress. */
+export function abortOngoingGitOperation(repoPath) {
+    const op = getOngoingGitOperation(repoPath);
+    if (op === 'merge') {
+        git(repoPath, ['merge', '--abort']);
+    }
+    else if (op === 'rebase') {
+        git(repoPath, ['rebase', '--abort']);
+    }
+    return op;
+}
 /** Try a git command with `base`, falling back to `origin/base` if the local ref is missing. */
 function resolveBase(repoPath, base) {
     try {

package/dist/server/utils/paths.js

@@ -99,7 +99,7 @@ export function getTemplatesPath() {
 /**
  * Absolute path to the compiled MCP server entry (shipped in the published
  * package as dist/mcp-server/kobo-tasks-server.js). Returns null if not
- * present — callers (agent-manager) then fall back to the TS source for dev.
+ * present — callers (orchestrator) then fall back to the TS source for dev.
  */
 export function getCompiledMcpServerPath() {
     const compiled = getPackageAssetPath('dist', 'mcp-server', 'kobo-tasks-server.js');

package/dist/shared/models.js

@@ -0,0 +1,50 @@
+export const CLAUDE_MODELS = [
+    {
+        id: 'auto',
+        label: 'Auto',
+        i18nLabelKey: 'model.auto',
+        i18nDescriptionKey: 'model.autoDescription',
+    },
+    {
+        id: 'claude-opus-4-7',
+        label: 'Opus 4.7 (Classic)',
+        i18nLabelKey: 'model.opus47Classic',
+        i18nDescriptionKey: 'model.opus47ClassicDescription',
+    },
+    {
+        id: 'claude-opus-4-7[1m]',
+        label: 'Opus 4.7 (1M)',
+        i18nLabelKey: 'model.opus471m',
+        i18nDescriptionKey: 'model.opus471mDescription',
+    },
+    {
+        id: 'claude-opus-4-6',
+        label: 'Opus 4.6 (Classic)',
+        i18nLabelKey: 'model.opusClassic',
+        i18nDescriptionKey: 'model.opusClassicDescription',
+    },
+    {
+        id: 'claude-opus-4-6[1m]',
+        label: 'Opus 4.6 (1M)',
+        i18nLabelKey: 'model.opus1m',
+        i18nDescriptionKey: 'model.opus1mDescription',
+    },
+    {
+        id: 'claude-sonnet-4-6',
+        label: 'Sonnet 4.6 (Classic)',
+        i18nLabelKey: 'model.sonnetClassic',
+        i18nDescriptionKey: 'model.sonnetClassicDescription',
+    },
+    {
+        id: 'claude-sonnet-4-6[1m]',
+        label: 'Sonnet 4.6 (1M)',
+        i18nLabelKey: 'model.sonnet1m',
+        i18nDescriptionKey: 'model.sonnet1mDescription',
+    },
+    {
+        id: 'claude-haiku-4-5-20251001',
+        label: 'Haiku 4.5',
+        i18nLabelKey: 'model.haiku',
+        i18nDescriptionKey: 'model.haikuDescription',
+    },
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loicngr/kobo",
-  "version": "1.5.7",
+  "version": "1.6.1",
   "description": "Kōbō — multi-workspace agent manager for Claude Code. Orchestrates isolated git worktrees with dev servers, Notion integration, and MCP tools.",
   "type": "module",
   "license": "GPL-3.0-or-later",

package/src/client/dist/spa/assets/ActivityFeed-DYtAK49y.js

@@ -0,0 +1,7 @@
+import{E as e,F as t,H as n,L as r,M as i,Q as a,U as o,_t as s,bt as c,d as l,f as u,g as d,h as f,l as p,p as m,r as h,rt as g,u as _,v,yt as y}from"./runtime-core.esm-bundler-C3IgBgY5.js";import{L as b,l as x,t as S}from"./QIcon-B0-pH3Qs.js";import{t as C}from"./QBtn-p1aZtrJH.js";import{n as w}from"./vue-i18n-CeG0hR0Z.js";import{S as T,v as E,x as D}from"./index-D997aY4Y.js";import{t as O}from"./QSpinnerDots-By20ptst.js";import{t as k}from"./QExpansionItem-5ekmpO-2.js";import{t as ee}from"./QScrollArea-L6wUiA20.js";import{n as A,t as j}from"./marked.esm-DW0ulF0a.js";import{t as M}from"./_plugin-vue_export-helper-CEhRWsKN.js";function N(e,t,n=!0){let r=[],i=new Map,a=new Map;for(let n=0;n<e.length;n++){let o=e[n],s=t?.[n];switch(o.kind){case`message:text`:{let e=i.get(o.messageId);if(e)e.text+=o.text,e.streaming=o.streaming;else{let e={type:`text`,messageId:o.messageId,text:o.text,streaming:o.streaming,ts:s};i.set(o.messageId,e),r.push(e)}break}case`message:end`:{let e=i.get(o.messageId);e&&(e.streaming=!1);break}case`message:thinking`:r.push({type:`thinking`,messageId:o.messageId,text:o.text,ts:s});break;case`tool:call`:{let e={type:`tool`,toolCallId:o.toolCallId,name:o.name,input:o.input,ts:s};a.set(o.toolCallId,e),r.push(e);break}case`tool:result`:{let e=a.get(o.toolCallId);e&&(e.result={output:o.output,isError:o.isError});break}case`session:started`:r.push({type:`session`,kind:`started`,detail:{engineSessionId:o.engineSessionId,model:o.model},ts:s});break;case`session:ended`:r.push({type:`session`,kind:`ended`,detail:{reason:o.reason,exitCode:o.exitCode},ts:s});break;case`session:compacted`:r.push({type:`session`,kind:`compacted`,ts:s});break;case`session:brainstorm-complete`:case`message:raw`:case`skills:discovered`:case`usage`:case`rate_limit`:case`subagent:progress`:case`error`:break;default:}}let o=null;for(let e of r)e.type===`text`&&e.streaming&&(o&&(o.streaming=!1),o=e);return o&&!n&&(o.streaming=!1),r}function te(e,t){if(t.length===0)return e;let n=t.map(e=>({type:`user`,content:e.content,sender:e.sender,ts:e.ts})),r=[...e,...n];return r.sort((e,t)=>{let n=e.ts??``,r=t.ts??``;return n===r?0:n?r?n<r?-1:1:-1:1}),r}function P(e){switch(e.type){case`user`:return e.sender===`system-prompt`?`system-prompt`:`user`;case`session`:return`session`;default:return`agent`}}function ne(e){let t=[],n=null;for(let r of e){let e=P(r),i=e===`session`||e===`system-prompt`;!n||n.speaker!==e||i?(n={speaker:e,ts:r.ts,items:[r]},t.push(n),i&&(n=null)):n.items.push(r)}return t}var F={class:`text-caption text-grey-6`},I=v({__name:`SessionEventItem`,props:{item:{}},setup(e){let n=e,r=p(()=>{switch(n.item.kind){case`started`:return`session.started`;case`ended`:return`session.ended`;case`compacted`:return`session.compacted`;default:return`session.started`}});return(e,n)=>(t(),m(`span`,F,c(e.$t(r.value)),1))}}),L={class:`markdown-message`},R=[`innerHTML`],z=M(v({__name:`TextMessageItem`,props:{item:{}},setup(e){let n=e,r=p(()=>{let e=j.parse(n.item.text,{async:!1,breaks:!0,gfm:!0});return A.sanitize(e)});return(n,i)=>(t(),m(`div`,L,[_(`div`,{innerHTML:r.value},null,8,R),e.item.streaming?(t(),l(x,{key:0,size:`xs`,class:`q-ml-xs`})):u(``,!0)]))}}),[[`__scopeId`,`data-v-158cbb54`]]),B={key:0,class:`text-caption text-grey-5`,style:{"font-style":`italic`}},V=[`innerHTML`],H={key:1,style:{"white-space":`pre-wrap`}},U=M(v({__name:`ThinkingItem`,props:{item:{}},setup(e){let n=e,r=p(()=>n.item.text.trim().slice(0,100)),i=p(()=>n.item.text.trim().length>0),a=p(()=>n.item.text.trim().length>100),s=p(()=>{let e=j.parse(n.item.text,{async:!1,breaks:!0,gfm:!0});return A.sanitize(e)});return(n,d)=>i.value?(t(),m(`div`,B,[a.value?(t(),l(k,{key:0,dense:``,"dense-toggle":``,label:r.value,"header-class":`text-grey-5 text-caption`,style:{"font-style":`italic`}},{default:o(()=>[_(`div`,{class:`q-py-xs markdown-thinking`,innerHTML:s.value},null,8,V)]),_:1},8,[`label`])):(t(),m(`span`,H,c(e.item.text),1))])):u(``,!0)}}),[[`__scopeId`,`data-v-e9fb9f90`]]);function W(e,t){let n=e.split(`
+`),r=t.split(`
+`),i=n.length,a=r.length,o=Array.from({length:i+1},()=>Array(a+1).fill(0));for(let e=i-1;e>=0;e--)for(let t=a-1;t>=0;t--)n[e]===r[t]?o[e][t]=o[e+1][t+1]+1:o[e][t]=Math.max(o[e+1][t],o[e][t+1]);let s=[],c=0,l=0;for(;c<i&&l<a;)n[c]===r[l]?(s.push({type:`context`,content:n[c]}),c++,l++):o[c+1][l]>=o[c][l+1]?(s.push({type:`del`,content:n[c]}),c++):(s.push({type:`add`,content:r[l]}),l++);for(;c<i;)s.push({type:`del`,content:n[c++]});for(;l<a;)s.push({type:`add`,content:r[l++]});return s}function G(e,t){if(!t||typeof t!=`object`)return null;let n=t;if(e===`Edit`){let e=n.file_path;if(!e)return null;let t=n.old_string??``,r=n.new_string??``;return{toolName:`Edit`,filePath:e,oldString:t,newString:r,replaceAll:n.replace_all??!1,additions:r?r.split(`
+`).length:0,deletions:t?t.split(`
+`).length:0}}if(e===`Write`){let e=n.file_path;if(!e)return null;let t=n.content??``;return{toolName:`Write`,filePath:e,content:t,additions:t?t.split(`
+`).length:0,deletions:0}}if(e===`Bash`){let e=(n.command??``).match(/^\s*rm\s+(?:-[a-zA-Z]*\s+)*(.+)/);if(e)return{toolName:`Bash:rm`,filePath:e[1].trim().replace(/["']/g,``),additions:0,deletions:1}}return null}function K(e,t){if(!e||!t?.projectPath)return e;let n=q(e,`${t.projectPath}/.worktrees/${t.workingBranch}`);return n===e&&(n=q(e,t.projectPath)),n}function q(e,t){if(!t)return e;let n=t.replace(/[.*+?^${}()|[\]\\]/g,`\\$&`);return e.replace(RegExp(`${n}/`,`g`),``).replace(RegExp(`${n}(?=\\s|$|["'\`])`,`g`),`.`)}var J={class:`tool-name`},Y=[`title`],X={key:0,class:`tool-stat-add`},re={key:1,class:`tool-stat-del`},ie={class:`diff-sign`},ae={key:1,class:`tool-row tool-row-generic`},Z={class:`tool-header`},oe={class:`tool-name`},se=[`title`],ce={key:0,class:`tool-output`},le=M(v({__name:`ToolCallItem`,props:{item:{}},setup(e){let n=e,i=a(!1),o=E(),g=p(()=>G(n.item.name,n.item.input)),v=p(()=>g.value?K(g.value.filePath,o.selectedWorkspace):``),y={Bash:`terminal`,Read:`description`,Edit:`edit`,Write:`edit_note`,MultiEdit:`edit`,Glob:`folder_open`,Grep:`manage_search`,LS:`list`,Skill:`auto_awesome`,Task:`hub`,Agent:`hub`,TodoWrite:`checklist`,TodoRead:`checklist`,ToolSearch:`search`,WebFetch:`public`,WebSearch:`travel_explore`,NotebookRead:`book`,NotebookEdit:`edit_note`,SendMessage:`send`,ExitPlanMode:`check_circle_outline`,KillShell:`stop_circle`,BashOutput:`terminal`},x=p(()=>y[n.item.name]??`build`),C=p(()=>{if(g.value)return``;let e=n.item.input,t=w(e);return t?K(t,o.selectedWorkspace):``});function w(e){if(!e||typeof e!=`object`)return typeof e==`string`?e:``;let t=e;for(let e of[`file_path`,`path`,`command`,`pattern`,`query`,`url`,`skill`,`description`,`subject`,`prompt`]){let n=t[e];if(typeof n==`string`&&n.length>0)return n}for(let e of Object.values(t))if(typeof e==`string`&&e.length>0)return e;return``}let T=p(()=>{let e=g.value;return e?e.toolName===`Edit`&&e.oldString!==void 0&&e.newString!==void 0?W(e.oldString,e.newString):e.toolName===`Write`&&e.content!==void 0?e.content.split(`
+`).map(e=>({type:`add`,content:e})):e.toolName===`Bash:rm`?[{type:`del`,content:`File deleted`}]:null:null}),D=p(()=>{let e=n.item.result;if(!e)return``;if(typeof e.output==`string`)return e.output;try{return JSON.stringify(e.output)}catch{return String(e.output)}});function O(){i.value=!i.value}return(n,a)=>g.value?(t(),m(`div`,{key:0,class:s([`tool-row`,{"tool-row-expanded":i.value}])},[_(`div`,{class:`tool-header`,onClick:O},[d(S,{name:x.value,size:`14px`,class:`tool-icon`},null,8,[`name`]),_(`span`,J,c(g.value.toolName===`Bash:rm`?`Bash`:g.value.toolName),1),_(`span`,{class:`tool-path`,title:g.value.filePath},c(v.value),9,Y),g.value.additions>0?(t(),m(`span`,X,`+`+c(g.value.additions),1)):u(``,!0),g.value.deletions>0?(t(),m(`span`,re,`-`+c(g.value.deletions),1)):u(``,!0),e.item.result?.isError?(t(),l(S,{key:2,name:`error_outline`,color:`negative`,size:`xs`,class:`q-ml-xs`})):e.item.result?(t(),l(S,{key:3,name:`check`,color:`positive`,size:`xs`,class:`q-ml-xs`})):u(``,!0),d(S,{name:i.value?`expand_less`:`expand_more`,size:`xs`,class:`q-ml-auto text-grey-6`},null,8,[`name`])]),i.value&&T.value?(t(),m(`div`,{key:0,class:`tool-diff`,onClick:a[0]||=b(()=>{},[`stop`])},[(t(!0),m(h,null,r(T.value,(e,n)=>(t(),m(`div`,{key:n,class:s([`diff-line`,{"diff-del":e.type===`del`,"diff-add":e.type===`add`,"diff-context":e.type===`context`}])},[_(`span`,ie,c(e.type===`del`?`-`:e.type===`add`?`+`:` `),1),f(c(e.content),1)],2))),128))])):u(``,!0)],2)):(t(),m(`div`,ae,[_(`div`,Z,[d(S,{name:x.value,size:`14px`,class:`tool-icon`},null,8,[`name`]),_(`span`,oe,c(e.item.name),1),C.value?(t(),m(`span`,{key:0,class:`tool-arg`,title:w(e.item.input)||C.value},c(C.value),9,se)):u(``,!0),e.item.result?.isError?(t(),l(S,{key:1,name:`error_outline`,color:`negative`,size:`xs`,class:`q-ml-auto`})):e.item.result?(t(),l(S,{key:2,name:`check`,color:`positive`,size:`xs`,class:`q-ml-auto`})):u(``,!0)]),e.item.result&&D.value?(t(),m(`div`,ce,c(D.value),1)):u(``,!0)]))}}),[[`__scopeId`,`data-v-440d2c83`]]),ue=[`innerHTML`],de={key:1,class:`markdown-message`},fe=[`innerHTML`],pe=M(v({__name:`UserMessageItem`,props:{item:{}},setup(e){let n=e,r=p(()=>n.item.sender===`system-prompt`),i=p(()=>{let e=j.parse(n.item.content,{async:!1,breaks:!0,gfm:!0});return A.sanitize(e)});return(e,n)=>r.value?(t(),l(k,{key:0,dense:``,"dense-toggle":``,label:e.$t(`chat.systemPrompt`),"header-class":`text-grey-5 text-caption`},{default:o(()=>[_(`div`,{class:`q-py-xs markdown-user-prompt`,innerHTML:i.value},null,8,ue)]),_:1},8,[`label`])):(t(),m(`div`,de,[_(`div`,{innerHTML:i.value},null,8,fe)]))}}),[[`__scopeId`,`data-v-cb8cec0f`]]),me={class:`turn-header`},he={key:0,class:`turn-time`},ge={key:1,class:`turn-actions`},_e={class:`turn-body`},ve=M(v({__name:`TurnCard`,props:{turn:{}},setup(e){let n=e,{t:i}=w(),a=p(()=>{switch(n.turn.speaker){case`user`:return{label:i(`chat.you`),accent:`#ce93d8`,badgeClass:`turn-badge-user`};case`agent`:return{label:i(`chat.agent`),accent:`#7986cb`,badgeClass:`turn-badge-agent`};case`system-prompt`:return{label:i(`chat.systemPrompt`),accent:`#757575`,badgeClass:`turn-badge-system`};case`session`:return{label:i(`chat.session`),accent:`#616161`,badgeClass:`turn-badge-session`}}}),o=p(()=>{if(!n.turn.ts)return``;let e=new Date(n.turn.ts);return Number.isNaN(e.getTime())?``:e.toLocaleTimeString(void 0,{hour:`2-digit`,minute:`2-digit`})}),d=p(()=>n.turn.items.filter(e=>e.type===`tool`).length);return(n,f)=>(t(),m(`div`,{class:s([`turn-card`,{"turn-card--user":e.turn.speaker===`user`}]),style:y({"--turn-accent":a.value.accent})},[_(`div`,me,[_(`span`,{class:s([`turn-badge`,a.value.badgeClass])},c(a.value.label),3),o.value?(t(),m(`span`,he,c(o.value),1)):u(``,!0),d.value>0?(t(),m(`span`,ge,` · `+c(g(i)(`chat.nActions`,{n:d.value})),1)):u(``,!0)]),_(`div`,_e,[(t(!0),m(h,null,r(e.turn.items,(e,n)=>(t(),m(h,{key:n},[e.type===`text`?(t(),l(z,{key:0,item:e},null,8,[`item`])):e.type===`thinking`?(t(),l(U,{key:1,item:e},null,8,[`item`])):e.type===`tool`?(t(),l(le,{key:2,item:e},null,8,[`item`])):e.type===`user`?(t(),l(pe,{key:3,item:e},null,8,[`item`])):e.type===`session`?(t(),l(I,{key:4,item:e},null,8,[`item`])):u(``,!0)],64))),128))])],6))}}),[[`__scopeId`,`data-v-8a9ce6dd`]]),ye={key:0,class:`activity-feed-switching`},be={key:1,class:`activity-feed-wrap`},xe={key:0,class:`text-center q-py-sm text-caption text-grey-6`},Se={class:`q-pa-md`},Ce={key:1,class:`q-px-md q-pb-md`},we=60,Q=200,$=200,Te=400,Ee=200,De=M(v({__name:`ActivityFeed`,props:{workspaceId:{}},setup(s){let g=s,v=T(),y=D(),b=E(),S=p(()=>(b.activityFeeds[g.workspaceId]??[]).filter(e=>e.type===`text`&&typeof e.content==`string`).map(e=>({content:e.content,sender:e.meta?.sender??`user`,ts:e.timestamp,sessionId:e.sessionId}))),w=p(()=>{let e=b.workspaces.find(e=>e.id===g.workspaceId);return e?e.status===`extracting`||e.status===`brainstorming`||e.status===`executing`:!1}),A=p(()=>{let e=te(N(v.eventsFor(g.workspaceId),v.timestampsFor(g.workspaceId),w.value),S.value);return ne(y.showVerboseSystemMessages?e:e.filter(e=>e.type!==`session`))}),j=p(()=>y.showVerboseSystemMessages?v.eventsFor(g.workspaceId).filter(e=>e.kind===`message:raw`).map(e=>e.content):[]),M=a(null),P=!0,F=a(!1),I=!1,L=a(!0);function R(e){P=e.verticalSize-e.verticalPosition-e.verticalContainerSize<=we,I&&e.verticalPosition<=Q&&!F.value&&v.hasMoreOlderFor(g.workspaceId)&&z()}async function z(){let t=g.workspaceId,n=v.oldestIdFor(t);if(!n)return;F.value=!0;let r=Date.now();try{let r=M.value,i=r?.getScroll().verticalSize??0,a=r?.getScroll().verticalPosition??0,o=fetch(`/api/workspaces/${t}/events?before=${encodeURIComponent(n)}&limit=200`),s=new Promise(e=>setTimeout(e,$)),[c]=await Promise.all([o,s]);if(!c.ok){v.prepend(t,[],[],{oldestId:n,hasMoreOlder:!1});return}let l=await c.json(),u=l.events??[],d=u.filter(e=>e.type===`agent:event`&&e.workspaceId===t),f=u.filter(e=>e.type===`user:message`&&e.workspaceId===t),p=d.map(e=>e.payload),m=d.map(e=>e.createdAt),h=d.map(e=>e.sessionId??null),g=u.length>0?u[0].id:n;v.prepend(t,p,m,{oldestId:g,hasMoreOlder:l.hasMore,sessionIds:h});for(let e of f){let n=e.payload;typeof n.content==`string`&&b.addActivityItem(t,{id:e.id,type:`text`,content:n.content,timestamp:e.createdAt,sessionId:e.sessionId??void 0,meta:{sender:n.sender??`user`}})}if(await e(),r){let e=r.getScroll().verticalSize-i,t=Math.max(a+e,Q+50);r.setScrollPosition(`vertical`,t,0)}}catch(e){console.error(`[ActivityFeed] failed to load older events:`,e)}finally{let e=Date.now()-r,t=Math.max(0,$-e);await new Promise(e=>setTimeout(e,t+Te)),F.value=!1}}async function B(t=0){await e();let n=M.value;if(!n)return;let r=n.getScroll();n.setScrollPosition(`vertical`,r.verticalSize,t)}let V=a([]),H=a(null);function U(){let e=A.value,t=V.value,n=[];if(t.length===e.length){for(let r=0;r<e.length;r++){if(e[r].speaker!==`user`)continue;let i=t[r]?.$el;i&&n.push(i)}if(n.length>0)return n}let r=H.value?.parentElement;if(r){let e=r.querySelectorAll(`.turn-card--user`);for(let t of e)n.push(t)}return n}function W(){let e=M.value;if(!e)return null;let t=H.value;if(!t)return null;let n=e.getScroll().verticalPosition,r=t.getBoundingClientRect().top,i=null;for(let e of U()){let t=e.getBoundingClientRect().top-r;if(t<n-40)i=t;else break}return i}async function G(){let t=M.value;if(!t)return;let n=W();if(n===null)for(let t=0;t<15&&v.hasMoreOlderFor(g.workspaceId);t++){for(;F.value;)await new Promise(e=>setTimeout(e,50));if(await z(),await e(),n=W(),n!==null)break}n!==null&&t.setScrollPosition(`vertical`,Math.max(0,n-12),250)}async function K(){I=!1,await e(),await B(0),requestAnimationFrame(()=>{requestAnimationFrame(()=>{I=!0})})}let q=p(()=>v.eventsFor(g.workspaceId).length);async function J(){L.value=!0;let e=Date.now();await new Promise(e=>setTimeout(e,Ee));let t=e+5e3;for(;q.value===0&&Date.now()<t;)await new Promise(e=>setTimeout(e,50));L.value=!1}n(L,async e=>{!e&&q.value>0&&await K()}),i(()=>{J(),q.value>0&&K()});let Y=!1;return n(q,async(e,t)=>{if(!Y&&e>0){Y=!0,await K();return}e>t&&P&&!F.value&&await B(180)}),n(()=>g.workspaceId,()=>{P=!0,Y=!1,I=!1,J(),q.value>0&&K()}),n(()=>b.selectedSessionId,async()=>{P=!0,I=!1,await K()}),n(p(()=>S.value.filter(e=>e.sender!==`system-prompt`).length),async(e,t)=>{e>t&&(P=!0,await B(180))}),(e,n)=>L.value?(t(),m(`div`,ye,[d(O,{size:`40px`,color:`indigo-4`})])):(t(),m(`div`,be,[d(ee,{ref_key:`scrollRef`,ref:M,class:`activity-feed-scroll`,onScroll:R},{default:o(()=>[_(`div`,{ref_key:`contentOriginRef`,ref:H,class:`content-origin-marker`},null,512),F.value?(t(),m(`div`,xe,[d(x,{size:`sm`}),f(` `+c(e.$t(`activity.loading_older`)),1)])):u(``,!0),_(`div`,Se,[(t(!0),m(h,null,r(A.value,(e,n)=>(t(),l(ve,{key:n,ref_for:!0,ref_key:`turnRefs`,ref:V,turn:e},null,8,[`turn`]))),128))]),j.value.length?(t(),m(`div`,Ce,[d(k,{label:e.$t(`activity.raw_lines`,{n:j.value.length}),dense:``},{default:o(()=>[(t(!0),m(h,null,r(j.value,(e,n)=>(t(),m(`div`,{key:n,class:`text-caption text-grey q-pa-xs`},c(e),1))),128))]),_:1},8,[`label`])])):u(``,!0)]),_:1},512),d(C,{round:``,dense:``,unelevated:``,color:`grey-9`,"text-color":`grey-3`,icon:`arrow_upward`,size:`sm`,class:`activity-feed-prev-btn`,title:e.$t(`activity.prev_user_message`),onClick:G},null,8,[`title`])]))}}),[[`__scopeId`,`data-v-51e2c6eb`]]);export{De as default};