diff --git a/packages/loopover-miner/lib/ams-policy.d.ts b/packages/loopover-miner/lib/ams-policy.d.ts index 6fbac40645..e7ee82e60a 100644 --- a/packages/loopover-miner/lib/ams-policy.d.ts +++ b/packages/loopover-miner/lib/ams-policy.d.ts @@ -1,20 +1,28 @@ import type { AmsPolicySpec } from "@loopover/engine"; -export function resolveAmsPolicyConfigPath(env?: Record): string; - export type AmsPolicySource = "local" | "default"; - export type ResolvedAmsPolicy = { - spec: AmsPolicySpec; - source: AmsPolicySource; - warnings: string[]; + spec: AmsPolicySpec; + source: AmsPolicySource; + warnings: string[]; }; - -export function resolveAmsPolicy( - repoFullName: string, - options?: { +export type AmsPolicyOptions = { + /** Accepted for forward/API compatibility with callers that pass a fetch override; unused today since this + * resolver never fetches (see the module doc comment above). */ fetchImpl?: unknown; readFileSync?: (path: string, encoding: "utf8") => string; existsSync?: (path: string) => boolean; env?: Record; - }, -): Promise; +}; +/** Resolve the operator's local AMS policy file path: explicit env var > `LOOPOVER_MINER_CONFIG_DIR` > + * `XDG_CONFIG_HOME`/`~/.config`, mirroring every other local-store path in this package. */ +export declare function resolveAmsPolicyConfigPath(env?: Record): string; +/** + * Resolve the real, effective AMS execution policy for one attempt: the operator's own local + * `.loopover-ams.yml` when present (source: "local"), else the engine's safe defaults (source: "default"). + * Never throws -- an unreadable/malformed local file degrades through the tolerant parser to the safe + * defaults, same discipline as every other tolerant parser in this pipeline. + * + * `repoFullName` is accepted for API compatibility with callers that resolve policy per target repo, but the + * resolver intentionally does not fetch or trust target-repository AMS policy content. + */ +export declare function resolveAmsPolicy(repoFullName: string, options?: AmsPolicyOptions): Promise; diff --git a/packages/loopover-miner/lib/ams-policy.js b/packages/loopover-miner/lib/ams-policy.js index 3574b2b15e..0fbbfe17f9 100644 --- a/packages/loopover-miner/lib/ams-policy.js +++ b/packages/loopover-miner/lib/ams-policy.js @@ -1,7 +1,6 @@ import { existsSync, readFileSync } from "node:fs"; import { DEFAULT_AMS_POLICY_SPEC, parseAmsPolicySpecContent } from "@loopover/engine"; import { resolveLocalStoreDbPath } from "./local-store.js"; - // Resolver for the operator-local `.loopover-ams.yml` (#5132, Wave 3.5 follow-up). AmsPolicySpec // (ams-policy-spec.ts, engine package) is the type/parser surface; this module is the actual local // read+resolve caller. @@ -9,35 +8,32 @@ import { resolveLocalStoreDbPath } from "./local-store.js"; // This is deliberately NOT the same resolution shape as self-review-context.js/rejection-signal.js, which // read from the target repo: AmsPolicySpec's fields are the OPERATOR's own execution-risk policy, so an // untrusted target repo must never get final say over them. - const AMS_POLICY_FILENAME = ".loopover-ams.yml"; - /** Resolve the operator's local AMS policy file path: explicit env var > `LOOPOVER_MINER_CONFIG_DIR` > * `XDG_CONFIG_HOME`/`~/.config`, mirroring every other local-store path in this package. */ export function resolveAmsPolicyConfigPath(env = process.env) { - return resolveLocalStoreDbPath(AMS_POLICY_FILENAME, "LOOPOVER_MINER_AMS_POLICY_PATH", env); + return resolveLocalStoreDbPath(AMS_POLICY_FILENAME, "LOOPOVER_MINER_AMS_POLICY_PATH", env); } - function normalizeOptions(options = {}) { - return { - readFileSync: options.readFileSync ?? readFileSync, - existsSync: options.existsSync ?? existsSync, - env: options.env ?? process.env, - }; + return { + readFileSync: options.readFileSync ?? readFileSync, + existsSync: options.existsSync ?? existsSync, + env: options.env ?? process.env, + }; } - /** Read the operator's own local `.loopover-ams.yml`, if one exists. Never throws: an unreadable file is * treated the same as an absent one, falling through to the next resolution layer. */ function readLocalAmsPolicyContent(resolved) { - const path = resolveAmsPolicyConfigPath(resolved.env); - if (!resolved.existsSync(path)) return null; - try { - return resolved.readFileSync(path, "utf8"); - } catch { - return null; - } + const path = resolveAmsPolicyConfigPath(resolved.env); + if (!resolved.existsSync(path)) + return null; + try { + return resolved.readFileSync(path, "utf8"); + } + catch { + return null; + } } - /** * Resolve the real, effective AMS execution policy for one attempt: the operator's own local * `.loopover-ams.yml` when present (source: "local"), else the engine's safe defaults (source: "default"). @@ -46,23 +42,15 @@ function readLocalAmsPolicyContent(resolved) { * * `repoFullName` is accepted for API compatibility with callers that resolve policy per target repo, but the * resolver intentionally does not fetch or trust target-repository AMS policy content. - * - * @param {string} repoFullName - * @param {{ - * readFileSync?: (path: string, encoding: "utf8") => string, existsSync?: (path: string) => boolean, - * env?: Record, - * }} [options] - * @returns {Promise<{ spec: import("@loopover/engine").AmsPolicySpec, source: "local"|"default", warnings: string[] }>} */ export async function resolveAmsPolicy(repoFullName, options = {}) { - void repoFullName; - const resolved = normalizeOptions(options); - - const localContent = readLocalAmsPolicyContent(resolved); - if (localContent !== null) { - const parsed = parseAmsPolicySpecContent(localContent); - return { spec: parsed.spec, source: "local", warnings: parsed.warnings }; - } - - return { spec: DEFAULT_AMS_POLICY_SPEC, source: "default", warnings: [] }; + void repoFullName; + const resolved = normalizeOptions(options); + const localContent = readLocalAmsPolicyContent(resolved); + if (localContent !== null) { + const parsed = parseAmsPolicySpecContent(localContent); + return { spec: parsed.spec, source: "local", warnings: parsed.warnings }; + } + return { spec: DEFAULT_AMS_POLICY_SPEC, source: "default", warnings: [] }; } +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW1zLXBvbGljeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImFtcy1wb2xpY3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxZQUFZLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFFbkQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLHlCQUF5QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDdEYsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFM0QsaUdBQWlHO0FBQ2pHLG1HQUFtRztBQUNuRyx1QkFBdUI7QUFDdkIsRUFBRTtBQUNGLDBHQUEwRztBQUMxRyx3R0FBd0c7QUFDeEcsNERBQTREO0FBRTVELE1BQU0sbUJBQW1CLEdBQUcsbUJBQW1CLENBQUM7QUF5QmhEOzZGQUM2RjtBQUM3RixNQUFNLFVBQVUsMEJBQTBCLENBQUMsTUFBMEMsT0FBTyxDQUFDLEdBQUc7SUFDOUYsT0FBTyx1QkFBdUIsQ0FBQyxtQkFBbUIsRUFBRSxnQ0FBZ0MsRUFBRSxHQUFHLENBQUMsQ0FBQztBQUM3RixDQUFDO0FBRUQsU0FBUyxnQkFBZ0IsQ0FBQyxVQUE0QixFQUFFO0lBQ3RELE9BQU87UUFDTCxZQUFZLEVBQUUsT0FBTyxDQUFDLFlBQVksSUFBSSxZQUFZO1FBQ2xELFVBQVUsRUFBRSxPQUFPLENBQUMsVUFBVSxJQUFJLFVBQVU7UUFDNUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUc7S0FDaEMsQ0FBQztBQUNKLENBQUM7QUFFRDt1RkFDdUY7QUFDdkYsU0FBUyx5QkFBeUIsQ0FBQyxRQUFvQztJQUNyRSxNQUFNLElBQUksR0FBRywwQkFBMEIsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdEQsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQUUsT0FBTyxJQUFJLENBQUM7SUFDNUMsSUFBSSxDQUFDO1FBQ0gsT0FBTyxRQUFRLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxnQkFBZ0IsQ0FDcEMsWUFBb0IsRUFDcEIsVUFBNEIsRUFBRTtJQUU5QixLQUFLLFlBQVksQ0FBQztJQUNsQixNQUFNLFFBQVEsR0FBRyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUUzQyxNQUFNLFlBQVksR0FBRyx5QkFBeUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN6RCxJQUFJLFlBQVksS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUMxQixNQUFNLE1BQU0sR0FBRyx5QkFBeUIsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUN2RCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzNFLENBQUM7SUFFRCxPQUFPLEVBQUUsSUFBSSxFQUFFLHVCQUF1QixFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFDO0FBQzVFLENBQUMifQ== \ No newline at end of file diff --git a/packages/loopover-miner/lib/ams-policy.ts b/packages/loopover-miner/lib/ams-policy.ts new file mode 100644 index 0000000000..19dad08b41 --- /dev/null +++ b/packages/loopover-miner/lib/ams-policy.ts @@ -0,0 +1,88 @@ +import { existsSync, readFileSync } from "node:fs"; +import type { AmsPolicySpec } from "@loopover/engine"; +import { DEFAULT_AMS_POLICY_SPEC, parseAmsPolicySpecContent } from "@loopover/engine"; +import { resolveLocalStoreDbPath } from "./local-store.js"; + +// Resolver for the operator-local `.loopover-ams.yml` (#5132, Wave 3.5 follow-up). AmsPolicySpec +// (ams-policy-spec.ts, engine package) is the type/parser surface; this module is the actual local +// read+resolve caller. +// +// This is deliberately NOT the same resolution shape as self-review-context.js/rejection-signal.js, which +// read from the target repo: AmsPolicySpec's fields are the OPERATOR's own execution-risk policy, so an +// untrusted target repo must never get final say over them. + +const AMS_POLICY_FILENAME = ".loopover-ams.yml"; + +export type AmsPolicySource = "local" | "default"; + +export type ResolvedAmsPolicy = { + spec: AmsPolicySpec; + source: AmsPolicySource; + warnings: string[]; +}; + +export type AmsPolicyOptions = { + /** Accepted for forward/API compatibility with callers that pass a fetch override; unused today since this + * resolver never fetches (see the module doc comment above). */ + fetchImpl?: unknown; + readFileSync?: (path: string, encoding: "utf8") => string; + existsSync?: (path: string) => boolean; + env?: Record; +}; + +type NormalizedAmsPolicyOptions = { + readFileSync: (path: string, encoding: "utf8") => string; + existsSync: (path: string) => boolean; + env: Record; +}; + +/** Resolve the operator's local AMS policy file path: explicit env var > `LOOPOVER_MINER_CONFIG_DIR` > + * `XDG_CONFIG_HOME`/`~/.config`, mirroring every other local-store path in this package. */ +export function resolveAmsPolicyConfigPath(env: Record = process.env): string { + return resolveLocalStoreDbPath(AMS_POLICY_FILENAME, "LOOPOVER_MINER_AMS_POLICY_PATH", env); +} + +function normalizeOptions(options: AmsPolicyOptions = {}): NormalizedAmsPolicyOptions { + return { + readFileSync: options.readFileSync ?? readFileSync, + existsSync: options.existsSync ?? existsSync, + env: options.env ?? process.env, + }; +} + +/** Read the operator's own local `.loopover-ams.yml`, if one exists. Never throws: an unreadable file is + * treated the same as an absent one, falling through to the next resolution layer. */ +function readLocalAmsPolicyContent(resolved: NormalizedAmsPolicyOptions): string | null { + const path = resolveAmsPolicyConfigPath(resolved.env); + if (!resolved.existsSync(path)) return null; + try { + return resolved.readFileSync(path, "utf8"); + } catch { + return null; + } +} + +/** + * Resolve the real, effective AMS execution policy for one attempt: the operator's own local + * `.loopover-ams.yml` when present (source: "local"), else the engine's safe defaults (source: "default"). + * Never throws -- an unreadable/malformed local file degrades through the tolerant parser to the safe + * defaults, same discipline as every other tolerant parser in this pipeline. + * + * `repoFullName` is accepted for API compatibility with callers that resolve policy per target repo, but the + * resolver intentionally does not fetch or trust target-repository AMS policy content. + */ +export async function resolveAmsPolicy( + repoFullName: string, + options: AmsPolicyOptions = {}, +): Promise { + void repoFullName; + const resolved = normalizeOptions(options); + + const localContent = readLocalAmsPolicyContent(resolved); + if (localContent !== null) { + const parsed = parseAmsPolicySpecContent(localContent); + return { spec: parsed.spec, source: "local", warnings: parsed.warnings }; + } + + return { spec: DEFAULT_AMS_POLICY_SPEC, source: "default", warnings: [] }; +} diff --git a/packages/loopover-miner/lib/attempt-runner.d.ts b/packages/loopover-miner/lib/attempt-runner.d.ts index 0e966049f9..b440eb31e9 100644 --- a/packages/loopover-miner/lib/attempt-runner.d.ts +++ b/packages/loopover-miner/lib/attempt-runner.d.ts @@ -1,63 +1,67 @@ -import type { - CodingAgentDriver, - GovernorDecision, - IterateLoopInput, - IterateLoopResult, - LocalWriteActionSpec, -} from "@loopover/engine"; -import type { HarnessSubmissionDecision, HarnessSubmissionEventLedger } from "./harness-submission-trigger.js"; -import type { SubmissionFreshnessClaimLedger, LiveIssueSnapshot, FreshnessAbortReason } from "./submission-freshness-check.js"; +import type { CodingAgentDriver, GovernorDecision, IterateLoopInput, IterateLoopResult, IterateLoopShouldAbort, LocalWriteActionSpec } from "@loopover/engine"; +import type { FreshnessAbortReason, LiveIssueSnapshot, SubmissionFreshnessClaimLedger } from "./submission-freshness-check.js"; import type { GovernorChokepointInputPersisted } from "./governor-chokepoint-persisted.js"; import type { GovernorState } from "./governor-state.js"; - -export const ATTEMPT_OUTCOMES: readonly ["abandon", "stale", "blocked", "governed", "submitted"]; - -// rateLimitBuckets/rateLimitBackoffAttempts/capUsage are optional here (via GovernorChokepointInputPersisted, -// not the engine's own GovernorChokepointInput) so a caller can omit them and let evaluateGovernorChokepointGatePersisted -// (#5134) auto-supply real persisted state -- forcing them required at this layer would make every caller -// hand-thread honest-but-stale zero defaults on every invocation, silently defeating that persistence. +import type { HarnessSubmissionDecision, HarnessSubmissionEventLedger } from "./harness-submission-trigger.js"; +export declare const ATTEMPT_OUTCOMES: readonly ["abandon", "stale", "blocked", "governed", "submitted"]; export type AttemptGovernorContext = Omit; - export type AttemptInput = { - loopInput: IterateLoopInput; - issueNumber: number; - minerLogin: string; - base: string; - killSwitchScope: "global" | "repo" | "none"; - slopThreshold: "clean" | "low" | "elevated" | "high"; - submissionMode: "observe" | "enforce"; - maxConsecutiveGateBlocks?: number; - draft?: boolean; - governor: AttemptGovernorContext; + loopInput: IterateLoopInput; + issueNumber: number; + minerLogin: string; + base: string; + killSwitchScope: "global" | "repo" | "none"; + slopThreshold: "clean" | "low" | "elevated" | "high"; + submissionMode: "observe" | "enforce"; + maxConsecutiveGateBlocks?: number; + draft?: boolean; + governor: AttemptGovernorContext; }; - export type AttemptDeps = { - driver: CodingAgentDriver; - runSlopAssessment: (input: unknown) => unknown; - appendAttemptLogEvent: (event: unknown) => void; - claimLedger: SubmissionFreshnessClaimLedger; - fetchLiveIssueSnapshot: (repoFullName: string, issueNumber: number) => Promise; - eventLedger: HarnessSubmissionEventLedger; - /** Injected governor-ledger append (mirrors evaluateGovernorChokepointGate's own `options.append`); omitted - * falls back to that function's own default (the real default governor ledger). */ - governorLedgerAppend?: (event: unknown) => unknown; - /** Injected governor-state store (#5134); omitted falls back to evaluateGovernorChokepointGatePersisted's - * own default (opens + closes the real default governor-state store for this one call). */ - governorState?: GovernorState; - sessionStartMs?: number; - nowMs: number; - executeLocalWrite: (spec: LocalWriteActionSpec) => Promise; - /** Mid-attempt kill-switch probe threaded into `runIterateLoop` (#5670). */ - shouldAbort?: () => import("@loopover/engine").IterateLoopShouldAbort; - /** Live kill-switch scope resolver after handoff (#5670); defaults to the frozen attempt-start scope. */ - resolveKillSwitchScope?: () => "global" | "repo" | "none"; + driver: CodingAgentDriver; + runSlopAssessment: (input: unknown) => unknown; + appendAttemptLogEvent: (event: unknown) => void; + claimLedger: SubmissionFreshnessClaimLedger; + fetchLiveIssueSnapshot: (repoFullName: string, issueNumber: number) => Promise; + eventLedger: HarnessSubmissionEventLedger; + /** Injected governor-ledger append (mirrors evaluateGovernorChokepointGate's own `options.append`); omitted + * falls back to that function's own default (the real default governor ledger). */ + governorLedgerAppend?: (event: unknown) => unknown; + /** Injected governor-state store (#5134); omitted falls back to evaluateGovernorChokepointGatePersisted's + * own default (opens + closes the real default governor-state store for this one call). */ + governorState?: GovernorState; + sessionStartMs?: number; + nowMs: number; + executeLocalWrite: (spec: LocalWriteActionSpec) => Promise; + /** Mid-attempt kill-switch probe threaded into `runIterateLoop` (#5670). */ + shouldAbort?: () => IterateLoopShouldAbort; + /** Live kill-switch scope resolver after handoff (#5670); defaults to the frozen attempt-start scope. */ + resolveKillSwitchScope?: () => "global" | "repo" | "none"; +}; +export type AttemptResult = { + outcome: "abandon"; + loopResult: IterateLoopResult; +} | { + outcome: "stale"; + reason: FreshnessAbortReason; + loopResult: IterateLoopResult; +} | { + outcome: "blocked"; + decision: HarnessSubmissionDecision; + loopResult: IterateLoopResult; +} | { + outcome: "governed"; + decision: GovernorDecision; + loopResult: IterateLoopResult; +} | { + outcome: "submitted"; + spec: LocalWriteActionSpec; + execResult: unknown; + loopResult: IterateLoopResult; }; - -export type AttemptResult = - | { outcome: "abandon"; loopResult: IterateLoopResult } - | { outcome: "stale"; reason: FreshnessAbortReason; loopResult: IterateLoopResult } - | { outcome: "blocked"; decision: HarnessSubmissionDecision; loopResult: IterateLoopResult } - | { outcome: "governed"; decision: GovernorDecision; loopResult: IterateLoopResult } - | { outcome: "submitted"; spec: LocalWriteActionSpec; execResult: unknown; loopResult: IterateLoopResult }; - -export function runMinerAttempt(input: AttemptInput, deps: AttemptDeps): Promise; +/** + * Run one full attempt end to end: iterate-loop -> (on handoff) freshness -> submission-gate -> Governor + * chokepoint -> (on allowed:true) build + execute the real open_pr command. Fails closed (throws) on malformed + * input/deps, mirroring every sibling module in this pipeline. + */ +export declare function runMinerAttempt(input: AttemptInput, deps: AttemptDeps): Promise; diff --git a/packages/loopover-miner/lib/attempt-runner.js b/packages/loopover-miner/lib/attempt-runner.js index cb41aee258..90764dae16 100644 --- a/packages/loopover-miner/lib/attempt-runner.js +++ b/packages/loopover-miner/lib/attempt-runner.js @@ -5,7 +5,13 @@ import { evaluateGovernorChokepointGatePersisted } from "./governor-chokepoint-p import { listRecentOwnSubmissions } from "./governor-state.js"; import { prepareOpenPrSubmission } from "./harness-submission-trigger.js"; import { captureMinerError } from "./sentry.js"; - +export const ATTEMPT_OUTCOMES = Object.freeze([ + "abandon", + "stale", + "blocked", + "governed", + "submitted", +]); // The real driving-loop entrypoint (#2337): the missing link between #2333's iterate-loop orchestrator and an // actual, executed open_pr write. Composes, in order: runIterateLoop (create -> score -> self-review -> decide, // #2333) -> on handoff, checkSubmissionFreshness (#3007) -> prepareOpenPrSubmission (#2336/#2337) -> the @@ -41,185 +47,174 @@ import { captureMinerError } from "./sentry.js"; // listRecentOwnSubmissions) are computed late -- right before the chokepoint call, after handoff, where the // changed files first exist -- and passed in, so chokepoint.ts's selfPlagiarismCheck finally runs on real data. // `input.governor.reputationHistory` remains a caller-supplied optional field, not auto-loaded here yet. - -/** True once the loop reaches handoff AND every downstream gate (freshness, submission, governor) allows. */ -export const ATTEMPT_OUTCOMES = Object.freeze(["abandon", "stale", "blocked", "governed", "submitted"]); - function assertFn(value, name) { - if (typeof value !== "function") throw new Error(`invalid_${name}`); + if (typeof value !== "function") + throw new Error(`invalid_${name}`); } - function assertDeps(deps) { - if (!deps || typeof deps !== "object") throw new Error("invalid_attempt_deps"); - assertFn(deps.runSlopAssessment, "run_slop_assessment"); - assertFn(deps.appendAttemptLogEvent, "append_attempt_log_event"); - assertFn(deps.fetchLiveIssueSnapshot, "fetch_live_issue_snapshot"); - assertFn(deps.executeLocalWrite, "execute_local_write"); - if (!deps.driver || typeof deps.driver.run !== "function") throw new Error("invalid_driver"); - if (!deps.claimLedger || typeof deps.claimLedger.listClaims !== "function") throw new Error("invalid_claim_ledger"); - if (!deps.eventLedger || typeof deps.eventLedger.appendEvent !== "function") throw new Error("invalid_event_ledger"); - if (typeof deps.nowMs !== "number" || !Number.isFinite(deps.nowMs)) throw new Error("invalid_now_ms"); + if (!deps || typeof deps !== "object") + throw new Error("invalid_attempt_deps"); + const candidate = deps; + assertFn(candidate.runSlopAssessment, "run_slop_assessment"); + assertFn(candidate.appendAttemptLogEvent, "append_attempt_log_event"); + assertFn(candidate.fetchLiveIssueSnapshot, "fetch_live_issue_snapshot"); + assertFn(candidate.executeLocalWrite, "execute_local_write"); + const driver = candidate.driver; + if (!driver || typeof driver.run !== "function") + throw new Error("invalid_driver"); + const claimLedger = candidate.claimLedger; + if (!claimLedger || typeof claimLedger.listClaims !== "function") + throw new Error("invalid_claim_ledger"); + const eventLedger = candidate.eventLedger; + if (!eventLedger || typeof eventLedger.appendEvent !== "function") + throw new Error("invalid_event_ledger"); + if (typeof candidate.nowMs !== "number" || !Number.isFinite(candidate.nowMs)) + throw new Error("invalid_now_ms"); } - function assertInput(input) { - if (!input || typeof input !== "object") throw new Error("invalid_attempt_input"); - if (!input.loopInput || typeof input.loopInput !== "object") throw new Error("invalid_loop_input"); - if (!Number.isInteger(input.issueNumber) || input.issueNumber < 1) throw new Error("invalid_issue_number"); - if (typeof input.minerLogin !== "string" || !input.minerLogin.trim()) throw new Error("invalid_miner_login"); - if (typeof input.base !== "string" || !input.base.trim()) throw new Error("invalid_base"); - if (!["global", "repo", "none"].includes(input.killSwitchScope)) throw new Error("invalid_kill_switch_scope"); - if (!["clean", "low", "elevated", "high"].includes(input.slopThreshold)) throw new Error("invalid_slop_threshold"); - if (!["observe", "enforce"].includes(input.submissionMode)) throw new Error("invalid_submission_mode"); - if (!input.governor || typeof input.governor !== "object") throw new Error("invalid_governor_context"); + if (!input || typeof input !== "object") + throw new Error("invalid_attempt_input"); + const candidate = input; + if (!candidate.loopInput || typeof candidate.loopInput !== "object") + throw new Error("invalid_loop_input"); + if (!Number.isInteger(candidate.issueNumber) || candidate.issueNumber < 1) { + throw new Error("invalid_issue_number"); + } + if (typeof candidate.minerLogin !== "string" || !candidate.minerLogin.trim()) + throw new Error("invalid_miner_login"); + if (typeof candidate.base !== "string" || !candidate.base.trim()) + throw new Error("invalid_base"); + if (!["global", "repo", "none"].includes(candidate.killSwitchScope)) { + throw new Error("invalid_kill_switch_scope"); + } + if (!["clean", "low", "elevated", "high"].includes(candidate.slopThreshold)) { + throw new Error("invalid_slop_threshold"); + } + if (!["observe", "enforce"].includes(candidate.submissionMode)) + throw new Error("invalid_submission_mode"); + if (!candidate.governor || typeof candidate.governor !== "object") + throw new Error("invalid_governor_context"); } - /** * Run one full attempt end to end: iterate-loop -> (on handoff) freshness -> submission-gate -> Governor * chokepoint -> (on allowed:true) build + execute the real open_pr command. Fails closed (throws) on malformed * input/deps, mirroring every sibling module in this pipeline. - * - * @param {{ - * loopInput: import("@loopover/engine").IterateLoopInput, - * issueNumber: number, - * minerLogin: string, - * base: string, - * killSwitchScope: "global"|"repo"|"none", - * slopThreshold: "clean"|"low"|"elevated"|"high", - * submissionMode: "observe"|"enforce", - * maxConsecutiveGateBlocks?: number, - * draft?: boolean, - * governor: Omit, - * }} input - * @param {{ - * driver: import("@loopover/engine").CodingAgentDriver, - * runSlopAssessment: Function, - * appendAttemptLogEvent: Function, - * claimLedger: object, - * fetchLiveIssueSnapshot: Function, - * eventLedger: object, - * governorLedgerAppend?: Function, - * governorState?: import("./governor-state.js").GovernorState, - * sessionStartMs?: number, - * nowMs: number, - * executeLocalWrite: (spec: import("@loopover/engine").LocalWriteActionSpec) => Promise, - * shouldAbort?: () => import("@loopover/engine").IterateLoopShouldAbort, - * resolveKillSwitchScope?: () => "global"|"repo"|"none", - * }} deps */ export async function runMinerAttempt(input, deps) { - assertInput(input); - assertDeps(deps); - - const loopResult = await runIterateLoop(input.loopInput, { - driver: deps.driver, - runSlopAssessment: deps.runSlopAssessment, - appendAttemptLogEvent: deps.appendAttemptLogEvent, - ...(typeof deps.shouldAbort === "function" ? { shouldAbort: deps.shouldAbort } : {}), - }); - - if (loopResult.outcome === "abandon") { - return { outcome: "abandon", loopResult }; - } - - const handoffPacket = loopResult.handoffPacket; - - // Re-check kill-switch AFTER handoff and BEFORE any write (#5670) when a live resolver is supplied. - // Without a live resolver, preserve pre-#5670 behavior: the frozen attempt-start scope is threaded into - // prepareOpenPrSubmission / the submission gate (which itself denies active kill scopes). - if (typeof deps.resolveKillSwitchScope === "function") { - const liveKillSwitchScope = deps.resolveKillSwitchScope(); - if (liveKillSwitchScope !== "none") { - return { - outcome: "abandon", - loopResult: { - ...loopResult, - outcome: "abandon", - finalDecision: { - action: "abandon", - abandonReason: "kill_switch_engaged", - reason: `Kill-switch (${liveKillSwitchScope}) engaged after handoff; refusing to open a PR.`, - }, - handoffPacket: undefined, - }, - }; + assertInput(input); + assertDeps(deps); + const loopResult = await runIterateLoop(input.loopInput, { + driver: deps.driver, + // AttemptDeps deliberately keeps this loosely typed (`(input: unknown) => unknown`) at the public boundary -- + // the real, narrower shape (SelfReviewAdapterDeps["runSlopAssessment"]) is an engine-internal detail callers + // shouldn't need to import just to satisfy this dependency's type. + runSlopAssessment: deps.runSlopAssessment, + appendAttemptLogEvent: deps.appendAttemptLogEvent, + ...(typeof deps.shouldAbort === "function" ? { shouldAbort: deps.shouldAbort } : {}), + }); + if (loopResult.outcome === "abandon") { + return { outcome: "abandon", loopResult }; + } + // Populated by design whenever outcome !== "abandon" (IterateLoopOutcome is only ever "handoff" | "abandon", + // and handoffPacket is only ever set on "handoff") -- runIterateLoop's own type keeps the field optional + // because it models both outcomes in one result shape. + const handoffPacket = loopResult.handoffPacket; + // Re-check kill-switch AFTER handoff and BEFORE any write (#5670) when a live resolver is supplied. + // Without a live resolver, preserve pre-#5670 behavior: the frozen attempt-start scope is threaded into + // prepareOpenPrSubmission / the submission gate (which itself denies active kill scopes). + if (typeof deps.resolveKillSwitchScope === "function") { + const liveKillSwitchScope = deps.resolveKillSwitchScope(); + if (liveKillSwitchScope !== "none") { + return { + outcome: "abandon", + loopResult: { + ...loopResult, + outcome: "abandon", + finalDecision: { + action: "abandon", + abandonReason: "kill_switch_engaged", + reason: `Kill-switch (${liveKillSwitchScope}) engaged after handoff; refusing to open a PR.`, + }, + handoffPacket: undefined, + }, + }; + } + } + const freshness = await checkSubmissionFreshness({ repoFullName: input.loopInput.repoFullName, issueNumber: input.issueNumber, minerLogin: input.minerLogin }, { claimLedger: deps.claimLedger, fetchLiveIssueSnapshot: deps.fetchLiveIssueSnapshot, eventLedger: deps.eventLedger }); + if (!freshness.fresh) { + return { outcome: "stale", reason: freshness.reason, loopResult }; + } + const submission = await prepareOpenPrSubmission({ + killSwitchScope: input.killSwitchScope, + repoFullName: input.loopInput.repoFullName, + // HandoffPacket's optional fields are typed `| undefined` (engine's exactOptionalPropertyTypes style); + // HarnessSubmissionCandidateInput's narrower local field type omits that -- both describe the same real + // shape, so the cast just bridges the two independently-declared-but-compatible types. + handoffPacket: handoffPacket, + slopThreshold: input.slopThreshold, + mode: input.submissionMode, + // Spread-omit rather than pass `undefined` explicitly -- PrepareOpenPrSubmissionCandidate's optional + // fields don't declare `| undefined`, and exactOptionalPropertyTypes treats those as different. + ...(input.maxConsecutiveGateBlocks !== undefined + ? { maxConsecutiveGateBlocks: input.maxConsecutiveGateBlocks } + : {}), + base: input.base, + title: input.loopInput.title, + body: input.loopInput.body ?? "", + ...(input.draft !== undefined ? { draft: input.draft } : {}), + }, { eventLedger: deps.eventLedger, ...(deps.sessionStartMs !== undefined ? { sessionStartMs: deps.sessionStartMs } : {}) }); + if (!submission.ready) { + return { outcome: "blocked", decision: submission.decision, loopResult }; + } + // Late-augment the self-plagiarism inputs (#5676): the prospective submission's real diff fingerprint and the + // miner's real recent-submission history only exist HERE, after handoff -- attempt-cli.js's single early + // governor snapshot (buildAttemptGovernorContext) is built before any changed files exist, so it cannot carry + // them. This finally feeds chokepoint.ts's selfPlagiarismCheck, which was previously always skipped for lack of + // data. Read the history from the SAME governor-state store the chokepoint itself uses (deps.governorState when + // provided, else the persisted default via the module-level export). Fail open on a read failure so a + // history-store hiccup never blocks an otherwise-allowed real submission. + /* v8 ignore next -- buildHandoffPacket always populates changedFiles; the `?? []` only guards a hand-built packet */ + const changedFilePaths = (handoffPacket.changedFiles ?? []).map((file) => file.path); + const selfPlagiarismCandidate = { + repoFullName: input.loopInput.repoFullName, + fingerprint: fingerprintFromChangedFiles(changedFilePaths), + // The prospective submission's own time is "now" -- selfPlagiarismCheck needs a real submittedAt on the + // candidate (it denies a candidate lacking one) and uses it for earliest-claimant election vs the priors. + submittedAt: new Date(deps.nowMs).toISOString(), + }; + let selfPlagiarismRecentSubmissions; + try { + selfPlagiarismRecentSubmissions = deps.governorState + ? deps.governorState.listRecentOwnSubmissions({ repoFullName: input.loopInput.repoFullName }) + : listRecentOwnSubmissions({ repoFullName: input.loopInput.repoFullName }); + } + catch (error) { + // Fail-open is deliberate (see the comment above) -- this only makes the fallback VISIBLE. A broken + // governor-state store silently disabling the self-plagiarism safety check had zero trace anywhere (#6011). + captureMinerError(error, { kind: "self_plagiarism_history_read_failed", repoFullName: input.loopInput.repoFullName }); + selfPlagiarismRecentSubmissions = []; + } + const governed = evaluateGovernorChokepointGatePersisted({ + actionClass: "open_pr", + repoFullName: input.loopInput.repoFullName, + nowMs: deps.nowMs, + wouldBeAction: submission.openPrInput, + ...input.governor, + selfPlagiarismCandidate, + selfPlagiarismRecentSubmissions, + }, { + // AttemptDeps deliberately keeps governorLedgerAppend loosely typed (`(event: unknown) => unknown`) at the + // public boundary, same as runSlopAssessment above -- cast to the engine-internal signature here. + ...(deps.governorLedgerAppend + ? { append: deps.governorLedgerAppend } + : {}), + ...(deps.governorState ? { governorState: deps.governorState } : {}), + }); + if (!governed.decision.allowed) { + return { outcome: "governed", decision: governed.decision, loopResult }; } - } - - const freshness = await checkSubmissionFreshness( - { repoFullName: input.loopInput.repoFullName, issueNumber: input.issueNumber, minerLogin: input.minerLogin }, - { claimLedger: deps.claimLedger, fetchLiveIssueSnapshot: deps.fetchLiveIssueSnapshot, eventLedger: deps.eventLedger }, - ); - if (!freshness.fresh) { - return { outcome: "stale", reason: freshness.reason, loopResult }; - } - - const submission = await prepareOpenPrSubmission( - { - killSwitchScope: input.killSwitchScope, - repoFullName: input.loopInput.repoFullName, - handoffPacket, - slopThreshold: input.slopThreshold, - mode: input.submissionMode, - maxConsecutiveGateBlocks: input.maxConsecutiveGateBlocks, - base: input.base, - title: input.loopInput.title, - body: input.loopInput.body ?? "", - draft: input.draft, - }, - { eventLedger: deps.eventLedger, sessionStartMs: deps.sessionStartMs }, - ); - if (!submission.ready) { - return { outcome: "blocked", decision: submission.decision, loopResult }; - } - - // Late-augment the self-plagiarism inputs (#5676): the prospective submission's real diff fingerprint and the - // miner's real recent-submission history only exist HERE, after handoff -- attempt-cli.js's single early - // governor snapshot (buildAttemptGovernorContext) is built before any changed files exist, so it cannot carry - // them. This finally feeds chokepoint.ts's selfPlagiarismCheck, which was previously always skipped for lack of - // data. Read the history from the SAME governor-state store the chokepoint itself uses (deps.governorState when - // provided, else the persisted default via the module-level export). Fail open on a read failure so a - // history-store hiccup never blocks an otherwise-allowed real submission. - /* v8 ignore next -- buildHandoffPacket always populates changedFiles; the `?? []` only guards a hand-built packet */ - const changedFilePaths = (handoffPacket.changedFiles ?? []).map((file) => file.path); - const selfPlagiarismCandidate = { - repoFullName: input.loopInput.repoFullName, - fingerprint: fingerprintFromChangedFiles(changedFilePaths), - // The prospective submission's own time is "now" -- selfPlagiarismCheck needs a real submittedAt on the - // candidate (it denies a candidate lacking one) and uses it for earliest-claimant election vs the priors. - submittedAt: new Date(deps.nowMs).toISOString(), - }; - let selfPlagiarismRecentSubmissions; - try { - selfPlagiarismRecentSubmissions = deps.governorState - ? deps.governorState.listRecentOwnSubmissions({ repoFullName: input.loopInput.repoFullName }) - : listRecentOwnSubmissions({ repoFullName: input.loopInput.repoFullName }); - } catch (error) { - // Fail-open is deliberate (see the comment above) -- this only makes the fallback VISIBLE. A broken - // governor-state store silently disabling the self-plagiarism safety check had zero trace anywhere (#6011). - captureMinerError(error, { kind: "self_plagiarism_history_read_failed", repoFullName: input.loopInput.repoFullName }); - selfPlagiarismRecentSubmissions = []; - } - - const governed = evaluateGovernorChokepointGatePersisted( - { - actionClass: "open_pr", - repoFullName: input.loopInput.repoFullName, - nowMs: deps.nowMs, - wouldBeAction: submission.openPrInput, - ...input.governor, - selfPlagiarismCandidate, - selfPlagiarismRecentSubmissions, - }, - { - ...(deps.governorLedgerAppend ? { append: deps.governorLedgerAppend } : {}), - ...(deps.governorState ? { governorState: deps.governorState } : {}), - }, - ); - if (!governed.decision.allowed) { - return { outcome: "governed", decision: governed.decision, loopResult }; - } - - const spec = buildOpenPrSpec(submission.openPrInput); - const execResult = await deps.executeLocalWrite(spec); - return { outcome: "submitted", spec, execResult, loopResult }; + const spec = buildOpenPrSpec(submission.openPrInput); + const execResult = await deps.executeLocalWrite(spec); + return { outcome: "submitted", spec, execResult, loopResult }; } +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"attempt-runner.js","sourceRoot":"","sources":["attempt-runner.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/loopover-miner/lib/attempt-runner.ts b/packages/loopover-miner/lib/attempt-runner.ts new file mode 100644 index 0000000000..3484911788 --- /dev/null +++ b/packages/loopover-miner/lib/attempt-runner.ts @@ -0,0 +1,304 @@ +import type { + CodingAgentDriver, + GovernorDecision, + HandoffPacket, + IterateLoopInput, + IterateLoopResult, + IterateLoopShouldAbort, + LocalWriteActionSpec, + SelfReviewAdapterDeps, +} from "@loopover/engine"; +import { buildOpenPrSpec, fingerprintFromChangedFiles } from "@loopover/engine"; +import { runIterateLoop } from "@loopover/engine"; +import type { + FreshnessAbortReason, + LiveIssueSnapshot, + SubmissionFreshnessClaimLedger, +} from "./submission-freshness-check.js"; +import { checkSubmissionFreshness } from "./submission-freshness-check.js"; +import type { GovernorChokepointInputPersisted } from "./governor-chokepoint-persisted.js"; +import { evaluateGovernorChokepointGatePersisted } from "./governor-chokepoint-persisted.js"; +import type { AppendGovernorEventInput, GovernorLedgerEntry } from "./governor-ledger.js"; +import type { GovernorState } from "./governor-state.js"; +import { listRecentOwnSubmissions } from "./governor-state.js"; +import type { + HarnessSubmissionCandidateInput, + HarnessSubmissionDecision, + HarnessSubmissionEventLedger, +} from "./harness-submission-trigger.js"; +import { prepareOpenPrSubmission } from "./harness-submission-trigger.js"; +import { captureMinerError } from "./sentry.js"; + +export const ATTEMPT_OUTCOMES: readonly ["abandon", "stale", "blocked", "governed", "submitted"] = Object.freeze([ + "abandon", + "stale", + "blocked", + "governed", + "submitted", +]); + +// rateLimitBuckets/rateLimitBackoffAttempts/capUsage are optional here (via GovernorChokepointInputPersisted, +// not the engine's own GovernorChokepointInput) so a caller can omit them and let evaluateGovernorChokepointGatePersisted +// (#5134) auto-supply real persisted state -- forcing them required at this layer would make every caller +// hand-thread honest-but-stale zero defaults on every invocation, silently defeating that persistence. +export type AttemptGovernorContext = Omit< + GovernorChokepointInputPersisted, + "actionClass" | "repoFullName" | "nowMs" | "wouldBeAction" +>; + +export type AttemptInput = { + loopInput: IterateLoopInput; + issueNumber: number; + minerLogin: string; + base: string; + killSwitchScope: "global" | "repo" | "none"; + slopThreshold: "clean" | "low" | "elevated" | "high"; + submissionMode: "observe" | "enforce"; + maxConsecutiveGateBlocks?: number; + draft?: boolean; + governor: AttemptGovernorContext; +}; + +export type AttemptDeps = { + driver: CodingAgentDriver; + runSlopAssessment: (input: unknown) => unknown; + appendAttemptLogEvent: (event: unknown) => void; + claimLedger: SubmissionFreshnessClaimLedger; + fetchLiveIssueSnapshot: (repoFullName: string, issueNumber: number) => Promise; + eventLedger: HarnessSubmissionEventLedger; + /** Injected governor-ledger append (mirrors evaluateGovernorChokepointGate's own `options.append`); omitted + * falls back to that function's own default (the real default governor ledger). */ + governorLedgerAppend?: (event: unknown) => unknown; + /** Injected governor-state store (#5134); omitted falls back to evaluateGovernorChokepointGatePersisted's + * own default (opens + closes the real default governor-state store for this one call). */ + governorState?: GovernorState; + sessionStartMs?: number; + nowMs: number; + executeLocalWrite: (spec: LocalWriteActionSpec) => Promise; + /** Mid-attempt kill-switch probe threaded into `runIterateLoop` (#5670). */ + shouldAbort?: () => IterateLoopShouldAbort; + /** Live kill-switch scope resolver after handoff (#5670); defaults to the frozen attempt-start scope. */ + resolveKillSwitchScope?: () => "global" | "repo" | "none"; +}; + +export type AttemptResult = + | { outcome: "abandon"; loopResult: IterateLoopResult } + | { outcome: "stale"; reason: FreshnessAbortReason; loopResult: IterateLoopResult } + | { outcome: "blocked"; decision: HarnessSubmissionDecision; loopResult: IterateLoopResult } + | { outcome: "governed"; decision: GovernorDecision; loopResult: IterateLoopResult } + | { outcome: "submitted"; spec: LocalWriteActionSpec; execResult: unknown; loopResult: IterateLoopResult }; + +// The real driving-loop entrypoint (#2337): the missing link between #2333's iterate-loop orchestrator and an +// actual, executed open_pr write. Composes, in order: runIterateLoop (create -> score -> self-review -> decide, +// #2333) -> on handoff, checkSubmissionFreshness (#3007) -> prepareOpenPrSubmission (#2336/#2337) -> the +// Governor chokepoint (#2340, which itself composes kill-switch, dry-run, rate-limit, budget caps, non- +// convergence, self-reputation-throttle, and self-plagiarism -- see chokepoint.ts's own module doc comment for +// the exact precedence ladder) -> on allowed:true, builds the REAL open_pr command via the now-shared +// buildOpenPrSpec (@loopover/engine, moved from root src/mcp/local-write-tools.ts) and executes it. +// +// WORKTREE LIFECYCLE IS NOT THIS MODULE'S JOB: runIterateLoop already takes a plain `workingDirectory` string +// (packages/loopover-engine/src/miner/iterate-loop.ts's own IterateLoopInput), deliberately agnostic about +// where it came from. Allocating one is the caller's job, via the already-built slot allocator +// (worktree-allocator.js, #4297) -- this module composes the create/review/gate/submit sequence #2337 is +// actually about, not worktree allocation policy, which is a separate, already-solved concern. +// +// `deps.runSlopAssessment` stays INJECTED rather than imported here (this module composes the sequence and is +// agnostic about the scorer behind the seam), but it is no longer unwired: slop-assessment.js (#5133) is its +// real production binding -- a direct pass-through to the engine's own buildSlopAssessment -- and attempt-cli.js +// wires that binding in on the production path. The seam was injected-but-unwired when this module was written +// only because the deterministic scorer was not yet portable; #5133 extracted src/signals/slop.ts's PR-side +// scorer into packages/loopover-engine/src/signals/slop.ts (byte-parity-verified against the live gate's own +// copy), closing the gap this header used to document. This function still requires a real implementation be +// injected rather than silently stubbing a result that would either always pass (unsafe) or always fail +// (useless). +// +// `input.governor`'s cross-attempt state (rate-limit buckets, backoff attempts, budget-cap usage) DOES now +// persist across separate process invocations (#5134, governor-state.js), via +// evaluateGovernorChokepointGatePersisted -- callers no longer need to hand-thread honest empty/zero defaults +// on every invocation; `capUsage` is loaded from that same store but its post-attempt save stays the caller's +// job (see governor-chokepoint-persisted.js's own header for why: nothing computes "the next capUsage" from a +// verdict, only the attempt's real outcome does). Self-plagiarism state is now wired here (#5676): the +// prospective submission's real diff `selfPlagiarismCandidate` (fingerprintFromChangedFiles over the handoff +// packet's changed files) and the miner's real `selfPlagiarismRecentSubmissions` (governor-state.js's +// listRecentOwnSubmissions) are computed late -- right before the chokepoint call, after handoff, where the +// changed files first exist -- and passed in, so chokepoint.ts's selfPlagiarismCheck finally runs on real data. +// `input.governor.reputationHistory` remains a caller-supplied optional field, not auto-loaded here yet. + +function assertFn(value: unknown, name: string): void { + if (typeof value !== "function") throw new Error(`invalid_${name}`); +} + +function assertDeps(deps: unknown): asserts deps is AttemptDeps { + if (!deps || typeof deps !== "object") throw new Error("invalid_attempt_deps"); + const candidate = deps as Record; + assertFn(candidate.runSlopAssessment, "run_slop_assessment"); + assertFn(candidate.appendAttemptLogEvent, "append_attempt_log_event"); + assertFn(candidate.fetchLiveIssueSnapshot, "fetch_live_issue_snapshot"); + assertFn(candidate.executeLocalWrite, "execute_local_write"); + const driver = candidate.driver as { run?: unknown } | undefined; + if (!driver || typeof driver.run !== "function") throw new Error("invalid_driver"); + const claimLedger = candidate.claimLedger as { listClaims?: unknown } | undefined; + if (!claimLedger || typeof claimLedger.listClaims !== "function") throw new Error("invalid_claim_ledger"); + const eventLedger = candidate.eventLedger as { appendEvent?: unknown } | undefined; + if (!eventLedger || typeof eventLedger.appendEvent !== "function") throw new Error("invalid_event_ledger"); + if (typeof candidate.nowMs !== "number" || !Number.isFinite(candidate.nowMs)) throw new Error("invalid_now_ms"); +} + +function assertInput(input: unknown): asserts input is AttemptInput { + if (!input || typeof input !== "object") throw new Error("invalid_attempt_input"); + const candidate = input as Record; + if (!candidate.loopInput || typeof candidate.loopInput !== "object") throw new Error("invalid_loop_input"); + if (!Number.isInteger(candidate.issueNumber) || (candidate.issueNumber as number) < 1) { + throw new Error("invalid_issue_number"); + } + if (typeof candidate.minerLogin !== "string" || !candidate.minerLogin.trim()) throw new Error("invalid_miner_login"); + if (typeof candidate.base !== "string" || !candidate.base.trim()) throw new Error("invalid_base"); + if (!["global", "repo", "none"].includes(candidate.killSwitchScope as string)) { + throw new Error("invalid_kill_switch_scope"); + } + if (!["clean", "low", "elevated", "high"].includes(candidate.slopThreshold as string)) { + throw new Error("invalid_slop_threshold"); + } + if (!["observe", "enforce"].includes(candidate.submissionMode as string)) throw new Error("invalid_submission_mode"); + if (!candidate.governor || typeof candidate.governor !== "object") throw new Error("invalid_governor_context"); +} + +/** + * Run one full attempt end to end: iterate-loop -> (on handoff) freshness -> submission-gate -> Governor + * chokepoint -> (on allowed:true) build + execute the real open_pr command. Fails closed (throws) on malformed + * input/deps, mirroring every sibling module in this pipeline. + */ +export async function runMinerAttempt(input: AttemptInput, deps: AttemptDeps): Promise { + assertInput(input); + assertDeps(deps); + + const loopResult = await runIterateLoop(input.loopInput, { + driver: deps.driver, + // AttemptDeps deliberately keeps this loosely typed (`(input: unknown) => unknown`) at the public boundary -- + // the real, narrower shape (SelfReviewAdapterDeps["runSlopAssessment"]) is an engine-internal detail callers + // shouldn't need to import just to satisfy this dependency's type. + runSlopAssessment: deps.runSlopAssessment as SelfReviewAdapterDeps["runSlopAssessment"], + appendAttemptLogEvent: deps.appendAttemptLogEvent, + ...(typeof deps.shouldAbort === "function" ? { shouldAbort: deps.shouldAbort } : {}), + }); + + if (loopResult.outcome === "abandon") { + return { outcome: "abandon", loopResult }; + } + + // Populated by design whenever outcome !== "abandon" (IterateLoopOutcome is only ever "handoff" | "abandon", + // and handoffPacket is only ever set on "handoff") -- runIterateLoop's own type keeps the field optional + // because it models both outcomes in one result shape. + const handoffPacket = loopResult.handoffPacket as HandoffPacket; + + // Re-check kill-switch AFTER handoff and BEFORE any write (#5670) when a live resolver is supplied. + // Without a live resolver, preserve pre-#5670 behavior: the frozen attempt-start scope is threaded into + // prepareOpenPrSubmission / the submission gate (which itself denies active kill scopes). + if (typeof deps.resolveKillSwitchScope === "function") { + const liveKillSwitchScope = deps.resolveKillSwitchScope(); + if (liveKillSwitchScope !== "none") { + return { + outcome: "abandon", + loopResult: { + ...loopResult, + outcome: "abandon", + finalDecision: { + action: "abandon", + abandonReason: "kill_switch_engaged", + reason: `Kill-switch (${liveKillSwitchScope}) engaged after handoff; refusing to open a PR.`, + }, + handoffPacket: undefined, + }, + }; + } + } + + const freshness = await checkSubmissionFreshness( + { repoFullName: input.loopInput.repoFullName, issueNumber: input.issueNumber, minerLogin: input.minerLogin }, + { claimLedger: deps.claimLedger, fetchLiveIssueSnapshot: deps.fetchLiveIssueSnapshot, eventLedger: deps.eventLedger }, + ); + if (!freshness.fresh) { + return { outcome: "stale", reason: freshness.reason, loopResult }; + } + + const submission = await prepareOpenPrSubmission( + { + killSwitchScope: input.killSwitchScope, + repoFullName: input.loopInput.repoFullName, + // HandoffPacket's optional fields are typed `| undefined` (engine's exactOptionalPropertyTypes style); + // HarnessSubmissionCandidateInput's narrower local field type omits that -- both describe the same real + // shape, so the cast just bridges the two independently-declared-but-compatible types. + handoffPacket: handoffPacket as HarnessSubmissionCandidateInput["handoffPacket"], + slopThreshold: input.slopThreshold, + mode: input.submissionMode, + // Spread-omit rather than pass `undefined` explicitly -- PrepareOpenPrSubmissionCandidate's optional + // fields don't declare `| undefined`, and exactOptionalPropertyTypes treats those as different. + ...(input.maxConsecutiveGateBlocks !== undefined + ? { maxConsecutiveGateBlocks: input.maxConsecutiveGateBlocks } + : {}), + base: input.base, + title: input.loopInput.title, + body: input.loopInput.body ?? "", + ...(input.draft !== undefined ? { draft: input.draft } : {}), + }, + { eventLedger: deps.eventLedger, ...(deps.sessionStartMs !== undefined ? { sessionStartMs: deps.sessionStartMs } : {}) }, + ); + if (!submission.ready) { + return { outcome: "blocked", decision: submission.decision, loopResult }; + } + + // Late-augment the self-plagiarism inputs (#5676): the prospective submission's real diff fingerprint and the + // miner's real recent-submission history only exist HERE, after handoff -- attempt-cli.js's single early + // governor snapshot (buildAttemptGovernorContext) is built before any changed files exist, so it cannot carry + // them. This finally feeds chokepoint.ts's selfPlagiarismCheck, which was previously always skipped for lack of + // data. Read the history from the SAME governor-state store the chokepoint itself uses (deps.governorState when + // provided, else the persisted default via the module-level export). Fail open on a read failure so a + // history-store hiccup never blocks an otherwise-allowed real submission. + /* v8 ignore next -- buildHandoffPacket always populates changedFiles; the `?? []` only guards a hand-built packet */ + const changedFilePaths = (handoffPacket.changedFiles ?? []).map((file) => file.path); + const selfPlagiarismCandidate = { + repoFullName: input.loopInput.repoFullName, + fingerprint: fingerprintFromChangedFiles(changedFilePaths), + // The prospective submission's own time is "now" -- selfPlagiarismCheck needs a real submittedAt on the + // candidate (it denies a candidate lacking one) and uses it for earliest-claimant election vs the priors. + submittedAt: new Date(deps.nowMs).toISOString(), + }; + let selfPlagiarismRecentSubmissions: ReturnType; + try { + selfPlagiarismRecentSubmissions = deps.governorState + ? deps.governorState.listRecentOwnSubmissions({ repoFullName: input.loopInput.repoFullName }) + : listRecentOwnSubmissions({ repoFullName: input.loopInput.repoFullName }); + } catch (error) { + // Fail-open is deliberate (see the comment above) -- this only makes the fallback VISIBLE. A broken + // governor-state store silently disabling the self-plagiarism safety check had zero trace anywhere (#6011). + captureMinerError(error, { kind: "self_plagiarism_history_read_failed", repoFullName: input.loopInput.repoFullName }); + selfPlagiarismRecentSubmissions = []; + } + + const governed = evaluateGovernorChokepointGatePersisted( + { + actionClass: "open_pr", + repoFullName: input.loopInput.repoFullName, + nowMs: deps.nowMs, + wouldBeAction: submission.openPrInput, + ...input.governor, + selfPlagiarismCandidate, + selfPlagiarismRecentSubmissions, + }, + { + // AttemptDeps deliberately keeps governorLedgerAppend loosely typed (`(event: unknown) => unknown`) at the + // public boundary, same as runSlopAssessment above -- cast to the engine-internal signature here. + ...(deps.governorLedgerAppend + ? { append: deps.governorLedgerAppend as (event: AppendGovernorEventInput) => GovernorLedgerEntry } + : {}), + ...(deps.governorState ? { governorState: deps.governorState } : {}), + }, + ); + if (!governed.decision.allowed) { + return { outcome: "governed", decision: governed.decision, loopResult }; + } + + const spec = buildOpenPrSpec(submission.openPrInput); + const execResult = await deps.executeLocalWrite(spec); + return { outcome: "submitted", spec, execResult, loopResult }; +} diff --git a/packages/loopover-miner/lib/calibration-types.d.ts b/packages/loopover-miner/lib/calibration-types.d.ts index 097cc40352..2aee19a1d5 100644 --- a/packages/loopover-miner/lib/calibration-types.d.ts +++ b/packages/loopover-miner/lib/calibration-types.d.ts @@ -1,46 +1,39 @@ /** A single gate-prediction row the miner will replay against observed outcomes. */ export type PredictedVerdictRecord = { - targetId: string; - project: string; - predictedDecision: string; - recordedAt: string; - source?: string; + targetId: string; + project: string; + predictedDecision: string; + recordedAt: string; + source?: string; }; - /** The realized human outcome for a previously predicted target. */ export type ObservedOutcomeRecord = { - targetId: string; - project: string; - outcomeDecision: string; - recordedAt: string; + targetId: string; + project: string; + outcomeDecision: string; + recordedAt: string; }; - /** Per-project confusion-matrix row — field names mirror `GateEvalRow` in `src/review/parity.ts`. */ export type CalibrationRow = { - project: string; - wouldMerge: number; - mergeConfirmed: number; - mergeFalse: number; - wouldClose: number; - closeConfirmed: number; - closeFalse: number; - hold: number; - decided: number; - mergePrecision: number | null; - closePrecision: number | null; + project: string; + wouldMerge: number; + mergeConfirmed: number; + mergeFalse: number; + wouldClose: number; + closeConfirmed: number; + closeFalse: number; + hold: number; + decided: number; + mergePrecision: number | null; + closePrecision: number | null; }; - /** Aggregate calibration report over one or more projects. */ export type CalibrationReport = { - rows: CalibrationRow[]; - /** True once at least one project has enough decided samples to read meaningfully. */ - hasSignal: boolean; + rows: CalibrationRow[]; + /** True once at least one project has enough decided samples to read meaningfully. */ + hasSignal: boolean; }; - -export function isPredictedVerdictRecord(value: unknown): value is PredictedVerdictRecord; - -export function isObservedOutcomeRecord(value: unknown): value is ObservedOutcomeRecord; - -export function isCalibrationRow(value: unknown): value is CalibrationRow; - -export function isCalibrationReport(value: unknown): value is CalibrationReport; +export declare function isPredictedVerdictRecord(value: unknown): value is PredictedVerdictRecord; +export declare function isObservedOutcomeRecord(value: unknown): value is ObservedOutcomeRecord; +export declare function isCalibrationRow(value: unknown): value is CalibrationRow; +export declare function isCalibrationReport(value: unknown): value is CalibrationReport; diff --git a/packages/loopover-miner/lib/calibration-types.js b/packages/loopover-miner/lib/calibration-types.js index a857b1f7f7..a80b60b496 100644 --- a/packages/loopover-miner/lib/calibration-types.js +++ b/packages/loopover-miner/lib/calibration-types.js @@ -1,74 +1,59 @@ // Shared calibration shapes for the miner self-improvement phase (#2332). Types-only scaffolding — // report/ledger/metrics issues build on this module. Field names mirror `GateEvalRow` / // `GateEvalReport` in `src/review/parity.ts` for easy mental mapping without importing cloud code. - function isNonEmptyString(value) { - return typeof value === "string" && value.trim().length > 0; + return typeof value === "string" && value.trim().length > 0; } - function isOptionalString(value) { - return value === undefined || isNonEmptyString(value); + return value === undefined || isNonEmptyString(value); } - function isNonNegativeInteger(value) { - return typeof value === "number" && Number.isInteger(value) && value >= 0; + return typeof value === "number" && Number.isInteger(value) && value >= 0; } - function isNullableRatio(value) { - return value === null || (typeof value === "number" && Number.isFinite(value) && value >= 0 && value <= 1); + return value === null || (typeof value === "number" && Number.isFinite(value) && value >= 0 && value <= 1); } - -/** @param {unknown} value */ export function isPredictedVerdictRecord(value) { - if (value === null || typeof value !== "object" || Array.isArray(value)) return false; - const record = /** @type {Record} */ (value); - return ( - isNonEmptyString(record.targetId) - && isNonEmptyString(record.project) - && isNonEmptyString(record.predictedDecision) - && isNonEmptyString(record.recordedAt) - && isOptionalString(record.source) - ); + if (value === null || typeof value !== "object" || Array.isArray(value)) + return false; + const record = value; + return (isNonEmptyString(record.targetId) + && isNonEmptyString(record.project) + && isNonEmptyString(record.predictedDecision) + && isNonEmptyString(record.recordedAt) + && isOptionalString(record.source)); } - -/** @param {unknown} value */ export function isObservedOutcomeRecord(value) { - if (value === null || typeof value !== "object" || Array.isArray(value)) return false; - const record = /** @type {Record} */ (value); - return ( - isNonEmptyString(record.targetId) - && isNonEmptyString(record.project) - && isNonEmptyString(record.outcomeDecision) - && isNonEmptyString(record.recordedAt) - ); + if (value === null || typeof value !== "object" || Array.isArray(value)) + return false; + const record = value; + return (isNonEmptyString(record.targetId) + && isNonEmptyString(record.project) + && isNonEmptyString(record.outcomeDecision) + && isNonEmptyString(record.recordedAt)); } - -/** @param {unknown} value */ export function isCalibrationRow(value) { - if (value === null || typeof value !== "object" || Array.isArray(value)) return false; - const row = /** @type {Record} */ (value); - return ( - isNonEmptyString(row.project) - && isNonNegativeInteger(row.wouldMerge) - && isNonNegativeInteger(row.mergeConfirmed) - && isNonNegativeInteger(row.mergeFalse) - && isNonNegativeInteger(row.wouldClose) - && isNonNegativeInteger(row.closeConfirmed) - && isNonNegativeInteger(row.closeFalse) - && isNonNegativeInteger(row.hold) - && isNonNegativeInteger(row.decided) - && isNullableRatio(row.mergePrecision) - && isNullableRatio(row.closePrecision) - ); + if (value === null || typeof value !== "object" || Array.isArray(value)) + return false; + const row = value; + return (isNonEmptyString(row.project) + && isNonNegativeInteger(row.wouldMerge) + && isNonNegativeInteger(row.mergeConfirmed) + && isNonNegativeInteger(row.mergeFalse) + && isNonNegativeInteger(row.wouldClose) + && isNonNegativeInteger(row.closeConfirmed) + && isNonNegativeInteger(row.closeFalse) + && isNonNegativeInteger(row.hold) + && isNonNegativeInteger(row.decided) + && isNullableRatio(row.mergePrecision) + && isNullableRatio(row.closePrecision)); } - -/** @param {unknown} value */ export function isCalibrationReport(value) { - if (value === null || typeof value !== "object" || Array.isArray(value)) return false; - const report = /** @type {Record} */ (value); - return ( - typeof report.hasSignal === "boolean" - && Array.isArray(report.rows) - && report.rows.every((row) => isCalibrationRow(row)) - ); -} + if (value === null || typeof value !== "object" || Array.isArray(value)) + return false; + const report = value; + return (typeof report.hasSignal === "boolean" + && Array.isArray(report.rows) + && report.rows.every((row) => isCalibrationRow(row))); +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsaWJyYXRpb24tdHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjYWxpYnJhdGlvbi10eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxtR0FBbUc7QUFDbkcsd0ZBQXdGO0FBQ3hGLG1HQUFtRztBQXlDbkcsU0FBUyxnQkFBZ0IsQ0FBQyxLQUFjO0lBQ3RDLE9BQU8sT0FBTyxLQUFLLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDO0FBQzlELENBQUM7QUFFRCxTQUFTLGdCQUFnQixDQUFDLEtBQWM7SUFDdEMsT0FBTyxLQUFLLEtBQUssU0FBUyxJQUFJLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQ3hELENBQUM7QUFFRCxTQUFTLG9CQUFvQixDQUFDLEtBQWM7SUFDMUMsT0FBTyxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQyxDQUFDO0FBQzVFLENBQUM7QUFFRCxTQUFTLGVBQWUsQ0FBQyxLQUFjO0lBQ3JDLE9BQU8sS0FBSyxLQUFLLElBQUksSUFBSSxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssSUFBSSxDQUFDLElBQUksS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDO0FBQzdHLENBQUM7QUFFRCxNQUFNLFVBQVUsd0JBQXdCLENBQUMsS0FBYztJQUNyRCxJQUFJLEtBQUssS0FBSyxJQUFJLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDO1FBQUUsT0FBTyxLQUFLLENBQUM7SUFDdEYsTUFBTSxNQUFNLEdBQUcsS0FBZ0MsQ0FBQztJQUNoRCxPQUFPLENBQ0wsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQztXQUM5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 \ No newline at end of file diff --git a/packages/loopover-miner/lib/calibration-types.ts b/packages/loopover-miner/lib/calibration-types.ts new file mode 100644 index 0000000000..4687f0413e --- /dev/null +++ b/packages/loopover-miner/lib/calibration-types.ts @@ -0,0 +1,109 @@ +// Shared calibration shapes for the miner self-improvement phase (#2332). Types-only scaffolding — +// report/ledger/metrics issues build on this module. Field names mirror `GateEvalRow` / +// `GateEvalReport` in `src/review/parity.ts` for easy mental mapping without importing cloud code. + +/** A single gate-prediction row the miner will replay against observed outcomes. */ +export type PredictedVerdictRecord = { + targetId: string; + project: string; + predictedDecision: string; + recordedAt: string; + source?: string; +}; + +/** The realized human outcome for a previously predicted target. */ +export type ObservedOutcomeRecord = { + targetId: string; + project: string; + outcomeDecision: string; + recordedAt: string; +}; + +/** Per-project confusion-matrix row — field names mirror `GateEvalRow` in `src/review/parity.ts`. */ +export type CalibrationRow = { + project: string; + wouldMerge: number; + mergeConfirmed: number; + mergeFalse: number; + wouldClose: number; + closeConfirmed: number; + closeFalse: number; + hold: number; + decided: number; + mergePrecision: number | null; + closePrecision: number | null; +}; + +/** Aggregate calibration report over one or more projects. */ +export type CalibrationReport = { + rows: CalibrationRow[]; + /** True once at least one project has enough decided samples to read meaningfully. */ + hasSignal: boolean; +}; + +function isNonEmptyString(value: unknown): value is string { + return typeof value === "string" && value.trim().length > 0; +} + +function isOptionalString(value: unknown): value is string | undefined { + return value === undefined || isNonEmptyString(value); +} + +function isNonNegativeInteger(value: unknown): value is number { + return typeof value === "number" && Number.isInteger(value) && value >= 0; +} + +function isNullableRatio(value: unknown): value is number | null { + return value === null || (typeof value === "number" && Number.isFinite(value) && value >= 0 && value <= 1); +} + +export function isPredictedVerdictRecord(value: unknown): value is PredictedVerdictRecord { + if (value === null || typeof value !== "object" || Array.isArray(value)) return false; + const record = value as Record; + return ( + isNonEmptyString(record.targetId) + && isNonEmptyString(record.project) + && isNonEmptyString(record.predictedDecision) + && isNonEmptyString(record.recordedAt) + && isOptionalString(record.source) + ); +} + +export function isObservedOutcomeRecord(value: unknown): value is ObservedOutcomeRecord { + if (value === null || typeof value !== "object" || Array.isArray(value)) return false; + const record = value as Record; + return ( + isNonEmptyString(record.targetId) + && isNonEmptyString(record.project) + && isNonEmptyString(record.outcomeDecision) + && isNonEmptyString(record.recordedAt) + ); +} + +export function isCalibrationRow(value: unknown): value is CalibrationRow { + if (value === null || typeof value !== "object" || Array.isArray(value)) return false; + const row = value as Record; + return ( + isNonEmptyString(row.project) + && isNonNegativeInteger(row.wouldMerge) + && isNonNegativeInteger(row.mergeConfirmed) + && isNonNegativeInteger(row.mergeFalse) + && isNonNegativeInteger(row.wouldClose) + && isNonNegativeInteger(row.closeConfirmed) + && isNonNegativeInteger(row.closeFalse) + && isNonNegativeInteger(row.hold) + && isNonNegativeInteger(row.decided) + && isNullableRatio(row.mergePrecision) + && isNullableRatio(row.closePrecision) + ); +} + +export function isCalibrationReport(value: unknown): value is CalibrationReport { + if (value === null || typeof value !== "object" || Array.isArray(value)) return false; + const report = value as Record; + return ( + typeof report.hasSignal === "boolean" + && Array.isArray(report.rows) + && report.rows.every((row) => isCalibrationRow(row)) + ); +} diff --git a/packages/loopover-miner/lib/contribution-profile-cache.d.ts b/packages/loopover-miner/lib/contribution-profile-cache.d.ts index 6a953d9831..63f40c433c 100644 --- a/packages/loopover-miner/lib/contribution-profile-cache.d.ts +++ b/packages/loopover-miner/lib/contribution-profile-cache.d.ts @@ -1,38 +1,25 @@ -import type { - CachedContributionProfile, - ContributionProfile, -} from "./contribution-profile.js"; - +import type { CachedContributionProfile, ContributionProfile } from "./contribution-profile.js"; export type ContributionProfileCache = { - dbPath: string; - /** Read a cached profile, or null when absent or unparseable. `stale` is true past the TTL. */ - get(repoFullName: string, nowMs?: number): CachedContributionProfile | null; - /** Cache a profile keyed by its own repoFullName, stamped with `nowMs` (defaults to now). */ - put( - profile: ContributionProfile, - nowMs?: number, - ): { repoFullName: string; fetchedAt: string }; - /** Delete the cached profile for one repo (#7091); returns rows removed (0 or 1). */ - purgeByRepo(repoFullName: string): number; - close(): void; + dbPath: string; + /** Read a cached profile, or null when absent or unparseable. `stale` is true past the TTL. */ + get(repoFullName: string, nowMs?: number): CachedContributionProfile | null; + /** Cache a profile keyed by its own repoFullName, stamped with `nowMs` (defaults to now). */ + put(profile: ContributionProfile, nowMs?: number): { + repoFullName: string; + fetchedAt: string; + }; + /** Delete the cached profile for one repo (#7091); returns rows removed (0 or 1). */ + purgeByRepo(repoFullName: string): number; + close(): void; }; - -export function resolveContributionProfileCacheDbPath( - env?: Record, -): string; - -export function initContributionProfileCache( - dbPath?: string, -): ContributionProfileCache; - -export function getCachedContributionProfile( - repoFullName: string, - nowMs?: number, -): CachedContributionProfile | null; - -export function putCachedContributionProfile( - profile: ContributionProfile, - nowMs?: number, -): { repoFullName: string; fetchedAt: string }; - -export function closeDefaultContributionProfileCache(): void; +export declare function resolveContributionProfileCacheDbPath(env?: Record): string; +/** + * Open the 100%-local contribution-profile cache. The DB only lives on this machine (#6797). + */ +export declare function initContributionProfileCache(dbPath?: string): ContributionProfileCache; +export declare function getCachedContributionProfile(repoFullName: string, nowMs?: number): CachedContributionProfile | null; +export declare function putCachedContributionProfile(profile: ContributionProfile, nowMs?: number): { + repoFullName: string; + fetchedAt: string; +}; +export declare function closeDefaultContributionProfileCache(): void; diff --git a/packages/loopover-miner/lib/contribution-profile-cache.js b/packages/loopover-miner/lib/contribution-profile-cache.js index 6f4810f5b9..1e23b974cc 100644 --- a/packages/loopover-miner/lib/contribution-profile-cache.js +++ b/packages/loopover-miner/lib/contribution-profile-cache.js @@ -1,152 +1,106 @@ -// ContributionProfile local cache store (#6797). Persists the extraction output (#6796) keyed by repo, so a -// repeated `discover` run within the freshness window doesn't re-fetch/re-parse the same labels + docs. 100% -// local/client-side, like every other miner store: never uploads, syncs, or phones home. Follows the shared -// local-store.js pattern (openLocalStoreDb + resolveLocalStoreDbPath + the schema-version stamp) so it is -// picked up by `doctor`'s store-integrity sweep and `migrate` the same way its siblings are. -import { - CONTRIBUTION_PROFILE_CACHE_TTL_MS, - CONTRIBUTION_PROFILE_STORE_TABLE, -} from "./contribution-profile.js"; -import { - normalizeLocalStoreDbPath, - openLocalStoreDb, - resolveLocalStoreDbPath, -} from "./local-store.js"; +import { CONTRIBUTION_PROFILE_CACHE_TTL_MS, CONTRIBUTION_PROFILE_STORE_TABLE, } from "./contribution-profile.js"; +import { normalizeLocalStoreDbPath, openLocalStoreDb, resolveLocalStoreDbPath, } from "./local-store.js"; import { applySchemaMigrations } from "./schema-version.js"; -import { - CONTRIBUTION_PROFILE_CACHE_PURGE_SPEC, - purgeStoreByRepo, -} from "./store-maintenance.js"; - +import { CONTRIBUTION_PROFILE_CACHE_PURGE_SPEC, purgeStoreByRepo, } from "./store-maintenance.js"; const defaultDbFileName = "contribution-profile-cache.sqlite3"; let defaultContributionProfileCache = null; - export function resolveContributionProfileCacheDbPath(env = process.env) { - return resolveLocalStoreDbPath( - defaultDbFileName, - "LOOPOVER_MINER_CONTRIBUTION_PROFILE_CACHE_DB", - env, - ); + return resolveLocalStoreDbPath(defaultDbFileName, "LOOPOVER_MINER_CONTRIBUTION_PROFILE_CACHE_DB", env); } - function normalizeDbPath(dbPath) { - return normalizeLocalStoreDbPath( - dbPath, - resolveContributionProfileCacheDbPath(), - "invalid_contribution_profile_cache_db_path", - ); + return normalizeLocalStoreDbPath(dbPath, resolveContributionProfileCacheDbPath(), "invalid_contribution_profile_cache_db_path"); } - function normalizeRepoFullName(repoFullName) { - if (typeof repoFullName !== "string") - throw new Error("invalid_repo_full_name"); - const [owner, repo, extra] = repoFullName.trim().split("/"); - if (!owner || !repo || extra !== undefined) - throw new Error("invalid_repo_full_name"); - return `${owner}/${repo}`; + if (typeof repoFullName !== "string") + throw new Error("invalid_repo_full_name"); + const [owner, repo, extra] = repoFullName.trim().split("/"); + if (!owner || !repo || extra !== undefined) + throw new Error("invalid_repo_full_name"); + return `${owner}/${repo}`; } - /** * Open the 100%-local contribution-profile cache. The DB only lives on this machine (#6797). - * - * @param {string} [dbPath] */ -export function initContributionProfileCache( - dbPath = resolveContributionProfileCacheDbPath(), -) { - const resolvedPath = normalizeDbPath(dbPath); - const db = openLocalStoreDb(resolvedPath); - db.exec(` +export function initContributionProfileCache(dbPath = resolveContributionProfileCacheDbPath()) { + const resolvedPath = normalizeDbPath(dbPath); + const db = openLocalStoreDb(resolvedPath); + db.exec(` CREATE TABLE IF NOT EXISTS ${CONTRIBUTION_PROFILE_STORE_TABLE} ( repo_full_name TEXT PRIMARY KEY, profile_json TEXT NOT NULL, fetched_at TEXT NOT NULL ) `); - // Schema-version convention (#4832): stamp the baseline. No post-baseline migrations for this v1 store yet. - applySchemaMigrations(db, []); - - const getStatement = db.prepare( - `SELECT profile_json, fetched_at FROM ${CONTRIBUTION_PROFILE_STORE_TABLE} WHERE repo_full_name = ?`, - ); - const putStatement = db.prepare(` + // Schema-version convention (#4832): stamp the baseline. No post-baseline migrations for this v1 store yet. + applySchemaMigrations(db, []); + const getStatement = db.prepare(`SELECT profile_json, fetched_at FROM ${CONTRIBUTION_PROFILE_STORE_TABLE} WHERE repo_full_name = ?`); + const putStatement = db.prepare(` INSERT INTO ${CONTRIBUTION_PROFILE_STORE_TABLE} (repo_full_name, profile_json, fetched_at) VALUES (?, ?, ?) ON CONFLICT(repo_full_name) DO UPDATE SET profile_json = excluded.profile_json, fetched_at = excluded.fetched_at `); - - return { - dbPath: resolvedPath, - /** - * Read a cached profile. Returns { profile, fetchedAt, stale } or null when absent. `stale` is true once - * the row is older than the TTL, so a caller re-extracts. A row whose JSON is unparseable is treated as a - * miss (fail closed) rather than throwing — a corrupted/hand-edited file must not break discover. - * - * @param {string} repoFullName - * @param {number} [nowMs] current time in ms, injectable for deterministic tests - */ - get(repoFullName, nowMs = Date.now()) { - const row = getStatement.get(normalizeRepoFullName(repoFullName)); - if (!row) return null; - let profile; - try { - profile = JSON.parse(row.profile_json); - } catch { - return null; - } - const fetchedMs = Date.parse(row.fetched_at); - // An unparseable timestamp fails closed to stale, so a corrupted row is re-extracted rather than trusted. - const stale = - Number.isNaN(fetchedMs) || - nowMs - fetchedMs > CONTRIBUTION_PROFILE_CACHE_TTL_MS; - return { profile, fetchedAt: row.fetched_at, stale }; - }, - /** - * Cache a profile, stamping it with the current time. The profile's own repoFullName is the key. - * - * @param {{ repoFullName: string }} profile a ContributionProfile - * @param {number} [nowMs] current time in ms, injectable for deterministic tests - */ - put(profile, nowMs = Date.now()) { - const repoFullName = normalizeRepoFullName(profile?.repoFullName); - const fetchedAt = new Date(nowMs).toISOString(); - putStatement.run(repoFullName, JSON.stringify(profile), fetchedAt); - return { repoFullName, fetchedAt }; - }, - /** - * Delete the cached profile for one repo (#7091) — the right-to-be-forgotten path `loopover-miner purge` - * invokes. Returns the number of rows removed (0 or 1, since repo_full_name is the primary key). Reuses - * store-maintenance.js's identifier-guarded purgeStoreByRepo, exactly like the other repo-scoped stores. - * - * @param {string} repoFullName - * @returns {number} rows deleted - */ - purgeByRepo(repoFullName) { - return purgeStoreByRepo(db, CONTRIBUTION_PROFILE_CACHE_PURGE_SPEC, normalizeRepoFullName(repoFullName)); - }, - close() { - db.close(); - }, - }; + return { + dbPath: resolvedPath, + /** + * Read a cached profile. Returns { profile, fetchedAt, stale } or null when absent. `stale` is true once + * the row is older than the TTL, so a caller re-extracts. A row whose JSON is unparseable is treated as a + * miss (fail closed) rather than throwing — a corrupted/hand-edited file must not break discover. + */ + get(repoFullName, nowMs = Date.now()) { + const row = getStatement.get(normalizeRepoFullName(repoFullName)); + if (!row) + return null; + let profile; + try { + profile = JSON.parse(row.profile_json); + } + catch { + return null; + } + const fetchedMs = Date.parse(row.fetched_at); + // An unparseable timestamp fails closed to stale, so a corrupted row is re-extracted rather than trusted. + const stale = Number.isNaN(fetchedMs) || + nowMs - fetchedMs > CONTRIBUTION_PROFILE_CACHE_TTL_MS; + return { profile, fetchedAt: row.fetched_at, stale }; + }, + /** + * Cache a profile, stamping it with the current time. The profile's own repoFullName is the key. + */ + put(profile, nowMs = Date.now()) { + const repoFullName = normalizeRepoFullName(profile?.repoFullName); + const fetchedAt = new Date(nowMs).toISOString(); + putStatement.run(repoFullName, JSON.stringify(profile), fetchedAt); + return { repoFullName, fetchedAt }; + }, + /** + * Delete the cached profile for one repo (#7091) — the right-to-be-forgotten path `loopover-miner purge` + * invokes. Returns the number of rows removed (0 or 1, since repo_full_name is the primary key). Reuses + * store-maintenance.js's identifier-guarded purgeStoreByRepo, exactly like the other repo-scoped stores. + */ + purgeByRepo(repoFullName) { + return purgeStoreByRepo(db, CONTRIBUTION_PROFILE_CACHE_PURGE_SPEC, normalizeRepoFullName(repoFullName)); + }, + close() { + db.close(); + }, + }; } - function getDefaultContributionProfileCache() { - defaultContributionProfileCache ??= initContributionProfileCache(); - return defaultContributionProfileCache; + defaultContributionProfileCache ??= initContributionProfileCache(); + return defaultContributionProfileCache; } - export function getCachedContributionProfile(repoFullName, nowMs) { - return getDefaultContributionProfileCache().get(repoFullName, nowMs); + return getDefaultContributionProfileCache().get(repoFullName, nowMs); } - export function putCachedContributionProfile(profile, nowMs) { - return getDefaultContributionProfileCache().put(profile, nowMs); + return getDefaultContributionProfileCache().put(profile, nowMs); } - export function closeDefaultContributionProfileCache() { - if (!defaultContributionProfileCache) return; - defaultContributionProfileCache.close(); - defaultContributionProfileCache = null; + if (!defaultContributionProfileCache) + return; + defaultContributionProfileCache.close(); + defaultContributionProfileCache = null; } +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJpYnV0aW9uLXByb2ZpbGUtY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb250cmlidXRpb24tcHJvZmlsZS1jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFNQSxPQUFPLEVBQ0wsaUNBQWlDLEVBQ2pDLGdDQUFnQyxHQUNqQyxNQUFNLDJCQUEyQixDQUFDO0FBQ25DLE9BQU8sRUFDTCx5QkFBeUIsRUFDekIsZ0JBQWdCLEVBQ2hCLHVCQUF1QixHQUN4QixNQUFNLGtCQUFrQixDQUFDO0FBQzFCLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzVELE9BQU8sRUFDTCxxQ0FBcUMsRUFDckMsZ0JBQWdCLEdBQ2pCLE1BQU0sd0JBQXdCLENBQUM7QUFnQmhDLE1BQU0saUJBQWlCLEdBQUcsb0NBQW9DLENBQUM7QUFDL0QsSUFBSSwrQkFBK0IsR0FBb0MsSUFBSSxDQUFDO0FBRTVFLE1BQU0sVUFBVSxxQ0FBcUMsQ0FBQyxNQUEwQyxPQUFPLENBQUMsR0FBRztJQUN6RyxPQUFPLHVCQUF1QixDQUM1QixpQkFBaUIsRUFDakIsOENBQThDLEVBQzlDLEdBQUcsQ0FDSixDQUFDO0FBQ0osQ0FBQztBQUVELFNBQVMsZUFBZSxDQUFDLE1BQWlDO0lBQ3hELE9BQU8seUJBQXlCLENBQzlCLE1BQU0sRUFDTixxQ0FBcUMsRUFBRSxFQUN2Qyw0Q0FBNEMsQ0FDN0MsQ0FBQztBQUNKLENBQUM7QUFFRCxTQUFTLHFCQUFxQixDQUFDLFlBQXFCO0lBQ2xELElBQUksT0FBTyxZQUFZLEtBQUssUUFBUTtRQUNsQyxNQUFNLElBQUksS0FBSyxDQUFDLHdCQUF3QixDQUFDLENBQUM7SUFDNUMsTUFBTSxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLEdBQUcsWUFBWSxDQUFDLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUM1RCxJQUFJLENBQUMsS0FBSyxJQUFJLENB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 \ No newline at end of file diff --git a/packages/loopover-miner/lib/contribution-profile-cache.ts b/packages/loopover-miner/lib/contribution-profile-cache.ts new file mode 100644 index 0000000000..d8cb8fdd67 --- /dev/null +++ b/packages/loopover-miner/lib/contribution-profile-cache.ts @@ -0,0 +1,161 @@ +// ContributionProfile local cache store (#6797). Persists the extraction output (#6796) keyed by repo, so a +// repeated `discover` run within the freshness window doesn't re-fetch/re-parse the same labels + docs. 100% +// local/client-side, like every other miner store: never uploads, syncs, or phones home. Follows the shared +// local-store.js pattern (openLocalStoreDb + resolveLocalStoreDbPath + the schema-version stamp) so it is +// picked up by `doctor`'s store-integrity sweep and `migrate` the same way its siblings are. +import type { CachedContributionProfile, ContributionProfile } from "./contribution-profile.js"; +import { + CONTRIBUTION_PROFILE_CACHE_TTL_MS, + CONTRIBUTION_PROFILE_STORE_TABLE, +} from "./contribution-profile.js"; +import { + normalizeLocalStoreDbPath, + openLocalStoreDb, + resolveLocalStoreDbPath, +} from "./local-store.js"; +import { applySchemaMigrations } from "./schema-version.js"; +import { + CONTRIBUTION_PROFILE_CACHE_PURGE_SPEC, + purgeStoreByRepo, +} from "./store-maintenance.js"; + +export type ContributionProfileCache = { + dbPath: string; + /** Read a cached profile, or null when absent or unparseable. `stale` is true past the TTL. */ + get(repoFullName: string, nowMs?: number): CachedContributionProfile | null; + /** Cache a profile keyed by its own repoFullName, stamped with `nowMs` (defaults to now). */ + put( + profile: ContributionProfile, + nowMs?: number, + ): { repoFullName: string; fetchedAt: string }; + /** Delete the cached profile for one repo (#7091); returns rows removed (0 or 1). */ + purgeByRepo(repoFullName: string): number; + close(): void; +}; + +const defaultDbFileName = "contribution-profile-cache.sqlite3"; +let defaultContributionProfileCache: ContributionProfileCache | null = null; + +export function resolveContributionProfileCacheDbPath(env: Record = process.env): string { + return resolveLocalStoreDbPath( + defaultDbFileName, + "LOOPOVER_MINER_CONTRIBUTION_PROFILE_CACHE_DB", + env, + ); +} + +function normalizeDbPath(dbPath: string | null | undefined): string { + return normalizeLocalStoreDbPath( + dbPath, + resolveContributionProfileCacheDbPath(), + "invalid_contribution_profile_cache_db_path", + ); +} + +function normalizeRepoFullName(repoFullName: unknown): string { + if (typeof repoFullName !== "string") + throw new Error("invalid_repo_full_name"); + const [owner, repo, extra] = repoFullName.trim().split("/"); + if (!owner || !repo || extra !== undefined) + throw new Error("invalid_repo_full_name"); + return `${owner}/${repo}`; +} + +/** + * Open the 100%-local contribution-profile cache. The DB only lives on this machine (#6797). + */ +export function initContributionProfileCache( + dbPath: string = resolveContributionProfileCacheDbPath(), +): ContributionProfileCache { + const resolvedPath = normalizeDbPath(dbPath); + const db = openLocalStoreDb(resolvedPath); + db.exec(` + CREATE TABLE IF NOT EXISTS ${CONTRIBUTION_PROFILE_STORE_TABLE} ( + repo_full_name TEXT PRIMARY KEY, + profile_json TEXT NOT NULL, + fetched_at TEXT NOT NULL + ) + `); + // Schema-version convention (#4832): stamp the baseline. No post-baseline migrations for this v1 store yet. + applySchemaMigrations(db, []); + + const getStatement = db.prepare( + `SELECT profile_json, fetched_at FROM ${CONTRIBUTION_PROFILE_STORE_TABLE} WHERE repo_full_name = ?`, + ); + const putStatement = db.prepare(` + INSERT INTO ${CONTRIBUTION_PROFILE_STORE_TABLE} (repo_full_name, profile_json, fetched_at) + VALUES (?, ?, ?) + ON CONFLICT(repo_full_name) DO UPDATE SET + profile_json = excluded.profile_json, + fetched_at = excluded.fetched_at + `); + + return { + dbPath: resolvedPath, + /** + * Read a cached profile. Returns { profile, fetchedAt, stale } or null when absent. `stale` is true once + * the row is older than the TTL, so a caller re-extracts. A row whose JSON is unparseable is treated as a + * miss (fail closed) rather than throwing — a corrupted/hand-edited file must not break discover. + */ + get(repoFullName: string, nowMs: number = Date.now()): CachedContributionProfile | null { + const row = getStatement.get(normalizeRepoFullName(repoFullName)) as + | { profile_json: string; fetched_at: string } + | undefined; + if (!row) return null; + let profile; + try { + profile = JSON.parse(row.profile_json); + } catch { + return null; + } + const fetchedMs = Date.parse(row.fetched_at); + // An unparseable timestamp fails closed to stale, so a corrupted row is re-extracted rather than trusted. + const stale = + Number.isNaN(fetchedMs) || + nowMs - fetchedMs > CONTRIBUTION_PROFILE_CACHE_TTL_MS; + return { profile, fetchedAt: row.fetched_at, stale }; + }, + /** + * Cache a profile, stamping it with the current time. The profile's own repoFullName is the key. + */ + put(profile: ContributionProfile, nowMs: number = Date.now()): { repoFullName: string; fetchedAt: string } { + const repoFullName = normalizeRepoFullName(profile?.repoFullName); + const fetchedAt = new Date(nowMs).toISOString(); + putStatement.run(repoFullName, JSON.stringify(profile), fetchedAt); + return { repoFullName, fetchedAt }; + }, + /** + * Delete the cached profile for one repo (#7091) — the right-to-be-forgotten path `loopover-miner purge` + * invokes. Returns the number of rows removed (0 or 1, since repo_full_name is the primary key). Reuses + * store-maintenance.js's identifier-guarded purgeStoreByRepo, exactly like the other repo-scoped stores. + */ + purgeByRepo(repoFullName: string): number { + return purgeStoreByRepo(db, CONTRIBUTION_PROFILE_CACHE_PURGE_SPEC, normalizeRepoFullName(repoFullName)); + }, + close() { + db.close(); + }, + }; +} + +function getDefaultContributionProfileCache(): ContributionProfileCache { + defaultContributionProfileCache ??= initContributionProfileCache(); + return defaultContributionProfileCache; +} + +export function getCachedContributionProfile(repoFullName: string, nowMs?: number): CachedContributionProfile | null { + return getDefaultContributionProfileCache().get(repoFullName, nowMs); +} + +export function putCachedContributionProfile( + profile: ContributionProfile, + nowMs?: number, +): { repoFullName: string; fetchedAt: string } { + return getDefaultContributionProfileCache().put(profile, nowMs); +} + +export function closeDefaultContributionProfileCache() { + if (!defaultContributionProfileCache) return; + defaultContributionProfileCache.close(); + defaultContributionProfileCache = null; +} diff --git a/packages/loopover-miner/lib/discovery-index-client.d.ts b/packages/loopover-miner/lib/discovery-index-client.d.ts index 435baf44d2..c0bcbee7f7 100644 --- a/packages/loopover-miner/lib/discovery-index-client.d.ts +++ b/packages/loopover-miner/lib/discovery-index-client.d.ts @@ -1,43 +1,61 @@ +/** Opt-in client for the hosted discovery-index service (#4250, #7164/#7166/#7168). Complete no-op unless + * LOOPOVER_MINER_DISCOVERY_PLANE is set -- mirrors sentry.js's own-project opt-in posture: nothing here is ever + * auto-enabled or phones home by default. Supplements (never replaces) opportunity-fanout.js's per-instance + * GitHub fan-out with results from the shared, centrally-cached index, and submits soft-claim coordination at + * work-start/work-end -- the fleet-wide rate-limit mitigation packages/loopover-miner/docs/discovery-plane- + * operator-guide.md documents. Every call here is fail-open (never throws, degrades to "no supplement"/"no + * telemetry sent" on any error), matching orb-export.js's sendAmsExportBatch: an optional-plane hiccup must + * never break the miner's real discover/attempt work. Uses @loopover/engine's discovery-index-contract.ts and + * discovery-soft-claim.ts exports directly rather than re-implementing the shapes. */ import type { DiscoveryIndexQuery, DiscoveryIndexResponse } from "@loopover/engine"; - -export const DISCOVERY_PLANE_FLAG: string; -export const DISCOVERY_INDEX_URL_FLAG: string; -export const DISCOVERY_TELEMETRY_FLAG: string; - +export declare const DISCOVERY_PLANE_FLAG = "LOOPOVER_MINER_DISCOVERY_PLANE"; +export declare const DISCOVERY_INDEX_URL_FLAG = "LOOPOVER_MINER_DISCOVERY_INDEX_URL"; +export declare const DISCOVERY_TELEMETRY_FLAG = "LOOPOVER_MINER_DISCOVERY_TELEMETRY"; export type DiscoveryIndexClientOptions = { - env?: Record; - /** Always called as `fetchImpl(url, init)` with a plain string URL -- narrower than `typeof fetch` on - * purpose, since that's the only shape this module ever actually calls it with. */ - fetchImpl?: (url: string, init: RequestInit) => Promise; - requestTimeoutMs?: number; + env?: Record; + /** Always called as `fetchImpl(url, init)` with a plain string URL -- narrower than `typeof fetch` on + * purpose, since that's the only shape this module ever actually calls it with. */ + fetchImpl?: (url: string, init: RequestInit) => Promise; + requestTimeoutMs?: number; }; - /** The shape claim-ledger.js's rowToClaim (and claimIssueWithinCap(...).claim) already produces -- passed * straight into @loopover/engine's buildSoftClaimRequest with no translation. */ export type SoftClaimLedgerRecord = { - repoFullName: string; - issueNumber: number; - claimedAt: string; - status: "active" | "released" | "expired"; - note?: string | null; + repoFullName: string; + issueNumber: number; + claimedAt: string; + status: "active" | "released" | "expired"; + note?: string | null; }; - -export function isDiscoveryPlaneEnabled(env?: Record): boolean; - -export function isDiscoveryTelemetryEnabled(env?: Record): boolean; - -export function queryDiscoveryIndex( - query: Partial, - options?: DiscoveryIndexClientOptions, -): Promise; - -export function submitSoftClaim( - claim: SoftClaimLedgerRecord, - options?: DiscoveryIndexClientOptions, -): Promise<{ sent: boolean }>; - -export function recordDiscoveryTelemetry( - event: string, - outcome: string, - options?: { env?: Record }, -): void; +/** Master opt-in (default off). When false, no discovery-index traffic and no telemetry may be emitted. */ +export declare function isDiscoveryPlaneEnabled(env?: Record): boolean; +/** Second, independent opt-in (default off) for anonymized operational telemetry -- can stay off while the + * plane itself is queried/claimed against. */ +export declare function isDiscoveryTelemetryEnabled(env?: Record): boolean; +/** + * Query the hosted discovery-index for supplementary candidates. Returns `EMPTY_QUERY_RESPONSE` (never throws) + * when the plane is disabled, the URL is unconfigured, or the request fails for any reason -- callers can + * always safely concatenate `.candidates` onto their own locally-discovered set with zero special-casing. + */ +export declare function queryDiscoveryIndex(query: Partial, options?: DiscoveryIndexClientOptions): Promise; +/** + * Best-effort soft-claim submission at work-start/work-end. `claim` is the object returned by claim-ledger.js's + * claimIssueWithinCap(...).claim (or its rowToClaim shape generally) -- passed straight into buildSoftClaimRequest + * with no translation, per that builder's own contract. Fire-and-forget: never throws, and the caller's real + * work (already underway once this is called) is never blocked or aborted by a plane hiccup. Returns + * `{sent: boolean}` for callers that want to log/test the outcome without depending on it for control flow. + */ +export declare function submitSoftClaim(claim: SoftClaimLedgerRecord, options?: DiscoveryIndexClientOptions): Promise<{ + sent: boolean; +}>; +/** + * Emit anonymized, low-cardinality operational telemetry about the plane itself (never per-issue business + * data) -- gated separately behind LOOPOVER_MINER_DISCOVERY_TELEMETRY, per the operator guide's invariant list + * ("low-cardinality reason buckets", mirroring orb-export.js's `reasonBucket` convention). No hosted telemetry + * collector endpoint exists for the discovery plane yet (out of scope for #7164/#7166), so this emits a + * structured local log line via this package's own logger -- the gate, shape, and off-by-default behavior are + * real and tested; swapping in a real remote sink later is a logger-call change, not a design change. + */ +export declare function recordDiscoveryTelemetry(event: string, outcome: string, options?: { + env?: Record; +}): void; diff --git a/packages/loopover-miner/lib/discovery-index-client.js b/packages/loopover-miner/lib/discovery-index-client.js index fad1b3d8cb..6ce63f78ed 100644 --- a/packages/loopover-miner/lib/discovery-index-client.js +++ b/packages/loopover-miner/lib/discovery-index-client.js @@ -1,88 +1,73 @@ -/** Opt-in client for the hosted discovery-index service (#4250, #7164/#7166/#7168). Complete no-op unless - * LOOPOVER_MINER_DISCOVERY_PLANE is set -- mirrors sentry.js's own-project opt-in posture: nothing here is ever - * auto-enabled or phones home by default. Supplements (never replaces) opportunity-fanout.js's per-instance - * GitHub fan-out with results from the shared, centrally-cached index, and submits soft-claim coordination at - * work-start/work-end -- the fleet-wide rate-limit mitigation packages/loopover-miner/docs/discovery-plane- - * operator-guide.md documents. Every call here is fail-open (never throws, degrades to "no supplement"/"no - * telemetry sent" on any error), matching orb-export.js's sendAmsExportBatch: an optional-plane hiccup must - * never break the miner's real discover/attempt work. Uses @loopover/engine's discovery-index-contract.ts and - * discovery-soft-claim.ts exports directly rather than re-implementing the shapes. */ import { normalizeDiscoveryIndexRequest, normalizeDiscoveryIndexResponse, buildSoftClaimRequest } from "@loopover/engine"; import { fetchWithRetry } from "./http-retry.js"; import { describeCliError } from "./cli-error.js"; import { getLogger } from "./logger.js"; - export const DISCOVERY_PLANE_FLAG = "LOOPOVER_MINER_DISCOVERY_PLANE"; export const DISCOVERY_INDEX_URL_FLAG = "LOOPOVER_MINER_DISCOVERY_INDEX_URL"; export const DISCOVERY_TELEMETRY_FLAG = "LOOPOVER_MINER_DISCOVERY_TELEMETRY"; - const TRUTHY_ENV_VALUE = /^(1|true|yes|on)$/i; const DEFAULT_REQUEST_TIMEOUT_MS = 10_000; - function isTruthyEnvValue(value) { - return TRUTHY_ENV_VALUE.test(value.trim()); + return TRUTHY_ENV_VALUE.test(value.trim()); } - // Reads below use literal `env.LOOPOVER_MINER_*` property access (not the exported *_FLAG constants above, // which exist for callers/tests to reference the exact name without a typo) because // scripts/generate-env-reference.mjs statically greps for exactly this `env.NAME ?? "default"` shape to keep // packages/loopover-miner/docs/env-reference.md honest -- a dynamic `env[SOME_CONST]` lookup is invisible to it. - /** Master opt-in (default off). When false, no discovery-index traffic and no telemetry may be emitted. */ export function isDiscoveryPlaneEnabled(env = process.env) { - return isTruthyEnvValue(env.LOOPOVER_MINER_DISCOVERY_PLANE ?? ""); + return isTruthyEnvValue(env.LOOPOVER_MINER_DISCOVERY_PLANE ?? ""); } - /** Second, independent opt-in (default off) for anonymized operational telemetry -- can stay off while the * plane itself is queried/claimed against. */ export function isDiscoveryTelemetryEnabled(env = process.env) { - return isTruthyEnvValue(env.LOOPOVER_MINER_DISCOVERY_TELEMETRY ?? ""); + return isTruthyEnvValue(env.LOOPOVER_MINER_DISCOVERY_TELEMETRY ?? ""); } - function resolveDiscoveryIndexUrl(env) { - const raw = (env.LOOPOVER_MINER_DISCOVERY_INDEX_URL ?? "").trim(); - return raw ? raw.replace(/\/+$/, "") : null; + const raw = (env.LOOPOVER_MINER_DISCOVERY_INDEX_URL ?? "").trim(); + return raw ? raw.replace(/\/+$/, "") : null; } - function authHeaders(env) { - const secret = typeof env.LOOPOVER_MINER_DISCOVERY_SHARED_SECRET === "string" ? env.LOOPOVER_MINER_DISCOVERY_SHARED_SECRET.trim() : ""; - return secret ? { authorization: `Bearer ${secret}` } : {}; + const secret = typeof env.LOOPOVER_MINER_DISCOVERY_SHARED_SECRET === "string" ? env.LOOPOVER_MINER_DISCOVERY_SHARED_SECRET.trim() : ""; + return secret ? { authorization: `Bearer ${secret}` } : {}; } - -const EMPTY_QUERY_RESPONSE = Object.freeze({ contractVersion: 1, candidates: [], nextCursor: null }); - +const EMPTY_QUERY_RESPONSE = Object.freeze({ + contractVersion: 1, + candidates: [], + nextCursor: null, +}); /** * Query the hosted discovery-index for supplementary candidates. Returns `EMPTY_QUERY_RESPONSE` (never throws) * when the plane is disabled, the URL is unconfigured, or the request fails for any reason -- callers can * always safely concatenate `.candidates` onto their own locally-discovered set with zero special-casing. */ export async function queryDiscoveryIndex(query, options = {}) { - const env = options.env ?? process.env; - if (!isDiscoveryPlaneEnabled(env)) return EMPTY_QUERY_RESPONSE; - const baseUrl = resolveDiscoveryIndexUrl(env); - if (!baseUrl) return EMPTY_QUERY_RESPONSE; - - const fetchImpl = options.fetchImpl ?? fetch; - const { request } = normalizeDiscoveryIndexRequest(query); - try { - const response = await fetchWithRetry( - fetchImpl, - `${baseUrl}/v1/discovery-index/query`, - { - method: "POST", - headers: { "content-type": "application/json", ...authHeaders(env) }, - body: JSON.stringify(request.query), - }, - { timeoutMs: options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS }, - ); - if (!response.ok) return EMPTY_QUERY_RESPONSE; - const payload = await response.json().catch(() => null); - return normalizeDiscoveryIndexResponse(payload).response; - } catch { - return EMPTY_QUERY_RESPONSE; - } + const env = options.env ?? process.env; + if (!isDiscoveryPlaneEnabled(env)) + return EMPTY_QUERY_RESPONSE; + const baseUrl = resolveDiscoveryIndexUrl(env); + if (!baseUrl) + return EMPTY_QUERY_RESPONSE; + // fetchWithRetry's signature is deliberately untyped-permissive (`(url: unknown, init?: unknown) => + // Promise`) so it can wrap any fetch-shaped function; the narrower, more useful public + // DiscoveryIndexClientOptions#fetchImpl type is cast at this one boundary rather than widened repo-wide. + const fetchImpl = (options.fetchImpl ?? fetch); + const { request } = normalizeDiscoveryIndexRequest(query); + try { + const response = await fetchWithRetry(fetchImpl, `${baseUrl}/v1/discovery-index/query`, { + method: "POST", + headers: { "content-type": "application/json", ...authHeaders(env) }, + body: JSON.stringify(request.query), + }, { timeoutMs: options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS }); + if (!response.ok) + return EMPTY_QUERY_RESPONSE; + const payload = await response.json().catch(() => null); + return normalizeDiscoveryIndexResponse(payload).response; + } + catch { + return EMPTY_QUERY_RESPONSE; + } } - /** * Best-effort soft-claim submission at work-start/work-end. `claim` is the object returned by claim-ledger.js's * claimIssueWithinCap(...).claim (or its rowToClaim shape generally) -- passed straight into buildSoftClaimRequest @@ -91,33 +76,32 @@ export async function queryDiscoveryIndex(query, options = {}) { * `{sent: boolean}` for callers that want to log/test the outcome without depending on it for control flow. */ export async function submitSoftClaim(claim, options = {}) { - const env = options.env ?? process.env; - if (!isDiscoveryPlaneEnabled(env)) return { sent: false }; - const baseUrl = resolveDiscoveryIndexUrl(env); - if (!baseUrl) return { sent: false }; - - const request = buildSoftClaimRequest(claim); - if (request === null) return { sent: false }; - - const fetchImpl = options.fetchImpl ?? fetch; - try { - const response = await fetchWithRetry( - fetchImpl, - `${baseUrl}/v1/discovery-index/soft-claim`, - { - method: "POST", - headers: { "content-type": "application/json", ...authHeaders(env) }, - body: JSON.stringify(request), - }, - { timeoutMs: options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS }, - ); - return { sent: response.ok }; - } catch (error) { - getLogger().debug("discovery_plane_soft_claim_failed", { error: describeCliError(error) }); - return { sent: false }; - } + const env = options.env ?? process.env; + if (!isDiscoveryPlaneEnabled(env)) + return { sent: false }; + const baseUrl = resolveDiscoveryIndexUrl(env); + if (!baseUrl) + return { sent: false }; + const request = buildSoftClaimRequest(claim); + if (request === null) + return { sent: false }; + // fetchWithRetry's signature is deliberately untyped-permissive (`(url: unknown, init?: unknown) => + // Promise`) so it can wrap any fetch-shaped function; the narrower, more useful public + // DiscoveryIndexClientOptions#fetchImpl type is cast at this one boundary rather than widened repo-wide. + const fetchImpl = (options.fetchImpl ?? fetch); + try { + const response = await fetchWithRetry(fetchImpl, `${baseUrl}/v1/discovery-index/soft-claim`, { + method: "POST", + headers: { "content-type": "application/json", ...authHeaders(env) }, + body: JSON.stringify(request), + }, { timeoutMs: options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS }); + return { sent: response.ok }; + } + catch (error) { + getLogger().debug("discovery_plane_soft_claim_failed", { error: describeCliError(error) }); + return { sent: false }; + } } - /** * Emit anonymized, low-cardinality operational telemetry about the plane itself (never per-issue business * data) -- gated separately behind LOOPOVER_MINER_DISCOVERY_TELEMETRY, per the operator guide's invariant list @@ -127,7 +111,9 @@ export async function submitSoftClaim(claim, options = {}) { * real and tested; swapping in a real remote sink later is a logger-call change, not a design change. */ export function recordDiscoveryTelemetry(event, outcome, options = {}) { - const env = options.env ?? process.env; - if (!isDiscoveryPlaneEnabled(env) || !isDiscoveryTelemetryEnabled(env)) return; - getLogger().info("discovery_plane_telemetry", { event, outcome }); + const env = options.env ?? process.env; + if (!isDiscoveryPlaneEnabled(env) || !isDiscoveryTelemetryEnabled(env)) + return; + getLogger().info("discovery_plane_telemetry", { event, outcome }); } +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlzY292ZXJ5LWluZGV4LWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImRpc2NvdmVyeS1pbmRleC1jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBVUEsT0FBTyxFQUFFLDhCQUE4QixFQUFFLCtCQUErQixFQUFFLHFCQUFxQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDMUgsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFeEMsTUFBTSxDQUFDLE1BQU0sb0JBQW9CLEdBQUcsZ0NBQWdDLENBQUM7QUFDckUsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsb0NBQW9DLENBQUM7QUFDN0UsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsb0NBQW9DLENBQUM7QUFvQjdFLE1BQU0sZ0JBQWdCLEdBQUcsb0JBQW9CLENBQUM7QUFDOUMsTUFBTSwwQkFBMEIsR0FBRyxNQUFNLENBQUM7QUFFMUMsU0FBUyxnQkFBZ0IsQ0FBQyxLQUFhO0lBQ3JDLE9BQU8sZ0JBQWdCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0FBQzdDLENBQUM7QUFFRCwyR0FBMkc7QUFDM0csb0ZBQW9GO0FBQ3BGLDZHQUE2RztBQUM3RyxpSEFBaUg7QUFFakgsMkdBQTJHO0FBQzNHLE1BQU0sVUFBVSx1QkFBdUIsQ0FBQyxNQUEwQyxPQUFPLENBQUMsR0FBRztJQUMzRixPQUFPLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyw4QkFBOEIsSUFBSSxFQUFFLENBQUMsQ0FBQztBQUNwRSxDQUFDO0FBRUQ7K0NBQytDO0FBQy9DLE1BQU0sVUFBVSwyQkFBMkIsQ0FBQyxNQUEwQyxPQUFPLENBQUMsR0FBRztJQUMvRixPQUFPLGdCQUFnQixDQUFDLEdB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 \ No newline at end of file diff --git a/packages/loopover-miner/lib/discovery-index-client.ts b/packages/loopover-miner/lib/discovery-index-client.ts new file mode 100644 index 0000000000..ab40472906 --- /dev/null +++ b/packages/loopover-miner/lib/discovery-index-client.ts @@ -0,0 +1,172 @@ +/** Opt-in client for the hosted discovery-index service (#4250, #7164/#7166/#7168). Complete no-op unless + * LOOPOVER_MINER_DISCOVERY_PLANE is set -- mirrors sentry.js's own-project opt-in posture: nothing here is ever + * auto-enabled or phones home by default. Supplements (never replaces) opportunity-fanout.js's per-instance + * GitHub fan-out with results from the shared, centrally-cached index, and submits soft-claim coordination at + * work-start/work-end -- the fleet-wide rate-limit mitigation packages/loopover-miner/docs/discovery-plane- + * operator-guide.md documents. Every call here is fail-open (never throws, degrades to "no supplement"/"no + * telemetry sent" on any error), matching orb-export.js's sendAmsExportBatch: an optional-plane hiccup must + * never break the miner's real discover/attempt work. Uses @loopover/engine's discovery-index-contract.ts and + * discovery-soft-claim.ts exports directly rather than re-implementing the shapes. */ +import type { DiscoveryIndexQuery, DiscoveryIndexResponse } from "@loopover/engine"; +import { normalizeDiscoveryIndexRequest, normalizeDiscoveryIndexResponse, buildSoftClaimRequest } from "@loopover/engine"; +import { fetchWithRetry } from "./http-retry.js"; +import { describeCliError } from "./cli-error.js"; +import { getLogger } from "./logger.js"; + +export const DISCOVERY_PLANE_FLAG = "LOOPOVER_MINER_DISCOVERY_PLANE"; +export const DISCOVERY_INDEX_URL_FLAG = "LOOPOVER_MINER_DISCOVERY_INDEX_URL"; +export const DISCOVERY_TELEMETRY_FLAG = "LOOPOVER_MINER_DISCOVERY_TELEMETRY"; + +export type DiscoveryIndexClientOptions = { + env?: Record; + /** Always called as `fetchImpl(url, init)` with a plain string URL -- narrower than `typeof fetch` on + * purpose, since that's the only shape this module ever actually calls it with. */ + fetchImpl?: (url: string, init: RequestInit) => Promise; + requestTimeoutMs?: number; +}; + +/** The shape claim-ledger.js's rowToClaim (and claimIssueWithinCap(...).claim) already produces -- passed + * straight into @loopover/engine's buildSoftClaimRequest with no translation. */ +export type SoftClaimLedgerRecord = { + repoFullName: string; + issueNumber: number; + claimedAt: string; + status: "active" | "released" | "expired"; + note?: string | null; +}; + +const TRUTHY_ENV_VALUE = /^(1|true|yes|on)$/i; +const DEFAULT_REQUEST_TIMEOUT_MS = 10_000; + +function isTruthyEnvValue(value: string): boolean { + return TRUTHY_ENV_VALUE.test(value.trim()); +} + +// Reads below use literal `env.LOOPOVER_MINER_*` property access (not the exported *_FLAG constants above, +// which exist for callers/tests to reference the exact name without a typo) because +// scripts/generate-env-reference.mjs statically greps for exactly this `env.NAME ?? "default"` shape to keep +// packages/loopover-miner/docs/env-reference.md honest -- a dynamic `env[SOME_CONST]` lookup is invisible to it. + +/** Master opt-in (default off). When false, no discovery-index traffic and no telemetry may be emitted. */ +export function isDiscoveryPlaneEnabled(env: Record = process.env): boolean { + return isTruthyEnvValue(env.LOOPOVER_MINER_DISCOVERY_PLANE ?? ""); +} + +/** Second, independent opt-in (default off) for anonymized operational telemetry -- can stay off while the + * plane itself is queried/claimed against. */ +export function isDiscoveryTelemetryEnabled(env: Record = process.env): boolean { + return isTruthyEnvValue(env.LOOPOVER_MINER_DISCOVERY_TELEMETRY ?? ""); +} + +function resolveDiscoveryIndexUrl(env: Record): string | null { + const raw = (env.LOOPOVER_MINER_DISCOVERY_INDEX_URL ?? "").trim(); + return raw ? raw.replace(/\/+$/, "") : null; +} + +function authHeaders(env: Record): { authorization: string } | Record { + const secret = typeof env.LOOPOVER_MINER_DISCOVERY_SHARED_SECRET === "string" ? env.LOOPOVER_MINER_DISCOVERY_SHARED_SECRET.trim() : ""; + return secret ? { authorization: `Bearer ${secret}` } : {}; +} + +const EMPTY_QUERY_RESPONSE: DiscoveryIndexResponse = Object.freeze({ + contractVersion: 1, + candidates: [], + nextCursor: null, +}); + +/** + * Query the hosted discovery-index for supplementary candidates. Returns `EMPTY_QUERY_RESPONSE` (never throws) + * when the plane is disabled, the URL is unconfigured, or the request fails for any reason -- callers can + * always safely concatenate `.candidates` onto their own locally-discovered set with zero special-casing. + */ +export async function queryDiscoveryIndex( + query: Partial, + options: DiscoveryIndexClientOptions = {}, +): Promise { + const env = options.env ?? process.env; + if (!isDiscoveryPlaneEnabled(env)) return EMPTY_QUERY_RESPONSE; + const baseUrl = resolveDiscoveryIndexUrl(env); + if (!baseUrl) return EMPTY_QUERY_RESPONSE; + + // fetchWithRetry's signature is deliberately untyped-permissive (`(url: unknown, init?: unknown) => + // Promise`) so it can wrap any fetch-shaped function; the narrower, more useful public + // DiscoveryIndexClientOptions#fetchImpl type is cast at this one boundary rather than widened repo-wide. + const fetchImpl = (options.fetchImpl ?? fetch) as (url: unknown, init?: unknown) => Promise; + const { request } = normalizeDiscoveryIndexRequest(query); + try { + const response = await fetchWithRetry( + fetchImpl, + `${baseUrl}/v1/discovery-index/query`, + { + method: "POST", + headers: { "content-type": "application/json", ...authHeaders(env) }, + body: JSON.stringify(request.query), + }, + { timeoutMs: options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS }, + ); + if (!response.ok) return EMPTY_QUERY_RESPONSE; + const payload = await response.json().catch(() => null); + return normalizeDiscoveryIndexResponse(payload).response; + } catch { + return EMPTY_QUERY_RESPONSE; + } +} + +/** + * Best-effort soft-claim submission at work-start/work-end. `claim` is the object returned by claim-ledger.js's + * claimIssueWithinCap(...).claim (or its rowToClaim shape generally) -- passed straight into buildSoftClaimRequest + * with no translation, per that builder's own contract. Fire-and-forget: never throws, and the caller's real + * work (already underway once this is called) is never blocked or aborted by a plane hiccup. Returns + * `{sent: boolean}` for callers that want to log/test the outcome without depending on it for control flow. + */ +export async function submitSoftClaim( + claim: SoftClaimLedgerRecord, + options: DiscoveryIndexClientOptions = {}, +): Promise<{ sent: boolean }> { + const env = options.env ?? process.env; + if (!isDiscoveryPlaneEnabled(env)) return { sent: false }; + const baseUrl = resolveDiscoveryIndexUrl(env); + if (!baseUrl) return { sent: false }; + + const request = buildSoftClaimRequest(claim); + if (request === null) return { sent: false }; + + // fetchWithRetry's signature is deliberately untyped-permissive (`(url: unknown, init?: unknown) => + // Promise`) so it can wrap any fetch-shaped function; the narrower, more useful public + // DiscoveryIndexClientOptions#fetchImpl type is cast at this one boundary rather than widened repo-wide. + const fetchImpl = (options.fetchImpl ?? fetch) as (url: unknown, init?: unknown) => Promise; + try { + const response = await fetchWithRetry( + fetchImpl, + `${baseUrl}/v1/discovery-index/soft-claim`, + { + method: "POST", + headers: { "content-type": "application/json", ...authHeaders(env) }, + body: JSON.stringify(request), + }, + { timeoutMs: options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS }, + ); + return { sent: response.ok }; + } catch (error) { + getLogger().debug("discovery_plane_soft_claim_failed", { error: describeCliError(error) }); + return { sent: false }; + } +} + +/** + * Emit anonymized, low-cardinality operational telemetry about the plane itself (never per-issue business + * data) -- gated separately behind LOOPOVER_MINER_DISCOVERY_TELEMETRY, per the operator guide's invariant list + * ("low-cardinality reason buckets", mirroring orb-export.js's `reasonBucket` convention). No hosted telemetry + * collector endpoint exists for the discovery plane yet (out of scope for #7164/#7166), so this emits a + * structured local log line via this package's own logger -- the gate, shape, and off-by-default behavior are + * real and tested; swapping in a real remote sink later is a logger-call change, not a design change. + */ +export function recordDiscoveryTelemetry( + event: string, + outcome: string, + options: { env?: Record } = {}, +): void { + const env = options.env ?? process.env; + if (!isDiscoveryPlaneEnabled(env) || !isDiscoveryTelemetryEnabled(env)) return; + getLogger().info("discovery_plane_telemetry", { event, outcome }); +} diff --git a/packages/loopover-miner/lib/opportunity-fanout.d.ts b/packages/loopover-miner/lib/opportunity-fanout.d.ts index 5f47a66a83..4fd88e0f6a 100644 --- a/packages/loopover-miner/lib/opportunity-fanout.d.ts +++ b/packages/loopover-miner/lib/opportunity-fanout.d.ts @@ -1,89 +1,62 @@ import type { ForgeConfig } from "./forge-config.js"; import type { PolicyDocCache } from "./policy-doc-cache.js"; import type { PolicyVerdictCache } from "./policy-verdict-cache.js"; - export type FanoutTarget = { - owner: string; - repo: string; + owner: string; + repo: string; }; - /** Options shared by every fan-out entry point. `apiBaseUrl` is the legacy top-level forge-host override (it still * wins over `forge.apiBaseUrl`); `forge` (#4784) carries the rest of the per-tenant forge knobs. `policyDocCache`, * when supplied, lets discovery revalidate each repo's policy docs with a conditional GET instead of a full * refetch (#4842). `policyVerdictCache`, when supplied, lets discovery reuse an already-resolved verdict once its * deciding doc's ETag is confirmed unchanged, instead of re-resolving it (#4843). */ export type FanoutOptions = { - apiBaseUrl?: string; - forge?: Partial; - concurrency?: number; - rateLimitLowWaterMark?: number; - rateLimitHighWaterMark?: number; - perPage?: number; - maxPages?: number; - requestTimeoutMs?: number; - sleepFn?: (ms: number) => Promise; - policyDocCache?: PolicyDocCache | null; - policyVerdictCache?: PolicyVerdictCache | null; + apiBaseUrl?: string; + forge?: Partial; + concurrency?: number; + rateLimitLowWaterMark?: number; + rateLimitHighWaterMark?: number; + perPage?: number; + maxPages?: number; + requestTimeoutMs?: number; + sleepFn?: (ms: number) => Promise; + policyDocCache?: PolicyDocCache | null; + policyVerdictCache?: PolicyVerdictCache | null; }; - export type RawCandidateIssue = { - owner: string; - repo: string; - repoFullName: string; - issueNumber: number; - title: string; - labels: string[]; - /** Assignee logins (#7040), already present in the same list/search payload as labels — no extra request. */ - assignees: string[]; - commentsCount: number; - createdAt: string | null; - updatedAt: string | null; - htmlUrl: string | null; - aiPolicyAllowed: true; - aiPolicySource: "AI-USAGE.md" | "CONTRIBUTING.md" | "none"; + owner: string; + repo: string; + repoFullName: string; + issueNumber: number; + title: string; + labels: string[]; + /** Assignee logins (#7040), already present in the same list/search payload as labels — no extra request. */ + assignees: string[]; + commentsCount: number; + createdAt: string | null; + updatedAt: string | null; + htmlUrl: string | null; + aiPolicyAllowed: true; + aiPolicySource: "AI-USAGE.md" | "CONTRIBUTING.md" | "none"; }; - export type CandidateIssueWarning = { - repoFullName: string; - stage: string; - message: string; + repoFullName: string; + stage: string; + message: string; }; - export type CandidateIssueSummary = { - issues: RawCandidateIssue[]; - rateLimitRemaining: number | null; - rateLimitResetAt: string | null; - warnings: CandidateIssueWarning[]; + issues: RawCandidateIssue[]; + rateLimitRemaining: number | null; + rateLimitResetAt: string | null; + warnings: CandidateIssueWarning[]; }; - -export function mapWithConcurrency( - items: T[], - maxConcurrency: number, - worker: (item: T, index: number) => Promise, - resolveLimit: () => number, - sleepFn?: (ms: number) => Promise, -): Promise; - -export function fetchCandidateIssuesWithSummary( - targets: FanoutTarget[], - githubToken: string, - options?: FanoutOptions, -): Promise; - -export function fetchCandidateIssues( - targets: FanoutTarget[], - githubToken: string, - options?: FanoutOptions, -): Promise; - -export function searchCandidateIssuesWithSummary( - searchQuery: string, - githubToken: string, - options?: FanoutOptions, -): Promise; - -export function searchCandidateIssues( - searchQuery: string, - githubToken: string, - options?: FanoutOptions, -): Promise; +export declare function mapWithConcurrency(items: T[], maxConcurrency: number, worker: (item: T, index: number) => Promise, resolveLimit: () => number, sleepFn?: (ms: number) => Promise): Promise; +export declare function fetchCandidateIssuesWithSummary(targets: FanoutTarget[], githubToken: string, options?: FanoutOptions): Promise; +/** + * Metadata-only GitHub discovery (#2307): never clones source, never fetches blobs beyond small policy docs, + * never uploads source, and never performs writes. Call the WithSummary variant when rate-limit telemetry is + * needed. + */ +export declare function fetchCandidateIssues(targets: FanoutTarget[], githubToken: string, options?: FanoutOptions): Promise; +export declare function searchCandidateIssuesWithSummary(searchQuery: string, githubToken: string, options?: FanoutOptions): Promise; +export declare function searchCandidateIssues(searchQuery: string, githubToken: string, options?: FanoutOptions): Promise; diff --git a/packages/loopover-miner/lib/opportunity-fanout.js b/packages/loopover-miner/lib/opportunity-fanout.js index afd0ff7954..10ab566243 100644 --- a/packages/loopover-miner/lib/opportunity-fanout.js +++ b/packages/loopover-miner/lib/opportunity-fanout.js @@ -1,13 +1,8 @@ import { Buffer } from "node:buffer"; import { resolveAiPolicyVerdict } from "@loopover/engine"; import { resolveForgeConfig } from "./forge-config.js"; -import { - DEFAULT_RATE_LIMIT_HIGH_WATER_MARK, - DEFAULT_RATE_LIMIT_LOW_WATER_MARK, - resolveThrottledConcurrency, -} from "./discovery-throttle.js"; +import { DEFAULT_RATE_LIMIT_HIGH_WATER_MARK, DEFAULT_RATE_LIMIT_LOW_WATER_MARK, resolveThrottledConcurrency, } from "./discovery-throttle.js"; import { fetchWithRetry } from "./http-retry.js"; - const defaultConcurrency = 5; // How long a parked worker waits before re-checking the live rate-limit-derived concurrency limit (#4844). const throttleParkMs = 25; @@ -16,598 +11,534 @@ const defaultPerPage = 100; // truncated (#4831); cap the follow loop so a pathological Link chain can't run away. const defaultMaxPages = 10; const defaultRequestTimeoutMs = 10_000; - function normalizeLimit(value, fallback, min, max) { - if (!Number.isFinite(value)) return fallback; - return Math.min(max, Math.max(min, Math.floor(value))); + if (!Number.isFinite(value)) + return fallback; + return Math.min(max, Math.max(min, Math.floor(value))); } - function targetKey(target) { - return `${target.owner.toLowerCase()}/${target.repo.toLowerCase()}`; + return `${target.owner.toLowerCase()}/${target.repo.toLowerCase()}`; } - function normalizeTargets(targets) { - const seen = new Set(); - const normalized = []; - for (const target of Array.isArray(targets) ? targets : []) { - const owner = typeof target?.owner === "string" ? target.owner.trim() : ""; - const repo = typeof target?.repo === "string" ? target.repo.trim() : ""; - if (!owner || !repo) continue; - const key = targetKey({ owner, repo }); - if (seen.has(key)) continue; - seen.add(key); - normalized.push({ owner, repo, repoFullName: `${owner}/${repo}` }); - } - return normalized; -} - + const seen = new Set(); + const normalized = []; + for (const target of Array.isArray(targets) ? targets : []) { + const owner = typeof target?.owner === "string" ? target.owner.trim() : ""; + const repo = typeof target?.repo === "string" ? target.repo.trim() : ""; + if (!owner || !repo) + continue; + const key = targetKey({ owner, repo }); + if (seen.has(key)) + continue; + seen.add(key); + normalized.push({ owner, repo, repoFullName: `${owner}/${repo}` }); + } + return normalized; +} function targetFromFullName(fullName) { - if (typeof fullName !== "string") return null; - const [owner, repo, extra] = fullName.split("/"); - if (!owner || !repo || extra) return null; - return { owner, repo, repoFullName: `${owner}/${repo}` }; + if (typeof fullName !== "string") + return null; + const [owner, repo, extra] = fullName.split("/"); + if (!owner || !repo || extra) + return null; + return { owner, repo, repoFullName: `${owner}/${repo}` }; } - function escapeRegExp(value) { - return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); + return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); } - // Derive owner/repo from a search hit when `repository.full_name` is absent, using the tenant forge's own // `repoPathPrefix` for the API `repository_url` and a forge-agnostic host for the web `html_url` (#4784). Hardcoding // `/repos/` and `github.com` here dropped every custom-forge search result whose payload omitted `full_name`. function targetFromSearchIssue(issue, forge) { - const repositoryFullName = targetFromFullName(issue?.repository?.full_name); - if (repositoryFullName) return repositoryFullName; - - const repoPathPrefix = escapeRegExp(forge.repoPathPrefix.replace(/\/+$/, "")); - const repositoryUrl = - typeof issue?.repository_url === "string" - ? issue.repository_url.match(new RegExp(`${repoPathPrefix}/([^/?#]+)/([^/?#]+)(?:[?#].*)?$`)) - : null; - if (repositoryUrl) { - const owner = decodeURIComponent(repositoryUrl[1]); - const repo = decodeURIComponent(repositoryUrl[2]); - return { owner, repo, repoFullName: `${owner}/${repo}` }; - } - - const htmlUrl = - typeof issue?.html_url === "string" - ? issue.html_url.match(/^https:\/\/[^/]+\/([^/]+)\/([^/]+)\/issues\/\d+(?:[?#].*)?$/) - : null; - if (htmlUrl) { - const owner = decodeURIComponent(htmlUrl[1]); - const repo = decodeURIComponent(htmlUrl[2]); - return { owner, repo, repoFullName: `${owner}/${repo}` }; - } - - return null; + const repositoryFullName = targetFromFullName(issue?.repository?.full_name); + if (repositoryFullName) + return repositoryFullName; + const repoPathPrefix = escapeRegExp(forge.repoPathPrefix.replace(/\/+$/, "")); + const repositoryUrl = typeof issue?.repository_url === "string" + ? issue.repository_url.match(new RegExp(`${repoPathPrefix}/([^/?#]+)/([^/?#]+)(?:[?#].*)?$`)) + : null; + if (repositoryUrl) { + const owner = decodeURIComponent(repositoryUrl[1]); + const repo = decodeURIComponent(repositoryUrl[2]); + return { owner, repo, repoFullName: `${owner}/${repo}` }; + } + const htmlUrl = typeof issue?.html_url === "string" + ? issue.html_url.match(/^https:\/\/[^/]+\/([^/]+)\/([^/]+)\/issues\/\d+(?:[?#].*)?$/) + : null; + if (htmlUrl) { + const owner = decodeURIComponent(htmlUrl[1]); + const repo = decodeURIComponent(htmlUrl[2]); + return { owner, repo, repoFullName: `${owner}/${repo}` }; + } + return null; } - function githubHeaders(githubToken, forge) { - const headers = { - accept: forge.acceptHeader, - "user-agent": forge.userAgent, - [forge.apiVersionHeader]: forge.apiVersion, - }; - const token = typeof githubToken === "string" ? githubToken.trim() : ""; - if (token) headers.authorization = `Bearer ${token}`; - return headers; -} - + const headers = { + accept: forge.acceptHeader, + "user-agent": forge.userAgent, + [forge.apiVersionHeader]: forge.apiVersion, + }; + const token = typeof githubToken === "string" ? githubToken.trim() : ""; + if (token) + headers.authorization = `Bearer ${token}`; + return headers; +} function apiUrl(apiBaseUrl, path, query = "") { - return `${apiBaseUrl.replace(/\/+$/, "")}${path}${query}`; + return `${apiBaseUrl.replace(/\/+$/, "")}${path}${query}`; } - function repoPath(forge, target, suffix) { - return `${forge.repoPathPrefix}/${encodeURIComponent(target.owner)}/${encodeURIComponent(target.repo)}${suffix}`; + return `${forge.repoPathPrefix}/${encodeURIComponent(target.owner)}/${encodeURIComponent(target.repo)}${suffix}`; } - function recordRateLimit(summary, response) { - const remaining = Number(response.headers.get("x-ratelimit-remaining")); - if (Number.isFinite(remaining)) { - summary.rateLimitRemaining = - summary.rateLimitRemaining === null - ? remaining - : Math.min(summary.rateLimitRemaining, remaining); - } - const resetSeconds = Number(response.headers.get("x-ratelimit-reset")); - if (Number.isFinite(resetSeconds) && resetSeconds > 0) { - const resetAt = new Date(resetSeconds * 1000).toISOString(); - summary.rateLimitResetAt = - summary.rateLimitResetAt === null || resetAt > summary.rateLimitResetAt - ? resetAt - : summary.rateLimitResetAt; - } -} - + const remaining = Number(response.headers.get("x-ratelimit-remaining")); + if (Number.isFinite(remaining)) { + summary.rateLimitRemaining = + summary.rateLimitRemaining === null + ? remaining + : Math.min(summary.rateLimitRemaining, remaining); + } + const resetSeconds = Number(response.headers.get("x-ratelimit-reset")); + if (Number.isFinite(resetSeconds) && resetSeconds > 0) { + const resetAt = new Date(resetSeconds * 1000).toISOString(); + summary.rateLimitResetAt = + summary.rateLimitResetAt === null || resetAt > summary.rateLimitResetAt + ? resetAt + : summary.rateLimitResetAt; + } +} async function githubGetJson(url, githubToken, summary, options, extraHeaders = {}) { - // Retry a transient 5xx from GitHub before dropping this target's results for the whole run (#4830) — the same - // discipline as the CI/gate-verdict pollers. A thrown network error still propagates to each caller's try/catch. - // `extraHeaders` carries per-call additions (e.g. a policy-doc If-None-Match, #4842) on top of the base auth set. - // requestTimeoutMs bounds each individual attempt so a stalled connection can't hang discovery forever - // (#miner-github-read-timeouts) -- fetchWithRetry gives each retry its own fresh AbortSignal.timeout(). - const response = await fetchWithRetry( - fetch, - url, - { method: "GET", headers: { ...githubHeaders(githubToken, options.forge), ...extraHeaders } }, - { sleepFn: options?.sleepFn, timeoutMs: options?.requestTimeoutMs }, - ); - recordRateLimit(summary, response); - const payload = await response.json().catch(() => null); - return { response, payload }; -} - + // Retry a transient 5xx from GitHub before dropping this target's results for the whole run (#4830) — the same + // discipline as the CI/gate-verdict pollers. A thrown network error still propagates to each caller's try/catch. + // `extraHeaders` carries per-call additions (e.g. a policy-doc If-None-Match, #4842) on top of the base auth set. + // requestTimeoutMs bounds each individual attempt so a stalled connection can't hang discovery forever + // (#miner-github-read-timeouts) -- fetchWithRetry gives each retry its own fresh AbortSignal.timeout(). + // Spread-omit sleepFn when absent rather than passing `sleepFn: undefined` -- FetchWithRetryOptions doesn't + // widen its optional properties to `| undefined`, and exactOptionalPropertyTypes treats those as different. + const retryOptions = { ...(options?.sleepFn ? { sleepFn: options.sleepFn } : {}), timeoutMs: options?.requestTimeoutMs }; + const response = await fetchWithRetry(fetch, url, { method: "GET", headers: { ...githubHeaders(githubToken, options.forge), ...extraHeaders } }, retryOptions); + recordRateLimit(summary, response); + const payload = await response.json().catch(() => null); + return { response, payload }; +} function decodeContentPayload(payload) { - if (!payload || typeof payload !== "object" || Array.isArray(payload)) return null; - if (typeof payload.content !== "string") return null; - if (payload.encoding === "base64") { - return Buffer.from(payload.content.replace(/\s/g, ""), "base64").toString("utf8"); - } - return payload.content; -} - + if (!payload || typeof payload !== "object" || Array.isArray(payload)) + return null; + const content = payload; + if (typeof content.content !== "string") + return null; + if (content.encoding === "base64") { + return Buffer.from(content.content.replace(/\s/g, ""), "base64").toString("utf8"); + } + return content.content; +} function warning(target, stage, message) { - return { repoFullName: target.repoFullName, stage, message }; + return { repoFullName: target.repoFullName, stage, message }; } - // Read a URL's prior ETag so an unchanged doc can be revalidated with a conditional GET (#4842). A cache that is // absent, or whose read throws (corrupt/locked file), is treated as a plain miss: the caller does a full fetch, // per the "never risk a stale policy" rule — the cache only ever makes discovery cheaper, never less correct. function readCachedPolicyDoc(cache, url) { - if (!cache) return null; - try { - return cache.get(url); - } catch { - return null; - } + if (!cache) + return null; + try { + return cache.get(url); + } + catch { + return null; + } } - function readEtagHeader(response) { - const etag = response.headers.get("etag"); - return typeof etag === "string" && etag.trim() ? etag : null; + const etag = response.headers.get("etag"); + return typeof etag === "string" && etag.trim() ? etag : null; } - // Persist the fresh ETag + body so the NEXT discover run can revalidate instead of re-downloading. Only a real // ETag paired with decoded content is stored, and a write that throws must never fail discovery (same stale-safe // rule) — it degrades to "not cached", so the next run simply refetches in full. function writeCachedPolicyDoc(cache, url, etag, content) { - if (!cache || content === null || etag === null) return; - try { - cache.put(url, etag, content); - } catch { - // Leave this URL uncached; the next run refetches fully rather than serving anything stale. - } -} - + if (!cache || content === null || etag === null) + return; + try { + cache.put(url, etag, content); + } + catch { + // Leave this URL uncached; the next run refetches fully rather than serving anything stale. + } +} // A bare `owner/repo` is NOT a safe policy-verdict cache key: two different tenant forge hosts (#4784's // per-tenant `apiBaseUrl`) can each have their own unrelated repo of the same name, and their policy docs are // wholly independent. Scope the key by host, mirroring policy-doc-cache.js's own precedent of keying on the full // request URL rather than a bare path. function policyVerdictCacheKey(apiBaseUrl, repoFullName) { - return `${apiBaseUrl}::${repoFullName}`; + return `${apiBaseUrl}::${repoFullName}`; } - // Read a repo scope's previously-resolved verdict for the SAME decisive doc + ETag (#4843). A cache that is // absent, or whose read throws (corrupt/locked file), is treated as a plain miss — the caller resolves the // verdict fresh, per the same "never risk a stale policy" rule as the doc cache above. function readCachedPolicyVerdict(cache, repoScope) { - if (!cache) return null; - try { - return cache.get(repoScope); - } catch { - return null; - } + if (!cache) + return null; + try { + return cache.get(repoScope); + } + catch { + return null; + } } - // Persist the freshly-resolved verdict against the ETag of the doc that decided it, so the next run can reuse it // outright once that ETag is confirmed unchanged. Only ever called with a real ETag; a write that throws must // never fail discovery — it degrades to "not cached", so the next run just resolves the verdict again. function writeCachedPolicyVerdict(cache, repoScope, decisiveDoc, etag, verdict) { - if (!cache || etag === null) return; - try { - cache.put(repoScope, decisiveDoc, etag, verdict); - } catch { - // Leave this repo scope uncached; the next run just resolves the verdict fresh again. - } -} - + if (!cache || etag === null) + return; + try { + cache.put(repoScope, decisiveDoc, etag, verdict); + } + catch { + // Leave this repo scope uncached; the next run just resolves the verdict fresh again. + } +} async function fetchRepoDoc(target, path, githubToken, options, summary, warnings) { - const url = apiUrl( - options.apiBaseUrl, - repoPath(options.forge, target, `/contents/${encodeURIComponent(path)}`), - ); - const cached = readCachedPolicyDoc(options.policyDocCache, url); - const conditionalHeaders = cached ? { "if-none-match": cached.etag } : {}; - try { - const { response, payload } = await githubGetJson(url, githubToken, summary, options, conditionalHeaders); - // A 304 only ever follows the If-None-Match we send above, which we only send when `cached` exists — so the - // cached body is the GitHub-confirmed current content, served with no extra rate-limit spend. - if (response.status === 304) return { content: cached.content, etag: cached.etag }; - if (response.status === 404) return { content: null, etag: null }; - if (!response.ok) { - warnings.push(warning(target, `policy:${path}`, `GitHub returned ${response.status}`)); - return { content: null, etag: null }; + const url = apiUrl(options.apiBaseUrl, repoPath(options.forge, target, `/contents/${encodeURIComponent(path)}`)); + const cached = readCachedPolicyDoc(options.policyDocCache, url); + const conditionalHeaders = cached ? { "if-none-match": cached.etag } : {}; + try { + const { response, payload } = await githubGetJson(url, githubToken, summary, options, conditionalHeaders); + // A 304 only ever follows the If-None-Match we send above, which we only send when `cached` exists — so the + // cached body is the GitHub-confirmed current content, served with no extra rate-limit spend. + if (response.status === 304) + return { content: cached.content, etag: cached.etag }; + if (response.status === 404) + return { content: null, etag: null }; + if (!response.ok) { + warnings.push(warning(target, `policy:${path}`, `GitHub returned ${response.status}`)); + return { content: null, etag: null }; + } + const content = decodeContentPayload(payload); + const etag = readEtagHeader(response); + writeCachedPolicyDoc(options.policyDocCache, url, etag, content); + return { content, etag }; + } + catch (error) { + warnings.push(warning(target, `policy:${path}`, error instanceof Error ? error.message : "policy fetch failed")); + return { content: null, etag: null }; } - const content = decodeContentPayload(payload); - const etag = readEtagHeader(response); - writeCachedPolicyDoc(options.policyDocCache, url, etag, content); - return { content, etag }; - } catch (error) { - warnings.push( - warning(target, `policy:${path}`, error instanceof Error ? error.message : "policy fetch failed"), - ); - return { content: null, etag: null }; - } -} - +} // Resolve a repo scope's AI-usage-policy verdict, reusing a cached one when the deciding doc's ETag hasn't moved // since it was last resolved (#4843). Only ever consulted with an ETag that a same-run conditional-GET just // confirmed is current, so a cache hit is exactly as correct as recomputing — it just skips the (cheap, but not // free) parse. function resolveOrCacheVerdict(cache, repoScope, decisiveDoc, etag, computeVerdict) { - if (etag !== null) { - const cached = readCachedPolicyVerdict(cache, repoScope); - if (cached && cached.decisiveDoc === decisiveDoc && cached.etag === etag) return cached.verdict; - } - const verdict = computeVerdict(); - writeCachedPolicyVerdict(cache, repoScope, decisiveDoc, etag, verdict); - return verdict; -} - + if (etag !== null) { + const cached = readCachedPolicyVerdict(cache, repoScope); + if (cached && cached.decisiveDoc === decisiveDoc && cached.etag === etag) + return cached.verdict; + } + const verdict = computeVerdict(); + writeCachedPolicyVerdict(cache, repoScope, decisiveDoc, etag, verdict); + return verdict; +} async function resolveRepoAiPolicy(target, githubToken, options, summary, warnings) { - const repoScope = policyVerdictCacheKey(options.apiBaseUrl, target.repoFullName); - const { content: aiUsage, etag: aiUsageEtag } = await fetchRepoDoc( - target, - "AI-USAGE.md", - githubToken, - options, - summary, - warnings, - ); - // Short-circuit only on AI-USAGE.md that has real content. A present-but-blank AI-USAGE.md must still fall - // through to CONTRIBUTING.md — otherwise a stub AI-USAGE.md silently fails open and swallows a ban declared in - // CONTRIBUTING.md (the exact case resolveAiPolicyVerdict was fixed to handle in #2900, which can only fire if - // both docs reach it). - if (aiUsage !== null && aiUsage.trim().length > 0) { - return resolveOrCacheVerdict(options.policyVerdictCache, repoScope, "AI-USAGE.md", aiUsageEtag, () => - resolveAiPolicyVerdict({ aiUsage, contributing: null }), - ); - } - const { content: contributing, etag: contributingEtag } = await fetchRepoDoc( - target, - "CONTRIBUTING.md", - githubToken, - options, - summary, - warnings, - ); - return resolveOrCacheVerdict( - options.policyVerdictCache, - repoScope, - "CONTRIBUTING.md", - contributingEtag, - () => resolveAiPolicyVerdict({ aiUsage: null, contributing }), - ); -} - + const repoScope = policyVerdictCacheKey(options.apiBaseUrl, target.repoFullName); + const { content: aiUsage, etag: aiUsageEtag } = await fetchRepoDoc(target, "AI-USAGE.md", githubToken, options, summary, warnings); + // Short-circuit only on AI-USAGE.md that has real content. A present-but-blank AI-USAGE.md must still fall + // through to CONTRIBUTING.md — otherwise a stub AI-USAGE.md silently fails open and swallows a ban declared in + // CONTRIBUTING.md (the exact case resolveAiPolicyVerdict was fixed to handle in #2900, which can only fire if + // both docs reach it). + if (aiUsage !== null && aiUsage.trim().length > 0) { + return resolveOrCacheVerdict(options.policyVerdictCache, repoScope, "AI-USAGE.md", aiUsageEtag, () => resolveAiPolicyVerdict({ aiUsage, contributing: null })); + } + const { content: contributing, etag: contributingEtag } = await fetchRepoDoc(target, "CONTRIBUTING.md", githubToken, options, summary, warnings); + return resolveOrCacheVerdict(options.policyVerdictCache, repoScope, "CONTRIBUTING.md", contributingEtag, () => resolveAiPolicyVerdict({ aiUsage: null, contributing })); +} function labelNames(labels) { - if (!Array.isArray(labels)) return []; - return labels - .map((label) => { - if (typeof label === "string") return label; - if (label && typeof label === "object" && typeof label.name === "string") return label.name; - return ""; + if (!Array.isArray(labels)) + return []; + return labels + .map((label) => { + if (typeof label === "string") + return label; + if (label && typeof label === "object" && typeof label.name === "string") { + return label.name; + } + return ""; }) - .filter((name) => name.length > 0); + .filter((name) => name.length > 0); } - // Assignee logins (#7040): GitHub's issue-list/search payloads already carry `assignees` in the same response // that supplies labels/comments/etc. -- no extra request needed. contribution-profile-filter.js's // assignee-exclusion rule uses this to drop candidates assigned to a login the target repo considers off-limits // (its own owner, by default). function assigneeLogins(assignees) { - if (!Array.isArray(assignees)) return []; - return assignees - .map((assignee) => (assignee && typeof assignee === "object" && typeof assignee.login === "string" ? assignee.login : "")) - .filter((login) => login.length > 0); + if (!Array.isArray(assignees)) + return []; + return assignees + .map((assignee) => assignee && typeof assignee === "object" && typeof assignee.login === "string" + ? assignee.login + : "") + .filter((login) => login.length > 0); } - function normalizeIssue(target, issue, policySource) { - if (!issue || typeof issue !== "object" || issue.pull_request) return null; - if (!Number.isInteger(issue.number) || issue.number <= 0) return null; - if (typeof issue.title !== "string" || issue.title.trim().length === 0) return null; - return { - owner: target.owner, - repo: target.repo, - repoFullName: target.repoFullName, - issueNumber: issue.number, - title: issue.title, - labels: labelNames(issue.labels), - assignees: assigneeLogins(issue.assignees), - commentsCount: Number.isFinite(issue.comments) ? issue.comments : 0, - createdAt: typeof issue.created_at === "string" ? issue.created_at : null, - updatedAt: typeof issue.updated_at === "string" ? issue.updated_at : null, - htmlUrl: typeof issue.html_url === "string" ? issue.html_url : null, - aiPolicyAllowed: true, - aiPolicySource: policySource, - }; -} - + if (!issue || typeof issue !== "object" || issue.pull_request) + return null; + const candidate = issue; + if (!Number.isInteger(candidate.number) || candidate.number <= 0) + return null; + if (typeof candidate.title !== "string" || candidate.title.trim().length === 0) + return null; + return { + owner: target.owner, + repo: target.repo, + repoFullName: target.repoFullName, + issueNumber: candidate.number, + title: candidate.title, + labels: labelNames(candidate.labels), + assignees: assigneeLogins(candidate.assignees), + commentsCount: Number.isFinite(candidate.comments) ? candidate.comments : 0, + createdAt: typeof candidate.created_at === "string" ? candidate.created_at : null, + updatedAt: typeof candidate.updated_at === "string" ? candidate.updated_at : null, + htmlUrl: typeof candidate.html_url === "string" ? candidate.html_url : null, + aiPolicyAllowed: true, + aiPolicySource: policySource, + }; +} function searchQueryWithIssueQualifiers(searchQuery, forge) { - const trimmed = typeof searchQuery === "string" ? searchQuery.trim() : ""; - if (!trimmed) return ""; - return `${trimmed} ${forge.searchQualifiers}`; + const trimmed = typeof searchQuery === "string" ? searchQuery.trim() : ""; + if (!trimmed) + return ""; + return `${trimmed} ${forge.searchQualifiers}`; } - // The URL of the next page from a GitHub Link header (`; rel="next"`), constrained to the current // token-bearing GitHub API endpoint so a forged Link header cannot redirect credentials off-origin. function nextPageUrl(response, apiBaseUrl, expectedPath) { - const linkHeader = response.headers.get("link") ?? ""; - const match = linkHeader.match(/<([^>]+)>;\s*rel="next"/); - if (match === null) return null; - - let nextUrl; - let expectedUrl; - try { - expectedUrl = new URL(apiUrl(apiBaseUrl, expectedPath)); - nextUrl = new URL(match[1], expectedUrl); - } catch { - return null; - } - - if ( - nextUrl.protocol !== "https:" || - nextUrl.origin !== expectedUrl.origin || - nextUrl.pathname !== expectedUrl.pathname - ) { - return null; - } - return nextUrl.toString(); + const linkHeader = response.headers.get("link") ?? ""; + const match = linkHeader.match(/<([^>]+)>;\s*rel="next"/); + if (match === null) + return null; + let nextUrl; + let expectedUrl; + try { + expectedUrl = new URL(apiUrl(apiBaseUrl, expectedPath)); + nextUrl = new URL(match[1], expectedUrl); + } + catch { + return null; + } + if (nextUrl.protocol !== "https:" || + nextUrl.origin !== expectedUrl.origin || + nextUrl.pathname !== expectedUrl.pathname) { + return null; + } + return nextUrl.toString(); } - async function fetchTargetIssues(target, githubToken, options, summary, warnings) { - const verdict = await resolveRepoAiPolicy(target, githubToken, options, summary, warnings); - if (!verdict.allowed) return []; - - const issuesPath = repoPath(options.forge, target, "/issues"); - let url = apiUrl(options.apiBaseUrl, issuesPath, `?state=open&per_page=${options.perPage}`); - const issues = []; - try { - for (let page = 0; url !== null && page < options.maxPages; page += 1) { - const { response, payload } = await githubGetJson(url, githubToken, summary, options); - if (!response.ok) { - warnings.push(warning(target, "issues", `GitHub returned ${response.status}`)); + const verdict = await resolveRepoAiPolicy(target, githubToken, options, summary, warnings); + if (!verdict.allowed) + return []; + const issuesPath = repoPath(options.forge, target, "/issues"); + let url = apiUrl(options.apiBaseUrl, issuesPath, `?state=open&per_page=${options.perPage}`); + const issues = []; + try { + for (let page = 0; url !== null && page < options.maxPages; page += 1) { + const { response, payload } = await githubGetJson(url, githubToken, summary, options); + if (!response.ok) { + warnings.push(warning(target, "issues", `GitHub returned ${response.status}`)); + return issues; + } + if (!Array.isArray(payload)) { + warnings.push(warning(target, "issues", "GitHub returned a non-array issues payload")); + return issues; + } + for (const issue of payload) { + const normalized = normalizeIssue(target, issue, verdict.source); + if (normalized !== null) + issues.push(normalized); + } + url = nextPageUrl(response, options.apiBaseUrl, issuesPath); + } return issues; - } - if (!Array.isArray(payload)) { - warnings.push(warning(target, "issues", "GitHub returned a non-array issues payload")); + } + catch (error) { + warnings.push(warning(target, "issues", error instanceof Error ? error.message : "issue fetch failed")); return issues; - } - for (const issue of payload) { - const normalized = normalizeIssue(target, issue, verdict.source); - if (normalized !== null) issues.push(normalized); - } - url = nextPageUrl(response, options.apiBaseUrl, issuesPath); } - return issues; - } catch (error) { - warnings.push( - warning(target, "issues", error instanceof Error ? error.message : "issue fetch failed"), - ); - return issues; - } -} - +} async function fetchSearchIssues(searchQuery, githubToken, options, summary, warnings) { - const qualifiedQuery = searchQueryWithIssueQualifiers(searchQuery, options.forge); - if (!qualifiedQuery) return []; - - const searchPath = options.forge.searchEndpoint; - let url = apiUrl( - options.apiBaseUrl, - searchPath, - `?q=${encodeURIComponent(qualifiedQuery)}&per_page=${options.perPage}`, - ); - const items = []; - try { - for (let page = 0; url !== null && page < options.maxPages; page += 1) { - const { response, payload } = await githubGetJson(url, githubToken, summary, options); - if (!response.ok) { - warnings.push({ - repoFullName: "*", - stage: "search", - message: `GitHub returned ${response.status}`, - }); + const qualifiedQuery = searchQueryWithIssueQualifiers(searchQuery, options.forge); + if (!qualifiedQuery) + return []; + const searchPath = options.forge.searchEndpoint; + let url = apiUrl(options.apiBaseUrl, searchPath, `?q=${encodeURIComponent(qualifiedQuery)}&per_page=${options.perPage}`); + const items = []; + try { + for (let page = 0; url !== null && page < options.maxPages; page += 1) { + const { response, payload } = await githubGetJson(url, githubToken, summary, options); + if (!response.ok) { + warnings.push({ + repoFullName: "*", + stage: "search", + message: `GitHub returned ${response.status}`, + }); + return items; + } + const searchPayload = payload; + if (!searchPayload || typeof searchPayload !== "object" || !Array.isArray(searchPayload.items)) { + warnings.push({ + repoFullName: "*", + stage: "search", + message: "GitHub returned a non-array search payload", + }); + return items; + } + items.push(...searchPayload.items); + url = nextPageUrl(response, options.apiBaseUrl, searchPath); + } return items; - } - if (!payload || typeof payload !== "object" || !Array.isArray(payload.items)) { + } + catch (error) { warnings.push({ - repoFullName: "*", - stage: "search", - message: "GitHub returned a non-array search payload", + repoFullName: "*", + stage: "search", + message: error instanceof Error ? error.message : "issue search failed", }); return items; - } - items.push(...payload.items); - url = nextPageUrl(response, options.apiBaseUrl, searchPath); } - return items; - } catch (error) { - warnings.push({ - repoFullName: "*", - stage: "search", - message: error instanceof Error ? error.message : "issue search failed", - }); - return items; - } -} - +} function delay(ms) { - return new Promise((resolve) => setTimeout(resolve, ms)); + return new Promise((resolve) => setTimeout(resolve, ms)); } - // Run `worker` over `items` with a dynamic in-flight cap (#4844). The pool spawns `maxConcurrency` loops, but a // loop parks (re-checking every `throttleParkMs`) whenever the live `resolveLimit()` — derived from the recorded // rate-limit budget — is already met by the number of in-flight workers, so effective concurrency tapers off as // the budget drops instead of sprinting into a 403. `sleepFn` lets tests inject an instant wait for the park. export async function mapWithConcurrency(items, maxConcurrency, worker, resolveLimit, sleepFn) { - const results = new Array(items.length); - const sleep = sleepFn ?? delay; - let next = 0; - let active = 0; - const runOne = async () => { - while (next < items.length) { - // Park while the live limit is already saturated. The check and the `active`/`next` bumps below run without - // an intervening await, so two loops can never claim the same slot. - while (active >= resolveLimit()) { - await sleep(throttleParkMs); - } - // The shared cursor can be drained by other loops while this one is parked, so re-check before claiming. - if (next >= items.length) return; - const index = next; - next += 1; - active += 1; - try { - results[index] = await worker(items[index], index); - } finally { - active -= 1; - } - } - }; - const workers = Array.from({ length: Math.min(maxConcurrency, items.length) }, runOne); - await Promise.all(workers); - return results; + const results = new Array(items.length); + const sleep = sleepFn ?? delay; + let next = 0; + let active = 0; + const runOne = async () => { + while (next < items.length) { + // Park while the live limit is already saturated. The check and the `active`/`next` bumps below run without + // an intervening await, so two loops can never claim the same slot. + while (active >= resolveLimit()) { + await sleep(throttleParkMs); + } + // The shared cursor can be drained by other loops while this one is parked, so re-check before claiming. + if (next >= items.length) + return; + const index = next; + next += 1; + active += 1; + try { + results[index] = await worker(items[index], index); + } + finally { + active -= 1; + } + } + }; + const workers = Array.from({ length: Math.min(maxConcurrency, items.length) }, runOne); + await Promise.all(workers); + return results; } - /** A live limit resolver for `mapWithConcurrency`, reading the summary's rate-limit budget as it is updated (#4844). */ function liveConcurrencyResolver(normalizedOptions, summary) { - return () => - resolveThrottledConcurrency( - normalizedOptions.concurrency, - summary.rateLimitRemaining, - normalizedOptions.rateLimitLowWaterMark, - normalizedOptions.rateLimitHighWaterMark, - ); -} - + return () => resolveThrottledConcurrency(normalizedOptions.concurrency, summary.rateLimitRemaining, normalizedOptions.rateLimitLowWaterMark, normalizedOptions.rateLimitHighWaterMark); +} function normalizeOptions(options = {}) { - // A legacy top-level `apiBaseUrl` (the pre-#4784 GitHub-Enterprise override every existing caller uses) still wins - // over `forge.apiBaseUrl`, so nothing that already passes `apiBaseUrl` changes behavior. - const apiBaseUrlOverride = - typeof options.apiBaseUrl === "string" && options.apiBaseUrl.trim() - ? { apiBaseUrl: options.apiBaseUrl } - : {}; - const forge = resolveForgeConfig({ ...(options.forge ?? {}), ...apiBaseUrlOverride }); - return { - forge, - apiBaseUrl: forge.apiBaseUrl, - concurrency: normalizeLimit(options.concurrency, defaultConcurrency, 1, 10), - // Below/above these recorded-rate-limit-remaining marks the fanout serializes / runs at full concurrency; in - // between it scales down linearly (#4844). - rateLimitLowWaterMark: normalizeLimit( - options.rateLimitLowWaterMark, - DEFAULT_RATE_LIMIT_LOW_WATER_MARK, - 0, - 1_000_000, - ), - rateLimitHighWaterMark: normalizeLimit( - options.rateLimitHighWaterMark, - DEFAULT_RATE_LIMIT_HIGH_WATER_MARK, - 1, - 1_000_000, - ), - perPage: normalizeLimit(options.perPage, defaultPerPage, 1, 100), - maxPages: normalizeLimit(options.maxPages, defaultMaxPages, 1, 100), - requestTimeoutMs: normalizeLimit(options.requestTimeoutMs, defaultRequestTimeoutMs, 1, 60_000), - // Passed through to the per-fetch retry so tests can inject an instant sleep; undefined uses the real backoff. - sleepFn: typeof options.sleepFn === "function" ? options.sleepFn : undefined, - // Optional local ETag cache for policy-doc revalidation (#4842). Absent (null) => every policy doc is fetched - // in full, exactly as before; discover-cli.js supplies the real on-disk store for a live run. - policyDocCache: options.policyDocCache ?? null, - // Optional local cache of resolved policy verdicts (#4843). Absent (null) => every verdict is resolved fresh, - // exactly as before; discover-cli.js supplies the real on-disk store for a live run. - policyVerdictCache: options.policyVerdictCache ?? null, - }; -} - + // A legacy top-level `apiBaseUrl` (the pre-#4784 GitHub-Enterprise override every existing caller uses) still wins + // over `forge.apiBaseUrl`, so nothing that already passes `apiBaseUrl` changes behavior. + const apiBaseUrlOverride = typeof options.apiBaseUrl === "string" && options.apiBaseUrl.trim() + ? { apiBaseUrl: options.apiBaseUrl } + : {}; + const forge = resolveForgeConfig({ ...(options.forge ?? {}), ...apiBaseUrlOverride }); + return { + forge, + apiBaseUrl: forge.apiBaseUrl, + concurrency: normalizeLimit(options.concurrency, defaultConcurrency, 1, 10), + // Below/above these recorded-rate-limit-remaining marks the fanout serializes / runs at full concurrency; in + // between it scales down linearly (#4844). + rateLimitLowWaterMark: normalizeLimit(options.rateLimitLowWaterMark, DEFAULT_RATE_LIMIT_LOW_WATER_MARK, 0, 1_000_000), + rateLimitHighWaterMark: normalizeLimit(options.rateLimitHighWaterMark, DEFAULT_RATE_LIMIT_HIGH_WATER_MARK, 1, 1_000_000), + perPage: normalizeLimit(options.perPage, defaultPerPage, 1, 100), + maxPages: normalizeLimit(options.maxPages, defaultMaxPages, 1, 100), + requestTimeoutMs: normalizeLimit(options.requestTimeoutMs, defaultRequestTimeoutMs, 1, 60_000), + // Passed through to the per-fetch retry so tests can inject an instant sleep; undefined uses the real backoff. + sleepFn: typeof options.sleepFn === "function" ? options.sleepFn : undefined, + // Optional local ETag cache for policy-doc revalidation (#4842). Absent (null) => every policy doc is fetched + // in full, exactly as before; discover-cli.js supplies the real on-disk store for a live run. + policyDocCache: options.policyDocCache ?? null, + // Optional local cache of resolved policy verdicts (#4843). Absent (null) => every verdict is resolved fresh, + // exactly as before; discover-cli.js supplies the real on-disk store for a live run. + policyVerdictCache: options.policyVerdictCache ?? null, + }; +} export async function fetchCandidateIssuesWithSummary(targets, githubToken, options = {}) { - const normalizedOptions = normalizeOptions(options); - const normalizedTargets = normalizeTargets(targets); - const summary = { - rateLimitRemaining: null, - rateLimitResetAt: null, - }; - const warnings = []; - const batches = await mapWithConcurrency( - normalizedTargets, - normalizedOptions.concurrency, - (target) => fetchTargetIssues(target, githubToken, normalizedOptions, summary, warnings), - liveConcurrencyResolver(normalizedOptions, summary), - normalizedOptions.sleepFn, - ); - return { - issues: batches.flat(), - rateLimitRemaining: summary.rateLimitRemaining, - rateLimitResetAt: summary.rateLimitResetAt, - warnings, - }; -} - + const normalizedOptions = normalizeOptions(options); + const normalizedTargets = normalizeTargets(targets); + const summary = { + rateLimitRemaining: null, + rateLimitResetAt: null, + }; + const warnings = []; + const batches = await mapWithConcurrency(normalizedTargets, normalizedOptions.concurrency, (target) => fetchTargetIssues(target, githubToken, normalizedOptions, summary, warnings), liveConcurrencyResolver(normalizedOptions, summary), normalizedOptions.sleepFn); + return { + issues: batches.flat(), + rateLimitRemaining: summary.rateLimitRemaining, + rateLimitResetAt: summary.rateLimitResetAt, + warnings, + }; +} /** * Metadata-only GitHub discovery (#2307): never clones source, never fetches blobs beyond small policy docs, * never uploads source, and never performs writes. Call the WithSummary variant when rate-limit telemetry is * needed. */ export async function fetchCandidateIssues(targets, githubToken, options = {}) { - const result = await fetchCandidateIssuesWithSummary(targets, githubToken, options); - return result.issues; + const result = await fetchCandidateIssuesWithSummary(targets, githubToken, options); + return result.issues; } - export async function searchCandidateIssuesWithSummary(searchQuery, githubToken, options = {}) { - const normalizedOptions = normalizeOptions(options); - const summary = { - rateLimitRemaining: null, - rateLimitResetAt: null, - }; - const warnings = []; - const searchItems = await fetchSearchIssues(searchQuery, githubToken, normalizedOptions, summary, warnings); - const targetsByKey = new Map(); - for (const item of searchItems) { - if (!item || typeof item !== "object" || item.pull_request) continue; - const target = targetFromSearchIssue(item, normalizedOptions.forge); - if (target && !targetsByKey.has(targetKey(target))) targetsByKey.set(targetKey(target), target); - } - - const policyEntries = await mapWithConcurrency( - [...targetsByKey.values()], - normalizedOptions.concurrency, - async (target) => { - const verdict = await resolveRepoAiPolicy(target, githubToken, normalizedOptions, summary, warnings); - return [targetKey(target), verdict]; - }, - liveConcurrencyResolver(normalizedOptions, summary), - normalizedOptions.sleepFn, - ); - const policiesByKey = new Map(policyEntries); - const issues = []; - for (const item of searchItems) { - const target = targetFromSearchIssue(item, normalizedOptions.forge); - if (!target) continue; - const policy = policiesByKey.get(targetKey(target)); - if (!policy?.allowed) continue; - const normalizedIssue = normalizeIssue(target, item, policy.source); - if (normalizedIssue) issues.push(normalizedIssue); - } - - return { - issues, - rateLimitRemaining: summary.rateLimitRemaining, - rateLimitResetAt: summary.rateLimitResetAt, - warnings, - }; -} - + const normalizedOptions = normalizeOptions(options); + const summary = { + rateLimitRemaining: null, + rateLimitResetAt: null, + }; + const warnings = []; + const searchItems = await fetchSearchIssues(searchQuery, githubToken, normalizedOptions, summary, warnings); + const targetsByKey = new Map(); + for (const item of searchItems) { + if (!item || typeof item !== "object" || item.pull_request) + continue; + const target = targetFromSearchIssue(item, normalizedOptions.forge); + if (target && !targetsByKey.has(targetKey(target))) + targetsByKey.set(targetKey(target), target); + } + const policyEntries = await mapWithConcurrency([...targetsByKey.values()], normalizedOptions.concurrency, async (target) => { + const verdict = await resolveRepoAiPolicy(target, githubToken, normalizedOptions, summary, warnings); + return [targetKey(target), verdict]; + }, liveConcurrencyResolver(normalizedOptions, summary), normalizedOptions.sleepFn); + const policiesByKey = new Map(policyEntries); + const issues = []; + for (const item of searchItems) { + const target = targetFromSearchIssue(item, normalizedOptions.forge); + if (!target) + continue; + const policy = policiesByKey.get(targetKey(target)); + if (!policy?.allowed) + continue; + const normalizedIssue = normalizeIssue(target, item, policy.source); + if (normalizedIssue) + issues.push(normalizedIssue); + } + return { + issues, + rateLimitRemaining: summary.rateLimitRemaining, + rateLimitResetAt: summary.rateLimitResetAt, + warnings, + }; +} export async function searchCandidateIssues(searchQuery, githubToken, options = {}) { - const result = await searchCandidateIssuesWithSummary(searchQuery, githubToken, options); - return result.issues; + const result = await searchCandidateIssuesWithSummary(searchQuery, githubToken, options); + return result.issues; } +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"opportunity-fanout.js","sourceRoot":"","sources":["opportunity-fanout.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/loopover-miner/lib/opportunity-fanout.ts b/packages/loopover-miner/lib/opportunity-fanout.ts new file mode 100644 index 0000000000..d4172de922 --- /dev/null +++ b/packages/loopover-miner/lib/opportunity-fanout.ts @@ -0,0 +1,795 @@ +import { Buffer } from "node:buffer"; +import type { AiPolicyVerdict } from "@loopover/engine"; +import { resolveAiPolicyVerdict } from "@loopover/engine"; +import type { ForgeConfig } from "./forge-config.js"; +import { resolveForgeConfig } from "./forge-config.js"; +import type { PolicyDocCache } from "./policy-doc-cache.js"; +import type { PolicyVerdictCache } from "./policy-verdict-cache.js"; +import { + DEFAULT_RATE_LIMIT_HIGH_WATER_MARK, + DEFAULT_RATE_LIMIT_LOW_WATER_MARK, + resolveThrottledConcurrency, +} from "./discovery-throttle.js"; +import { fetchWithRetry } from "./http-retry.js"; + +export type FanoutTarget = { + owner: string; + repo: string; +}; + +/** Options shared by every fan-out entry point. `apiBaseUrl` is the legacy top-level forge-host override (it still + * wins over `forge.apiBaseUrl`); `forge` (#4784) carries the rest of the per-tenant forge knobs. `policyDocCache`, + * when supplied, lets discovery revalidate each repo's policy docs with a conditional GET instead of a full + * refetch (#4842). `policyVerdictCache`, when supplied, lets discovery reuse an already-resolved verdict once its + * deciding doc's ETag is confirmed unchanged, instead of re-resolving it (#4843). */ +export type FanoutOptions = { + apiBaseUrl?: string; + forge?: Partial; + concurrency?: number; + rateLimitLowWaterMark?: number; + rateLimitHighWaterMark?: number; + perPage?: number; + maxPages?: number; + requestTimeoutMs?: number; + sleepFn?: (ms: number) => Promise; + policyDocCache?: PolicyDocCache | null; + policyVerdictCache?: PolicyVerdictCache | null; +}; + +export type RawCandidateIssue = { + owner: string; + repo: string; + repoFullName: string; + issueNumber: number; + title: string; + labels: string[]; + /** Assignee logins (#7040), already present in the same list/search payload as labels — no extra request. */ + assignees: string[]; + commentsCount: number; + createdAt: string | null; + updatedAt: string | null; + htmlUrl: string | null; + aiPolicyAllowed: true; + aiPolicySource: "AI-USAGE.md" | "CONTRIBUTING.md" | "none"; +}; + +export type CandidateIssueWarning = { + repoFullName: string; + stage: string; + message: string; +}; + +export type CandidateIssueSummary = { + issues: RawCandidateIssue[]; + rateLimitRemaining: number | null; + rateLimitResetAt: string | null; + warnings: CandidateIssueWarning[]; +}; + +/** A normalized fan-out target: `owner`/`repo` plus the derived `owner/repo` display/key form. */ +type Target = { + owner: string; + repo: string; + repoFullName: string; +}; + +type RateLimitSummary = { + rateLimitRemaining: number | null; + rateLimitResetAt: string | null; +}; + +type NormalizedOptions = { + forge: ForgeConfig; + apiBaseUrl: string; + concurrency: number; + rateLimitLowWaterMark: number; + rateLimitHighWaterMark: number; + perPage: number; + maxPages: number; + requestTimeoutMs: number; + sleepFn?: ((ms: number) => Promise) | undefined; + policyDocCache: PolicyDocCache | null; + policyVerdictCache: PolicyVerdictCache | null; +}; + +const defaultConcurrency = 5; +// How long a parked worker waits before re-checking the live rate-limit-derived concurrency limit (#4844). +const throttleParkMs = 25; +const defaultPerPage = 100; +// Follow the GitHub Link header past the first page so a repo/search with >100 open issues isn't silently +// truncated (#4831); cap the follow loop so a pathological Link chain can't run away. +const defaultMaxPages = 10; +const defaultRequestTimeoutMs = 10_000; + +/** Minimal shape of a raw GitHub issue/search-hit payload -- every field is read defensively (`typeof` / + * `Array.isArray` guarded) since it comes straight off the wire. */ +type GithubIssuePayload = { + pull_request?: unknown; + number?: unknown; + title?: unknown; + labels?: unknown; + assignees?: unknown; + comments?: unknown; + created_at?: unknown; + updated_at?: unknown; + html_url?: unknown; + repository?: { full_name?: unknown } | null; + repository_url?: unknown; +}; + +type ContentPayload = { + content?: unknown; + encoding?: unknown; +}; + +function normalizeLimit(value: unknown, fallback: number, min: number, max: number): number { + if (!Number.isFinite(value)) return fallback; + return Math.min(max, Math.max(min, Math.floor(value as number))); +} + +function targetKey(target: { owner: string; repo: string }): string { + return `${target.owner.toLowerCase()}/${target.repo.toLowerCase()}`; +} + +function normalizeTargets(targets: unknown): Target[] { + const seen = new Set(); + const normalized: Target[] = []; + for (const target of Array.isArray(targets) ? targets : []) { + const owner = typeof target?.owner === "string" ? target.owner.trim() : ""; + const repo = typeof target?.repo === "string" ? target.repo.trim() : ""; + if (!owner || !repo) continue; + const key = targetKey({ owner, repo }); + if (seen.has(key)) continue; + seen.add(key); + normalized.push({ owner, repo, repoFullName: `${owner}/${repo}` }); + } + return normalized; +} + +function targetFromFullName(fullName: unknown): Target | null { + if (typeof fullName !== "string") return null; + const [owner, repo, extra] = fullName.split("/"); + if (!owner || !repo || extra) return null; + return { owner, repo, repoFullName: `${owner}/${repo}` }; +} + +function escapeRegExp(value: string): string { + return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); +} + +// Derive owner/repo from a search hit when `repository.full_name` is absent, using the tenant forge's own +// `repoPathPrefix` for the API `repository_url` and a forge-agnostic host for the web `html_url` (#4784). Hardcoding +// `/repos/` and `github.com` here dropped every custom-forge search result whose payload omitted `full_name`. +function targetFromSearchIssue(issue: GithubIssuePayload, forge: ForgeConfig): Target | null { + const repositoryFullName = targetFromFullName(issue?.repository?.full_name); + if (repositoryFullName) return repositoryFullName; + + const repoPathPrefix = escapeRegExp(forge.repoPathPrefix.replace(/\/+$/, "")); + const repositoryUrl = + typeof issue?.repository_url === "string" + ? issue.repository_url.match(new RegExp(`${repoPathPrefix}/([^/?#]+)/([^/?#]+)(?:[?#].*)?$`)) + : null; + if (repositoryUrl) { + const owner = decodeURIComponent(repositoryUrl[1]!); + const repo = decodeURIComponent(repositoryUrl[2]!); + return { owner, repo, repoFullName: `${owner}/${repo}` }; + } + + const htmlUrl = + typeof issue?.html_url === "string" + ? issue.html_url.match(/^https:\/\/[^/]+\/([^/]+)\/([^/]+)\/issues\/\d+(?:[?#].*)?$/) + : null; + if (htmlUrl) { + const owner = decodeURIComponent(htmlUrl[1]!); + const repo = decodeURIComponent(htmlUrl[2]!); + return { owner, repo, repoFullName: `${owner}/${repo}` }; + } + + return null; +} + +function githubHeaders(githubToken: unknown, forge: ForgeConfig): Record { + const headers: Record = { + accept: forge.acceptHeader, + "user-agent": forge.userAgent, + [forge.apiVersionHeader]: forge.apiVersion, + }; + const token = typeof githubToken === "string" ? githubToken.trim() : ""; + if (token) headers.authorization = `Bearer ${token}`; + return headers; +} + +function apiUrl(apiBaseUrl: string, path: string, query = ""): string { + return `${apiBaseUrl.replace(/\/+$/, "")}${path}${query}`; +} + +function repoPath(forge: ForgeConfig, target: Target, suffix: string): string { + return `${forge.repoPathPrefix}/${encodeURIComponent(target.owner)}/${encodeURIComponent(target.repo)}${suffix}`; +} + +function recordRateLimit(summary: RateLimitSummary, response: Response): void { + const remaining = Number(response.headers.get("x-ratelimit-remaining")); + if (Number.isFinite(remaining)) { + summary.rateLimitRemaining = + summary.rateLimitRemaining === null + ? remaining + : Math.min(summary.rateLimitRemaining, remaining); + } + const resetSeconds = Number(response.headers.get("x-ratelimit-reset")); + if (Number.isFinite(resetSeconds) && resetSeconds > 0) { + const resetAt = new Date(resetSeconds * 1000).toISOString(); + summary.rateLimitResetAt = + summary.rateLimitResetAt === null || resetAt > summary.rateLimitResetAt + ? resetAt + : summary.rateLimitResetAt; + } +} + +async function githubGetJson( + url: string, + githubToken: unknown, + summary: RateLimitSummary, + options: NormalizedOptions, + extraHeaders: Record = {}, +): Promise<{ response: Response; payload: unknown }> { + // Retry a transient 5xx from GitHub before dropping this target's results for the whole run (#4830) — the same + // discipline as the CI/gate-verdict pollers. A thrown network error still propagates to each caller's try/catch. + // `extraHeaders` carries per-call additions (e.g. a policy-doc If-None-Match, #4842) on top of the base auth set. + // requestTimeoutMs bounds each individual attempt so a stalled connection can't hang discovery forever + // (#miner-github-read-timeouts) -- fetchWithRetry gives each retry its own fresh AbortSignal.timeout(). + // Spread-omit sleepFn when absent rather than passing `sleepFn: undefined` -- FetchWithRetryOptions doesn't + // widen its optional properties to `| undefined`, and exactOptionalPropertyTypes treats those as different. + const retryOptions = { ...(options?.sleepFn ? { sleepFn: options.sleepFn } : {}), timeoutMs: options?.requestTimeoutMs }; + const response = await fetchWithRetry( + fetch as (url: unknown, init?: unknown) => Promise, + url, + { method: "GET", headers: { ...githubHeaders(githubToken, options.forge), ...extraHeaders } }, + retryOptions, + ); + recordRateLimit(summary, response); + const payload = await response.json().catch(() => null); + return { response, payload }; +} + +function decodeContentPayload(payload: unknown): string | null { + if (!payload || typeof payload !== "object" || Array.isArray(payload)) return null; + const content = payload as ContentPayload; + if (typeof content.content !== "string") return null; + if (content.encoding === "base64") { + return Buffer.from(content.content.replace(/\s/g, ""), "base64").toString("utf8"); + } + return content.content; +} + +function warning(target: Target, stage: string, message: string): CandidateIssueWarning { + return { repoFullName: target.repoFullName, stage, message }; +} + +// Read a URL's prior ETag so an unchanged doc can be revalidated with a conditional GET (#4842). A cache that is +// absent, or whose read throws (corrupt/locked file), is treated as a plain miss: the caller does a full fetch, +// per the "never risk a stale policy" rule — the cache only ever makes discovery cheaper, never less correct. +function readCachedPolicyDoc(cache: PolicyDocCache | null, url: string) { + if (!cache) return null; + try { + return cache.get(url); + } catch { + return null; + } +} + +function readEtagHeader(response: Response): string | null { + const etag = response.headers.get("etag"); + return typeof etag === "string" && etag.trim() ? etag : null; +} + +// Persist the fresh ETag + body so the NEXT discover run can revalidate instead of re-downloading. Only a real +// ETag paired with decoded content is stored, and a write that throws must never fail discovery (same stale-safe +// rule) — it degrades to "not cached", so the next run simply refetches in full. +function writeCachedPolicyDoc(cache: PolicyDocCache | null, url: string, etag: string | null, content: string | null): void { + if (!cache || content === null || etag === null) return; + try { + cache.put(url, etag, content); + } catch { + // Leave this URL uncached; the next run refetches fully rather than serving anything stale. + } +} + +// A bare `owner/repo` is NOT a safe policy-verdict cache key: two different tenant forge hosts (#4784's +// per-tenant `apiBaseUrl`) can each have their own unrelated repo of the same name, and their policy docs are +// wholly independent. Scope the key by host, mirroring policy-doc-cache.js's own precedent of keying on the full +// request URL rather than a bare path. +function policyVerdictCacheKey(apiBaseUrl: string, repoFullName: string): string { + return `${apiBaseUrl}::${repoFullName}`; +} + +// Read a repo scope's previously-resolved verdict for the SAME decisive doc + ETag (#4843). A cache that is +// absent, or whose read throws (corrupt/locked file), is treated as a plain miss — the caller resolves the +// verdict fresh, per the same "never risk a stale policy" rule as the doc cache above. +function readCachedPolicyVerdict(cache: PolicyVerdictCache | null, repoScope: string) { + if (!cache) return null; + try { + return cache.get(repoScope); + } catch { + return null; + } +} + +// Persist the freshly-resolved verdict against the ETag of the doc that decided it, so the next run can reuse it +// outright once that ETag is confirmed unchanged. Only ever called with a real ETag; a write that throws must +// never fail discovery — it degrades to "not cached", so the next run just resolves the verdict again. +function writeCachedPolicyVerdict( + cache: PolicyVerdictCache | null, + repoScope: string, + decisiveDoc: "AI-USAGE.md" | "CONTRIBUTING.md", + etag: string | null, + verdict: AiPolicyVerdict, +): void { + if (!cache || etag === null) return; + try { + cache.put(repoScope, decisiveDoc, etag, verdict); + } catch { + // Leave this repo scope uncached; the next run just resolves the verdict fresh again. + } +} + +async function fetchRepoDoc( + target: Target, + path: string, + githubToken: unknown, + options: NormalizedOptions, + summary: RateLimitSummary, + warnings: CandidateIssueWarning[], +): Promise<{ content: string | null; etag: string | null }> { + const url = apiUrl( + options.apiBaseUrl, + repoPath(options.forge, target, `/contents/${encodeURIComponent(path)}`), + ); + const cached = readCachedPolicyDoc(options.policyDocCache, url); + const conditionalHeaders: Record = cached ? { "if-none-match": cached.etag } : {}; + try { + const { response, payload } = await githubGetJson(url, githubToken, summary, options, conditionalHeaders); + // A 304 only ever follows the If-None-Match we send above, which we only send when `cached` exists — so the + // cached body is the GitHub-confirmed current content, served with no extra rate-limit spend. + if (response.status === 304) return { content: cached!.content, etag: cached!.etag }; + if (response.status === 404) return { content: null, etag: null }; + if (!response.ok) { + warnings.push(warning(target, `policy:${path}`, `GitHub returned ${response.status}`)); + return { content: null, etag: null }; + } + const content = decodeContentPayload(payload); + const etag = readEtagHeader(response); + writeCachedPolicyDoc(options.policyDocCache, url, etag, content); + return { content, etag }; + } catch (error) { + warnings.push( + warning(target, `policy:${path}`, error instanceof Error ? error.message : "policy fetch failed"), + ); + return { content: null, etag: null }; + } +} + +// Resolve a repo scope's AI-usage-policy verdict, reusing a cached one when the deciding doc's ETag hasn't moved +// since it was last resolved (#4843). Only ever consulted with an ETag that a same-run conditional-GET just +// confirmed is current, so a cache hit is exactly as correct as recomputing — it just skips the (cheap, but not +// free) parse. +function resolveOrCacheVerdict( + cache: PolicyVerdictCache | null, + repoScope: string, + decisiveDoc: "AI-USAGE.md" | "CONTRIBUTING.md", + etag: string | null, + computeVerdict: () => AiPolicyVerdict, +): AiPolicyVerdict { + if (etag !== null) { + const cached = readCachedPolicyVerdict(cache, repoScope); + if (cached && cached.decisiveDoc === decisiveDoc && cached.etag === etag) return cached.verdict; + } + const verdict = computeVerdict(); + writeCachedPolicyVerdict(cache, repoScope, decisiveDoc, etag, verdict); + return verdict; +} + +async function resolveRepoAiPolicy( + target: Target, + githubToken: unknown, + options: NormalizedOptions, + summary: RateLimitSummary, + warnings: CandidateIssueWarning[], +): Promise { + const repoScope = policyVerdictCacheKey(options.apiBaseUrl, target.repoFullName); + const { content: aiUsage, etag: aiUsageEtag } = await fetchRepoDoc( + target, + "AI-USAGE.md", + githubToken, + options, + summary, + warnings, + ); + // Short-circuit only on AI-USAGE.md that has real content. A present-but-blank AI-USAGE.md must still fall + // through to CONTRIBUTING.md — otherwise a stub AI-USAGE.md silently fails open and swallows a ban declared in + // CONTRIBUTING.md (the exact case resolveAiPolicyVerdict was fixed to handle in #2900, which can only fire if + // both docs reach it). + if (aiUsage !== null && aiUsage.trim().length > 0) { + return resolveOrCacheVerdict(options.policyVerdictCache, repoScope, "AI-USAGE.md", aiUsageEtag, () => + resolveAiPolicyVerdict({ aiUsage, contributing: null }), + ); + } + const { content: contributing, etag: contributingEtag } = await fetchRepoDoc( + target, + "CONTRIBUTING.md", + githubToken, + options, + summary, + warnings, + ); + return resolveOrCacheVerdict( + options.policyVerdictCache, + repoScope, + "CONTRIBUTING.md", + contributingEtag, + () => resolveAiPolicyVerdict({ aiUsage: null, contributing }), + ); +} + +function labelNames(labels: unknown): string[] { + if (!Array.isArray(labels)) return []; + return labels + .map((label) => { + if (typeof label === "string") return label; + if (label && typeof label === "object" && typeof (label as { name?: unknown }).name === "string") { + return (label as { name: string }).name; + } + return ""; + }) + .filter((name) => name.length > 0); +} + +// Assignee logins (#7040): GitHub's issue-list/search payloads already carry `assignees` in the same response +// that supplies labels/comments/etc. -- no extra request needed. contribution-profile-filter.js's +// assignee-exclusion rule uses this to drop candidates assigned to a login the target repo considers off-limits +// (its own owner, by default). +function assigneeLogins(assignees: unknown): string[] { + if (!Array.isArray(assignees)) return []; + return assignees + .map((assignee) => + assignee && typeof assignee === "object" && typeof (assignee as { login?: unknown }).login === "string" + ? (assignee as { login: string }).login + : "", + ) + .filter((login) => login.length > 0); +} + +function normalizeIssue(target: Target, issue: unknown, policySource: RawCandidateIssue["aiPolicySource"]): RawCandidateIssue | null { + if (!issue || typeof issue !== "object" || (issue as GithubIssuePayload).pull_request) return null; + const candidate = issue as GithubIssuePayload; + if (!Number.isInteger(candidate.number) || (candidate.number as number) <= 0) return null; + if (typeof candidate.title !== "string" || candidate.title.trim().length === 0) return null; + return { + owner: target.owner, + repo: target.repo, + repoFullName: target.repoFullName, + issueNumber: candidate.number as number, + title: candidate.title, + labels: labelNames(candidate.labels), + assignees: assigneeLogins(candidate.assignees), + commentsCount: Number.isFinite(candidate.comments) ? (candidate.comments as number) : 0, + createdAt: typeof candidate.created_at === "string" ? candidate.created_at : null, + updatedAt: typeof candidate.updated_at === "string" ? candidate.updated_at : null, + htmlUrl: typeof candidate.html_url === "string" ? candidate.html_url : null, + aiPolicyAllowed: true, + aiPolicySource: policySource, + }; +} + +function searchQueryWithIssueQualifiers(searchQuery: unknown, forge: ForgeConfig): string { + const trimmed = typeof searchQuery === "string" ? searchQuery.trim() : ""; + if (!trimmed) return ""; + return `${trimmed} ${forge.searchQualifiers}`; +} + +// The URL of the next page from a GitHub Link header (`; rel="next"`), constrained to the current +// token-bearing GitHub API endpoint so a forged Link header cannot redirect credentials off-origin. +function nextPageUrl(response: Response, apiBaseUrl: string, expectedPath: string): string | null { + const linkHeader = response.headers.get("link") ?? ""; + const match = linkHeader.match(/<([^>]+)>;\s*rel="next"/); + if (match === null) return null; + + let nextUrl: URL; + let expectedUrl: URL; + try { + expectedUrl = new URL(apiUrl(apiBaseUrl, expectedPath)); + nextUrl = new URL(match[1]!, expectedUrl); + } catch { + return null; + } + + if ( + nextUrl.protocol !== "https:" || + nextUrl.origin !== expectedUrl.origin || + nextUrl.pathname !== expectedUrl.pathname + ) { + return null; + } + return nextUrl.toString(); +} + +async function fetchTargetIssues( + target: Target, + githubToken: unknown, + options: NormalizedOptions, + summary: RateLimitSummary, + warnings: CandidateIssueWarning[], +): Promise { + const verdict = await resolveRepoAiPolicy(target, githubToken, options, summary, warnings); + if (!verdict.allowed) return []; + + const issuesPath = repoPath(options.forge, target, "/issues"); + let url: string | null = apiUrl(options.apiBaseUrl, issuesPath, `?state=open&per_page=${options.perPage}`); + const issues: RawCandidateIssue[] = []; + try { + for (let page = 0; url !== null && page < options.maxPages; page += 1) { + const { response, payload } = await githubGetJson(url, githubToken, summary, options); + if (!response.ok) { + warnings.push(warning(target, "issues", `GitHub returned ${response.status}`)); + return issues; + } + if (!Array.isArray(payload)) { + warnings.push(warning(target, "issues", "GitHub returned a non-array issues payload")); + return issues; + } + for (const issue of payload) { + const normalized = normalizeIssue(target, issue, verdict.source); + if (normalized !== null) issues.push(normalized); + } + url = nextPageUrl(response, options.apiBaseUrl, issuesPath); + } + return issues; + } catch (error) { + warnings.push( + warning(target, "issues", error instanceof Error ? error.message : "issue fetch failed"), + ); + return issues; + } +} + +async function fetchSearchIssues( + searchQuery: unknown, + githubToken: unknown, + options: NormalizedOptions, + summary: RateLimitSummary, + warnings: CandidateIssueWarning[], +): Promise { + const qualifiedQuery = searchQueryWithIssueQualifiers(searchQuery, options.forge); + if (!qualifiedQuery) return []; + + const searchPath = options.forge.searchEndpoint; + let url: string | null = apiUrl( + options.apiBaseUrl, + searchPath, + `?q=${encodeURIComponent(qualifiedQuery)}&per_page=${options.perPage}`, + ); + const items: GithubIssuePayload[] = []; + try { + for (let page = 0; url !== null && page < options.maxPages; page += 1) { + const { response, payload } = await githubGetJson(url, githubToken, summary, options); + if (!response.ok) { + warnings.push({ + repoFullName: "*", + stage: "search", + message: `GitHub returned ${response.status}`, + }); + return items; + } + const searchPayload = payload as { items?: unknown } | null; + if (!searchPayload || typeof searchPayload !== "object" || !Array.isArray(searchPayload.items)) { + warnings.push({ + repoFullName: "*", + stage: "search", + message: "GitHub returned a non-array search payload", + }); + return items; + } + items.push(...(searchPayload.items as GithubIssuePayload[])); + url = nextPageUrl(response, options.apiBaseUrl, searchPath); + } + return items; + } catch (error) { + warnings.push({ + repoFullName: "*", + stage: "search", + message: error instanceof Error ? error.message : "issue search failed", + }); + return items; + } +} + +function delay(ms: number): Promise { + return new Promise((resolve) => setTimeout(resolve, ms)); +} + +// Run `worker` over `items` with a dynamic in-flight cap (#4844). The pool spawns `maxConcurrency` loops, but a +// loop parks (re-checking every `throttleParkMs`) whenever the live `resolveLimit()` — derived from the recorded +// rate-limit budget — is already met by the number of in-flight workers, so effective concurrency tapers off as +// the budget drops instead of sprinting into a 403. `sleepFn` lets tests inject an instant wait for the park. +export async function mapWithConcurrency( + items: T[], + maxConcurrency: number, + worker: (item: T, index: number) => Promise, + resolveLimit: () => number, + sleepFn?: (ms: number) => Promise, +): Promise { + const results = new Array(items.length); + const sleep = sleepFn ?? delay; + let next = 0; + let active = 0; + const runOne = async () => { + while (next < items.length) { + // Park while the live limit is already saturated. The check and the `active`/`next` bumps below run without + // an intervening await, so two loops can never claim the same slot. + while (active >= resolveLimit()) { + await sleep(throttleParkMs); + } + // The shared cursor can be drained by other loops while this one is parked, so re-check before claiming. + if (next >= items.length) return; + const index = next; + next += 1; + active += 1; + try { + results[index] = await worker(items[index]!, index); + } finally { + active -= 1; + } + } + }; + const workers = Array.from({ length: Math.min(maxConcurrency, items.length) }, runOne); + await Promise.all(workers); + return results; +} + +/** A live limit resolver for `mapWithConcurrency`, reading the summary's rate-limit budget as it is updated (#4844). */ +function liveConcurrencyResolver(normalizedOptions: NormalizedOptions, summary: RateLimitSummary): () => number { + return () => + resolveThrottledConcurrency( + normalizedOptions.concurrency, + summary.rateLimitRemaining, + normalizedOptions.rateLimitLowWaterMark, + normalizedOptions.rateLimitHighWaterMark, + ); +} + +function normalizeOptions(options: FanoutOptions = {}): NormalizedOptions { + // A legacy top-level `apiBaseUrl` (the pre-#4784 GitHub-Enterprise override every existing caller uses) still wins + // over `forge.apiBaseUrl`, so nothing that already passes `apiBaseUrl` changes behavior. + const apiBaseUrlOverride = + typeof options.apiBaseUrl === "string" && options.apiBaseUrl.trim() + ? { apiBaseUrl: options.apiBaseUrl } + : {}; + const forge = resolveForgeConfig({ ...(options.forge ?? {}), ...apiBaseUrlOverride }); + return { + forge, + apiBaseUrl: forge.apiBaseUrl, + concurrency: normalizeLimit(options.concurrency, defaultConcurrency, 1, 10), + // Below/above these recorded-rate-limit-remaining marks the fanout serializes / runs at full concurrency; in + // between it scales down linearly (#4844). + rateLimitLowWaterMark: normalizeLimit( + options.rateLimitLowWaterMark, + DEFAULT_RATE_LIMIT_LOW_WATER_MARK, + 0, + 1_000_000, + ), + rateLimitHighWaterMark: normalizeLimit( + options.rateLimitHighWaterMark, + DEFAULT_RATE_LIMIT_HIGH_WATER_MARK, + 1, + 1_000_000, + ), + perPage: normalizeLimit(options.perPage, defaultPerPage, 1, 100), + maxPages: normalizeLimit(options.maxPages, defaultMaxPages, 1, 100), + requestTimeoutMs: normalizeLimit(options.requestTimeoutMs, defaultRequestTimeoutMs, 1, 60_000), + // Passed through to the per-fetch retry so tests can inject an instant sleep; undefined uses the real backoff. + sleepFn: typeof options.sleepFn === "function" ? options.sleepFn : undefined, + // Optional local ETag cache for policy-doc revalidation (#4842). Absent (null) => every policy doc is fetched + // in full, exactly as before; discover-cli.js supplies the real on-disk store for a live run. + policyDocCache: options.policyDocCache ?? null, + // Optional local cache of resolved policy verdicts (#4843). Absent (null) => every verdict is resolved fresh, + // exactly as before; discover-cli.js supplies the real on-disk store for a live run. + policyVerdictCache: options.policyVerdictCache ?? null, + }; +} + +export async function fetchCandidateIssuesWithSummary( + targets: FanoutTarget[], + githubToken: string, + options: FanoutOptions = {}, +): Promise { + const normalizedOptions = normalizeOptions(options); + const normalizedTargets = normalizeTargets(targets); + const summary: RateLimitSummary = { + rateLimitRemaining: null, + rateLimitResetAt: null, + }; + const warnings: CandidateIssueWarning[] = []; + const batches = await mapWithConcurrency( + normalizedTargets, + normalizedOptions.concurrency, + (target) => fetchTargetIssues(target, githubToken, normalizedOptions, summary, warnings), + liveConcurrencyResolver(normalizedOptions, summary), + normalizedOptions.sleepFn, + ); + return { + issues: batches.flat(), + rateLimitRemaining: summary.rateLimitRemaining, + rateLimitResetAt: summary.rateLimitResetAt, + warnings, + }; +} + +/** + * Metadata-only GitHub discovery (#2307): never clones source, never fetches blobs beyond small policy docs, + * never uploads source, and never performs writes. Call the WithSummary variant when rate-limit telemetry is + * needed. + */ +export async function fetchCandidateIssues( + targets: FanoutTarget[], + githubToken: string, + options: FanoutOptions = {}, +): Promise { + const result = await fetchCandidateIssuesWithSummary(targets, githubToken, options); + return result.issues; +} + +export async function searchCandidateIssuesWithSummary( + searchQuery: string, + githubToken: string, + options: FanoutOptions = {}, +): Promise { + const normalizedOptions = normalizeOptions(options); + const summary: RateLimitSummary = { + rateLimitRemaining: null, + rateLimitResetAt: null, + }; + const warnings: CandidateIssueWarning[] = []; + const searchItems = await fetchSearchIssues(searchQuery, githubToken, normalizedOptions, summary, warnings); + const targetsByKey = new Map(); + for (const item of searchItems) { + if (!item || typeof item !== "object" || item.pull_request) continue; + const target = targetFromSearchIssue(item, normalizedOptions.forge); + if (target && !targetsByKey.has(targetKey(target))) targetsByKey.set(targetKey(target), target); + } + + const policyEntries = await mapWithConcurrency( + [...targetsByKey.values()], + normalizedOptions.concurrency, + async (target): Promise<[string, AiPolicyVerdict]> => { + const verdict = await resolveRepoAiPolicy(target, githubToken, normalizedOptions, summary, warnings); + return [targetKey(target), verdict]; + }, + liveConcurrencyResolver(normalizedOptions, summary), + normalizedOptions.sleepFn, + ); + const policiesByKey = new Map(policyEntries); + const issues: RawCandidateIssue[] = []; + for (const item of searchItems) { + const target = targetFromSearchIssue(item, normalizedOptions.forge); + if (!target) continue; + const policy = policiesByKey.get(targetKey(target)); + if (!policy?.allowed) continue; + const normalizedIssue = normalizeIssue(target, item, policy.source); + if (normalizedIssue) issues.push(normalizedIssue); + } + + return { + issues, + rateLimitRemaining: summary.rateLimitRemaining, + rateLimitResetAt: summary.rateLimitResetAt, + warnings, + }; +} + +export async function searchCandidateIssues( + searchQuery: string, + githubToken: string, + options: FanoutOptions = {}, +): Promise { + const result = await searchCandidateIssuesWithSummary(searchQuery, githubToken, options); + return result.issues; +} diff --git a/packages/loopover-miner/lib/plan-store.d.ts b/packages/loopover-miner/lib/plan-store.d.ts index 3d3cddf98a..13d9fdc804 100644 --- a/packages/loopover-miner/lib/plan-store.d.ts +++ b/packages/loopover-miner/lib/plan-store.d.ts @@ -1,51 +1,44 @@ export type PlanStepStatus = "pending" | "running" | "completed" | "failed" | "skipped"; - export type PlanStep = { - id: string; - title: string; - actionClass?: string; - dependsOn: string[]; - status: PlanStepStatus; - attempts: number; - maxAttempts: number; - lastError?: string | null; + id: string; + title: string; + actionClass?: string; + dependsOn: string[]; + status: PlanStepStatus; + attempts: number; + maxAttempts: number; + lastError?: string | null; }; - export type PlanDag = { - steps: PlanStep[]; + steps: PlanStep[]; }; - export type PlanStatus = "pending" | "running" | "completed" | "failed"; - export type PlanRecord = { - planId: string; - plan: PlanDag; - status: PlanStatus; - updatedAt: string; + planId: string; + plan: PlanDag; + status: PlanStatus; + updatedAt: string; }; - export type ListPlansFilter = { - status?: PlanStatus | null; + status?: PlanStatus | null; }; - export type PlanStore = { - dbPath: string; - savePlan(planId: string, plan: PlanDag): PlanRecord; - loadPlan(planId: string): PlanRecord | null; - listPlans(filter?: ListPlansFilter): PlanRecord[]; - close(): void; + dbPath: string; + savePlan(planId: string, plan: PlanDag): PlanRecord; + loadPlan(planId: string): PlanRecord | null; + listPlans(filter?: ListPlansFilter): PlanRecord[]; + close(): void; }; - -export const PLAN_STATUSES: readonly PlanStatus[]; - -export function resolvePlanStoreDbPath(env?: Record): string; - -export function openPlanStore(dbPath?: string): PlanStore; - -export function savePlan(planId: string, plan: PlanDag): PlanRecord; - -export function loadPlan(planId: string): PlanRecord | null; - -export function listPlans(filter?: ListPlansFilter): PlanRecord[]; - -export function closeDefaultPlanStore(): void; +/** Derived plan-level status used for `listPlans({ status })`. */ +export declare const PLAN_STATUSES: readonly PlanStatus[]; +export declare function resolvePlanStoreDbPath(env?: Record): string; +/** + * Opens the local plan store, creating the table on first use. `savePlan` is a single atomic INSERT…ON CONFLICT + * upsert keyed by `plan_id`; the plan JSON is validated on save AND re-validated on load, so a corrupted row is + * rejected rather than silently returned. (#2318) + */ +export declare function openPlanStore(dbPath?: string): PlanStore; +export declare function savePlan(planId: string, plan: PlanDag): PlanRecord; +export declare function loadPlan(planId: string): PlanRecord | null; +export declare function listPlans(filter?: ListPlansFilter): PlanRecord[]; +export declare function closeDefaultPlanStore(): void; diff --git a/packages/loopover-miner/lib/plan-store.js b/packages/loopover-miner/lib/plan-store.js index 01274d8844..e5aca1dc86 100644 --- a/packages/loopover-miner/lib/plan-store.js +++ b/packages/loopover-miner/lib/plan-store.js @@ -1,153 +1,171 @@ import { normalizeLocalStoreDbPath, openLocalStoreDb, resolveLocalStoreDbPath } from "./local-store.js"; import { applySchemaMigrations } from "./schema-version.js"; - -// Local SQLite persistence for the stateless MCP plan DAG (#2318). `loopover_build_plan`/`plan_status`/ -// `record_step_result` are stateless — the caller holds the plan and passes it back each call — so a miner running -// unattended across process restarts needs somewhere to persist the plan object between calls. This is local-only -// bookkeeping (no plan logic, no network), 100% client-side, mirroring the package's other local stores. Every -// plan is validated against the `planDagSchema` shape (src/mcp/server.ts) on BOTH save and load, so a corrupted -// local row fails loudly instead of feeding a malformed plan back into `loopover_plan_status`. - -const PLAN_STEP_STATUSES = Object.freeze(["pending", "running", "completed", "failed", "skipped"]); +const PLAN_STEP_STATUSES = Object.freeze([ + "pending", + "running", + "completed", + "failed", + "skipped", +]); /** Derived plan-level status used for `listPlans({ status })`. */ export const PLAN_STATUSES = Object.freeze(["pending", "running", "completed", "failed"]); - const stepStatusSet = new Set(PLAN_STEP_STATUSES); const planStatusSet = new Set(PLAN_STATUSES); const defaultDbFileName = "plan-store.sqlite3"; let defaultPlanStore = null; - export function resolvePlanStoreDbPath(env = process.env) { - return resolveLocalStoreDbPath(defaultDbFileName, "LOOPOVER_MINER_PLAN_STORE_DB", env); + return resolveLocalStoreDbPath(defaultDbFileName, "LOOPOVER_MINER_PLAN_STORE_DB", env); } - function normalizeDbPath(dbPath) { - return normalizeLocalStoreDbPath(dbPath, resolvePlanStoreDbPath(), "invalid_plan_store_db_path"); + return normalizeLocalStoreDbPath(dbPath, resolvePlanStoreDbPath(), "invalid_plan_store_db_path"); } - function normalizePlanId(planId) { - if (typeof planId !== "string" || !planId.trim()) throw new Error("invalid_plan_id"); - return planId.trim(); + if (typeof planId !== "string" || !planId.trim()) + throw new Error("invalid_plan_id"); + return planId.trim(); } - function normalizePlanStatusFilter(status) { - if (status === undefined || status === null) return undefined; - if (!planStatusSet.has(status)) throw new Error("invalid_status"); - return status; + if (status === undefined || status === null) + return undefined; + if (!planStatusSet.has(status)) + throw new Error("invalid_status"); + return status; } - function isBoundedString(value, min, max) { - return typeof value === "string" && value.length >= min && value.length <= max; + return typeof value === "string" && value.length >= min && value.length <= max; } - function isBoundedInt(value, min, max) { - return Number.isInteger(value) && value >= min && value <= max; + return Number.isInteger(value) && value >= min && value <= max; } - const STEP_KEYS = new Set(["id", "title", "actionClass", "dependsOn", "status", "attempts", "maxAttempts", "lastError"]); - function isValidStep(step) { - if (!step || typeof step !== "object" || Array.isArray(step)) return false; - for (const key of Object.keys(step)) if (!STEP_KEYS.has(key)) return false; // strict: no unknown keys - if (!isBoundedString(step.id, 1, 100) || !isBoundedString(step.title, 1, 300)) return false; - if (step.actionClass !== undefined && !isBoundedString(step.actionClass, 1, 60)) return false; - if (!Array.isArray(step.dependsOn) || step.dependsOn.length > 50) return false; - if (!step.dependsOn.every((dep) => isBoundedString(dep, 1, 100))) return false; - if (!stepStatusSet.has(step.status)) return false; - if (!isBoundedInt(step.attempts, 0, Number.MAX_SAFE_INTEGER)) return false; - if (!isBoundedInt(step.maxAttempts, 1, 10)) return false; - if (step.lastError !== undefined && step.lastError !== null && !isBoundedString(step.lastError, 0, 2000)) return false; - return true; -} - + if (!step || typeof step !== "object" || Array.isArray(step)) + return false; + for (const key of Object.keys(step)) + if (!STEP_KEYS.has(key)) + return false; // strict: no unknown keys + const candidate = step; + if (!isBoundedString(candidate.id, 1, 100) || !isBoundedString(candidate.title, 1, 300)) + return false; + if (candidate.actionClass !== undefined && !isBoundedString(candidate.actionClass, 1, 60)) + return false; + if (!Array.isArray(candidate.dependsOn) || candidate.dependsOn.length > 50) + return false; + if (!candidate.dependsOn.every((dep) => isBoundedString(dep, 1, 100))) + return false; + if (!stepStatusSet.has(candidate.status)) + return false; + if (!isBoundedInt(candidate.attempts, 0, Number.MAX_SAFE_INTEGER)) + return false; + if (!isBoundedInt(candidate.maxAttempts, 1, 10)) + return false; + if (candidate.lastError !== undefined + && candidate.lastError !== null + && !isBoundedString(candidate.lastError, 0, 2000)) { + return false; + } + return true; +} /** Validate a plan against the `planDagSchema` shape (strict `{ steps: PlanStep[] }`, ≤100 steps). Throws on any * malformed field so a bad plan can neither be saved nor read back. */ function validatePlanDag(plan) { - if (!plan || typeof plan !== "object" || Array.isArray(plan)) throw new Error("invalid_plan"); - const keys = Object.keys(plan); - if (keys.length !== 1 || keys[0] !== "steps") throw new Error("invalid_plan"); - if (!Array.isArray(plan.steps) || plan.steps.length === 0 || plan.steps.length > 100) { - throw new Error("invalid_plan"); - } - if (!plan.steps.every(isValidStep)) throw new Error("invalid_plan"); - const seenStepIds = new Set(); - for (const step of plan.steps) { - if (seenStepIds.has(step.id)) throw new Error("invalid_plan"); - seenStepIds.add(step.id); - } - for (const step of plan.steps) { - for (const dep of step.dependsOn) { - if (dep === step.id || !seenStepIds.has(dep)) throw new Error("invalid_plan"); + if (!plan || typeof plan !== "object" || Array.isArray(plan)) + throw new Error("invalid_plan"); + const keys = Object.keys(plan); + if (keys.length !== 1 || keys[0] !== "steps") + throw new Error("invalid_plan"); + const candidate = plan; + if (!Array.isArray(candidate.steps) || candidate.steps.length === 0 || candidate.steps.length > 100) { + throw new Error("invalid_plan"); + } + if (!candidate.steps.every(isValidStep)) + throw new Error("invalid_plan"); + const steps = candidate.steps; + const seenStepIds = new Set(); + for (const step of steps) { + if (seenStepIds.has(step.id)) + throw new Error("invalid_plan"); + seenStepIds.add(step.id); } - } - const color = new Map(); - const byId = new Map(plan.steps.map((step) => [step.id, step])); - const hasCycle = (id) => { - color.set(id, 1); - for (const dep of byId.get(id)?.dependsOn ?? []) { - const depColor = color.get(dep) ?? 0; - if (depColor === 1) return true; - if (depColor === 0 && byId.has(dep) && hasCycle(dep)) return true; + for (const step of steps) { + for (const dep of step.dependsOn) { + if (dep === step.id || !seenStepIds.has(dep)) + throw new Error("invalid_plan"); + } } - color.set(id, 2); - return false; - }; - for (const step of plan.steps) { - if ((color.get(step.id) ?? 0) === 0 && hasCycle(step.id)) { - throw new Error("invalid_plan"); + const color = new Map(); + const byId = new Map(steps.map((step) => [step.id, step])); + const hasCycle = (id) => { + color.set(id, 1); + // Non-null: every `id` this is called with is either a step's own id (inserted into `byId` above) or a + // `dep` whose `byId.has(dep)` was just confirmed true by the caller -- `byId.get(id)` can never miss here. + for (const dep of byId.get(id).dependsOn) { + const depColor = color.get(dep) ?? 0; + if (depColor === 1) + return true; + if (depColor === 0 && byId.has(dep) && hasCycle(dep)) + return true; + } + color.set(id, 2); + return false; + }; + for (const step of steps) { + if ((color.get(step.id) ?? 0) === 0 && hasCycle(step.id)) { + throw new Error("invalid_plan"); + } } - } - return plan; + return { steps }; } - /** Derive a plan-level status from its steps: any failed → failed; else any running → running; else all steps * finished (completed/skipped) with at least one step → completed; otherwise pending. */ function computePlanStatus(plan) { - const steps = plan.steps; - if (steps.some((step) => step.status === "failed")) return "failed"; - if (steps.some((step) => step.status === "running")) return "running"; - if (steps.length > 0 && steps.every((step) => step.status === "completed" || step.status === "skipped")) { - return "completed"; - } - return "pending"; -} - + const steps = plan.steps; + if (steps.some((step) => step.status === "failed")) + return "failed"; + if (steps.some((step) => step.status === "running")) + return "running"; + if (steps.length > 0 && steps.every((step) => step.status === "completed" || step.status === "skipped")) { + return "completed"; + } + return "pending"; +} function rowToRecord(row) { - let plan; - try { - plan = validatePlanDag(JSON.parse(row.plan_json)); - } catch { - throw new Error("corrupted_plan_row"); // stored blob no longer matches the plan shape - } - // Also fail closed on the status column: a manually-edited or legacy row (predating the CHECK constraint) could - // hold a status outside PLAN_STATUSES, which would otherwise violate the exported PlanRecord contract on read. - if (!planStatusSet.has(row.status)) throw new Error("corrupted_plan_row"); - return { planId: row.plan_id, plan, status: row.status, updatedAt: row.updated_at }; -} - + let plan; + try { + plan = validatePlanDag(JSON.parse(row.plan_json)); + } + catch { + throw new Error("corrupted_plan_row"); // stored blob no longer matches the plan shape + } + // Also fail closed on the status column: a manually-edited or legacy row (predating the CHECK constraint) could + // hold a status outside PLAN_STATUSES, which would otherwise violate the exported PlanRecord contract on read. + if (!planStatusSet.has(row.status)) + throw new Error("corrupted_plan_row"); + return { planId: row.plan_id, plan, status: row.status, updatedAt: row.updated_at }; +} // v1 -> v2 (#4939/#6597): additive tenant-scoping column, a prerequisite for any hosted, multi-tenant use of // this same store's logic. NULL for every row today -- self-host behavior is byte-identical, since nothing // reads or writes it yet. Same defensive column-presence guard as this file's sibling stores' own additive // migrations (e.g. event-ledger.js's addTenantIdColumn). function addTenantIdColumn(db) { - const hasTenantIdColumn = db - .prepare("PRAGMA table_info(miner_plans)") - .all() - .some((column) => column.name === "tenant_id"); - if (!hasTenantIdColumn) db.exec("ALTER TABLE miner_plans ADD COLUMN tenant_id TEXT"); + const hasTenantIdColumn = db + .prepare("PRAGMA table_info(miner_plans)") + .all() + .some((column) => column.name === "tenant_id"); + if (!hasTenantIdColumn) + db.exec("ALTER TABLE miner_plans ADD COLUMN tenant_id TEXT"); } - /** * Opens the local plan store, creating the table on first use. `savePlan` is a single atomic INSERT…ON CONFLICT * upsert keyed by `plan_id`; the plan JSON is validated on save AND re-validated on load, so a corrupted row is * rejected rather than silently returned. (#2318) */ export function openPlanStore(dbPath = resolvePlanStoreDbPath()) { - const resolvedPath = normalizeDbPath(dbPath); - // openLocalStoreDb centralizes the mkdir(0o700)/chmod(0o600)/busy_timeout + crash-safe cleanup registration and - // treats ':memory:' as a no-file special case, so this store no longer hand-rolls that boilerplate (#4826). - const db = openLocalStoreDb(resolvedPath); - db.exec(` + const resolvedPath = normalizeDbPath(dbPath); + // openLocalStoreDb centralizes the mkdir(0o700)/chmod(0o600)/busy_timeout + crash-safe cleanup registration and + // treats ':memory:' as a no-file special case, so this store no longer hand-rolls that boilerplate (#4826). + const db = openLocalStoreDb(resolvedPath); + db.exec(` CREATE TABLE IF NOT EXISTS miner_plans ( plan_id TEXT PRIMARY KEY, plan_json TEXT NOT NULL, @@ -155,10 +173,9 @@ export function openPlanStore(dbPath = resolvePlanStoreDbPath()) { updated_at TEXT NOT NULL ) `); - // Schema-version convention (#4832): stamp the baseline and run any post-baseline migrations. - applySchemaMigrations(db, [addTenantIdColumn]); - - const saveStatement = db.prepare(` + // Schema-version convention (#4832): stamp the baseline and run any post-baseline migrations. + applySchemaMigrations(db, [addTenantIdColumn]); + const saveStatement = db.prepare(` INSERT INTO miner_plans (plan_id, plan_json, status, updated_at) VALUES (?, ?, ?, ?) ON CONFLICT(plan_id) DO UPDATE SET @@ -166,56 +183,50 @@ export function openPlanStore(dbPath = resolvePlanStoreDbPath()) { status = excluded.status, updated_at = excluded.updated_at `); - const getStatement = db.prepare("SELECT * FROM miner_plans WHERE plan_id = ?"); - const listAllStatement = db.prepare("SELECT * FROM miner_plans ORDER BY plan_id ASC"); - const listStatusStatement = db.prepare("SELECT * FROM miner_plans WHERE status = ? ORDER BY plan_id ASC"); - - return { - dbPath: resolvedPath, - savePlan(planId, plan) { - const id = normalizePlanId(planId); - validatePlanDag(plan); - const status = computePlanStatus(plan); - const updatedAt = new Date().toISOString(); - saveStatement.run(id, JSON.stringify(plan), status, updatedAt); - return { planId: id, plan, status, updatedAt }; - }, - loadPlan(planId) { - const row = getStatement.get(normalizePlanId(planId)); - return row ? rowToRecord(row) : null; - }, - listPlans(filter = {}) { - const status = normalizePlanStatusFilter(filter.status); - if (status !== undefined) { - return listStatusStatement.all(status).map(rowToRecord); - } - return listAllStatement.all().map(rowToRecord); - }, - close() { - db.close(); - }, - }; -} - + const getStatement = db.prepare("SELECT * FROM miner_plans WHERE plan_id = ?"); + const listAllStatement = db.prepare("SELECT * FROM miner_plans ORDER BY plan_id ASC"); + const listStatusStatement = db.prepare("SELECT * FROM miner_plans WHERE status = ? ORDER BY plan_id ASC"); + return { + dbPath: resolvedPath, + savePlan(planId, plan) { + const id = normalizePlanId(planId); + validatePlanDag(plan); + const status = computePlanStatus(plan); + const updatedAt = new Date().toISOString(); + saveStatement.run(id, JSON.stringify(plan), status, updatedAt); + return { planId: id, plan, status, updatedAt }; + }, + loadPlan(planId) { + const row = getStatement.get(normalizePlanId(planId)); + return row ? rowToRecord(row) : null; + }, + listPlans(filter = {}) { + const status = normalizePlanStatusFilter(filter.status); + const rows = (status !== undefined ? listStatusStatement.all(status) : listAllStatement.all()); + return rows.map(rowToRecord); + }, + close() { + db.close(); + }, + }; +} function getDefaultPlanStore() { - defaultPlanStore ??= openPlanStore(); - return defaultPlanStore; + defaultPlanStore ??= openPlanStore(); + return defaultPlanStore; } - export function savePlan(planId, plan) { - return getDefaultPlanStore().savePlan(planId, plan); + return getDefaultPlanStore().savePlan(planId, plan); } - export function loadPlan(planId) { - return getDefaultPlanStore().loadPlan(planId); + return getDefaultPlanStore().loadPlan(planId); } - export function listPlans(filter) { - return getDefaultPlanStore().listPlans(filter); + return getDefaultPlanStore().listPlans(filter); } - export function closeDefaultPlanStore() { - if (!defaultPlanStore) return; - defaultPlanStore.close(); - defaultPlanStore = null; + if (!defaultPlanStore) + return; + defaultPlanStore.close(); + defaultPlanStore = null; } +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"plan-store.js","sourceRoot":"","sources":["plan-store.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/loopover-miner/lib/plan-store.ts b/packages/loopover-miner/lib/plan-store.ts new file mode 100644 index 0000000000..64236a7405 --- /dev/null +++ b/packages/loopover-miner/lib/plan-store.ts @@ -0,0 +1,279 @@ +import type { DatabaseSync } from "node:sqlite"; +import { normalizeLocalStoreDbPath, openLocalStoreDb, resolveLocalStoreDbPath } from "./local-store.js"; +import { applySchemaMigrations } from "./schema-version.js"; + +// Local SQLite persistence for the stateless MCP plan DAG (#2318). `loopover_build_plan`/`plan_status`/ +// `record_step_result` are stateless — the caller holds the plan and passes it back each call — so a miner running +// unattended across process restarts needs somewhere to persist the plan object between calls. This is local-only +// bookkeeping (no plan logic, no network), 100% client-side, mirroring the package's other local stores. Every +// plan is validated against the `planDagSchema` shape (src/mcp/server.ts) on BOTH save and load, so a corrupted +// local row fails loudly instead of feeding a malformed plan back into `loopover_plan_status`. + +export type PlanStepStatus = "pending" | "running" | "completed" | "failed" | "skipped"; + +export type PlanStep = { + id: string; + title: string; + actionClass?: string; + dependsOn: string[]; + status: PlanStepStatus; + attempts: number; + maxAttempts: number; + lastError?: string | null; +}; + +export type PlanDag = { + steps: PlanStep[]; +}; + +export type PlanStatus = "pending" | "running" | "completed" | "failed"; + +export type PlanRecord = { + planId: string; + plan: PlanDag; + status: PlanStatus; + updatedAt: string; +}; + +export type ListPlansFilter = { + status?: PlanStatus | null; +}; + +export type PlanStore = { + dbPath: string; + savePlan(planId: string, plan: PlanDag): PlanRecord; + loadPlan(planId: string): PlanRecord | null; + listPlans(filter?: ListPlansFilter): PlanRecord[]; + close(): void; +}; + +const PLAN_STEP_STATUSES: readonly PlanStepStatus[] = Object.freeze([ + "pending", + "running", + "completed", + "failed", + "skipped", +]); +/** Derived plan-level status used for `listPlans({ status })`. */ +export const PLAN_STATUSES: readonly PlanStatus[] = Object.freeze(["pending", "running", "completed", "failed"]); + +const stepStatusSet: Set = new Set(PLAN_STEP_STATUSES); +const planStatusSet: Set = new Set(PLAN_STATUSES); +const defaultDbFileName = "plan-store.sqlite3"; +let defaultPlanStore: PlanStore | null = null; + +export function resolvePlanStoreDbPath(env: Record = process.env): string { + return resolveLocalStoreDbPath(defaultDbFileName, "LOOPOVER_MINER_PLAN_STORE_DB", env); +} + +function normalizeDbPath(dbPath: string | null | undefined): string { + return normalizeLocalStoreDbPath(dbPath, resolvePlanStoreDbPath(), "invalid_plan_store_db_path"); +} + +function normalizePlanId(planId: unknown): string { + if (typeof planId !== "string" || !planId.trim()) throw new Error("invalid_plan_id"); + return planId.trim(); +} + +function normalizePlanStatusFilter(status: PlanStatus | null | undefined): PlanStatus | undefined { + if (status === undefined || status === null) return undefined; + if (!planStatusSet.has(status)) throw new Error("invalid_status"); + return status; +} + +function isBoundedString(value: unknown, min: number, max: number): value is string { + return typeof value === "string" && value.length >= min && value.length <= max; +} + +function isBoundedInt(value: unknown, min: number, max: number): value is number { + return Number.isInteger(value) && (value as number) >= min && (value as number) <= max; +} + +const STEP_KEYS = new Set(["id", "title", "actionClass", "dependsOn", "status", "attempts", "maxAttempts", "lastError"]); + +function isValidStep(step: unknown): step is PlanStep { + if (!step || typeof step !== "object" || Array.isArray(step)) return false; + for (const key of Object.keys(step)) if (!STEP_KEYS.has(key)) return false; // strict: no unknown keys + const candidate = step as Record; + if (!isBoundedString(candidate.id, 1, 100) || !isBoundedString(candidate.title, 1, 300)) return false; + if (candidate.actionClass !== undefined && !isBoundedString(candidate.actionClass, 1, 60)) return false; + if (!Array.isArray(candidate.dependsOn) || candidate.dependsOn.length > 50) return false; + if (!candidate.dependsOn.every((dep: unknown) => isBoundedString(dep, 1, 100))) return false; + if (!stepStatusSet.has(candidate.status as string)) return false; + if (!isBoundedInt(candidate.attempts, 0, Number.MAX_SAFE_INTEGER)) return false; + if (!isBoundedInt(candidate.maxAttempts, 1, 10)) return false; + if ( + candidate.lastError !== undefined + && candidate.lastError !== null + && !isBoundedString(candidate.lastError, 0, 2000) + ) { + return false; + } + return true; +} + +/** Validate a plan against the `planDagSchema` shape (strict `{ steps: PlanStep[] }`, ≤100 steps). Throws on any + * malformed field so a bad plan can neither be saved nor read back. */ +function validatePlanDag(plan: unknown): PlanDag { + if (!plan || typeof plan !== "object" || Array.isArray(plan)) throw new Error("invalid_plan"); + const keys = Object.keys(plan); + if (keys.length !== 1 || keys[0] !== "steps") throw new Error("invalid_plan"); + const candidate = plan as { steps: unknown }; + if (!Array.isArray(candidate.steps) || candidate.steps.length === 0 || candidate.steps.length > 100) { + throw new Error("invalid_plan"); + } + if (!candidate.steps.every(isValidStep)) throw new Error("invalid_plan"); + const steps = candidate.steps as PlanStep[]; + const seenStepIds = new Set(); + for (const step of steps) { + if (seenStepIds.has(step.id)) throw new Error("invalid_plan"); + seenStepIds.add(step.id); + } + for (const step of steps) { + for (const dep of step.dependsOn) { + if (dep === step.id || !seenStepIds.has(dep)) throw new Error("invalid_plan"); + } + } + const color = new Map(); + const byId = new Map(steps.map((step) => [step.id, step])); + const hasCycle = (id: string): boolean => { + color.set(id, 1); + // Non-null: every `id` this is called with is either a step's own id (inserted into `byId` above) or a + // `dep` whose `byId.has(dep)` was just confirmed true by the caller -- `byId.get(id)` can never miss here. + for (const dep of byId.get(id)!.dependsOn) { + const depColor = color.get(dep) ?? 0; + if (depColor === 1) return true; + if (depColor === 0 && byId.has(dep) && hasCycle(dep)) return true; + } + color.set(id, 2); + return false; + }; + for (const step of steps) { + if ((color.get(step.id) ?? 0) === 0 && hasCycle(step.id)) { + throw new Error("invalid_plan"); + } + } + return { steps }; +} + +/** Derive a plan-level status from its steps: any failed → failed; else any running → running; else all steps + * finished (completed/skipped) with at least one step → completed; otherwise pending. */ +function computePlanStatus(plan: PlanDag): PlanStatus { + const steps = plan.steps; + if (steps.some((step) => step.status === "failed")) return "failed"; + if (steps.some((step) => step.status === "running")) return "running"; + if (steps.length > 0 && steps.every((step) => step.status === "completed" || step.status === "skipped")) { + return "completed"; + } + return "pending"; +} + +function rowToRecord(row: { plan_id: string; plan_json: string; status: string; updated_at: string }): PlanRecord { + let plan: PlanDag; + try { + plan = validatePlanDag(JSON.parse(row.plan_json)); + } catch { + throw new Error("corrupted_plan_row"); // stored blob no longer matches the plan shape + } + // Also fail closed on the status column: a manually-edited or legacy row (predating the CHECK constraint) could + // hold a status outside PLAN_STATUSES, which would otherwise violate the exported PlanRecord contract on read. + if (!planStatusSet.has(row.status)) throw new Error("corrupted_plan_row"); + return { planId: row.plan_id, plan, status: row.status as PlanStatus, updatedAt: row.updated_at }; +} + +// v1 -> v2 (#4939/#6597): additive tenant-scoping column, a prerequisite for any hosted, multi-tenant use of +// this same store's logic. NULL for every row today -- self-host behavior is byte-identical, since nothing +// reads or writes it yet. Same defensive column-presence guard as this file's sibling stores' own additive +// migrations (e.g. event-ledger.js's addTenantIdColumn). +function addTenantIdColumn(db: DatabaseSync): void { + const hasTenantIdColumn = db + .prepare("PRAGMA table_info(miner_plans)") + .all() + .some((column) => (column as { name: string }).name === "tenant_id"); + if (!hasTenantIdColumn) db.exec("ALTER TABLE miner_plans ADD COLUMN tenant_id TEXT"); +} + +/** + * Opens the local plan store, creating the table on first use. `savePlan` is a single atomic INSERT…ON CONFLICT + * upsert keyed by `plan_id`; the plan JSON is validated on save AND re-validated on load, so a corrupted row is + * rejected rather than silently returned. (#2318) + */ +export function openPlanStore(dbPath: string = resolvePlanStoreDbPath()): PlanStore { + const resolvedPath = normalizeDbPath(dbPath); + // openLocalStoreDb centralizes the mkdir(0o700)/chmod(0o600)/busy_timeout + crash-safe cleanup registration and + // treats ':memory:' as a no-file special case, so this store no longer hand-rolls that boilerplate (#4826). + const db = openLocalStoreDb(resolvedPath); + db.exec(` + CREATE TABLE IF NOT EXISTS miner_plans ( + plan_id TEXT PRIMARY KEY, + plan_json TEXT NOT NULL, + status TEXT NOT NULL CHECK (status IN ('pending', 'running', 'completed', 'failed')), + updated_at TEXT NOT NULL + ) + `); + // Schema-version convention (#4832): stamp the baseline and run any post-baseline migrations. + applySchemaMigrations(db, [addTenantIdColumn]); + + const saveStatement = db.prepare(` + INSERT INTO miner_plans (plan_id, plan_json, status, updated_at) + VALUES (?, ?, ?, ?) + ON CONFLICT(plan_id) DO UPDATE SET + plan_json = excluded.plan_json, + status = excluded.status, + updated_at = excluded.updated_at + `); + const getStatement = db.prepare("SELECT * FROM miner_plans WHERE plan_id = ?"); + const listAllStatement = db.prepare("SELECT * FROM miner_plans ORDER BY plan_id ASC"); + const listStatusStatement = db.prepare("SELECT * FROM miner_plans WHERE status = ? ORDER BY plan_id ASC"); + + return { + dbPath: resolvedPath, + savePlan(planId: string, plan: PlanDag): PlanRecord { + const id = normalizePlanId(planId); + validatePlanDag(plan); + const status = computePlanStatus(plan); + const updatedAt = new Date().toISOString(); + saveStatement.run(id, JSON.stringify(plan), status, updatedAt); + return { planId: id, plan, status, updatedAt }; + }, + loadPlan(planId: string): PlanRecord | null { + const row = getStatement.get(normalizePlanId(planId)) as + | { plan_id: string; plan_json: string; status: string; updated_at: string } + | undefined; + return row ? rowToRecord(row) : null; + }, + listPlans(filter: ListPlansFilter = {}): PlanRecord[] { + const status = normalizePlanStatusFilter(filter.status); + const rows = ( + status !== undefined ? listStatusStatement.all(status) : listAllStatement.all() + ) as { plan_id: string; plan_json: string; status: string; updated_at: string }[]; + return rows.map(rowToRecord); + }, + close() { + db.close(); + }, + }; +} + +function getDefaultPlanStore(): PlanStore { + defaultPlanStore ??= openPlanStore(); + return defaultPlanStore; +} + +export function savePlan(planId: string, plan: PlanDag): PlanRecord { + return getDefaultPlanStore().savePlan(planId, plan); +} + +export function loadPlan(planId: string): PlanRecord | null { + return getDefaultPlanStore().loadPlan(planId); +} + +export function listPlans(filter?: ListPlansFilter): PlanRecord[] { + return getDefaultPlanStore().listPlans(filter); +} + +export function closeDefaultPlanStore() { + if (!defaultPlanStore) return; + defaultPlanStore.close(); + defaultPlanStore = null; +} diff --git a/packages/loopover-miner/lib/rejection-templates.d.ts b/packages/loopover-miner/lib/rejection-templates.d.ts index 62bced6f5b..bbf51de490 100644 --- a/packages/loopover-miner/lib/rejection-templates.d.ts +++ b/packages/loopover-miner/lib/rejection-templates.d.ts @@ -1,12 +1,24 @@ export type RejectionReason = "gate_close" | "maintainer_close_no_reason" | "superseded_by_duplicate"; - export type RejectionContext = { - repoFullName: string; - prNumber: number; + repoFullName: string; + prNumber: number; }; - -export const REJECTION_REASONS: readonly RejectionReason[]; - -export function containsPrivateLanguage(text: string): boolean; - -export function renderRejectionMessage(reason: RejectionReason, context: RejectionContext): string; +/** The supported rejection-reason buckets, in declaration order. */ +export declare const REJECTION_REASONS: readonly RejectionReason[]; +/** True when the given text contains any banned private-language token. */ +export declare function containsPrivateLanguage(text: string): boolean; +/** + * Substitute every `{placeholder}` token in `template` from `values`, throwing rather than emitting a + * half-rendered note if any placeholder is unmapped (`missing_placeholder:`) or if a substituted value's + * own text still leaves what looks like an unresolved placeholder in the output (`unresolved_placeholder`) -- + * defense-in-depth against a future template-authoring bug, not a route `renderRejectionMessage` itself can hit + * today given the fixed {@link REJECTION_REASONS} vocabulary (exported so both guards are directly unit-testable + * without needing a malformed production template). Pure and deterministic. + */ +export declare function resolvePlaceholders(template: string, values: Record): string; +/** + * Render the courtesy note for a closed/rejected PR. `reason` must be one of {@link REJECTION_REASONS}; `context` + * supplies `repoFullName` (`owner/repo`) and `prNumber` (a positive integer). Throws on an unknown reason or a + * malformed context. Pure and deterministic. + */ +export declare function renderRejectionMessage(reason: RejectionReason, context: RejectionContext): string; diff --git a/packages/loopover-miner/lib/rejection-templates.js b/packages/loopover-miner/lib/rejection-templates.js index bfb192bf95..57d5b6da0d 100644 --- a/packages/loopover-miner/lib/rejection-templates.js +++ b/packages/loopover-miner/lib/rejection-templates.js @@ -3,69 +3,74 @@ // write action, out of scope here). The note must be courteous, non-defensive, and never re-litigate the // maintainer's decision. This module is pure content/formatting: static template strings + a deterministic // renderer — no GitHub calls, no LLM, no network. Same inputs always render the same message. - // Templates keyed by rejection-reason bucket. Every placeholder is `{name}`; the renderer resolves the structured // context (a PR number + a repo) and never interpolates free-form/private text. const REASON_TEMPLATES = { - gate_close: - "The automated review gate closed PR #{prNumber} on {repoFullName}. Thanks for the review — I'll address the flagged points and open a fresh PR if the change still fits.", - maintainer_close_no_reason: - "PR #{prNumber} on {repoFullName} was closed by the maintainer. Thanks for taking the time to look — I'll leave it here unless you'd like me to revisit it.", - superseded_by_duplicate: - "PR #{prNumber} on {repoFullName} looks superseded by other work on the same issue, so I'm closing it on my side to avoid duplication. Thanks to whoever is carrying it forward.", + gate_close: "The automated review gate closed PR #{prNumber} on {repoFullName}. Thanks for the review — I'll address the flagged points and open a fresh PR if the change still fits.", + maintainer_close_no_reason: "PR #{prNumber} on {repoFullName} was closed by the maintainer. Thanks for taking the time to look — I'll leave it here unless you'd like me to revisit it.", + superseded_by_duplicate: "PR #{prNumber} on {repoFullName} looks superseded by other work on the same issue, so I'm closing it on my side to avoid duplication. Thanks to whoever is carrying it forward.", }; - /** The supported rejection-reason buckets, in declaration order. */ export const REJECTION_REASONS = Object.freeze(Object.keys(REASON_TEMPLATES)); - // Private-language tokens that must never surface in a public-facing courtesy note (mirrors the redaction set in // `sanitizePublicComment`, src/github/commands.ts). Templates are authored clean and this is asserted in tests; // the structured context (a PR number + a validated `owner/repo`) carries no private scoring/reward/wallet data, // so — deliberately — no value-level redaction is applied that could mangle a legitimate repo name. -const PRIVATE_LANGUAGE = - /\b(?:raw trust scores?|trust scores?|wallets?|hotkeys?|coldkeys?|seed phrases?|mnemonics?|payouts?|rewards?)\b/i; - +const PRIVATE_LANGUAGE = /\b(?:raw trust scores?|trust scores?|wallets?|hotkeys?|coldkeys?|seed phrases?|mnemonics?|payouts?|rewards?)\b/i; /** True when the given text contains any banned private-language token. */ export function containsPrivateLanguage(text) { - return PRIVATE_LANGUAGE.test(text); + return PRIVATE_LANGUAGE.test(text); } - // A GitHub `owner/repo`: owner is 1-39 chars of alphanumerics/hyphens starting alphanumeric; repo is // alphanumerics/`.`/`_`/`-`. Anchored + character-class-restricted so control characters, whitespace, markup, or an // extra `/` (e.g. `owner/repo\nextra`, `owner/`) are rejected — the note interpolates this text directly, so a // malformed value must throw rather than leak caller-controlled display text. const GITHUB_FULL_NAME = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,38})\/[A-Za-z0-9._-]{1,100}$/; - function normalizeRepoFullName(repoFullName) { - if (typeof repoFullName !== "string") throw new Error("invalid_repo_full_name"); - const trimmed = repoFullName.trim(); - if (!GITHUB_FULL_NAME.test(trimmed)) throw new Error("invalid_repo_full_name"); - return trimmed; + if (typeof repoFullName !== "string") + throw new Error("invalid_repo_full_name"); + const trimmed = repoFullName.trim(); + if (!GITHUB_FULL_NAME.test(trimmed)) + throw new Error("invalid_repo_full_name"); + return trimmed; } - function normalizePrNumber(prNumber) { - if (!Number.isInteger(prNumber) || prNumber < 1) throw new Error("invalid_pr_number"); - return prNumber; + if (!Number.isInteger(prNumber) || prNumber < 1) + throw new Error("invalid_pr_number"); + return prNumber; +} +/** + * Substitute every `{placeholder}` token in `template` from `values`, throwing rather than emitting a + * half-rendered note if any placeholder is unmapped (`missing_placeholder:`) or if a substituted value's + * own text still leaves what looks like an unresolved placeholder in the output (`unresolved_placeholder`) -- + * defense-in-depth against a future template-authoring bug, not a route `renderRejectionMessage` itself can hit + * today given the fixed {@link REJECTION_REASONS} vocabulary (exported so both guards are directly unit-testable + * without needing a malformed production template). Pure and deterministic. + */ +export function resolvePlaceholders(template, values) { + const rendered = template.replace(/\{(\w+)\}/g, (_match, key) => { + const value = values[key]; + if (value === undefined) + throw new Error(`missing_placeholder:${key}`); + return String(value); + }); + if (/\{[^}]+\}/.test(rendered)) + throw new Error("unresolved_placeholder"); + return rendered; } - /** * Render the courtesy note for a closed/rejected PR. `reason` must be one of {@link REJECTION_REASONS}; `context` - * supplies `repoFullName` (`owner/repo`) and `prNumber` (a positive integer). Throws on an unknown reason, a - * malformed context, or (defensively) any placeholder a template leaves unresolved — so a caller can never emit a - * half-rendered note. Pure and deterministic. + * supplies `repoFullName` (`owner/repo`) and `prNumber` (a positive integer). Throws on an unknown reason or a + * malformed context. Pure and deterministic. */ -export function renderRejectionMessage(reason, context = {}) { - const template = REASON_TEMPLATES[reason]; - if (template === undefined) throw new Error("invalid_rejection_reason"); - const values = { - repoFullName: normalizeRepoFullName(context.repoFullName), - prNumber: normalizePrNumber(context.prNumber), - }; - const rendered = template.replace(/\{(\w+)\}/g, (_match, key) => { - const value = values[key]; - if (value === undefined) throw new Error(`missing_placeholder:${key}`); - return String(value); - }); - if (/\{[^}]+\}/.test(rendered)) throw new Error("unresolved_placeholder"); - return rendered; +export function renderRejectionMessage(reason, context) { + const template = REASON_TEMPLATES[reason]; + if (template === undefined) + throw new Error("invalid_rejection_reason"); + const values = { + repoFullName: normalizeRepoFullName(context.repoFullName), + prNumber: normalizePrNumber(context.prNumber), + }; + return resolvePlaceholders(template, values); } +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVqZWN0aW9uLXRlbXBsYXRlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInJlamVjdGlvbi10ZW1wbGF0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsa0hBQWtIO0FBQ2xILG1IQUFtSDtBQUNuSCx5R0FBeUc7QUFDekcsMkdBQTJHO0FBQzNHLDhGQUE4RjtBQVM5RixrSEFBa0g7QUFDbEgsZ0ZBQWdGO0FBQ2hGLE1BQU0sZ0JBQWdCLEdBQW9DO0lBQ3hELFVBQVUsRUFDUiwwS0FBMEs7SUFDNUssMEJBQTBCLEVBQ3hCLDRKQUE0SjtJQUM5Six1QkFBdUIsRUFDckIsaUxBQWlMO0NBQ3BMLENBQUM7QUFFRixvRUFBb0U7QUFDcEUsTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQStCLE1BQU0sQ0FBQyxNQUFNLENBQ3hFLE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQXNCLENBQ25ELENBQUM7QUFFRixpSEFBaUg7QUFDakgsZ0hBQWdIO0FBQ2hILGlIQUFpSDtBQUNqSCxvR0FBb0c7QUFDcEcsTUFBTSxnQkFBZ0IsR0FDcEIsaUhBQWlILENBQUM7QUFFcEgsMkVBQTJFO0FBQzNFLE1BQU0sVUFBVSx1QkFBdUIsQ0FBQyxJQUFZO0lBQ2xELE9BQU8sZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQ3JDLENBQUM7QUFFRCxxR0FBcUc7QUFDckcsb0hBQW9IO0FBQ3BILHFIQUFxSDtBQUNySCw4RUFBOEU7QUFDOUUsTUFBTSxnQkFBZ0IsR0FBRyw0REFBNEQsQ0FBQztBQUV0RixTQUFTLHFCQUFxQixDQUFDLFlBQXFCO0lBQ2xELElBQUksT0FBTyxZQUFZLEtBQUssUUFBUTtRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUNoRixNQUFNLE9BQU8sR0FBRyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDcEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7UUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLHdCQUF3QixDQUFDLENBQUM7SUFDL0UsT0FBTyxPQUFPLENBQUM7QUFDakIsQ0FBQztBQUVELFNBQVMsaUJBQWlCLENBQUMsUUFBaUI7SUFDMUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUssUUFBbUIsR0FBRyxDQUFDO1FBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBQ2xHLE9BQU8sUUFBa0IsQ0FBQztBQUM1QixDQUFDO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FBQyxRQUFnQixFQUFFLE1BQXVDO0lBQzNGLE1BQU0sUUFBUSxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLENBQUMsTUFBTSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQzlELE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUMxQixJQUFJLEtBQUssS0FBSyxTQUFTO1lBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyx1QkFBdUIsR0FBRyxFQUFFLENBQUMsQ0FBQztRQUN2RSxPQUFPLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUN2QixDQUFDLENBQUMsQ0FBQztJQUNILElBQUksV0FBVyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7UUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLHdCQUF3QixDQUFDLENBQUM7SUFDMUUsT0FBTyxRQUFRLENBQUM7QUFDbEIsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsc0JBQXNCLENBQUMsTUFBdUIsRUFBRSxPQUF5QjtJQUN2RixNQUFNLFFBQVEsR0FBRyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUMxQyxJQUFJLFFBQVEsS0FBSyxTQUFTO1FBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO0lBQ3hFLE1BQU0sTUFBTSxHQUFvQztRQUM5QyxZQUFZLEVBQUUscUJBQXFCLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQztRQUN6RCxRQUFRLEVBQUUsaUJBQWlCLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQztLQUM5QyxDQUFDO0lBQ0YsT0FBTyxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7QUFDL0MsQ0FBQyJ9 \ No newline at end of file diff --git a/packages/loopover-miner/lib/rejection-templates.ts b/packages/loopover-miner/lib/rejection-templates.ts new file mode 100644 index 0000000000..366fda5c88 --- /dev/null +++ b/packages/loopover-miner/lib/rejection-templates.ts @@ -0,0 +1,91 @@ +// CoC-compliant rejection message templates (#2324). When one of the miner's PRs is closed/rejected, it may leave +// a single, final, human-readable local note (e.g. in a run summary or CLI output — posting anywhere is a separate +// write action, out of scope here). The note must be courteous, non-defensive, and never re-litigate the +// maintainer's decision. This module is pure content/formatting: static template strings + a deterministic +// renderer — no GitHub calls, no LLM, no network. Same inputs always render the same message. + +export type RejectionReason = "gate_close" | "maintainer_close_no_reason" | "superseded_by_duplicate"; + +export type RejectionContext = { + repoFullName: string; + prNumber: number; +}; + +// Templates keyed by rejection-reason bucket. Every placeholder is `{name}`; the renderer resolves the structured +// context (a PR number + a repo) and never interpolates free-form/private text. +const REASON_TEMPLATES: Record = { + gate_close: + "The automated review gate closed PR #{prNumber} on {repoFullName}. Thanks for the review — I'll address the flagged points and open a fresh PR if the change still fits.", + maintainer_close_no_reason: + "PR #{prNumber} on {repoFullName} was closed by the maintainer. Thanks for taking the time to look — I'll leave it here unless you'd like me to revisit it.", + superseded_by_duplicate: + "PR #{prNumber} on {repoFullName} looks superseded by other work on the same issue, so I'm closing it on my side to avoid duplication. Thanks to whoever is carrying it forward.", +}; + +/** The supported rejection-reason buckets, in declaration order. */ +export const REJECTION_REASONS: readonly RejectionReason[] = Object.freeze( + Object.keys(REASON_TEMPLATES) as RejectionReason[], +); + +// Private-language tokens that must never surface in a public-facing courtesy note (mirrors the redaction set in +// `sanitizePublicComment`, src/github/commands.ts). Templates are authored clean and this is asserted in tests; +// the structured context (a PR number + a validated `owner/repo`) carries no private scoring/reward/wallet data, +// so — deliberately — no value-level redaction is applied that could mangle a legitimate repo name. +const PRIVATE_LANGUAGE = + /\b(?:raw trust scores?|trust scores?|wallets?|hotkeys?|coldkeys?|seed phrases?|mnemonics?|payouts?|rewards?)\b/i; + +/** True when the given text contains any banned private-language token. */ +export function containsPrivateLanguage(text: string): boolean { + return PRIVATE_LANGUAGE.test(text); +} + +// A GitHub `owner/repo`: owner is 1-39 chars of alphanumerics/hyphens starting alphanumeric; repo is +// alphanumerics/`.`/`_`/`-`. Anchored + character-class-restricted so control characters, whitespace, markup, or an +// extra `/` (e.g. `owner/repo\nextra`, `owner/`) are rejected — the note interpolates this text directly, so a +// malformed value must throw rather than leak caller-controlled display text. +const GITHUB_FULL_NAME = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,38})\/[A-Za-z0-9._-]{1,100}$/; + +function normalizeRepoFullName(repoFullName: unknown): string { + if (typeof repoFullName !== "string") throw new Error("invalid_repo_full_name"); + const trimmed = repoFullName.trim(); + if (!GITHUB_FULL_NAME.test(trimmed)) throw new Error("invalid_repo_full_name"); + return trimmed; +} + +function normalizePrNumber(prNumber: unknown): number { + if (!Number.isInteger(prNumber) || (prNumber as number) < 1) throw new Error("invalid_pr_number"); + return prNumber as number; +} + +/** + * Substitute every `{placeholder}` token in `template` from `values`, throwing rather than emitting a + * half-rendered note if any placeholder is unmapped (`missing_placeholder:`) or if a substituted value's + * own text still leaves what looks like an unresolved placeholder in the output (`unresolved_placeholder`) -- + * defense-in-depth against a future template-authoring bug, not a route `renderRejectionMessage` itself can hit + * today given the fixed {@link REJECTION_REASONS} vocabulary (exported so both guards are directly unit-testable + * without needing a malformed production template). Pure and deterministic. + */ +export function resolvePlaceholders(template: string, values: Record): string { + const rendered = template.replace(/\{(\w+)\}/g, (_match, key) => { + const value = values[key]; + if (value === undefined) throw new Error(`missing_placeholder:${key}`); + return String(value); + }); + if (/\{[^}]+\}/.test(rendered)) throw new Error("unresolved_placeholder"); + return rendered; +} + +/** + * Render the courtesy note for a closed/rejected PR. `reason` must be one of {@link REJECTION_REASONS}; `context` + * supplies `repoFullName` (`owner/repo`) and `prNumber` (a positive integer). Throws on an unknown reason or a + * malformed context. Pure and deterministic. + */ +export function renderRejectionMessage(reason: RejectionReason, context: RejectionContext): string { + const template = REASON_TEMPLATES[reason]; + if (template === undefined) throw new Error("invalid_rejection_reason"); + const values: Record = { + repoFullName: normalizeRepoFullName(context.repoFullName), + prNumber: normalizePrNumber(context.prNumber), + }; + return resolvePlaceholders(template, values); +} diff --git a/test/unit/miner-ams-policy.test.ts b/test/unit/miner-ams-policy.test.ts index 7ba4394bbf..dcbbbe1bc6 100644 --- a/test/unit/miner-ams-policy.test.ts +++ b/test/unit/miner-ams-policy.test.ts @@ -94,4 +94,25 @@ describe("resolveAmsPolicy (#5132)", () => { expect(result).toEqual({ spec: DEFAULT_AMS_POLICY_SPEC, source: "default", warnings: [] }); expect(fetchImpl).not.toHaveBeenCalled(); }); + + it("treats a readFileSync that throws (e.g. a race where the file vanishes after existsSync) the same as absent", async () => { + const root = tempRoot(); + const readFileSync = () => { + throw new Error("EACCES: permission denied"); + }; + const result = await resolveAmsPolicy("acme/widgets", { + env: { LOOPOVER_MINER_CONFIG_DIR: root }, + existsSync: () => true, + readFileSync, + }); + expect(result).toEqual({ spec: DEFAULT_AMS_POLICY_SPEC, source: "default", warnings: [] }); + }); + + it("defaults env to process.env when no env override is supplied", async () => { + // No LOOPOVER_MINER_AMS_POLICY_PATH/LOOPOVER_MINER_CONFIG_DIR/XDG_CONFIG_HOME override set for this test + // process, so this exercises the real `options.env ?? process.env` default path and resolves to the real + // (almost certainly absent, on a test machine) `~/.config/loopover-miner/.loopover-ams.yml`. + const result = await resolveAmsPolicy("acme/widgets", { existsSync: () => false }); + expect(result).toEqual({ spec: DEFAULT_AMS_POLICY_SPEC, source: "default", warnings: [] }); + }); }); diff --git a/test/unit/miner-attempt-runner.test.ts b/test/unit/miner-attempt-runner.test.ts index 4c4c32f374..48be8acde9 100644 --- a/test/unit/miner-attempt-runner.test.ts +++ b/test/unit/miner-attempt-runner.test.ts @@ -333,6 +333,16 @@ describe("runMinerAttempt (#2337) — the real create->review->gate->submit pipe expect(second.decision.stage).toBe("rate_limit"); }); + it("threads an explicit maxConsecutiveGateBlocks/sessionStartMs through, and tolerates an omitted draft", async () => { + const deps = baseDeps({ sessionStartMs: 9_000 }); + const input = baseAttemptInput({ maxConsecutiveGateBlocks: 3 }); + delete (input as { draft?: unknown }).draft; + + const result = await runMinerAttempt(input, deps); + + expect(result.outcome).toBe("submitted"); + }); + it("fails closed on malformed input", async () => { const deps = baseDeps(); await expect(runMinerAttempt(null as never, deps)).rejects.toThrow("invalid_attempt_input"); diff --git a/test/unit/miner-calibration-types.test.ts b/test/unit/miner-calibration-types.test.ts index 67dfa40a47..77d4ad0987 100644 --- a/test/unit/miner-calibration-types.test.ts +++ b/test/unit/miner-calibration-types.test.ts @@ -67,4 +67,12 @@ describe("loopover-miner calibration types scaffold (#2332)", () => { expect(isCalibrationReport({ rows: [row], hasSignal: "yes" })).toBe(false); expect(isCalibrationReport({ rows: [{ ...row, project: "" }], hasSignal: true })).toBe(false); }); + + it("rejects null, non-object, and array values for every shape's own top-level guard", () => { + for (const bad of [null, "not-an-object", 42, ["array", "not", "object"]]) { + expect(isObservedOutcomeRecord(bad)).toBe(false); + expect(isCalibrationRow(bad)).toBe(false); + expect(isCalibrationReport(bad)).toBe(false); + } + }); }); diff --git a/test/unit/miner-contribution-profile-cache.test.ts b/test/unit/miner-contribution-profile-cache.test.ts index 97a0fda853..621b23c536 100644 --- a/test/unit/miner-contribution-profile-cache.test.ts +++ b/test/unit/miner-contribution-profile-cache.test.ts @@ -176,6 +176,19 @@ describe("contribution-profile cache store (#6797)", () => { false, ); }); + + it("purgeByRepo deletes only the given repo's cached profile and returns the count (#7091)", () => { + const store = tempStore(); + store.put(profile("acme/widgets"), AT_MS); + store.put(profile("acme/other"), AT_MS); + expect(store.purgeByRepo("acme/widgets")).toBe(1); + expect(store.get("acme/widgets")).toBeNull(); + expect(store.get("acme/other")).not.toBeNull(); + }); + + it("purgeByRepo returns 0 when the repo has no cached profile", () => { + expect(tempStore().purgeByRepo("acme/widgets")).toBe(0); + }); }); function tempRootForDefault(): string { diff --git a/test/unit/miner-opportunity-fanout.test.ts b/test/unit/miner-opportunity-fanout.test.ts index 47772bdeef..3e75d6071f 100644 --- a/test/unit/miner-opportunity-fanout.test.ts +++ b/test/unit/miner-opportunity-fanout.test.ts @@ -8,6 +8,7 @@ vi.mock("@loopover/engine", async () => { import { fetchCandidateIssues, fetchCandidateIssuesWithSummary, + searchCandidateIssues, searchCandidateIssuesWithSummary, } from "../../packages/loopover-miner/lib/opportunity-fanout.js"; @@ -420,4 +421,236 @@ describe("fetchCandidateIssues (#2307)", () => { expect(timeoutSpy.mock.calls.every(([ms]) => ms === 10_000)).toBe(true); timeoutSpy.mockRestore(); }); + + it("tolerates non-array targets and malformed target entries, making zero requests for zero valid targets", async () => { + const fetchSpy = vi.fn(); + vi.stubGlobal("fetch", fetchSpy); + + const fromNonArray = await fetchCandidateIssuesWithSummary("not-an-array" as never, "token", { apiBaseUrl: API }); + expect(fromNonArray.issues).toEqual([]); + + const fromMalformedEntries = await fetchCandidateIssuesWithSummary( + [{ owner: 123, repo: null }, {}, { owner: "acme" }] as never, + "token", + { apiBaseUrl: API }, + ); + expect(fromMalformedEntries.issues).toEqual([]); + expect(fetchSpy).not.toHaveBeenCalled(); + }); + + it("omits the Authorization header when githubToken is not a string", async () => { + const authorizations: Array = []; + vi.stubGlobal("fetch", async (input: RequestInfo | URL, init?: RequestInit) => { + authorizations.push( + init?.headers instanceof Headers + ? init.headers.get("authorization") + : (init?.headers as Record | undefined)?.authorization, + ); + const url = String(input); + if (url.endsWith("/contents/AI-USAGE.md")) return jsonResponse({}, { status: 404 }); + if (url.endsWith("/contents/CONTRIBUTING.md")) return contentResponse("Contributions welcome."); + if (url.includes("/issues?")) return jsonResponse([issue(1)]); + return jsonResponse({}, { status: 404 }); + }); + + await fetchCandidateIssues([{ owner: "acme", repo: "widgets" }], undefined as never, { apiBaseUrl: API }); + + expect(authorizations.every((value) => value == null)).toBe(true); + }); + + it("tolerates a non-numeric x-ratelimit-remaining header (never records a NaN budget)", async () => { + vi.stubGlobal("fetch", async (input: RequestInfo | URL) => { + const url = String(input); + // "unknown" -> Number("unknown") is NaN, so Number.isFinite(remaining) is false -- unlike a genuinely + // ABSENT header, where headers.get() returns null and Number(null) is 0 (finite), not NaN. + const headers = { "x-ratelimit-remaining": "unknown" }; + if (url.endsWith("/contents/AI-USAGE.md")) return Response.json({}, { status: 404, headers }); + if (url.endsWith("/contents/CONTRIBUTING.md")) return contentResponse("Contributions welcome."); + if (url.includes("/issues?")) return Response.json([issue(3)], { headers }); + return Response.json({}, { status: 404, headers }); + }); + + const result = await fetchCandidateIssuesWithSummary([{ owner: "acme", repo: "widgets" }], "token", { + apiBaseUrl: API, + }); + + // CONTRIBUTING.md's response (contentResponse) DOES carry a real numeric remaining (42) -- proving the + // "unknown" responses were skipped rather than poisoning the running minimum with NaN. + expect(result.rateLimitRemaining).toBe(42); + }); + + it("treats a malformed (array, not object) policy-doc payload as absent content, and passes through non-base64-encoded content unchanged", async () => { + vi.stubGlobal("fetch", async (input: RequestInfo | URL) => { + const url = String(input); + // A malformed AI-USAGE.md payload (array, not `{content, encoding}`) decodes to null content -> falls + // through to CONTRIBUTING.md, whose content here is NOT base64-encoded (encoding: "none"). + if (url.endsWith("/contents/AI-USAGE.md")) return jsonResponse([1, 2, 3]); + if (url.endsWith("/contents/CONTRIBUTING.md")) { + return jsonResponse({ type: "file", encoding: "none", content: "Contributions welcome, AI included." }); + } + if (url.includes("/issues?")) return jsonResponse([issue(5)]); + return jsonResponse({}, { status: 404 }); + }); + + const result = await fetchCandidateIssues([{ owner: "acme", repo: "widgets" }], "token", { apiBaseUrl: API }); + + expect(result.map((entry) => entry.issueNumber)).toEqual([5]); + expect(result[0]?.aiPolicySource).toBe("CONTRIBUTING.md"); + }); + + it("normalizes a non-Error thrown while fetching a policy doc to a generic warning message, still falling through", async () => { + vi.stubGlobal("fetch", async (input: RequestInfo | URL) => { + const url = String(input); + if (url.endsWith("/contents/AI-USAGE.md")) throw "boom"; // eslint-disable-line no-throw-literal -- deliberately non-Error + if (url.endsWith("/contents/CONTRIBUTING.md")) return contentResponse("Contributions welcome."); + if (url.includes("/issues?")) return jsonResponse([issue(9)]); + return jsonResponse({}, { status: 404 }); + }); + + const result = await fetchCandidateIssuesWithSummary([{ owner: "acme", repo: "widgets" }], "token", { + apiBaseUrl: API, + }); + + expect(result.warnings).toEqual([ + { repoFullName: "acme/widgets", stage: "policy:AI-USAGE.md", message: "policy fetch failed" }, + ]); + expect(result.issues.map((entry) => entry.issueNumber)).toEqual([9]); + }); + + it("normalizes a non-Error thrown while listing issues to a generic warning message", async () => { + vi.stubGlobal("fetch", async (input: RequestInfo | URL) => { + const url = String(input); + if (url.endsWith("/contents/AI-USAGE.md")) return jsonResponse({}, { status: 404 }); + if (url.endsWith("/contents/CONTRIBUTING.md")) return contentResponse("Contributions welcome."); + if (url.includes("/issues?")) throw { code: "ECONNRESET" }; // eslint-disable-line no-throw-literal -- deliberately non-Error + return jsonResponse({}, { status: 404 }); + }); + + const result = await fetchCandidateIssuesWithSummary([{ owner: "acme", repo: "widgets" }], "token", { + apiBaseUrl: API, + }); + + expect(result.warnings).toEqual([{ repoFullName: "acme/widgets", stage: "issues", message: "issue fetch failed" }]); + }); + + it("drops malformed issue entries and defaults every optional field a minimal-but-valid entry omits", async () => { + vi.stubGlobal("fetch", async (input: RequestInfo | URL) => { + const url = String(input); + if (url.endsWith("/contents/AI-USAGE.md")) return jsonResponse({}, { status: 404 }); + if (url.endsWith("/contents/CONTRIBUTING.md")) return contentResponse("Contributions welcome."); + if (url.includes("/issues?")) { + return jsonResponse([ + { number: 0, title: "Invalid number (<= 0)" }, + { number: 5, title: "" }, // blank title + { number: 6, title: "Minimal issue" }, // no labels/assignees/comments/created_at/updated_at/html_url + ]); + } + return jsonResponse({}, { status: 404 }); + }); + + const result = await fetchCandidateIssues([{ owner: "acme", repo: "widgets" }], "token", { apiBaseUrl: API }); + + expect(result).toEqual([ + { + owner: "acme", + repo: "widgets", + repoFullName: "acme/widgets", + issueNumber: 6, + title: "Minimal issue", + labels: [], + assignees: [], + commentsCount: 0, + createdAt: null, + updatedAt: null, + htmlUrl: null, + aiPolicyAllowed: true, + aiPolicySource: "CONTRIBUTING.md", + }, + ]); + }); + + it("returns no results for a blank/whitespace-only search query, without ever calling fetch", async () => { + const fetchSpy = vi.fn(); + vi.stubGlobal("fetch", fetchSpy); + + const result = await searchCandidateIssuesWithSummary(" ", "token", { apiBaseUrl: API }); + + expect(result.issues).toEqual([]); + expect(fetchSpy).not.toHaveBeenCalled(); + }); + + it("returns no results for a non-string search query, without ever calling fetch", async () => { + const fetchSpy = vi.fn(); + vi.stubGlobal("fetch", fetchSpy); + + const result = await searchCandidateIssuesWithSummary(undefined as never, "token", { apiBaseUrl: API }); + + expect(result.issues).toEqual([]); + expect(fetchSpy).not.toHaveBeenCalled(); + }); + + it("normalizes a non-Error thrown while searching to a generic warning message", async () => { + vi.stubGlobal("fetch", async () => { + throw "search boom"; // eslint-disable-line no-throw-literal -- deliberately non-Error + }); + + const result = await searchCandidateIssuesWithSummary("label:bug", "token", { apiBaseUrl: API }); + + expect(result.warnings).toEqual([{ repoFullName: "*", stage: "search", message: "issue search failed" }]); + }); + + it("resolves a search hit whose repository.full_name is malformed via its html_url fallback instead", async () => { + vi.stubGlobal("fetch", async (input: RequestInfo | URL) => { + const url = String(input); + if (url.includes("/search/issues?")) { + return jsonResponse({ + items: [ + { + ...issue(60), + repository: { full_name: "no-slash-here" }, // malformed: no "/", falls through to html_url + html_url: "https://github.com/acme/widgets/issues/60", + }, + ], + }); + } + if (url.endsWith("/contents/AI-USAGE.md")) return jsonResponse({}, { status: 404 }); + if (url.endsWith("/contents/CONTRIBUTING.md")) return contentResponse("Contributions welcome."); + return jsonResponse({}, { status: 404 }); + }); + + const result = await searchCandidateIssuesWithSummary("label:bug", "token", { apiBaseUrl: API }); + + expect(result.issues.map((entry) => [entry.repoFullName, entry.issueNumber])).toEqual([["acme/widgets", 60]]); + }); + + it("silently drops a search hit with no full_name, no matching repository_url, and no html_url at all", async () => { + vi.stubGlobal("fetch", async (input: RequestInfo | URL) => { + const url = String(input); + if (url.includes("/search/issues?")) { + return jsonResponse({ items: [{ number: 61, title: "Unresolvable target" }] }); + } + return jsonResponse({}, { status: 404 }); + }); + + const result = await searchCandidateIssuesWithSummary("label:bug", "token", { apiBaseUrl: API }); + + expect(result.issues).toEqual([]); + expect(result.warnings).toEqual([]); + }); + + it("searchCandidateIssues returns just the issues array, defaulting options when omitted", async () => { + vi.stubGlobal("fetch", async (input: RequestInfo | URL) => { + const url = String(input); + if (url.includes("/search/issues?")) { + return jsonResponse({ items: [{ ...issue(70), repository: { full_name: "acme/widgets" } }] }); + } + if (url.endsWith("/contents/AI-USAGE.md")) return jsonResponse({}, { status: 404 }); + if (url.endsWith("/contents/CONTRIBUTING.md")) return contentResponse("Contributions welcome."); + return jsonResponse({}, { status: 404 }); + }); + + const result = await searchCandidateIssues("label:bug", "token"); + + expect(result.map((entry) => entry.issueNumber)).toEqual([70]); + }); }); diff --git a/test/unit/miner-plan-store.test.ts b/test/unit/miner-plan-store.test.ts index 94b1076599..8e158761a5 100644 --- a/test/unit/miner-plan-store.test.ts +++ b/test/unit/miner-plan-store.test.ts @@ -2,12 +2,15 @@ import { mkdtempSync, rmSync, statSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { DatabaseSync } from "node:sqlite"; -import { afterEach, describe, expect, it } from "vitest"; +import { afterEach, describe, expect, it, vi } from "vitest"; import { PLAN_STATUSES, closeDefaultPlanStore, + listPlans, + loadPlan, openPlanStore, resolvePlanStoreDbPath, + savePlan, } from "../../packages/loopover-miner/lib/plan-store.js"; import type { PlanDag } from "../../packages/loopover-miner/lib/plan-store.js"; import { readSchemaVersion } from "../../packages/loopover-miner/lib/schema-version.js"; @@ -26,6 +29,7 @@ function tempStore() { afterEach(() => { for (const store of stores.splice(0)) store.close(); closeDefaultPlanStore(); + vi.unstubAllEnvs(); for (const root of roots.splice(0)) rmSync(root, { recursive: true, force: true }); }); @@ -92,6 +96,41 @@ describe("loopover-miner plan store (#2318)", () => { expect(store.listPlans({ status: null }).map((record) => record.planId)).toEqual(["a", "b"]); }); + it("derives 'failed' status once any step failed, even alongside other statuses", () => { + const store = tempStore(); + const saved = store.savePlan("failed-plan", { + steps: [ + { id: "a", title: "A", dependsOn: [], status: "completed", attempts: 1, maxAttempts: 1 }, + { id: "b", title: "B", dependsOn: [], status: "failed", attempts: 1, maxAttempts: 1 }, + ], + }); + expect(saved.status).toBe("failed"); + }); + + it("derives 'pending' status when no step is failed/running and not every step is finished", () => { + const store = tempStore(); + const saved = store.savePlan("pending-plan", { + steps: [ + { id: "a", title: "A", dependsOn: [], status: "completed", attempts: 1, maxAttempts: 1 }, + { id: "b", title: "B", dependsOn: [], status: "pending", attempts: 0, maxAttempts: 1 }, + ], + }); + expect(saved.status).toBe("pending"); + }); + + it("exposes module-level savePlan/loadPlan/listPlans helpers backed by the default DB path", () => { + const root = mkdtempSync(join(tmpdir(), "loopover-miner-plan-store-default-")); + roots.push(root); + vi.stubEnv("LOOPOVER_MINER_PLAN_STORE_DB", join(root, "default.sqlite3")); + + expect(loadPlan("p1")).toBeNull(); + const saved = savePlan("p1", PLAN); + expect(saved.planId).toBe("p1"); + expect(loadPlan("p1")?.plan).toEqual(PLAN); + expect(listPlans().map((record) => record.planId)).toEqual(["p1"]); + expect(listPlans({ status: "running" }).map((record) => record.planId)).toEqual(["p1"]); + }); + it("rejects a malformed plan on save rather than persisting it", () => { const store = tempStore(); expect(() => store.savePlan("x", { steps: [{ id: "s1", title: "no status", dependsOn: [], attempts: 0, maxAttempts: 1 } as never] })).toThrow("invalid_plan"); @@ -109,6 +148,36 @@ describe("loopover-miner plan store (#2318)", () => { ).toThrow("invalid_plan"); }); + it("rejects a plan that is itself null, a non-object, or an array", () => { + const store = tempStore(); + expect(() => store.savePlan("x", null as never)).toThrow("invalid_plan"); + expect(() => store.savePlan("x", "nope" as never)).toThrow("invalid_plan"); + expect(() => store.savePlan("x", [] as never)).toThrow("invalid_plan"); + }); + + it("rejects every individually-malformed step field on save", () => { + const store = tempStore(); + const valid = { id: "a", title: "A", dependsOn: [] as string[], status: "pending" as const, attempts: 0, maxAttempts: 1 }; + // A non-object step (e.g. a bare string) in the steps array. + expect(() => store.savePlan("x", { steps: ["not-an-object" as never] })).toThrow("invalid_plan"); + // Invalid id/title. + expect(() => store.savePlan("x", { steps: [{ ...valid, id: "" }] })).toThrow("invalid_plan"); + expect(() => store.savePlan("x", { steps: [{ ...valid, title: "" }] })).toThrow("invalid_plan"); + // Invalid actionClass (present but out-of-bounds). + expect(() => store.savePlan("x", { steps: [{ ...valid, actionClass: "" }] })).toThrow("invalid_plan"); + // dependsOn not an array, and dependsOn with a non-string entry. + expect(() => store.savePlan("x", { steps: [{ ...valid, dependsOn: "nope" as never }] })).toThrow("invalid_plan"); + expect(() => store.savePlan("x", { steps: [{ ...valid, dependsOn: [1 as never] }] })).toThrow("invalid_plan"); + // Invalid attempts/maxAttempts. + expect(() => store.savePlan("x", { steps: [{ ...valid, attempts: -1 }] })).toThrow("invalid_plan"); + expect(() => store.savePlan("x", { steps: [{ ...valid, maxAttempts: 0 }] })).toThrow("invalid_plan"); + // Invalid lastError (present but out-of-bounds type). + expect(() => store.savePlan("x", { steps: [{ ...valid, lastError: 123 as never }] })).toThrow("invalid_plan"); + // A well-formed lastError (string, or explicit null) is accepted. + expect(() => store.savePlan("x", { steps: [{ ...valid, lastError: "boom" }] })).not.toThrow(); + expect(() => store.savePlan("y", { steps: [{ ...valid, lastError: null }] })).not.toThrow(); + }); + it("rejects unknown or self-referential dependsOn entries on save", () => { const store = tempStore(); const pendingStep = { id: "a", title: "A", dependsOn: [] as string[], status: "pending" as const, attempts: 0, maxAttempts: 1 }; diff --git a/test/unit/miner-rejection-templates.test.ts b/test/unit/miner-rejection-templates.test.ts index 1ecb4dcc4c..3886f08e19 100644 --- a/test/unit/miner-rejection-templates.test.ts +++ b/test/unit/miner-rejection-templates.test.ts @@ -3,6 +3,7 @@ import { REJECTION_REASONS, containsPrivateLanguage, renderRejectionMessage, + resolvePlaceholders, } from "../../packages/loopover-miner/lib/rejection-templates.js"; const CONTEXT = { repoFullName: "JSONbored/loopover", prNumber: 2751 } as const; @@ -64,4 +65,33 @@ describe("loopover-miner rejection templates (#2324)", () => { "JSONbored/loopover.io_test-1", ); }); + + it("rejects a non-string repoFullName", () => { + for (const bad of [null, undefined, 42, {}]) { + // @ts-expect-error — exercising the runtime guard against a non-string repoFullName + expect(() => renderRejectionMessage("gate_close", { repoFullName: bad, prNumber: 1 })).toThrow( + "invalid_repo_full_name", + ); + } + }); + + describe("resolvePlaceholders (the defense-in-depth guard behind renderRejectionMessage)", () => { + it("renders every placeholder present in values", () => { + expect(resolvePlaceholders("PR #{prNumber} on {repoFullName}", { prNumber: 7, repoFullName: "o/r" })).toBe( + "PR #7 on o/r", + ); + }); + + it("throws missing_placeholder for a template referencing a key values doesn't supply", () => { + expect(() => resolvePlaceholders("Hello {missingKey}", {})).toThrow("missing_placeholder:missingKey"); + }); + + it("throws unresolved_placeholder when a substituted value's own text still looks like a placeholder", () => { + // Not reachable via renderRejectionMessage (GITHUB_FULL_NAME forbids `{`/`}` in repoFullName), but a real + // guard against any future caller of this pure helper that doesn't pre-validate its values the same way. + expect(() => resolvePlaceholders("{repoFullName}", { repoFullName: "{injected}" })).toThrow( + "unresolved_placeholder", + ); + }); + }); });