ima2-gen 1.1.21 → 1.1.22

package/lib/agentQueueStore.ts

@@ -1,270 +0,0 @@
-import { ulid } from "ulid";
-import { getDb } from "./db.js";
-import {
-  type AgentGenerationSettings,
-  type AgentQueueItem,
-  type AgentQueueStatus,
-  type AgentSlashCommand,
-  type AgentSessionRunSummary,
-} from "./agentTypes.js";
-import { DEFAULT_AGENT_GENERATION_SETTINGS, normalizeAgentGenerationSettings } from "./agentSettings.js";
-import { normalizeAgentGenerationPlan } from "./agentGenerationPlanner.js";
-
-type AgentQueueRow = {
-  id: string;
-  sessionId: string;
-  requestId: string;
-  prompt: string;
-  options: string;
-  toolPlan: string;
-  status: AgentQueueStatus;
-  position: number;
-  resultImageIds: string;
-  errorCode: string | null;
-  errorMessage: string | null;
-  createdAt: number;
-  startedAt: number | null;
-  finishedAt: number | null;
-};
-
-export type AgentQueueProjection = {
-  queueBySession: Record<string, AgentQueueItem[]>;
-  runSummaryBySession: Record<string, AgentSessionRunSummary>;
-};
-
-export type AgentQueueLimits = {
-  maxGlobalRunning: number;
-  maxSessionRunning: number;
-};
-
-export function createAgentQueueItem(input: {
-  sessionId: string;
-  prompt: string;
-  options?: unknown;
-  plan?: unknown;
-  command?: AgentSlashCommand | null;
-}) {
-  const t = Date.now();
-  const id = `aq_${ulid()}`;
-  const requestId = `agent_queue_${ulid()}`;
-  const options = normalizeAgentGenerationSettings(input.options);
-  const plan = input.plan
-    ? normalizeAgentGenerationPlan(input.prompt, input.plan, options)
-    : normalizeAgentGenerationPlan(input.prompt, { command: input.command }, options);
-  const position = getQueuedCount(input.sessionId) + 1;
-  getDb().prepare(`
-    INSERT INTO agent_queue_items
-      (id, session_id, request_id, prompt, options, tool_plan, status, position, result_image_ids, created_at)
-    VALUES (?, ?, ?, ?, ?, ?, 'queued', ?, '[]', ?)
-  `).run(id, input.sessionId, requestId, input.prompt, JSON.stringify(options), JSON.stringify(plan), position, t);
-  return getAgentQueueItem(id)!;
-}
-
-export function getAgentQueueItem(id: string) {
-  const row = getDb().prepare(`
-    SELECT
-      id,
-      session_id AS sessionId,
-      request_id AS requestId,
-      prompt,
-      options,
-      tool_plan AS toolPlan,
-      status,
-      position,
-      result_image_ids AS resultImageIds,
-      error_code AS errorCode,
-      error_message AS errorMessage,
-      created_at AS createdAt,
-      started_at AS startedAt,
-      finished_at AS finishedAt
-    FROM agent_queue_items
-    WHERE id = ?
-  `).get(id) as AgentQueueRow | undefined;
-  return row ? queueItemFromRow(row) : null;
-}
-
-export function listAgentQueueItems(sessionId?: string | null) {
-  const where = sessionId ? "WHERE session_id = ?" : "";
-  const rows = getDb().prepare(`
-    SELECT
-      id,
-      session_id AS sessionId,
-      request_id AS requestId,
-      prompt,
-      options,
-      tool_plan AS toolPlan,
-      status,
-      position,
-      result_image_ids AS resultImageIds,
-      error_code AS errorCode,
-      error_message AS errorMessage,
-      created_at AS createdAt,
-      started_at AS startedAt,
-      finished_at AS finishedAt
-    FROM agent_queue_items
-    ${where}
-    ORDER BY
-      CASE status WHEN 'running' THEN 0 WHEN 'queued' THEN 1 WHEN 'failed' THEN 2 ELSE 3 END,
-      created_at DESC
-    LIMIT 80
-  `).all(...(sessionId ? [sessionId] : [])) as AgentQueueRow[];
-  return rows.map(queueItemFromRow);
-}
-
-export function getAgentQueueProjection(sessionIds: readonly string[]): AgentQueueProjection {
-  const queueBySession: Record<string, AgentQueueItem[]> = {};
-  const runSummaryBySession: Record<string, AgentSessionRunSummary> = {};
-  for (const sessionId of sessionIds) {
-    const items = listAgentQueueItems(sessionId);
-    queueBySession[sessionId] = items;
-    runSummaryBySession[sessionId] = summarizeQueue(items);
-  }
-  return { queueBySession, runSummaryBySession };
-}
-
-export function claimNextAgentQueueItem(limits: AgentQueueLimits) {
-  if (countRunningItems() >= limits.maxGlobalRunning) return null;
-  const rows = getDb().prepare(`
-    SELECT
-      id,
-      session_id AS sessionId,
-      request_id AS requestId,
-      prompt,
-      options,
-      tool_plan AS toolPlan,
-      status,
-      position,
-      result_image_ids AS resultImageIds,
-      error_code AS errorCode,
-      error_message AS errorMessage,
-      created_at AS createdAt,
-      started_at AS startedAt,
-      finished_at AS finishedAt
-    FROM agent_queue_items
-    WHERE status = 'queued'
-    ORDER BY created_at ASC
-    LIMIT 20
-  `).all() as AgentQueueRow[];
-
-  for (const row of rows) {
-    if (countRunningItems(row.sessionId) >= limits.maxSessionRunning) continue;
-    const res = getDb().prepare(`
-      UPDATE agent_queue_items
-      SET status = 'running', started_at = ?, error_code = NULL, error_message = NULL
-      WHERE id = ? AND status = 'queued'
-    `).run(Date.now(), row.id);
-    if (res.changes > 0) return getAgentQueueItem(row.id);
-  }
-  return null;
-}
-
-export function completeAgentQueueItem(id: string, imageIds: readonly string[]) {
-  getDb().prepare(`
-    UPDATE agent_queue_items
-    SET status = 'succeeded',
-        result_image_ids = ?,
-        finished_at = ?,
-        error_code = NULL,
-        error_message = NULL
-    WHERE id = ?
-  `).run(JSON.stringify([...imageIds]), Date.now(), id);
-}
-
-export function failAgentQueueItem(id: string, error: { code?: string | null; message: string }) {
-  getDb().prepare(`
-    UPDATE agent_queue_items
-    SET status = 'failed',
-        error_code = ?,
-        error_message = ?,
-        finished_at = ?
-    WHERE id = ?
-  `).run(error.code ?? "AGENT_QUEUE_FAILED", error.message, Date.now(), id);
-}
-
-export function cancelAgentQueueItem(id: string) {
-  const res = getDb().prepare(`
-    UPDATE agent_queue_items
-    SET status = 'canceled', finished_at = ?
-    WHERE id = ? AND status = 'queued'
-  `).run(Date.now(), id);
-  return res.changes > 0;
-}
-
-export function retryAgentQueueItem(id: string) {
-  const res = getDb().prepare(`
-    UPDATE agent_queue_items
-    SET status = 'queued',
-        position = ?,
-        result_image_ids = '[]',
-        error_code = NULL,
-        error_message = NULL,
-        started_at = NULL,
-        finished_at = NULL
-    WHERE id = ? AND status IN ('failed', 'canceled')
-  `).run(getQueuedCount(null) + 1, id);
-  return res.changes > 0;
-}
-
-function queueItemFromRow(row: AgentQueueRow): AgentQueueItem {
-  const options = normalizeAgentGenerationSettings(parseJson(row.options, {}));
-  return {
-    id: row.id,
-    sessionId: row.sessionId,
-    requestId: row.requestId,
-    prompt: row.prompt,
-    status: row.status,
-    position: row.position,
-    resultImageIds: parseStringArray(row.resultImageIds),
-    errorCode: row.errorCode,
-    errorMessage: row.errorMessage,
-    createdAt: row.createdAt,
-    startedAt: row.startedAt,
-    finishedAt: row.finishedAt,
-    options,
-    plan: normalizeAgentGenerationPlan(row.prompt, parseJson(row.toolPlan, {}), options),
-  };
-}
-
-function summarizeQueue(items: readonly AgentQueueItem[]): AgentSessionRunSummary {
-  const queuedCount = items.filter((item) => item.status === "queued").length;
-  const runningCount = items.filter((item) => item.status === "running").length;
-  const failed = items.find((item) => item.status === "failed");
-  return {
-    status: runningCount > 0 ? "running" : queuedCount > 0 ? "queued" : failed ? "error" : "idle",
-    queuedCount,
-    runningCount,
-    lastQueueItemId: items[0]?.id ?? null,
-    lastError: failed?.errorMessage ?? null,
-  };
-}
-
-function getQueuedCount(sessionId: string | null) {
-  const row = sessionId
-    ? getDb().prepare("SELECT COUNT(*) AS count FROM agent_queue_items WHERE session_id = ? AND status = 'queued'").get(sessionId)
-    : getDb().prepare("SELECT COUNT(*) AS count FROM agent_queue_items WHERE status = 'queued'").get();
-  return Number((row as { count?: number } | undefined)?.count ?? 0);
-}
-
-function countRunningItems(sessionId?: string) {
-  const row = sessionId
-    ? getDb().prepare("SELECT COUNT(*) AS count FROM agent_queue_items WHERE session_id = ? AND status = 'running'").get(sessionId)
-    : getDb().prepare("SELECT COUNT(*) AS count FROM agent_queue_items WHERE status = 'running'").get();
-  return Number((row as { count?: number } | undefined)?.count ?? 0);
-}
-
-function parseJson(value: string, fallback: unknown) {
-  try {
-    return JSON.parse(value);
-  } catch {
-    return fallback;
-  }
-}
-
-function parseStringArray(value: string) {
-  const parsed = parseJson(value, []);
-  return Array.isArray(parsed) ? parsed.filter((item): item is string => typeof item === "string") : [];
-}
-
-export function getDefaultAgentQueueOptions(): AgentGenerationSettings {
-  return DEFAULT_AGENT_GENERATION_SETTINGS;
-}

