merge-steward 0.33.2 → 0.34.0

package/dist/cli/args.js

@@ -58,16 +58,8 @@ export function validateFlags(parsed) {
             assertKnownFlags(parsed, "root", []);
             return;
         case "dashboard":
-        case "dash":
-        case "d":
             assertKnownFlags(parsed, "root", ["repo", "pr"]);
             return;
-        case "attach":
-            assertKnownFlags(parsed, "repos", ["base-branch", "label", "merge-queue-check-name", "refresh", "json"]);
-            return;
-        case "repos":
-            assertKnownFlags(parsed, "repos", ["json"]);
-            return;
         case "repo":
             switch (subcommand) {
                 case undefined:

package/dist/cli/commands/attach.js

@@ -10,7 +10,7 @@ function deriveRepoId(repoFullName) {
         .replace(/^[^a-z0-9]+/, "")
         .replace(/[^a-z0-9]+$/, "");
     if (!normalized) {
-        throw new UsageError(`Could not derive a repo id from ${repoFullName}. Pass an explicit <id>.`, "repos");
+        throw new UsageError(`Could not derive a repo id from ${repoFullName}. Pass an explicit <id>.`, "repo");
     }
     return normalized;
 }
@@ -18,13 +18,13 @@ function parseAttachTarget(parsed) {
     const first = parsed.positionals[1];
     const second = parsed.positionals[2];
     if (!first) {
-        throw new UsageError("merge-steward attach requires <owner/repo> or <id> <owner/repo>.", "repos");
+        throw new UsageError("merge-steward repo attach requires <owner/repo> or <id> <owner/repo>.", "repo");
     }
     if (second) {
         return { repoId: first, repoFullName: second };
     }
     if (!first.includes("/")) {
-        throw new UsageError("merge-steward attach requires <owner/repo> or <id> <owner/repo>.", "repos");
+        throw new UsageError("merge-steward repo attach requires <owner/repo> or <id> <owner/repo>.", "repo");
     }
     const existing = listRepoConfigs().find((repo) => repo.repoFullName === first);
     if (existing) {
@@ -33,7 +33,7 @@ function parseAttachTarget(parsed) {
     const repoId = deriveRepoId(first);
     const conflict = listRepoConfigs().find((repo) => repo.repoId === repoId && repo.repoFullName !== first);
     if (conflict) {
-        throw new UsageError(`Derived repo id '${repoId}' is already used by ${conflict.repoFullName}. Pass an explicit <id>.`, "repos");
+        throw new UsageError(`Derived repo id '${repoId}' is already used by ${conflict.repoFullName}. Pass an explicit <id>.`, "repo");
     }
     return { repoId, repoFullName: first };
 }

package/dist/cli/commands/init.js

@@ -47,7 +47,7 @@ export async function handleInit(parsed, stdout, runCommand) {
         "",
         "Next steps:",
         `1. Put the webhook secret and GitHub App credentials into ${home.serviceEnvPath} for dev or systemd-creds for prod`,
-        "2. Run `merge-steward attach <owner/repo>`",
+        "2. Run `merge-steward repo attach <owner/repo>`",
         "3. Configure your GitHub App webhook URL to the webhook URL above",
         "4. Run `merge-steward doctor --repo <id>`",
     ].join("\n") + "\n");

package/dist/cli/commands/repos.js

@@ -9,7 +9,7 @@ export async function handleRepos(parsed, stdout) {
             return 0;
         }
         if (repos.length === 0) {
-            writeOutput(stdout, "No attached repositories yet. Run `merge-steward attach <owner/repo>`.\n");
+            writeOutput(stdout, "No attached repositories yet. Run `merge-steward repo attach <owner/repo>`.\n");
             return 0;
         }
         writeOutput(stdout, repos

package/dist/cli/help.js

@@ -78,10 +78,6 @@ function repoHelpText() {
         "  --refresh                    Re-discover the base branch from GitHub",
         "  --json                       Emit structured JSON",
         "",
-        "Compatibility aliases:",
-        "  merge-steward attach ...     Alias for `merge-steward repo attach ...`",
-        "  merge-steward repos ...      Alias for `merge-steward repo list/show ...`",
-        "",
         "Examples:",
         "  merge-steward repo attach owner/repo",
         "  merge-steward repo attach owner/repo --refresh",
@@ -120,7 +116,6 @@ function queueHelpText() {
 export function helpTextFor(topic) {
     switch (topic) {
         case "repo":
-        case "repos":
             return repoHelpText();
         case "service":
             return serviceHelpText();

package/dist/cli/system.js

@@ -87,7 +87,7 @@ export function loadRepoConfigById(repoId) {
         const configuredHint = configured.length > 0
             ? ` Configured repos: ${configured.map((repo) => repo.repoId).join(", ")}.`
             : "";
-        throw new UsageError(`Repo config not found for ${repoId}: ${configPath}. Run \`merge-steward attach ${repoId} <owner/repo>\` first.${configuredHint}`, "repos");
+        throw new UsageError(`Repo config not found for ${repoId}: ${configPath}. Run \`merge-steward repo attach ${repoId} <owner/repo>\` first.${configuredHint}`, "repo");
     }
     return {
         configPath,

package/dist/cli/types.d.ts

@@ -2,7 +2,7 @@ export interface ParsedArgs {
     positionals: string[];
     flags: Map<string, string | boolean>;
 }
-export type HelpTopic = "root" | "repo" | "repos" | "service" | "queue";
+export type HelpTopic = "root" | "repo" | "service" | "queue";
 export interface Output {
     write(chunk: string): boolean;
 }

package/dist/cli.js

@@ -21,22 +21,19 @@ export async function runCli(argv, options) {
             return 0;
         }
         validateFlags(parsed);
-        const requestedCommand = parsed.positionals[0] ?? "help";
-        const command = requestedCommand === "dash" || requestedCommand === "d"
-            ? "dashboard"
-            : requestedCommand;
+        const command = parsed.positionals[0] ?? "help";
         if (hasHelpFlag(parsed) || command === "help") {
             const topic = command === "help"
                 ? (parsed.positionals[1] ?? "root")
-                : (command === "attach" || command === "repo" || command === "repos"
+                : (command === "repo"
                     ? "repo"
                     : command === "service" || command === "queue"
                         ? command
                         : "root");
-            if (!["root", "attach", "repo", "repos", "service", "queue"].includes(topic)) {
+            if (!["root", "repo", "service", "queue"].includes(topic)) {
                 throw new UsageError(`Unknown help topic: ${String(topic)}`);
             }
-            writeOutput(stdout, `${helpTextFor(topic === "attach" ? "repo" : topic)}\n`);
+            writeOutput(stdout, `${helpTextFor(topic)}\n`);
             return 0;
         }
         switch (command) {
@@ -45,23 +42,19 @@ export async function runCli(argv, options) {
                 return 0;
             case "init":
                 return await (await import("./cli/commands/init.js")).handleInit(parsed, stdout, runCommand);
-            case "attach":
-                return await (await import("./cli/commands/attach.js")).handleAttach(parsed, stdout, runCommand);
-            case "repos":
-                return await (await import("./cli/commands/repos.js")).handleRepos(parsed, stdout);
             case "repo": {
                 const subcommand = parsed.positionals[1] ?? "list";
                 if (subcommand === "attach") {
-                    return await (await import("./cli/commands/attach.js")).handleAttach(rewriteParsedArgs(parsed, ["attach", ...parsed.positionals.slice(2)]), stdout, runCommand);
+                    return await (await import("./cli/commands/attach.js")).handleAttach(rewriteParsedArgs(parsed, ["repo", ...parsed.positionals.slice(2)]), stdout, runCommand);
                 }
                 if (subcommand === "list") {
-                    return await (await import("./cli/commands/repos.js")).handleRepos(rewriteParsedArgs(parsed, ["repos", ...parsed.positionals.slice(2)]), stdout);
+                    return await (await import("./cli/commands/repos.js")).handleRepos(rewriteParsedArgs(parsed, ["repo", ...parsed.positionals.slice(2)]), stdout);
                 }
                 if (subcommand === "show") {
                     if (!parsed.positionals[2]) {
                         throw new UsageError("merge-steward repo show requires <id>.", "repo");
                     }
-                    return await (await import("./cli/commands/repos.js")).handleRepos(rewriteParsedArgs(parsed, ["repos", ...parsed.positionals.slice(2)]), stdout);
+                    return await (await import("./cli/commands/repos.js")).handleRepos(rewriteParsedArgs(parsed, ["repo", ...parsed.positionals.slice(2)]), stdout);
                 }
                 throw new UsageError(`Unknown repo command: ${subcommand}`, "repo");
             }

package/dist/db/schema.d.ts

@@ -1,7 +1,3 @@
 import type { DatabaseConnection } from "./shared.ts";
-/**
- * Create and upgrade the steward's SQLite schema. Idempotent — safe to call
- * on every startup. Migrations preserve active queue state, then remove
- * obsolete columns so the runtime has one candidate model.
- */
+/** Create the current steward schema and reject any other schema version. */
 export declare function ensureSchema(connection: DatabaseConnection): void;

package/dist/db/schema.js

@@ -1,9 +1,13 @@
-/**
- * Create and upgrade the steward's SQLite schema. Idempotent — safe to call
- * on every startup. Migrations preserve active queue state, then remove
- * obsolete columns so the runtime has one candidate model.
- */
+/** Create the current steward schema and reject any other schema version. */
 export function ensureSchema(connection) {
+    const existingTables = connection.prepare(`
+    SELECT name FROM sqlite_master
+    WHERE type = 'table' AND name NOT LIKE 'sqlite_%'
+  `).all();
+    if (existingTables.length > 0) {
+        assertCurrentSchema(connection);
+        return;
+    }
     connection.exec(`
     CREATE TABLE IF NOT EXISTS queue_entries (
       id TEXT PRIMARY KEY,
@@ -22,11 +26,13 @@ export function ensureSchema(connection) {
       max_retries INTEGER NOT NULL DEFAULT 3,
       last_failed_base_sha TEXT,
       issue_key TEXT,
+      pr_title TEXT,
       candidate_kind TEXT,
       candidate_policy_fingerprint TEXT,
       candidate_ref TEXT,
       candidate_sha TEXT,
       candidate_based_on TEXT,
+      base_ref_name TEXT,
       wait_detail TEXT,
       post_merge_status TEXT,
       post_merge_sha TEXT,
@@ -73,45 +79,6 @@ export function ensureSchema(connection) {
     connection.exec(`
     CREATE INDEX IF NOT EXISTS idx_queue_events_entry
       ON queue_events(entry_id, id)
-  `);
-    ensureColumn(connection, "queue_entries", "post_merge_status", "TEXT");
-    ensureColumn(connection, "queue_entries", "post_merge_sha", "TEXT");
-    ensureColumn(connection, "queue_entries", "post_merge_summary", "TEXT");
-    ensureColumn(connection, "queue_entries", "post_merge_checked_at", "TEXT");
-    ensureColumn(connection, "queue_entries", "wait_detail", "TEXT");
-    ensureColumn(connection, "queue_entries", "pr_title", "TEXT");
-    ensureColumn(connection, "queue_entries", "candidate_kind", "TEXT");
-    ensureColumn(connection, "queue_entries", "candidate_policy_fingerprint", "TEXT");
-    ensureColumn(connection, "queue_entries", "candidate_ref", "TEXT");
-    ensureColumn(connection, "queue_entries", "candidate_sha", "TEXT");
-    ensureColumn(connection, "queue_entries", "candidate_based_on", "TEXT");
-    ensureColumn(connection, "queue_entries", "base_ref_name", "TEXT");
-    ensureColumn(connection, "queue_entries", "decided_at", "TEXT");
-    migrateLegacyCandidateColumns(connection);
-    // Retire patch-equivalence caches from older installations. Candidate
-    // validity is SHA-bound; preserving these columns would imply otherwise.
-    dropColumnIfPresent(connection, "queue_entries", "head_patch_id");
-    dropColumnIfPresent(connection, "queue_entries", "spec_tree_id");
-    connection.exec(`
-    UPDATE queue_entries
-       SET candidate_kind = 'integration'
-     WHERE candidate_kind IS NULL
-       AND candidate_sha IS NOT NULL
-       AND candidate_ref IS NOT NULL
-  `);
-    connection.exec(`
-    UPDATE queue_entries
-       SET post_merge_status = 'pending'
-     WHERE status = 'merged'
-       AND post_merge_status IS NULL
-  `);
-    // Backfill decided_at for already-terminal rows so historic entries show a
-    // sensible duration/age; updated_at is the best estimate we have for them.
-    connection.exec(`
-    UPDATE queue_entries
-       SET decided_at = updated_at
-     WHERE decided_at IS NULL
-       AND status IN ('merged', 'evicted', 'dequeued')
   `);
     // Must match TERMINAL_STATUSES in types.ts: merged, evicted, dequeued
     connection.exec(`
@@ -119,56 +86,51 @@ export function ensureSchema(connection) {
       ON queue_entries(repo_id, pr_number)
       WHERE status NOT IN ('merged', 'evicted', 'dequeued')
   `);
+    assertCurrentSchema(connection);
 }
-function migrateLegacyCandidateColumns(connection) {
-    const legacyColumns = [
-        ["spec_branch", "candidate_ref"],
-        ["spec_sha", "candidate_sha"],
-        ["spec_based_on", "candidate_based_on"],
-    ];
-    for (const [legacy, candidate] of legacyColumns) {
-        if (!hasColumn(connection, "queue_entries", legacy))
-            continue;
-        connection.exec(`
-      UPDATE queue_entries
-         SET ${candidate} = ${legacy}
-       WHERE ${candidate} IS NULL
-         AND ${legacy} IS NOT NULL
-    `);
+const QUEUE_ENTRY_COLUMNS = [
+    "id", "repo_id", "pr_number", "branch", "head_sha", "base_sha", "status",
+    "position", "priority", "generation", "ci_run_id", "ci_retries",
+    "retry_attempts", "max_retries", "last_failed_base_sha", "issue_key",
+    "pr_title", "candidate_kind", "candidate_policy_fingerprint", "candidate_ref",
+    "candidate_sha", "candidate_based_on", "base_ref_name", "wait_detail",
+    "post_merge_status", "post_merge_sha", "post_merge_summary",
+    "post_merge_checked_at", "decided_at", "enqueued_at", "updated_at",
+];
+const QUEUE_INCIDENT_COLUMNS = [
+    "id", "entry_id", "at", "failure_class", "context_json", "outcome",
+];
+const QUEUE_EVENT_COLUMNS = [
+    "id", "entry_id", "at", "from_status", "to_status", "detail", "base_sha",
+];
+const REQUIRED_INDEXES = [
+    "idx_queue_entries_repo_status",
+    "idx_queue_entries_repo_position",
+    "idx_queue_incidents_entry",
+    "idx_queue_events_entry",
+    "idx_one_active_per_pr",
+];
+function assertCurrentSchema(connection) {
+    assertExactColumns(connection, "queue_entries", QUEUE_ENTRY_COLUMNS);
+    assertExactColumns(connection, "queue_incidents", QUEUE_INCIDENT_COLUMNS);
+    assertExactColumns(connection, "queue_events", QUEUE_EVENT_COLUMNS);
+    const indexes = new Set(connection.prepare("SELECT name FROM sqlite_master WHERE type = 'index'").all()
+        .map((row) => String(row.name)));
+    const missing = REQUIRED_INDEXES.filter((index) => !indexes.has(index));
+    if (missing.length > 0) {
+        throw new Error(`Merge Steward database schema is incompatible (missing indexes: ${missing.join(", ")})`);
     }
-    // Derive kind while the legacy ref is still available, then remove all
-    // old candidate representations in this same startup migration.
-    connection.exec(`
-    UPDATE queue_entries
-       SET candidate_kind = CASE
-         WHEN candidate_sha = head_sha AND candidate_ref IS NULL THEN 'head'
-         WHEN candidate_sha IS NOT NULL THEN 'integration'
-         ELSE NULL
-       END
-     WHERE candidate_kind IS NULL
-  `);
-    for (const [legacy] of legacyColumns) {
-        dropColumnIfPresent(connection, "queue_entries", legacy);
-    }
-}
-function hasColumn(connection, table, column) {
-    const rows = connection.prepare(`PRAGMA table_info(${table})`).all();
-    for (const row of rows) {
-        if (String(row.name) === column) {
-            return true;
-        }
-    }
-    return false;
 }
-function ensureColumn(connection, table, column, type) {
-    if (hasColumn(connection, table, column)) {
+function assertExactColumns(connection, table, expected) {
+    const actual = connection.prepare(`PRAGMA table_info(${table})`).all()
+        .map((row) => String(row.name));
+    const missing = expected.filter((column) => !actual.includes(column));
+    const unexpected = actual.filter((column) => !expected.includes(column));
+    if (missing.length === 0 && unexpected.length === 0)
         return;
-    }
-    connection.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${type}`);
-}
-function dropColumnIfPresent(connection, table, column) {
-    if (!hasColumn(connection, table, column)) {
-        return;
-    }
-    connection.exec(`ALTER TABLE ${table} DROP COLUMN ${column}`);
+    const details = [
+        ...(missing.length > 0 ? [`missing: ${missing.join(", ")}`] : []),
+        ...(unexpected.length > 0 ? [`unexpected: ${unexpected.join(", ")}`] : []),
+    ].join("; ");
+    throw new Error(`Merge Steward database schema is incompatible (${table}: ${details})`);
 }

package/dist/server.js

@@ -85,7 +85,7 @@ export async function startMultiServer() {
     };
     setRuntimeGitHubAuthProvider(undefined);
     if (configs.length === 0) {
-        logger.warn("No repo configs found. Run `merge-steward attach <owner/repo>` to add repos.");
+        logger.warn("No repo configs found. Run `merge-steward repo attach <owner/repo>` to add repos.");
     }
     if (githubAuth.mode === "app") {
         githubRuntimeStatus = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-steward",
-  "version": "0.33.2",
+  "version": "0.34.0",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {

package/dist/watch/display-filter.d.ts

@@ -1,14 +0,0 @@
-import type { QueueEntry } from "../types.ts";
-/**
- * Build the display row list for the queue watch. In "active" mode,
- * includes active entries plus recently-terminal entries (within 60s),
- * deduplicated by prNumber (active wins over terminal for re-admissions).
- * In "all" mode, returns all entries as-is.
- */
-export declare function buildDisplayEntries(entries: QueueEntry[], filter: "active" | "all"): QueueEntry[];
-/**
- * Build the spec chain header entries. Always shows the current live
- * chain: active entries plus recently-merged entries (for cascade
- * visibility), regardless of the display filter. One entry per PR.
- */
-export declare function buildChainEntries(entries: QueueEntry[]): QueueEntry[];

package/dist/watch/display-filter.js

@@ -1,69 +0,0 @@
-import { TERMINAL_STATUSES } from "../types.js";
-const RECENTLY_COMPLETED_MS = 60_000;
-function isPostMergeUnresolved(entry) {
-    if (entry.status !== "merged")
-        return false;
-    return entry.postMergeStatus === null
-        || entry.postMergeStatus === "pending"
-        || entry.postMergeStatus === "unknown";
-}
-function isActiveFilterVisible(entry, cutoff) {
-    if (!TERMINAL_STATUSES.includes(entry.status)) {
-        return true;
-    }
-    // Keep a merged entry visible until main's own post-merge CI resolves so
-    // the operator can watch the verification land.  Once it's pass/fail we
-    // fall back to the recently-completed window.
-    if (isPostMergeUnresolved(entry)) {
-        return true;
-    }
-    return new Date(entry.updatedAt).getTime() > cutoff;
-}
-function isLaterEntry(left, right) {
-    if (left.position !== right.position) {
-        return left.position > right.position;
-    }
-    return new Date(left.updatedAt).getTime() >= new Date(right.updatedAt).getTime();
-}
-function pickLatestPerPR(entries) {
-    const byPR = new Map();
-    for (const entry of entries) {
-        const existing = byPR.get(entry.prNumber);
-        if (!existing || isLaterEntry(entry, existing)) {
-            byPR.set(entry.prNumber, entry);
-        }
-    }
-    return [...byPR.values()];
-}
-/**
- * Build the display row list for the queue watch. In "active" mode,
- * includes active entries plus recently-terminal entries (within 60s),
- * deduplicated by prNumber (active wins over terminal for re-admissions).
- * In "all" mode, returns all entries as-is.
- */
-export function buildDisplayEntries(entries, filter) {
-    if (filter !== "active")
-        return entries;
-    const cutoff = Date.now() - RECENTLY_COMPLETED_MS;
-    return pickLatestPerPR(entries)
-        .filter((entry) => {
-        const isActive = !TERMINAL_STATUSES.includes(entry.status);
-        return isActive || isActiveFilterVisible(entry, cutoff);
-    })
-        .sort((a, b) => a.position - b.position);
-}
-/**
- * Build the spec chain header entries. Always shows the current live
- * chain: active entries plus recently-merged entries (for cascade
- * visibility), regardless of the display filter. One entry per PR.
- */
-export function buildChainEntries(entries) {
-    const cutoff = Date.now() - RECENTLY_COMPLETED_MS;
-    return pickLatestPerPR(entries)
-        .filter((entry) => {
-        const isActive = !TERMINAL_STATUSES.includes(entry.status);
-        const isRecent = !isActive && new Date(entry.updatedAt).getTime() > cutoff;
-        return isActive || isRecent || isPostMergeUnresolved(entry);
-    })
-        .sort((a, b) => a.position - b.position);
-}