opencode-supertask 0.1.31 → 0.1.32-rc.2

package/dist/plugin/supertask.js

@@ -26976,6 +26976,42 @@ function computeBackoff(retryCount, baseMs = 3e4, maxMs = MAX_BACKOFF_MS) {
   return Math.min(baseMs * Math.pow(2, retryCount - 1), maxMs);
 }
 
+// src/core/task-working-directory.ts
+import { statSync } from "fs";
+import { isAbsolute } from "path";
+var InvalidTaskWorkingDirectoryError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "InvalidTaskWorkingDirectoryError";
+  }
+};
+function validateTaskWorkingDirectory(cwd) {
+  if (cwd == null) return;
+  if (!cwd.trim()) {
+    throw new InvalidTaskWorkingDirectoryError("\u4EFB\u52A1\u5DE5\u4F5C\u76EE\u5F55\u4E0D\u80FD\u4E3A\u7A7A");
+  }
+  if (!isAbsolute(cwd)) {
+    throw new InvalidTaskWorkingDirectoryError(`\u4EFB\u52A1\u5DE5\u4F5C\u76EE\u5F55\u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84\uFF1A${cwd}`);
+  }
+  let stat;
+  try {
+    stat = statSync(cwd);
+  } catch (error45) {
+    const detail = error45 instanceof Error ? error45.message : String(error45);
+    throw new InvalidTaskWorkingDirectoryError(`\u4EFB\u52A1\u5DE5\u4F5C\u76EE\u5F55\u4E0D\u5B58\u5728\u6216\u65E0\u6CD5\u8BBF\u95EE\uFF1A${cwd}\uFF08${detail}\uFF09`);
+  }
+  if (!stat.isDirectory()) {
+    throw new InvalidTaskWorkingDirectoryError(`\u4EFB\u52A1\u5DE5\u4F5C\u76EE\u5F55\u4E0D\u662F\u76EE\u5F55\uFF1A${cwd}`);
+  }
+}
+
+// src/core/task-batch.ts
+var TASK_BATCH_TRIM_CHARACTERS = " 	\n\v\f\r\xA0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";
+function normalizeTaskBatchId(batchId) {
+  if (batchId == null) return batchId;
+  return batchId.trim() || null;
+}
+
 // src/core/services/task.service.ts
 var { tasks: tasks2, taskRuns: taskRuns2 } = schema_exports;
 var cleanupInvocation = 0;
