patchrelay 0.8.8 → 0.9.0

package/dist/config.js

@@ -7,32 +7,6 @@ import { ensureAbsolutePath } from "./utils.js";
 const LINEAR_OAUTH_CALLBACK_PATH = "/oauth/linear/callback";
 const REPO_SETTINGS_DIRNAME = ".patchrelay";
 const REPO_SETTINGS_FILENAME = "project.json";
-const workflowSchema = z.object({
-    id: z.string().min(1),
-    when_state: z.string().min(1),
-    active_state: z.string().min(1),
-    workflow_file: z.string().min(1),
-    fallback_state: z.string().min(1).nullable().optional(),
-});
-const workflowDefinitionSchema = z.object({
-    id: z.string().min(1),
-    stages: z.array(workflowSchema).min(1),
-});
-const workflowSelectionSchema = z.object({
-    default_workflow: z.string().min(1).optional(),
-    by_label: z
-        .array(z.object({
-        label: z.string().min(1),
-        workflow: z.string().min(1),
-    }))
-        .default([]),
-});
-const workflowLabelsSchema = z
-    .object({
-    working: z.string().min(1).optional(),
-    awaiting_handoff: z.string().min(1).optional(),
-})
-    .optional();
 const trustedActorsSchema = z
     .object({
     ids: z.array(z.string().min(1)).default([]),
@@ -42,11 +16,6 @@ const trustedActorsSchema = z
 })
     .optional();
 const repoSettingsSchema = z.object({
-    workflows: z.array(workflowSchema).min(1).optional(),
-    workflow_definitions: z.array(workflowDefinitionSchema).min(1).optional(),
-    workflow_selection: workflowSelectionSchema.optional(),
-    workflow_labels: workflowLabelsSchema,
-    trusted_actors: trustedActorsSchema,
     trigger_events: z.array(z.string().min(1)).min(1).optional(),
     branch_prefix: z.string().min(1).optional(),
 });
