opencode-supertask 0.1.39 → 0.1.41

package/dist/plugin/supertask.js

@@ -26774,6 +26774,7 @@ var tasks = sqliteTable("tasks", {
   name: text("name").notNull(),
   agent: text("agent").notNull(),
   model: text("model").default("default"),
+  variant: text("variant"),
   prompt: text("prompt").notNull(),
   cwd: text("cwd"),
   // 分类与优先级
@@ -26818,6 +26819,7 @@ var taskRuns = sqliteTable("task_runs", {
   taskId: integer2("task_id").notNull().references(() => tasks.id, { onDelete: "cascade" }),
   sessionId: text("session_id"),
   model: text("model"),
+  variant: text("variant"),
   status: text("status").default("running"),
   startedAt: integer2("started_at", { mode: "timestamp" }).$defaultFn(() => /* @__PURE__ */ new Date()),
   finishedAt: integer2("finished_at", { mode: "timestamp" }),
@@ -26838,6 +26840,7 @@ var taskTemplates = sqliteTable("task_templates", {
   name: text("name").notNull(),
   agent: text("agent").notNull(),
   model: text("model").default("default"),
+  variant: text("variant"),
   prompt: text("prompt").notNull(),
   cwd: text("cwd"),
   category: text("category").default("general"),
@@ -27012,6 +27015,22 @@ function normalizeTaskBatchId(batchId) {
   return batchId.trim() || null;
 }
 
+// src/core/model-variant.ts
+var MAX_MODEL_VARIANT_LENGTH = 128;
+var CONTROL_CHARACTER_PATTERN = /[\u0000-\u001F\u007F]/;
+function normalizeModelVariant(value) {
+  if (value === void 0 || value === null) return value;
+  const normalized = value.trim();
+  if (!normalized) return null;
+  if (normalized.length > MAX_MODEL_VARIANT_LENGTH) {
+    throw new Error(`variant \u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7 ${MAX_MODEL_VARIANT_LENGTH} \u4E2A\u5B57\u7B26`);
+  }
+  if (CONTROL_CHARACTER_PATTERN.test(normalized)) {
+    throw new Error("variant \u4E0D\u80FD\u5305\u542B\u63A7\u5236\u5B57\u7B26");
+  }
+  return normalized;
+}
+
 // src/core/services/task.service.ts
 var { tasks: tasks2, taskRuns: taskRuns2 } = schema_exports;
 var cleanupInvocation = 0;
@@ -27077,7 +27096,8 @@ var TaskService = class {
   static async add(data) {
     const normalizedData = {
       ...data,
-      batchId: normalizeTaskBatchId(data.batchId)
+      batchId: normalizeTaskBatchId(data.batchId),
+      variant: normalizeModelVariant(data.variant)
     };
     this.validateNewTask(normalizedData);
     return db.transaction((tx) => {
@@ -27105,7 +27125,11 @@ var TaskService = class {
   }
   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 };
+    const normalizedData = {
+      ...data,
+      ...data.batchId === void 0 ? {} : { batchId: normalizeTaskBatchId(data.batchId) ?? null },
+      ...data.variant === void 0 ? {} : { variant: normalizeModelVariant(data.variant) ?? null }
+    };
     return db.transaction((tx) => {
       const task = tx.select().from(tasks2).where(and(
         eq(tasks2.id, id),
@@ -27117,6 +27141,7 @@ var TaskService = class {
         name: normalizedData.name ?? task.name,
         agent: normalizedData.agent ?? task.agent,
         model: normalizedData.model ?? task.model,
+        variant: normalizedData.variant === void 0 ? task.variant : normalizedData.variant,
         prompt: normalizedData.prompt ?? task.prompt,
         cwd: task.cwd,
         category: normalizedData.category ?? task.category,
@@ -27130,13 +27155,23 @@ var TaskService = class {
       });
       const maxRetries = normalizedData.maxRetries ?? task.maxRetries ?? 3;
       const exhausted = task.status === "failed" && (task.retryCount ?? 0) > maxRetries;
-      return tx.update(tasks2).set({
+      const updated = tx.update(tasks2).set({
         ...normalizedData,
         ...exhausted ? {
           status: "dead_letter",
           retryAfter: null
         } : {}
       }).where(eq(tasks2.id, id)).returning().get() ?? null;
+      if (exhausted && updated) {
+        const finishedAt = /* @__PURE__ */ new Date();
+        tx.update(tasks2).set({
+          status: "dead_letter",
+          finishedAt,
+          retryAfter: null,
+          resultLog: `\u4F9D\u8D56\u4EFB\u52A1 #${id} \u5DF2\u8FDB\u5165\u4E0D\u53EF\u6062\u590D\u7EC8\u6001`
+        }).where(blockedDependentsOf(id)).run();
+      }
+      return updated;
     }, { behavior: "immediate" });
   }
   static validateNewTask(data) {
@@ -27157,7 +27192,7 @@ var TaskService = class {
       throw new Error(`${name} \u5FC5\u987B\u662F ${min} \u5230 ${max} \u4E4B\u95F4\u7684\u6574\u6570`);
     }
   }
-  static async next(scope = {}) {
+  static buildRunnableTaskWhere(scope) {
     const baseConditions = [...this.buildScopeWhere(scope)];
     const nowMs = Date.now();
     const retryAfterFilter = or(
@@ -27192,40 +27227,43 @@ var TaskService = class {
     if (batchFilter) {
       conditions.push(batchFilter);
     }
-    const result = await db.select().from(tasks2).where(and(
+    return and(
       ...conditions,
       or(
         isNull(tasks2.dependsOn),
         sql`EXISTS (
-                        SELECT 1 FROM tasks AS dependency_task
-                        WHERE dependency_task.id = ${tasks2.dependsOn}
-                          AND dependency_task.status = 'done'
-                          AND dependency_task.cwd IS ${tasks2.cwd}
-                    )`
+                    SELECT 1 FROM tasks AS dependency_task
+                    WHERE dependency_task.id = ${tasks2.dependsOn}
+                      AND dependency_task.status = 'done'
+                      AND dependency_task.cwd IS ${tasks2.cwd}
+                )`
       ),
       or(
         isNull(tasks2.batchId),
         sql`trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS}) = ''`,
         sql`NOT EXISTS (
-                        SELECT 1 FROM tasks AS running_batch_task
-                        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 (
-                                  SELECT 1 FROM task_runs AS running_batch_run
-                                  WHERE running_batch_run.task_id = running_batch_task.id
-                                    AND running_batch_run.status = 'running'
-                              )
+                    SELECT 1 FROM tasks AS running_batch_task
+                    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 (
+                              SELECT 1 FROM task_runs AS running_batch_run
+                              WHERE running_batch_run.task_id = running_batch_task.id
+                                AND running_batch_run.status = 'running'
                           )
-                        )`
+                      )
+                    )`
       ),
       sql`NOT EXISTS (
-                    SELECT 1 FROM task_runs AS candidate_active_run
-                    WHERE candidate_active_run.task_id = ${tasks2.id}
-                      AND candidate_active_run.status = 'running'
-                )`
-    )).orderBy(
+                SELECT 1 FROM task_runs AS candidate_active_run
+                WHERE candidate_active_run.task_id = ${tasks2.id}
+                  AND candidate_active_run.status = 'running'
+            )`
+    );
+  }
+  static async next(scope = {}) {
+    const result = await db.select().from(tasks2).where(this.buildRunnableTaskWhere(scope)).orderBy(
       desc(tasks2.urgency),
       desc(tasks2.importance),
       asc(tasks2.createdAt),
@@ -27233,6 +27271,22 @@ var TaskService = class {
     ).limit(1);
     return result[0] ?? null;
   }
+  static async claimNext(scope = {}) {
+    return db.transaction((tx) => {
+      const candidate = tx.select().from(tasks2).where(this.buildRunnableTaskWhere(scope)).orderBy(
+        desc(tasks2.urgency),
+        desc(tasks2.importance),
+        asc(tasks2.createdAt),
+        asc(tasks2.id)
+      ).limit(1).get();
+      if (!candidate) return null;
+      return tx.update(tasks2).set({
+        status: "running",
+        startedAt: /* @__PURE__ */ new Date(),
+        finishedAt: null
+      }).where(eq(tasks2.id, candidate.id)).returning().get() ?? null;
+    }, { behavior: "immediate" });
+  }
   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) {
@@ -27891,7 +27945,8 @@ var TaskTemplateService = class {
   static async create(data) {
     const normalizedData = {
       ...data,
-      batchId: normalizeTaskBatchId(data.batchId)
+      batchId: normalizeTaskBatchId(data.batchId),
+      variant: normalizeModelVariant(data.variant)
     };
     this.validate(normalizedData);
     const now = Date.now();
@@ -27957,7 +28012,8 @@ var TaskTemplateService = class {
   static async update(id, data) {
     const normalizedData = {
       ...data,
-      batchId: normalizeTaskBatchId(data.batchId) ?? null
+      batchId: normalizeTaskBatchId(data.batchId) ?? null,
+      ...data.variant === void 0 ? {} : { variant: normalizeModelVariant(data.variant) ?? null }
     };
     this.validate(normalizedData);
     const now = Date.now();
@@ -29604,6 +29660,7 @@ var SuperTaskPlugin = async () => {
           agent: tool.schema.string().trim().min(1).describe("\u6267\u884C\u7684 Agent \u540D\u79F0\uFF0C\u5982 localize-gen, course-gen"),
           prompt: tool.schema.string().trim().min(1).describe("\u53D1\u9001\u7ED9 Agent \u7684\u5B8C\u6574\u63D0\u793A\u8BCD"),
           model: tool.schema.string().optional().describe("\u4F7F\u7528\u7684\u6A21\u578B\uFF0C\u5982 gemini-2.5-pro"),
+          variant: tool.schema.string().trim().min(1).max(128).optional().describe("\u6A21\u578B variant\uFF0C\u5982 low\u3001high\u3001xhigh\uFF1B\u4EC5\u5728\u6A21\u578B\u652F\u6301\u65F6\u4F7F\u7528"),
           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"),
@@ -29624,6 +29681,7 @@ var SuperTaskPlugin = async () => {
               agent: args.agent,
               prompt: args.prompt,
               model: args.model,
+              variant: args.variant,
               category: args.category ?? "general",
               importance: args.importance ?? 3,
               urgency: args.urgency ?? 3,
@@ -29657,6 +29715,7 @@ var SuperTaskPlugin = async () => {
                 name: task.name,
                 agent: task.agent,
                 model: task.model,
+                variant: task.variant,
                 prompt: task.prompt,
                 cwd: task.cwd,
                 category: task.category,
@@ -29778,6 +29837,7 @@ var SuperTaskPlugin = async () => {
                 name: task.name,
                 agent: task.agent,
                 model: task.model,
+                variant: task.variant,
                 prompt: task.prompt,
                 cwd: task.cwd,
                 category: task.category,
@@ -29801,6 +29861,7 @@ var SuperTaskPlugin = async () => {
           agent: tool.schema.string().trim().min(1).describe("\u6267\u884C\u7684 Agent \u540D\u79F0"),
           prompt: tool.schema.string().trim().min(1).describe("\u53D1\u9001\u7ED9 Agent \u7684\u5B8C\u6574\u63D0\u793A\u8BCD"),
           model: tool.schema.string().optional().describe("\u4F7F\u7528\u7684\u6A21\u578B"),
+          variant: tool.schema.string().trim().min(1).max(128).optional().describe("\u6A21\u578B variant\uFF0C\u5982 low\u3001high\u3001xhigh\uFF1B\u4EC5\u5728\u6A21\u578B\u652F\u6301\u65F6\u4F7F\u7528"),
           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"),
@@ -29844,6 +29905,7 @@ var SuperTaskPlugin = async () => {
               agent: args.agent,
               prompt: args.prompt,
               model: args.model,
+              variant: args.variant,
               category: args.category ?? "general",
               importance: args.importance ?? 3,
               urgency: args.urgency ?? 3,