@michengai/dsh-automation 0.1.39 → 0.1.41

package/lib/index.js

@@ -276,7 +276,7 @@ var AUTOMATION_CREATE_DESCRIPTION = [
   "\u4E3A\u5F53\u524D\u5DE5\u4F5C\u533A\u521B\u5EFA\u4E00\u6761\u72EC\u7ACB DSH \u81EA\u52A8\u5316\uFF1B\u6BCF\u6B21\u89E6\u53D1\u5F00\u542F\u5168\u65B0 Session\uFF0C\u4E0D\u7EE7\u627F\u5F53\u524D\u5BF9\u8BDD\u3002",
   '\u5DE5\u4F5C\u65E5\u65E9\u4E0A 8 \u70B9\u793A\u4F8B\uFF1Akind=weekly, weekdays=["MO","TU","WE","TH","FR"], time="08:00", time_zone="Asia/Shanghai"\u3002',
   "\u540C\u65F6\u652F\u6301 hourly(minute)\u3001monthly(month_day + time) \u548C custom(every_days + time)\u3002",
-  "\u5FC5\u987B\u4F7F\u7528\u663E\u5F0F IANA \u65F6\u533A\u3002\u6700\u77ED\u95F4\u9694 5 \u5206\u949F\u3002\u9ED8\u8BA4\u6743\u9650\u6765\u81EA Host\uFF1B\u4E0D\u9700\u8981\u5199\u5165\u65F6\u5E94\u663E\u5F0F\u9009\u62E9 read-only\uFF0C\u53EA\u6709\u9700\u8981\u6539\u6587\u4EF6\u65F6\u624D\u9009 workspace-write\u3002"
+  "\u5FC5\u987B\u4F7F\u7528\u663E\u5F0F IANA \u65F6\u533A\u3002\u6700\u77ED\u95F4\u9694 1 \u5206\u949F\u3002\u9ED8\u8BA4\u6743\u9650\u6765\u81EA Host\uFF1B\u4E0D\u9700\u8981\u5199\u5165\u65F6\u5E94\u663E\u5F0F\u9009\u62E9 read-only\uFF0C\u53EA\u6709\u9700\u8981\u6539\u6587\u4EF6\u65F6\u624D\u9009 workspace-write\u3002"
 ].join("");
 
 // src/service.ts
