funolio-agent 1.0.7 → 1.0.47

package/dist/local-data.js

@@ -58,9 +58,20 @@ exports.createConversation = createConversation;
 exports.getConversation = getConversation;
 exports.listConversations = listConversations;
 exports.countConversations = countConversations;
+exports.countMessagesForBot = countMessagesForBot;
+exports.listBotConversationActivity = listBotConversationActivity;
 exports.updateConversation = updateConversation;
+exports.touchConversationActivity = touchConversationActivity;
 exports.deleteConversation = deleteConversation;
 exports.addMessage = addMessage;
+exports.updateMessage = updateMessage;
+exports.createChatJob = createChatJob;
+exports.getChatJob = getChatJob;
+exports.getLatestConversationChatJob = getLatestConversationChatJob;
+exports.listQueuedChatJobs = listQueuedChatJobs;
+exports.countRunningChatJobs = countRunningChatJobs;
+exports.updateChatJob = updateChatJob;
+exports.markRunningChatJobsInterrupted = markRunningChatJobsInterrupted;
 exports.createMessageActivity = createMessageActivity;
 exports.attachMessageActivitiesToMessage = attachMessageActivitiesToMessage;
 exports.listMessageActivities = listMessageActivities;
@@ -104,6 +115,7 @@ exports.setSetting = setSetting;
 exports.setJsonSetting = setJsonSetting;
 exports.getAllSettings = getAllSettings;
 exports.deleteSetting = deleteSetting;
+exports.purgeLegacyExtractionDataOnce = purgeLegacyExtractionDataOnce;
 exports.defaultOrchestrationPolicy = defaultOrchestrationPolicy;
 exports.resolveCurrentUserIdentity = resolveCurrentUserIdentity;
 exports.getUserOrchestrationPolicy = getUserOrchestrationPolicy;
@@ -211,6 +223,7 @@ const memory_extraction_1 = require("./memory-extraction");
 const orchestrator_blocked_prompt_1 = require("./orchestration/orchestrator-blocked-prompt");
 const crypto = __importStar(require("crypto"));
 const default_tool_profile_1 = require("./default-tool-profile");
+const approval_1 = require("./approval");
 let _db = null;
 /** Get or open the shared database connection */
 function getDb() {
@@ -249,7 +262,7 @@ function createAgentProfile(p) {
         if (p.isOrchestrator) {
             db.prepare("UPDATE agent_profile SET is_orchestrator = 0, updated_at = datetime('now') WHERE is_orchestrator = 1").run();
         }
-        insert.run(id, p.provider, p.model, p.name, p.soulMd ?? null, p.memoryMd ?? null, p.toolsMd ?? null, p.skillsMd ?? null, p.apiKeyEnc ?? null, p.permissionMode ?? default_tool_profile_1.DEFAULT_PERMISSION_MODE, p.isDefault ? 1 : 0, p.roleLabel ?? null, p.roleClass ?? null, p.isActive !== false ? 1 : 0, p.priority ?? 100, p.providerConnectionId ?? null, p.color ?? null, p.purposeMd ?? null, p.identitySummary ?? null, p.finalPrompt ?? null, p.enabledBuiltinToolsJson ?? null, p.enabledMcpToolsJson ?? null, p.isOrchestrator ? 1 : 0, ts, ts);
+        insert.run(id, p.provider, p.model, p.name, p.soulMd ?? null, p.memoryMd ?? null, p.toolsMd ?? null, p.skillsMd ?? null, p.apiKeyEnc ?? null, (0, approval_1.normalizePermissionMode)(p.permissionMode ?? default_tool_profile_1.DEFAULT_PERMISSION_MODE), p.isDefault ? 1 : 0, p.roleLabel ?? null, p.roleClass ?? null, p.isActive !== false ? 1 : 0, p.priority ?? 100, p.providerConnectionId ?? null, p.color ?? null, p.purposeMd ?? null, p.identitySummary ?? null, p.finalPrompt ?? null, p.enabledBuiltinToolsJson ?? null, p.enabledMcpToolsJson ?? null, p.isOrchestrator ? 1 : 0, ts, ts);
     });
     transaction();
     return db.prepare('SELECT * FROM agent_profile WHERE id = ?').get(id);