@@ -27039,34 +27075,75 @@ var TaskService = class {
     return conditions;
   }
   static async add(data) {
-    this.validateNewTask(data);
+    const normalizedData = {
+      ...data,
+      batchId: normalizeTaskBatchId(data.batchId)
+    };
+    this.validateNewTask(normalizedData);
     return db.transaction((tx) => {
-      if (data.dependsOn != null) {
+      if (normalizedData.dependsOn != null) {
         const dependency = tx.select({
           id: tasks2.id,
           cwd: tasks2.cwd,
           status: tasks2.status,
           retryCount: tasks2.retryCount,
           maxRetries: tasks2.maxRetries
-        }).from(tasks2).where(eq(tasks2.id, data.dependsOn)).get();
+        }).from(tasks2).where(eq(tasks2.id, normalizedData.dependsOn)).get();
         if (!dependency) {
-          throw new Error(`dependsOn \u6307\u5411\u7684\u4EFB\u52A1 #${data.dependsOn} \u4E0D\u5B58\u5728`);
+          throw new Error(`dependsOn \u6307\u5411\u7684\u4EFB\u52A1 #${normalizedData.dependsOn} \u4E0D\u5B58\u5728`);
         }
-        if ((dependency.cwd ?? null) !== (data.cwd ?? null)) {
+        if ((dependency.cwd ?? null) !== (normalizedData.cwd ?? null)) {
           throw new Error("dependsOn \u5FC5\u987B\u6307\u5411\u540C\u4E00 cwd \u7684\u4EFB\u52A1");
         }
         const dependencyIsRecoverable = dependency.status === "pending" || dependency.status === "running" || dependency.status === "done" || dependency.status === "failed" && (dependency.retryCount ?? 0) <= (dependency.maxRetries ?? 3);
         if (!dependencyIsRecoverable) {
-          throw new Error(`dependsOn \u6307\u5411\u7684\u4EFB\u52A1 #${data.dependsOn} \u5DF2\u8FDB\u5165\u4E0D\u53EF\u6062\u590D\u7EC8\u6001`);
+          throw new Error(`dependsOn \u6307\u5411\u7684\u4EFB\u52A1 #${normalizedData.dependsOn} \u5DF2\u8FDB\u5165\u4E0D\u53EF\u6062\u590D\u7EC8\u6001`);
         }
       }
-      return tx.insert(tasks2).values(data).returning().get();
+      return tx.insert(tasks2).values(normalizedData).returning().get();
+    }, { behavior: "immediate" });
+  }
+  static async update(id, data, scope = {}) {
+    if (Object.keys(data).length === 0) throw new Error("\u81F3\u5C11\u63D0\u4F9B\u4E00\u4E2A\u8981\u4FEE\u6539\u7684\u5B57\u6BB5");
+    const normalizedData = data.batchId === void 0 ? data : { ...data, batchId: normalizeTaskBatchId(data.batchId) ?? null };
+    return db.transaction((tx) => {
+      const task = tx.select().from(tasks2).where(and(
+        eq(tasks2.id, id),
+        sql`${tasks2.status} IN ('pending', 'failed', 'dead_letter')`,
+        ...this.buildScopeWhere(scope)
+      )).get();
+      if (!task) return null;
+      this.validateNewTask({
+        name: normalizedData.name ?? task.name,
+        agent: normalizedData.agent ?? task.agent,
+        model: normalizedData.model ?? task.model,
+        prompt: normalizedData.prompt ?? task.prompt,
+        cwd: task.cwd,
+        category: normalizedData.category ?? task.category,
+        importance: normalizedData.importance ?? task.importance,
+        urgency: normalizedData.urgency ?? task.urgency,
+        batchId: normalizedData.batchId === void 0 ? task.batchId : normalizedData.batchId,
+        maxRetries: normalizedData.maxRetries ?? task.maxRetries,
+        retryBackoffMs: normalizedData.retryBackoffMs ?? task.retryBackoffMs,
+        timeoutMs: normalizedData.timeoutMs === void 0 ? task.timeoutMs : normalizedData.timeoutMs,
+        dependsOn: task.dependsOn
+      });
+      const maxRetries = normalizedData.maxRetries ?? task.maxRetries ?? 3;
+      const exhausted = task.status === "failed" && (task.retryCount ?? 0) > maxRetries;
+      return tx.update(tasks2).set({
+        ...normalizedData,
+        ...exhausted ? {
+          status: "dead_letter",
+          retryAfter: null
+        } : {}
+      }).where(eq(tasks2.id, id)).returning().get() ?? null;
     }, { behavior: "immediate" });
   }
   static validateNewTask(data) {
     if (!data.name.trim()) throw new Error("name \u4E0D\u80FD\u4E3A\u7A7A");
     if (!data.agent.trim()) throw new Error("agent \u4E0D\u80FD\u4E3A\u7A7A");
     if (!data.prompt.trim()) throw new Error("prompt \u4E0D\u80FD\u4E3A\u7A7A");
+    validateTaskWorkingDirectory(data.cwd);
     this.validateInteger("importance", data.importance, 1, 5);
     this.validateInteger("urgency", data.urgency, 1, 5);
     this.validateInteger("maxRetries", data.maxRetries, 0, 1e3);
@@ -27087,12 +27164,14 @@ var TaskService = class {
       isNull(tasks2.retryAfter),
       sql`${tasks2.retryAfter} <= ${nowMs}`
     );
-    const hasExcludedBatches = scope.excludedBatchIds && scope.excludedBatchIds.length > 0;
+    const excludedBatchIds = [...new Set((scope.excludedBatchIds ?? []).map((batchId) => normalizeTaskBatchId(batchId)).filter((batchId) => Boolean(batchId)))];
+    const hasExcludedBatches = excludedBatchIds.length > 0;
     let batchFilter;
     if (hasExcludedBatches) {
       batchFilter = or(
         isNull(tasks2.batchId),
-        sql`${tasks2.batchId} NOT IN ${scope.excludedBatchIds}`
+        sql`trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS}) = ''`,
+        sql`trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS}) NOT IN ${excludedBatchIds}`
       );
     }
     const statusConditions = or(
@@ -27126,9 +27205,11 @@ var TaskService = class {
       ),
       or(
         isNull(tasks2.batchId),
+        sql`trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS}) = ''`,
         sql`NOT EXISTS (
                         SELECT 1 FROM tasks AS running_batch_task
-                        WHERE running_batch_task.batch_id = ${tasks2.batchId}
+                        WHERE trim(running_batch_task.batch_id, ${TASK_BATCH_TRIM_CHARACTERS})
+                            = trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS})
                           AND (
                               running_batch_task.status = 'running'
                               OR EXISTS (
@@ -27152,12 +27233,18 @@ var TaskService = class {
     ).limit(1);
     return result[0] ?? null;
   }
-  static async countRunning() {
+  static async countRunning(scope = {}) {
+    const scopeConditions = scope.legacyCwd ? [sql`${tasks2.cwd} IS NULL OR trim(${tasks2.cwd}) = ''`] : this.buildScopeWhere(scope);
+    if (scope.batchId !== void 0) {
+      const batchId = normalizeTaskBatchId(scope.batchId);
+      scopeConditions.push(batchId ? sql`trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS}) = ${batchId}` : sql`0`);
+    }
     return db.transaction((tx) => {
-      const runningTasks = tx.select({ count: sql`count(*)` }).from(tasks2).where(eq(tasks2.status, "running")).get();
+      const runningTasks = tx.select({ count: sql`count(*)` }).from(tasks2).where(and(eq(tasks2.status, "running"), ...scopeConditions)).get();
       const runsWithoutRunningTask = tx.select({ count: sql`count(DISTINCT ${taskRuns2.taskId})` }).from(taskRuns2).innerJoin(tasks2, eq(tasks2.id, taskRuns2.taskId)).where(and(
         eq(taskRuns2.status, "running"),
-        sql`${tasks2.status} <> 'running'`
+        sql`${tasks2.status} <> 'running'`,
+        ...scopeConditions
       )).get();
       return Number(runningTasks?.count ?? 0) + Number(runsWithoutRunningTask?.count ?? 0);
     }, { behavior: "deferred" });
@@ -27490,15 +27577,17 @@ var TaskService = class {
     }).where(and(...conditions, hasViableDependency())).returning().get() ?? null, { behavior: "immediate" });
   }
   static async retryBatch(batchId, scope = {}) {
+    const normalizedBatchId = normalizeTaskBatchId(batchId);
+    if (!normalizedBatchId) return 0;
     const sqlite2 = getSqlite();
     const scopeFilter = scope.cwd === void 0 ? "" : "AND candidate.cwd = ?";
-    const parameters = scope.cwd === void 0 ? [batchId] : [batchId, scope.cwd];
+    const parameters = scope.cwd === void 0 ? [TASK_BATCH_TRIM_CHARACTERS, normalizedBatchId] : [TASK_BATCH_TRIM_CHARACTERS, normalizedBatchId, scope.cwd];
     return db.transaction(() => sqlite2.query(`
             WITH RECURSIVE
             candidate(id, cwd, depends_on) AS MATERIALIZED (
                 SELECT candidate.id, candidate.cwd, candidate.depends_on
                 FROM tasks AS candidate
-                WHERE candidate.batch_id = ?
+                WHERE trim(candidate.batch_id, ?) = ?
                   AND candidate.status IN ('failed', 'dead_letter')
                   ${scopeFilter}
             ),
@@ -27552,16 +27641,28 @@ var TaskService = class {
   static async list(options = {}) {
     let query = db.select().from(tasks2).$dynamic();
     const conditions = [];
-    if (options.status) {
+    if (options.activeExecution) {
+      conditions.push(or(
+        eq(tasks2.status, "running"),
+        sql`EXISTS (
+                    SELECT 1 FROM task_runs AS active_list_run
+                    WHERE active_list_run.task_id = ${tasks2.id}
+                      AND active_list_run.status = 'running'
+                )`
+      ));
+    } else if (options.status) {
       conditions.push(eq(tasks2.status, options.status));
     }
-    if (options.batchId) {
-      conditions.push(eq(tasks2.batchId, options.batchId));
+    if (options.batchId !== void 0) {
+      const batchId = normalizeTaskBatchId(options.batchId);
+      conditions.push(batchId ? sql`trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS}) = ${batchId}` : sql`0`);
     }
     if (options.category) {
       conditions.push(eq(tasks2.category, options.category));
     }
-    if (options.cwd !== void 0) {
+    if (options.legacyCwd) {
+      conditions.push(sql`${tasks2.cwd} IS NULL OR trim(${tasks2.cwd}) = ''`);
+    } else if (options.cwd !== void 0) {
       conditions.push(eq(tasks2.cwd, options.cwd));
     }
     if (conditions.length > 0) {
@@ -27579,9 +27680,12 @@ var TaskService = class {
   static async stats(options = {}) {
     const conditions = [];
     if (options.batchId !== void 0) {
-      conditions.push(eq(tasks2.batchId, options.batchId));
+      const batchId = normalizeTaskBatchId(options.batchId);
+      conditions.push(batchId ? sql`trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS}) = ${batchId}` : sql`0`);
     }
-    if (options.cwd !== void 0) {
+    if (options.legacyCwd) {
+      conditions.push(sql`${tasks2.cwd} IS NULL OR trim(${tasks2.cwd}) = ''`);
+    } else if (options.cwd !== void 0) {
       conditions.push(eq(tasks2.cwd, options.cwd));
     }
     const whereCondition = conditions.length > 0 ? and(...conditions) : void 0;
@@ -27606,6 +27710,33 @@ var TaskService = class {
     }
     return stats;
   }
+  static async projectSummaries(limit = 100) {
+    this.validateInteger("limit", limit, 1, 1e3);
+    const lastCreatedAt = sql`max(${tasks2.createdAt})`;
+    const lastTaskId = sql`max(${tasks2.id})`;
+    const rows = await db.select({
+      cwd: tasks2.cwd,
+      total: sql`count(*)`,
+      pending: sql`sum(CASE WHEN ${tasks2.status} = 'pending' THEN 1 ELSE 0 END)`,
+      running: sql`sum(CASE WHEN ${tasks2.status} = 'running' OR EXISTS (
+                    SELECT 1 FROM task_runs AS active_project_run
+                    WHERE active_project_run.task_id = ${tasks2.id}
+                      AND active_project_run.status = 'running'
+                ) THEN 1 ELSE 0 END)`,
+      failed: sql`sum(CASE WHEN ${tasks2.status} IN ('failed', 'dead_letter') THEN 1 ELSE 0 END)`,
+      done: sql`sum(CASE WHEN ${tasks2.status} = 'done' THEN 1 ELSE 0 END)`,
+      lastCreatedAt
+    }).from(tasks2).where(sql`${tasks2.cwd} IS NOT NULL AND trim(${tasks2.cwd}) <> ''`).groupBy(tasks2.cwd).orderBy(desc(lastCreatedAt), desc(lastTaskId)).limit(limit);
+    return rows.flatMap((row) => row.cwd === null ? [] : [{
+      cwd: row.cwd,
+      total: Number(row.total),
+      pending: Number(row.pending),
+      running: Number(row.running),
+      failed: Number(row.failed),
+      done: Number(row.done),
+      lastCreatedAt: row.lastCreatedAt === null ? null : Number(row.lastCreatedAt) * 1e3
+    }]);
+  }
   static async delete(id, scope = {}) {
     const conditions = [
       eq(tasks2.id, id),
@@ -27758,24 +27889,29 @@ function isValidCronExpr(expr) {
 var { taskTemplates: taskTemplates2 } = schema_exports;
 var TaskTemplateService = class {
   static async create(data) {
-    this.validate(data);
+    const normalizedData = {
+      ...data,
+      batchId: normalizeTaskBatchId(data.batchId)
+    };
+    this.validate(normalizedData);
     const now = Date.now();
-    const nextRunAt = data.nextRunAt ?? this.calculateNextRunAt(
-      data.scheduleType,
+    const nextRunAt = normalizedData.nextRunAt ?? this.calculateNextRunAt(
+      normalizedData.scheduleType,
       {
-        cronExpr: data.cronExpr ?? null,
-        intervalMs: data.intervalMs ?? null,
-        runAt: data.runAt ?? null
+        cronExpr: normalizedData.cronExpr ?? null,
+        intervalMs: normalizedData.intervalMs ?? null,
+        runAt: normalizedData.runAt ?? null
       },
       now
     );
-    const result = await db.insert(taskTemplates2).values({ ...data, nextRunAt, createdAt: now, updatedAt: now }).returning();
+    const result = await db.insert(taskTemplates2).values({ ...normalizedData, nextRunAt, createdAt: now, updatedAt: now }).returning();
     return result[0];
   }
   static validate(data) {
     if (!data.name.trim()) throw new Error("name \u4E0D\u80FD\u4E3A\u7A7A");
     if (!data.agent.trim()) throw new Error("agent \u4E0D\u80FD\u4E3A\u7A7A");
     if (!data.prompt.trim()) throw new Error("prompt \u4E0D\u80FD\u4E3A\u7A7A");
+    validateTaskWorkingDirectory(data.cwd);
     const scheduleType = data.scheduleType;
     if (!["cron", "delayed", "recurring"].includes(scheduleType)) {
       throw new Error("scheduleType \u5FC5\u987B\u662F cron\u3001delayed \u6216 recurring");
@@ -27802,13 +27938,40 @@ var TaskTemplateService = class {
       throw new Error(`${name} \u5FC5\u987B\u662F ${min} \u5230 ${max} \u4E4B\u95F4\u7684\u6574\u6570`);
     }
   }
-  static async list(limit = 50) {
-    return await db.select().from(taskTemplates2).orderBy(desc(taskTemplates2.createdAt), desc(taskTemplates2.id)).limit(limit);
+  static async list(limit = 50, offset = 0) {
+    return await db.select().from(taskTemplates2).orderBy(desc(taskTemplates2.createdAt), desc(taskTemplates2.id)).limit(limit).offset(offset);
+  }
+  static async stats() {
+    const result = await db.select({
+      total: sql`count(*)`,
+      enabled: sql`sum(case when ${taskTemplates2.enabled} = 1 then 1 else 0 end)`
+    }).from(taskTemplates2);
+    const total = Number(result[0]?.total ?? 0);
+    const enabled = Number(result[0]?.enabled ?? 0);
+    return { total, enabled, disabled: total - enabled };
   }
   static async getById(id) {
     const result = await db.select().from(taskTemplates2).where(eq(taskTemplates2.id, id));
     return result[0] || null;
   }
+  static async update(id, data) {
+    const normalizedData = {
+      ...data,
+      batchId: normalizeTaskBatchId(data.batchId) ?? null
+    };
+    this.validate(normalizedData);
+    const now = Date.now();
+    const nextRunAt = this.calculateNextRunAt(
+      normalizedData.scheduleType,
+      normalizedData,
+      now
+    );
+    return db.transaction((tx) => {
+      const existing = tx.select({ id: taskTemplates2.id }).from(taskTemplates2).where(eq(taskTemplates2.id, id)).limit(1).get();
+      if (!existing) return null;
+      return tx.update(taskTemplates2).set({ ...normalizedData, nextRunAt, updatedAt: now }).where(eq(taskTemplates2.id, id)).returning().get() ?? null;
+    }, { behavior: "immediate" });
+  }
   static async enable(id) {
     return db.transaction((tx) => {
       const template = tx.select().from(taskTemplates2).where(eq(taskTemplates2.id, id)).limit(1).get();
@@ -27981,11 +28144,11 @@ import {
   mkdirSync as mkdirSync3,
   readFileSync as readFileSync3,
   rmSync,
-  statSync,
+  statSync as statSync2,
   writeFileSync
 } from "fs";
 import { homedir as homedir3, userInfo } from "os";
-import { delimiter, dirname as dirname4, isAbsolute, join as join4, resolve } from "path";
+import { delimiter, dirname as dirname4, isAbsolute as isAbsolute2, join as join4, resolve } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { Database as Database4 } from "bun:sqlite";
 
@@ -28206,7 +28369,7 @@ function getRunningVersion(env = process.env, cwd = process.cwd()) {
   }
 }
 function resolveRuntimeExecutable(command, env, cwd) {
-  if (isAbsolute(command) || command.includes("/")) return runtimePath(command, cwd);
+  if (isAbsolute2(command) || command.includes("/")) return runtimePath(command, cwd);
   for (const entry of (env.PATH ?? "").split(delimiter)) {
     if (!entry) continue;
     const candidate = resolve(cwd, entry, command);
@@ -28251,7 +28414,7 @@ function pm2CommandTimeoutMs(env = process.env) {
 }
 function resolvePm2Bin() {
   const configured = pm2Bin();
-  if (isAbsolute(configured)) return configured;
+  if (isAbsolute2(configured)) return configured;
   const result = spawnSync("which", [configured], { encoding: "utf8" });
   const resolved = result.status === 0 ? result.stdout.trim().split("\n")[0] : "";
   if (!resolved) throw new Error(`[supertask] \u65E0\u6CD5\u89E3\u6790 pm2 \u53EF\u6267\u884C\u6587\u4EF6: ${configured}`);
@@ -28358,7 +28521,7 @@ function gatewayRuntimeFromProcess(processInfo) {
   if (typeof savedBunPath !== "string" || typeof savedCwd !== "string") return null;
   try {
     accessSync(savedBunPath, constants.X_OK);
-    if (!statSync(savedCwd).isDirectory()) return null;
+    if (!statSync2(savedCwd).isDirectory()) return null;
     if (spawnSync(savedBunPath, ["--version"], {
       stdio: "ignore",
       env: savedEnv,
@@ -28495,7 +28658,7 @@ function pm2StartGateway(runtime = currentGatewayRuntime()) {
   try {
     accessSync(runtime.bunPath, constants.X_OK);
     accessSync(runtime.gatewayEntry, constants.R_OK);
-    if (!statSync(runtime.cwd).isDirectory()) throw new Error("cwd is not a directory");
+    if (!statSync2(runtime.cwd).isDirectory()) throw new Error("cwd is not a directory");
   } catch (error45) {
     throw new Error(`[supertask] Gateway \u76EE\u6807\u8FD0\u884C\u65F6\u4E0D\u53EF\u7528: ${error45 instanceof Error ? error45.message : String(error45)}`);
   }
@@ -28819,7 +28982,7 @@ function latestVersion() {
   }
   return uniqueVersions[0];
 }
-function resolveInstalledVersion(expectedVersion) {
+function resolveInstalledPluginVersion(expectedVersion) {
   const override = process.env.SUPERTASK_PLUGIN_PACKAGE_DIR;
   const installed = override ? [pluginAt(override)].filter((plugin) => plugin !== null) : installedPlugins();
   const matched = installed.find((plugin) => plugin.version === expectedVersion);
@@ -28848,7 +29011,7 @@ function installPluginVersion(version3) {
   if (result.status !== 0) {
     throw new Error(`[supertask] OpenCode \u63D2\u4EF6\u66F4\u65B0\u5931\u8D25: ${output || `\u9000\u51FA\u7801 ${result.status}`}`);
   }
-  return resolveInstalledVersion(version3);
+  return resolveInstalledPluginVersion(version3);
 }
 function installLatestPlugin() {
   return installPluginVersion(latestVersion());
@@ -28937,12 +29100,21 @@ var SYSTEM_INSTRUCTION = `
 - \u5F53\u7528\u6237\u95EE"\u4EFB\u52A1\u8FDB\u5C55\u5982\u4F55"\u65F6\uFF0C\u7528 \`supertask_status\` \u548C \`supertask_list\`
 - \u5F53\u7528\u6237\u8BF4"\u91CD\u8BD5\u5931\u8D25\u7684\u4EFB\u52A1"\u65F6\uFF0C\u7528 \`supertask_retry\`
 
+### \u6279\u6B21\u3001\u5E76\u53D1\u4E0E\u4F9D\u8D56
+
+- \`batchId\` \u662F\u5168\u5C40\u4E32\u884C\u6267\u884C\u952E\uFF1A\u5373\u4F7F\u4EFB\u52A1\u5C5E\u4E8E\u4E0D\u540C\u9879\u76EE\u76EE\u5F55\uFF0C\u6240\u6709\u5177\u6709\u76F8\u540C\u975E\u7A7A \`batchId\` \u7684\u4EFB\u52A1\u4E5F\u4E0D\u4F1A\u540C\u65F6\u6267\u884C\uFF0CGateway \u91CD\u542F\u540E\u4ECD\u7136\u6210\u7ACB
+- \u4E0D\u540C \`batchId\` \u6216\u672A\u8BBE\u7F6E \`batchId\` \u7684\u4EFB\u52A1\u53EF\u4EE5\u5E76\u884C\uFF0C\u4F46\u4ECD\u53D7 Gateway \u5168\u5C40\u5E76\u53D1\u4E0A\u9650\u548C\u4EFB\u52A1\u4F9D\u8D56\u7EA6\u675F
+- \u628A\u9700\u8981\u4E92\u65A5\u6267\u884C\u7684\u4EFB\u52A1\u8BBE\u7F6E\u4E3A\u540C\u4E00 \`batchId\`\uFF1B\u5EFA\u8BAE\u4F7F\u7528\u201C\u9879\u76EE:\u7528\u9014\u201D\u7B49\u5168\u5C40\u552F\u4E00\u540D\u79F0\uFF0C\u4E0D\u8981\u7ED9\u5F7C\u6B64\u72EC\u7ACB\u3001\u5E0C\u671B\u5E76\u884C\u7684\u4EFB\u52A1\u590D\u7528\u540C\u4E00 \`batchId\`
+- \`batchId\` \u53EA\u4FDD\u8BC1\u4E0D\u5E76\u53D1\uFF0C\u4E0D\u4FDD\u8BC1\u4E0D\u540C\u4F18\u5148\u7EA7\u4EFB\u52A1\u6309\u521B\u5EFA\u987A\u5E8F\u8FD0\u884C\uFF1B\u82E5\u4EFB\u52A1 B \u5FC5\u987B\u7B49\u5F85\u4EFB\u52A1 A \u5B8C\u6210\uFF0C\u5E94\u628A B \u7684 \`dependsOn\` \u8BBE\u7F6E\u4E3A A \u7684\u4EFB\u52A1 ID
+- \u5411\u5DF2\u6709\u6279\u6B21\u8FFD\u52A0\u4EFB\u52A1\u524D\uFF0C\u53EF\u7528 \`supertask_status\` \u7684 \`batchId\` \u67E5\u770B\u5F53\u524D\u9879\u76EE\u7EDF\u8BA1\uFF0C\u5E76\u4EE5\u8FD4\u56DE\u503C \`globalBatch.activeRunning\` \u5224\u65AD\u8BE5\u6279\u6B21\u662F\u5426\u5DF2\u88AB\u4EFB\u4E00\u9879\u76EE\u5360\u7528\uFF1B\`blockedByOtherProject\` \u8868\u793A\u5360\u7528\u6765\u81EA\u5176\u4ED6\u9879\u76EE
+
 ### \u8C03\u5EA6\u6A21\u677F
 
 \u7528 \`supertask_schedule\` \u53EF\u521B\u5EFA\u4E09\u79CD\u5B9A\u65F6\u4EFB\u52A1\uFF1A
 - \`cron\`: cron \u8868\u8FBE\u5F0F\uFF08\u5982 "0 9 * * 1-5" = \u5DE5\u4F5C\u65E5 9 \u70B9\uFF09
 - \`recurring\`: \u56FA\u5B9A\u95F4\u9694\u5FAA\u73AF\uFF08\u5982\u6BCF 6 \u5C0F\u65F6\uFF09
 - \`delayed\`: \u4E00\u6B21\u6027\u5B9A\u65F6\u6267\u884C
+- \`max_instances\` \u53EA\u9650\u5236\u81EA\u52A8\u8C03\u5EA6\u4EA7\u751F\u7684\u6D3B\u8DC3\u5B9E\u4F8B\uFF08\u6392\u961F\u3001\u8FD0\u884C\u4E2D\u3001\u7B49\u5F85\u91CD\u8BD5\uFF09\uFF1B\u624B\u52A8\u201C\u7ACB\u5373\u8FD0\u884C\u4E00\u6B21\u201D\u59CB\u7EC8\u521B\u5EFA\u4EFB\u52A1\u5E76\u52A0\u5165\u961F\u5217
 `;
 var SuperTaskPlugin = async () => {
   return {
@@ -28955,7 +29127,7 @@ var SuperTaskPlugin = async () => {
     tool: {
       // 创建任务
       supertask_add: tool({
-        description: "\u521B\u5EFA\u65B0\u4EFB\u52A1\u5230\u961F\u5217\u3002\u8FD4\u56DE\u4EFB\u52A1 ID\u3002\u4EFB\u52A1\u6309 urgency\u3001importance\u3001createdAt\u3001id \u7684\u987A\u5E8F\u8C03\u5EA6\u3002",
+        description: "\u521B\u5EFA\u65B0\u4EFB\u52A1\u5230\u6301\u4E45\u961F\u5217\u3002\u8DE8\u9879\u76EE\u7684\u76F8\u540C\u975E\u7A7A batchId \u4EFB\u52A1\u5168\u5C40\u4E25\u683C\u4E32\u884C\uFF0C\u4E0D\u540C\u6279\u6B21\u53EF\u5728\u5168\u5C40\u5E76\u53D1\u4E0A\u9650\u5185\u5E76\u884C\uFF1BdependsOn \u7528\u4E8E\u8868\u8FBE\u5FC5\u987B\u5B8C\u6210\u7684\u5148\u540E\u5173\u7CFB\u3002\u8FD4\u56DE\u4EFB\u52A1 ID\u3002\u4EFB\u52A1\u6309 urgency\u3001importance\u3001createdAt\u3001id \u7684\u987A\u5E8F\u8C03\u5EA6\u3002",
         args: {
           name: tool.schema.string().trim().min(1).describe("\u4EFB\u52A1\u540D\u79F0\uFF08\u4EBA\u7C7B\u53EF\u8BFB\uFF09"),
           agent: tool.schema.string().trim().min(1).describe("\u6267\u884C\u7684 Agent \u540D\u79F0\uFF0C\u5982 localize-gen, course-gen"),
@@ -28964,8 +29136,8 @@ var SuperTaskPlugin = async () => {
           category: tool.schema.enum(["translate", "generate", "review", "test", "general"]).optional().describe("\u4EFB\u52A1\u5206\u7C7B"),
           importance: tool.schema.number().int().min(1).max(5).optional().describe("\u91CD\u8981\u7A0B\u5EA6 1-5\uFF085 \u6700\u91CD\u8981\uFF09"),
           urgency: tool.schema.number().int().min(1).max(5).optional().describe("\u7D27\u6025\u7A0B\u5EA6 1-5\uFF085 \u6700\u7D27\u6025\uFF09"),
-          batchId: tool.schema.string().optional().describe("\u6279\u6B21 ID\uFF0C\u7528\u4E8E\u5206\u7EC4\u7BA1\u7406"),
-          dependsOn: tool.schema.number().int().positive().optional().describe("\u4F9D\u8D56\u7684\u4EFB\u52A1 ID\uFF0C\u8BE5\u4EFB\u52A1\u5B8C\u6210\u540E\u624D\u4F1A\u6267\u884C"),
+          batchId: tool.schema.string().trim().min(1).optional().describe("\u5168\u5C40\u4E32\u884C\u6279\u6B21 ID\uFF1A\u5373\u4F7F\u5C5E\u4E8E\u4E0D\u540C\u9879\u76EE\uFF0C\u6240\u6709\u76F8\u540C\u975E\u7A7A batchId \u7684\u4EFB\u52A1\u4E5F\u4E0D\u4F1A\u540C\u65F6\u6267\u884C\uFF1B\u72EC\u7ACB\u4EFB\u52A1\u8BF7\u7701\u7565\uFF0C\u4E0D\u8981\u4F20\u7A7A\u5B57\u7B26\u4E32\u6216\u590D\u7528\u540C\u4E00\u503C"),
+          dependsOn: tool.schema.number().int().positive().optional().describe("\u4F9D\u8D56\u7684\u4EFB\u52A1 ID\uFF1B\u9700\u8981\u4E25\u683C\u5148\u540E\u987A\u5E8F\u65F6\u8BBE\u7F6E\uFF0C\u524D\u7F6E\u4EFB\u52A1\u5B8C\u6210\u540E\u624D\u4F1A\u6267\u884C"),
           max_retries: tool.schema.number().int().min(0).max(1e3).optional().describe("\u9996\u6B21\u6267\u884C\u4E4B\u5916\u5141\u8BB8\u7684\u91CD\u8BD5\u6B21\u6570\uFF0C\u9ED8\u8BA4 3"),
           retry_backoff_ms: tool.schema.number().int().min(0).max(864e5).optional().describe("\u91CD\u8BD5\u9000\u907F\u57FA\u7840\u95F4\u9694 ms\uFF0C\u9ED8\u8BA4 30000"),
           timeout_ms: tool.schema.number().int().min(1e3).max(6048e5).optional().describe("\u4EFB\u52A1\u786C\u8D85\u65F6 ms\uFF1B\u672A\u4F20\u5219\u4F7F\u7528 Gateway \u9ED8\u8BA4\u503C"),
@@ -29032,15 +29204,32 @@ var SuperTaskPlugin = async () => {
       }),
       // 查看统计
       supertask_status: tool({
-        description: "\u67E5\u770B\u4EFB\u52A1\u961F\u5217\u7EDF\u8BA1\u3002\u53EF\u6309\u6279\u6B21\u7B5B\u9009\u3002",
+        description: "\u67E5\u770B\u5F53\u524D\u9879\u76EE\u7684\u4EFB\u52A1\u961F\u5217\u7EDF\u8BA1\u3002\u4F20\u5165 batchId \u65F6\u8FD8\u8FD4\u56DE\u8DE8\u9879\u76EE\u7684 globalBatch \u7EDF\u8BA1\u548C\u662F\u5426\u88AB\u5176\u4ED6\u9879\u76EE\u5360\u7528\u3002",
         args: {
-          batchId: tool.schema.string().optional().describe("\u6309\u6279\u6B21\u7B5B\u9009"),
+          batchId: tool.schema.string().trim().min(1).optional().describe("\u6309\u6279\u6B21\u7B5B\u9009\uFF1B\u540C\u540D\u6279\u6B21\u5728\u6240\u6709\u9879\u76EE\u95F4\u5168\u5C40\u4E32\u884C"),
           cwd: tool.schema.string().optional().describe("\u9879\u76EE\u9694\u79BB\uFF1A\u4F20\u5165\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\uFF0C\u53EA\u7EDF\u8BA1\u8BE5\u9879\u76EE\u7684\u4EFB\u52A1")
         },
         async execute(args, context) {
           try {
-            const stats = await TaskService.stats({ batchId: args.batchId, cwd: context.directory });
-            return JSON.stringify(stats);
+            const project = await TaskService.stats({
+              batchId: args.batchId,
+              cwd: context.directory
+            });
+            if (args.batchId === void 0) return JSON.stringify(project);
+            const [globalBatch, activeRunning, globalActiveRunning] = await Promise.all([
+              TaskService.stats({ batchId: args.batchId }),
+              TaskService.countRunning({ batchId: args.batchId, cwd: context.directory }),
+              TaskService.countRunning({ batchId: args.batchId })
+            ]);
+            return JSON.stringify({
+              ...project,
+              activeRunning,
+              globalBatch: {
+                ...globalBatch,
+                activeRunning: globalActiveRunning
+              },
+              blockedByOtherProject: globalActiveRunning > activeRunning
+            });
           } catch (error45) {
             return JSON.stringify({
               error: error45 instanceof Error ? error45.message : String(error45)
@@ -29144,14 +29333,14 @@ var SuperTaskPlugin = async () => {
           category: tool.schema.enum(["translate", "generate", "review", "test", "general"]).optional().describe("\u4EFB\u52A1\u5206\u7C7B"),
           importance: tool.schema.number().int().min(1).max(5).optional().describe("\u91CD\u8981\u7A0B\u5EA6 1-5"),
           urgency: tool.schema.number().int().min(1).max(5).optional().describe("\u7D27\u6025\u7A0B\u5EA6 1-5"),
-          batchId: tool.schema.string().optional().describe("\u6A21\u677F\u751F\u6210\u7684\u4EFB\u52A1\u5F52\u5C5E\u7684\u6279\u6B21 ID"),
+          batchId: tool.schema.string().trim().min(1).optional().describe("\u6A21\u677F\u751F\u6210\u4EFB\u52A1\u7684\u5168\u5C40\u4E32\u884C\u6279\u6B21 ID\uFF1B\u8DE8\u9879\u76EE\u7684\u76F8\u540C\u975E\u7A7A batchId \u5B9E\u4F8B\u4E0D\u4F1A\u540C\u65F6\u6267\u884C\uFF1B\u65E0\u6279\u6B21\u65F6\u8BF7\u7701\u7565"),
           schedule: tool.schema.object({
             type: tool.schema.enum(["cron", "delayed", "recurring"]).describe("\u8C03\u5EA6\u7C7B\u578B"),
             cron_expr: tool.schema.string().optional().describe("cron \u8868\u8FBE\u5F0F\uFF08cron \u7C7B\u578B\u5FC5\u586B\uFF0C\u5982 '0 9 * * 1-5'\uFF09"),
             delay: tool.schema.string().optional().describe("\u5EF6\u8FDF\u65F6\u95F4\uFF08delayed \u7C7B\u578B\u5FC5\u586B\uFF09\uFF0C\u53CB\u597D\u683C\u5F0F\u5982 '30s' '5min' '1h' '2d'\uFF0C\u4E5F\u652F\u6301 ISO 8601 duration \u5982 'PT30M'"),
             interval: tool.schema.string().optional().describe("\u5FAA\u73AF\u95F4\u9694\uFF08recurring \u7C7B\u578B\u5FC5\u586B\uFF09\uFF0C\u53CB\u597D\u683C\u5F0F\u5982 '1h' '30min' '5s'\uFF0C\u4E5F\u652F\u6301 ISO 8601 duration \u5982 'PT1H'")
           }).describe("\u8C03\u5EA6\u914D\u7F6E"),
-          max_instances: tool.schema.number().int().min(1).max(1e3).optional().describe("\u6700\u5927\u5E76\u53D1\u5B9E\u4F8B\u6570\uFF0C\u9ED8\u8BA4 1"),
+          max_instances: tool.schema.number().int().min(1).max(1e3).optional().describe("\u81EA\u52A8\u8C03\u5EA6\u7684\u6D3B\u8DC3\u5B9E\u4F8B\u4E0A\u9650\uFF0C\u9ED8\u8BA4 1\uFF1B\u6D3B\u8DC3\u5B9E\u4F8B\u5305\u542B\u6392\u961F\u3001\u8FD0\u884C\u4E2D\u548C\u7B49\u5F85\u91CD\u8BD5\uFF0C\u624B\u52A8\u7ACB\u5373\u8FD0\u884C\u4E0D\u53D7\u6B64\u9650\u5236"),
           max_retries: tool.schema.number().int().min(0).max(1e3).optional().describe("\u514B\u9686\u7ED9 task \u7684\u6700\u5927\u91CD\u8BD5\u6B21\u6570\uFF0C\u9ED8\u8BA4 3"),
           retry_backoff_ms: tool.schema.number().int().min(0).max(864e5).optional().describe("\u514B\u9686\u7ED9 task \u7684\u9000\u907F\u57FA\u7840\u95F4\u9694 ms\uFF0C\u9ED8\u8BA4 30000"),
           timeout_ms: tool.schema.number().int().min(1e3).max(6048e5).optional().describe("\u514B\u9686\u7ED9 task \u7684\u786C\u8D85\u65F6 ms\uFF1B\u672A\u4F20\u5219\u4F7F\u7528 Gateway \u9ED8\u8BA4\u503C")
@@ -29262,7 +29451,7 @@ var SuperTaskPlugin = async () => {
               before: result.before,
               after: result.after,
               restarted: result.restarted,
-              message: `SuperTask \u5DF2\u4ECE ${result.before ?? "unknown"} \u5347\u7EA7\u5230 ${result.after}\uFF0CGateway \u5DF2\u91CD\u542F\u3002\u8BF7\u91CD\u542F opencode \u4EE5\u52A0\u8F7D\u65B0\u7248\u63D2\u4EF6\u3002`
+              message: `SuperTask \u5DF2\u4ECE ${result.before ?? "unknown"} \u5347\u7EA7\u5230 ${result.after}\uFF0CGateway \u5DF2\u91CD\u542F\u3002\u8BF7\u91CD\u542F opencode \u4EE5\u52A0\u8F7D\u65B0\u7248\u63D2\u4EF6\uFF1B\u82E5\u4F7F\u7528\u5168\u5C40 CLI\uFF0C\u8BF7\u7528\u539F\u5305\u7BA1\u7406\u5668\u5C06\u5B83\u66F4\u65B0\u5230 opencode-supertask@${result.after}\uFF08npm install -g \u6216 bun add -g\uFF09\u3002`
             });
           } catch (error45) {
             return JSON.stringify({