update

src/main/automation/automation-action-schemas.ts

@@ -10,6 +10,7 @@
  */
 
 import { z } from "zod";
+import { approvalTypeEnum } from "@shared/types";
 
 const messageChannelSchema = z.enum(["direct", "department", "company", "project", "incident"]);
 const messagePrioritySchema = z.enum(["urgent", "normal", "low"]);
@@ -41,7 +42,7 @@ export const triggerHeartbeatConfigSchema = z.object({
 });
 
 export const createApprovalConfigSchema = z.object({
-  approvalType: z.string().optional(),
+  approvalType: approvalTypeEnum.optional(),
   summary: z.string().optional(),
   impact: z.string().optional(),
 });

src/main/automation/automation-actions.ts

@@ -3,7 +3,6 @@ import type { AutomationAction, DesktopEvent } from "@shared/types";
 import { dispatchAgentMessage } from "../message-dispatch";
 import { validateTaskCreation } from "../task-quality-gates";
 import type { AutomationEventContext } from "./types";
-import { isHeartbeatTaskTitle } from "../orchestration/heartbeat-task";
 import { parseActionConfig, type AutomationActionConfigMap } from "./automation-action-schemas";
 
 // Map trigger type → default wake trigger when automation fires a heartbeat.
@@ -116,8 +115,9 @@ export function executeAutomationAction(
       const description = cfg.description ?? "";
       const priority = cfg.priority ?? "medium";
       const assigneeAgentId = cfg.assigneeAgentId ?? null;
-      const isHeartbeat = isHeartbeatTaskTitle(title);
-      const taskValidation = validateTaskCreation({ title, description }, isHeartbeat);
+      // Automation rules create user-facing tasks; heartbeat tasks are
+      // synthesized only by acquireHeartbeatTask, never via create_task.
+      const taskValidation = validateTaskCreation({ title, description }, false);
       if (!taskValidation.valid) {
         logger.warn(`[automation] Skipping create_task — validation failed: ${taskValidation.errors.join("; ")}`);
         break;
@@ -231,7 +231,15 @@ export function executeAutomationAction(
         // Keep the fallback title when the task no longer exists.
       }
       // Heartbeat tasks are internal system tasks — skip escalation messages to avoid flooding channels.
-      if (isHeartbeatTaskTitle(taskTitle)) {
+      let isHeartbeatTask = false;
+      if (ctx.taskId) {
+        try {
+          isHeartbeatTask = db.getTask(ctx.taskId).isHeartbeat === true;
+        } catch {
+          isHeartbeatTask = false;
+        }
+      }
+      if (isHeartbeatTask) {
         logger.info(`[automation] Skipping escalation for heartbeat task "${taskTitle}"`);
         break;
       }

src/main/automation/automation-approval-handler.ts

@@ -3,7 +3,6 @@ import type { AppDatabase } from "../database";
 import type { NotificationOptions } from "../notification-service";
 import { extractApprovalDocumentIds } from "@shared/approval-documents";
 import { notifyHireApproved } from "../hire-hook";
-import { autoAssignSkillsToAgent } from "./automation-skills";
 import type { AutomationEventContext } from "./types";
 import { normalizeWorkflowSteps } from "./automation-workflow";
 
@@ -95,140 +94,110 @@ export function handleApprovalResolved(
   });
 
   if (approval.type === "hire_agent" && decision === "approved" && approval.relatedAgentId) {
-    try {
-      const agent = db.getAgent(approval.relatedAgentId);
+    const agent = db.getAgent(approval.relatedAgentId);
 
-      if (agent.status === "idle") {
-        db.addActivity({
-          companyId,
-          actor: "system",
-          action: "agent.hired",
-          entityType: "agent",
-          entityId: agent.id,
-          detail: `${agent.name} hire approved and activated.`,
-        });
+    if (agent.status === "idle") {
+      db.addActivity({
+        companyId,
+        actor: "system",
+        action: "agent.hired",
+        entityType: "agent",
+        entityId: agent.id,
+        detail: `${agent.name} hire approved and activated.`,
+      });
 
-        const skillsAssigned = autoAssignSkillsToAgent(db, logger, companyId, agent.id);
-        if (skillsAssigned > 0) {
-          db.addActivity({
-            companyId,
-            actor: "system",
-            action: "skills.auto_assigned",
-            entityType: "agent",
-            entityId: agent.id,
-            detail: `Auto-assigned ${skillsAssigned} skill(s) to ${agent.name} based on role/department matching.`,
-          });
-        }
+      dispatchAutomation("hire_approved", {
+        companyId,
+        agentId: agent.id,
+      });
+      wakeAgentIfPossible(agent.id, companyId, "assignment");
 
-        dispatchAutomation("hire_approved", {
-          companyId,
-          agentId: agent.id,
-        });
-        wakeAgentIfPossible(agent.id, companyId, "assignment");
-
-        const ceo = db.getCeoForCompany(companyId);
-        if (ceo && ceo.id !== agent.id) {
-          wakeAgentIfPossible(ceo.id, companyId, "assignment");
-        }
-
-        publishDomainChanged();
-        const hireLocale = db.listSnapshot().locale;
-        notify({
-          title: localizeNotification(hireLocale, "Agent Hired", "新员工入职"),
-          body: localizeNotification(hireLocale, `${agent.name} joined as ${agent.role}`, `${agent.name} 已加入，职位：${agent.role}`),
-          urgency: "informational",
-          navigation: { section: "orgchart", entityId: agent.id },
-          batchKey: "agent_hired",
-        });
-
-        // Notify adapter that hire was approved (Paperclip hire-hook parity)
-        void notifyHireApproved(db, {
-          companyId,
-          agentId: agent.id,
-          source: "approval",
-          sourceId: approvalId,
-          approvedAt: new Date().toISOString(),
-        }).catch(() => {});
+      const ceo = db.getCeoForCompany(companyId);
+      if (ceo && ceo.id !== agent.id) {
+        wakeAgentIfPossible(ceo.id, companyId, "assignment");
       }
-    } catch {
-      // Hire follow-up is best-effort; approval state is already committed in storage.
+
+      publishDomainChanged();
+      const hireLocale = db.listSnapshot().locale;
+      notify({
+        title: localizeNotification(hireLocale, "Agent Hired", "新员工入职"),
+        body: localizeNotification(hireLocale, `${agent.name} joined as ${agent.role}`, `${agent.name} 已加入，职位：${agent.role}`),
+        urgency: "informational",
+        navigation: { section: "orgchart", entityId: agent.id },
+        batchKey: "agent_hired",
+      });
+
+      // Notify adapter that hire was approved (Paperclip hire-hook parity)
+      void notifyHireApproved(db, {
+        companyId,
+        agentId: agent.id,
+        source: "approval",
+        sourceId: approvalId,
+        approvedAt: new Date().toISOString(),
+      }).catch(() => {});
     }
   }
 
   if (approval.type === "deliverable_review") {
-    try {
-      // Update linked document statuses from payloadJson
-      const documentIds = extractApprovalDocumentIds(approval.payloadJson);
-      const docStatus = decision === "approved"
-        ? "approved"
-        : decision === "rejected" || decision === "revision_requested"
-          ? "draft"
-          : "in_review";
-      for (const docId of documentIds) {
-        db.updateDocumentStatus(docId, companyId, docStatus);
-      }
-
-      if (approval.relatedTaskId) {
-        const task = db.getTask(approval.relatedTaskId);
-        if (task.assigneeAgentId) {
-          try {
-            const agent = db.getAgent(task.assigneeAgentId);
-            if (!agent.heartbeatEnabled) {
-              db.setHeartbeat(task.assigneeAgentId, true, agent.heartbeatIntervalSec || 120);
-              logger.info(`[deliverable-review] Resumed heartbeat for ${agent.name} after user ${decision}.`);
-            }
-          } catch { /* agent lookup non-fatal */ }
-        }
-        if (decision === "approved") {
-          db.advanceTaskStatus(task.id, "done", "Board approved deliverable.");
-          handleTaskStatusChange(task.id, companyId, task.status, "done");
-          db.addActivity({ companyId, actor: "board", action: "deliverable.approved", entityType: "task", entityId: task.id, detail: approval.decisionNote || "Deliverable approved by board." });
-        } else if (decision === "rejected") {
-          recordReviewFeedbackKnowledge(db, approval, decision);
-          db.advanceTaskStatus(task.id, "in_progress", `Board rejected deliverable: ${approval.decisionNote || "No reason given."}`);
-          handleTaskStatusChange(task.id, companyId, task.status, "in_progress");
-          if (task.assigneeAgentId) {
-            wakeAgentIfPossible(task.assigneeAgentId, companyId, "revision_needed");
-          }
-        } else if (decision === "revision_requested") {
-          db.advanceTaskStatus(task.id, "in_progress", `Board requested revisions: ${approval.decisionNote || "No reason given."}`);
-          handleTaskStatusChange(task.id, companyId, task.status, "in_progress");
-          recordReviewFeedbackKnowledge(db, approval, decision);
-          if (task.assigneeAgentId) {
-            wakeAgentIfPossible(task.assigneeAgentId, companyId, "revision_needed");
-          }
-        }
-      } else if (approval.requestedByAgentId) {
-        // Document-only review (no task) — resume the producing agent
-        try {
-          const agent = db.getAgent(approval.requestedByAgentId);
-          if (!agent.heartbeatEnabled) {
-            db.setHeartbeat(approval.requestedByAgentId, true, agent.heartbeatIntervalSec || 120);
-            logger.info(`[deliverable-review] Resumed heartbeat for ${agent.name} after user ${decision}.`);
-          }
-        } catch { /* agent lookup non-fatal */ }
-        if (decision !== "approved") {
-          wakeAgentIfPossible(approval.requestedByAgentId, companyId, "revision_needed");
-        }
-      }
-
-      publishDomainChanged();
-    } catch {
-      // Deliverable review follow-up is non-fatal — approval state is already committed.
+    const documentIds = extractApprovalDocumentIds(approval.payloadJson);
+    const docStatus = decision === "approved"
+      ? "approved"
+      : decision === "rejected" || decision === "revision_requested"
+        ? "draft"
+        : "in_review";
+    for (const docId of documentIds) {
+      db.updateDocumentStatus(docId, companyId, docStatus);
     }
+
+    if (approval.relatedTaskId) {
+      const task = db.getTask(approval.relatedTaskId);
+      if (task.assigneeAgentId) {
+        const agent = db.getAgent(task.assigneeAgentId);
+        if (!agent.heartbeatEnabled) {
+          db.setHeartbeat(task.assigneeAgentId, true, agent.heartbeatIntervalSec || 120);
+          logger.info(`[deliverable-review] Resumed heartbeat for ${agent.name} after user ${decision}.`);
+        }
+      }
+      if (decision === "approved") {
+        db.advanceTaskStatus(task.id, "done", "Board approved deliverable.");
+        handleTaskStatusChange(task.id, companyId, task.status, "done");
+        db.addActivity({ companyId, actor: "board", action: "deliverable.approved", entityType: "task", entityId: task.id, detail: approval.decisionNote || "Deliverable approved by board." });
+      } else if (decision === "rejected") {
+        recordReviewFeedbackKnowledge(db, approval, decision);
+        db.advanceTaskStatus(task.id, "in_progress", `Board rejected deliverable: ${approval.decisionNote || "No reason given."}`);
+        handleTaskStatusChange(task.id, companyId, task.status, "in_progress");
+        if (task.assigneeAgentId) {
+          wakeAgentIfPossible(task.assigneeAgentId, companyId, "revision_needed");
+        }
+      } else if (decision === "revision_requested") {
+        db.advanceTaskStatus(task.id, "in_progress", `Board requested revisions: ${approval.decisionNote || "No reason given."}`);
+        handleTaskStatusChange(task.id, companyId, task.status, "in_progress");
+        recordReviewFeedbackKnowledge(db, approval, decision);
+        if (task.assigneeAgentId) {
+          wakeAgentIfPossible(task.assigneeAgentId, companyId, "revision_needed");
+        }
+      }
+    } else if (approval.requestedByAgentId) {
+      const agent = db.getAgent(approval.requestedByAgentId);
+      if (!agent.heartbeatEnabled) {
+        db.setHeartbeat(approval.requestedByAgentId, true, agent.heartbeatIntervalSec || 120);
+        logger.info(`[deliverable-review] Resumed heartbeat for ${agent.name} after user ${decision}.`);
+      }
+      if (decision !== "approved") {
+        wakeAgentIfPossible(approval.requestedByAgentId, companyId, "revision_needed");
+      }
+    }
+
+    publishDomainChanged();
   }
 
   if (approval.type === "draft_review" || approval.type === "strategy_review") {
-    try {
-      const documentIds = extractApprovalDocumentIds(approval.payloadJson);
-      const docStatus = decision === "approved" ? "approved" : "draft";
-      for (const docId of documentIds) {
-        db.updateDocumentStatus(docId, companyId, docStatus);
-      }
-      publishDomainChanged();
-    } catch {
-      // Document checkpoint follow-up is non-fatal — approval state is already committed.
+    const documentIds = extractApprovalDocumentIds(approval.payloadJson);
+    const docStatus = decision === "approved" ? "approved" : "draft";
+    for (const docId of documentIds) {
+      db.updateDocumentStatus(docId, companyId, docStatus);
     }
+    publishDomainChanged();
   }
 
   // Handle budget override approvals

src/main/automation/automation-run-completion.ts

@@ -3,7 +3,6 @@ import type { RunRecord, SectionId } from "@shared/types";
 import type { NotificationOptions } from "../notification-service";
 import type { AutomationEventContext, RunFinishedEvent } from "./types";
 import { IMPORTANT_DOCUMENT_TYPES } from "./types";
-import { isHeartbeatTaskTitle } from "../orchestration/heartbeat-task";
 
 function localizeNotification(locale: string | null | undefined, en: string, zh: string): string {
   return locale === "zh" ? zh : en;
@@ -225,11 +224,11 @@ export function processRunCompletion(
   let effectiveStatus = task.status;
 
   if (isSuccess && effectiveStatus === "in_progress") {
-    // Check if non-code task produced a deliverable before auto-advancing
+    // Delegate the task-type → deliverable-required decision to the pure
+    // helper so production and tests share a single source of truth.
     const taskType = task.taskType ?? "general";
-    const needsDeliverable = taskType === "research" || taskType === "content";
 
-    if (needsDeliverable) {
+    if (needsDeliverableCheck(taskType)) {
       const hasDeliverable = checkRunProducedDeliverable(db, run.id, run.companyId, task.id);
       if (!hasDeliverable) {
         // Don't auto-advance -- flag for manager review
@@ -243,7 +242,11 @@ export function processRunCompletion(
           if (chain.length > 0) {
             wakeAgentIfPossible(chain[0].id, run.companyId, "review_needed");
           }
-        } catch { /* best effort */ }
+        } catch (error) {
+          deps.logger.warn(
+            `[automation] deliverable-review manager wake failed for agent ${run.agentId}: ${error instanceof Error ? error.message : String(error)}`,
+          );
+        }
         publishDomainChanged();
         // Skip the normal in_review advance
       } else {
@@ -257,7 +260,7 @@ export function processRunCompletion(
     }
   }
 
-  if (isSuccess && isHeartbeatTaskTitle(task.title) && effectiveStatus !== "done") {
+  if (isSuccess && task.isHeartbeat && effectiveStatus !== "done") {
     db.advanceTaskStatus(task.id, "done", "Heartbeat check completed.");
     handleTaskStatusChange(task.id, run.companyId, effectiveStatus, "done");
   }

src/main/automation/automation-skills.ts

@@ -1,127 +0,0 @@
-import type { AppDatabase } from "../database";
-import { roleMatchesLeadershipKeywords } from "../agent-role-helpers";
-import type { DepartmentId } from "@shared/types/enums";
-
-const DEPARTMENT_SKILL_KEYWORDS: Record<DepartmentId, string[]> = {
-  engineering: ["code", "engineer", "develop", "program", "software", "api", "backend", "frontend", "full-stack", "fullstack", "devops", "infrastructure", "system", "architect", "debug", "test", "ci", "cd", "deploy", "docker", "kubernetes", "database", "sql", "git", "typescript", "javascript", "python", "rust", "go", "java", "react", "node", "css", "html", "web"],
-  product: ["product", "feature", "requirement", "roadmap", "user story", "ux", "ui", "design", "prototype", "wireframe", "specification", "prd"],
-  marketing: ["market", "content", "seo", "social media", "brand", "campaign", "analytics", "growth", "copywrite", "blog", "newsletter", "email"],
-  sales: ["sales", "crm", "lead", "pipeline", "deal", "revenue", "prospect", "outbound", "cold"],
-  hr: ["hr", "human resource", "hiring", "recruit", "onboard", "performance", "culture", "talent", "people"],
-  finance: ["finance", "budget", "accounting", "cost", "revenue", "profit", "spend", "invoice", "tax", "payroll"],
-  design: ["design", "ui", "ux", "visual", "figma", "sketch", "prototype", "illustration", "typography", "layout", "color", "icon"],
-  research: ["research", "analysis", "data", "study", "survey", "experiment", "insight", "benchmark", "report"],
-  operations: ["operations", "process", "workflow", "efficiency", "supply chain", "logistics", "coordination"],
-  customer_support: ["support", "customer", "ticket", "helpdesk", "troubleshoot", "faq", "documentation"],
-  legal: ["legal", "compliance", "contract", "regulation", "policy", "privacy", "ip", "intellectual property"],
-  executive: ["strategy", "leadership", "management", "executive", "ceo", "cto", "coo", "cfo", "cmo", "vp"],
-};
-
-function scoreSkillAgentMatch(
-  skill: { name: string; description: string | null; markdown: string },
-  agent: { role: string; department: string | null; title: string | null; capabilities: string },
-): number {
-  const agentText = [
-    agent.role,
-    agent.department ?? "",
-    agent.title ?? "",
-    agent.capabilities,
-  ].join(" ").toLowerCase();
-
-  const skillText = [
-    skill.name,
-    skill.description ?? "",
-    skill.markdown.slice(0, 500),
-  ].join(" ").toLowerCase();
-
-  let score = 0;
-
-  const dept = (agent.department ?? "") as DepartmentId;
-  const deptKeywords = DEPARTMENT_SKILL_KEYWORDS[dept] ?? [];
-  for (const keyword of deptKeywords) {
-    if (skillText.includes(keyword)) {
-      score += 2;
-    }
-  }
-
-  const agentWords = agentText
-    .replace(/[^a-z0-9\s-]/g, " ")
-    .split(/\s+/)
-    .filter((w) => w.length >= 3);
-  for (const word of agentWords) {
-    if (skillText.includes(word)) {
-      score += 1;
-    }
-  }
-
-  // Executives need awareness of all domains. Use the shared leadership
-  // keyword list with word-boundary matching so "lead" does not match
-  // "cleaner" / "leaderboard" in agent role strings.
-  if (roleMatchesLeadershipKeywords(agent.role, agent.title)) {
-    score += 1;
-  }
-
-  return score;
-}
-
-export function autoAssignSkillsToAgent(
-  db: AppDatabase,
-  logger: { info: (...args: unknown[]) => void; warn: (...args: unknown[]) => void },
-  companyId: string,
-  agentId: string,
-): number {
-  const agent = db.getAgent(agentId);
-  if (!agent || agent.companyId !== companyId) return 0;
-
-  const allSkills = db.listCompanySkills(companyId);
-  if (allSkills.length === 0) return 0;
-
-  const existingAssignments = new Set(db.listAgentSkillAssignments(agentId));
-
-  // Always assign basic-for-all builtin skills regardless of score
-  let assigned = 0;
-  for (const skill of allSkills) {
-    if (existingAssignments.has(skill.id)) continue;
-    try {
-      const meta = skill.metadata ? (typeof skill.metadata === "string" ? JSON.parse(skill.metadata) : skill.metadata) : {};
-      if (meta.builtinCategory === "basic-for-all") {
-        db.assignSkillToAgent(agentId, skill.id);
-        existingAssignments.add(skill.id);
-        assigned++;
-        logger.info(`[skill-autoassign] Assigned basic skill "${skill.name}" to ${agent.name}`);
-      }
-    } catch { /* skip malformed metadata */ }
-  }
-
-  const scored = allSkills
-    .filter((skill) => !existingAssignments.has(skill.id))
-    .map((skill) => ({
-      skill,
-      score: scoreSkillAgentMatch(skill, agent),
-    }))
-    .sort((a, b) => b.score - a.score);
-
-  const MIN_SCORE = 3;
-  for (const { skill, score } of scored) {
-    if (score < MIN_SCORE) continue;
-    try {
-      db.assignSkillToAgent(agentId, skill.id);
-      assigned++;
-      logger.info(
-        `[skill-autoassign] Assigned "${skill.name}" to ${agent.name} (${agent.role}) — score ${score}`,
-      );
-    } catch (err) {
-      logger.warn(
-        `[skill-autoassign] Failed to assign "${skill.name}" to ${agent.name}: ${err instanceof Error ? err.message : String(err)}`,
-      );
-    }
-  }
-
-  if (assigned === 0) {
-    logger.info(
-      `[skill-autoassign] No matching skills for ${agent.name} (${agent.role}); agent will run without skills until manually assigned`,
-    );
-  }
-
-  return assigned;
-}

src/main/automation/index.ts

@@ -13,7 +13,6 @@ import { handleTaskStatusChange, handleTaskCreated } from "./automation-handlers
 import type { HandlerDeps } from "./automation-handlers";
 
 export type { AutomationEventContext } from "./types";
-export { autoAssignSkillsToAgent } from "./automation-skills";
 
 export function createAutomationService({
   db,