funolio-agent 1.0.75 → 1.1.65

package/dist/local-data.js

@@ -36,17 +36,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UNASSIGNED_PROJECT_NAME = void 0;
 exports.getDb = getDb;
 exports.closeDb = closeDb;
+exports.getAgentOrchestrationRoleClass = getAgentOrchestrationRoleClass;
+exports.getAgentOrchestrationRoleLabel = getAgentOrchestrationRoleLabel;
+exports.getAgentRolePriorities = getAgentRolePriorities;
+exports.rolesMatch = rolesMatch;
 exports.createAgentProfile = createAgentProfile;
 exports.getAgentProfile = getAgentProfile;
 exports.getDefaultAgentProfile = getDefaultAgentProfile;
 exports.getOrchestratorBot = getOrchestratorBot;
 exports.getCurrentOrchestratorSelection = getCurrentOrchestratorSelection;
+exports.getResolvedClerkConfigInfo = getResolvedClerkConfigInfo;
 exports.listAgentProfiles = listAgentProfiles;
 exports.migrateAgentProfilesToDefaultToolProfile = migrateAgentProfilesToDefaultToolProfile;
 exports.updateAgentProfile = updateAgentProfile;
 exports.setOrchestratorBot = setOrchestratorBot;
 exports.setDefaultAgentProfile = setDefaultAgentProfile;
 exports.isClerkOrchestratorEnabled = isClerkOrchestratorEnabled;
+exports.isOrchestrationToolDispatchEnabled = isOrchestrationToolDispatchEnabled;
+exports.setOrchestrationToolDispatchEnabled = setOrchestrationToolDispatchEnabled;
 exports.setClerkAsOrchestrator = setClerkAsOrchestrator;
 exports.createProviderConnection = createProviderConnection;
 exports.listProviderConnections = listProviderConnections;
@@ -59,20 +66,35 @@ exports.upsertOauthProviderConnection = upsertOauthProviderConnection;
 exports.deleteProviderConnection = deleteProviderConnection;
 exports.deleteAgentProfile = deleteAgentProfile;
 exports.createConversation = createConversation;
+exports.getConversationParticipantBotIds = getConversationParticipantBotIds;
+exports.getConversationPrimaryBotId = getConversationPrimaryBotId;
 exports.getConversation = getConversation;
 exports.listConversations = listConversations;
 exports.countConversations = countConversations;
 exports.countMessagesForBot = countMessagesForBot;
+exports.countMessagesForBotSince = countMessagesForBotSince;
+exports.countDecisionsForBot = countDecisionsForBot;
+exports.countBotActiveDays = countBotActiveDays;
+exports.countBotConversationsUpdatedBetween = countBotConversationsUpdatedBetween;
+exports.sumBotTokenUsageSince = sumBotTokenUsageSince;
 exports.listBotConversationActivity = listBotConversationActivity;
 exports.updateConversation = updateConversation;
+exports.syncConversationParticipants = syncConversationParticipants;
 exports.touchConversationActivity = touchConversationActivity;
+exports.bumpConversationSyncRevision = bumpConversationSyncRevision;
 exports.deleteConversation = deleteConversation;
+exports.toWarmSessionBindingKey = toWarmSessionBindingKey;
+exports.parseWarmSessionBindingKey = parseWarmSessionBindingKey;
+exports.epochRowToWarmInfo = epochRowToWarmInfo;
 exports.addMessage = addMessage;
 exports.updateMessage = updateMessage;
 exports.createChatJob = createChatJob;
 exports.getCliSessionEpoch = getCliSessionEpoch;
 exports.upsertCliSessionEpoch = upsertCliSessionEpoch;
 exports.deleteCliSessionEpoch = deleteCliSessionEpoch;
+exports.clearCliSessionEpochIfMatches = clearCliSessionEpochIfMatches;
+exports.cleanupPoisonedClaudePrewarmSessionRows = cleanupPoisonedClaudePrewarmSessionRows;
+exports.getCliSessionEpochsByConversation = getCliSessionEpochsByConversation;
 exports.generateNextSessionId = generateNextSessionId;
 exports.getChatJob = getChatJob;
 exports.getLatestConversationChatJob = getLatestConversationChatJob;
@@ -83,6 +105,8 @@ exports.listActiveAssistantMessageIds = listActiveAssistantMessageIds;
 exports.countRunningChatJobs = countRunningChatJobs;
 exports.updateChatJob = updateChatJob;
 exports.markRunningChatJobsInterrupted = markRunningChatJobsInterrupted;
+exports.recoverInterruptedChatJobs = recoverInterruptedChatJobs;
+exports.recoverInterruptedWorkflowRuns = recoverInterruptedWorkflowRuns;
 exports.createMessageActivity = createMessageActivity;
 exports.attachMessageActivitiesToMessage = attachMessageActivitiesToMessage;
 exports.listMessageActivities = listMessageActivities;
@@ -117,6 +141,16 @@ exports.updateImportJob = updateImportJob;
 exports.createImportJobItem = createImportJobItem;
 exports.getQueuedImportItems = getQueuedImportItems;
 exports.updateImportJobItem = updateImportJobItem;
+exports.createImportedPlanRun = createImportedPlanRun;
+exports.getImportedPlanRun = getImportedPlanRun;
+exports.listImportedPlanRunsForConversation = listImportedPlanRunsForConversation;
+exports.getLatestImportedPlanRunForConversation = getLatestImportedPlanRunForConversation;
+exports.updateImportedPlanRun = updateImportedPlanRun;
+exports.touchImportedPlanRun = touchImportedPlanRun;
+exports.getImportedPlanRunTasks = getImportedPlanRunTasks;
+exports.getImportedPlanRunRemainingTaskIds = getImportedPlanRunRemainingTaskIds;
+exports.getImportedPlanRunCurrentTask = getImportedPlanRunCurrentTask;
+exports.deleteImportedPlanRunSelectedTasks = deleteImportedPlanRunSelectedTasks;
 exports.createOutboxEvent = createOutboxEvent;
 exports.getPendingOutboxEvents = getPendingOutboxEvents;
 exports.markOutboxEventSent = markOutboxEventSent;
@@ -156,6 +190,7 @@ exports.completeTodoTaskByUser = completeTodoTaskByUser;
 exports.listTodoArtifactsForTask = listTodoArtifactsForTask;
 exports.completeTodoTaskByWorker = completeTodoTaskByWorker;
 exports.blockTodoTaskByWorker = blockTodoTaskByWorker;
+exports.markTodoTaskRuntimeBlocked = markTodoTaskRuntimeBlocked;
 exports.deleteTodoTask = deleteTodoTask;
 exports.reorderTodoTask = reorderTodoTask;
 exports.listTodoAudit = listTodoAudit;
@@ -163,6 +198,7 @@ exports.moveNullTodoTasksToUnassigned = moveNullTodoTasksToUnassigned;
 exports.getLatestActiveTodoForConversation = getLatestActiveTodoForConversation;
 exports.getNextActiveTodoForConversation = getNextActiveTodoForConversation;
 exports.listCompletedTodoTasksForConversation = listCompletedTodoTasksForConversation;
+exports.listActiveTodoTasksForConversation = listActiveTodoTasksForConversation;
 exports.createProject = createProject;
 exports.upsertProject = upsertProject;
 exports.getProject = getProject;
