merge-steward 0.22.1 → 0.22.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/config.d.ts CHANGED
@@ -21,10 +21,10 @@ export declare const stewardConfigSchema: z.ZodObject<{
21
21
  }, z.core.$strip>;
22
22
  logging: z.ZodDefault<z.ZodObject<{
23
23
  level: z.ZodDefault<z.ZodEnum<{
24
+ debug: "debug";
24
25
  error: "error";
25
- warn: "warn";
26
26
  info: "info";
27
- debug: "debug";
27
+ warn: "warn";
28
28
  }>>;
29
29
  }, z.core.$strip>>;
30
30
  admissionLabel: z.ZodDefault<z.ZodString>;
@@ -32,10 +32,6 @@ export declare class ShellGitOperations implements GitOperations, SpeculativeBra
32
32
  * so the reconciler can push it and reference its SHA.
33
33
  */
34
34
  buildSpeculative(prBranch: string, baseBranch: string, specName: string, mergeMessage?: string): Promise<MergeResult>;
35
- /**
36
- * During a merge conflict, check if all unmerged files match a configured
37
- * auto-resolve pattern. If so, regenerate them via the pattern's command.
38
- */
39
35
  private tryAutoResolveConflict;
40
36
  deleteSpeculative(specName: string): Promise<void>;
41
37
  }
@@ -67,7 +67,7 @@ export function readBundledAsset(relativePath) {
67
67
  export function getBuiltCliEntryPath() {
68
68
  const entryPath = getBundledAssetPath("dist/index.js");
69
69
  if (!existsSync(entryPath)) {
70
- throw new Error(`Built merge-steward entrypoint not found: ${entryPath}. Run npm run build -w merge-steward first.`);
70
+ throw new Error(`Built merge-steward entrypoint not found: ${entryPath}. Run pnpm --filter merge-steward build first.`);
71
71
  }
72
72
  return entryPath;
73
73
  }
@@ -8,10 +8,10 @@ export declare const stewardHomeConfigSchema: z.ZodObject<{
8
8
  }, z.core.$strip>>;
9
9
  logging: z.ZodDefault<z.ZodObject<{
10
10
  level: z.ZodDefault<z.ZodEnum<{
11
+ debug: "debug";
11
12
  error: "error";
12
- warn: "warn";
13
13
  info: "info";
14
- debug: "debug";
14
+ warn: "warn";
15
15
  }>>;
16
16
  }, z.core.$strip>>;
17
17
  }, z.core.$strip>;
@@ -8,5 +8,5 @@ interface DetailViewProps {
8
8
  queueBlock: QueueBlockState | null;
9
9
  githubPolicy: GitHubPolicyState;
10
10
  }
11
- export declare function DetailView({ detail, isHead, activeIndex, activeCount, headPrNumber, queueBlock, githubPolicy, }: DetailViewProps): React.JSX.Element;
11
+ export declare function DetailView({ detail, isHead, activeIndex, activeCount, headPrNumber, queueBlock, githubPolicy }: DetailViewProps): React.JSX.Element;
12
12
  export {};
@@ -4,5 +4,5 @@ interface FreshnessBadgeProps {
4
4
  expectedFreshMs: number;
5
5
  gatewayError?: string | null;
6
6
  }
7
- export declare function FreshnessBadge({ connected, lastSnapshotReceivedAt, expectedFreshMs, gatewayError, }: FreshnessBadgeProps): React.JSX.Element;
7
+ export declare function FreshnessBadge({ connected, lastSnapshotReceivedAt, expectedFreshMs, gatewayError }: FreshnessBadgeProps): React.JSX.Element;
8
8
  export {};
@@ -5,7 +5,7 @@ interface ListViewProps {
5
5
  showCursor: boolean;
6
6
  bodyRows: number;
7
7
  }
8
- export declare function RepoRow({ repo, selected, showCursor, width, }: {
8
+ export declare function RepoRow({ repo, selected, showCursor, width }: {
9
9
  repo: DashboardRepo;
10
10
  selected: boolean;
11
11
  showCursor: boolean;
@@ -7,5 +7,5 @@ interface QueueListViewProps {
7
7
  headEntryId: string | null;
8
8
  queueBlock: QueueBlockState | null;
9
9
  }
10
- export declare function QueueListView({ entries, allEntries, selectedEntryId, recentEvents, headEntryId, queueBlock, }: QueueListViewProps): React.JSX.Element;
10
+ export declare function QueueListView({ entries, allEntries, selectedEntryId, recentEvents, headEntryId, queueBlock }: QueueListViewProps): React.JSX.Element;
11
11
  export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "merge-steward",
3
- "version": "0.22.1",
3
+ "version": "0.22.2",
4
4
  "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
5
5
  "type": "module",
6
6
  "repository": {
@@ -36,28 +36,28 @@
36
36
  },
37
37
  "scripts": {
38
38
  "dev": "node --watch --experimental-transform-types src/index.ts",
39
- "prepack": "npm run build",
40
- "build": "rm -rf dist && tsc -p tsconfig.json && chmod +x dist/index.js",
39
+ "prepack": "pnpm build",
40
+ "build": "rm -rf dist && tsgo -p tsconfig.json && chmod +x dist/index.js",
41
41
  "start": "node dist/index.js serve",
42
- "typecheck": "tsc -p tsconfig.json --noEmit",
42
+ "typecheck": "tsgo -p tsconfig.json --noEmit",
43
43
  "test": "node --experimental-transform-types --test 'test/**/*.test.ts'",
44
44
  "test:scenarios": "node --experimental-transform-types --test 'test/scenarios/*.test.ts'",
45
45
  "test:property": "node --experimental-transform-types --test 'test/property/*.test.ts'"
46
46
  },
47
47
  "dependencies": {
48
- "fastify": "^5.8.2",
48
+ "fastify": "^5.8.5",
49
49
  "fastify-raw-body": "^5.0.0",
50
- "ink": "^6.8.0",
50
+ "ink": "^7.0.1",
51
51
  "pino": "^10.3.1",
52
- "react": "^19.2.4",
52
+ "react": "^19.2.5",
53
53
  "zod": "^4.3.6"
54
54
  },
55
55
  "devDependencies": {
56
- "@types/node": "^25.5.0",
56
+ "@types/node": "^25.6.0",
57
57
  "@types/react": "^19.2.14",
58
- "fast-check": "^4.6.0",
59
- "isomorphic-git": "^1.27.1",
60
- "memfs": "^4.17.0",
61
- "typescript": "^5.8.3"
58
+ "@typescript/native-preview": "7.0.0-dev.20260427.1",
59
+ "fast-check": "^4.7.0",
60
+ "isomorphic-git": "^1.37.6",
61
+ "memfs": "^4.57.2"
62
62
  }
63
63
  }