package/lib/agentQueueWorker.ts

@@ -1,89 +0,0 @@
-import {
-  claimNextAgentQueueItem,
-  completeAgentQueueItem,
-  failAgentQueueItem,
-  getAgentQueueItem,
-  type AgentQueueLimits,
-} from "./agentQueueStore.js";
-import { runAgentGenerationPlan } from "./agentRuntime.js";
-import { errInfo } from "./errInfo.js";
-import { finishJob, setJobPhase, startJob } from "./inflight.js";
-import { logEvent } from "./logger.js";
-import type { RuntimeContext } from "./runtimeContext.js";
-
-const DEFAULT_LIMITS: AgentQueueLimits = {
-  maxGlobalRunning: 2,
-  maxSessionRunning: 1,
-};
-
-let workerTimer: NodeJS.Timeout | null = null;
-let ticking = false;
-
-export function ensureAgentQueueWorker(ctx: RuntimeContext) {
-  if (workerTimer) return;
-  workerTimer = setInterval(() => {
-    void tickAgentQueueWorker(ctx);
-  }, 1_500);
-  workerTimer.unref?.();
-  void tickAgentQueueWorker(ctx);
-}
-
-export async function tickAgentQueueWorker(ctx: RuntimeContext) {
-  if (ticking) return;
-  ticking = true;
-  try {
-    while (true) {
-      const item = claimNextAgentQueueItem(DEFAULT_LIMITS);
-      if (!item) return;
-      void runClaimedQueueItem(ctx, item.id).finally(() => {
-        void tickAgentQueueWorker(ctx);
-      });
-    }
-  } finally {
-    ticking = false;
-  }
-}
-
-async function runClaimedQueueItem(ctx: RuntimeContext, itemId: string) {
-  const item = getAgentQueueItem(itemId);
-  if (!item) return;
-  startJob({
-    requestId: item.requestId,
-    kind: "agent_queue",
-    prompt: item.prompt,
-    meta: {
-      sessionId: item.sessionId,
-      queueItemId: item.id,
-      variants: item.plan.plannedVariants,
-      parallelism: item.plan.plannedParallelism,
-      requestedVariants: item.plan.requestedVariants,
-    },
-  });
-  try {
-    logEvent("agent_queue", "start", { itemId: item.id, sessionId: item.sessionId });
-    setJobPhase(item.requestId, "streaming");
-    const result = await runAgentGenerationPlan(ctx, item.sessionId, item.prompt, item.plan, {
-      ...item.options,
-      requestId: item.requestId,
-      webSearchEnabled: item.options.webSearchEnabled,
-      parallelism: item.plan.plannedParallelism,
-    }, {
-      appendUserTurn: false,
-    });
-    completeAgentQueueItem(item.id, result.imageIds);
-    finishJob(item.requestId, {
-      status: "completed",
-      meta: { imageIds: result.imageIds },
-    });
-    logEvent("agent_queue", "finish", { itemId: item.id, imageCount: result.imageIds.length });
-  } catch (error) {
-    const err = errInfo(error);
-    failAgentQueueItem(item.id, { code: err.code, message: err.message });
-    finishJob(item.requestId, {
-      status: "failed",
-      errorCode: err.code,
-      meta: { queueItemId: item.id },
-    });
-    logEvent("agent_queue", "error", { itemId: item.id, code: err.code, message: err.message });
-  }
-}