@@ -21330,8 +21330,8 @@ function assertValidSchedule(schedule) {
     return;
   }
   if (schedule.kind === "interval") {
-    if (!Number.isInteger(schedule.everyMinutes) || schedule.everyMinutes < 5) {
-      throw new Error("interval.everyMinutes must be an integer of at least 5");
+    if (!Number.isInteger(schedule.everyMinutes) || schedule.everyMinutes < 1) {
+      throw new Error("interval.everyMinutes must be an integer of at least 1");
     }
     parseInstant(schedule.anchor, "interval.anchor");
     return;
@@ -21610,7 +21610,7 @@ var timeZone = nonBlank;
 var weekday = external_exports.enum(["MO", "TU", "WE", "TH", "FR", "SA", "SU"]);
 var automationScheduleSchema = external_exports.discriminatedUnion("kind", [
   external_exports.object({ kind: external_exports.literal("once"), at: instant, timeZone }),
-  external_exports.object({ kind: external_exports.literal("interval"), everyMinutes: external_exports.number().int().min(5), anchor: instant, timeZone }),
+  external_exports.object({ kind: external_exports.literal("interval"), everyMinutes: external_exports.number().int().min(1), anchor: instant, timeZone }),
   external_exports.object({ kind: external_exports.literal("daily"), time: external_exports.string().regex(/^(?:[01]\d|2[0-3]):[0-5]\d$/), timeZone }),
   external_exports.object({
     kind: external_exports.literal("weekly"),
@@ -21647,6 +21647,7 @@ var automationDefinitionSchema = external_exports.object({
   version: external_exports.literal(1),
   id: nonBlank,
   revision: external_exports.number().int().positive(),
+  maxConcurrentRuns: external_exports.number().int().positive().default(1),
   name: nonBlank.max(200),
   prompt: nonBlank.max(1e5),
   status: external_exports.enum(["active", "paused"]),
@@ -21712,6 +21713,7 @@ function createDefinition(input) {
     name: requireNonBlank(input.name, "name"),
     prompt: requireNonBlank(input.prompt, "prompt"),
     status: "active",
+    maxConcurrentRuns: input.maxConcurrentRuns ?? 1,
     schedule,
     rrule: scheduleToRRule(schedule),
     timeZone: schedule.timeZone,
@@ -21736,6 +21738,7 @@ function updateDefinition(current, input) {
     name: input.name === void 0 ? current.name : requireNonBlank(input.name, "name"),
     prompt: input.prompt === void 0 ? current.prompt : requireNonBlank(input.prompt, "prompt"),
     status: input.status ?? current.status,
+    maxConcurrentRuns: input.maxConcurrentRuns ?? current.maxConcurrentRuns ?? 1,
     schedule,
     rrule: scheduleToRRule(schedule),
     timeZone: schedule.timeZone,
@@ -21981,6 +21984,7 @@ var AutomationService = class _AutomationService {
       try {
         value = createDefinition({
           id: `automation_${randomUUID2()}`,
+          maxConcurrentRuns: request.maxConcurrentRuns ?? 1,
           name: request.name,
           prompt: request.prompt,
           schedule: request.schedule,
@@ -22073,11 +22077,12 @@ var AutomationService = class _AutomationService {
     const run = await this.serialize(async () => {
       const definition = await this.ownedDefinition(scope, id);
       throwIfCancelled(signal);
-      const alreadyActive = [...this.runs.entries()].some(
+      const limit = definition.maxConcurrentRuns ?? 1;
+      const activeCount = [...this.runs.entries()].filter(
         ([, candidate]) => candidate.automationId === id && (candidate.status === "queued" || candidate.status === "running")
-      );
-      if (alreadyActive)
-        throw new AutomationRequestError("\u8BE5\u81EA\u52A8\u5316\u5DF2\u6709\u6392\u961F\u6216\u8FD0\u884C\u4E2D\u7684\u4EFB\u52A1\u3002");
+      ).length;
+      if (activeCount >= limit)
+        throw new AutomationRequestError(`\u8BE5\u81EA\u52A8\u5316\u5DF2\u6709\u6392\u961F\u6216\u8FD0\u884C\u4E2D\u7684\u4EFB\u52A1\uFF0C\u5DF2\u8FBE\u5230\u5E76\u53D1\u4E0A\u9650\uFF08${limit}\uFF09\u3002`);
       const value = createManualRun(definition, toIso());
       await this.runs.put(value.id, value);
       return value;
@@ -22356,12 +22361,12 @@ var AutomationService = class _AutomationService {
       return;
     const candidate = createScheduledRun(definition, scheduledFor);
     if (this.runs.get(candidate.id) !== void 0) return;
-    const overlapping = related.some(
+    const overlapping = related.filter(
       (run) => run.status === "queued" || run.status === "running"
-    );
+    ).length >= (definition.maxConcurrentRuns ?? 1);
     const age = Date.parse(now2) - Date.parse(scheduledFor);
     if (overlapping || age > this.config.misfireGraceMs) {
-      const reason = overlapping ? { code: "overlap", message: "\u4E0A\u4E00\u6B21\u8FD0\u884C\u4ECD\u5728\u8FDB\u884C\uFF0C\u672C\u6B21\u5DF2\u8DF3\u8FC7\u3002" } : {
+      const reason = overlapping ? { code: "overlap", message: "\u5DF2\u8FBE\u5230\u8BE5\u81EA\u52A8\u5316\u7684\u5E76\u53D1\u4E0A\u9650\uFF0C\u672C\u6B21\u5DF2\u8DF3\u8FC7\u3002" } : {
         code: "misfire",
         message: "Host \u6062\u590D\u65F6\u5DF2\u8D85\u51FA\u8865\u8DD1\u7A97\u53E3\uFF0C\u672C\u6B21\u5DF2\u8DF3\u8FC7\u3002"
       };
@@ -22378,16 +22383,20 @@ var AutomationService = class _AutomationService {
   }
   async startQueuedRuns() {
     if (this.stopping) return;
-    const activeAutomationIds = new Set(
-      [...this.active.keys()].map((id) => this.runs.get(id)?.automationId).filter((id) => id !== void 0)
-    );
+    const activeCounts = /* @__PURE__ */ new Map();
+    for (const id of this.active.keys()) {
+      const automationId = this.runs.get(id)?.automationId;
+      if (automationId !== void 0) activeCounts.set(automationId, (activeCounts.get(automationId) ?? 0) + 1);
+    }
     const candidates = [...this.runs.entries()].map(([, run]) => run).filter((run) => run.status === "queued" && !this.active.has(run.id)).sort(
       (left, right) => Date.parse(left.scheduledFor) - Date.parse(right.scheduledFor)
     );
     const queued = [];
     for (const run of candidates) {
-      if (activeAutomationIds.has(run.automationId)) continue;
-      activeAutomationIds.add(run.automationId);
+      const count = activeCounts.get(run.automationId) ?? 0;
+      const limit = this.definitions.get(run.automationId)?.maxConcurrentRuns ?? 1;
+      if (count >= limit) continue;
+      activeCounts.set(run.automationId, count + 1);
       queued.push(run);
     }
     for (const run of queued) this.startRun(run);
@@ -22756,6 +22765,12 @@ function integer2(value, label) {
   if (typeof value !== "number" || !Number.isSafeInteger(value)) throw new RpcRequestError(`${label} must be an integer`);
   return value;
 }
+function positiveInteger2(value, label) {
+  if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 1) {
+    throw new RpcRequestError(`${label} must be a positive integer`);
+  }
+  return value;
+}
 function toDomainSchedule(raw, timeZone2) {
   const schedule = record2(raw, "schedule");
   const kind = string4(schedule.kind, "schedule.kind");
@@ -22848,6 +22863,7 @@ async function snapshotValue(service, payload, signal) {
       scheduleSummary: definition.rrule,
       timeZone: definition.timeZone,
       permission: definition.permissionPreset,
+      maxConcurrentRuns: definition.maxConcurrentRuns ?? 1,
       ...definition.nextRunAt === null ? {} : { nextRunAt: definition.nextRunAt },
       ...definition.lastRun === null ? {} : {
         lastRunAt: definition.lastRun.finishedAt ?? definition.lastRun.startedAt ?? definition.lastRun.scheduledFor,
@@ -22893,6 +22909,7 @@ function registerAutomationRpc(ctx, service) {
             prompt: string4(input.prompt, "input.prompt", 1e5),
             schedule: toDomainSchedule(input.schedule, timeZone2),
             permissionPreset: string4(input.permission, "input.permission"),
+            ...input.maxConcurrentRuns === void 0 ? {} : { maxConcurrentRuns: positiveInteger2(input.maxConcurrentRuns, "input.maxConcurrentRuns") },
             ...input.workspaceId === void 0 ? {} : { workspaceId: string4(input.workspaceId, "input.workspaceId") },
             ...input.cwd === void 0 ? {} : { cwd: string4(input.cwd, "input.cwd") },
             ...input.provider === void 0 ? {} : { provider: input.provider === null ? null : string4(input.provider, "input.provider") },
@@ -22924,6 +22941,7 @@ function registerAutomationRpc(ctx, service) {
             prompt: string4(input.prompt, "input.prompt", 1e5),
             schedule: toDomainSchedule(input.schedule, timeZone2),
             permissionPreset: string4(input.permission, "input.permission"),
+            ...input.maxConcurrentRuns === void 0 ? {} : { maxConcurrentRuns: positiveInteger2(input.maxConcurrentRuns, "input.maxConcurrentRuns") },
             ...input.workspaceId === void 0 ? {} : { workspaceId: string4(input.workspaceId, "input.workspaceId") },
             ...input.cwd === void 0 ? {} : { cwd: string4(input.cwd, "input.cwd") },
             ...input.provider === void 0 ? {} : { provider: input.provider === null ? null : string4(input.provider, "input.provider") },
@@ -23046,12 +23064,13 @@ function registerAutomationTools(service, agent) {
         kind: { type: "string", required: true, enum: ["once", "interval", "hourly", "daily", "weekly", "monthly", "custom"] },
         time_zone: { type: "string", required: true, description: "IANA \u65F6\u533A\uFF0C\u4F8B\u5982 Asia/Shanghai\u3002" },
         at: { type: "string", description: "\u4E00\u6B21\u6027\u8BA1\u5212\u7684\u5E26\u504F\u79FB ISO \u65F6\u95F4\u3002" },
-        every_minutes: { type: "integer", description: "\u95F4\u9694\u8BA1\u5212\u7684\u5206\u949F\u6570\uFF0C\u6700\u5C0F 5\u3002" },
+        every_minutes: { type: "integer", description: "\u95F4\u9694\u8BA1\u5212\u7684\u5206\u949F\u6570\uFF0C\u6700\u5C0F 1\u3002" },
         minute: { type: "integer", description: "\u6BCF\u5C0F\u65F6\u8BA1\u5212\u5728\u7B2C\u51E0\u5206\u949F\u8FD0\u884C\uFF0C\u8303\u56F4 0-59\u3002" },
         time: { type: "string", description: "\u6BCF\u5929\u3001\u6BCF\u5468\u3001\u6BCF\u6708\u6216\u81EA\u5B9A\u4E49\u8BA1\u5212\u7684\u672C\u5730 HH:mm\u3002" },
         weekdays: { type: "array", items: { type: "string", enum: WEEKDAYS2 } },
         month_day: { type: "integer", description: "\u6BCF\u6708\u8BA1\u5212\u5728\u7B2C\u51E0\u65E5\u8FD0\u884C\uFF0C\u8303\u56F4 1-31\u3002" },
         every_days: { type: "integer", description: "\u81EA\u5B9A\u4E49\u8BA1\u5212\u6BCF\u9694\u51E0\u5929\u8FD0\u884C\uFF0C\u8303\u56F4 1-365\u3002" },
+        max_concurrent_runs: { type: "integer", description: "\u540C\u4E00\u81EA\u52A8\u5316\u7684\u5E76\u53D1\u8FD0\u884C\u4E0A\u9650\uFF0C\u5FC5\u987B\u4E3A\u6B63\u6574\u6570\uFF0C\u9ED8\u8BA4 1" },
         permission: { type: "string", enum: permissionNames }
       },
       output: JSON_OUTPUT,
@@ -23062,6 +23081,7 @@ function registerAutomationTools(service, agent) {
             name: args.name,
             prompt: args.prompt,
             schedule: scheduleFromArgs(args, (/* @__PURE__ */ new Date()).toISOString()),
+            ...args.max_concurrent_runs === void 0 ? {} : { maxConcurrentRuns: args.max_concurrent_runs },
             ...args.permission === void 0 ? {} : { permissionPreset: args.permission }
           }, exec.signal);
           return json2({ ok: true, automation: value });
@@ -23111,6 +23131,7 @@ function registerAutomationTools(service, agent) {
         weekdays: { type: "array", items: { type: "string", enum: WEEKDAYS2 } },
         month_day: { type: "integer" },
         every_days: { type: "integer" },
+        max_concurrent_runs: { type: "integer", description: "\u540C\u4E00\u81EA\u52A8\u5316\u7684\u5E76\u53D1\u8FD0\u884C\u4E0A\u9650\uFF0C\u5FC5\u987B\u4E3A\u6B63\u6574\u6570\uFF0C\u9ED8\u8BA4 1" },
         permission: { type: "string", enum: permissionNames }
       },
       output: JSON_OUTPUT,
@@ -23122,6 +23143,7 @@ function registerAutomationTools(service, agent) {
           if (args.name !== void 0) input.name = String(args.name);
           if (args.prompt !== void 0) input.prompt = String(args.prompt);
           if (args.status !== void 0) input.status = args.status;
+          if (args.max_concurrent_runs !== void 0) input.maxConcurrentRuns = args.max_concurrent_runs;
           if (args.permission !== void 0) input.permissionPreset = args.permission;
           if (args.kind !== void 0) input.schedule = scheduleFromArgs(args, (/* @__PURE__ */ new Date()).toISOString());
           if (Object.keys(input).length === 0) throw new Error("automation_update \u81F3\u5C11\u9700\u8981\u4E00\u4E2A\u53D8\u66F4\u5B57\u6BB5");

package/lib/types/client/helpers.d.ts

@@ -8,6 +8,7 @@ export interface AutomationFormState {
     readonly prompt: string;
     readonly scheduleKind: ScheduleKind;
     readonly onceAt: string;
+    readonly maxConcurrentRuns: string;
     readonly everyMinutes: string;
     readonly intervalAnchor: string;
     readonly time: string;
@@ -22,7 +23,7 @@ export interface AutomationFormState {
     readonly reasoningEffort: string;
     readonly skills: readonly string[];
 }
-export type FormErrorKey = 'form.error.name' | 'form.error.prompt' | 'form.error.once' | 'form.error.interval' | 'form.error.weekdays' | 'form.error.workspace';
+export type FormErrorKey = 'form.error.maxConcurrentRuns' | 'form.error.name' | 'form.error.prompt' | 'form.error.once' | 'form.error.interval' | 'form.error.weekdays' | 'form.error.workspace';
 export declare class AutomationFormError extends Error {
     readonly key: FormErrorKey;
     constructor(key: FormErrorKey);

package/lib/types/client/locales.d.ts

@@ -152,6 +152,9 @@ export declare const en: {
     readonly "form.time": "Time";
     readonly "form.days": "Weekdays";
     readonly "form.timeZone": "Time zone";
+    readonly "form.maxConcurrentRuns": "Concurrency";
+    readonly "form.maxConcurrentRunsHint": "Queued and running executions share this limit. Defaults to 1; when full, scheduled triggers are skipped and manual runs are rejected.";
+    readonly "form.error.maxConcurrentRuns": "Enter a positive whole number for concurrent runs.";
     readonly "form.permission": "Permission boundary";
     readonly "permission.readOnly": "Read Only";
     readonly "permission.workspaceWrite": "Workspace Write";
@@ -162,7 +165,7 @@ export declare const en: {
     readonly "form.error.name": "Enter a name.";
     readonly "form.error.prompt": "Enter a complete, standalone task prompt.";
     readonly "form.error.once": "Choose a valid future date and time.";
-    readonly "form.error.interval": "The interval must be between 5 and 43,200 minutes.";
+    readonly "form.error.interval": "The interval must be between 1 and 43,200 minutes.";
     readonly "form.error.weekdays": "Select at least one weekday.";
     readonly "day.1": "Mon";
     readonly "day.2": "Tue";

package/lib/types/client/protocol.d.ts

@@ -74,6 +74,7 @@ export interface AutomationViewModel {
     readonly schedule: AutomationSchedule;
     readonly scheduleSummary: string;
     readonly timeZone: string;
+    readonly maxConcurrentRuns?: number;
     readonly permission: AutomationPermission;
     readonly workspaceId?: string;
     readonly cwd?: string;
@@ -125,6 +126,7 @@ export interface CreateAutomationInput {
     readonly prompt: string;
     readonly schedule: AutomationSchedule;
     readonly timeZone: string;
+    readonly maxConcurrentRuns?: number;
     readonly permission: AutomationPermission;
     readonly workspaceId: string;
     readonly cwd: string;

package/lib/types/service.d.ts

@@ -37,6 +37,7 @@ export interface CreateRequest {
     readonly name: string;
     readonly prompt: string;
     readonly schedule: AutomationSchedule;
+    readonly maxConcurrentRuns?: number;
     readonly permissionPreset?: PermissionPreset;
     readonly workspaceId?: string;
     readonly cwd?: string;

package/lib/types/types.d.ts

@@ -62,6 +62,7 @@ declare module '@deepseek-ai/dsh-llm' {
 export interface AutomationDefinition {
     readonly version: 1;
     readonly id: string;
+    readonly maxConcurrentRuns?: number;
     readonly revision: number;
     readonly name: string;
     readonly prompt: string;
@@ -123,6 +124,7 @@ export interface CreateAutomationInput {
     readonly provider?: string | null;
     readonly model?: string | null;
     readonly reasoningEffort?: string | null | undefined;
+    readonly maxConcurrentRuns?: number;
     readonly permissionPreset?: PermissionPreset;
     readonly createdBy: AutomationCreator;
     readonly now: string;
@@ -136,6 +138,7 @@ export interface UpdateAutomationInput {
     readonly provider?: string | null;
     readonly model?: string | null;
     readonly reasoningEffort?: string | null | undefined;
+    readonly maxConcurrentRuns?: number;
     readonly permissionPreset?: PermissionPreset;
     readonly workspaceId?: string;
     readonly cwd?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-automation",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "description": "在独立 DSH Session 中按计划执行编码任务，支持 Web 设置页与 Agent 双入口管理。",
   "type": "module",
   "packageManager": "pnpm@11.22.0",