crewx 0.8.1 → 0.8.2-rc.2

package/dist-server/domain/task/task.service.js

@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 var TaskService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskService = void 0;
@@ -18,8 +21,8 @@ const fs_1 = require("fs");
 const child_process_1 = require("child_process");
 const js_yaml_1 = require("js-yaml");
 const task_constants_js_1 = require("./task.constants.js");
-const crewx_tool_factory_js_1 = require("../mcp/crewx-tool.factory.js");
 const sdk_1 = require("@crewx/sdk");
+const sdk_2 = require("@crewx/sdk");
 const task_repository_js_1 = require("../../repository/task.repository.js");
 const workspace_context_store_js_1 = require("../../common/workspace-context.store.js");
 const MAX_LOG_ENTRY_FIELD_LEN = 128 * 1024; // 128KB worth of UTF-16 code units
@@ -28,9 +31,11 @@ const MAX_LOG_ENTRY_FIELD_LEN = 128 * 1024; // 128KB worth of UTF-16 code units
 // TSK005 uses crewx.db for execution status and logs.
 let TaskService = TaskService_1 = class TaskService {
     taskRepo;
+    crewx;
     logger = new common_1.Logger(TaskService_1.name);
-    constructor(taskRepo) {
+    constructor(taskRepo, crewx) {
         this.taskRepo = taskRepo;
+        this.crewx = crewx;
     }
     // TSK.ALL: All tasks from crewx.db with filtering, search, and pagination
     getAllTasks(params, workspaceId) {
@@ -72,14 +77,14 @@ let TaskService = TaskService_1 = class TaskService {
         if (!agent || typeof agent !== 'string' || !agent.trim()) {
             throw new common_1.BadRequestException('agent is required');
         }
-        // Fire-and-forget: start CLI execution in background so HTTP response is immediate
-        (0, crewx_tool_factory_js_1.getCrewXTool)()
-            .then((tool) => tool.executeAgent({
-            agentId: agent,
-            task: message,
+        // Fire-and-forget: delegate to shared Crewx singleton (ConversationPlugin
+        // handles threads row upsert). Never close the instance — CrewxModule owns it.
+        this.crewx
+            .execute(`@${agent}`, message, {
+            threadId,
             platform: 'cli',
             metadata: { thread: threadId },
-        }))
+        })
             .catch((err) => {
             this.logger.error(`Background executeAgent failed [thread=${threadId}]: ${err.message}`, err.stack);
         });
@@ -391,7 +396,7 @@ let TaskService = TaskService_1 = class TaskService {
         const entries = [];
         for (const log of rawLogs) {
             if (log.level === 'stdout') {
-                entries.push(...(0, sdk_1.parseStdoutEvent)(log.timestamp, log.message));
+                entries.push(...(0, sdk_2.parseStdoutEvent)(log.timestamp, log.message));
             }
             else if (log.level === 'info') {
                 entries.push({
@@ -650,5 +655,7 @@ let TaskService = TaskService_1 = class TaskService {
 exports.TaskService = TaskService;
 exports.TaskService = TaskService = TaskService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [task_repository_js_1.TaskRepository])
+    __param(1, (0, common_1.Inject)(sdk_1.Crewx)),
+    __metadata("design:paramtypes", [task_repository_js_1.TaskRepository,
+        sdk_1.Crewx])
 ], TaskService);

package/dist-server/domain/thread/dto/update-thread.dto.js

@@ -0,0 +1,23 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateThreadDto = void 0;
+const class_validator_1 = require("class-validator");
+class UpdateThreadDto {
+    title;
+}
+exports.UpdateThreadDto = UpdateThreadDto;
+__decorate([
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.MinLength)(1),
+    (0, class_validator_1.MaxLength)(120),
+    __metadata("design:type", String)
+], UpdateThreadDto.prototype, "title", void 0);

package/dist-server/domain/thread/thread.controller.js

@@ -19,6 +19,7 @@ const thread_service_js_1 = require("./thread.service.js");
 const box_service_js_1 = require("../box/box.service.js");
 const list_threads_dto_js_1 = require("./dto/list-threads.dto.js");
 const build_context_dto_js_1 = require("./dto/build-context.dto.js");
+const update_thread_dto_js_1 = require("./dto/update-thread.dto.js");
 const workspace_decorator_js_1 = require("../../common/decorators/workspace.decorator.js");
 let ThreadController = class ThreadController {
     threadService;
@@ -32,6 +33,11 @@ let ThreadController = class ThreadController {
         const data = this.threadService.listThreads(query, ws.id);
         return { success: true, data };
     }
+    // THD.UPDATE: Update thread title
+    updateThread(threadId, dto, ws) {
+        const data = this.threadService.updateThread(threadId, ws.id, { title: dto.title });
+        return { success: true, data };
+    }
     // THD.GET: Get thread meta info (messages moved to MSG.LIST)
     getThread(threadId, ws) {
         const data = this.threadService.getThread(threadId, ws.id);
@@ -68,6 +74,16 @@ __decorate([
     __metadata("design:paramtypes", [list_threads_dto_js_1.ListThreadsDto, Object]),
     __metadata("design:returntype", void 0)
 ], ThreadController.prototype, "listThreads", null);
+__decorate([
+    (0, swagger_1.ApiOperation)({ operationId: 'THD.UPDATE', summary: 'Update thread title' }),
+    (0, common_1.Patch)(':threadId'),
+    __param(0, (0, common_1.Param)('threadId')),
+    __param(1, (0, common_1.Body)()),
+    __param(2, (0, workspace_decorator_js_1.Workspace)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, update_thread_dto_js_1.UpdateThreadDto, Object]),
+    __metadata("design:returntype", void 0)
+], ThreadController.prototype, "updateThread", null);
 __decorate([
     (0, swagger_1.ApiOperation)({ operationId: 'THD.GET', summary: 'Get thread meta info' }),
     (0, common_1.Get)(':threadId'),

package/dist-server/domain/thread/thread.service.js

@@ -101,6 +101,15 @@ let ThreadService = class ThreadService {
             },
         };
     }
+    // THD.UPDATE: Update thread title (locks against auto-overwrite)
+    updateThread(threadId, workspaceId, patch) {
+        this.validateId(threadId);
+        const updated = this.threadRepo.updateThreadTitle(threadId, patch.title, workspaceId);
+        if (!updated) {
+            throw new common_1.NotFoundException(`Thread not found: ${threadId}`);
+        }
+        return { threadId, title: patch.title };
+    }
     // TSK.LIST: List tasks for a thread (polling)
     getThreadTasks(threadId, workspaceId) {
         this.validateId(threadId);

package/dist-server/main.js

@@ -92,7 +92,7 @@ async function bootstrap() {
         // Fallback to index.html for SPA routing
         app.use((req, res, next) => {
             if (!req.path.startsWith('/api/') && !req.path.startsWith('/mcp')) {
-                res.sendFile((0, path_1.join)(staticPath, 'index.html'));
+                res.sendFile('index.html', { root: staticPath });
             }
             else {
                 next();

package/dist-server/modules/crewx.module.js

@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrewxModule = void 0;
 const common_1 = require("@nestjs/common");
@@ -16,6 +19,10 @@ const crewx_server_js_1 = require("../bootstrap/crewx-server.js");
  * CrewxModule — NestJS DI Provider for the Crewx facade.
  *
  * Loads crewx.yaml from the server workspace at boot time via async factory.
+ * The resulting instance is a singleton shared across web / MCP / any other
+ * path that needs Crewx. Do NOT call crewx.close() from call sites — the
+ * module owns the instance lifecycle via onApplicationShutdown.
+ *
  * Resolution order:
  *   1. CREWX_CONFIG env var (full file path)
  *   2. CREWX_WORKSPACE env var + crewx.yaml
@@ -23,6 +30,13 @@ const crewx_server_js_1 = require("../bootstrap/crewx-server.js");
  *   4. process.cwd() + crewx.yml
  */
 let CrewxModule = class CrewxModule {
+    crewx;
+    constructor(crewx) {
+        this.crewx = crewx;
+    }
+    async onApplicationShutdown() {
+        await this.crewx.close().catch(() => { });
+    }
 };
 exports.CrewxModule = CrewxModule;
 exports.CrewxModule = CrewxModule = __decorate([
@@ -46,5 +60,6 @@ exports.CrewxModule = CrewxModule = __decorate([
             },
         ],
         exports: [sdk_1.Crewx],
-    })
+    }),
+    __metadata("design:paramtypes", [sdk_1.Crewx])
 ], CrewxModule);

package/dist-server/repository/box.repository.js

@@ -20,12 +20,12 @@ let BoxRepository = class BoxRepository extends base_sqlite_repository_js_1.Base
         const db = this.openReadonly(dbPath);
         try {
             this.ensureThreadExists(db, threadId);
-            return db.all(`
-        SELECT id, thread_id, seq, first_task_id, mid_task_id, last_task_id,
-               task_count, summary, source_tokens, summary_tokens, created_at
-        FROM thread_boxes
-        WHERE thread_id = ?
-        ORDER BY seq ASC
+            return db.all(`
+        SELECT id, thread_id, seq, first_task_id, mid_task_id, last_task_id,
+               task_count, summary, source_tokens, summary_tokens, created_at
+        FROM thread_boxes
+        WHERE thread_id = ?
+        ORDER BY seq ASC
       `, [threadId]);
         }
         catch (error) {
@@ -48,11 +48,11 @@ let BoxRepository = class BoxRepository extends base_sqlite_repository_js_1.Base
         }
         const db = this.openReadonly(dbPath);
         try {
-            const row = db.get(`
-        SELECT id, thread_id, seq, first_task_id, mid_task_id, last_task_id,
-               task_count, summary, source_tokens, summary_tokens, created_at
-        FROM thread_boxes
-        WHERE id = ? AND thread_id = ?
+            const row = db.get(`
+        SELECT id, thread_id, seq, first_task_id, mid_task_id, last_task_id,
+               task_count, summary, source_tokens, summary_tokens, created_at
+        FROM thread_boxes
+        WHERE id = ? AND thread_id = ?
       `, [boxId, threadId]);
             if (!row) {
                 throw new common_1.NotFoundException(`Box not found: ${boxId} in thread: ${threadId}`);
@@ -81,11 +81,11 @@ let BoxRepository = class BoxRepository extends base_sqlite_repository_js_1.Base
         try {
             this.ensureThreadExists(db, threadId);
             try {
-                db.run(`
-          INSERT INTO thread_boxes
-            (id, thread_id, seq, first_task_id, mid_task_id, last_task_id,
-             task_count, summary, source_tokens, summary_tokens, created_at)
-          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                db.run(`
+          INSERT INTO thread_boxes
+            (id, thread_id, seq, first_task_id, mid_task_id, last_task_id,
+             task_count, summary, source_tokens, summary_tokens, created_at)
+          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         `, [
                     data.id,
                     threadId,
@@ -106,10 +106,10 @@ let BoxRepository = class BoxRepository extends base_sqlite_repository_js_1.Base
                 }
                 throw error;
             }
-            return db.get(`
-        SELECT id, thread_id, seq, first_task_id, mid_task_id, last_task_id,
-               task_count, summary, source_tokens, summary_tokens, created_at
-        FROM thread_boxes WHERE id = ?
+            return db.get(`
+        SELECT id, thread_id, seq, first_task_id, mid_task_id, last_task_id,
+               task_count, summary, source_tokens, summary_tokens, created_at
+        FROM thread_boxes WHERE id = ?
       `, [data.id]);
         }
         catch (error) {

package/dist-server/repository/project.repository.js

@@ -31,9 +31,9 @@ let ProjectRepository = class ProjectRepository extends base_sqlite_repository_j
         }
         // Backfill workspace_path for rows that still have it in the old repo_path column
         try {
-            db.run(`
-        UPDATE workspaces SET workspace_path = repo_path
-        WHERE (workspace_path IS NULL OR workspace_path = '') AND repo_path IS NOT NULL AND repo_path != ''
+            db.run(`
+        UPDATE workspaces SET workspace_path = repo_path
+        WHERE (workspace_path IS NULL OR workspace_path = '') AND repo_path IS NOT NULL AND repo_path != ''
       `);
         }
         catch {
@@ -86,13 +86,13 @@ let ProjectRepository = class ProjectRepository extends base_sqlite_repository_j
         const db = this.openProjectDb();
         try {
             const countRow = db.get('SELECT COUNT(*) as count FROM threads WHERE workspace_id = ?', [id]);
-            const rows = db.all(`
-        SELECT t.*,
-          (SELECT agent_id FROM tasks tk WHERE tk.thread_id = t.id AND tk.agent_id IS NOT NULL ORDER BY tk.started_at ASC LIMIT 1) AS agent_id
-        FROM threads t
-        WHERE t.workspace_id = ?
-        ORDER BY t.updated_at DESC
-        LIMIT ? OFFSET ?
+            const rows = db.all(`
+        SELECT t.*,
+          (SELECT agent_id FROM tasks tk WHERE tk.thread_id = t.id AND tk.agent_id IS NOT NULL ORDER BY tk.started_at ASC LIMIT 1) AS agent_id
+        FROM threads t
+        WHERE t.workspace_id = ?
+        ORDER BY t.updated_at DESC
+        LIMIT ? OFFSET ?
       `, [id, params.limit, params.offset]);
             return { rows, total: countRow.count };
         }
@@ -128,9 +128,9 @@ let ProjectRepository = class ProjectRepository extends base_sqlite_repository_j
         const db = this.openProjectDb(false);
         try {
             const now = new Date().toISOString();
-            db.run(`
-        INSERT INTO workspaces (id, slug, name, workspace_path, is_active, created_at, updated_at)
-        VALUES (?, ?, ?, ?, 1, ?, ?)
+            db.run(`
+        INSERT INTO workspaces (id, slug, name, workspace_path, is_active, created_at, updated_at)
+        VALUES (?, ?, ?, ?, 1, ?, ?)
       `, [id, slug, name, repoPath, now, now]);
             return db.get('SELECT * FROM workspaces WHERE id = ?', [id]);
         }

package/dist-server/repository/request-log.repository.js

@@ -15,16 +15,16 @@ const common_1 = require("@nestjs/common");
 const base_sqlite_repository_js_1 = require("./base-sqlite.repository.js");
 let RequestLogRepository = class RequestLogRepository extends base_sqlite_repository_js_1.BaseSqliteRepository {
     static { RequestLogRepository_1 = this; }
-    static INSERT_SQL = `
-    INSERT INTO request_logs (
-      id, path, method, status_code, duration_ms,
-      ip, request_headers, response_headers, request_body, response_body,
-      query, user_id, project_id, partition_key, timestamp, metadata
-    ) VALUES (
-      ?, ?, ?, ?, ?,
-      ?, ?, ?, ?, ?,
-      ?, ?, ?, ?, ?, ?
-    )
+    static INSERT_SQL = `
+    INSERT INTO request_logs (
+      id, path, method, status_code, duration_ms,
+      ip, request_headers, response_headers, request_body, response_body,
+      query, user_id, project_id, partition_key, timestamp, metadata
+    ) VALUES (
+      ?, ?, ?, ?, ?,
+      ?, ?, ?, ?, ?,
+      ?, ?, ?, ?, ?, ?
+    )
   `;
     logger = new common_1.Logger(RequestLogRepository_1.name);
     db = null;

package/dist-server/repository/task.repository.js

@@ -23,16 +23,16 @@ let TaskRepository = class TaskRepository extends base_sqlite_repository_js_1.Ba
             const db = this.openReadonly(dbPath);
             try {
                 // Primary lookup: by internal task UUID
-                let row = db.get(`SELECT id, agent_id, status, started_at, completed_at, duration_ms,
-                  error, caller_agent_id, parent_task_id, logs,
-                  prompt, result, model, thread_id, input_tokens, output_tokens, cost_usd, metadata
+                let row = db.get(`SELECT id, agent_id, status, started_at, completed_at, duration_ms,
+                  error, caller_agent_id, parent_task_id, logs,
+                  prompt, result, model, thread_id, input_tokens, output_tokens, cost_usd, metadata
            FROM tasks WHERE id = ?${wsFilter}`, [taskId, ...wsParams]);
                 // Fallback: treat taskId as thread/conversation name
                 if (!row) {
-                    row = db.get(`SELECT id, agent_id, status, started_at, completed_at, duration_ms,
-                    error, caller_agent_id, parent_task_id, logs,
-                    prompt, result, model, thread_id, input_tokens, output_tokens, cost_usd, metadata
-             FROM tasks WHERE (thread_id = ? OR (thread_id IS NULL AND command LIKE ?))${wsFilter}
+                    row = db.get(`SELECT id, agent_id, status, started_at, completed_at, duration_ms,
+                    error, caller_agent_id, parent_task_id, logs,
+                    prompt, result, model, thread_id, input_tokens, output_tokens, cost_usd, metadata
+             FROM tasks WHERE (thread_id = ? OR (thread_id IS NULL AND command LIKE ?))${wsFilter}
              ORDER BY started_at DESC LIMIT 1`, [taskId, `%--thread=${taskId}%`, ...wsParams]);
                 }
                 if (row)
@@ -51,7 +51,7 @@ let TaskRepository = class TaskRepository extends base_sqlite_repository_js_1.Ba
     }
     /** Get child tasks for a parent task. */
     findChildTasks(db, parentTaskId) {
-        return db.all(`SELECT id, agent_id, status, started_at, completed_at, duration_ms, error, logs
+        return db.all(`SELECT id, agent_id, status, started_at, completed_at, duration_ms, error, logs
        FROM tasks WHERE parent_task_id = ? ORDER BY started_at ASC`, [parentTaskId]);
     }
     /** Get workspace usage summary, optionally filtered by workspaceId. */
@@ -63,18 +63,18 @@ let TaskRepository = class TaskRepository extends base_sqlite_repository_js_1.Ba
         try {
             const whereClause = workspaceId ? `WHERE workspace_id = ?` : '';
             const queryParams = workspaceId ? [workspaceId] : [];
-            return db.all(`
-        SELECT
-          COALESCE(workspace_id, 'unknown') AS workspace_id,
-          COALESCE(workspace_name, 'Unknown Workspace') AS workspace_name,
-          SUM(input_tokens) AS input_tokens,
-          SUM(output_tokens) AS output_tokens,
-          SUM(cost_usd) AS cost_usd,
-          COUNT(*) AS task_count
-        FROM tasks
-        ${whereClause}
-        GROUP BY workspace_id, workspace_name
-        ORDER BY (SUM(input_tokens) + SUM(output_tokens)) DESC
+            return db.all(`
+        SELECT
+          COALESCE(workspace_id, 'unknown') AS workspace_id,
+          COALESCE(workspace_name, 'Unknown Workspace') AS workspace_name,
+          SUM(input_tokens) AS input_tokens,
+          SUM(output_tokens) AS output_tokens,
+          SUM(cost_usd) AS cost_usd,
+          COUNT(*) AS task_count
+        FROM tasks
+        ${whereClause}
+        GROUP BY workspace_id, workspace_name
+        ORDER BY (SUM(input_tokens) + SUM(output_tokens)) DESC
       `, queryParams);
         }
         catch (error) {
@@ -98,7 +98,7 @@ let TaskRepository = class TaskRepository extends base_sqlite_repository_js_1.Ba
                 continue;
             const db = this.openReadonly(dbPath);
             try {
-                const rows = db.all(`SELECT id, input_tokens, output_tokens, cost_usd
+                const rows = db.all(`SELECT id, input_tokens, output_tokens, cost_usd
            FROM tasks WHERE thread_id = ? OR (thread_id IS NULL AND command LIKE ?)`, [threadId, `%--thread=${threadId}%`]);
                 for (const row of rows) {
                     if (seenIds.has(row.id))
@@ -134,9 +134,9 @@ let TaskRepository = class TaskRepository extends base_sqlite_repository_js_1.Ba
                 const baseParams = [threadId, `%--thread=${threadId}%`];
                 if (workspaceId)
                     baseParams.push(workspaceId);
-                const rows = db.all(`SELECT id, agent_id, started_at, completed_at, logs
-           FROM tasks
-           WHERE (thread_id = ? OR (thread_id IS NULL AND command LIKE ?))${wsFilter}
+                const rows = db.all(`SELECT id, agent_id, started_at, completed_at, logs
+           FROM tasks
+           WHERE (thread_id = ? OR (thread_id IS NULL AND command LIKE ?))${wsFilter}
            ORDER BY started_at ASC`, baseParams);
                 for (const row of rows) {
                     if (!seenIds.has(row.id)) {
@@ -187,10 +187,10 @@ let TaskRepository = class TaskRepository extends base_sqlite_repository_js_1.Ba
             const countRow = db.get(`SELECT COUNT(*) AS cnt FROM tasks ${whereClause}`, queryParams);
             const total = countRow?.cnt ?? 0;
             const sortDir = params.sortDir === 'ASC' ? 'ASC' : 'DESC';
-            const tasks = db.all(`SELECT id, agent_id, status, prompt, model, started_at, completed_at, duration_ms,
-                input_tokens, output_tokens, cost_usd, thread_id
-         FROM tasks ${whereClause}
-         ORDER BY started_at ${sortDir}
+            const tasks = db.all(`SELECT id, agent_id, status, prompt, model, started_at, completed_at, duration_ms,
+                input_tokens, output_tokens, cost_usd, thread_id
+         FROM tasks ${whereClause}
+         ORDER BY started_at ${sortDir}
          LIMIT ? OFFSET ?`, [...queryParams, params.limit, params.offset]);
             return { tasks, total };
         }
@@ -215,34 +215,34 @@ let TaskRepository = class TaskRepository extends base_sqlite_repository_js_1.Ba
                     ? (params.push(workspace), `AND t.workspace_name = ?`)
                     : '';
                 // Provider derived from coding_agent_command first word (no agents table)
-                return db.all(`
-          SELECT
-            t.agent_id,
-            t.workspace_id,
-            t.workspace_name,
-            COALESCE(
-              'cli/' || SUBSTR(t.coding_agent_command, 1,
-                CASE WHEN INSTR(t.coding_agent_command, ' ') > 0
-                  THEN INSTR(t.coding_agent_command, ' ') - 1
-                  ELSE LENGTH(t.coding_agent_command)
-                END
-              ),
-              'unknown'
-            ) AS provider,
-            COALESCE(SUM(t.input_tokens), 0) AS input_tokens,
-            COALESCE(SUM(t.output_tokens), 0) AS output_tokens,
-            COALESCE(SUM(t.input_tokens), 0) + COALESCE(SUM(t.output_tokens), 0) AS total_tokens,
-            COALESCE(SUM(t.cost_usd), 0) AS total_cost,
-            COUNT(*) AS task_count,
-            COALESCE(SUM(t.duration_ms), 0) AS active_duration_ms,
-            MAX(t.completed_at) AS last_active_at
-          FROM tasks t
-          WHERE t.status IN ('completed', 'success')
-            AND t.started_at >= ?
-            AND t.started_at < ?
-            ${workspaceCondition}
-          GROUP BY t.agent_id, t.workspace_id, t.workspace_name, provider
-          ORDER BY total_tokens DESC
+                return db.all(`
+          SELECT
+            t.agent_id,
+            t.workspace_id,
+            t.workspace_name,
+            COALESCE(
+              'cli/' || SUBSTR(t.coding_agent_command, 1,
+                CASE WHEN INSTR(t.coding_agent_command, ' ') > 0
+                  THEN INSTR(t.coding_agent_command, ' ') - 1
+                  ELSE LENGTH(t.coding_agent_command)
+                END
+              ),
+              'unknown'
+            ) AS provider,
+            COALESCE(SUM(t.input_tokens), 0) AS input_tokens,
+            COALESCE(SUM(t.output_tokens), 0) AS output_tokens,
+            COALESCE(SUM(t.input_tokens), 0) + COALESCE(SUM(t.output_tokens), 0) AS total_tokens,
+            COALESCE(SUM(t.cost_usd), 0) AS total_cost,
+            COUNT(*) AS task_count,
+            COALESCE(SUM(t.duration_ms), 0) AS active_duration_ms,
+            MAX(t.completed_at) AS last_active_at
+          FROM tasks t
+          WHERE t.status IN ('completed', 'success')
+            AND t.started_at >= ?
+            AND t.started_at < ?
+            ${workspaceCondition}
+          GROUP BY t.agent_id, t.workspace_id, t.workspace_name, provider
+          ORDER BY total_tokens DESC
         `, params);
             }
             catch (error) {
@@ -263,18 +263,18 @@ let TaskRepository = class TaskRepository extends base_sqlite_repository_js_1.Ba
                 const workspaceCondition = workspace
                     ? (params.push(workspace), `AND t.workspace_name = ?`)
                     : '';
-                return db.all(`
-          SELECT
-            t.started_at,
-            t.agent_id,
-            COALESCE(t.input_tokens, 0) AS input_tokens,
-            COALESCE(t.output_tokens, 0) AS output_tokens
-          FROM tasks t
-          WHERE t.status IN ('completed', 'success')
-            AND t.started_at >= ?
-            AND t.started_at < ?
-            ${workspaceCondition}
-          ORDER BY t.started_at ASC
+                return db.all(`
+          SELECT
+            t.started_at,
+            t.agent_id,
+            COALESCE(t.input_tokens, 0) AS input_tokens,
+            COALESCE(t.output_tokens, 0) AS output_tokens
+          FROM tasks t
+          WHERE t.status IN ('completed', 'success')
+            AND t.started_at >= ?
+            AND t.started_at < ?
+            ${workspaceCondition}
+          ORDER BY t.started_at ASC
         `, params);
             }
             catch (error) {
@@ -315,7 +315,7 @@ let TaskRepository = class TaskRepository extends base_sqlite_repository_js_1.Ba
             const params = workspaceId
                 ? [error, now, taskId, workspaceId]
                 : [error, now, taskId];
-            db.run(`UPDATE tasks SET status = 'failed', error = ?, completed_at = ?
+            db.run(`UPDATE tasks SET status = 'failed', error = ?, completed_at = ?
          WHERE id = ? AND status = 'running'${wsFilter}`, params);
             const changes = db.get(`SELECT changes() AS cnt`);
             return (changes?.cnt ?? 0) > 0;
@@ -336,9 +336,9 @@ let TaskRepository = class TaskRepository extends base_sqlite_repository_js_1.Ba
             try {
                 const wsFilter = workspaceId ? ` AND workspace_id = ?` : '';
                 const params = workspaceId ? [`%${hint}%`, workspaceId] : [`%${hint}%`];
-                const rows = db.all(`SELECT id, agent_id, started_at, completed_at, logs
-           FROM tasks
-           WHERE prompt LIKE ?${wsFilter}
+                const rows = db.all(`SELECT id, agent_id, started_at, completed_at, logs
+           FROM tasks
+           WHERE prompt LIKE ?${wsFilter}
            ORDER BY started_at ASC`, params);
                 for (const row of rows) {
                     if (!seenIds.has(row.id)) {