@desplega.ai/agent-swarm 1.86.0 → 1.88.0

package/src/be/db.ts

@@ -29,6 +29,7 @@ import type {
   ContextSnapshotEventType,
   ContextVersion,
   CooldownConfig,
+  FollowUpConfig,
   InboxItemState,
   InboxItemStatus,
   InboxItemType,
@@ -87,6 +88,7 @@ import type {
   WorkflowSummary,
   WorkflowVersion,
 } from "../types";
+import { FollowUpConfigSchema, isTerminalTaskStatus } from "../types";
 import { deriveProviderFromKeyType } from "../utils/credentials";
 import { scrubSecrets } from "../utils/secret-scrubber";
 import { decryptSecret, encryptSecret, getEncryptionKey, resolveEncryptionKey } from "./crypto";
@@ -689,6 +691,14 @@ export function createAgent(
       agent.harnessProvider ?? null,
     );
   if (!row) throw new Error("Failed to create agent");
+  try {
+    installSystemDefaultSkillsForAgent(id);
+  } catch (err) {
+    console.warn(
+      "[db] Failed to install system-default skills for new agent:",
+      (err as Error).message,
+    );
+  }
   try {
     createLogEntry({ eventType: "agent_joined", agentId: id, newValue: agent.status });
   } catch {}
@@ -993,6 +1003,7 @@ type AgentTaskRow = {
   workflowRunId: string | null;
   workflowRunStepId: string | null;
   outputSchema: string | null;
+  followUpConfig: string | null;
   contextKey: string | null;
   createdAt: string;
   lastUpdatedAt: string;
@@ -1016,6 +1027,27 @@ type AgentTaskRow = {
 };
 
 function rowToAgentTask(row: AgentTaskRow): AgentTask {
+  let followUpConfig: FollowUpConfig | undefined;
+  if (row.followUpConfig) {
+    try {
+      const parsed = FollowUpConfigSchema.safeParse(JSON.parse(row.followUpConfig));
+      if (parsed.success) {
+        followUpConfig = parsed.data;
+      } else {
+        console.warn(
+          `[db] Ignoring invalid agent_tasks.followUpConfig for task ${row.id}:`,
+          parsed.error.message,
+        );
+      }
+    } catch (error) {
+      console.warn(
+        `[db] Ignoring malformed agent_tasks.followUpConfig for task ${row.id}:`,
+        error instanceof Error ? error.message : String(error),
+      );
+      followUpConfig = undefined;
+    }
+  }
+
   return {
     id: row.id,
     agentId: row.agentId,
@@ -1057,6 +1089,7 @@ function rowToAgentTask(row: AgentTaskRow): AgentTask {
     workflowRunId: row.workflowRunId ?? undefined,
     workflowRunStepId: row.workflowRunStepId ?? undefined,
     outputSchema: row.outputSchema ? JSON.parse(row.outputSchema) : undefined,
+    followUpConfig,
     contextKey: row.contextKey ?? undefined,
     compactionCount: row.compactionCount ?? undefined,
     peakContextPercent: row.peakContextPercent ?? undefined,
@@ -1173,7 +1206,7 @@ export const taskQueries = {
   setProgress: () =>
     getDb().prepare<AgentTaskRow, [string, string]>(
       `UPDATE agent_tasks SET progress = ?,
-       status = CASE WHEN status IN ('completed', 'failed', 'cancelled') THEN status ELSE 'in_progress' END,
+       status = CASE WHEN status IN ('completed', 'failed', 'cancelled', 'superseded') THEN status ELSE 'in_progress' END,
        lastUpdatedAt = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
        WHERE id = ? RETURNING *`,
     ),
@@ -1244,14 +1277,14 @@ export function startTask(taskId: string): AgentTask | null {
   if (!oldTask) return null;
 
   // Guard: never revive tasks that are already in a terminal state
-  if (["completed", "failed", "cancelled"].includes(oldTask.status)) {
+  if (isTerminalTaskStatus(oldTask.status)) {
     return null;
   }
 
   const row = getDb()
     .prepare<AgentTaskRow, [string]>(
       `UPDATE agent_tasks SET status = 'in_progress', lastUpdatedAt = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
-       WHERE id = ? AND status NOT IN ('completed', 'failed', 'cancelled') RETURNING *`,
+       WHERE id = ? AND status NOT IN ('completed', 'failed', 'cancelled', 'superseded') RETURNING *`,
     )
     .get(taskId);
   if (row && oldTask) {
@@ -1291,6 +1324,31 @@ export function getChildTasks(parentTaskId: string): AgentTask[] {
     .map(rowToAgentTask);
 }
 
+/**
+ * Returns true if `parentId` has at least one non-terminal child task with
+ * `taskType = 'resume'`. Used by the heartbeat sweep as an idempotency guard:
+ * if a prior sweep tick already created a resume follow-up for this parent,
+ * don't create a duplicate.
+ *
+ * **Filters by taskType = 'resume'** specifically. A parent task can also
+ * have ordinary non-terminal delegation children (`send-task` auto-defaults
+ * `parentTaskId` to the caller's current task — see src/tools/send-task.ts).
+ * Treating those as "already resumed" would incorrectly skip the resume
+ * path for a crashed worker that had delegated subtasks (PR #594 review).
+ */
+export function hasNonTerminalResumeChild(parentId: string): boolean {
+  const row = getDb()
+    .prepare(
+      `SELECT 1 FROM agent_tasks
+       WHERE parentTaskId = ?
+         AND taskType = 'resume'
+         AND status NOT IN ('completed', 'failed', 'cancelled', 'superseded')
+       LIMIT 1`,
+    )
+    .get(parentId);
+  return row !== undefined && row !== null;
+}
+
 export function updateTaskClaudeSessionId(
   taskId: string,
   claudeSessionId: string,
@@ -1370,14 +1428,18 @@ export function getTasksByStatus(status: AgentTaskStatus): AgentTask[] {
 
 /**
  * Find a task by VCS repo and issue/PR/MR number.
- * Returns the most recent non-completed/failed task for this VCS entity.
+ * Returns the most recent non-terminal task for this VCS entity.
+ *
+ * Terminal exclusion MUST stay in lock-step with `TERMINAL_TASK_STATUSES`
+ * in `src/types.ts`. SQL strings can't import a TS const — if you add a
+ * new terminal status, grep for `NOT IN ('completed'` across this file.
  */
 export function findTaskByVcs(vcsRepo: string, vcsNumber: number): AgentTask | null {
   const row = getDb()
     .prepare<AgentTaskRow, [string, number]>(
       `SELECT * FROM agent_tasks
        WHERE vcsRepo = ? AND vcsNumber = ?
-       AND status NOT IN ('completed', 'failed')
+       AND status NOT IN ('completed', 'failed', 'cancelled', 'superseded')
        ORDER BY createdAt DESC
        LIMIT 1`,
     )
@@ -1926,7 +1988,7 @@ export function completeTask(id: string, output?: string): AgentTask | null {
   // Idempotency guard: don't re-complete a task already in a terminal state.
   // Mirrors cancelTask. Prevents duplicate task.completed events, duplicate
   // log entries, and duplicate follow-up tasks when multiple sessions race.
-  if (["completed", "failed", "cancelled"].includes(oldTask.status)) {
+  if (isTerminalTaskStatus(oldTask.status)) {
     return null;
   }
 
@@ -1971,7 +2033,7 @@ export function failTask(id: string, reason: string): AgentTask | null {
   // Idempotency guard: don't re-fail a task already in a terminal state.
   // Mirrors cancelTask / completeTask. Prevents duplicate task.failed events
   // and duplicate follow-up tasks when multiple sessions race.
-  if (["completed", "failed", "cancelled"].includes(oldTask.status)) {
+  if (isTerminalTaskStatus(oldTask.status)) {
     return null;
   }
 
@@ -2008,8 +2070,7 @@ export function cancelTask(id: string, reason?: string): AgentTask | null {
   if (!oldTask) return null;
 
   // Only cancel tasks that are not already in a terminal state
-  const terminalStatuses = ["completed", "failed", "cancelled"];
-  if (terminalStatuses.includes(oldTask.status)) {
+  if (isTerminalTaskStatus(oldTask.status)) {
     return null;
   }
 
@@ -2043,6 +2104,69 @@ export function cancelTask(id: string, reason?: string): AgentTask | null {
   return row ? rowToAgentTask(row) : null;
 }
 
+/**
+ * Supersede a task: mark it as `superseded` (terminal) so a fresh "resume"
+ * follow-up task can pick up where it left off. Used by the graceful-shutdown
+ * path and the `POST /api/tasks/:id/supersede` route. Returns null if the task
+ * is already terminal (mirrors `completeTask` / `cancelTask` idempotency).
+ *
+ * Writes a `task_superseded` agent_log with `{ reason, resumeTaskId }` payload
+ * and emits a `task.superseded` workflow event. The caller is responsible for
+ * creating the resume follow-up (via `createResumeFollowUp`) and passing the
+ * resulting id as `resumeTaskId`.
+ */
+export function supersedeTask(
+  id: string,
+  args: { reason: string; resumeTaskId: string | null },
+): AgentTask | null {
+  const oldTask = getTaskById(id);
+  if (!oldTask) return null;
+
+  // Idempotency guard: don't re-supersede a task already in a terminal state.
+  if (isTerminalTaskStatus(oldTask.status)) {
+    return null;
+  }
+
+  const finishedAt = new Date().toISOString();
+  const row = getDb()
+    .prepare<AgentTaskRow, [string, string]>(
+      `UPDATE agent_tasks
+       SET status = 'superseded',
+           finishedAt = ?,
+           lastUpdatedAt = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
+       WHERE id = ? AND status NOT IN ('completed', 'failed', 'cancelled', 'superseded')
+       RETURNING *`,
+    )
+    .get(finishedAt, id);
+
+  if (row && oldTask) {
+    try {
+      createLogEntry({
+        eventType: "task_superseded",
+        taskId: id,
+        agentId: row.agentId ?? undefined,
+        oldValue: oldTask.status,
+        newValue: "superseded",
+        metadata: { reason: args.reason, resumeTaskId: args.resumeTaskId },
+      });
+    } catch {}
+    try {
+      import("../workflows/event-bus").then(({ workflowEventBus }) => {
+        workflowEventBus.emit("task.superseded", {
+          taskId: id,
+          reason: args.reason,
+          resumeTaskId: args.resumeTaskId,
+          agentId: row.agentId,
+          workflowRunId: row.workflowRunId,
+          workflowRunStepId: row.workflowRunStepId,
+        });
+      });
+    } catch {}
+  }
+
+  return row ? rowToAgentTask(row) : null;
+}
+
 /**
  * Pause a task that is currently in progress.
  * Used during graceful shutdown to allow tasks to resume after container restart.
@@ -2560,6 +2684,7 @@ export interface CreateTaskOptions {
    * a schema'd task should be defensive about JSON parsing.
    */
   outputSchema?: Record<string, unknown>;
+  followUpConfig?: FollowUpConfig;
   requestedByUserId?: string;
   contextKey?: string;
 }
@@ -2578,8 +2703,9 @@ export function findRecentSimilarTasks(opts: {
   const conditions: string[] = ["createdAt > ?"];
   const params: (string | number)[] = [since];
 
-  // Exclude completed/failed/cancelled tasks — only active or recently created
-  conditions.push("status NOT IN ('completed', 'failed', 'cancelled')");
+  // Exclude all terminal statuses — only active or recently created.
+  // Keep in lock-step with `TERMINAL_TASK_STATUSES` in src/types.ts.
+  conditions.push("status NOT IN ('completed', 'failed', 'cancelled', 'superseded')");
 
   if (opts.creatorAgentId) {
     conditions.push("creatorAgentId = ?");
@@ -2614,6 +2740,16 @@ export function createTaskExtended(task: string, options?: CreateTaskOptions): A
   if (options?.parentTaskId) {
     const parent = getTaskById(options.parentTaskId);
     if (parent) {
+      // Identity & routing — anything that says "what work is this, who asked
+      // for it, where does it run" carries forward to every child (follow-ups,
+      // reboot retries, resume tasks). Explicit options always win.
+      //
+      // When adding a new identity-shaped column to `agent_tasks`, ADD IT HERE
+      // unless you have a specific reason a child should NOT inherit it. This
+      // is the single source of truth — `createResumeFollowUp` and the other
+      // follow-up creators rely on this block instead of re-listing fields.
+
+      // Slack context
       if (parent.slackChannelId && !options.slackChannelId) {
         options.slackChannelId = parent.slackChannelId;
       }
@@ -2623,18 +2759,98 @@ export function createTaskExtended(task: string, options?: CreateTaskOptions): A
       if (parent.slackUserId && !options.slackUserId) {
         options.slackUserId = parent.slackUserId;
       }
+
+      // AgentMail context
       if (parent.agentmailInboxId && !options.agentmailInboxId) {
         options.agentmailInboxId = parent.agentmailInboxId;
       }
+      if (parent.agentmailMessageId && !options.agentmailMessageId) {
+        options.agentmailMessageId = parent.agentmailMessageId;
+      }
       if (parent.agentmailThreadId && !options.agentmailThreadId) {
         options.agentmailThreadId = parent.agentmailThreadId;
       }
+
+      // Mention context (Slack @-mentions)
+      if (parent.mentionMessageId && !options.mentionMessageId) {
+        options.mentionMessageId = parent.mentionMessageId;
+      }
+      if (parent.mentionChannelId && !options.mentionChannelId) {
+        options.mentionChannelId = parent.mentionChannelId;
+      }
+
+      // VCS identity (GitHub / GitLab issue / PR / MR + webhook routing)
+      // Webhook handlers locate active work via `findTaskByVcs(repo, number)`,
+      // so a resume / follow-up child MUST carry the full VCS identity or
+      // subsequent review/update events get dropped.
+      if (parent.vcsProvider && !options.vcsProvider) {
+        options.vcsProvider = parent.vcsProvider;
+      }
+      if (parent.vcsRepo && !options.vcsRepo) {
+        options.vcsRepo = parent.vcsRepo;
+      }
+      if (parent.vcsNumber != null && options.vcsNumber == null) {
+        options.vcsNumber = parent.vcsNumber;
+      }
+      if (parent.vcsEventType && !options.vcsEventType) {
+        options.vcsEventType = parent.vcsEventType;
+      }
+      if (parent.vcsCommentId != null && options.vcsCommentId == null) {
+        options.vcsCommentId = parent.vcsCommentId;
+      }
+      if (parent.vcsAuthor && !options.vcsAuthor) {
+        options.vcsAuthor = parent.vcsAuthor;
+      }
+      if (parent.vcsUrl && !options.vcsUrl) {
+        options.vcsUrl = parent.vcsUrl;
+      }
+      if (parent.vcsInstallationId != null && options.vcsInstallationId == null) {
+        options.vcsInstallationId = parent.vcsInstallationId;
+      }
+      if (parent.vcsNodeId && !options.vcsNodeId) {
+        options.vcsNodeId = parent.vcsNodeId;
+      }
+
+      // Execution context (per-task overrides)
+      //
+      // `model` is DELIBERATELY NOT inherited. A parent task's `model` is a
+      // concrete, provider-specific resolved string (e.g. `claude-opus-4-8`,
+      // `openrouter/moonshotai/kimi-k2.6`). Derived tasks (resume follow-ups,
+      // completion/review follow-ups, re-dispatches) routinely land on a
+      // DIFFERENT agent — and therefore a different harness/provider — than the
+      // parent. Carrying the parent's concrete model across that boundary makes
+      // the child die at session-init with a model-incompatibility error before
+      // any worker code runs (e.g. a `claude-opus-4-8` resume claimed by a Codex
+      // worker → `400 model is not supported when using Codex`, or a
+      // `kimi-k2.6` review follow-up routed to a Claude-harness Lead → session
+      // exit 1). Per Taras's directive (2026-05-29): derived tasks must never
+      // set the model — it resolves from the ASSIGNEE agent's own provider /
+      // `MODEL_OVERRIDE` config at session-init (see
+      // `src/commands/runner.ts` — `opts.model || configModel`). A null `model`
+      // here is the correct, intended state. Do NOT re-add inheritance here; if
+      // a same-provider child genuinely needs a specific model, the creator must
+      // pass it explicitly.
+      if (parent.dir && !options.dir) {
+        options.dir = parent.dir;
+      }
+
+      // Contract (schema validation) — `store-progress` validates completion
+      // output against `outputSchema`, runner injects structured-output
+      // instructions only when it's present.
+      if (parent.outputSchema && !options.outputSchema) {
+        options.outputSchema = parent.outputSchema;
+      }
+
+      // Attribution
       if (parent.requestedByUserId && !options.requestedByUserId) {
         options.requestedByUserId = parent.requestedByUserId;
       }
       if (parent.contextKey && !options.contextKey) {
         options.contextKey = parent.contextKey;
       }
+      if (parent.followUpConfig && !options.followUpConfig) {
+        options.followUpConfig = parent.followUpConfig;
+      }
     }
   }
 
@@ -2660,8 +2876,8 @@ export function createTaskExtended(task: string, options?: CreateTaskOptions): A
         vcsInstallationId, vcsNodeId,
         agentmailInboxId, agentmailMessageId, agentmailThreadId,
         mentionMessageId, mentionChannelId, dir, parentTaskId, model, scheduleId,
-        workflowRunId, workflowRunStepId, outputSchema, requestedByUserId, contextKey, swarmVersion, createdAt, lastUpdatedAt
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`,
+        workflowRunId, workflowRunStepId, outputSchema, followUpConfig, requestedByUserId, contextKey, swarmVersion, createdAt, lastUpdatedAt
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`,
     )
     .get(
       id,
@@ -2700,6 +2916,7 @@ export function createTaskExtended(task: string, options?: CreateTaskOptions): A
       options?.workflowRunId ?? null,
       options?.workflowRunStepId ?? null,
       options?.outputSchema ? JSON.stringify(options.outputSchema) : null,
+      options?.followUpConfig ? JSON.stringify(options.followUpConfig) : null,
       options?.requestedByUserId ?? null,
       options?.contextKey ?? null,
       pkg.version,
@@ -4017,6 +4234,15 @@ export const sessionLogQueries = {
       "SELECT * FROM session_logs WHERE taskId = ? ORDER BY iteration ASC, lineNumber ASC",
     ),
 
+  getRecentByTaskId: () =>
+    getDb().prepare<SessionLogRow, [string, number]>(
+      `SELECT * FROM (
+         SELECT * FROM session_logs WHERE taskId = ?
+         ORDER BY iteration DESC, lineNumber DESC
+         LIMIT ?
+       ) ORDER BY iteration ASC, lineNumber ASC`,
+    ),
+
   getBySessionId: () =>
     getDb().prepare<SessionLogRow, [string, number]>(
       "SELECT * FROM session_logs WHERE sessionId = ? AND iteration = ? ORDER BY lineNumber ASC",
@@ -4052,7 +4278,10 @@ export function createSessionLogs(logs: {
   })();
 }
 
-export function getSessionLogsByTaskId(taskId: string): SessionLog[] {
+export function getSessionLogsByTaskId(taskId: string, limit?: number): SessionLog[] {
+  if (typeof limit === "number" && limit > 0) {
+    return sessionLogQueries.getRecentByTaskId().all(taskId, limit).map(rowToSessionLog);
+  }
   return sessionLogQueries.getByTaskId().all(taskId).map(rowToSessionLog);
 }
 
@@ -8026,6 +8255,7 @@ type SkillRow = {
   userInvocable: number;
   version: number;
   isEnabled: number;
+  systemDefault: number;
   createdAt: string;
   lastUpdatedAt: string;
   lastFetchedAt: string | null;
@@ -8055,6 +8285,7 @@ function rowToSkill(row: SkillRow): Skill {
     userInvocable: row.userInvocable === 1,
     version: row.version,
     isEnabled: row.isEnabled === 1,
+    systemDefault: row.systemDefault === 1,
     createdAt: row.createdAt,
     lastUpdatedAt: row.lastUpdatedAt,
     lastFetchedAt: row.lastFetchedAt,
@@ -8079,7 +8310,12 @@ function rowToAgentSkill(row: AgentSkillRow): AgentSkill {
   };
 }
 
-type SkillWithInstallRow = SkillRow & { isActive: number; installedAt: string };
+type SkillWithInstallRow = SkillRow & {
+  isActive: number;
+  installedAt: string;
+  sourceRank?: number;
+  typeRank?: number;
+};
 
 function rowToSkillWithInstall(row: SkillWithInstallRow): SkillWithInstallInfo {
   return {
@@ -8109,6 +8345,7 @@ export interface SkillInsert {
   agent?: string;
   disableModelInvocation?: boolean;
   userInvocable?: boolean;
+  systemDefault?: boolean;
 }
 
 export function createSkill(data: SkillInsert): Skill {
@@ -8121,8 +8358,8 @@ export function createSkill(data: SkillInsert): Skill {
         id, name, description, content, type, scope, ownerAgentId,
         sourceUrl, sourceRepo, sourcePath, sourceBranch, sourceHash, isComplex,
         allowedTools, model, effort, context, agent, disableModelInvocation, userInvocable,
-        version, isEnabled, createdAt, lastUpdatedAt
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 1, ?, ?) RETURNING *`,
+        version, isEnabled, systemDefault, createdAt, lastUpdatedAt
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 1, ?, ?, ?) RETURNING *`,
     )
     .get(
       id,
@@ -8145,6 +8382,7 @@ export function createSkill(data: SkillInsert): Skill {
       data.agent ?? null,
       data.disableModelInvocation ? 1 : 0,
       data.userInvocable === false ? 0 : 1,
+      data.systemDefault ? 1 : 0,
       now,
       now,
     );
@@ -8184,6 +8422,10 @@ export function updateSkill(
     sets.push("isEnabled = ?");
     params.push(updates.isEnabled ? 1 : 0);
   }
+  if (updates.systemDefault !== undefined) {
+    sets.push("systemDefault = ?");
+    params.push(updates.systemDefault ? 1 : 0);
+  }
   if (updates.allowedTools !== undefined) {
     sets.push("allowedTools = ?");
     params.push(updates.allowedTools ?? null);
@@ -8295,7 +8537,7 @@ export interface SkillFilters {
  * which is replaced with an empty string so the row still satisfies `Skill`.
  */
 const SKILL_SLIM_COLUMNS =
-  "id, name, description, type, scope, ownerAgentId, sourceUrl, sourceRepo, sourcePath, sourceBranch, sourceHash, isComplex, allowedTools, model, effort, context, agent, disableModelInvocation, userInvocable, version, isEnabled, createdAt, lastUpdatedAt, lastFetchedAt, '' as content";
+  "id, name, description, type, scope, ownerAgentId, sourceUrl, sourceRepo, sourcePath, sourceBranch, sourceHash, isComplex, allowedTools, model, effort, context, agent, disableModelInvocation, userInvocable, version, isEnabled, systemDefault, createdAt, lastUpdatedAt, lastFetchedAt, '' as content";
 
 export function listSkills(filters?: SkillFilters): Skill[] {
   const columns = filters?.includeContent === false ? SKILL_SLIM_COLUMNS : "*";
@@ -8365,6 +8607,19 @@ export function installSkill(agentId: string, skillId: string): AgentSkill {
   return rowToAgentSkill(row);
 }
 
+export function getSystemDefaultSkills(): Skill[] {
+  return getDb()
+    .prepare<SkillRow, []>(
+      "SELECT * FROM skills WHERE systemDefault = 1 AND isEnabled = 1 ORDER BY name ASC",
+    )
+    .all()
+    .map(rowToSkill);
+}
+
+export function installSystemDefaultSkillsForAgent(agentId: string): AgentSkill[] {
+  return getSystemDefaultSkills().map((skill) => installSkill(agentId, skill.id));
+}
+
 export function uninstallSkill(agentId: string, skillId: string): boolean {
   const result = getDb()
     .prepare("DELETE FROM agent_skills WHERE agentId = ? AND skillId = ?")
@@ -8374,15 +8629,23 @@ export function uninstallSkill(agentId: string, skillId: string): boolean {
 
 export function getAgentSkills(agentId: string, activeOnly = true): SkillWithInstallInfo[] {
   const query = `
-    SELECT s.*, as2.isActive, as2.installedAt
+    SELECT s.*, as2.isActive, as2.installedAt, 0 as sourceRank,
+      CASE WHEN s.type = 'personal' THEN 0 ELSE 1 END as typeRank
     FROM skills s
     JOIN agent_skills as2 ON s.id = as2.skillId
     WHERE as2.agentId = ?
       ${activeOnly ? "AND as2.isActive = 1" : ""}
       AND s.isEnabled = 1
+    UNION ALL
+    SELECT s.*, 1 as isActive, s.createdAt as installedAt, 1 as sourceRank,
+      CASE WHEN s.type = 'personal' THEN 0 ELSE 1 END as typeRank
+    FROM skills s
+    WHERE s.systemDefault = 1
+      AND s.isEnabled = 1
     ORDER BY
-      CASE WHEN s.type = 'personal' THEN 0 ELSE 1 END,
-      s.name
+      sourceRank,
+      typeRank,
+      name
   `;
 
   const rows = getDb().prepare<SkillWithInstallRow, [string]>(query).all(agentId);

package/src/be/migrations/079_task_followup_config.sql

@@ -0,0 +1 @@
+ALTER TABLE agent_tasks ADD COLUMN followUpConfig TEXT;

package/src/be/migrations/080_skill_system_defaults.sql

@@ -0,0 +1,8 @@
+-- 080_skill_system_defaults.sql
+-- Adds a first-class marker for skills that are installed for every agent.
+-- Forward migration: add nullable-safe column with default 0.
+-- Reverse operation, if ever needed: ALTER TABLE skills DROP COLUMN systemDefault;
+
+ALTER TABLE skills ADD COLUMN systemDefault INTEGER NOT NULL DEFAULT 0;
+
+CREATE INDEX IF NOT EXISTS idx_skills_system_default ON skills(systemDefault);