@moo.md/hum 0.0.0 → 0.2.0
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/package.json +2 -2
- package/schema/hum.schema.json +2 -2
- package/scripts/eval.ts +88 -50
- package/src/adapter-api.ts +46 -14
- package/src/adapters/admit.ts +2 -2
- package/src/adapters/argument.ts +1 -1
- package/src/adapters/claim.ts +18 -15
- package/src/adapters/claude-bg.ts +72 -32
- package/src/adapters/claude-p.ts +26 -25
- package/src/adapters/contract.ts +22 -10
- package/src/adapters/each-call.ts +9 -0
- package/src/adapters/fake.ts +6 -6
- package/src/adapters/git.ts +12 -19
- package/src/adapters/github-client.ts +102 -0
- package/src/adapters/github.ts +50 -136
- package/src/adapters/guard.ts +20 -9
- package/src/adapters/history.ts +12 -15
- package/src/adapters/item-file.ts +1 -1
- package/src/adapters/markdown.ts +49 -42
- package/src/adapters/marked.ts +15 -13
- package/src/adapters/model-call.ts +4 -4
- package/src/adapters/once.ts +5 -5
- package/src/adapters/owner-commit.ts +13 -11
- package/src/adapters/pull-requests.ts +11 -13
- package/src/adapters/registry.ts +7 -7
- package/src/adapters/roundup.ts +31 -37
- package/src/adapters/serial.ts +4 -5
- package/src/adapters/transcript.ts +13 -8
- package/src/cli/main.ts +1 -0
- package/src/cli/ops.ts +32 -14
- package/src/cli/service.ts +14 -8
- package/src/cli/setup.ts +8 -3
- package/src/cli/shared-watch.ts +3 -3
- package/src/config/checks.ts +14 -18
- package/src/config/machine.ts +5 -7
- package/src/config/refusal.ts +7 -0
- package/src/config/schema.ts +9 -9
- package/src/config/settings.ts +17 -2
- package/src/config/state-map.ts +5 -3
- package/src/decide/alignment.ts +4 -4
- package/src/decide/answer.ts +24 -22
- package/src/decide/kind.ts +1 -6
- package/src/decide/labels.ts +9 -9
- package/src/decide/merge.ts +6 -7
- package/src/decide/prose.ts +4 -4
- package/src/decide/question.ts +23 -20
- package/src/decide/review.ts +4 -2
- package/src/decide/risk.ts +25 -19
- package/src/decide/taste.ts +3 -3
- package/src/exec.ts +10 -4
- package/src/index.ts +14 -13
- package/src/loop/check-item.ts +3 -3
- package/src/loop/ci.ts +1 -1
- package/src/loop/github.ts +2 -2
- package/src/loop/groups.ts +13 -6
- package/src/loop/memory.ts +40 -28
- package/src/loop/notes.ts +5 -5
- package/src/loop/pair.ts +1 -1
- package/src/loop/pass.ts +18 -12
- package/src/loop/proof.ts +9 -7
- package/src/loop/prove-item.ts +3 -3
- package/src/loop/records.ts +12 -13
- package/src/loop/signals.ts +6 -6
- package/src/measure/inputs.ts +1 -1
- package/src/measure/measure.ts +4 -4
- package/src/measure/rate.ts +2 -0
- package/src/service/ci-tick.ts +2 -2
- package/src/service/supervise.ts +3 -2
- package/src/service/token.ts +3 -3
- package/src/service/wake.ts +2 -2
- package/src/service/workflows.ts +2 -2
- package/src/setup/propose.ts +4 -4
- package/src/setup/prove.ts +20 -14
- package/src/setup/scan.ts +31 -24
- package/src/setup/shipped.ts +8 -2
- package/src/setup/tables.ts +4 -3
- package/src/setup/waits.ts +9 -11
- package/src/setup/write.ts +17 -10
- package/src/slots/pool.ts +32 -24
- package/src/state/events.ts +1 -1
- package/src/state/faults.ts +13 -5
- package/src/state/format.ts +2 -2
- package/src/state/items.ts +20 -15
- package/src/state/open.ts +2 -2
- package/src/state/ops.ts +16 -10
- package/src/state/records.ts +5 -5
- package/src/state/runs.ts +33 -26
- package/src/state/saved.ts +44 -32
- package/src/status/file.ts +20 -1
- package/src/status/format.ts +47 -57
- package/src/status/sections.ts +2 -2
- package/src/worker/alignment-report.ts +4 -5
- package/src/worker/answers.ts +26 -24
- package/src/worker/base-check.ts +4 -5
- package/src/worker/checks.ts +25 -11
- package/src/worker/kind.ts +23 -19
- package/src/worker/land.ts +115 -126
- package/src/worker/merged.ts +9 -7
- package/src/worker/open.ts +15 -13
- package/src/worker/prose-run.ts +3 -3
- package/src/worker/questions.ts +15 -12
- package/src/worker/scheduler.ts +4 -4
- package/src/worker/signature.ts +3 -3
- package/src/worker/tally.ts +0 -2
- package/src/worker/taste.ts +6 -15
- package/src/worker/thin-path.ts +150 -123
- package/src/worker/thread.ts +25 -0
- package/src/worker/worker.ts +125 -73
- package/surface.json +633 -2198
- package/src/slots/scan.ts +0 -26
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
import { Octokit } from "@octokit/core";
|
|
2
|
+
import { GraphqlResponseError } from "@octokit/graphql";
|
|
3
|
+
import { paginateGraphQL } from "@octokit/plugin-paginate-graphql";
|
|
4
|
+
import { type ThrottlingOptions, throttling } from "@octokit/plugin-throttling";
|
|
5
|
+
import { RequestError } from "@octokit/request-error";
|
|
6
|
+
import pMemoize from "p-memoize";
|
|
7
|
+
import { PermanentError } from "../adapter-api.ts";
|
|
8
|
+
import type { MERGE_METHODS } from "../config/schema.ts";
|
|
9
|
+
import { type Env, exec } from "../exec.ts";
|
|
10
|
+
|
|
11
|
+
const RATE_LIMIT_RETRIES = 1;
|
|
12
|
+
const NOT_MODIFIED = 304;
|
|
13
|
+
|
|
14
|
+
const HumOctokit = Octokit.plugin(throttling, paginateGraphQL);
|
|
15
|
+
|
|
16
|
+
export type GitHubClient = InstanceType<typeof HumOctokit>;
|
|
17
|
+
|
|
18
|
+
/** The GraphQL name of each merge method. */
|
|
19
|
+
export const MERGE_METHOD = { merge: "MERGE", squash: "SQUASH", rebase: "REBASE" } as const satisfies Record<(typeof MERGE_METHODS)[number], string>;
|
|
20
|
+
|
|
21
|
+
/** What a failed request means to hum. */
|
|
22
|
+
type Failure =
|
|
23
|
+
/** GitHub answered 304 to a conditional request: nothing changed, and no rate limit was spent. */
|
|
24
|
+
| { readonly kind: "not-modified" }
|
|
25
|
+
/** Another writer took the ref first: it already exists, or it moved since it was read. */
|
|
26
|
+
| { readonly kind: "lost-race" }
|
|
27
|
+
/** No retry fixes it: a 4xx other than a rate limit, or a GraphQL error about the request itself. */
|
|
28
|
+
| { readonly kind: "permanent"; readonly message: string }
|
|
29
|
+
| { readonly kind: "transient" };
|
|
30
|
+
|
|
31
|
+
/** GraphQL errors about the request itself; any other, such as a timeout GitHub reports, may pass on a retry. */
|
|
32
|
+
const PERMANENT_GRAPHQL_ERRORS: ReadonlySet<string> = new Set(["NOT_FOUND", "FORBIDDEN", "UNPROCESSABLE"]);
|
|
33
|
+
|
|
34
|
+
const isRateLimited = (error: RequestError): boolean => error.status === 429 || (error.status === 403 && error.response?.headers["x-ratelimit-remaining"] === "0");
|
|
35
|
+
|
|
36
|
+
export const failureOf = (cause: unknown): Failure => {
|
|
37
|
+
if (cause instanceof RequestError) {
|
|
38
|
+
if (cause.status === NOT_MODIFIED) return { kind: "not-modified" };
|
|
39
|
+
|
|
40
|
+
return cause.status >= 400 && cause.status < 500 && !isRateLimited(cause) ? { kind: "permanent", message: cause.message } : { kind: "transient" };
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const found = cause instanceof GraphqlResponseError ? cause.errors?.[0] : undefined;
|
|
44
|
+
|
|
45
|
+
if (found?.type === "STALE_DATA" || (found?.type === "UNPROCESSABLE" && /already exists/i.test(found.message))) return { kind: "lost-race" };
|
|
46
|
+
|
|
47
|
+
return found && PERMANENT_GRAPHQL_ERRORS.has(found.type ?? "") ? { kind: "permanent", message: found.message } : { kind: "transient" };
|
|
48
|
+
};
|
|
49
|
+
|
|
50
|
+
/** Throws `cause`, marked permanent when no retry can fix it. */
|
|
51
|
+
export const raise = (cause: unknown): never => {
|
|
52
|
+
const failure = failureOf(cause);
|
|
53
|
+
|
|
54
|
+
throw failure.kind === "permanent" ? new PermanentError(failure.message, { cause }) : cause;
|
|
55
|
+
};
|
|
56
|
+
|
|
57
|
+
/** The owner's own login: `GH_TOKEN` or `GITHUB_TOKEN`, else the token `gh` holds. */
|
|
58
|
+
const ownerToken = async (timeoutMs: number, env: Env): Promise<string> => {
|
|
59
|
+
const fromEnv = env.GH_TOKEN || env.GITHUB_TOKEN;
|
|
60
|
+
|
|
61
|
+
if (fromEnv) return fromEnv;
|
|
62
|
+
|
|
63
|
+
const gh = await exec("gh", ["auth", "token"], { stdin: "", timeoutMs });
|
|
64
|
+
const token = gh.stdout.trim();
|
|
65
|
+
|
|
66
|
+
if (gh.exitCode !== 0 || token === "") throw new PermanentError("no GitHub login: run `gh auth login`, or set GH_TOKEN");
|
|
67
|
+
|
|
68
|
+
return token;
|
|
69
|
+
};
|
|
70
|
+
|
|
71
|
+
const retryOnce: NonNullable<ThrottlingOptions["onRateLimit"]> = (_retryAfter, _options, _octokit, retryCount) => retryCount < RATE_LIMIT_RETRIES;
|
|
72
|
+
|
|
73
|
+
type Send = (url: string, init?: RequestInit) => Promise<Response>;
|
|
74
|
+
|
|
75
|
+
export type GitHubClientOptions = {
|
|
76
|
+
readonly token: string;
|
|
77
|
+
readonly baseUrl?: string;
|
|
78
|
+
/** Replaces `fetch`, for a GitHub that is not github.com. */
|
|
79
|
+
readonly fetch?: Send;
|
|
80
|
+
/** Whether writes are spaced as GitHub asks; only a GitHub with no secondary rate limit may go without. */
|
|
81
|
+
readonly spaced?: boolean;
|
|
82
|
+
/** The owner's `commandTimeoutSeconds` in milliseconds: how long one request may wait for GitHub's answer. */
|
|
83
|
+
readonly timeoutMs: number;
|
|
84
|
+
};
|
|
85
|
+
|
|
86
|
+
const bounded =
|
|
87
|
+
(send: Send, timeoutMs: number): Send =>
|
|
88
|
+
(url, init) =>
|
|
89
|
+
send(url, { ...init, signal: AbortSignal.any([AbortSignal.timeout(timeoutMs), ...(init?.signal ? [init.signal] : [])]) });
|
|
90
|
+
|
|
91
|
+
/** A GitHub client that waits out rate limits, spaces its writes as GitHub asks, and gives up on a request GitHub has not answered within `timeoutMs`. */
|
|
92
|
+
export const gitHubClient = ({ token, baseUrl, fetch = globalThis.fetch, spaced = true, timeoutMs }: GitHubClientOptions): GitHubClient =>
|
|
93
|
+
new HumOctokit({
|
|
94
|
+
auth: token,
|
|
95
|
+
userAgent: "hum",
|
|
96
|
+
baseUrl,
|
|
97
|
+
request: { fetch: bounded(fetch, timeoutMs) },
|
|
98
|
+
throttle: { enabled: spaced, onRateLimit: retryOnce, onSecondaryRateLimit: retryOnce },
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
/** The client on the owner's own login, made once per process and `timeoutMs`, so every reader and writer shares its rate-limit spacing. */
|
|
102
|
+
export const ownerGitHub = pMemoize(async (timeoutMs: number, env: Env): Promise<GitHubClient> => gitHubClient({ token: await ownerToken(timeoutMs, env), timeoutMs }), { cacheKey: ([timeoutMs]) => timeoutMs });
|
package/src/adapters/github.ts
CHANGED
|
@@ -1,34 +1,28 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { GraphqlResponseError } from "@octokit/graphql";
|
|
3
|
-
import { paginateGraphQL } from "@octokit/plugin-paginate-graphql";
|
|
4
|
-
import { type ThrottlingOptions, throttling } from "@octokit/plugin-throttling";
|
|
5
|
-
import { RequestError } from "@octokit/request-error";
|
|
1
|
+
import ExpiryMap from "expiry-map";
|
|
6
2
|
import hostedGitInfo from "hosted-git-info";
|
|
7
3
|
import pMemoize from "p-memoize";
|
|
8
4
|
import { z } from "zod";
|
|
9
|
-
import {
|
|
5
|
+
import { ADAPTER_API_VERSION, type AdapterContext, type Answers, type Claim, type Item, ItemId, PermanentError, type Integrations, type Questions, type Release, type Watch, type WorkSource } from "../adapter-api.ts";
|
|
10
6
|
import type { Json } from "../config/json.ts";
|
|
11
7
|
import type { MERGE_METHODS } from "../config/schema.ts";
|
|
12
|
-
import {
|
|
8
|
+
import { HOUR_MS } from "../time.ts";
|
|
13
9
|
import { parseArgument } from "./argument.ts";
|
|
14
10
|
import { claimCommit, claimCommitMessage, claimer, claimOfCommit, isLive } from "./claim.ts";
|
|
15
|
-
import {
|
|
11
|
+
import { failureOf, type GitHubClient, ownerGitHub, raise } from "./github-client.ts";
|
|
12
|
+
import { answerMarker, commentText, filedFollowUp, followUpBody, followUpNote, isFollowUpOf, type Marker, marked, parseComment, questionMarker, questionText } from "./marked.ts";
|
|
13
|
+
import { gitHubPullRequests } from "./pull-requests.ts";
|
|
16
14
|
|
|
17
|
-
const RATE_LIMIT_RETRIES = 1;
|
|
18
|
-
const NOT_MODIFIED = 304;
|
|
19
15
|
const READY_LABEL_COLOR = "0e8a16";
|
|
20
16
|
const READY_LABEL_DESCRIPTION = "hum may take this item";
|
|
21
17
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
export type GitHubClient = InstanceType<typeof HumOctokit>;
|
|
18
|
+
/** How long an issue's node id is kept after it was read. An id never changes; the limit only bounds what the worker holds. */
|
|
19
|
+
const ISSUE_ID_KEPT_MS = HOUR_MS;
|
|
25
20
|
|
|
26
21
|
type Variables = Readonly<Record<string, Json>>;
|
|
27
22
|
|
|
28
|
-
|
|
29
|
-
export const MERGE_METHOD = { merge: "MERGE", squash: "SQUASH", rebase: "REBASE" } as const satisfies Record<(typeof MERGE_METHODS)[number], string>;
|
|
23
|
+
const IssueId = ItemId.refine((id) => /^[1-9]\d*$/.test(id), "a GitHub issue number is a whole number above 0");
|
|
30
24
|
|
|
31
|
-
const IssueNumber =
|
|
25
|
+
const IssueNumber = IssueId.transform(Number);
|
|
32
26
|
|
|
33
27
|
const Repo = z.string().regex(/^[\w.-]+\/[\w.-]+$/, "a GitHub repo is owner/name");
|
|
34
28
|
|
|
@@ -69,13 +63,7 @@ const CreatedLabel = z.object({ createLabel: z.object({ label: z.object({ id: z.
|
|
|
69
63
|
|
|
70
64
|
const CreatedIssue = z.object({ createIssue: z.object({ issue: z.object({ number: z.int().positive() }) }) });
|
|
71
65
|
|
|
72
|
-
const
|
|
73
|
-
repository: z.object({
|
|
74
|
-
id: z.string(),
|
|
75
|
-
issue: z.object({ title: z.string() }),
|
|
76
|
-
pullRequests: z.object({ nodes: z.array(z.object({ id: z.string(), state: z.enum(["OPEN", "MERGED", "CLOSED"]) })) }),
|
|
77
|
-
}),
|
|
78
|
-
});
|
|
66
|
+
const RecentIssuesReply = z.object({ repository: z.object({ issues: z.object({ nodes: z.array(z.object({ number: z.int().positive(), title: z.string(), body: z.string() })) }) }) });
|
|
79
67
|
|
|
80
68
|
const CreatedCommit = z.object({ sha: z.string() });
|
|
81
69
|
|
|
@@ -119,14 +107,6 @@ const LABEL = `query Label($owner: String!, $name: String!, $label: String!) {
|
|
|
119
107
|
repository(owner: $owner, name: $name) { id label(name: $label) { id } }
|
|
120
108
|
}`;
|
|
121
109
|
|
|
122
|
-
const PULLS = `query Pulls($owner: String!, $name: String!, $number: Int!, $head: String!) {
|
|
123
|
-
repository(owner: $owner, name: $name) {
|
|
124
|
-
id
|
|
125
|
-
issue(number: $number) { title }
|
|
126
|
-
pullRequests(headRefName: $head, states: [OPEN, MERGED], first: 1) { nodes { id state } }
|
|
127
|
-
}
|
|
128
|
-
}`;
|
|
129
|
-
|
|
130
110
|
const ADD_COMMENT = `mutation AddComment($subject: ID!, $body: String!) {
|
|
131
111
|
addComment(input: { subjectId: $subject, body: $body }) { clientMutationId }
|
|
132
112
|
}`;
|
|
@@ -143,54 +123,15 @@ const CREATE_LABEL = `mutation CreateLabel($repository: ID!, $name: String!, $co
|
|
|
143
123
|
createLabel(input: { repositoryId: $repository, name: $name, color: $color, description: $description }) { label { id } }
|
|
144
124
|
}`;
|
|
145
125
|
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
const CREATE_PULL = `mutation CreatePull($repository: ID!, $base: String!, $head: String!, $title: String!, $body: String!) {
|
|
151
|
-
createPullRequest(input: { repositoryId: $repository, baseRefName: $base, headRefName: $head, title: $title, body: $body }) { clientMutationId }
|
|
126
|
+
/** The newest issues: a follow-up whose note was never written is among them, since the note is written right after it. */
|
|
127
|
+
const RECENT_ISSUES = `query RecentIssues($owner: String!, $name: String!) {
|
|
128
|
+
repository(owner: $owner, name: $name) { issues(first: 20, orderBy: { field: CREATED_AT, direction: DESC }) { nodes { number title body } } }
|
|
152
129
|
}`;
|
|
153
130
|
|
|
154
|
-
const
|
|
155
|
-
|
|
131
|
+
const CREATE_ISSUE = `mutation CreateIssue($repository: ID!, $title: String!, $body: String!, $labels: [ID!]!) {
|
|
132
|
+
createIssue(input: { repositoryId: $repository, title: $title, body: $body, labelIds: $labels }) { issue { number } }
|
|
156
133
|
}`;
|
|
157
134
|
|
|
158
|
-
/** What a failed request means to hum. */
|
|
159
|
-
type Failure =
|
|
160
|
-
/** GitHub answered 304 to a conditional request: nothing changed, and no rate limit was spent. */
|
|
161
|
-
| { readonly kind: "not-modified" }
|
|
162
|
-
/** Another writer took the ref first: it already exists, or it moved since it was read. */
|
|
163
|
-
| { readonly kind: "lost-race" }
|
|
164
|
-
/** No retry fixes it: a 4xx other than a rate limit, or a GraphQL error about the request itself. */
|
|
165
|
-
| { readonly kind: "permanent"; readonly message: string }
|
|
166
|
-
| { readonly kind: "transient" };
|
|
167
|
-
|
|
168
|
-
/** GraphQL errors about the request itself; any other, such as a timeout GitHub reports, may pass on a retry. */
|
|
169
|
-
const PERMANENT_GRAPHQL_ERRORS: ReadonlySet<string> = new Set(["NOT_FOUND", "FORBIDDEN", "UNPROCESSABLE"]);
|
|
170
|
-
|
|
171
|
-
const isRateLimited = (error: RequestError): boolean => error.status === 429 || (error.status === 403 && error.response?.headers["x-ratelimit-remaining"] === "0");
|
|
172
|
-
|
|
173
|
-
const failureOf = (cause: unknown): Failure => {
|
|
174
|
-
if (cause instanceof RequestError) {
|
|
175
|
-
if (cause.status === NOT_MODIFIED) return { kind: "not-modified" };
|
|
176
|
-
|
|
177
|
-
return cause.status >= 400 && cause.status < 500 && !isRateLimited(cause) ? { kind: "permanent", message: cause.message } : { kind: "transient" };
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
const found = cause instanceof GraphqlResponseError ? cause.errors?.[0] : undefined;
|
|
181
|
-
|
|
182
|
-
if (found?.type === "STALE_DATA" || (found?.type === "UNPROCESSABLE" && /already exists/i.test(found.message))) return { kind: "lost-race" };
|
|
183
|
-
|
|
184
|
-
return found && PERMANENT_GRAPHQL_ERRORS.has(found.type ?? "") ? { kind: "permanent", message: found.message } : { kind: "transient" };
|
|
185
|
-
};
|
|
186
|
-
|
|
187
|
-
/** Throws `cause`, marked permanent when no retry can fix it. */
|
|
188
|
-
export const raise = (cause: unknown): never => {
|
|
189
|
-
const failure = failureOf(cause);
|
|
190
|
-
|
|
191
|
-
throw failure.kind === "permanent" ? new PermanentError(failure.message, { cause }) : cause;
|
|
192
|
-
};
|
|
193
|
-
|
|
194
135
|
/** The `owner/name` of a GitHub remote URL, or undefined for any other host. */
|
|
195
136
|
export const repoFromRemote = (url: string): string | undefined => {
|
|
196
137
|
const remote = hostedGitInfo.fromUrl(url.trim());
|
|
@@ -198,41 +139,6 @@ export const repoFromRemote = (url: string): string | undefined => {
|
|
|
198
139
|
return remote?.type === "github" ? `${remote.user}/${remote.project}` : undefined;
|
|
199
140
|
};
|
|
200
141
|
|
|
201
|
-
/** The owner's own login: `GH_TOKEN` or `GITHUB_TOKEN`, else the token `gh` holds. */
|
|
202
|
-
export const ownerToken = async (timeoutMs: number): Promise<string> => {
|
|
203
|
-
const fromEnv = process.env.GH_TOKEN || process.env.GITHUB_TOKEN;
|
|
204
|
-
|
|
205
|
-
if (fromEnv) return fromEnv;
|
|
206
|
-
|
|
207
|
-
const gh = await exec("gh", ["auth", "token"], { stdin: "", timeoutMs });
|
|
208
|
-
const token = gh.stdout.trim();
|
|
209
|
-
|
|
210
|
-
if (gh.exitCode !== 0 || token === "") throw new PermanentError("no GitHub login: run `gh auth login`, or set GH_TOKEN");
|
|
211
|
-
|
|
212
|
-
return token;
|
|
213
|
-
};
|
|
214
|
-
|
|
215
|
-
const retryOnce: NonNullable<ThrottlingOptions["onRateLimit"]> = (_retryAfter, _options, _octokit, retryCount) => retryCount < RATE_LIMIT_RETRIES;
|
|
216
|
-
|
|
217
|
-
export type GitHubClientOptions = {
|
|
218
|
-
readonly token: string;
|
|
219
|
-
readonly baseUrl?: string;
|
|
220
|
-
/** Replaces `fetch`, for a GitHub that is not github.com. */
|
|
221
|
-
readonly fetch?: typeof fetch;
|
|
222
|
-
/** Whether writes are spaced as GitHub asks; only a GitHub with no secondary rate limit may go without. */
|
|
223
|
-
readonly spaced?: boolean;
|
|
224
|
-
};
|
|
225
|
-
|
|
226
|
-
/** A GitHub client that waits out rate limits and spaces its writes as GitHub asks. */
|
|
227
|
-
export const gitHubClient = ({ token, baseUrl, fetch, spaced = true }: GitHubClientOptions): GitHubClient =>
|
|
228
|
-
new HumOctokit({
|
|
229
|
-
auth: token,
|
|
230
|
-
userAgent: "hum",
|
|
231
|
-
baseUrl,
|
|
232
|
-
request: { fetch },
|
|
233
|
-
throttle: { enabled: spaced, onRateLimit: retryOnce, onSecondaryRateLimit: retryOnce },
|
|
234
|
-
});
|
|
235
|
-
|
|
236
142
|
export type GitHubOptions = {
|
|
237
143
|
/** `owner/name`. */
|
|
238
144
|
readonly repo: string;
|
|
@@ -249,12 +155,12 @@ export type GitHubOptions = {
|
|
|
249
155
|
readonly timeoutMs: number;
|
|
250
156
|
};
|
|
251
157
|
|
|
252
|
-
type Whole =
|
|
158
|
+
type Whole = Integrations & {
|
|
253
159
|
readonly workSource: WorkSource;
|
|
254
160
|
readonly questions: Questions;
|
|
255
161
|
readonly answers: Answers;
|
|
256
162
|
readonly release: Release;
|
|
257
|
-
/** Requests so far that spent rate limit; a 304 spends none. */
|
|
163
|
+
/** Requests so far on its client that spent rate limit; a 304 spends none. The owner's client is shared, so other readers count too. */
|
|
258
164
|
readonly spent: () => number;
|
|
259
165
|
};
|
|
260
166
|
|
|
@@ -266,17 +172,17 @@ type StandingClaim = { readonly claim: Claim; readonly sha: string };
|
|
|
266
172
|
* bare commit, and created with `createRef`; a renewal or an expired take is `createCommitOnBranch` on the head it
|
|
267
173
|
* read. `watch` is one REST request with `If-None-Match`, because GitHub answers 304 free of rate limit.
|
|
268
174
|
*/
|
|
269
|
-
export const githubAdapter = (options: GitHubOptions, { now }: AdapterContext): Whole => {
|
|
175
|
+
export const githubAdapter = (options: GitHubOptions, { now, env }: AdapterContext): Whole => {
|
|
270
176
|
const { base, claimPrefix, readyLabel, mergeMethod, timeoutMs } = options;
|
|
271
177
|
const repo = parseArgument(Repo, options.repo);
|
|
272
178
|
const [owner = "", name = ""] = repo.split("/");
|
|
273
179
|
const where = { owner, name };
|
|
274
180
|
const claimRefs = `refs/heads/${claimPrefix}`;
|
|
275
|
-
const issueIds = new
|
|
181
|
+
const issueIds = new ExpiryMap<number, string>(ISSUE_ID_KEPT_MS);
|
|
276
182
|
let spent = 0;
|
|
277
183
|
|
|
278
184
|
const client = pMemoize(async () => {
|
|
279
|
-
const made = options.client ??
|
|
185
|
+
const made = options.client ?? (await ownerGitHub(timeoutMs, env));
|
|
280
186
|
|
|
281
187
|
made.hook.after("request", () => void spent++);
|
|
282
188
|
made.hook.error("request", (error) => {
|
|
@@ -338,7 +244,7 @@ export const githubAdapter = (options: GitHubOptions, { now }: AdapterContext):
|
|
|
338
244
|
return { repository: repository.id, label: repository.label?.id ?? (await made()) };
|
|
339
245
|
});
|
|
340
246
|
|
|
341
|
-
const claimFrom = (item:
|
|
247
|
+
const claimFrom = (item: ItemId, target: { oid?: string; message?: string } | undefined): Claim | undefined => claimOfCommit(item, target?.message ?? "");
|
|
342
248
|
|
|
343
249
|
const firstClaim = async (claim: Claim): Promise<boolean> => {
|
|
344
250
|
const { repository } = await query(BaseReply, BASE, { baseRef: `refs/heads/${base}` });
|
|
@@ -368,14 +274,10 @@ export const githubAdapter = (options: GitHubOptions, { now }: AdapterContext):
|
|
|
368
274
|
now,
|
|
369
275
|
);
|
|
370
276
|
|
|
371
|
-
const
|
|
372
|
-
const { repository } = await query(PullsReply, PULLS, { number: parseArgument(IssueNumber, id), head });
|
|
373
|
-
|
|
374
|
-
return { ...repository, pull: repository.pullRequests.nodes[0] };
|
|
375
|
-
};
|
|
277
|
+
const pulls = gitHubPullRequests(repo, { timeoutMs, client });
|
|
376
278
|
|
|
377
279
|
return {
|
|
378
|
-
apiVersion:
|
|
280
|
+
apiVersion: ADAPTER_API_VERSION,
|
|
379
281
|
spent: () => spent,
|
|
380
282
|
workSource: {
|
|
381
283
|
listReady: async () => {
|
|
@@ -383,9 +285,13 @@ export const githubAdapter = (options: GitHubOptions, { now }: AdapterContext):
|
|
|
383
285
|
|
|
384
286
|
if (refs.totalCount > refs.nodes.length) throw new PermanentError(`${repo} holds ${refs.totalCount} claim branches; hum reads ${refs.nodes.length}`);
|
|
385
287
|
|
|
386
|
-
const claims = new Map(refs.nodes.
|
|
288
|
+
const claims = new Map(refs.nodes.flatMap((ref) => {
|
|
289
|
+
const item = ItemId.safeParse(ref.name);
|
|
387
290
|
|
|
388
|
-
|
|
291
|
+
return item.success ? [[ref.name, claimFrom(item.data, ref.target)] as const] : [];
|
|
292
|
+
}));
|
|
293
|
+
|
|
294
|
+
return issues.nodes.flatMap(({ number, title }) => (isLive(claims.get(String(number)), now()) ? [] : [{ id: ItemId.parse(String(number)), title }]));
|
|
389
295
|
},
|
|
390
296
|
read: async (id): Promise<Item> => {
|
|
391
297
|
const { issue, ref } = await fetchItem(parseArgument(IssueNumber, id));
|
|
@@ -399,8 +305,8 @@ export const githubAdapter = (options: GitHubOptions, { now }: AdapterContext):
|
|
|
399
305
|
labels: issue.labels.nodes.map((label) => label.name),
|
|
400
306
|
};
|
|
401
307
|
},
|
|
402
|
-
claim: (id, holder, ttlMs) => take("claim",
|
|
403
|
-
renew: (id, holder, ttlMs) => take("renew",
|
|
308
|
+
claim: (id, holder, ttlMs) => take("claim", parseArgument(IssueId, id), holder, ttlMs),
|
|
309
|
+
renew: (id, holder, ttlMs) => take("renew", parseArgument(IssueId, id), holder, ttlMs),
|
|
404
310
|
comment: (id, text) => comment(id, commentText(text)),
|
|
405
311
|
fileFollowUp: async (from, { title, body }) => {
|
|
406
312
|
const { issue } = await fetchItem(parseArgument(IssueNumber, from));
|
|
@@ -408,13 +314,19 @@ export const githubAdapter = (options: GitHubOptions, { now }: AdapterContext):
|
|
|
408
314
|
|
|
409
315
|
if (filed !== undefined) return { id: filed, title };
|
|
410
316
|
|
|
411
|
-
const
|
|
412
|
-
|
|
413
|
-
|
|
317
|
+
const created = async () => {
|
|
318
|
+
const { repository, label } = await labelled();
|
|
319
|
+
|
|
320
|
+
return (await mutate(CreatedIssue, CREATE_ISSUE, { repository, title, body: followUpBody(body, `#${from}`), labels: [label] })).createIssue.issue.number;
|
|
321
|
+
};
|
|
322
|
+
|
|
323
|
+
const recent = (await query(RecentIssuesReply, RECENT_ISSUES, {})).repository.issues.nodes;
|
|
324
|
+
const id = ItemId.parse(String(recent.find(isFollowUpOf(`#${from}`, title))?.number ?? (await created())));
|
|
325
|
+
const note = followUpNote(title, id);
|
|
414
326
|
|
|
415
327
|
await commentMarked(from, note.marker, note.text);
|
|
416
328
|
|
|
417
|
-
return { id
|
|
329
|
+
return { id, title };
|
|
418
330
|
},
|
|
419
331
|
},
|
|
420
332
|
questions: {
|
|
@@ -439,18 +351,20 @@ export const githubAdapter = (options: GitHubOptions, { now }: AdapterContext):
|
|
|
439
351
|
},
|
|
440
352
|
release: {
|
|
441
353
|
publish: async (id, ref) => {
|
|
442
|
-
const
|
|
354
|
+
const found = await pulls.find(ref);
|
|
355
|
+
|
|
356
|
+
if (found !== undefined && found.state !== "CLOSED") return;
|
|
443
357
|
|
|
444
|
-
|
|
358
|
+
const { issue } = await fetchItem(parseArgument(IssueNumber, id));
|
|
445
359
|
|
|
446
|
-
await
|
|
360
|
+
await pulls.open({ head: ref, base, title: issue.title, body: `Closes #${id}` });
|
|
447
361
|
},
|
|
448
362
|
release: async (id, ref) => {
|
|
449
|
-
const
|
|
363
|
+
const pull = await pulls.find(ref);
|
|
450
364
|
|
|
451
|
-
if (!pull) throw new PermanentError(`no pull request from ${ref} to release for item ${id}`);
|
|
365
|
+
if (!pull || pull.state === "CLOSED") throw new PermanentError(`no pull request from ${ref} to release for item ${id}`);
|
|
452
366
|
|
|
453
|
-
if (pull.state === "OPEN") await
|
|
367
|
+
if (pull.state === "OPEN") await pulls.merge(pull, mergeMethod);
|
|
454
368
|
},
|
|
455
369
|
},
|
|
456
370
|
};
|
package/src/adapters/guard.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import pRetry, { AbortError, type RetryContext } from "p-retry";
|
|
2
2
|
import { z } from "zod";
|
|
3
|
-
import { type Adapter, ClaimResult, Item, ItemRef, PermanentError, Watch, type WorkSource } from "../adapter-api.ts";
|
|
3
|
+
import { type Adapter, ClaimResult, Failed, type Fallible, type Integrations, Item, ItemId, ItemRef, PermanentError, Watch, type WorkSource } from "../adapter-api.ts";
|
|
4
4
|
import { type HumConfig, SHIPPED_DEFAULTS } from "../config/schema.ts";
|
|
5
5
|
import type { Faults } from "../state/faults.ts";
|
|
6
6
|
import { SECOND_MS } from "../time.ts";
|
|
@@ -42,10 +42,11 @@ const abortIfPermanent = (cause: unknown): never => {
|
|
|
42
42
|
* - A transient failure is retried inside the timeout; one that outlasts it raises one card and throws.
|
|
43
43
|
* - An empty ready list that contradicts the last read is a fault, not "no work".
|
|
44
44
|
* - A call that would double on a retry (`comment`, `ask`, `decide`, `answer`) runs once; its caller retries it under an op key.
|
|
45
|
+
* - An answer of `failed: "now"` raises one card and throws at once; `failed: "retry"` is a transient failure like any other.
|
|
45
46
|
*/
|
|
46
|
-
export const guarded = (adapter: Adapter, { provider, faults, timeoutMs, backoffMs = SHIPPED_BACKOFF_MS, lastReady: remembered }: GuardOptions):
|
|
47
|
-
const unavailable =
|
|
48
|
-
const contradicted =
|
|
47
|
+
export const guarded = (adapter: Adapter, { provider, faults, timeoutMs, backoffMs = SHIPPED_BACKOFF_MS, lastReady: remembered }: GuardOptions): Integrations => {
|
|
48
|
+
const unavailable = { code: "provider-unavailable", item: provider };
|
|
49
|
+
const contradicted = { code: "empty-list", item: provider };
|
|
49
50
|
|
|
50
51
|
const refuseChangedReply = (error: z.ZodError): never => {
|
|
51
52
|
const [issue] = error.issues;
|
|
@@ -71,14 +72,24 @@ export const guarded = (adapter: Adapter, { provider, faults, timeoutMs, backoff
|
|
|
71
72
|
});
|
|
72
73
|
};
|
|
73
74
|
|
|
74
|
-
const
|
|
75
|
+
const failNow = ({ why }: Failed): never => {
|
|
76
|
+
faults.raise({ code: "provider-failed", item: provider, cause: `${provider} could not complete a call: ${why}`, fix: `Fix what ${provider} names, or update its adapter; hum calls it again on its next tick.` });
|
|
77
|
+
|
|
78
|
+
throw new PermanentError(`${provider}: ${why}`);
|
|
79
|
+
};
|
|
80
|
+
|
|
81
|
+
const once = async <T>(call: () => Promise<T | Failed>, schema: z.ZodType<T>): Promise<T> => {
|
|
75
82
|
const reply = await call();
|
|
83
|
+
const failed = Failed.safeParse(reply);
|
|
84
|
+
|
|
85
|
+
if (failed.success) return failed.data.failed === "now" ? failNow(failed.data) : Promise.reject(new Error(`${provider}: ${failed.data.why}`));
|
|
86
|
+
|
|
76
87
|
const parsed = schema.safeParse(reply);
|
|
77
88
|
|
|
78
89
|
return parsed.success ? parsed.data : refuseChangedReply(parsed.error);
|
|
79
90
|
};
|
|
80
91
|
|
|
81
|
-
const retried = async <T>(call: () => Promise<T>, schema: z.ZodType<T>): Promise<T> => {
|
|
92
|
+
const retried = async <T>(call: () => Promise<T | Failed>, schema: z.ZodType<T>): Promise<T> => {
|
|
82
93
|
const value = await pRetry(() => once(call, schema).catch(abortIfPermanent), {
|
|
83
94
|
retries: Number.POSITIVE_INFINITY,
|
|
84
95
|
maxRetryTime: timeoutMs,
|
|
@@ -93,15 +104,15 @@ export const guarded = (adapter: Adapter, { provider, faults, timeoutMs, backoff
|
|
|
93
104
|
};
|
|
94
105
|
|
|
95
106
|
const { workSource, questions, answers, release } = adapter;
|
|
96
|
-
let lastReadyIds:
|
|
107
|
+
let lastReadyIds: ItemId[] = (remembered?.load() ?? []).flatMap((id) => ItemId.safeParse(id).data ?? []);
|
|
97
108
|
|
|
98
|
-
const firstStillReady = async (source: WorkSource
|
|
109
|
+
const firstStillReady = async (source: Fallible<WorkSource>, ids: readonly ItemId[]): Promise<ItemId | undefined> => {
|
|
99
110
|
for (const id of ids) if ((await retried(() => source.read(id), Item)).ready) return id;
|
|
100
111
|
|
|
101
112
|
return undefined;
|
|
102
113
|
};
|
|
103
114
|
|
|
104
|
-
const refuseContradictingEmptyList = async (source: WorkSource): Promise<void> => {
|
|
115
|
+
const refuseContradictingEmptyList = async (source: Fallible<WorkSource>): Promise<void> => {
|
|
105
116
|
const stillReady = await firstStillReady(source, lastReadyIds);
|
|
106
117
|
|
|
107
118
|
if (stillReady === undefined) return;
|
package/src/adapters/history.ts
CHANGED
|
@@ -3,6 +3,7 @@ import parseDiff from "parse-diff";
|
|
|
3
3
|
import PQueue from "p-queue";
|
|
4
4
|
import pkg from "../../package.json" with { type: "json" };
|
|
5
5
|
import type { HumConfig } from "../config/schema.ts";
|
|
6
|
+
import { SECOND_MS } from "../time.ts";
|
|
6
7
|
import { labelChanges, type PastChange } from "../decide/labels.ts";
|
|
7
8
|
import type { Change, Histories, Label } from "../decide/risk.ts";
|
|
8
9
|
import { type Git, PATCH } from "./git.ts";
|
|
@@ -50,7 +51,7 @@ const readLog = async (
|
|
|
50
51
|
return {
|
|
51
52
|
sha,
|
|
52
53
|
subject,
|
|
53
|
-
committedAt: Number(committed) *
|
|
54
|
+
committedAt: Number(committed) * SECOND_MS,
|
|
54
55
|
body: body.trim(),
|
|
55
56
|
files: counted.map(({ file }) => file),
|
|
56
57
|
size: counted.reduce((sum, { lines }) => sum + lines, 0),
|
|
@@ -79,7 +80,7 @@ const rewrittenRanges = (
|
|
|
79
80
|
}),
|
|
80
81
|
);
|
|
81
82
|
|
|
82
|
-
/** The changes that wrote the lines `sha` deleted or rewrote: git blame at its parent. */
|
|
83
|
+
/** The changes that wrote the lines `sha` deleted or rewrote: git blame at its parent. A root commit deletes nothing, so it blames nothing; a blame git fails throws. */
|
|
83
84
|
const blame = async (git: Git, sha: string): Promise<readonly string[]> => {
|
|
84
85
|
const diff = await git.raw([
|
|
85
86
|
"show",
|
|
@@ -92,7 +93,7 @@ const blame = async (git: Git, sha: string): Promise<readonly string[]> => {
|
|
|
92
93
|
|
|
93
94
|
const found = await Promise.all(
|
|
94
95
|
rewrittenRanges(diff).map(async ({ file, from, to }) => {
|
|
95
|
-
const
|
|
96
|
+
const blamed = await git.raw([
|
|
96
97
|
"blame",
|
|
97
98
|
"--porcelain",
|
|
98
99
|
"-L",
|
|
@@ -102,11 +103,7 @@ const blame = async (git: Git, sha: string): Promise<readonly string[]> => {
|
|
|
102
103
|
file,
|
|
103
104
|
]);
|
|
104
105
|
|
|
105
|
-
return
|
|
106
|
-
? result.stdout
|
|
107
|
-
.split("\n")
|
|
108
|
-
.flatMap((line) => BLAME_HEADER.exec(line)?.[1] ?? [])
|
|
109
|
-
: [];
|
|
106
|
+
return blamed.split("\n").flatMap((line) => BLAME_HEADER.exec(line)?.[1] ?? []);
|
|
110
107
|
}),
|
|
111
108
|
);
|
|
112
109
|
|
|
@@ -124,14 +121,14 @@ export const readHistory = async (
|
|
|
124
121
|
): Promise<PastChange[]> => {
|
|
125
122
|
const changes = await readLog(git, base, historyDepth);
|
|
126
123
|
|
|
127
|
-
const
|
|
124
|
+
const doesRewrite = (change: PastChange): boolean =>
|
|
128
125
|
[changeLabels.fixSubject, changeLabels.revertSubject].some((subject) => new RegExp(subject).test(change.subject));
|
|
129
126
|
|
|
130
127
|
const queue = new PQueue({ concurrency: BLAMES_AT_ONCE });
|
|
131
128
|
|
|
132
129
|
return Promise.all(
|
|
133
130
|
changes.map(async (change) =>
|
|
134
|
-
|
|
131
|
+
doesRewrite(change)
|
|
135
132
|
? {
|
|
136
133
|
...change,
|
|
137
134
|
blamed: (await queue.add(() => blame(git, change.sha))) ?? [],
|
|
@@ -167,7 +164,7 @@ export const historiesOf = (
|
|
|
167
164
|
);
|
|
168
165
|
};
|
|
169
166
|
|
|
170
|
-
const
|
|
167
|
+
const doesMatchAny = (sources: readonly string[], line: string): boolean =>
|
|
171
168
|
sources.some((source) => new RegExp(source).test(line));
|
|
172
169
|
|
|
173
170
|
/** What a diff tells the risk level: the paths, the size, a loosened check and a change to the engine's pin. */
|
|
@@ -187,7 +184,7 @@ export const changeOf = (
|
|
|
187
184
|
),
|
|
188
185
|
);
|
|
189
186
|
|
|
190
|
-
const
|
|
187
|
+
const doesHoldPin = (file: parseDiff.File): boolean =>
|
|
191
188
|
[MANIFEST, ...lockfiles].includes(basename(file.to ?? file.from ?? ""));
|
|
192
189
|
|
|
193
190
|
return {
|
|
@@ -204,12 +201,12 @@ export const changeOf = (
|
|
|
204
201
|
size: files.reduce((sum, file) => sum + file.additions + file.deletions, 0),
|
|
205
202
|
loosened: lines.some(
|
|
206
203
|
({ change, text }) =>
|
|
207
|
-
(change.type === "add" &&
|
|
208
|
-
(change.type === "del" &&
|
|
204
|
+
(change.type === "add" && doesMatchAny(loosenedCheck.added, text)) ||
|
|
205
|
+
(change.type === "del" && doesMatchAny(loosenedCheck.removed, text)),
|
|
209
206
|
),
|
|
210
207
|
pinChanged: lines.some(
|
|
211
208
|
({ file, change, text }) =>
|
|
212
|
-
change.type !== "normal" &&
|
|
209
|
+
change.type !== "normal" && doesHoldPin(file) && text.includes(pkg.name),
|
|
213
210
|
),
|
|
214
211
|
};
|
|
215
212
|
};
|
|
@@ -20,7 +20,7 @@ const FRONT_MATTER_FENCE = "---";
|
|
|
20
20
|
|
|
21
21
|
const FrontMatter = z.looseObject({ title: z.string().min(1), state: z.string().min(1), kind: z.string().min(1).optional() });
|
|
22
22
|
|
|
23
|
-
const EntryMarker = z.
|
|
23
|
+
const EntryMarker = z.object({ kind: z.enum(THREAD_KINDS), at: z.int().nonnegative(), option: z.string().min(1).optional() });
|
|
24
24
|
|
|
25
25
|
const Span = z.object({ start: z.object({ offset: z.int() }), end: z.object({ offset: z.int() }) });
|
|
26
26
|
|