@@ -54,16 +23,16 @@ const projectSchema = z.object({
     id: z.string().min(1),
     repo_path: z.string().min(1),
     worktree_root: z.string().min(1).optional(),
-    workflows: z.array(workflowSchema).min(1).optional(),
-    workflow_definitions: z.array(workflowDefinitionSchema).min(1).optional(),
-    workflow_selection: workflowSelectionSchema.optional(),
-    workflow_labels: workflowLabelsSchema,
     trusted_actors: trustedActorsSchema,
     issue_key_prefixes: z.array(z.string().min(1)).default([]),
     linear_team_ids: z.array(z.string().min(1)).default([]),
     allow_labels: z.array(z.string().min(1)).default([]),
     trigger_events: z.array(z.string().min(1)).min(1).optional(),
     branch_prefix: z.string().min(1).optional(),
+    github: z.object({
+        webhook_secret: z.string().min(1).optional(),
+        repo_full_name: z.string().min(1).optional(),
+    }).optional(),
 });
 const configSchema = z.object({
     server: z.object({
@@ -75,6 +44,7 @@ const configSchema = z.object({
     }),
     ingress: z.object({
         linear_webhook_path: z.string().default("/webhooks/linear"),
+        github_webhook_path: z.string().default("/webhooks/github"),
         max_body_bytes: z.number().int().positive().default(262144),
         max_timestamp_skew_seconds: z.number().int().positive().default(60),
     }),
@@ -151,42 +121,6 @@ function normalizeTriggerEvents(actor, configured) {
     });
     return [...required, ...extras];
 }
-const builtinWorkflows = [
-    {
-        id: "development",
-        when_state: "Start",
-        active_state: "Implementing",
-        workflow_file: "IMPLEMENTATION_WORKFLOW.md",
-        fallback_state: "Human Needed",
-    },
-    {
-        id: "review",
-        when_state: "Review",
-        active_state: "Reviewing",
-        workflow_file: "REVIEW_WORKFLOW.md",
-        fallback_state: "Human Needed",
-    },
-    {
-        id: "deploy",
-        when_state: "Deploy",
-        active_state: "Deploying",
-        workflow_file: "DEPLOY_WORKFLOW.md",
-        fallback_state: "Human Needed",
-    },
-    {
-        id: "cleanup",
-        when_state: "Cleanup",
-        active_state: "Cleaning Up",
-        workflow_file: "CLEANUP_WORKFLOW.md",
-        fallback_state: "Human Needed",
-    },
-];
-const builtinWorkflowDefinitions = [
-    {
-        id: "default",
-        stages: builtinWorkflows,
-    },
-];
 function withSectionDefaults(input) {
     const source = input && typeof input === "object" ? input : {};
     const { linear: _linear, runner: _runner, ...rest } = source;
@@ -283,9 +217,6 @@ function readEnvFilesForProfile(configPath, profile) {
     const paths = getEnvFilesForProfile(configPath, profile);
     return Object.assign({}, ...paths.map((envPath) => readEnvFile(envPath)));
 }
-function resolveWorkflowFilePath(repoPath, workflowFile) {
-    return path.isAbsolute(workflowFile) ? ensureAbsolutePath(workflowFile) : path.resolve(repoPath, workflowFile);
-}
 function parseJsonFile(filePath, label) {
     const raw = readFileSync(filePath, "utf8");
     try {
@@ -309,49 +240,6 @@ function readRepoSettings(repoPath, env) {
         configPath,
     };
 }
-function mergeWorkflowStages(repoPath, workflows) {
-    return workflows.map((workflow) => ({
-        id: workflow.id,
-        whenState: workflow.when_state,
-        activeState: workflow.active_state,
-        workflowFile: resolveWorkflowFilePath(repoPath, workflow.workflow_file),
-        ...(workflow.fallback_state ? { fallbackState: workflow.fallback_state } : {}),
-    }));
-}
-function mergeWorkflowDefinitions(repoPath, definitions) {
-    return definitions.map((definition) => ({
-        id: definition.id,
-        stages: mergeWorkflowStages(repoPath, definition.stages),
-    }));
-}
-function resolveProjectWorkflowConfig(repoPath, project, repoSettings) {
-    const selectedDefinitions = repoSettings?.workflow_definitions ??
-        project.workflow_definitions ??
-        (repoSettings?.workflows
-            ? [{ id: "default", stages: repoSettings.workflows }]
-            : project.workflows
-                ? [{ id: "default", stages: project.workflows }]
-                : builtinWorkflowDefinitions.map((definition) => ({ id: definition.id, stages: [...definition.stages] })));
-    const workflowDefinitions = mergeWorkflowDefinitions(repoPath, selectedDefinitions);
-    const selectionSource = repoSettings?.workflow_selection ?? project.workflow_selection;
-    const defaultWorkflowId = selectionSource?.default_workflow ?? workflowDefinitions[0]?.id;
-    const workflows = workflowDefinitions.find((definition) => definition.id === defaultWorkflowId)?.stages ?? workflowDefinitions[0]?.stages ?? [];
-    return {
-        workflows,
-        ...(workflowDefinitions.length > 0 ? { workflowDefinitions } : {}),
-        ...(defaultWorkflowId || (selectionSource?.by_label?.length ?? 0) > 0
-            ? {
-                workflowSelection: {
-                    ...(defaultWorkflowId ? { defaultWorkflowId } : {}),
-                    byLabel: (selectionSource?.by_label ?? []).map((entry) => ({
-                        label: entry.label,
-                        workflowId: entry.workflow,
-                    })),
-                },
-            }
-            : {}),
-    };
-}
 function defaultWorktreeRoot(projectId) {
     return path.join(getPatchRelayDataDir(), "worktrees", projectId);
 }
@@ -427,6 +315,7 @@ export function loadConfig(configPath = process.env.PATCHRELAY_CONFIG ?? getDefa
         },
         ingress: {
             linearWebhookPath: parsed.ingress.linear_webhook_path,
+            githubWebhookPath: parsed.ingress.github_webhook_path,
             maxBodyBytes: parsed.ingress.max_body_bytes,
             maxTimestampSkewSeconds: parsed.ingress.max_timestamp_skew_seconds,
         },
@@ -478,24 +367,11 @@ export function loadConfig(configPath = process.env.PATCHRELAY_CONFIG ?? getDefa
         projects: parsed.projects.map((project) => {
             const repoPath = ensureAbsolutePath(project.repo_path);
             const repoSettings = readRepoSettings(repoPath, env);
-            const workflowConfig = resolveProjectWorkflowConfig(repoPath, project, repoSettings);
-            const workflowLabels = repoSettings?.workflow_labels ?? project.workflow_labels;
-            const trustedActors = repoSettings?.trusted_actors ?? project.trusted_actors;
+            const trustedActors = project.trusted_actors;
             return {
                 id: project.id,
                 repoPath,
                 worktreeRoot: ensureAbsolutePath(project.worktree_root ?? defaultWorktreeRoot(project.id)),
-                workflows: workflowConfig.workflows,
-                ...(workflowConfig.workflowDefinitions ? { workflowDefinitions: workflowConfig.workflowDefinitions } : {}),
-                ...(workflowConfig.workflowSelection ? { workflowSelection: workflowConfig.workflowSelection } : {}),
-                ...(workflowLabels
-                    ? {
-                        workflowLabels: {
-                            ...(workflowLabels.working ? { working: workflowLabels.working } : {}),
-                            ...(workflowLabels.awaiting_handoff ? { awaitingHandoff: workflowLabels.awaiting_handoff } : {}),
-                        },
-                    }
-                    : {}),
                 ...(trustedActors
                     ? {
                         trustedActors: {
@@ -513,6 +389,12 @@ export function loadConfig(configPath = process.env.PATCHRELAY_CONFIG ?? getDefa
                     project.trigger_events),
                 branchPrefix: repoSettings?.branch_prefix ?? project.branch_prefix ?? defaultBranchPrefix(project.id),
                 ...(repoSettings?.configPath ? { repoSettingsPath: repoSettings.configPath } : {}),
+                ...(project.github ? {
+                    github: {
+                        ...(project.github.webhook_secret ? { webhookSecret: project.github.webhook_secret } : {}),
+                        ...(project.github.repo_full_name ? { repoFullName: project.github.repo_full_name } : {}),
+                    },
+                } : {}),
             };
         }),
     };
@@ -578,41 +460,6 @@ function validateConfigSemantics(config, options) {
             }
             linearTeamIds.set(teamId, project.id);
         }
-        const workflowDefinitions = project.workflowDefinitions ?? [{ id: "default", stages: project.workflows }];
-        const definitionIds = new Set();
-        for (const definition of workflowDefinitions) {
-            const normalizedDefinitionId = definition.id.trim().toLowerCase();
-            if (definitionIds.has(normalizedDefinitionId)) {
-                throw new Error(`Workflow definition "${definition.id}" is configured more than once in project ${project.id}`);
-            }
-            definitionIds.add(normalizedDefinitionId);
-            const workflowIds = new Set();
-            const workflowStates = new Set();
-            for (const workflow of definition.stages) {
-                const normalizedWorkflowId = workflow.id.trim().toLowerCase();
-                if (workflowIds.has(normalizedWorkflowId)) {
-                    throw new Error(`Workflow id "${workflow.id}" is configured more than once in project ${project.id}`);
-                }
-                workflowIds.add(normalizedWorkflowId);
-                const normalizedState = workflow.whenState.trim().toLowerCase();
-                if (workflowStates.has(normalizedState)) {
-                    throw new Error(`Linear state "${workflow.whenState}" is configured for more than one workflow in project ${project.id}`);
-                }
-                workflowStates.add(normalizedState);
-            }
-        }
-        if (project.workflowSelection?.defaultWorkflowId) {
-            const normalizedDefaultWorkflowId = project.workflowSelection.defaultWorkflowId.trim().toLowerCase();
-            if (!workflowDefinitions.some((definition) => definition.id.trim().toLowerCase() === normalizedDefaultWorkflowId)) {
-                throw new Error(`Default workflow "${project.workflowSelection.defaultWorkflowId}" does not exist in project ${project.id}`);
-            }
-        }
-        for (const rule of project.workflowSelection?.byLabel ?? []) {
-            const normalizedWorkflowId = rule.workflowId.trim().toLowerCase();
-            if (!workflowDefinitions.some((definition) => definition.id.trim().toLowerCase() === normalizedWorkflowId)) {
-                throw new Error(`Workflow selection for label "${rule.label}" points to unknown workflow "${rule.workflowId}" in project ${project.id}`);
-            }
-        }
     }
     if (config.operatorApi.enabled &&
         config.server.bind !== "127.0.0.1" &&

package/dist/db/migrations.js

@@ -1,151 +1,67 @@
-const baseMigration = `
-CREATE TABLE IF NOT EXISTS webhook_events (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  webhook_id TEXT NOT NULL UNIQUE,
-  received_at TEXT NOT NULL,
-  event_type TEXT NOT NULL,
-  issue_id TEXT,
-  project_id TEXT,
-  headers_json TEXT NOT NULL,
-  payload_json TEXT NOT NULL,
-  signature_valid INTEGER NOT NULL,
-  dedupe_status TEXT NOT NULL,
-  processing_status TEXT NOT NULL DEFAULT 'pending'
-);
-
-CREATE TABLE IF NOT EXISTS event_receipts (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  source TEXT NOT NULL,
-  external_id TEXT NOT NULL,
-  event_type TEXT NOT NULL,
-  received_at TEXT NOT NULL,
-  acceptance_status TEXT NOT NULL,
-  processing_status TEXT NOT NULL DEFAULT 'pending',
-  project_id TEXT,
-  linear_issue_id TEXT,
-  headers_json TEXT,
-  payload_json TEXT,
-  UNIQUE(source, external_id)
-);
-
-CREATE TABLE IF NOT EXISTS issue_control (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  project_id TEXT NOT NULL,
-  linear_issue_id TEXT NOT NULL,
-  selected_workflow_id TEXT,
-  desired_stage TEXT,
-  desired_receipt_id INTEGER,
-  active_run_lease_id INTEGER,
-  active_workspace_ownership_id INTEGER,
-  service_owned_comment_id TEXT,
-  active_agent_session_id TEXT,
-  lifecycle_status TEXT NOT NULL,
-  updated_at TEXT NOT NULL,
-  UNIQUE(project_id, linear_issue_id)
-);
-
-CREATE TABLE IF NOT EXISTS issue_projection (
+const schema = `
+CREATE TABLE IF NOT EXISTS issues (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   project_id TEXT NOT NULL,
   linear_issue_id TEXT NOT NULL,
   issue_key TEXT,
   title TEXT,
-  issue_url TEXT,
+  url TEXT,
   current_linear_state TEXT,
-  last_webhook_at TEXT,
-  updated_at TEXT NOT NULL,
-  UNIQUE(project_id, linear_issue_id)
-);
-
-CREATE TABLE IF NOT EXISTS workspace_ownership (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  project_id TEXT NOT NULL,
-  linear_issue_id TEXT NOT NULL,
-  branch_name TEXT NOT NULL,
-  worktree_path TEXT NOT NULL,
-  status TEXT NOT NULL,
-  current_run_lease_id INTEGER,
-  created_at TEXT NOT NULL,
+  factory_state TEXT NOT NULL DEFAULT 'delegated',
+  pending_run_type TEXT,
+  pending_run_context_json TEXT,
+  branch_name TEXT,
+  worktree_path TEXT,
+  thread_id TEXT,
+  active_run_id INTEGER,
+  status_comment_id TEXT,
+  agent_session_id TEXT,
+  pr_number INTEGER,
+  pr_url TEXT,
+  pr_state TEXT,
+  pr_review_state TEXT,
+  pr_check_status TEXT,
+  ci_repair_attempts INTEGER NOT NULL DEFAULT 0,
+  queue_repair_attempts INTEGER NOT NULL DEFAULT 0,
   updated_at TEXT NOT NULL,
   UNIQUE(project_id, linear_issue_id)
 );
 
-CREATE TABLE IF NOT EXISTS run_leases (
+CREATE TABLE IF NOT EXISTS runs (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
-  issue_control_id INTEGER NOT NULL,
+  issue_id INTEGER NOT NULL REFERENCES issues(id),
   project_id TEXT NOT NULL,
   linear_issue_id TEXT NOT NULL,
-  workspace_ownership_id INTEGER NOT NULL,
-  stage TEXT NOT NULL,
+  run_type TEXT NOT NULL DEFAULT 'implementation',
   status TEXT NOT NULL,
-  trigger_receipt_id INTEGER,
-  workflow_file TEXT NOT NULL DEFAULT '',
-  prompt_text TEXT NOT NULL DEFAULT '',
+  prompt_text TEXT,
   thread_id TEXT,
-  parent_thread_id TEXT,
   turn_id TEXT,
-  started_at TEXT NOT NULL,
-  ended_at TEXT,
+  parent_thread_id TEXT,
+  summary_json TEXT,
+  report_json TEXT,
   failure_reason TEXT,
-  FOREIGN KEY(issue_control_id) REFERENCES issue_control(id) ON DELETE CASCADE,
-  FOREIGN KEY(workspace_ownership_id) REFERENCES workspace_ownership(id) ON DELETE CASCADE,
-  FOREIGN KEY(trigger_receipt_id) REFERENCES event_receipts(id) ON DELETE SET NULL
+  started_at TEXT NOT NULL,
+  ended_at TEXT
 );
 
-CREATE TABLE IF NOT EXISTS issue_sessions (
+CREATE TABLE IF NOT EXISTS webhook_events (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
-  project_id TEXT NOT NULL,
-  linear_issue_id TEXT NOT NULL,
-  workspace_ownership_id INTEGER NOT NULL,
-  run_lease_id INTEGER,
-  thread_id TEXT NOT NULL UNIQUE,
-  parent_thread_id TEXT,
-  source TEXT NOT NULL,
-  linked_agent_session_id TEXT,
-  created_at TEXT NOT NULL,
-  updated_at TEXT NOT NULL,
-  last_opened_at TEXT,
-  FOREIGN KEY(workspace_ownership_id) REFERENCES workspace_ownership(id) ON DELETE CASCADE,
-  FOREIGN KEY(run_lease_id) REFERENCES run_leases(id) ON DELETE SET NULL
-);
-
-CREATE TABLE IF NOT EXISTS run_reports (
-  run_lease_id INTEGER PRIMARY KEY,
-  summary_json TEXT,
-  report_json TEXT,
-  created_at TEXT NOT NULL,
-  updated_at TEXT NOT NULL,
-  FOREIGN KEY(run_lease_id) REFERENCES run_leases(id) ON DELETE CASCADE
+  webhook_id TEXT NOT NULL UNIQUE,
+  received_at TEXT NOT NULL,
+  project_id TEXT,
+  payload_json TEXT,
+  processing_status TEXT NOT NULL DEFAULT 'pending'
 );
 
 CREATE TABLE IF NOT EXISTS run_thread_events (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
-  run_lease_id INTEGER NOT NULL,
+  run_id INTEGER NOT NULL,
   thread_id TEXT NOT NULL,
   turn_id TEXT,
   method TEXT NOT NULL,
   event_json TEXT NOT NULL,
-  created_at TEXT NOT NULL,
-  FOREIGN KEY(run_lease_id) REFERENCES run_leases(id) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS obligations (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  project_id TEXT NOT NULL,
-  linear_issue_id TEXT NOT NULL,
-  kind TEXT NOT NULL,
-  status TEXT NOT NULL,
-  source TEXT NOT NULL,
-  payload_json TEXT NOT NULL,
-  run_lease_id INTEGER,
-  thread_id TEXT,
-  turn_id TEXT,
-  dedupe_key TEXT,
-  last_error TEXT,
-  created_at TEXT NOT NULL,
-  updated_at TEXT NOT NULL,
-  completed_at TEXT,
-  FOREIGN KEY(run_lease_id) REFERENCES run_leases(id) ON DELETE SET NULL
+  created_at TEXT NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS linear_installations (
@@ -195,44 +111,20 @@ CREATE TABLE IF NOT EXISTS operator_feed_events (
   issue_key TEXT,
   project_id TEXT,
   stage TEXT,
-  status TEXT,
-  workflow_id TEXT,
-  next_stage TEXT
+  status TEXT
 );
 
-CREATE INDEX IF NOT EXISTS idx_event_receipts_project_issue ON event_receipts(project_id, linear_issue_id);
-CREATE INDEX IF NOT EXISTS idx_issue_control_ready ON issue_control(desired_stage, active_run_lease_id);
-CREATE INDEX IF NOT EXISTS idx_issue_projection_issue_key ON issue_projection(issue_key);
-CREATE INDEX IF NOT EXISTS idx_issue_sessions_issue ON issue_sessions(project_id, linear_issue_id, id DESC);
-CREATE INDEX IF NOT EXISTS idx_issue_sessions_last_opened ON issue_sessions(project_id, linear_issue_id, last_opened_at DESC, id DESC);
-CREATE INDEX IF NOT EXISTS idx_run_leases_active ON run_leases(status, project_id, linear_issue_id);
-CREATE INDEX IF NOT EXISTS idx_run_leases_thread ON run_leases(thread_id);
-CREATE INDEX IF NOT EXISTS idx_run_thread_events_run ON run_thread_events(run_lease_id, id);
+CREATE INDEX IF NOT EXISTS idx_issues_project ON issues(project_id, linear_issue_id);
+CREATE INDEX IF NOT EXISTS idx_issues_key ON issues(issue_key);
+CREATE INDEX IF NOT EXISTS idx_issues_ready ON issues(pending_run_type, active_run_id);
+CREATE INDEX IF NOT EXISTS idx_issues_branch ON issues(branch_name);
+CREATE INDEX IF NOT EXISTS idx_runs_issue ON runs(issue_id);
+CREATE INDEX IF NOT EXISTS idx_runs_active ON runs(status, project_id, linear_issue_id);
+CREATE INDEX IF NOT EXISTS idx_runs_thread ON runs(thread_id);
+CREATE INDEX IF NOT EXISTS idx_run_thread_events_run ON run_thread_events(run_id, id);
 CREATE INDEX IF NOT EXISTS idx_operator_feed_events_issue ON operator_feed_events(issue_key, id);
 CREATE INDEX IF NOT EXISTS idx_operator_feed_events_project ON operator_feed_events(project_id, id);
-CREATE INDEX IF NOT EXISTS idx_obligations_pending ON obligations(status, run_lease_id, kind);
-CREATE UNIQUE INDEX IF NOT EXISTS idx_obligations_dedupe
-ON obligations(run_lease_id, kind, dedupe_key)
-WHERE dedupe_key IS NOT NULL;
 `;
 export function runPatchRelayMigrations(connection) {
-    connection.exec(baseMigration);
-    try {
-        connection.exec("ALTER TABLE issue_control ADD COLUMN selected_workflow_id TEXT");
-    }
-    catch {
-        // Column already exists on upgraded installs.
-    }
-    try {
-        connection.exec("ALTER TABLE operator_feed_events ADD COLUMN workflow_id TEXT");
-    }
-    catch {
-        // Column already exists on upgraded installs.
-    }
-    try {
-        connection.exec("ALTER TABLE operator_feed_events ADD COLUMN next_stage TEXT");
-    }
-    catch {
-        // Column already exists on upgraded installs.
-    }
+    connection.exec(schema);
 }