@@ -258,21 +294,102 @@ function newId() {
 function now() {
     return new Date().toISOString().replace('T', ' ').replace('Z', '');
 }
+function defaultOrchestrationIncludeUserPrompt(_fields) {
+    // Every worker role gets the original user prompt by default.
+    // april19fixes.txt item 3 fix (IV): previously only verify/verification
+    // workers received it, which meant Ben/John/Brain flew blind on a
+    // generic "Complete X's workflow step" task whenever the handoff
+    // lacked detail. The orchestrator's task_instructions is still the
+    // primary context source; this default just ensures the original
+    // user message is always available as a fallback reference.
+    return true;
+}
+function getAgentOrchestrationRoleClass(agent) {
+    const roleClass = String(agent?.orchestration_role_class
+        || agent?.orchestration_role_label
+        || agent?.role_class
+        || agent?.role_label
+        || '').trim();
+    return roleClass || null;
+}
+function getAgentOrchestrationRoleLabel(agent) {
+    const roleLabel = String(agent?.orchestration_role_label
+        || agent?.orchestration_role_class
+        || agent?.role_label
+        || agent?.role_class
+        || '').trim();
+    return roleLabel || null;
+}
+/**
+ * Read a bot's role priority list, dual-reading new and old columns.
+ * Used everywhere role-based dispatch or display is needed.
+ *
+ * Reads `orchestration_roles_json` first (authoritative). If empty/missing,
+ * falls back to parsing `orchestration_role_class` (comma-separated, left-
+ * to-right priority). Returns empty array if neither source has content.
+ *
+ * Normalization (per Decision 2): trim each entry, drop empties. Does NOT
+ * lower-case or canonicalize the role text — comparisons are the caller's
+ * responsibility.
+ */
+function getAgentRolePriorities(row) {
+    const raw = (row.orchestration_roles_json || '').trim();
+    if (raw) {
+        try {
+            const parsed = JSON.parse(raw);
+            if (Array.isArray(parsed)) {
+                return parsed.map((entry) => String(entry || '').trim()).filter(Boolean);
+            }
+        }
+        catch {
+            // fall through to legacy parse
+        }
+    }
+    const legacy = (row.orchestration_role_class || '').trim();
+    if (!legacy)
+        return [];
+    return legacy.split(',').map((s) => s.trim()).filter(Boolean);
+}
+/**
+ * Compare two role strings for equality per Decision 2 matching rules:
+ * case-insensitive + whitespace-normalized. NO alias table.
+ * "QA" == "qa" == " QA " == "qa  ". "QA" != "Quality Assurance".
+ */
+function rolesMatch(a, b) {
+    const na = String(a || '').trim().replace(/\s+/g, ' ').toLowerCase();
+    const nb = String(b || '').trim().replace(/\s+/g, ' ').toLowerCase();
+    if (!na || !nb)
+        return false;
+    return na === nb;
+}
+const VALID_CODEX_REASONING_SUMMARIES = new Set(['auto', 'concise', 'detailed', 'none']);
+const VALID_CLAUDE_OUTPUT_STYLES = new Set(['default', 'explanatory']);
+function normalizeCodexReasoningSummary(value) {
+    const normalized = String(value || '').trim().toLowerCase();
+    return VALID_CODEX_REASONING_SUMMARIES.has(normalized) ? normalized : 'detailed';
+}
+function normalizeClaudeOutputStyle(value) {
+    const normalized = String(value || '').trim().toLowerCase();
+    return VALID_CLAUDE_OUTPUT_STYLES.has(normalized) ? normalized : 'default';
+}
 function createAgentProfile(p) {
     const db = getDb();
-    const id = newId();
+    const id = p.id ?? newId();
     const ts = now();
     const insert = db.prepare(`
     INSERT INTO agent_profile (
       id, provider, model, name, soul_md, memory_md, tools_md, skills_md, api_key_enc,
-      permission_mode, is_default, role_label, role_class, is_active, priority,
+      permission_mode, is_default, role_label, role_class, orchestration_role_label, orchestration_role_class,
+      orchestration_include_user_prompt, is_active, priority,
       provider_connection_id, color, purpose_md, identity_summary, final_prompt,
       enabled_builtin_tools_json, enabled_mcp_tools_json, show_thinking, is_orchestrator,
       codex_reasoning_effort, codex_reasoning_summary, codex_personality,
       codex_service_tier, codex_sandbox_policy, codex_approval_policy,
+      claude_effort_level, claude_output_style, claude_fast_mode, claude_permissions_json,
+      orchestration_roles_json,
       created_at, updated_at
     )
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `);
     const transaction = db.transaction(() => {
         if (p.isDefault) {
@@ -282,7 +399,16 @@ function createAgentProfile(p) {
             db.prepare("UPDATE agent_profile SET is_orchestrator = 0, updated_at = datetime('now') WHERE is_orchestrator = 1").run();
             setSetting(CLERK_IS_ORCHESTRATOR_KEY, 'false');
         }
-        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, p.codexReasoningEffort ?? 'none', p.codexReasoningSummary ?? 'detailed', p.codexPersonality ?? 'friendly', p.codexServiceTier ?? 'fast', p.codexSandboxPolicy ?? 'danger-full-access', p.codexApprovalPolicy ?? 'never', ts, ts);
+        // Dual-write: if caller provided a role priority list, also derive the
+        // legacy comma-separated `orchestration_role_class` value for compat.
+        // Priority 0 item becomes the primary for downstream code that still
+        // reads the old column directly.
+        const rolesList = Array.isArray(p.orchestrationRolesJson)
+            ? p.orchestrationRolesJson.map((s) => String(s || '').trim()).filter(Boolean)
+            : null;
+        const rolesJsonStored = rolesList && rolesList.length > 0 ? JSON.stringify(rolesList) : null;
+        const derivedRoleClass = rolesList && rolesList.length > 0 ? rolesList.join(', ') : null;
+        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.orchestrationRoleLabel ?? p.roleLabel ?? null, p.orchestrationRoleClass ?? derivedRoleClass ?? p.roleClass ?? null, (p.orchestrationIncludeUserPrompt ?? defaultOrchestrationIncludeUserPrompt(p)) ? 1 : 0, 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, 0, p.isOrchestrator ? 1 : 0, p.codexReasoningEffort ?? 'low', normalizeCodexReasoningSummary(p.codexReasoningSummary), p.codexPersonality ?? 'friendly', p.codexServiceTier ?? 'fast', p.codexSandboxPolicy ?? 'danger-full-access', p.codexApprovalPolicy ?? 'never', p.claudeEffortLevel ?? 'auto', normalizeClaudeOutputStyle(p.claudeOutputStyle), p.claudeFastMode ? 1 : 0, p.claudePermissionsJson ?? null, rolesJsonStored, ts, ts);
     });
     transaction();
     return db.prepare('SELECT * FROM agent_profile WHERE id = ?').get(id);
@@ -298,10 +424,11 @@ function getOrchestratorBot() {
 }
 function getCurrentOrchestratorSelection() {
     if (isClerkOrchestratorEnabled()) {
+        const clerk = getResolvedClerkConfigInfo();
         return {
             type: 'clerk',
-            provider: getSetting('clerk_provider') || null,
-            model: getSetting('clerk_model') || null,
+            provider: clerk.provider,
+            model: clerk.model,
         };
     }
     const bot = getOrchestratorBot();
@@ -310,6 +437,32 @@ function getCurrentOrchestratorSelection() {
     }
     return { type: 'none' };
 }
+function getResolvedClerkConfigInfo() {
+    const clerkConfig = getJsonSetting('clerk.config');
+    const providerConnectionId = clerkConfig?.providerConnectionId
+        ? String(clerkConfig.providerConnectionId).trim()
+        : '';
+    const connection = providerConnectionId ? getProviderConnection(providerConnectionId) : undefined;
+    const provider = String(connection?.provider_id
+        || clerkConfig?.providerId
+        || getSetting('clerk_provider')
+        || '').trim() || null;
+    const model = String(clerkConfig?.model
+        || connection?.default_model
+        || getSetting('clerk_model')
+        || '').trim() || null;
+    const hasSecret = Boolean(connection?.access_mode === 'cli'
+        || connection?.api_key_enc
+        || connection?.oauth_token
+        || getSetting('clerk_api_key'));
+    return {
+        provider,
+        model,
+        hasSecret,
+        configured: Boolean(provider && model && hasSecret),
+        providerConnectionId: providerConnectionId || null,
+    };
+}
 function listAgentProfiles() {
     return getDb().prepare('SELECT * FROM agent_profile ORDER BY is_default DESC, created_at ASC').all();
 }
@@ -409,6 +562,18 @@ function updateAgentProfile(id, fields) {
         sets.push('role_class = ?');
         vals.push(fields.roleClass);
     }
+    if (fields.orchestrationRoleLabel !== undefined) {
+        sets.push('orchestration_role_label = ?');
+        vals.push(fields.orchestrationRoleLabel);
+    }
+    if (fields.orchestrationRoleClass !== undefined) {
+        sets.push('orchestration_role_class = ?');
+        vals.push(fields.orchestrationRoleClass);
+    }
+    if (fields.orchestrationIncludeUserPrompt !== undefined) {
+        sets.push('orchestration_include_user_prompt = ?');
+        vals.push(fields.orchestrationIncludeUserPrompt ? 1 : 0);
+    }
     if (fields.isActive !== undefined) {
         sets.push('is_active = ?');
         vals.push(fields.isActive ? 1 : 0);
@@ -459,7 +624,7 @@ function updateAgentProfile(id, fields) {
     }
     if (fields.codexReasoningSummary !== undefined) {
         sets.push('codex_reasoning_summary = ?');
-        vals.push(fields.codexReasoningSummary);
+        vals.push(normalizeCodexReasoningSummary(fields.codexReasoningSummary));
     }
     if (fields.codexPersonality !== undefined) {
         sets.push('codex_personality = ?');
@@ -477,6 +642,39 @@ function updateAgentProfile(id, fields) {
         sets.push('codex_approval_policy = ?');
         vals.push(fields.codexApprovalPolicy);
     }
+    if (fields.claudeEffortLevel !== undefined) {
+        sets.push('claude_effort_level = ?');
+        vals.push(fields.claudeEffortLevel);
+    }
+    if (fields.claudeOutputStyle !== undefined) {
+        sets.push('claude_output_style = ?');
+        vals.push(normalizeClaudeOutputStyle(fields.claudeOutputStyle));
+    }
+    if (fields.claudeFastMode !== undefined) {
+        sets.push('claude_fast_mode = ?');
+        vals.push(fields.claudeFastMode ? 1 : 0);
+    }
+    if (fields.claudePermissionsJson !== undefined) {
+        sets.push('claude_permissions_json = ?');
+        vals.push(fields.claudePermissionsJson);
+    }
+    if (fields.orchestrationRolesJson !== undefined) {
+        // Dual-write: update both the new JSON column and the legacy comma-separated
+        // orchestration_role_class so any code still reading the old column stays
+        // consistent until Phase B drops it.
+        const rolesList = Array.isArray(fields.orchestrationRolesJson)
+            ? fields.orchestrationRolesJson.map((s) => String(s || '').trim()).filter(Boolean)
+            : null;
+        const rolesJsonStored = rolesList && rolesList.length > 0 ? JSON.stringify(rolesList) : null;
+        const derivedRoleClass = rolesList && rolesList.length > 0 ? rolesList.join(', ') : null;
+        sets.push('orchestration_roles_json = ?');
+        vals.push(rolesJsonStored);
+        // Only override orchestration_role_class if the caller didn't explicitly pass one this update.
+        if (fields.orchestrationRoleClass === undefined) {
+            sets.push('orchestration_role_class = ?');
+            vals.push(derivedRoleClass);
+        }
+    }
     if (sets.length === 0)
         return row;
     const transaction = db.transaction(() => {
@@ -522,6 +720,25 @@ function setDefaultAgentProfile(botId) {
 function isClerkOrchestratorEnabled() {
     return getSetting(CLERK_IS_ORCHESTRATOR_KEY) === 'true';
 }
+/**
+ * Phase B of orchestration-plan.txt: LLM-tool-dispatch is the only
+ * orchestration path in local_desktop mode. The feature flag introduced
+ * in Phase A has been retired — new path is always active, no user toggle.
+ * These helpers are kept for a brief deprecation window so any external
+ * callers (settings UI, HTTP endpoints) still compile while they are
+ * removed. Do not use in new code.
+ *
+ * @deprecated Phase B — tool dispatch is the only path.
+ */
+function isOrchestrationToolDispatchEnabled() {
+    return true;
+}
+/**
+ * @deprecated Phase B — no-op. Tool dispatch is the only path.
+ */
+function setOrchestrationToolDispatchEnabled(_enabled) {
+    // no-op after Phase B
+}
 function setClerkAsOrchestrator(enabled) {
     const db = getDb();
     const transaction = db.transaction(() => {
@@ -533,7 +750,7 @@ function setClerkAsOrchestrator(enabled) {
     transaction();
 }
 const CLI_PROVIDER_IDS = new Set(['claude-cli', 'codex-cli']);
-const SUPPORTED_PROVIDER_ACCESS_MODES = new Set(['api', 'cli']);
+const SUPPORTED_PROVIDER_ACCESS_MODES = new Set(['api', 'apiKey', 'cli']);
 function createProviderConnection(p) {
     const db = getDb();
     const id = newId();
@@ -734,12 +951,40 @@ function deleteAgentProfile(id) {
     tx();
     return true;
 }
+function normalizeConversationBotIds(botIds, fallbackBotId) {
+    const next = new Set();
+    for (const botId of botIds) {
+        const trimmed = String(botId || '').trim();
+        if (trimmed)
+            next.add(trimmed);
+    }
+    const fallback = String(fallbackBotId || '').trim();
+    if (next.size === 0 && fallback)
+        next.add(fallback);
+    return Array.from(next);
+}
+function parseConversationBotIds(raw) {
+    if (!raw)
+        return [];
+    try {
+        const parsed = JSON.parse(raw);
+        if (!Array.isArray(parsed))
+            return [];
+        return normalizeConversationBotIds(parsed.map((value) => (typeof value === 'string' ? value : null)));
+    }
+    catch {
+        return [];
+    }
+}
 function createConversation(agentId, title, source, opts) {
     const db = getDb();
     const id = newId();
     const ts = now();
     let projectId = opts?.projectId ?? null;
     let projectName = opts?.projectName ?? null;
+    const initialBotId = String(opts?.initialBotId || agentId || '').trim() || agentId;
+    const activeBotIds = normalizeConversationBotIds(opts?.botIds || [], initialBotId);
+    const activeBotIdsJson = JSON.stringify(activeBotIds);
     if (projectId) {
         const project = getProject(projectId);
         if (project) {
@@ -757,10 +1002,10 @@ function createConversation(agentId, title, source, opts) {
         projectName = unassigned.name;
     }
     db.prepare(`
-    INSERT INTO conversation (id, agent_id, title, source, project_id, project_name, created_at, updated_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(id, agentId, title ?? null, source ?? 'local', projectId, projectName, ts, ts);
-    return db.prepare('SELECT * FROM conversation WHERE id = ?').get(id);
+    INSERT INTO conversation (id, agent_id, initial_bot_id, active_bot_ids_json, title, source, project_id, project_name, sync_revision, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?)
+  `).run(id, agentId, initialBotId, activeBotIdsJson, title ?? null, source ?? 'local', projectId, projectName, ts, ts);
+    return getConversation(id);
 }
 function latestConversationSummarySql(conversationAlias) {
     return `(
@@ -854,14 +1099,42 @@ function conversationSelectSql(conversationAlias) {
 function hydrateConversationRow(row) {
     if (!row)
         return undefined;
+    const activeBotIds = parseConversationBotIds(row.active_bot_ids_json);
     return {
         ...row,
+        initial_bot_id: row.initial_bot_id ?? null,
+        active_bot_ids_json: row.active_bot_ids_json ?? null,
+        active_bot_ids: activeBotIds,
         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 getConversationParticipantBotIds(conversationId, conversation) {
+    const conv = conversation || getConversation(conversationId);
+    const fromConversation = normalizeConversationBotIds(conv?.active_bot_ids || []);
+    const rows = getDb().prepare(`
+    SELECT DISTINCT bot_id
+    FROM message
+    WHERE conversation_id = ?
+      AND bot_id IS NOT NULL
+      AND trim(bot_id) <> ''
+    ORDER BY bot_id
+  `).all(conversationId);
+    return normalizeConversationBotIds([...fromConversation, ...rows.map((row) => row.bot_id)], conv?.initial_bot_id || conv?.agent_id || null);
+}
+function getConversationPrimaryBotId(conversationId, conversation) {
+    const conv = conversation || getConversation(conversationId);
+    const initialBotId = String(conv?.initial_bot_id || '').trim();
+    if (initialBotId)
+        return initialBotId;
+    const participantIds = getConversationParticipantBotIds(conversationId, conv);
+    if (participantIds.length > 0)
+        return participantIds[0];
+    const legacyBotId = String(conv?.agent_id || '').trim();
+    return legacyBotId || null;
+}
 function getConversation(id) {
     return hydrateConversationRow(getDb().prepare(`${conversationSelectSql('c')} WHERE c.id = ?`).get(id));
 }
@@ -874,15 +1147,18 @@ function listConversations(opts) {
     const wheres = [];
     if (opts?.agentId) {
         wheres.push(`(
-      c.agent_id = ?
+      coalesce(c.active_bot_ids_json, '[]') LIKE ?
       OR EXISTS (
         SELECT 1
         FROM message m
         WHERE m.conversation_id = c.id
           AND m.bot_id = ?
       )
+      OR c.initial_bot_id = ?
+      OR c.agent_id = ?
     )`);
-        params.push(opts.agentId, opts.agentId);
+        const botNeedle = `%\"${opts.agentId}\"%`;
+        params.push(botNeedle, opts.agentId, opts.agentId, opts.agentId);
     }
     if (opts?.search) {
         wheres.push(`(
@@ -912,14 +1188,16 @@ function countConversations(agentId) {
         return db.prepare(`
       SELECT count(DISTINCT c.id) as cnt
       FROM conversation c
-      WHERE c.agent_id = ?
+      WHERE coalesce(c.active_bot_ids_json, '[]') LIKE ?
         OR EXISTS (
           SELECT 1
           FROM message m
           WHERE m.conversation_id = c.id
             AND m.bot_id = ?
         )
-    `).get(agentId, agentId).cnt;
+        OR c.initial_bot_id = ?
+        OR c.agent_id = ?
+    `).get(`%\"${agentId}\"%`, agentId, agentId, agentId).cnt;
     }
     return db.prepare('SELECT count(*) as cnt FROM conversation').get().cnt;
 }
@@ -930,6 +1208,74 @@ function countMessagesForBot(botId) {
     WHERE bot_id = ?
   `).get(botId).cnt;
 }
+function botConversationMembershipSql(alias) {
+    return `
+    (
+      coalesce(${alias}.active_bot_ids_json, '[]') LIKE ?
+      OR EXISTS (
+        SELECT 1
+        FROM message m
+        WHERE m.conversation_id = ${alias}.id
+          AND m.bot_id = ?
+      )
+      OR ${alias}.initial_bot_id = ?
+      OR ${alias}.agent_id = ?
+    )
+  `;
+}
+function botConversationMembershipParams(botId) {
+    return [`%\"${botId}\"%`, botId, botId, botId];
+}
+function countMessagesForBotSince(botId, since) {
+    return getDb().prepare(`
+    SELECT count(*) as cnt
+    FROM message
+    WHERE bot_id = ?
+      AND datetime(created_at) >= datetime(?)
+  `).get(botId, since).cnt;
+}
+function countDecisionsForBot(botId) {
+    const membershipSql = botConversationMembershipSql('c');
+    const params = botConversationMembershipParams(botId);
+    return getDb().prepare(`
+    SELECT count(*) as cnt
+    FROM decision d
+    JOIN conversation c ON c.id = d.conversation_id
+    WHERE ${membershipSql}
+  `).get(...params).cnt;
+}
+function countBotActiveDays(botId) {
+    const membershipSql = botConversationMembershipSql('c');
+    const params = botConversationMembershipParams(botId);
+    return getDb().prepare(`
+    SELECT count(DISTINCT date(c.updated_at)) as cnt
+    FROM conversation c
+    WHERE ${membershipSql}
+  `).get(...params).cnt;
+}
+function countBotConversationsUpdatedBetween(botId, from, to) {
+    const membershipSql = botConversationMembershipSql('c');
+    const params = [...botConversationMembershipParams(botId), from];
+    let sql = `
+    SELECT count(*) as cnt
+    FROM conversation c
+    WHERE ${membershipSql}
+      AND datetime(c.updated_at) >= datetime(?)
+  `;
+    if (to) {
+        sql += ` AND datetime(c.updated_at) < datetime(?)`;
+        params.push(to);
+    }
+    return getDb().prepare(sql).get(...params).cnt;
+}
+function sumBotTokenUsageSince(botId, since) {
+    return Number(getDb().prepare(`
+    SELECT coalesce(sum(token_count), 0) as total
+    FROM message
+    WHERE bot_id = ?
+      AND datetime(created_at) >= datetime(?)
+  `).get(botId, since).total ?? 0);
+}
 function listBotConversationActivity(botId, limit = 10) {
     const db = getDb();
     return db.prepare(`
@@ -950,18 +1296,20 @@ function listBotConversationActivity(botId, limit = 10) {
     FROM (
       ${conversationSelectSql('c')}
       WHERE (
-        c.agent_id = ?
+        coalesce(c.active_bot_ids_json, '[]') LIKE ?
         OR EXISTS (
           SELECT 1
           FROM message m
           WHERE m.conversation_id = c.id
             AND m.bot_id = ?
         )
+        OR c.initial_bot_id = ?
+        OR c.agent_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));
+  `).all(botId, botId, `%\"${botId}\"%`, botId, botId, botId, limit).map((row) => hydrateConversationRow(row));
 }
 function updateConversation(id, fields) {
     const db = getDb();
@@ -1003,6 +1351,8 @@ function updateConversation(id, fields) {
         processingError: ['processing_error', fields.processingError],
         botId: ['bot_id', fields.botId],
         forkedFromId: ['forked_from_id', fields.forkedFromId],
+        initialBotId: ['initial_bot_id', fields.initialBotId],
+        activeBotIdsJson: ['active_bot_ids_json', fields.activeBotIdsJson],
         createdAt: ['created_at', fields.createdAt],
         updatedAt: ['updated_at', fields.updatedAt],
     };
@@ -1028,6 +1378,21 @@ function updateConversation(id, fields) {
     vals.push(id);
     db.prepare(`UPDATE conversation SET ${sets.join(', ')} WHERE id = ?`).run(...vals);
 }
+function syncConversationParticipants(conversationId, botIds, opts) {
+    const conversation = getConversation(conversationId);
+    if (!conversation)
+        return;
+    const normalized = normalizeConversationBotIds(botIds, opts?.initialBotId || conversation.initial_bot_id || conversation.agent_id || null);
+    if (normalized.length === 0)
+        return;
+    const current = normalizeConversationBotIds(conversation.active_bot_ids || [], conversation.initial_bot_id || conversation.agent_id || null);
+    const nextIds = opts?.replace ? normalized : Array.from(new Set([...current, ...normalized]));
+    const nextInitialBotId = String(opts?.initialBotId || conversation.initial_bot_id || conversation.agent_id || nextIds[0] || '').trim() || null;
+    updateConversation(conversationId, {
+        activeBotIdsJson: JSON.stringify(nextIds),
+        initialBotId: nextInitialBotId || undefined,
+    });
+}
 function touchConversationActivity(id, ts) {
     const stamp = ts?.trim() || now();
     getDb().prepare(`
@@ -1039,10 +1404,46 @@ function touchConversationActivity(id, ts) {
     WHERE id = ?
   `).run(stamp, stamp, id);
 }
+function bumpConversationSyncRevision(id, ts) {
+    const stamp = ts?.trim() || now();
+    getDb().prepare(`
+    UPDATE conversation
+    SET sync_revision = coalesce(sync_revision, 0) + 1,
+        updated_at = CASE
+          WHEN datetime(updated_at) > datetime(?) THEN updated_at
+          ELSE ?
+        END
+    WHERE id = ?
+  `).run(stamp, stamp, id);
+    const row = getDb().prepare('SELECT sync_revision FROM conversation WHERE id = ?').get(id);
+    return Number(row?.sync_revision ?? 0);
+}
 function deleteConversation(id) {
     return getDb().prepare('DELETE FROM conversation WHERE id = ?').run(id).changes > 0;
 }
-function addMessage(conversationId, role, content, model, toolCallsJson, botId, agentName, createdAt) {
+function toWarmSessionBindingKey(conversationId, botId) {
+    return `${conversationId}::${botId}`;
+}
+function parseWarmSessionBindingKey(key) {
+    const idx = key.indexOf('::');
+    if (idx < 0)
+        return null;
+    return { conversationId: key.slice(0, idx), botId: key.slice(idx + 2) };
+}
+function epochRowToWarmInfo(row) {
+    return {
+        conversationId: row.conversation_id,
+        sessionScopeKey: row.session_scope_key,
+        botId: row.bot_id,
+        provider: row.provider,
+        sessionId: row.session_id,
+        topicId: row.topic_id,
+        epochTurnCount: row.epoch_turn_count,
+        lastUsedAt: row.last_used_at,
+        resetReason: row.reset_reason,
+    };
+}
+function addMessage(conversationId, role, content, model, toolCallsJson, botId, agentName, createdAt, attachmentsJson) {
     const db = getDb();
     const id = newId();
     const ts = createdAt?.trim() || now();
@@ -1050,9 +1451,9 @@ function addMessage(conversationId, role, content, model, toolCallsJson, botId,
     const maxSeq = db.prepare('SELECT COALESCE(MAX(seq), 0) as m FROM message WHERE conversation_id = ?').get(conversationId);
     const seq = maxSeq.m + 1;
     db.prepare(`
-    INSERT INTO message (id, conversation_id, seq, role, content, model, tool_calls_json, bot_id, agent_name, created_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(id, conversationId, seq, role, content, model ?? null, toolCallsJson ?? null, botId ?? null, agentName ?? null, ts);
+    INSERT INTO message (id, conversation_id, seq, role, content, attachments_json, model, tool_calls_json, bot_id, agent_name, created_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(id, conversationId, seq, role, content, attachmentsJson ?? null, model ?? null, toolCallsJson ?? null, botId ?? null, agentName ?? null, ts);
     // Update conversation message_count and updated_at
     db.prepare(`
     UPDATE conversation
@@ -1076,6 +1477,10 @@ function updateMessage(id, fields) {
         sets.push('content = ?');
         vals.push(fields.content);
     }
+    if (fields.attachmentsJson !== undefined) {
+        sets.push('attachments_json = ?');
+        vals.push(fields.attachmentsJson);
+    }
     if (fields.model !== undefined) {
         sets.push('model = ?');
         vals.push(fields.model);
@@ -1123,29 +1528,37 @@ function createChatJob(input) {
   `).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 getCliSessionEpoch(conversationId, botId) {
+function normalizeCliSessionScopeKey(conversationId, sessionScopeKey) {
+    const trimmed = String(sessionScopeKey || '').trim();
+    return trimmed || conversationId;
+}
+function getCliSessionEpoch(conversationId, botId, sessionScopeKey) {
+    const scopeKey = normalizeCliSessionScopeKey(conversationId, sessionScopeKey);
     return getDb().prepare(`
     SELECT *
     FROM cli_session_epoch
-    WHERE conversation_id = ? AND bot_id = ?
+    WHERE session_scope_key = ? AND bot_id = ?
     LIMIT 1
-  `).get(conversationId, botId);
+  `).get(scopeKey, botId);
 }
 function upsertCliSessionEpoch(input) {
     const db = getDb();
-    const existing = getCliSessionEpoch(input.conversationId, input.botId);
+    const scopeKey = normalizeCliSessionScopeKey(input.conversationId, input.sessionScopeKey);
+    const existing = getCliSessionEpoch(input.conversationId, input.botId, scopeKey);
     const id = existing?.id || newId();
     const epochStartedAt = input.epochStartedAt || existing?.epoch_started_at || now();
     const lastUsedAt = input.lastUsedAt || now();
+    const topicId = input.topicId !== undefined ? (input.topicId || null) : (existing?.topic_id ?? null);
     db.prepare(`
     INSERT INTO cli_session_epoch (
-      id, conversation_id, bot_id, provider, session_id, epoch_turn_count,
+      id, conversation_id, session_scope_key, bot_id, provider, session_id, topic_id, epoch_turn_count,
       last_input_tokens, last_output_tokens, epoch_started_at, last_used_at,
       reset_reason, created_at, updated_at
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    ON CONFLICT(conversation_id, bot_id) DO UPDATE SET
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    ON CONFLICT(session_scope_key, bot_id) DO UPDATE SET
       provider = excluded.provider,
       session_id = excluded.session_id,
+      topic_id = excluded.topic_id,
       epoch_turn_count = excluded.epoch_turn_count,
       last_input_tokens = excluded.last_input_tokens,
       last_output_tokens = excluded.last_output_tokens,
@@ -1153,14 +1566,42 @@ function upsertCliSessionEpoch(input) {
       last_used_at = excluded.last_used_at,
       reset_reason = excluded.reset_reason,
       updated_at = excluded.updated_at
-  `).run(id, input.conversationId, input.botId, input.provider, input.sessionId, input.epochTurnCount, input.lastInputTokens ?? null, input.lastOutputTokens ?? null, epochStartedAt, lastUsedAt, input.resetReason ?? null, existing?.created_at || now(), now());
-    return getCliSessionEpoch(input.conversationId, input.botId);
+  `).run(id, input.conversationId, scopeKey, input.botId, input.provider, input.sessionId, topicId, input.epochTurnCount, input.lastInputTokens ?? null, input.lastOutputTokens ?? null, epochStartedAt, lastUsedAt, input.resetReason ?? null, existing?.created_at || now(), now());
+    return getCliSessionEpoch(input.conversationId, input.botId, scopeKey);
+}
+function deleteCliSessionEpoch(conversationId, botId, sessionScopeKey) {
+    const scopeKey = normalizeCliSessionScopeKey(conversationId, sessionScopeKey);
+    return getDb().prepare(`
+    DELETE FROM cli_session_epoch
+    WHERE session_scope_key = ? AND bot_id = ?
+  `).run(scopeKey, botId).changes > 0;
+}
+function clearCliSessionEpochIfMatches(conversationId, botId, sessionId, sessionScopeKey) {
+    const normalizedSessionId = String(sessionId || '').trim();
+    if (!normalizedSessionId)
+        return false;
+    const scopeKey = normalizeCliSessionScopeKey(conversationId, sessionScopeKey);
+    return getDb().prepare(`
+    DELETE FROM cli_session_epoch
+    WHERE session_scope_key = ? AND bot_id = ? AND session_id = ?
+  `).run(scopeKey, botId, normalizedSessionId).changes > 0;
 }
-function deleteCliSessionEpoch(conversationId, botId) {
+function cleanupPoisonedClaudePrewarmSessionRows() {
     return getDb().prepare(`
     DELETE FROM cli_session_epoch
-    WHERE conversation_id = ? AND bot_id = ?
-  `).run(conversationId, botId).changes > 0;
+    WHERE provider = 'claude-cli'
+      AND epoch_turn_count = 0
+      AND reset_reason = 'prewarm'
+      AND session_id LIKE 'fff00000-%'
+  `).run().changes;
+}
+function getCliSessionEpochsByConversation(conversationId) {
+    return getDb().prepare(`
+    SELECT *
+    FROM cli_session_epoch
+    WHERE conversation_id = ?
+    ORDER BY last_used_at DESC
+  `).all(conversationId);
 }
 /**
  * Generate the next sequential Funolio session ID.
@@ -1286,6 +1727,119 @@ function markRunningChatJobsInterrupted(reason = 'Interrupted when app closed')
   `).run(reason, ts, ts);
     return result.changes;
 }
+function recoverInterruptedChatJobs() {
+    const db = getDb();
+    const ts = now();
+    const INTERRUPTED_NOTE = '\n\n[Response interrupted - retry to continue]';
+    const ERROR_MSG = 'Agent was restarted during processing';
+    const orphanedJobs = db.prepare(`
+    SELECT id, status, assistant_message_id
+    FROM chat_job
+    WHERE status IN ('running', 'pending')
+  `).all();
+    if (orphanedJobs.length === 0) {
+        return { recoveredJobs: [], totalRecovered: 0 };
+    }
+    const updateJob = db.prepare(`
+    UPDATE chat_job
+    SET status = 'interrupted',
+        error = ?,
+        updated_at = ?
+    WHERE id = ?
+  `);
+    const getMsg = db.prepare('SELECT id, content FROM message WHERE id = ?');
+    const appendNote = db.prepare('UPDATE message SET content = content || ? WHERE id = ?');
+    const recoveredJobs = [];
+    const runAll = db.transaction(() => {
+        for (const job of orphanedJobs) {
+            updateJob.run(ERROR_MSG, ts, job.id);
+            if (job.assistant_message_id) {
+                const msg = getMsg.get(job.assistant_message_id);
+                if (msg && msg.content && msg.content.trim().length > 0) {
+                    appendNote.run(INTERRUPTED_NOTE, msg.id);
+                }
+            }
+            recoveredJobs.push({ jobId: job.id, previousStatus: job.status });
+        }
+    });
+    runAll();
+    return { recoveredJobs, totalRecovered: recoveredJobs.length };
+}
+function recoverInterruptedWorkflowRuns(reason = 'Agent was restarted during workflow execution') {
+    const db = getDb();
+    const ts = now();
+    const runningWorkflowRows = db.prepare(`
+    SELECT id, conversation_id, status
+    FROM workflow_execution
+    WHERE status = 'running'
+  `).all();
+    const runningImportedRuns = db.prepare(`
+    SELECT *
+    FROM imported_plan_run
+    WHERE status = 'running'
+  `).all();
+    const updateSteps = db.prepare(`
+    UPDATE workflow_step_execution
+    SET status = 'failed',
+        error = CASE
+          WHEN error IS NULL OR trim(error) = '' THEN ?
+          ELSE error
+        END,
+        completed_at = COALESCE(completed_at, ?)
+    WHERE workflow_execution_id = ?
+      AND status = 'running'
+  `);
+    const updateWorkflow = db.prepare(`
+    UPDATE workflow_execution
+    SET status = 'failed',
+        error = CASE
+          WHEN error IS NULL OR trim(error) = '' THEN ?
+          ELSE error
+        END,
+        completed_at = COALESCE(completed_at, ?)
+    WHERE id = ?
+      AND status = 'running'
+  `);
+    const updateImportedRun = db.prepare(`
+    UPDATE imported_plan_run
+    SET status = ?,
+        completed_at = CASE WHEN ? = 'completed' THEN COALESCE(completed_at, ?) ELSE completed_at END,
+        last_error = ?,
+        updated_at = datetime('now')
+    WHERE id = ?
+  `);
+    const recoveredWorkflowExecutions = [];
+    const recoveredImportedPlanRuns = [];
+    const runAll = db.transaction(() => {
+        for (const workflow of runningWorkflowRows) {
+            updateSteps.run(reason, ts, workflow.id);
+            updateWorkflow.run(reason, ts, workflow.id);
+            recoveredWorkflowExecutions.push({
+                workflowId: workflow.id,
+                conversationId: workflow.conversation_id,
+                previousStatus: workflow.status,
+            });
+        }
+        for (const rawRun of runningImportedRuns) {
+            const run = normalizeImportedPlanRunRow(rawRun);
+            const remainingTaskCount = getImportedPlanRunRemainingTaskIds(run.id).length;
+            const nextStatus = remainingTaskCount > 0 ? 'paused' : 'completed';
+            updateImportedRun.run(nextStatus, nextStatus, ts, remainingTaskCount > 0 ? reason : null, run.id);
+            recoveredImportedPlanRuns.push({
+                runId: run.id,
+                conversationId: run.conversation_id,
+                previousStatus: run.status,
+                remainingTaskCount,
+            });
+        }
+    });
+    runAll();
+    return {
+        recoveredWorkflowExecutions,
+        recoveredImportedPlanRuns,
+        totalRecovered: recoveredWorkflowExecutions.length + recoveredImportedPlanRuns.length,
+    };
+}
 function createMessageActivity(activity) {
     const db = getDb();
     const id = newId();
@@ -1864,6 +2418,274 @@ function updateImportJobItem(id, fields) {
     vals.push(id);
     db.prepare(`UPDATE import_job_item SET ${sets.join(', ')} WHERE id = ?`).run(...vals);
 }
+function getImportedPlanFirstKnownOrder(run) {
+    const knownTasks = run.task_ids
+        .map((taskId) => getTodoTask(taskId, 'active') || getTodoTask(taskId, 'completed'))
+        .filter((task) => !!task);
+    if (knownTasks.length === 0)
+        return null;
+    return Math.min(...knownTasks.map((task) => task.created_order));
+}
+function doesTodoBelongToImportedPlanRun(run, task) {
+    if (!task.conversation_id || task.conversation_id !== run.conversation_id)
+        return false;
+    if (run.task_ids.includes(task.id))
+        return true;
+    const firstImportedOrder = getImportedPlanFirstKnownOrder(run);
+    if (firstImportedOrder == null)
+        return false;
+    return task.created_order >= firstImportedOrder;
+}
+function touchImportedPlanRunForTask(task) {
+    if (!task.conversation_id)
+        return undefined;
+    const rows = getDb().prepare(`
+    SELECT *
+    FROM imported_plan_run
+    WHERE conversation_id = ?
+      AND status IN ('running', 'paused')
+    ORDER BY datetime(updated_at) DESC, id DESC
+  `).all(task.conversation_id);
+    for (const row of rows) {
+        const run = normalizeImportedPlanRunRow(row);
+        if (!doesTodoBelongToImportedPlanRun(run, task))
+            continue;
+        getDb().prepare(`
+      UPDATE imported_plan_run
+      SET updated_at = datetime('now')
+      WHERE id = ?
+    `).run(run.id);
+        return getImportedPlanRun(run.id);
+    }
+    return undefined;
+}
+function parseImportedPlanStageArray(raw) {
+    try {
+        const parsed = JSON.parse(String(raw || '[]'));
+        if (!Array.isArray(parsed))
+            return [];
+        return parsed
+            .map((entry) => ({
+            role: String(entry?.role || '').trim(),
+            botId: String(entry?.botId || '').trim(),
+        }))
+            .filter((entry) => entry.role && entry.botId);
+    }
+    catch {
+        return [];
+    }
+}
+function parseImportedPlanOptions(raw) {
+    try {
+        const parsed = JSON.parse(String(raw || '{}'));
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+            return {};
+        return {
+            plannerInstructions: typeof parsed.plannerInstructions === 'string' ? parsed.plannerInstructions : null,
+            executionOrder: parsed.executionOrder === 'batch_by_stage' ? 'batch_by_stage'
+                : parsed.executionOrder === 'per_item_pipeline' ? 'per_item_pipeline'
+                    : null,
+        };
+    }
+    catch {
+        return {};
+    }
+}
+function parseImportedPlanTaskIds(raw) {
+    try {
+        const parsed = JSON.parse(String(raw || '[]'));
+        if (!Array.isArray(parsed))
+            return [];
+        return parsed
+            .map((value) => Number(value))
+            .filter((value) => Number.isFinite(value) && value > 0);
+    }
+    catch {
+        return [];
+    }
+}
+function normalizeImportedPlanRunRow(row) {
+    return {
+        id: String(row.id),
+        conversation_id: String(row.conversation_id),
+        project_id: row.project_id ? String(row.project_id) : null,
+        source_file_path: String(row.source_file_path || ''),
+        source_file_name: String(row.source_file_name || ''),
+        planner_bot_id: row.planner_bot_id ? String(row.planner_bot_id) : null,
+        planner_agent_name: row.planner_agent_name ? String(row.planner_agent_name) : null,
+        planner_provider: row.planner_provider ? String(row.planner_provider) : null,
+        planner_model: row.planner_model ? String(row.planner_model) : null,
+        requested_stages: parseImportedPlanStageArray(row.requested_stages_json),
+        requested_options: parseImportedPlanOptions(row.requested_options_json),
+        task_ids: parseImportedPlanTaskIds(row.task_ids_json),
+        status: String(row.status || 'paused'),
+        created_at: String(row.created_at || ''),
+        updated_at: String(row.updated_at || ''),
+        started_at: row.started_at ? String(row.started_at) : null,
+        completed_at: row.completed_at ? String(row.completed_at) : null,
+        discarded_at: row.discarded_at ? String(row.discarded_at) : null,
+        last_error: row.last_error ? String(row.last_error) : null,
+    };
+}
+function createImportedPlanRun(params) {
+    const db = getDb();
+    const id = newId();
+    const ts = now();
+    db.prepare(`
+    INSERT INTO imported_plan_run (
+      id, conversation_id, project_id, source_file_path, source_file_name,
+      planner_bot_id, planner_agent_name, planner_provider, planner_model,
+      requested_stages_json, requested_options_json, task_ids_json, status,
+      created_at, updated_at, started_at, completed_at, discarded_at, last_error
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(id, params.conversationId, params.projectId ?? null, params.sourceFilePath, params.sourceFileName, params.plannerBotId ?? null, params.plannerAgentName ?? null, params.plannerProvider ?? null, params.plannerModel ?? null, JSON.stringify(params.requestedStages || []), JSON.stringify(params.requestedOptions || {}), JSON.stringify((params.taskIds || []).filter((taskId) => Number.isFinite(taskId) && taskId > 0)), params.status || 'paused', ts, ts, params.status === 'running' ? ts : null, params.status === 'completed' ? ts : null, params.status === 'discarded' ? ts : null, null);
+    return getImportedPlanRun(id);
+}
+function getImportedPlanRun(id) {
+    const row = getDb().prepare('SELECT * FROM imported_plan_run WHERE id = ?').get(id);
+    if (!row)
+        return undefined;
+    return normalizeImportedPlanRunRow(row);
+}
+function listImportedPlanRunsForConversation(conversationId) {
+    const rows = getDb().prepare('SELECT * FROM imported_plan_run WHERE conversation_id = ? ORDER BY datetime(created_at) DESC, id DESC').all(conversationId);
+    return rows.map(normalizeImportedPlanRunRow);
+}
+function getLatestImportedPlanRunForConversation(conversationId, opts) {
+    const clauses = ['conversation_id = ?'];
+    const params = [conversationId];
+    if (!opts?.includeDiscarded)
+        clauses.push("status <> 'discarded'");
+    if (!opts?.includeCompleted)
+        clauses.push("status <> 'completed'");
+    const row = getDb().prepare(`SELECT * FROM imported_plan_run WHERE ${clauses.join(' AND ')} ORDER BY datetime(updated_at) DESC, id DESC LIMIT 1`).get(...params);
+    if (!row)
+        return undefined;
+    return normalizeImportedPlanRunRow(row);
+}
+function updateImportedPlanRun(id, fields) {
+    const db = getDb();
+    const sets = [];
+    const vals = [];
+    if (fields.taskIds !== undefined) {
+        sets.push('task_ids_json = ?');
+        vals.push(JSON.stringify(fields.taskIds));
+    }
+    if (fields.status !== undefined) {
+        sets.push('status = ?');
+        vals.push(fields.status);
+    }
+    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.discardedAt !== undefined) {
+        sets.push('discarded_at = ?');
+        vals.push(fields.discardedAt);
+    }
+    if (fields.lastError !== undefined) {
+        sets.push('last_error = ?');
+        vals.push(fields.lastError);
+    }
+    if (sets.length === 0)
+        return getImportedPlanRun(id);
+    sets.push("updated_at = datetime('now')");
+    vals.push(id);
+    db.prepare(`UPDATE imported_plan_run SET ${sets.join(', ')} WHERE id = ?`).run(...vals);
+    return getImportedPlanRun(id);
+}
+function touchImportedPlanRun(id) {
+    getDb().prepare(`
+    UPDATE imported_plan_run
+    SET updated_at = datetime('now')
+    WHERE id = ?
+  `).run(id);
+    return getImportedPlanRun(id);
+}
+function getImportedPlanRunTasks(id) {
+    const run = getImportedPlanRun(id);
+    if (!run)
+        return [];
+    const knownTasks = run.task_ids
+        .map((taskId) => getTodoTask(taskId, 'active') || getTodoTask(taskId, 'completed'))
+        .filter((task) => !!task);
+    if (knownTasks.length === 0) {
+        return run.task_ids
+            .map((taskId) => getTodoTask(taskId, 'active') || getTodoTask(taskId, 'completed'))
+            .filter((task) => !!task);
+    }
+    const firstImportedOrder = Math.min(...knownTasks.map((task) => task.created_order));
+    const db = getDb();
+    const activeRows = db.prepare(`SELECT * FROM todo_active WHERE conversation_id = ? AND COALESCE(internal_only, 0) = 0 AND created_order >= ? ORDER BY created_order ASC, id ASC`).all(run.conversation_id, firstImportedOrder);
+    const completedRows = db.prepare(`SELECT * FROM todo_completed WHERE conversation_id = ? AND COALESCE(internal_only, 0) = 0 AND created_order >= ? ORDER BY created_order ASC, id ASC`).all(run.conversation_id, firstImportedOrder);
+    const allTasks = [
+        ...activeRows.map((row) => normalizeTodoRow(row, 'active')),
+        ...completedRows.map((row) => normalizeTodoRow(row, 'completed')),
+    ].sort((a, b) => (a.created_order - b.created_order) || (a.id - b.id));
+    return allTasks;
+}
+function getImportedPlanRunRemainingTaskIds(id) {
+    const run = getImportedPlanRun(id);
+    if (!run)
+        return [];
+    const knownTasks = run.task_ids
+        .map((taskId) => getTodoTask(taskId, 'active') || getTodoTask(taskId, 'completed'))
+        .filter((task) => !!task);
+    if (knownTasks.length === 0) {
+        return run.task_ids.filter((taskId) => !!getTodoTask(taskId, 'active'));
+    }
+    // Resume must follow the current TODO queue, not just the original imported
+    // IDs. QA-fail fix tasks and re-QA companions are inserted into the same
+    // conversation/order after import; if the app resumes later, those inserted
+    // active tasks must run before later original tasks.
+    const firstImportedOrder = Math.min(...knownTasks.map((task) => task.created_order));
+    const rows = getDb().prepare(`
+    SELECT id
+    FROM todo_active
+    WHERE conversation_id = ?
+      AND COALESCE(internal_only, 0) = 0
+      AND created_order >= ?
+    ORDER BY created_order ASC, id ASC
+  `).all(run.conversation_id, firstImportedOrder);
+    return rows.map((row) => Number(row.id)).filter((taskId) => Number.isFinite(taskId) && taskId > 0);
+}
+function getImportedPlanRunCurrentTask(id) {
+    return getImportedPlanRunTasks(id).find((task) => task.state === 'active');
+}
+function deleteImportedPlanRunSelectedTasks(id, selectedTaskIds, actor) {
+    const db = getDb();
+    const tx = db.transaction(() => {
+        const current = getImportedPlanRun(id);
+        if (!current)
+            throw new Error(`Imported plan run ${id} not found`);
+        if (current.status !== 'paused') {
+            throw new Error('Imported plan tasks can only be edited while the plan is paused.');
+        }
+        const selected = new Set((selectedTaskIds || [])
+            .map((taskId) => Number(taskId))
+            .filter((taskId) => Number.isFinite(taskId) && current.task_ids.includes(taskId)));
+        if (selected.size === 0)
+            return current;
+        for (const taskId of selected) {
+            if (getTodoTask(taskId, 'active')) {
+                deleteTodoTask(taskId, { actor, state: 'active' });
+            }
+        }
+        const remainingTaskIds = current.task_ids.filter((taskId) => !selected.has(taskId) && !!getTodoTask(taskId, 'active'));
+        const nextStatus = remainingTaskIds.length > 0 ? 'paused' : 'discarded';
+        return updateImportedPlanRun(id, {
+            taskIds: remainingTaskIds,
+            status: nextStatus,
+            discardedAt: remainingTaskIds.length > 0 ? null : now(),
+            lastError: null,
+        });
+    });
+    return tx();
+}
 function createOutboxEvent(e) {
     const db = getDb();
     const id = newId();
@@ -1906,7 +2728,7 @@ function setJsonSetting(key, value) {
     setSetting(key, JSON.stringify(value));
 }
 function getAllSettings() {
-    const rows = getDb().prepare("SELECT key, value FROM settings WHERE key NOT LIKE '_%'").all();
+    const rows = getDb().prepare("SELECT key, value FROM settings WHERE substr(key, 1, 1) != '_'").all();
     const result = {};
     for (const r of rows)
         result[r.key] = r.value;
@@ -2319,6 +3141,7 @@ function normalizeTodoRow(row, state) {
     return {
         id: Number(row.id),
         project_id: row.project_id ? String(row.project_id) : null,
+        topic_id: row.topic_id ? String(row.topic_id) : null,
         conversation_id: row.conversation_id ? String(row.conversation_id) : null,
         origin: row.origin ? String(row.origin) : null,
         created_by_bot_id: row.created_by_bot_id ? String(row.created_by_bot_id) : null,
@@ -2358,9 +3181,9 @@ function roleClassToTaskType(roleClass) {
     const normalized = String(roleClass || '').trim().toLowerCase();
     if (!normalized)
         return null;
-    if (normalized === 'code' || normalized === 'coding' || normalized === 'developer')
+    if (normalized === 'code' || normalized === 'coding' || normalized === 'developer' || normalized === 'builder' || normalized === 'engineer')
         return 'coding';
-    if (normalized === 'qa' || normalized === 'review')
+    if (normalized === 'qa' || normalized === 'review' || normalized === 'reviewer')
         return 'qa';
     if (normalized === 'research' || normalized === 'brainstorm' || normalized === 'planning' || normalized === 'plan')
         return 'research';
@@ -2380,7 +3203,11 @@ function inferTaskTypeForAgent(agent, requested) {
     const explicit = String(requested || '').trim();
     if (explicit)
         return explicit;
-    return roleClassToTaskType(agent?.role_class) || roleClassToTaskType(agent?.role_label) || null;
+    return roleClassToTaskType(agent?.orchestration_role_class)
+        || roleClassToTaskType(agent?.orchestration_role_label)
+        || roleClassToTaskType(agent?.role_class)
+        || roleClassToTaskType(agent?.role_label)
+        || null;
 }
 function buildQueuedTaskContext(task) {
     const lines = [
@@ -2393,21 +3220,21 @@ function buildQueuedTaskContext(task) {
     return lines.join('\n');
 }
 function injectWorkerHandoffIntoPrompt(existingPrompt, handoffText, nextTask) {
-    const taskReplacement = [
-        'Task:',
+    const safeHandoff = String(handoffText || '');
+    const handoffSection = [
         'PREVIOUS WORKER HANDOFF',
-        handoffText,
+        safeHandoff,
         '',
         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 existingPrompt.replace(/\nRUNTIME CONTEXT\n/, `\n${handoffSection}\n\nRUNTIME CONTEXT\n`);
     }
     return [
+        existingPrompt,
+        '',
         'PREVIOUS WORKER HANDOFF',
-        handoffText,
+        safeHandoff,
         '',
         buildQueuedTaskContext(nextTask),
     ].join('\n');
@@ -2455,6 +3282,7 @@ function moveActiveTaskToCompletedTx(db, taskId, actor, reason) {
     const row = db.prepare('SELECT * FROM todo_active WHERE id = ?').get(taskId);
     if (!row)
         throw new Error(`Task ${taskId} not found`);
+    const activeTask = normalizeTodoRow(row, 'active');
     const completedAt = now();
     db.prepare(`
     INSERT INTO todo_completed (
@@ -2468,7 +3296,9 @@ function moveActiveTaskToCompletedTx(db, taskId, actor, reason) {
     db.prepare('DELETE FROM todo_active WHERE id = ?').run(taskId);
     logTodoAuditTx(db, taskId, 'completed', 'complete', actor, { reason });
     const completed = db.prepare('SELECT * FROM todo_completed WHERE id = ?').get(taskId);
-    return normalizeTodoRow(completed, 'completed');
+    const completedTask = normalizeTodoRow(completed, 'completed');
+    touchImportedPlanRunForTask(activeTask);
+    return completedTask;
 }
 function determineInsertPositionTx(db, projectId, insertAfterTaskId) {
     if (insertAfterTaskId) {
@@ -2542,43 +3372,35 @@ function resolveAllowedWorkerNamesForInsertion(currentTask) {
         allowed.add(previous.owner_name.trim().toLowerCase());
     return Array.from(allowed);
 }
-function resolvePreviousWorkerName(currentTask) {
+function resolvePreviousWorkerTask(currentTask) {
     const db = getDb();
     const previous = currentTask.project_id
         ? db.prepare(`
-      SELECT owner_name
+      SELECT owner_name, task_type
       FROM (
-        SELECT owner_name, created_order, internal_only FROM todo_active WHERE project_id = ?
+        SELECT owner_name, task_type, 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 = ?
+        SELECT owner_name, task_type, 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
+      SELECT owner_name, task_type
       FROM (
-        SELECT owner_name, created_order, internal_only FROM todo_active WHERE project_id IS NULL
+        SELECT owner_name, task_type, 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
+        SELECT owner_name, task_type, 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;
+    return previous || 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 resolvePreviousWorkerName(currentTask) {
+    return resolvePreviousWorkerTask(currentTask)?.owner_name?.trim() || null;
 }
 function normalizeArtifactInput(ref) {
     if (typeof ref === 'string') {
@@ -2644,13 +3466,22 @@ function listTodoTasks(opts) {
     const limit = opts?.limit ?? 200;
     const offset = opts?.offset ?? 0;
     const table = state === 'active' ? 'todo_active' : 'todo_completed';
+    const topicSelect = `
+    (
+      SELECT ts.topic_id
+      FROM topic_segment ts
+      WHERE ts.conversation_id = t.conversation_id
+      ORDER BY datetime(ts.created_at) DESC, ts.id DESC
+      LIMIT 1
+    ) AS topic_id
+  `;
     const orderBy = state === 'active'
-        ? 'ORDER BY created_order ASC, id ASC'
-        : 'ORDER BY datetime(completed_at) DESC, id DESC';
+        ? 'ORDER BY t.created_order ASC, t.id ASC'
+        : 'ORDER BY datetime(t.completed_at) DESC, t.id DESC';
     const hasProjectFilter = Object.prototype.hasOwnProperty.call(opts || {}, 'projectId') && opts?.projectId !== undefined;
     const sql = hasProjectFilter
-        ? `SELECT * FROM ${table} WHERE project_id ${opts?.projectId ? '= ?' : 'IS NULL'} ${orderBy} LIMIT ? OFFSET ?`
-        : `SELECT * FROM ${table} ${orderBy} LIMIT ? OFFSET ?`;
+        ? `SELECT t.*, ${topicSelect} FROM ${table} t WHERE t.project_id ${opts?.projectId ? '= ?' : 'IS NULL'} ${orderBy} LIMIT ? OFFSET ?`
+        : `SELECT t.*, ${topicSelect} FROM ${table} t ${orderBy} LIMIT ? OFFSET ?`;
     const rows = hasProjectFilter
         ? (opts?.projectId
             ? db.prepare(sql).all(opts.projectId, limit, offset)
@@ -2823,7 +3654,9 @@ function editTodoTask(taskId, params) {
             return moveActiveTaskToCompletedTx(db, taskId, params.actor, 'all_llms_complete');
         }
         const updated = db.prepare('SELECT * FROM todo_active WHERE id = ?').get(taskId);
-        return normalizeTodoRow(updated, 'active');
+        const updatedTask = normalizeTodoRow(updated, 'active');
+        touchImportedPlanRunForTask(updatedTask);
+        return updatedTask;
     });
     return tx();
 }
@@ -2887,7 +3720,9 @@ function checkTodoTask(taskId, params) {
             return moveActiveTaskToCompletedTx(db, taskId, params.actor, 'all_llms_complete');
         }
         const updated = db.prepare('SELECT * FROM todo_active WHERE id = ?').get(taskId);
-        return normalizeTodoRow(updated, 'active');
+        const updatedTask = normalizeTodoRow(updated, 'active');
+        touchImportedPlanRunForTask(updatedTask);
+        return updatedTask;
     });
     return tx();
 }
@@ -2942,6 +3777,23 @@ function completeTodoTaskByWorker(taskId, params) {
         if (!isAssignedWorker && !isOrchestratorActor) {
             throw new Error(`Actor "${actorName || 'unknown'}" is not the owner of task ${taskId}`);
         }
+        // QA tasks MUST declare qa_result. Codex QA 2026-04-19 (HIGH): the
+        // prompt says so, but the runtime was not enforcing it — a QA
+        // worker that omitted qa_result was silently treated as "pass"
+        // because control fell through to the next_worker handoff branch.
+        // Now rejected at the edge. Orchestrator actors (admin override)
+        // bypass this check — that's for cleanup operations only.
+        const isQaTask = String(currentTask.task_type || '').trim().toLowerCase() === 'qa';
+        if (isQaTask && !isOrchestratorActor) {
+            const incomingQaResult = params.qaResult;
+            if (incomingQaResult !== 'pass' && incomingQaResult !== 'fail') {
+                throw new Error(`QA task ${taskId} must be completed with qa_result='pass' or qa_result='fail'. `
+                    + `Got ${incomingQaResult === undefined ? 'no qa_result' : `qa_result='${String(incomingQaResult)}'`}. `
+                    + `'not_applicable' is not valid on QA tasks. `
+                    + `If QA passed with no defects, set qa_result='pass'. `
+                    + `If defects were found, set qa_result='fail' and include findings.`);
+            }
+        }
         const existingArtifactRows = loadArtifactRowsByIdsTx(db, currentTask.artifact_ids);
         const newArtifactRows = resolveArtifactRowsTx(db, params.artifactRefs || [], {
             projectId: currentTask.project_id,
@@ -2968,6 +3820,9 @@ function completeTodoTaskByWorker(taskId, params) {
             outputSummary,
             artifactIds,
             inserted: Boolean(params.insertTask),
+            qaResult: params.qaResult ?? null,
+            findings: params.findings ?? null,
+            requiresFixTask: params.requiresFixTask ?? null,
         });
         const completedTask = moveActiveTaskToCompletedTx(db, taskId, params.actor, 'all_llms_complete');
         let insertedTask;
@@ -3022,26 +3877,46 @@ function completeTodoTaskByWorker(taskId, params) {
             }
         }
         else {
-            if (shouldAutoCreateQaFixTask(completedTask, outputSummary, handoffPrompt)) {
-                const previousWorkerName = resolvePreviousWorkerName(completedTask);
+            const wantsQaFixTask = params.qaResult === 'fail' && params.requiresFixTask !== false;
+            if (wantsQaFixTask) {
+                const previousWorkerTask = resolvePreviousWorkerTask(completedTask);
+                const previousWorkerName = previousWorkerTask?.owner_name?.trim() || null;
+                const previousTaskType = String(previousWorkerTask?.task_type || '').trim().toLowerCase();
                 const previousWorker = resolveAgentByName(previousWorkerName);
-                if (previousWorkerName && previousWorker) {
+                const findingsText = (params.findings || []).map((s) => String(s || '').trim()).filter(Boolean).join('\n- ');
+                const fixPrompt = findingsText
+                    ? `QA findings to address:\n- ${findingsText}\n\n${handoffPrompt ? handoffPrompt + '\n\n' : ''}Address the findings above and keep the approved parts unchanged.`
+                    : (handoffPrompt || outputSummary || 'Address the QA findings and keep the approved parts unchanged.');
+                if (previousTaskType === 'qa') {
+                    returnedToOrchestrator = true;
+                    logTodoAuditTx(db, taskId, 'completed', 'return_to_orchestrator', params.actor, {
+                        handoffPrompt,
+                        qaResult: 'fail',
+                        findings: params.findings || null,
+                        skippedQaFixLoop: true,
+                        previousWorkerName,
+                        previousTaskType,
+                    });
+                }
+                else 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.',
+                        details: findingsText
+                            ? `QA findings:\n- ${findingsText}`
+                            : (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),
+                        taskType: previousWorkerTask?.task_type || 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.',
+                        taskPrompt: fixPrompt,
                         artifactIds,
                         insertAfterTaskId: completedTask.id,
                         actor: params.actor,
@@ -3049,13 +3924,54 @@ function completeTodoTaskByWorker(taskId, params) {
                     logTodoAuditTx(db, insertedTask.id, 'active', 'worker_insert', params.actor, {
                         insertedAfterTaskId: completedTask.id,
                         requestedWorkerName: previousWorker.name,
-                        autoCreatedFromQaFailure: true,
+                        qaFailureFromStructuredField: true,
+                        findings: params.findings || null,
                     });
+                    // Companion re-QA TODO: after the previous worker addresses the
+                    // findings, the QA worker must re-review. Without this follow-up
+                    // task, the fix TODO's next_worker_bot_id points at a QA worker
+                    // with no active TODO, and the dispatcher silently skips re-QA
+                    // and runs whatever sits next in the queue (item 5 bug).
+                    // Chain: fix -> re-QA -> [QA's original next_worker].
+                    const currentOwnerId = currentTask.owner_bot_id;
+                    const currentOwnerName = currentTask.owner_name;
+                    if (currentOwnerId && currentOwnerName) {
+                        const reQaTask = insertTodoTaskTx(db, {
+                            projectId: completedTask.project_id,
+                            conversationId: completedTask.conversation_id,
+                            title: `Re-QA after fix`,
+                            details: findingsText
+                                ? `Re-review the previous worker's fix for these findings:\n- ${findingsText}`
+                                : 'Re-review the previous worker\'s fix against the original handoff.',
+                            participants: [currentOwnerName],
+                            successCriteria: 'Re-QA confirms the findings were addressed and the work meets the original spec.',
+                            ownerBotId: currentOwnerId,
+                            ownerName: currentOwnerName,
+                            taskType: 'qa',
+                            profileName: completedTask.profile_name || 'Programming',
+                            nextWorkerBotId: completedTask.next_worker_bot_id,
+                            nextWorkerName: completedTask.next_worker_name,
+                            nextWorkerRole: completedTask.next_worker_role,
+                            taskPrompt: findingsText
+                                ? `Re-review the previous worker's fix.\n\nOriginal findings:\n- ${findingsText}\n\nConfirm each finding has been addressed and the work meets the original success criteria.`
+                                : 'Re-review the previous worker\'s fix against the original handoff and success criteria.',
+                            artifactIds,
+                            insertAfterTaskId: insertedTask.id,
+                            actor: params.actor,
+                        });
+                        logTodoAuditTx(db, reQaTask.id, 'active', 'worker_insert', params.actor, {
+                            insertedAfterTaskId: insertedTask.id,
+                            requestedWorkerName: currentOwnerName,
+                            qaReQueueFromStructuredField: true,
+                        });
+                    }
                 }
                 else {
                     returnedToOrchestrator = true;
                     logTodoAuditTx(db, taskId, 'completed', 'return_to_orchestrator', params.actor, {
                         handoffPrompt,
+                        qaResult: 'fail',
+                        findings: params.findings || null,
                         missingPreviousWorkerForQaFix: true,
                     });
                 }
@@ -3122,6 +4038,11 @@ function completeTodoTaskByWorker(taskId, params) {
                 }
             }
         }
+        touchImportedPlanRunForTask(completedTask);
+        if (insertedTask)
+            touchImportedPlanRunForTask(insertedTask);
+        if (handedOffTask)
+            touchImportedPlanRunForTask(handedOffTask);
         return {
             completedTask,
             insertedTask,
@@ -3217,6 +4138,7 @@ function blockTodoTaskByWorker(taskId, params) {
             checkedContext,
             userQuestion,
         });
+        touchImportedPlanRunForTask(blockedTask);
         return {
             blockedTask,
             artifacts: artifactRows,
@@ -3226,6 +4148,39 @@ function blockTodoTaskByWorker(taskId, params) {
     });
     return tx();
 }
+function markTodoTaskRuntimeBlocked(taskId, params) {
+    const blockerSummary = String(params.blockerSummary || '').trim();
+    if (!blockerSummary)
+        throw new Error('Runtime blocked task requires blockerSummary');
+    const checkedContext = String(params.checkedContext || 'Runtime/provider error was captured while executing the worker task.').trim();
+    const userQuestion = String(params.userQuestion || 'Fix the provider/runtime issue, then resume the plan.').trim();
+    const db = getDb();
+    const tx = db.transaction(() => {
+        const row = db.prepare('SELECT * FROM todo_active WHERE id = ?').get(taskId);
+        if (!row)
+            throw new Error(`Task ${taskId} not found`);
+        db.prepare(`
+      UPDATE todo_active
+      SET blocker_summary = ?,
+          blocker_checked = ?,
+          blocker_question = ?,
+          last_updated = ?,
+          version = version + 1
+      WHERE id = ?
+    `).run(blockerSummary, checkedContext, userQuestion, now(), taskId);
+        logTodoAuditTx(db, taskId, 'active', 'worker_blocked', params.actor, {
+            blockerSummary,
+            checkedContext,
+            userQuestion,
+            reasonCode: params.reasonCode || null,
+            runtimeBlocked: true,
+        });
+        const blockedTask = normalizeTodoRow(db.prepare('SELECT * FROM todo_active WHERE id = ?').get(taskId), 'active');
+        touchImportedPlanRunForTask(blockedTask);
+        return blockedTask;
+    });
+    return tx();
+}
 function deleteTodoTask(taskId, params) {
     if (params.actor.actorType !== 'user' && params.actor.actorType !== 'orchestrator')
         throw new Error('Only user or orchestrator can delete tasks');
@@ -3279,7 +4234,11 @@ function reorderTodoTask(taskId, toPosition, actor) {
         }
         logTodoAuditTx(db, taskId, 'active', 'reorder', actor, { toPosition: clamped });
         const updated = db.prepare('SELECT * FROM todo_active ORDER BY created_order ASC, id ASC').all();
-        return updated.map((r) => normalizeTodoRow(r, 'active'));
+        const normalized = updated.map((r) => normalizeTodoRow(r, 'active'));
+        const reorderedTask = normalized.find((task) => task.id === taskId);
+        if (reorderedTask)
+            touchImportedPlanRunForTask(reorderedTask);
+        return normalized;
     });
     return tx();
 }
@@ -3316,6 +4275,15 @@ function listCompletedTodoTasksForConversation(conversationId) {
     const rows = getDb().prepare('SELECT * FROM todo_completed WHERE conversation_id = ? AND COALESCE(internal_only, 0) = 0 ORDER BY created_order ASC, id ASC').all(conversationId);
     return rows.map((row) => normalizeTodoRow(row, 'completed'));
 }
+/**
+ * List all active (non-completed) TODOs for a conversation in creation order.
+ * Used by the orchestration dispatch-runner to feed `existing_todos` into
+ * the orchestrator hint so the LLM can see what's already queued.
+ */
+function listActiveTodoTasksForConversation(conversationId) {
+    const rows = getDb().prepare('SELECT * FROM todo_active WHERE conversation_id = ? AND COALESCE(internal_only, 0) = 0 ORDER BY created_order ASC, id ASC').all(conversationId);
+    return rows.map((row) => normalizeTodoRow(row, 'active'));
+}
 exports.UNASSIGNED_PROJECT_NAME = 'unassigned';
 function createProject(p) {
     const db = getDb();
@@ -3390,12 +4358,22 @@ function getProjectOverview(projectId) {
     const workflowTemplates = listWorkflowTemplates(projectId);
     const roleAssignments = getJsonSetting(`project:${projectId}:role_assignments`)
         || (() => {
-            try {
-                return JSON.parse(projectSettings.orchestrator_role_assignments || '{}');
-            }
-            catch {
-                return {};
+            const derived = {};
+            for (const bot of bots) {
+                const roleClass = (bot.role_class || '').toLowerCase();
+                if (!roleClass)
+                    continue;
+                if (!derived.coding && ['code', 'coding', 'coder', 'builder', 'developer', 'engineer'].includes(roleClass)) {
+                    derived.coding = bot.name;
+                }
+                else if (!derived.qa && ['qa', 'review', 'reviewer'].includes(roleClass)) {
+                    derived.qa = bot.name;
+                }
+                else if (!derived.research && ['research', 'researcher', 'analyst', 'advisor'].includes(roleClass)) {
+                    derived.research = bot.name;
+                }
             }
+            return derived;
         })();
     let preferredWorkflow = null;
     const rawWorkflow = projectSettings.orchestrator_preferred_workflow || projectSettings.preferred_workflow;
@@ -3415,6 +4393,7 @@ function getProjectOverview(projectId) {
         defaultModel: connection.default_model || null,
         hasSecret: connection.access_mode === 'cli' || Boolean(connection.api_key_enc),
     }));
+    const clerkConfig = getResolvedClerkConfigInfo();
     const userPolicy = getUserOrchestrationPolicy() || null;
     const projectPolicyOverride = getProjectOrchestrationPolicyOverride(projectId) || null;
     return {
@@ -3430,9 +4409,9 @@ function getProjectOverview(projectId) {
         preferred_workflow: preferredWorkflow,
         provider_summary: providerSummary,
         clerk: {
-            provider: getSetting('clerk_provider') || null,
-            model: getSetting('clerk_model') || null,
-            configured: Boolean(getSetting('clerk_provider') && getSetting('clerk_model') && getSetting('clerk_api_key')),
+            provider: clerkConfig.provider,
+            model: clerkConfig.model,
+            configured: clerkConfig.configured,
         },
         user_policy: userPolicy,
         project_policy_override: projectPolicyOverride,
@@ -3716,7 +4695,7 @@ function getPreviousConversationInTopic(conversationId) {
     ORDER BY ts.created_at DESC, c.updated_at DESC
     LIMIT 1
   `).get(topicId, conversationId);
-    return row || null;
+    return hydrateConversationRow(row) || null;
 }
 function getTopicMessages(topicId) {
     const db = getDb();