@hachej/boring-automation 0.1.79 → 0.1.80

package/dist/server/index.d.ts

@@ -172,6 +172,7 @@ interface BoringAutomationServerPluginOptions {
     store?: AutomationStore;
     dispatcherResolver?: WorkspaceAgentDispatcherResolver;
     actorResolver?: (request: FastifyRequest) => Promise<VerifiedAutomationActor> | VerifiedAutomationActor;
+    storeForRequest?: (request: FastifyRequest, actor: VerifiedAutomationActor) => Promise<AutomationStore> | AutomationStore;
 }
 declare function createBoringAutomationServerPlugin(options?: BoringAutomationServerPluginOptions): WorkspaceServerPlugin;
 declare function defaultBoringAutomationServerPlugin(options?: BoringAutomationServerPluginOptions, ctx?: Pick<WorkspaceAgentServerPluginContext, "workspaceRoot"> & Partial<Pick<WorkspaceAgentServerPluginContext, "trusted">>): WorkspaceServerPlugin;

package/dist/server/index.js

@@ -515,6 +515,162 @@ function clone(value) {
   return JSON.parse(JSON.stringify(value));
 }
 
+// src/server/postgresStore.ts
+import { randomUUID as randomUUID2 } from "crypto";
+var PostgresAutomationStore = class {
+  constructor(sql, actor, clock = () => /* @__PURE__ */ new Date()) {
+    this.sql = sql;
+    this.actor = actor;
+    this.clock = clock;
+  }
+  sql;
+  actor;
+  clock;
+  async listAutomations() {
+    const rows = await this.sql`
+      SELECT id, title, enabled, cron, timezone, model, prompt, created_at, updated_at
+      FROM boring_automation_automations
+      WHERE workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
+      ORDER BY created_at, id
+    `;
+    return rows.map(toAutomation);
+  }
+  async getAutomation(id) {
+    const rows = await this.sql`
+      SELECT id, title, enabled, cron, timezone, model, prompt, created_at, updated_at
+      FROM boring_automation_automations
+      WHERE id = ${id} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
+    `;
+    return rows[0] ? toAutomation(rows[0]) : null;
+  }
+  async createAutomation(input) {
+    const now = this.clock().toISOString();
+    const id = randomUUID2();
+    const prompt = input.prompt ?? "";
+    const rows = await this.sql`
+      INSERT INTO boring_automation_automations (id, workspace_id, owner_user_id, title, enabled, cron, timezone, model, prompt, created_at, updated_at)
+      VALUES (${id}, ${this.actor.workspaceId}, ${this.actor.userId}, ${input.title}, ${input.enabled ?? true}, ${input.cron}, ${input.timezone}, ${input.model}, ${prompt}, ${now}, ${now})
+      RETURNING id, title, enabled, cron, timezone, model, prompt, created_at, updated_at
+    `;
+    return toAutomation(rows[0]);
+  }
+  async updateAutomation(id, patch) {
+    const current = await this.getAutomation(id);
+    if (!current) throw automationNotFound(id);
+    const next = { ...current, ...patch, updatedAt: this.clock().toISOString() };
+    const rows = await this.sql`
+      UPDATE boring_automation_automations
+      SET title = ${next.title}, enabled = ${next.enabled}, cron = ${next.cron}, timezone = ${next.timezone}, model = ${next.model}, updated_at = ${next.updatedAt}
+      WHERE id = ${id} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
+      RETURNING id, title, enabled, cron, timezone, model, prompt, created_at, updated_at
+    `;
+    if (!rows[0]) throw automationNotFound(id);
+    return toAutomation(rows[0]);
+  }
+  async deleteAutomation(id) {
+    const result = await this.sql`
+      DELETE FROM boring_automation_automations
+      WHERE id = ${id} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
+    `;
+    if (result.count === 0) throw automationNotFound(id);
+  }
+  async getPrompt(automationId) {
+    const automation = await this.getAutomation(automationId);
+    if (!automation) throw automationNotFound(automationId);
+    const rows = await this.sql`
+      SELECT prompt FROM boring_automation_automations
+      WHERE id = ${automationId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
+    `;
+    return rows[0]?.prompt ?? "";
+  }
+  async updatePrompt(automationId, body) {
+    const result = await this.sql`
+      UPDATE boring_automation_automations SET prompt = ${body}, updated_at = ${this.clock().toISOString()}
+      WHERE id = ${automationId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
+    `;
+    if (result.count === 0) throw automationNotFound(automationId);
+  }
+  async reconcileOrphanedRuns(automationId) {
+    await this.sql`
+      UPDATE boring_automation_runs
+      SET status = 'failed', completed_at = ${this.clock().toISOString()}, error = 'Automation host restarted before the run completed', updated_at = ${this.clock().toISOString()}
+      WHERE automation_id = ${automationId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId} AND status IN ('queued', 'running')
+    `;
+  }
+  async beginRun(input) {
+    const automation = await this.getAutomation(input.automationId);
+    if (!automation) throw automationNotFound(input.automationId);
+    const active = await this.sql`
+      SELECT id FROM boring_automation_runs
+      WHERE automation_id = ${input.automationId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId} AND status IN ('queued', 'running')
+      LIMIT 1
+    `;
+    if (active[0]) throw runAlreadyActive(input.automationId);
+    try {
+      const now = input.createdAt ?? this.clock().toISOString();
+      const id = randomUUID2();
+      const rows = await this.sql`
+        INSERT INTO boring_automation_runs (id, automation_id, workspace_id, owner_user_id, session_id, status, trigger, scheduled_for, started_at, completed_at, duration_ms, input_tokens, output_tokens, total_tokens, prompt_snapshot, model_snapshot, error, created_at, updated_at)
+        VALUES (${id}, ${input.automationId}, ${this.actor.workspaceId}, ${this.actor.userId}, NULL, 'queued', ${input.trigger}, ${input.scheduledFor ?? null}, NULL, NULL, NULL, NULL, NULL, NULL, ${input.promptSnapshot}, ${input.modelSnapshot}, NULL, ${now}, ${now})
+        RETURNING *
+      `;
+      return toRun(rows[0]);
+    } catch (error) {
+      if (isUniqueViolation(error)) {
+        if (constraintName(error) === "boring_automation_runs_active_once_idx") throw runAlreadyActive(input.automationId);
+        if (input.trigger === "scheduled" && input.scheduledFor) throw runAlreadyRecorded(input.automationId, input.scheduledFor);
+      }
+      throw error;
+    }
+  }
+  async updateRunLifecycle(runId, patch) {
+    const current = await this.findRun(runId);
+    if (!current) throw runNotFound(runId);
+    const next = { ...current, ...patch, updatedAt: this.clock().toISOString() };
+    const rows = await this.sql`
+      UPDATE boring_automation_runs
+      SET session_id = ${next.sessionId}, status = ${next.status}, started_at = ${next.startedAt}, completed_at = ${next.completedAt}, duration_ms = ${next.durationMs}, input_tokens = ${next.inputTokens}, output_tokens = ${next.outputTokens}, total_tokens = ${next.totalTokens}, error = ${next.error}, updated_at = ${next.updatedAt}
+      WHERE id = ${runId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
+      RETURNING *
+    `;
+    if (!rows[0]) throw runNotFound(runId);
+    return toRun(rows[0]);
+  }
+  async listRuns(automationId) {
+    const rows = await this.sql`
+      SELECT * FROM boring_automation_runs
+      WHERE automation_id = ${automationId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
+      ORDER BY created_at DESC, id DESC
+    `;
+    return rows.map(toRun);
+  }
+  async findRun(runId) {
+    const rows = await this.sql`
+      SELECT * FROM boring_automation_runs
+      WHERE id = ${runId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
+    `;
+    return rows[0] ? toRun(rows[0]) : null;
+  }
+};
+function toAutomation(row) {
+  return { id: row.id, title: row.title, enabled: row.enabled, cron: row.cron, timezone: row.timezone, model: row.model, promptRef: `hosted:${row.id}`, createdAt: iso(row.created_at), updatedAt: iso(row.updated_at) };
+}
+function toRun(row) {
+  return { id: row.id, automationId: row.automation_id, sessionId: row.session_id, status: row.status, trigger: row.trigger, scheduledFor: nullableIso(row.scheduled_for), startedAt: nullableIso(row.started_at), completedAt: nullableIso(row.completed_at), durationMs: row.duration_ms, inputTokens: row.input_tokens, outputTokens: row.output_tokens, totalTokens: row.total_tokens, promptSnapshot: row.prompt_snapshot, modelSnapshot: row.model_snapshot, error: row.error, createdAt: iso(row.created_at), updatedAt: iso(row.updated_at) };
+}
+function iso(value) {
+  return value instanceof Date ? value.toISOString() : new Date(value).toISOString();
+}
+function nullableIso(value) {
+  return value === null ? null : iso(value);
+}
+function isUniqueViolation(error) {
+  return Boolean(error && typeof error === "object" && "code" in error && error.code === "23505");
+}
+function constraintName(error) {
+  return error && typeof error === "object" && "constraint_name" in error ? String(error.constraint_name) : void 0;
+}
+
 // src/server/manualRunExecutor.ts
 var ManualRunExecutor = class {
   constructor(options) {
@@ -934,172 +1090,25 @@ async function runBoringAutomationMigrations(sql) {
   `);
 }
 
-// src/server/postgresStore.ts
-import { randomUUID as randomUUID2 } from "crypto";
-var PostgresAutomationStore = class {
-  constructor(sql, actor, clock = () => /* @__PURE__ */ new Date()) {
-    this.sql = sql;
-    this.actor = actor;
-    this.clock = clock;
-  }
-  sql;
-  actor;
-  clock;
-  async listAutomations() {
-    const rows = await this.sql`
-      SELECT id, title, enabled, cron, timezone, model, prompt, created_at, updated_at
-      FROM boring_automation_automations
-      WHERE workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
-      ORDER BY created_at, id
-    `;
-    return rows.map(toAutomation);
-  }
-  async getAutomation(id) {
-    const rows = await this.sql`
-      SELECT id, title, enabled, cron, timezone, model, prompt, created_at, updated_at
-      FROM boring_automation_automations
-      WHERE id = ${id} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
-    `;
-    return rows[0] ? toAutomation(rows[0]) : null;
-  }
-  async createAutomation(input) {
-    const now = this.clock().toISOString();
-    const id = randomUUID2();
-    const prompt = input.prompt ?? "";
-    const rows = await this.sql`
-      INSERT INTO boring_automation_automations (id, workspace_id, owner_user_id, title, enabled, cron, timezone, model, prompt, created_at, updated_at)
-      VALUES (${id}, ${this.actor.workspaceId}, ${this.actor.userId}, ${input.title}, ${input.enabled ?? true}, ${input.cron}, ${input.timezone}, ${input.model}, ${prompt}, ${now}, ${now})
-      RETURNING id, title, enabled, cron, timezone, model, prompt, created_at, updated_at
-    `;
-    return toAutomation(rows[0]);
-  }
-  async updateAutomation(id, patch) {
-    const current = await this.getAutomation(id);
-    if (!current) throw automationNotFound(id);
-    const next = { ...current, ...patch, updatedAt: this.clock().toISOString() };
-    const rows = await this.sql`
-      UPDATE boring_automation_automations
-      SET title = ${next.title}, enabled = ${next.enabled}, cron = ${next.cron}, timezone = ${next.timezone}, model = ${next.model}, updated_at = ${next.updatedAt}
-      WHERE id = ${id} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
-      RETURNING id, title, enabled, cron, timezone, model, prompt, created_at, updated_at
-    `;
-    if (!rows[0]) throw automationNotFound(id);
-    return toAutomation(rows[0]);
-  }
-  async deleteAutomation(id) {
-    const result = await this.sql`
-      DELETE FROM boring_automation_automations
-      WHERE id = ${id} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
-    `;
-    if (result.count === 0) throw automationNotFound(id);
-  }
-  async getPrompt(automationId) {
-    const automation = await this.getAutomation(automationId);
-    if (!automation) throw automationNotFound(automationId);
-    const rows = await this.sql`
-      SELECT prompt FROM boring_automation_automations
-      WHERE id = ${automationId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
-    `;
-    return rows[0]?.prompt ?? "";
-  }
-  async updatePrompt(automationId, body) {
-    const result = await this.sql`
-      UPDATE boring_automation_automations SET prompt = ${body}, updated_at = ${this.clock().toISOString()}
-      WHERE id = ${automationId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
-    `;
-    if (result.count === 0) throw automationNotFound(automationId);
-  }
-  async reconcileOrphanedRuns(automationId) {
-    await this.sql`
-      UPDATE boring_automation_runs
-      SET status = 'failed', completed_at = ${this.clock().toISOString()}, error = 'Automation host restarted before the run completed', updated_at = ${this.clock().toISOString()}
-      WHERE automation_id = ${automationId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId} AND status IN ('queued', 'running')
-    `;
-  }
-  async beginRun(input) {
-    const automation = await this.getAutomation(input.automationId);
-    if (!automation) throw automationNotFound(input.automationId);
-    const active = await this.sql`
-      SELECT id FROM boring_automation_runs
-      WHERE automation_id = ${input.automationId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId} AND status IN ('queued', 'running')
-      LIMIT 1
-    `;
-    if (active[0]) throw runAlreadyActive(input.automationId);
-    try {
-      const now = input.createdAt ?? this.clock().toISOString();
-      const id = randomUUID2();
-      const rows = await this.sql`
-        INSERT INTO boring_automation_runs (id, automation_id, workspace_id, owner_user_id, session_id, status, trigger, scheduled_for, started_at, completed_at, duration_ms, input_tokens, output_tokens, total_tokens, prompt_snapshot, model_snapshot, error, created_at, updated_at)
-        VALUES (${id}, ${input.automationId}, ${this.actor.workspaceId}, ${this.actor.userId}, NULL, 'queued', ${input.trigger}, ${input.scheduledFor ?? null}, NULL, NULL, NULL, NULL, NULL, NULL, ${input.promptSnapshot}, ${input.modelSnapshot}, NULL, ${now}, ${now})
-        RETURNING *
-      `;
-      return toRun(rows[0]);
-    } catch (error) {
-      if (isUniqueViolation(error)) {
-        if (constraintName(error) === "boring_automation_runs_active_once_idx") throw runAlreadyActive(input.automationId);
-        if (input.trigger === "scheduled" && input.scheduledFor) throw runAlreadyRecorded(input.automationId, input.scheduledFor);
-      }
-      throw error;
-    }
-  }
-  async updateRunLifecycle(runId, patch) {
-    const current = await this.findRun(runId);
-    if (!current) throw runNotFound(runId);
-    const next = { ...current, ...patch, updatedAt: this.clock().toISOString() };
-    const rows = await this.sql`
-      UPDATE boring_automation_runs
-      SET session_id = ${next.sessionId}, status = ${next.status}, started_at = ${next.startedAt}, completed_at = ${next.completedAt}, duration_ms = ${next.durationMs}, input_tokens = ${next.inputTokens}, output_tokens = ${next.outputTokens}, total_tokens = ${next.totalTokens}, error = ${next.error}, updated_at = ${next.updatedAt}
-      WHERE id = ${runId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
-      RETURNING *
-    `;
-    if (!rows[0]) throw runNotFound(runId);
-    return toRun(rows[0]);
-  }
-  async listRuns(automationId) {
-    const rows = await this.sql`
-      SELECT * FROM boring_automation_runs
-      WHERE automation_id = ${automationId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
-      ORDER BY created_at DESC, id DESC
-    `;
-    return rows.map(toRun);
-  }
-  async findRun(runId) {
-    const rows = await this.sql`
-      SELECT * FROM boring_automation_runs
-      WHERE id = ${runId} AND workspace_id = ${this.actor.workspaceId} AND owner_user_id = ${this.actor.userId}
-    `;
-    return rows[0] ? toRun(rows[0]) : null;
-  }
-};
-function toAutomation(row) {
-  return { id: row.id, title: row.title, enabled: row.enabled, cron: row.cron, timezone: row.timezone, model: row.model, promptRef: `hosted:${row.id}`, createdAt: iso(row.created_at), updatedAt: iso(row.updated_at) };
-}
-function toRun(row) {
-  return { id: row.id, automationId: row.automation_id, sessionId: row.session_id, status: row.status, trigger: row.trigger, scheduledFor: nullableIso(row.scheduled_for), startedAt: nullableIso(row.started_at), completedAt: nullableIso(row.completed_at), durationMs: row.duration_ms, inputTokens: row.input_tokens, outputTokens: row.output_tokens, totalTokens: row.total_tokens, promptSnapshot: row.prompt_snapshot, modelSnapshot: row.model_snapshot, error: row.error, createdAt: iso(row.created_at), updatedAt: iso(row.updated_at) };
-}
-function iso(value) {
-  return value instanceof Date ? value.toISOString() : new Date(value).toISOString();
-}
-function nullableIso(value) {
-  return value === null ? null : iso(value);
-}
-function isUniqueViolation(error) {
-  return Boolean(error && typeof error === "object" && "code" in error && error.code === "23505");
-}
-function constraintName(error) {
-  return error && typeof error === "object" && "constraint_name" in error ? String(error.constraint_name) : void 0;
-}
-
 // src/server/index.ts
 function createBoringAutomationServerPlugin(options = {}) {
   const store = options.store ?? createDefaultStore(options.workspaceRoot);
-  const manualRunExecutor = options.dispatcherResolver && options.actorResolver ? new ManualRunExecutor({ store, dispatcherResolver: options.dispatcherResolver, actorResolver: options.actorResolver }) : void 0;
-  const dueRunService = manualRunExecutor ? new DueRunService({ store, executor: manualRunExecutor }) : void 0;
+  const manualRunExecutor = options.dispatcherResolver && options.actorResolver ? new ManualRunExecutor({
+    store,
+    storeForRequest: options.storeForRequest,
+    dispatcherResolver: options.dispatcherResolver,
+    actorResolver: options.actorResolver
+  }) : void 0;
+  const dueRunService = manualRunExecutor && !options.storeForRequest ? new DueRunService({ store, executor: manualRunExecutor }) : void 0;
   return defineServerPlugin({
     id: BORING_AUTOMATION_PLUGIN_ID,
     label: BORING_AUTOMATION_PLUGIN_LABEL,
     routes: async (app) => {
-      await automationRoutes(app, { store, manualRunExecutor, dueRunService });
+      await automationRoutes(app, { store, storeForRequest: options.storeForRequest ? async (request) => {
+        const actor = options.actorResolver ? await options.actorResolver(request) : void 0;
+        if (!actor) throw new Error("automation actor resolver is unavailable");
+        return await options.storeForRequest(request, actor);
+      } : void 0, manualRunExecutor, dueRunService });
     }
   });
 }
@@ -1109,6 +1118,17 @@ function createDefaultStore(workspaceRoot) {
 }
 function defaultBoringAutomationServerPlugin(options, ctx) {
   const trusted = ctx?.trusted;
+  if (!options?.store && trusted?.sql && trusted.workspaceAgentDispatcherResolver && trusted.actorResolver) {
+    const sql = trusted.sql;
+    const fallbackStore = new PostgresAutomationStore(sql, { workspaceId: "unbound", userId: "unbound" });
+    return createBoringAutomationServerPlugin({
+      ...options,
+      store: fallbackStore,
+      storeForRequest: async (_request, actor) => new PostgresAutomationStore(sql, actor),
+      dispatcherResolver: options?.dispatcherResolver ?? trusted.workspaceAgentDispatcherResolver,
+      actorResolver: options?.actorResolver ?? trusted.actorResolver
+    });
+  }
   return createBoringAutomationServerPlugin({
     ...options,
     workspaceRoot: options?.workspaceRoot ?? ctx?.workspaceRoot,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hachej/boring-automation",
-  "version": "0.1.79",
+  "version": "0.1.80",
   "type": "module",
   "private": false,
   "license": "MIT",
@@ -43,14 +43,14 @@
     "fastify": "^5.9.0",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
-    "@hachej/boring-workspace": "0.1.79"
+    "@hachej/boring-workspace": "0.1.80"
   },
   "dependencies": {
     "croner": "^10.0.1",
     "lucide-react": "^1.21.0",
     "postgres": "^3.4.7",
     "zod": "^3.23.0",
-    "@hachej/boring-ui-kit": "0.1.79"
+    "@hachej/boring-ui-kit": "0.1.80"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.9.1",
@@ -66,7 +66,7 @@
     "tsup": "^8.4.0",
     "typescript": "~6.0.3",
     "vitest": "^4.1.9",
-    "@hachej/boring-workspace": "0.1.79"
+    "@hachej/boring-workspace": "0.1.80"
   },
   "peerDependenciesMeta": {
     "fastify": {