@csdwd/ai-teams-server 0.3.4 → 0.3.6

package/dist/index.js

@@ -36,7 +36,9 @@ function parseLeaderToServerMessage(value) {
       atAgents: agentTargetField(message, "atAgents"),
       prompt: nonEmptyStringField(message, "prompt"),
       workspace: optionalStringField(message, "workspace"),
-      timeoutSec: optionalPositiveNumberField(message, "timeoutSec")
+      timeoutSec: optionalPositiveNumberField(message, "timeoutSec"),
+      priority: optionalNonNegativeNumberField(message, "priority"),
+      requiredLabels: optionalStringArrayField(message, "requiredLabels")
     };
   }
   if (type === "command.send") {
@@ -175,6 +177,15 @@ function stringArrayField(record, key) {
   }
   return value;
 }
+function optionalStringArrayField(record, key) {
+  const value = record[key];
+  if (value === void 0)
+    return void 0;
+  if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) {
+    throw new ProtocolError(`${key} must be a string array.`);
+  }
+  return value;
+}
 function agentTargetField(record, key) {
   const value = record[key];
   if (value === "queue") {
@@ -508,7 +519,8 @@ async function initDb(db) {
       usage_input_tokens          INTEGER,
       usage_output_tokens         INTEGER,
       usage_cache_read_tokens     INTEGER,
-      usage_cache_creation_tokens INTEGER
+      usage_cache_creation_tokens INTEGER,
+      retry_count                 INTEGER NOT NULL DEFAULT 0
     )
   `);
   await db.run(`
@@ -559,6 +571,10 @@ async function initDb(db) {
       updated_at      TEXT NOT NULL
     )
   `);
+  try {
+    await db.run("ALTER TABLE tasks ADD COLUMN retry_count INTEGER NOT NULL DEFAULT 0");
+  } catch {
+  }
 }
 async function hydrateState(db, state, defaultTimeoutSec, maxLogChunksPerTask) {
   const employeeRows = await db.all("SELECT payload_json FROM employees");
@@ -575,13 +591,13 @@ async function hydrateState(db, state, defaultTimeoutSec, maxLogChunksPerTask) {
       if (task.targetMode === "queue" || !task.employeeId) {
         state.sharedTaskQueue.push(task.id);
       } else {
-        const queue = state.taskQueues.get(task.employeeId) ?? [];
+        const queue = state.mainTaskQueues.get(task.employeeId) ?? [];
         queue.push(task.id);
-        state.taskQueues.set(task.employeeId, queue);
+        state.mainTaskQueues.set(task.employeeId, queue);
       }
     } else if (task.employeeId && !TERMINAL_STATUSES.has(task.status)) {
       task.status = "queued";
-      persistTask(db, task);
+      await persistTask(db, task);
       if (task.targetMode === "queue") {
         state.sharedTaskQueue.push(task.id);
       } else {
@@ -637,6 +653,7 @@ var TASK_COLUMNS = [
   "cli_config",
   "priority",
   "required_labels",
+  "retry_count",
   "created_at",
   "started_at",
   "finished_at",
@@ -731,11 +748,38 @@ async function deleteTask(db, taskId) {
   await db.run("DELETE FROM tasks WHERE id = $1", [taskId]);
   return true;
 }
+var UPDATABLE_TASK_FIELDS = /* @__PURE__ */ new Set([
+  "status",
+  "timeoutSec",
+  "cliConfig",
+  "priority",
+  "requiredLabels",
+  "prompt",
+  "workspace",
+  "employeeId",
+  "sessionId",
+  "exitCode",
+  "summary",
+  "error",
+  "durationMs",
+  "durationApiMs",
+  "numTurns",
+  "totalCostUsd",
+  "usageInputTokens",
+  "usageOutputTokens",
+  "usageCacheReadTokens",
+  "usageCacheCreationTokens"
+]);
 async function updateTaskFields(db, taskId, fields) {
-  const entries = Object.entries(fields);
+  const entries = Object.entries(fields).filter(([key]) => UPDATABLE_TASK_FIELDS.has(key));
   if (entries.length === 0) return getTaskById(db, taskId);
   const setClauses = entries.map(([key], i) => `${toSnakeCase(key)} = $${i + 2}`).join(", ");
-  const values = entries.map(([, val]) => val);
+  const values = entries.map(([key, val]) => {
+    if ((key === "cliConfig" || key === "requiredLabels") && val != null) {
+      return JSON.stringify(val);
+    }
+    return val;
+  });
   await db.run(
     `UPDATE tasks SET ${setClauses} WHERE id = $1`,
     [taskId, ...values]
@@ -756,6 +800,7 @@ function dbRowToTask(row, defaultTimeoutSec) {
     priority: row.priority ?? 1,
     requiredLabels: row.required_labels ? JSON.parse(row.required_labels) : null,
     status: row.status || "queued",
+    retryCount: row.retry_count ?? 0,
     createdAt: row.created_at,
     startedAt: row.started_at,
     finishedAt: row.finished_at,
@@ -786,6 +831,7 @@ function taskToDbValues(task) {
     task.cliConfig ? JSON.stringify(task.cliConfig) : null,
     task.priority,
     task.requiredLabels ? JSON.stringify(task.requiredLabels) : null,
+    task.retryCount,
     task.createdAt,
     task.startedAt,
     task.finishedAt,
@@ -1212,12 +1258,12 @@ var scheduleResponseSchema = {
     targetMode: { type: "string", enum: ["queue", "direct", "broadcast"] },
     targetAgents: { type: "array", items: { type: "string" } },
     prompt: { type: "string" },
-    workspace: { type: "string" },
-    timeoutSec: { type: "number" },
+    workspace: nullableString,
+    timeoutSec: nullableNumber,
     priority: { type: "integer" },
-    requiredLabels: { type: "array", items: { type: "string" } },
-    lastRunAt: { type: "string" },
-    nextRunAt: { type: "string" },
+    requiredLabels: { anyOf: [{ type: "array", items: { type: "string" } }, { type: "null" }] },
+    lastRunAt: nullableString,
+    nextRunAt: nullableString,
     createdAt: { type: "string" },
     updatedAt: { type: "string" }
   }
@@ -1248,6 +1294,7 @@ function extractDoneSessionId(content) {
 }
 function createDispatch(ctx) {
   const { state, db, log } = ctx;
+  const retryDelays = /* @__PURE__ */ new Map();
   function broadcastToLeaders(payload) {
     for (const socket of state.leaderSockets) {
       sendJson(socket, payload, ctx.encryptor);
@@ -1515,13 +1562,14 @@ function createDispatch(ctx) {
     if (!employee || employee.queueTaskId || employee.status !== "online") {
       return;
     }
-    while (state.sharedTaskQueue.length > 0) {
-      const taskId = state.sharedTaskQueue.shift();
+    for (let i = 0; i < state.sharedTaskQueue.length; i++) {
+      const taskId = state.sharedTaskQueue[i];
       const task = state.tasks.get(taskId);
-      if (task && task.status === "queued" && task.targetMode === "queue") {
-        dispatchTask(task, employeeId);
-        return;
-      }
+      if (!task || task.status !== "queued" || task.targetMode !== "queue") continue;
+      if (retryDelays.has(taskId)) continue;
+      state.sharedTaskQueue.splice(i, 1);
+      dispatchTask(task, employeeId);
+      return;
     }
   }
   function dispatchSharedQueuedTasks() {
@@ -1639,6 +1687,7 @@ function createDispatch(ctx) {
       priority: priority ?? 1,
       requiredLabels: requiredLabels ?? null,
       status: "queued",
+      retryCount: 0,
       createdAt: nowIso(),
       startedAt: null,
       finishedAt: null,
@@ -1679,11 +1728,13 @@ function createDispatch(ctx) {
   }
   function dispatchLeaderCommand(message, webhookUrl, cliConfig, priority, requiredLabels) {
     const leaderCommandId = randomUUID();
+    const resolvedPriority = message.priority ?? priority;
+    const resolvedRequiredLabels = message.requiredLabels ?? requiredLabels;
     if (message.atAgents === "queue") {
       return {
         ok: true,
         leaderCommandId,
-        tasks: [createTask(null, message.prompt, message.workspace, message.timeoutSec, leaderCommandId, "queue", webhookUrl, cliConfig, message.priority, message.requiredLabels)]
+        tasks: [createTask(null, message.prompt, message.workspace, message.timeoutSec, leaderCommandId, "queue", webhookUrl, cliConfig, resolvedPriority, resolvedRequiredLabels)]
       };
     }
     const targetIds = resolveTargetIds(message.atAgents);
@@ -1699,7 +1750,7 @@ function createDispatch(ctx) {
       ok: true,
       leaderCommandId,
       tasks: targetIds.map(
-        (employeeId) => createTask(employeeId, message.prompt, message.workspace, message.timeoutSec, leaderCommandId, targetMode, webhookUrl, cliConfig, message.priority, message.requiredLabels)
+        (employeeId) => createTask(employeeId, message.prompt, message.workspace, message.timeoutSec, leaderCommandId, targetMode, webhookUrl, cliConfig, resolvedPriority, resolvedRequiredLabels)
       )
     };
   }
@@ -1714,6 +1765,15 @@ function createDispatch(ctx) {
       clearTimeout(disconnectTimer);
       state.disconnectTimers.delete(message.employeeId);
     }
+    for (const prevTaskId of [previousMainTaskId, previousQueueTaskId]) {
+      if (prevTaskId) {
+        const timer = retryDelays.get(prevTaskId);
+        if (timer) {
+          clearTimeout(timer);
+          retryDelays.delete(prevTaskId);
+        }
+      }
+    }
     state.agentSockets.set(message.employeeId, socket);
     state.socketToEmployeeId.set(socket, message.employeeId);
     let mainTaskId = null;
@@ -1757,6 +1817,7 @@ function createDispatch(ctx) {
     if (!queueTaskId) {
       dispatchNextQueuedTask(message.employeeId);
     }
+    dispatchSharedQueuedTasks();
     resetHeartbeatTimer(message.employeeId);
   }
   function taskBelongsToSocket(taskId, employeeId, socket) {
@@ -1983,10 +2044,19 @@ function createDispatch(ctx) {
         const task = state.tasks.get(taskId);
         if (!task || TERMINAL_STATUSES.has(task.status)) continue;
         clearTaskTimeout(taskId);
-        task.status = "queued";
         task.employeeId = null;
+        task.retryCount += 1;
+        if (task.retryCount > 3) {
+          task.status = "failed";
+          task.error = `\u4EFB\u52A1\u91CD\u8BD5\u6B21\u6570\u8D85\u8FC7\u4E0A\u9650\uFF083\u6B21\uFF09\uFF0C\u5DF2\u7EC8\u6B62\u3002`;
+          task.finishedAt = nowIso();
+          upsertTask(task);
+          log.warn({ taskId, employeeId, retryCount: task.retryCount }, "Task exceeded max retry count, marked failed");
+          continue;
+        }
+        task.status = "queued";
         upsertTask(task);
-        log.info({ taskId, employeeId }, "Task re-queued after disconnect grace period");
+        log.info({ taskId, employeeId, retryCount: task.retryCount }, "Task re-queued after disconnect grace period");
         if (task.targetMode === "queue") {
           enqueueSharedTask(taskId);
         } else {
@@ -1994,6 +2064,16 @@ function createDispatch(ctx) {
           if (!queue.includes(taskId)) queue.push(taskId);
           state.mainTaskQueues.set(employeeId, queue);
         }
+        if (task.retryCount > 1) {
+          const retryDelay = (task.retryCount - 1) * 5e3;
+          const existingDelay = retryDelays.get(taskId);
+          if (existingDelay) clearTimeout(existingDelay);
+          retryDelays.set(taskId, setTimeout(() => {
+            retryDelays.delete(taskId);
+            dispatchSharedQueuedTasks();
+            dispatchNextMainQueuedTask(employeeId);
+          }, retryDelay));
+        }
       }
       const emp = state.employees.get(employeeId);
       if (emp) {
@@ -2014,7 +2094,13 @@ function createDispatch(ctx) {
     handleAgentMessage,
     handleLeaderMessage,
     cancelTaskById,
-    startDisconnectRecovery
+    startDisconnectRecovery,
+    cleanup() {
+      for (const timer of retryDelays.values()) {
+        clearTimeout(timer);
+      }
+      retryDelays.clear();
+    }
   };
 }
 
@@ -2121,6 +2207,25 @@ function stopScheduleJob(jobs, scheduleId) {
 }
 
 // src/index.ts
+function scheduleToResponse(s) {
+  return {
+    id: s.id,
+    name: s.name,
+    cron: s.cronExpr,
+    enabled: s.enabled,
+    targetMode: s.targetMode,
+    targetAgents: s.targetAgents,
+    prompt: s.prompt,
+    workspace: s.workspace,
+    timeoutSec: s.timeoutSec,
+    priority: s.priority,
+    requiredLabels: s.requiredLabels,
+    lastRunAt: s.lastRunAt,
+    nextRunAt: s.nextRunAt,
+    createdAt: s.createdAt,
+    updatedAt: s.updatedAt
+  };
+}
 var DEFAULT_PORT = 3789;
 function isAuthorized(authToken, rawUrl, headers) {
   const bearer = typeof headers.authorization === "string" ? headers.authorization : "";
@@ -2208,7 +2313,7 @@ async function createAiTeamsServer(options) {
     disconnectGraceMs,
     encryptor: createEncryptor(process.env.AI_TEAMS_ENCRYPTION_KEY)
   };
-  const { dispatchLeaderCommand, handleAgentMessage, handleLeaderMessage, cancelTaskById, startDisconnectRecovery } = createDispatch(dispatchCtx);
+  const { dispatchLeaderCommand, handleAgentMessage, handleLeaderMessage, cancelTaskById, startDisconnectRecovery, cleanup: dispatchCleanup } = createDispatch(dispatchCtx);
   const scheduleDispatchFn = (message, webhookUrl, cliConfig, priority, requiredLabels) => {
     return dispatchLeaderCommand(message, webhookUrl, cliConfig, priority, requiredLabels);
   };
@@ -2653,7 +2758,7 @@ async function createAiTeamsServer(options) {
     },
     async () => {
       const schedules = await getAllSchedules(db);
-      return { schedules };
+      return { schedules: schedules.map(scheduleToResponse) };
     }
   );
   app.get(
@@ -2669,7 +2774,7 @@ async function createAiTeamsServer(options) {
     async (request, reply) => {
       const schedule = await getScheduleById(db, request.params.scheduleId);
       if (!schedule) return reply.code(404).send({ error: "Schedule not found." });
-      return schedule;
+      return scheduleToResponse(schedule);
     }
   );
   app.post(
@@ -2709,7 +2814,7 @@ async function createAiTeamsServer(options) {
           schedule.nextRunAt = state.scheduleJobs.get(id)?.nextDate()?.toISO() ?? null;
         }
         await upsertSchedule(db, schedule);
-        return reply.code(201).send(schedule);
+        return reply.code(201).send(scheduleToResponse(schedule));
       } catch (err) {
         stopScheduleJob(state.scheduleJobs, id);
         return reply.code(400).send({ error: err instanceof Error ? err.message : "Invalid schedule." });
@@ -2724,7 +2829,7 @@ async function createAiTeamsServer(options) {
         summary: "Update a schedule",
         params: { type: "object", required: ["scheduleId"], properties: { scheduleId: { type: "string", minLength: 1 } } },
         body: updateScheduleRequestSchema,
-        response: { 200: scheduleResponseSchema, 404: errorResponseSchema, 401: errorResponseSchema }
+        response: { 200: scheduleResponseSchema, 400: errorResponseSchema, 404: errorResponseSchema, 401: errorResponseSchema }
       }
     },
     async (request, reply) => {
@@ -2743,13 +2848,18 @@ async function createAiTeamsServer(options) {
       if (request.body.requiredLabels !== void 0) fields.requiredLabels = request.body.requiredLabels;
       const updated = await updateScheduleFields(db, request.params.scheduleId, fields);
       if (!updated) return reply.code(404).send({ error: "Schedule not found." });
-      stopScheduleJob(state.scheduleJobs, request.params.scheduleId);
-      if (updated.enabled) {
-        startScheduleJob(updated, scheduleDispatchFn, state.scheduleJobs, onScheduleFire);
-        updated.nextRunAt = state.scheduleJobs.get(request.params.scheduleId)?.nextDate()?.toISO() ?? null;
-        await updateScheduleFields(db, request.params.scheduleId, { nextRunAt: updated.nextRunAt });
+      try {
+        stopScheduleJob(state.scheduleJobs, request.params.scheduleId);
+        if (updated.enabled) {
+          startScheduleJob(updated, scheduleDispatchFn, state.scheduleJobs, onScheduleFire);
+          updated.nextRunAt = state.scheduleJobs.get(request.params.scheduleId)?.nextDate()?.toISO() ?? null;
+          await updateScheduleFields(db, request.params.scheduleId, { nextRunAt: updated.nextRunAt });
+        }
+        return scheduleToResponse(updated);
+      } catch (err) {
+        stopScheduleJob(state.scheduleJobs, request.params.scheduleId);
+        return reply.code(400).send({ error: err instanceof Error ? err.message : "Invalid schedule." });
       }
-      return updated;
     }
   );
   app.delete(
@@ -2780,7 +2890,7 @@ async function createAiTeamsServer(options) {
         tags: ["schedules"],
         summary: "Manually trigger a schedule",
         params: { type: "object", required: ["scheduleId"], properties: { scheduleId: { type: "string", minLength: 1 } } },
-        response: { 200: scheduleResponseSchema, 404: errorResponseSchema, 401: errorResponseSchema }
+        response: { 200: scheduleResponseSchema, 400: errorResponseSchema, 404: errorResponseSchema, 401: errorResponseSchema }
       }
     },
     async (request, reply) => {
@@ -2796,7 +2906,9 @@ async function createAiTeamsServer(options) {
       );
       if (!result.ok) return reply.code(400).send({ error: result.message });
       await onScheduleFire(request.params.scheduleId);
-      return await getScheduleById(db, request.params.scheduleId);
+      const updated = await getScheduleById(db, request.params.scheduleId);
+      if (!updated) return reply.code(404).send({ error: "Schedule not found." });
+      return scheduleToResponse(updated);
     }
   );
   app.get("/ws/agent", { websocket: true }, (socket, request) => {
@@ -2886,8 +2998,9 @@ async function createAiTeamsServer(options) {
       for (const timer of state.heartbeatTimers.values()) {
         clearTimeout(timer);
       }
+      dispatchCleanup();
       await app.close();
-      db.close();
+      await db.close();
     }
   };
 }
@@ -2965,7 +3078,7 @@ if (isCli) {
   getArgValue2 = getArgValue, loadServerConfig2 = loadServerConfig, saveServerConfig2 = saveServerConfig, resolveDataDir2 = resolveDataDir, resolvePidFile2 = resolvePidFile, resolveLogDir2 = resolveLogDir, applyCliArgsToEnv2 = applyCliArgsToEnv;
   const args = process.argv.slice(2);
   if (args.includes("--version") || args.includes("-v")) {
-    console.log("0.3.4");
+    console.log("0.3.6");
     process.exit(0);
   }
   if (args.includes("--help") || args.includes("-h")) {
@@ -3000,19 +3113,21 @@ if (isCli) {
   const subcommand = args[0];
   if (subcommand === "start" || subcommand === "restart") {
     void (async () => {
-      if (subcommand === "restart") {
-        const status = getDaemonStatus(resolvePidFile());
-        if (status.running) {
-          await stopDaemon(resolvePidFile());
-        }
-      } else if (!process.env.__AI_TEAMS_DAEMON_WATCHDOG && !process.env.__AI_TEAMS_DAEMON_WORKER) {
-        const status = getDaemonStatus(resolvePidFile());
-        if (status.running) {
-          console.log(`Already running (PID ${status.pid}).`);
-          process.exit(0);
+      applyCliArgsToEnv();
+      if (!process.env.__AI_TEAMS_DAEMON_WATCHDOG && !process.env.__AI_TEAMS_DAEMON_WORKER) {
+        if (subcommand === "restart") {
+          const status = getDaemonStatus(resolvePidFile());
+          if (status.running) {
+            await stopDaemon(resolvePidFile());
+          }
+        } else {
+          const status = getDaemonStatus(resolvePidFile());
+          if (status.running) {
+            console.log(`Already running (PID ${status.pid}).`);
+            process.exit(0);
+          }
         }
       }
-      applyCliArgsToEnv();
       if (!process.env.AI_TEAMS_AUTH_TOKEN) {
         console.error("\u9519\u8BEF: \u9700\u8981\u8BA4\u8BC1 Token\u3002\u4F7F\u7528 --token <token> \u6216\u8BBE\u7F6E AI_TEAMS_AUTH_TOKEN \u73AF\u5883\u53D8\u91CF\u3002");
         process.exit(1);