stageflow 0.40.0 → 0.44.0

package/dist/runstore/sqlite/SqliteRunStore.js

@@ -9,10 +9,13 @@ import { parsePipelineDagSnapshot } from "../pipelineDagSnapshot.js";
 import { newRunId, runWorkspaceDir } from "../paths.js";
 import { attemptAgentDir, attemptArtifactsDir, stageDir, } from "../workspaceLayout.js";
 import { importDiskRunsIfEmpty } from "./migrateFromDisk.js";
+import * as evalStore from "./evalStore.js";
+import * as suggestionStore from "./suggestionStore.js";
 import { applyPendingMigrations, assertSchemaVersion, } from "./migrations/index.js";
 import { StoreSchemaError } from "./storeSchemaError.js";
 import { applyStorePragmas } from "./applyStorePragmas.js";
 import { RunSubmissionExistsError } from "../submission.js";
+import { nextFinishedAt } from "../runStatusClock.js";
 const EXECUTION_SELECT_COLS = `run_id, stage_id, attempt, status, verification_outcome, started_at, finished_at, envelope_json, cost_usd, usage_json, auto_resume_count`;
 const ensuredStageDirs = new Set();
 function executionFromRow(row) {
@@ -220,9 +223,9 @@ export class SqliteRunStore {
             }
             const inserted = this.db
                 .prepare(`INSERT INTO runs
-          (run_id, pipeline_id, task_id, task_yaml, status, created_at, updated_at, checkout_root, pipeline_dag_json, git_sha, ci_pr_url, ci_job_url, pipeline_path, task_path, project_root, repository, ref, resolved_sha, run_branch, git_author_name, git_author_email, pipeline_source, pipeline_body, caller_id, run_manifest, skip_gates, dispatch_key)
+          (run_id, pipeline_id, task_id, task_yaml, status, created_at, updated_at, checkout_root, pipeline_dag_json, git_sha, ci_pr_url, ci_job_url, pipeline_path, task_path, project_root, repository, ref, resolved_sha, run_branch, git_author_name, git_author_email, pipeline_source, pipeline_body, caller_id, origin, run_manifest, skip_gates, dispatch_key)
          VALUES
-          (@run_id, @pipeline_id, @task_id, @task_yaml, @status, @created_at, @updated_at, @checkout_root, @pipeline_dag_json, @git_sha, @ci_pr_url, @ci_job_url, @pipeline_path, @task_path, @project_root, @repository, @ref, @resolved_sha, @run_branch, @git_author_name, @git_author_email, @pipeline_source, @pipeline_body, @caller_id, @run_manifest, @skip_gates, @dispatch_key)
+          (@run_id, @pipeline_id, @task_id, @task_yaml, @status, @created_at, @updated_at, @checkout_root, @pipeline_dag_json, @git_sha, @ci_pr_url, @ci_job_url, @pipeline_path, @task_path, @project_root, @repository, @ref, @resolved_sha, @run_branch, @git_author_name, @git_author_email, @pipeline_source, @pipeline_body, @caller_id, @origin, @run_manifest, @skip_gates, @dispatch_key)
           ON CONFLICT(dispatch_key) DO NOTHING`)
                 .run({
                 run_id: runId,
@@ -252,6 +255,7 @@ export class SqliteRunStore {
                 pipeline_source: pipelineSource,
                 pipeline_body: pipelineBody,
                 caller_id: input.callerId ?? null,
+                origin: input.origin ?? null,
                 run_manifest: input.runManifest !== undefined
                     ? JSON.stringify(input.runManifest)
                     : null,
@@ -286,58 +290,57 @@ export class SqliteRunStore {
         await this.ready();
         return this.readSubmission(key);
     }
+    applyRunStatusUpdate(runId, status, expectedStatus) {
+        const now = new Date().toISOString();
+        const current = this.db
+            .prepare(`SELECT finished_at FROM runs WHERE run_id = ?`)
+            .get(runId);
+        if (current === undefined) {
+            throw new Error(`Run not found: ${runId}`);
+        }
+        const decision = nextFinishedAt({
+            nextStatus: status,
+            currentFinishedAt: current.finished_at,
+            now,
+        });
+        const params = {
+            run_id: runId,
+            status,
+            updated_at: now,
+        };
+        let finishedSql;
+        if (decision.action === "stamp") {
+            finishedSql = "finished_at = @finished_at";
+            params.finished_at = decision.finishedAt;
+        }
+        else if (decision.action === "clear") {
+            finishedSql = "finished_at = NULL";
+        }
+        else {
+            finishedSql = "finished_at = finished_at";
+        }
+        const expectedClause = expectedStatus !== undefined
+            ? " AND status = @expected_status"
+            : "";
+        if (expectedStatus !== undefined) {
+            params.expected_status = expectedStatus;
+        }
+        const result = this.db
+            .prepare(`UPDATE runs SET status = @status, updated_at = @updated_at, ${finishedSql}
+         WHERE run_id = @run_id${expectedClause}`)
+            .run(params);
+        return result.changes;
+    }
     async updateRunStatus(runId, status) {
         await this.ready();
-        const now = new Date().toISOString();
-        const isTerminal = status === "succeeded" || status === "failed" || status === "cancelled";
-        const result = isTerminal
-            ? this.db
-                .prepare(`UPDATE runs SET status = @status, updated_at = @updated_at,
-              finished_at = COALESCE(finished_at, @finished_at)
-             WHERE run_id = @run_id`)
-                .run({
-                run_id: runId,
-                status,
-                updated_at: now,
-                finished_at: now,
-            })
-            : this.db
-                .prepare(`UPDATE runs SET status = @status, updated_at = @updated_at WHERE run_id = @run_id`)
-                .run({
-                run_id: runId,
-                status,
-                updated_at: now,
-            });
-        if (result.changes === 0) {
+        if (this.applyRunStatusUpdate(runId, status, undefined) === 0) {
             throw new Error(`Run not found: ${runId}`);
         }
     }
     async tryUpdateRunStatus(runId, status, expectedStatus) {
         await this.ready();
-        const now = new Date().toISOString();
-        const isTerminal = status === "succeeded" || status === "failed" || status === "cancelled";
-        const result = isTerminal
-            ? this.db
-                .prepare(`UPDATE runs SET status = @status, updated_at = @updated_at,
-              finished_at = COALESCE(finished_at, @finished_at)
-             WHERE run_id = @run_id AND status = @expected_status`)
-                .run({
-                run_id: runId,
-                status,
-                expected_status: expectedStatus,
-                updated_at: now,
-                finished_at: now,
-            })
-            : this.db
-                .prepare(`UPDATE runs SET status = @status, updated_at = @updated_at
-             WHERE run_id = @run_id AND status = @expected_status`)
-                .run({
-                run_id: runId,
-                status,
-                expected_status: expectedStatus,
-                updated_at: now,
-            });
-        if (result.changes > 0)
+        const changes = this.applyRunStatusUpdate(runId, status, expectedStatus);
+        if (changes > 0)
             return true;
         const exists = this.db
             .prepare(`SELECT 1 AS ok FROM runs WHERE run_id = ?`)
@@ -854,9 +857,15 @@ export class SqliteRunStore {
             clauses.push("caller_id = ?");
             params.push(filter.caller_id);
         }
+        if (filter?.origin === "eval") {
+            clauses.push("origin = 'eval'");
+        }
+        else if (filter?.origin !== "any") {
+            clauses.push("origin IS NOT 'eval'");
+        }
         const where = clauses.length > 0 ? `WHERE ${clauses.join(" AND ")}` : "";
         const rows = this.db
-            .prepare(`SELECT run_id, pipeline_id, task_id, task_yaml, status, created_at, updated_at, checkout_root, pipeline_dag_json, git_sha, ci_pr_url, ci_job_url, pipeline_path, task_path, project_root, repository, ref, resolved_sha, run_branch, git_author_name, git_author_email, cancel_reason, finished_at, slimmed_at, disk_bytes, disk_measured_at, config_origins_json, pipeline_source, pipeline_body, caller_id, run_manifest, skip_gates
+            .prepare(`SELECT run_id, pipeline_id, task_id, task_yaml, status, created_at, updated_at, checkout_root, pipeline_dag_json, git_sha, ci_pr_url, ci_job_url, pipeline_path, task_path, project_root, repository, ref, resolved_sha, run_branch, git_author_name, git_author_email, cancel_reason, finished_at, slimmed_at, disk_bytes, disk_measured_at, config_origins_json, pipeline_source, pipeline_body, caller_id, origin, run_manifest, skip_gates
          FROM runs ${where} ORDER BY created_at DESC`)
             .all(...params);
         const summaries = [];
@@ -876,7 +885,7 @@ export class SqliteRunStore {
             .prepare(`SELECT r.run_id, r.pipeline_id, r.status, r.created_at, r.finished_at,
                 (SELECT SUM(e.cost_usd) FROM stage_executions e WHERE e.run_id = r.run_id) AS cost_usd
          FROM runs r
-         WHERE r.created_at >= ?
+         WHERE r.created_at >= ? AND r.origin IS NOT 'eval'
          ORDER BY r.created_at DESC`)
             .all(since);
         return rows.map((row) => ({
@@ -888,6 +897,90 @@ export class SqliteRunStore {
             ...(row.cost_usd != null ? { cost_usd: row.cost_usd } : {}),
         }));
     }
+    async createEvalRun(input) {
+        await this.ready();
+        return evalStore.createEvalRun(this.db, input);
+    }
+    async insertEvalCases(evalRunId, cases) {
+        await this.ready();
+        evalStore.insertEvalCases(this.db, evalRunId, cases);
+    }
+    async upsertEvalResult(result) {
+        await this.ready();
+        evalStore.upsertEvalResult(this.db, result);
+    }
+    async updateEvalRunProgress(evalRunId, progress) {
+        await this.ready();
+        evalStore.updateEvalRunProgress(this.db, evalRunId, progress);
+    }
+    async finishEvalRun(evalRunId, input) {
+        await this.ready();
+        evalStore.finishEvalRun(this.db, evalRunId, input);
+    }
+    async getEvalRun(evalRunId) {
+        await this.ready();
+        return evalStore.getEvalRun(this.db, evalRunId);
+    }
+    async getEvalRunByNumber(projectRoot, evalId, runNumber) {
+        await this.ready();
+        return evalStore.getEvalRunByNumber(this.db, projectRoot, evalId, runNumber);
+    }
+    async listEvalRuns(query) {
+        await this.ready();
+        return evalStore.listEvalRuns(this.db, query);
+    }
+    async listEvalResults(evalRunId) {
+        await this.ready();
+        return evalStore.listEvalResults(this.db, evalRunId);
+    }
+    async getEvalResultsForCase(evalRunId, caseId) {
+        await this.ready();
+        return evalStore.getEvalResultsForCase(this.db, evalRunId, caseId);
+    }
+    async getEvalCases(evalRunId) {
+        await this.ready();
+        return evalStore.getEvalCases(this.db, evalRunId);
+    }
+    async putEvalReview(evalRunId, caseId, repeatIndex, patch) {
+        await this.ready();
+        return evalStore.putEvalReview(this.db, evalRunId, caseId, repeatIndex, patch);
+    }
+    async getEvalReviews(evalRunId) {
+        await this.ready();
+        return evalStore.getEvalReviews(this.db, evalRunId);
+    }
+    async listFailureTypes(projectRoot, evalId) {
+        await this.ready();
+        return evalStore.listFailureTypes(this.db, projectRoot, evalId);
+    }
+    async recordGraderVersions(projectRoot, evalId, graders) {
+        await this.ready();
+        return evalStore.recordGraderVersions(this.db, projectRoot, evalId, graders);
+    }
+    async listEvalSubjectRefs(evalRunId, targetKind) {
+        await this.ready();
+        return evalStore.listEvalSubjectRefs(this.db, evalRunId, targetKind);
+    }
+    async upsertEvalSuggestions(evalRunId, inputs) {
+        await this.ready();
+        return suggestionStore.upsertEvalSuggestions(this.db, evalRunId, inputs);
+    }
+    async listEvalSuggestions(evalRunId, status) {
+        await this.ready();
+        return suggestionStore.listEvalSuggestions(this.db, evalRunId, status);
+    }
+    async dismissEvalSuggestions(evalRunId, ids) {
+        await this.ready();
+        return suggestionStore.dismissEvalSuggestions(this.db, evalRunId, ids);
+    }
+    async acceptEvalSuggestions(evalRunId, ids) {
+        await this.ready();
+        return suggestionStore.acceptEvalSuggestions(this.db, evalRunId, ids);
+    }
+    async deleteEvalRun(evalRunId) {
+        await this.ready();
+        return evalStore.deleteEvalRun(this.db, evalRunId);
+    }
     async ensureProject(absPath) {
         await this.ready();
         const resolved = path.resolve(absPath);
@@ -1450,6 +1543,7 @@ export class SqliteRunStore {
                 ? { pipeline_source: row.pipeline_source }
                 : {}),
             ...(row.caller_id != null ? { caller_id: row.caller_id } : {}),
+            ...(row.origin === "eval" ? { origin: "eval" } : {}),
             ...(row.run_manifest
                 ? { run_manifest: JSON.parse(row.run_manifest) }
                 : {}),
@@ -1464,7 +1558,7 @@ export class SqliteRunStore {
     }
     getRunRow(runId) {
         const row = this.db
-            .prepare(`SELECT run_id, pipeline_id, task_id, task_yaml, status, created_at, updated_at, checkout_root, pipeline_dag_json, git_sha, ci_pr_url, ci_job_url, pipeline_path, task_path, project_root, repository, ref, resolved_sha, run_branch, git_author_name, git_author_email, cancel_reason, finished_at, slimmed_at, disk_bytes, disk_measured_at, config_origins_json, pipeline_source, pipeline_body, caller_id, run_manifest, skip_gates
+            .prepare(`SELECT run_id, pipeline_id, task_id, task_yaml, status, created_at, updated_at, checkout_root, pipeline_dag_json, git_sha, ci_pr_url, ci_job_url, pipeline_path, task_path, project_root, repository, ref, resolved_sha, run_branch, git_author_name, git_author_email, cancel_reason, finished_at, slimmed_at, disk_bytes, disk_measured_at, config_origins_json, pipeline_source, pipeline_body, caller_id, origin, run_manifest, skip_gates
          FROM runs WHERE run_id = ?`)
             .get(runId);
         if (!row)

package/dist/runstore/sqlite/evalStore.d.ts

@@ -0,0 +1,20 @@
+import type Database from "better-sqlite3";
+import { type EvalTargetKind } from "../../evals/constants.js";
+import type { CreateEvalRunInput, EvalCaseInput, EvalCaseRow, EvalGraderVersionInput, EvalResultInput, EvalResultWithGrades, EvalReviewPatch, EvalReviewRow, EvalRunPage, EvalRunProgress, EvalRunRow, FinishEvalRunInput, ListEvalRunsQuery } from "../../evals/storeTypes.js";
+export declare function createEvalRun(db: Database.Database, input: CreateEvalRunInput): EvalRunRow;
+export declare function insertEvalCases(db: Database.Database, evalRunId: string, cases: EvalCaseInput[]): void;
+export declare function upsertEvalResult(db: Database.Database, input: EvalResultInput): void;
+export declare function updateEvalRunProgress(db: Database.Database, evalRunId: string, progress: EvalRunProgress): void;
+export declare function finishEvalRun(db: Database.Database, evalRunId: string, input: FinishEvalRunInput): void;
+export declare function getEvalRun(db: Database.Database, evalRunId: string): EvalRunRow | null;
+export declare function getEvalRunByNumber(db: Database.Database, projectRoot: string, evalId: string, runNumber: number): EvalRunRow | null;
+export declare function listEvalRuns(db: Database.Database, query: ListEvalRunsQuery): EvalRunPage;
+export declare function listEvalResults(db: Database.Database, evalRunId: string): EvalResultWithGrades[];
+export declare function getEvalResultsForCase(db: Database.Database, evalRunId: string, caseId: string): EvalResultWithGrades[];
+export declare function getEvalCases(db: Database.Database, evalRunId: string): EvalCaseRow[];
+export declare function putEvalReview(db: Database.Database, evalRunId: string, caseId: string, repeatIndex: number, patch: EvalReviewPatch): EvalReviewRow;
+export declare function getEvalReviews(db: Database.Database, evalRunId: string): EvalReviewRow[];
+export declare function listFailureTypes(db: Database.Database, projectRoot: string, evalId: string): string[];
+export declare function recordGraderVersions(db: Database.Database, projectRoot: string, evalId: string, graders: EvalGraderVersionInput[]): Record<string, number>;
+export declare function listEvalSubjectRefs(db: Database.Database, evalRunId: string, targetKind: EvalTargetKind): string[];
+export declare function deleteEvalRun(db: Database.Database, evalRunId: string): string[];