@@ -286,7 +299,8 @@ function migrateAgentProfilesToDefaultToolProfile() {
         catch {
             tools = [];
         }
-        const needsPermission = !row.permission_mode || row.permission_mode === 'autopilot' || row.permission_mode === 'default';
+        const normalizedPermission = (0, approval_1.normalizePermissionMode)(row.permission_mode);
+        const needsPermission = !row.permission_mode || row.permission_mode !== normalizedPermission;
         const needsTools = tools.length === 0;
         if (!needsPermission && !needsTools)
             continue;
@@ -294,7 +308,7 @@ function migrateAgentProfilesToDefaultToolProfile() {
         const vals = [now()];
         if (needsPermission) {
             sets.push('permission_mode = ?');
-            vals.push(default_tool_profile_1.DEFAULT_PERMISSION_MODE);
+            vals.push(normalizedPermission);
         }
         if (needsTools) {
             sets.push('enabled_builtin_tools_json = ?');
@@ -347,7 +361,7 @@ function updateAgentProfile(id, fields) {
     }
     if (fields.permissionMode !== undefined) {
         sets.push('permission_mode = ?');
-        vals.push(fields.permissionMode);
+        vals.push((0, approval_1.normalizePermissionMode)(fields.permissionMode));
     }
     if (fields.isDefault !== undefined) {
         sets.push('is_default = ?');
@@ -660,37 +674,206 @@ function createConversation(agentId, title, source, opts) {
   `).run(id, agentId, title ?? null, source ?? 'local', projectId, projectName, ts, ts);
     return db.prepare('SELECT * FROM conversation WHERE id = ?').get(id);
 }
+function latestConversationSummarySql(conversationAlias) {
+    return `(
+    SELECT cs.summary_text
+    FROM conversation_summary cs
+    WHERE cs.conversation_id = ${conversationAlias}.id
+    ORDER BY cs.turn_range_end DESC, cs.created_at DESC
+    LIMIT 1
+  )`;
+}
+function primaryConversationTopicTitleSql(conversationAlias) {
+    return `(
+    SELECT t.title
+    FROM topic_segment ts
+    INNER JOIN topic t ON t.id = ts.topic_id
+    WHERE ts.conversation_id = ${conversationAlias}.id
+    ORDER BY ts.created_at ASC
+    LIMIT 1
+  )`;
+}
+function firstConversationUserMessageSql(conversationAlias, maxLength = 120) {
+    return `(
+    SELECT substr(trim(m.content), 1, ${maxLength})
+    FROM message m
+    WHERE m.conversation_id = ${conversationAlias}.id
+      AND m.role = 'user'
+      AND trim(coalesce(m.content, '')) <> ''
+      AND trim(coalesce(m.content, '')) NOT LIKE '[System Instructions]%'
+      AND trim(coalesce(m.content, '')) NOT LIKE '# AGENTS.md%'
+      AND trim(coalesce(m.content, '')) NOT LIKE '<INSTRUCTIONS%'
+      AND trim(coalesce(m.content, '')) NOT LIKE '<environment_context%'
+      AND trim(coalesce(m.content, '')) NOT LIKE 'CURRENT TODO ID:%'
+    ORDER BY m.seq ASC
+    LIMIT 1
+  )`;
+}
+function firstConversationAssistantMessageSql(conversationAlias, maxLength = 120) {
+    return `(
+    SELECT substr(trim(m.content), 1, ${maxLength})
+    FROM message m
+    WHERE m.conversation_id = ${conversationAlias}.id
+      AND m.role = 'assistant'
+      AND trim(coalesce(m.content, '')) <> ''
+    ORDER BY m.seq ASC
+    LIMIT 1
+  )`;
+}
+function conversationSelectSql(conversationAlias) {
+    const latestSummary = latestConversationSummarySql(conversationAlias);
+    const topicTitle = primaryConversationTopicTitleSql(conversationAlias);
+    const firstUserMessage = firstConversationUserMessageSql(conversationAlias);
+    const firstAssistantMessage = firstConversationAssistantMessageSql(conversationAlias);
+    return `
+    SELECT
+      ${conversationAlias}.*,
+      COALESCE(
+        CASE
+          WHEN ${conversationAlias}.title IS NOT NULL
+            AND trim(${conversationAlias}.title) <> ''
+            AND trim(${conversationAlias}.title) <> 'New Conversation'
+            AND trim(${conversationAlias}.title) NOT LIKE '[System Instructions]%'
+            AND trim(${conversationAlias}.title) NOT LIKE '# AGENTS.md%'
+            AND trim(${conversationAlias}.title) NOT LIKE '<INSTRUCTIONS%'
+            AND trim(${conversationAlias}.title) NOT LIKE '<environment_context%'
+            AND trim(${conversationAlias}.title) NOT LIKE 'CURRENT TODO ID:%'
+          THEN ${conversationAlias}.title
+          ELSE NULL
+        END,
+        ${topicTitle},
+        ${firstUserMessage},
+        ${firstAssistantMessage},
+        ${conversationAlias}.title
+      ) AS resolved_title,
+      COALESCE(${latestSummary}, ${conversationAlias}.summary) AS resolved_summary,
+      CASE
+        WHEN ${conversationAlias}.source = 'import'
+          AND ${conversationAlias}.conversation_started_at IS NOT NULL
+        THEN ${conversationAlias}.conversation_started_at
+        ELSE ${conversationAlias}.created_at
+      END AS effective_created_at,
+      CASE
+        WHEN ${conversationAlias}.source = 'import'
+          AND ${conversationAlias}.conversation_ended_at IS NOT NULL
+        THEN ${conversationAlias}.conversation_ended_at
+        ELSE ${conversationAlias}.updated_at
+      END AS effective_updated_at
+    FROM conversation ${conversationAlias}
+  `;
+}
+function hydrateConversationRow(row) {
+    if (!row)
+        return undefined;
+    return {
+        ...row,
+        title: row.resolved_title ?? row.title,
+        summary: row.resolved_summary ?? row.summary,
+        created_at: row.effective_created_at ?? row.created_at,
+        updated_at: row.effective_updated_at ?? row.updated_at,
+    };
+}
 function getConversation(id) {
-    return getDb().prepare('SELECT * FROM conversation WHERE id = ?').get(id);
+    return hydrateConversationRow(getDb().prepare(`${conversationSelectSql('c')} WHERE c.id = ?`).get(id));
 }
 function listConversations(opts) {
     const db = getDb();
     const limit = opts?.limit ?? 50;
     const offset = opts?.offset ?? 0;
-    let sql = 'SELECT * FROM conversation';
+    let sql = conversationSelectSql('c');
     const params = [];
     const wheres = [];
     if (opts?.agentId) {
-        wheres.push('agent_id = ?');
-        params.push(opts.agentId);
+        wheres.push(`(
+      c.agent_id = ?
+      OR EXISTS (
+        SELECT 1
+        FROM message m
+        WHERE m.conversation_id = c.id
+          AND m.bot_id = ?
+      )
+    )`);
+        params.push(opts.agentId, opts.agentId);
     }
     if (opts?.search) {
-        wheres.push('(title LIKE ? OR summary LIKE ?)');
-        params.push(`%${opts.search}%`, `%${opts.search}%`);
+        wheres.push(`(
+      coalesce(c.title, '') LIKE ?
+      OR coalesce(c.summary, '') LIKE ?
+      OR coalesce(${latestConversationSummarySql('c')}, '') LIKE ?
+      OR coalesce(${primaryConversationTopicTitleSql('c')}, '') LIKE ?
+      OR coalesce(c.project_name, '') LIKE ?
+      OR coalesce(c.description, '') LIKE ?
+      OR coalesce(c.tags, '') LIKE ?
+      OR coalesce(c.topics_discussed, '') LIKE ?
+      OR coalesce(c.tech_stack, '') LIKE ?
+      OR coalesce(c.category, '') LIKE ?
+    )`);
+        const needle = `%${opts.search}%`;
+        params.push(needle, needle, needle, needle, needle, needle, needle, needle, needle, needle);
     }
     if (wheres.length)
         sql += ' WHERE ' + wheres.join(' AND ');
-    sql += ' ORDER BY updated_at DESC LIMIT ? OFFSET ?';
+    sql += ' ORDER BY c.updated_at DESC LIMIT ? OFFSET ?';
     params.push(limit, offset);
-    return db.prepare(sql).all(...params);
+    return db.prepare(sql).all(...params).map((row) => hydrateConversationRow(row));
 }
 function countConversations(agentId) {
     const db = getDb();
     if (agentId) {
-        return db.prepare('SELECT count(*) as cnt FROM conversation WHERE agent_id = ?').get(agentId).cnt;
+        return db.prepare(`
+      SELECT count(DISTINCT c.id) as cnt
+      FROM conversation c
+      WHERE c.agent_id = ?
+        OR EXISTS (
+          SELECT 1
+          FROM message m
+          WHERE m.conversation_id = c.id
+            AND m.bot_id = ?
+        )
+    `).get(agentId, agentId).cnt;
     }
     return db.prepare('SELECT count(*) as cnt FROM conversation').get().cnt;
 }
+function countMessagesForBot(botId) {
+    return getDb().prepare(`
+    SELECT count(*) as cnt
+    FROM message
+    WHERE bot_id = ?
+  `).get(botId).cnt;
+}
+function listBotConversationActivity(botId, limit = 10) {
+    const db = getDb();
+    return db.prepare(`
+    SELECT
+      conv.*,
+      COALESCE((
+        SELECT count(*)
+        FROM message bm
+        WHERE bm.conversation_id = conv.id
+          AND bm.bot_id = ?
+      ), 0) AS bot_message_count,
+      (
+        SELECT max(bm.created_at)
+        FROM message bm
+        WHERE bm.conversation_id = conv.id
+          AND bm.bot_id = ?
+      ) AS bot_last_message_at
+    FROM (
+      ${conversationSelectSql('c')}
+      WHERE (
+        c.agent_id = ?
+        OR EXISTS (
+          SELECT 1
+          FROM message m
+          WHERE m.conversation_id = c.id
+            AND m.bot_id = ?
+        )
+      )
+    ) conv
+    ORDER BY COALESCE(bot_last_message_at, conv.updated_at, conv.created_at) DESC
+    LIMIT ?
+  `).all(botId, botId, botId, botId, limit).map((row) => hydrateConversationRow(row));
+}
 function updateConversation(id, fields) {
     const db = getDb();
     const sets = [];
@@ -731,6 +914,8 @@ function updateConversation(id, fields) {
         processingError: ['processing_error', fields.processingError],
         botId: ['bot_id', fields.botId],
         forkedFromId: ['forked_from_id', fields.forkedFromId],
+        createdAt: ['created_at', fields.createdAt],
+        updatedAt: ['updated_at', fields.updatedAt],
     };
     for (const [key, [col, val]] of Object.entries(map)) {
         if (fields[key] !== undefined) {
@@ -748,17 +933,30 @@ function updateConversation(id, fields) {
     }
     if (sets.length === 0)
         return;
-    sets.push("updated_at = datetime('now')");
+    if (fields.updatedAt === undefined) {
+        sets.push("updated_at = datetime('now')");
+    }
     vals.push(id);
     db.prepare(`UPDATE conversation SET ${sets.join(', ')} WHERE id = ?`).run(...vals);
 }
+function touchConversationActivity(id, ts) {
+    const stamp = ts?.trim() || now();
+    getDb().prepare(`
+    UPDATE conversation
+    SET updated_at = CASE
+      WHEN datetime(updated_at) > datetime(?) THEN updated_at
+      ELSE ?
+    END
+    WHERE id = ?
+  `).run(stamp, stamp, id);
+}
 function deleteConversation(id) {
     return getDb().prepare('DELETE FROM conversation WHERE id = ?').run(id).changes > 0;
 }
-function addMessage(conversationId, role, content, model, toolCallsJson, botId, agentName) {
+function addMessage(conversationId, role, content, model, toolCallsJson, botId, agentName, createdAt) {
     const db = getDb();
     const id = newId();
-    const ts = now();
+    const ts = createdAt?.trim() || now();
     // Get next sequence number
     const maxSeq = db.prepare('SELECT COALESCE(MAX(seq), 0) as m FROM message WHERE conversation_id = ?').get(conversationId);
     const seq = maxSeq.m + 1;
@@ -767,9 +965,158 @@ function addMessage(conversationId, role, content, model, toolCallsJson, botId,
     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `).run(id, conversationId, seq, role, content, model ?? null, toolCallsJson ?? null, botId ?? null, agentName ?? null, ts);
     // Update conversation message_count and updated_at
-    db.prepare("UPDATE conversation SET message_count = message_count + 1, updated_at = datetime('now') WHERE id = ?").run(conversationId);
+    db.prepare(`
+    UPDATE conversation
+    SET message_count = message_count + 1,
+        updated_at = CASE
+          WHEN datetime(updated_at) > datetime(?) THEN updated_at
+          ELSE ?
+        END
+    WHERE id = ?
+  `).run(ts, ts, conversationId);
     return db.prepare('SELECT * FROM message WHERE id = ?').get(id);
 }
+function updateMessage(id, fields) {
+    const db = getDb();
+    const row = db.prepare('SELECT * FROM message WHERE id = ?').get(id);
+    if (!row)
+        return undefined;
+    const sets = [];
+    const vals = [];
+    if (fields.content !== undefined) {
+        sets.push('content = ?');
+        vals.push(fields.content);
+    }
+    if (fields.model !== undefined) {
+        sets.push('model = ?');
+        vals.push(fields.model);
+    }
+    if (fields.toolCallsJson !== undefined) {
+        sets.push('tool_calls_json = ?');
+        vals.push(fields.toolCallsJson);
+    }
+    if (fields.botId !== undefined) {
+        sets.push('bot_id = ?');
+        vals.push(fields.botId);
+    }
+    if (fields.agentName !== undefined) {
+        sets.push('agent_name = ?');
+        vals.push(fields.agentName);
+    }
+    if (fields.resultArtifact !== undefined) {
+        sets.push('result_artifact = ?');
+        vals.push(fields.resultArtifact);
+    }
+    if (fields.resultSummary !== undefined) {
+        sets.push('result_summary = ?');
+        vals.push(fields.resultSummary);
+    }
+    if (fields.resultStatus !== undefined) {
+        sets.push('result_status = ?');
+        vals.push(fields.resultStatus);
+    }
+    if (sets.length === 0)
+        return row;
+    vals.push(id);
+    db.prepare(`UPDATE message SET ${sets.join(', ')} WHERE id = ?`).run(...vals);
+    return db.prepare('SELECT * FROM message WHERE id = ?').get(id);
+}
+function createChatJob(input) {
+    const db = getDb();
+    const id = newId();
+    const ts = now();
+    db.prepare(`
+    INSERT INTO chat_job (
+      id, conversation_id, user_message_id, assistant_message_id, bot_id,
+      status, request_json, created_at, updated_at
+    )
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(id, input.conversationId, input.userMessageId, input.assistantMessageId, input.botId, input.status ?? 'queued', input.requestJson ?? null, ts, ts);
+    return db.prepare('SELECT * FROM chat_job WHERE id = ?').get(id);
+}
+function getChatJob(id) {
+    return getDb().prepare('SELECT * FROM chat_job WHERE id = ?').get(id);
+}
+function getLatestConversationChatJob(conversationId) {
+    return getDb().prepare(`
+    SELECT *
+    FROM chat_job
+    WHERE conversation_id = ?
+    ORDER BY datetime(created_at) DESC, rowid DESC
+    LIMIT 1
+  `).get(conversationId);
+}
+function listQueuedChatJobs(limit = 50) {
+    return getDb().prepare(`
+    SELECT *
+    FROM chat_job
+    WHERE status = 'queued'
+    ORDER BY datetime(created_at) ASC, rowid ASC
+    LIMIT ?
+  `).all(limit);
+}
+function countRunningChatJobs() {
+    return getDb().prepare(`
+    SELECT count(*) AS cnt
+    FROM chat_job
+    WHERE status = 'running'
+  `).get().cnt;
+}
+function updateChatJob(id, fields) {
+    const db = getDb();
+    const row = db.prepare('SELECT * FROM chat_job WHERE id = ?').get(id);
+    if (!row)
+        return undefined;
+    const sets = [];
+    const vals = [];
+    if (fields.status !== undefined) {
+        sets.push('status = ?');
+        vals.push(fields.status);
+    }
+    if (fields.error !== undefined) {
+        sets.push('error = ?');
+        vals.push(fields.error);
+    }
+    if (fields.requestJson !== undefined) {
+        sets.push('request_json = ?');
+        vals.push(fields.requestJson);
+    }
+    if (fields.startedAt !== undefined) {
+        sets.push('started_at = ?');
+        vals.push(fields.startedAt);
+    }
+    if (fields.completedAt !== undefined) {
+        sets.push('completed_at = ?');
+        vals.push(fields.completedAt);
+    }
+    if (fields.cancelledAt !== undefined) {
+        sets.push('cancelled_at = ?');
+        vals.push(fields.cancelledAt);
+    }
+    if (sets.length === 0)
+        return row;
+    sets.push('updated_at = ?');
+    vals.push(now());
+    vals.push(id);
+    db.prepare(`UPDATE chat_job SET ${sets.join(', ')} WHERE id = ?`).run(...vals);
+    return db.prepare('SELECT * FROM chat_job WHERE id = ?').get(id);
+}
+function markRunningChatJobsInterrupted(reason = 'Interrupted when app closed') {
+    const db = getDb();
+    const ts = now();
+    const result = db.prepare(`
+    UPDATE chat_job
+    SET status = 'failed',
+        error = CASE
+          WHEN error IS NULL OR trim(error) = '' THEN ?
+          ELSE error
+        END,
+        completed_at = COALESCE(completed_at, ?),
+        updated_at = ?
+    WHERE status = 'running'
+  `).run(reason, ts, ts);
+    return result.changes;
+}
 function createMessageActivity(activity) {
     const db = getDb();
     const id = newId();
@@ -1198,11 +1545,6 @@ function listMemoryFacts(opts) {
 function deleteMemoryFact(id) {
     return getDb().prepare('DELETE FROM memory_fact WHERE id = ?').run(id).changes > 0;
 }
-/**
- * Get user-profile facts (person entities) for injection into the system prompt.
- * Returns high-confidence facts about people (address, preferences, etc.)
- * limited to ~500 tokens worth of content.
- */
 function getUserProfileFacts(agentId, limit = 15) {
     const db = getDb();
     return db.prepare(`
@@ -1398,6 +1740,19 @@ function getAllSettings() {
 function deleteSetting(key) {
     return getDb().prepare('DELETE FROM settings WHERE key = ?').run(key).changes > 0;
 }
+function purgeLegacyExtractionDataOnce() {
+    if (getSetting('legacy_extraction_cleanup_v1') === 'done')
+        return false;
+    const db = getDb();
+    const tx = db.transaction(() => {
+        for (const table of ['entity_relationship', 'entity', 'memory_fact', 'decision', 'action_item']) {
+            db.prepare(`DELETE FROM ${table}`).run();
+        }
+        setSetting('legacy_extraction_cleanup_v1', 'done');
+    });
+    tx();
+    return true;
+}
 const AUTH_SESSION_KEY = 'auth.session';
 function defaultOrchestrationPolicy() {
     return {
@@ -1852,6 +2207,36 @@ function inferTaskTypeForAgent(agent, requested) {
         return explicit;
     return roleClassToTaskType(agent?.role_class) || roleClassToTaskType(agent?.role_label) || null;
 }
+function buildQueuedTaskContext(task) {
+    const lines = [
+        'NEXT TASK CONTEXT',
+        `Title: ${task.title}`,
+        task.task_type ? `Task type: ${task.task_type}` : null,
+        task.details?.trim() ? `Details: ${task.details.trim()}` : null,
+        task.success_criteria?.trim() ? `Success criteria: ${task.success_criteria.trim()}` : null,
+    ].filter(Boolean);
+    return lines.join('\n');
+}
+function injectWorkerHandoffIntoPrompt(existingPrompt, handoffText, nextTask) {
+    const taskReplacement = [
+        'Task:',
+        'PREVIOUS WORKER HANDOFF',
+        handoffText,
+        '',
+        buildQueuedTaskContext(nextTask),
+        '',
+        'RUNTIME CONTEXT',
+    ].join('\n');
+    if (existingPrompt.includes('\nRUNTIME CONTEXT\n')) {
+        return existingPrompt.replace(/Task:\s*[\s\S]*?\nRUNTIME CONTEXT\n/, `${taskReplacement}\n`);
+    }
+    return [
+        'PREVIOUS WORKER HANDOFF',
+        handoffText,
+        '',
+        buildQueuedTaskContext(nextTask),
+    ].join('\n');
+}
 function normalizeArtifactRow(row) {
     return {
         id: Number(row.id),
@@ -1982,6 +2367,44 @@ function resolveAllowedWorkerNamesForInsertion(currentTask) {
         allowed.add(previous.owner_name.trim().toLowerCase());
     return Array.from(allowed);
 }
+function resolvePreviousWorkerName(currentTask) {
+    const db = getDb();
+    const previous = currentTask.project_id
+        ? db.prepare(`
+      SELECT owner_name
+      FROM (
+        SELECT owner_name, created_order, internal_only FROM todo_active WHERE project_id = ?
+        UNION ALL
+        SELECT owner_name, created_order, internal_only FROM todo_completed WHERE project_id = ?
+      )
+      WHERE created_order < ? AND COALESCE(internal_only, 0) = 0 AND owner_name IS NOT NULL
+      ORDER BY created_order DESC
+      LIMIT 1
+    `).get(currentTask.project_id, currentTask.project_id, currentTask.position)
+        : db.prepare(`
+      SELECT owner_name
+      FROM (
+        SELECT owner_name, created_order, internal_only FROM todo_active WHERE project_id IS NULL
+        UNION ALL
+        SELECT owner_name, created_order, internal_only FROM todo_completed WHERE project_id IS NULL
+      )
+      WHERE created_order < ? AND COALESCE(internal_only, 0) = 0 AND owner_name IS NOT NULL
+      ORDER BY created_order DESC
+      LIMIT 1
+    `).get(currentTask.position);
+    return previous?.owner_name?.trim() || null;
+}
+function shouldAutoCreateQaFixTask(task, outputSummary, handoffPrompt) {
+    if (String(task.task_type || '').trim().toLowerCase() !== 'qa')
+        return false;
+    const combined = `${outputSummary || ''}\n${handoffPrompt || ''}`.trim().toLowerCase();
+    if (!combined)
+        return false;
+    if (/(^|\b)(qa passed|all checks passed|no issues found|looks good to ship)(\b|$)/i.test(combined)) {
+        return false;
+    }
+    return /\b(fix|defect|issue|problem|error|not ready|fails?|failed|remaining problem|remaining issue|validator|re-qa)\b/i.test(combined);
+}
 function normalizeArtifactInput(ref) {
     if (typeof ref === 'string') {
         const trimmed = ref.trim();
@@ -2424,10 +2847,49 @@ function completeTodoTaskByWorker(taskId, params) {
             }
         }
         else {
-            const nextWorkerName = completedTask.next_worker_name?.trim();
-            if (nextWorkerName) {
-                const nextRow = completedTask.next_worker_bot_id
-                    ? db.prepare(`
+            if (shouldAutoCreateQaFixTask(completedTask, outputSummary, handoffPrompt)) {
+                const previousWorkerName = resolvePreviousWorkerName(completedTask);
+                const previousWorker = resolveAgentByName(previousWorkerName);
+                if (previousWorkerName && previousWorker) {
+                    const participants = [previousWorker.name];
+                    insertedTask = insertTodoTaskTx(db, {
+                        projectId: completedTask.project_id,
+                        conversationId: completedTask.conversation_id,
+                        title: 'Fix QA findings',
+                        details: handoffPrompt || outputSummary || 'Address the QA findings and update the implementation.',
+                        participants,
+                        successCriteria: 'Address the QA findings and return the updated work for re-QA.',
+                        ownerBotId: previousWorker.id,
+                        ownerName: previousWorker.name,
+                        taskType: inferTaskTypeForAgent(previousWorker, null),
+                        profileName: completedTask.profile_name || 'Programming',
+                        nextWorkerBotId: currentTask.owner_bot_id,
+                        nextWorkerName: currentTask.owner_name,
+                        nextWorkerRole: actorBot?.role_label || actorBot?.role_class || null,
+                        taskPrompt: handoffPrompt || outputSummary || 'Address the QA findings and keep the approved parts unchanged.',
+                        artifactIds,
+                        insertAfterTaskId: completedTask.id,
+                        actor: params.actor,
+                    });
+                    logTodoAuditTx(db, insertedTask.id, 'active', 'worker_insert', params.actor, {
+                        insertedAfterTaskId: completedTask.id,
+                        requestedWorkerName: previousWorker.name,
+                        autoCreatedFromQaFailure: true,
+                    });
+                }
+                else {
+                    returnedToOrchestrator = true;
+                    logTodoAuditTx(db, taskId, 'completed', 'return_to_orchestrator', params.actor, {
+                        handoffPrompt,
+                        missingPreviousWorkerForQaFix: true,
+                    });
+                }
+            }
+            else {
+                const nextWorkerName = completedTask.next_worker_name?.trim();
+                if (nextWorkerName) {
+                    const nextRow = completedTask.next_worker_bot_id
+                        ? db.prepare(`
               SELECT * FROM todo_active
               WHERE conversation_id = ?
                 AND id <> ?
@@ -2437,7 +2899,7 @@ function completeTodoTaskByWorker(taskId, params) {
               ORDER BY created_order ASC, id ASC
               LIMIT 1
             `).get(completedTask.conversation_id, completedTask.id, completedTask.next_worker_bot_id, completedTask.created_order)
-                    : db.prepare(`
+                        : db.prepare(`
               SELECT * FROM todo_active
               WHERE conversation_id = ?
                 AND id <> ?
@@ -2447,21 +2909,15 @@ function completeTodoTaskByWorker(taskId, params) {
               ORDER BY created_order ASC, id ASC
               LIMIT 1
             `).get(completedTask.conversation_id, completedTask.id, nextWorkerName, completedTask.created_order);
-                if (nextRow) {
-                    const nextTask = normalizeTodoRow(nextRow, 'active');
-                    const handoffText = handoffPrompt?.trim()
-                        || outputSummary?.trim()
-                        || `Continue from the completed work summary: ${completedTask.title}`;
-                    const existingPrompt = nextTask.task_prompt?.trim() || nextTask.details || nextTask.title;
-                    const mergedArtifactIds = Array.from(new Set([...(nextTask.artifact_ids || []), ...artifactIds]));
-                    const nextPrompt = [
-                        'PREVIOUS WORKER HANDOFF',
-                        handoffText,
-                        '',
-                        'ORIGINAL ASSIGNED TODO',
-                        existingPrompt,
-                    ].join('\n');
-                    db.prepare(`
+                    if (nextRow) {
+                        const nextTask = normalizeTodoRow(nextRow, 'active');
+                        const handoffText = handoffPrompt?.trim()
+                            || outputSummary?.trim()
+                            || `Continue from the completed work summary: ${completedTask.title}`;
+                        const existingPrompt = nextTask.task_prompt?.trim() || nextTask.details || nextTask.title;
+                        const mergedArtifactIds = Array.from(new Set([...(nextTask.artifact_ids || []), ...artifactIds]));
+                        const nextPrompt = injectWorkerHandoffIntoPrompt(existingPrompt, handoffText, nextTask);
+                        db.prepare(`
             UPDATE todo_active
             SET task_prompt = ?,
                 artifact_ids_json = ?,
@@ -2469,26 +2925,27 @@ function completeTodoTaskByWorker(taskId, params) {
                 version = version + 1
             WHERE id = ?
           `).run(nextPrompt, JSON.stringify(mergedArtifactIds), now(), nextTask.id);
-                    handedOffTask = normalizeTodoRow(db.prepare('SELECT * FROM todo_active WHERE id = ?').get(nextTask.id), 'active');
-                    logTodoAuditTx(db, nextTask.id, 'active', 'edit', params.actor, {
-                        previousTaskId: completedTask.id,
-                        receivedHandoff: true,
-                    });
+                        handedOffTask = normalizeTodoRow(db.prepare('SELECT * FROM todo_active WHERE id = ?').get(nextTask.id), 'active');
+                        logTodoAuditTx(db, nextTask.id, 'active', 'edit', params.actor, {
+                            previousTaskId: completedTask.id,
+                            receivedHandoff: true,
+                        });
+                    }
+                    else {
+                        returnedToOrchestrator = true;
+                        logTodoAuditTx(db, taskId, 'completed', 'return_to_orchestrator', params.actor, {
+                            handoffPrompt,
+                            missingQueuedNextWorker: nextWorkerName,
+                        });
+                    }
                 }
                 else {
                     returnedToOrchestrator = true;
                     logTodoAuditTx(db, taskId, 'completed', 'return_to_orchestrator', params.actor, {
                         handoffPrompt,
-                        missingQueuedNextWorker: nextWorkerName,
                     });
                 }
             }
-            else {
-                returnedToOrchestrator = true;
-                logTodoAuditTx(db, taskId, 'completed', 'return_to_orchestrator', params.actor, {
-                    handoffPrompt,
-                });
-            }
         }
         return {
             completedTask,
@@ -3040,13 +3497,20 @@ function listTopicConversations(topicId, opts) {
     const db = getDb();
     const limit = opts?.limit ?? 50;
     const offset = opts?.offset ?? 0;
-    return db.prepare(`
-    SELECT DISTINCT c.* FROM conversation c
-    INNER JOIN topic_segment ts ON ts.conversation_id = c.id
+    const rows = db.prepare(`
+    SELECT DISTINCT conv.*
+    FROM (
+      ${conversationSelectSql('c')}
+    ) conv
+    INNER JOIN topic_segment ts ON ts.conversation_id = conv.id
     WHERE ts.topic_id = ?
-    ORDER BY c.updated_at DESC
+    ORDER BY datetime(COALESCE(conv.effective_updated_at, conv.updated_at)) DESC,
+             datetime(COALESCE(conv.effective_created_at, conv.created_at)) DESC
     LIMIT ? OFFSET ?
   `).all(topicId, limit, offset);
+    return rows
+        .map((row) => hydrateConversationRow(row))
+        .filter((row) => !!row);
 }
 function getPrimaryTopicIdForConversation(conversationId) {
     const db = getDb();
@@ -3090,16 +3554,29 @@ function listTopicConversationsWithPreviews(topicId, opts) {
     const limit = opts?.limit ?? 50;
     const offset = opts?.offset ?? 0;
     // Primary: find conversations via topic_segment links
-    let convs = db.prepare(`
-    SELECT DISTINCT c.* FROM conversation c
-    INNER JOIN topic_segment ts ON ts.conversation_id = c.id
+    const rawConvs = db.prepare(`
+    SELECT DISTINCT conv.*
+    FROM (
+      ${conversationSelectSql('c')}
+    ) conv
+    INNER JOIN topic_segment ts ON ts.conversation_id = conv.id
     WHERE ts.topic_id = ?
-    ORDER BY c.updated_at DESC
+    ORDER BY datetime(COALESCE(conv.effective_updated_at, conv.updated_at)) DESC,
+             datetime(COALESCE(conv.effective_created_at, conv.created_at)) DESC
     LIMIT ? OFFSET ?
   `).all(topicId, limit, offset);
+    const convs = rawConvs
+        .map((row) => hydrateConversationRow(row))
+        .filter((row) => !!row);
     // No fallback — topics with no segments have no conversations yet.
     // Backfill/import must create topic_segment rows explicitly.
     return convs.map(conv => {
+        const latestJob = getLatestConversationChatJob(conv.id);
+        const jobStatus = latestJob?.status === 'running'
+            ? 'working'
+            : latestJob?.status === 'completed'
+                ? 'done'
+                : latestJob?.status ?? null;
         // Get latest summary text
         const summary = db.prepare('SELECT summary_text FROM conversation_summary WHERE conversation_id = ? ORDER BY turn_range_end DESC LIMIT 1').get(conv.id);
         // Get first user message, truncated to 200 chars
@@ -3108,6 +3585,7 @@ function listTopicConversationsWithPreviews(topicId, opts) {
             ...conv,
             summary_text: summary?.summary_text ?? null,
             first_user_message: firstMsg ? firstMsg.content.slice(0, 200) : null,
+            job_status: jobStatus,
         };
     });
 }
@@ -3159,6 +3637,10 @@ function updateWorkflowTemplate(id, fields) {
     const db = getDb();
     const sets = [];
     const vals = [];
+    if (fields.projectId !== undefined) {
+        sets.push('project_id = ?');
+        vals.push(fields.projectId);
+    }
     if (fields.name !== undefined) {
         sets.push('name = ?');
         vals.push(fields.name);