@oss-autopilot/core 0.49.0 → 0.51.0

package/dist/core/status-determination.js

@@ -0,0 +1,112 @@
+/**
+ * Status determination logic for PRs — extracted from PRMonitor (#263).
+ *
+ * Computes the top-level status (needs_addressing vs waiting_on_maintainer),
+ * granular action/wait reasons, and staleness tier for a single PR based on
+ * its CI, review, merge-conflict, and timeline signals.
+ */
+/**
+ * CI-fix bots that push commits as a direct result of the contributor's push (#568).
+ * Their commits represent contributor work and should count as addressing feedback.
+ * This is intentionally an allowlist — not all `[bot]` accounts are CI-fix bots
+ * (e.g. dependabot[bot] and renovate[bot] open their own PRs).
+ * Values must be lowercase — lookup uses .toLowerCase() for case-insensitive matching.
+ */
+export const CI_FIX_BOTS = new Set(['autofix-ci[bot]', 'prettier-ci[bot]', 'pre-commit-ci[bot]']);
+/** Minimum gap (ms) between maintainer comment and contributor commit for
+ *  the commit to count as "addressing" the feedback (#547). Prevents false
+ *  positives from race conditions, clock skew, and in-flight pushes. */
+export const MIN_RESPONSE_GAP_MS = 2 * 60 * 1000; // 2 minutes
+/**
+ * Check whether the HEAD commit was authored by the contributor (#547).
+ * Returns true when the author matches, when the author is a known CI-fix
+ * bot (#568), or when author info is unavailable (graceful degradation).
+ */
+export function isContributorCommit(commitAuthor, contributorUsername) {
+    if (!commitAuthor || !contributorUsername)
+        return true; // degrade gracefully
+    const author = commitAuthor.toLowerCase();
+    if (CI_FIX_BOTS.has(author))
+        return true; // CI-fix bots act on behalf of the contributor (#568)
+    return author === contributorUsername.toLowerCase();
+}
+/**
+ * Check whether the contributor's commit is meaningfully after the maintainer's
+ * comment — i.e. the commit timestamp is at least MIN_RESPONSE_GAP_MS later (#547).
+ */
+export function isCommitAfterComment(commitDate, commentDate) {
+    const commitMs = new Date(commitDate).getTime();
+    const commentMs = new Date(commentDate).getTime();
+    if (Number.isNaN(commitMs) || Number.isNaN(commentMs)) {
+        // Fall back to simple string comparison (pre-#547 behavior)
+        return commitDate > commentDate;
+    }
+    return commitMs - commentMs >= MIN_RESPONSE_GAP_MS;
+}
+/**
+ * Determine the overall status of a PR based on its signals.
+ */
+export function determineStatus(input) {
+    const { ciStatus, hasMergeConflict, hasUnrespondedComment, hasIncompleteChecklist, reviewDecision, daysSinceActivity, dormantThreshold, approachingThreshold, latestCommitDate: rawCommitDate, latestCommitAuthor, contributorUsername, lastMaintainerCommentDate, latestChangesRequestedDate, hasActionableCIFailure = true, } = input;
+    // Compute staleness tier (independent of status)
+    let stalenessTier = 'active';
+    if (daysSinceActivity >= dormantThreshold)
+        stalenessTier = 'dormant';
+    else if (daysSinceActivity >= approachingThreshold)
+        stalenessTier = 'approaching_dormant';
+    // Only count the latest commit if it was authored by the contributor or a
+    // CI bot (#547, #568). Non-contributor commits (maintainer merge commits,
+    // GitHub suggestion commits) should not mask unaddressed feedback.
+    const latestCommitDate = rawCommitDate && isContributorCommit(latestCommitAuthor, contributorUsername) ? rawCommitDate : undefined;
+    // Priority order: needs_addressing (response/changes/ci/conflict/checklist) > waiting_on_maintainer (review/merge/addressed/ci_blocked)
+    if (hasUnrespondedComment) {
+        // If the contributor pushed a commit after the maintainer's comment,
+        // the changes have been addressed — waiting for maintainer re-review.
+        // Require a minimum 2-minute gap to avoid false positives from race
+        // conditions (pushing while review is being submitted) (#547).
+        if (latestCommitDate &&
+            lastMaintainerCommentDate &&
+            isCommitAfterComment(latestCommitDate, lastMaintainerCommentDate)) {
+            // Safety net (#431): if a CHANGES_REQUESTED review was submitted after
+            // the commit, the maintainer still expects changes — don't mask it
+            if (latestChangesRequestedDate && latestCommitDate < latestChangesRequestedDate) {
+                return { status: 'needs_addressing', actionReason: 'needs_response', stalenessTier };
+            }
+            if (ciStatus === 'failing' && hasActionableCIFailure)
+                return { status: 'needs_addressing', actionReason: 'failing_ci', stalenessTier };
+            // Non-actionable CI failures (infrastructure, fork, auth) don't block changes_addressed —
+            // the contributor can't fix them, so the relevant status is "waiting for re-review" (#502)
+            return { status: 'waiting_on_maintainer', waitReason: 'changes_addressed', stalenessTier };
+        }
+        return { status: 'needs_addressing', actionReason: 'needs_response', stalenessTier };
+    }
+    // Review requested changes but no unresponded comment.
+    // If the latest commit is before the review, the contributor hasn't addressed it yet.
+    if (reviewDecision === 'changes_requested' && latestChangesRequestedDate) {
+        if (!latestCommitDate || latestCommitDate < latestChangesRequestedDate) {
+            return { status: 'needs_addressing', actionReason: 'needs_changes', stalenessTier };
+        }
+        // Commit is after review — changes have been addressed
+        if (ciStatus === 'failing' && hasActionableCIFailure)
+            return { status: 'needs_addressing', actionReason: 'failing_ci', stalenessTier };
+        // Non-actionable CI failures don't block changes_addressed (#502)
+        return { status: 'waiting_on_maintainer', waitReason: 'changes_addressed', stalenessTier };
+    }
+    if (ciStatus === 'failing') {
+        return hasActionableCIFailure
+            ? { status: 'needs_addressing', actionReason: 'failing_ci', stalenessTier }
+            : { status: 'waiting_on_maintainer', waitReason: 'ci_blocked', stalenessTier };
+    }
+    if (hasMergeConflict) {
+        return { status: 'needs_addressing', actionReason: 'merge_conflict', stalenessTier };
+    }
+    if (hasIncompleteChecklist) {
+        return { status: 'needs_addressing', actionReason: 'incomplete_checklist', stalenessTier };
+    }
+    // Approved and CI passing/unknown = waiting on maintainer to merge
+    if (reviewDecision === 'approved' && (ciStatus === 'passing' || ciStatus === 'unknown')) {
+        return { status: 'waiting_on_maintainer', waitReason: 'pending_merge', stalenessTier };
+    }
+    // Default: no actionable issues found. Covers pending CI, no reviews yet, etc.
+    return { status: 'waiting_on_maintainer', waitReason: 'pending_review', stalenessTier };
+}

package/dist/core/types.d.ts

@@ -41,7 +41,7 @@ export interface RepoGroup {
 }
 /** GitHub's pull request review decision (from the reviewDecision GraphQL field). */
 export type ReviewDecision = 'approved' | 'changes_requested' | 'review_required' | 'unknown';
-/** Input options for `PRMonitor.determineStatus()`. */
+/** Input options for `determineStatus()` (see status-determination.ts). */
 export interface DetermineStatusInput {
     ciStatus: CIStatus;
     hasMergeConflict: boolean;
@@ -61,6 +61,13 @@ export interface DetermineStatusInput {
     /** True if at least one failing CI check is classified as 'actionable'. */
     hasActionableCIFailure?: boolean;
 }
+/** Result of `determineStatus()` — the PR's computed status classification. */
+export interface DetermineStatusResult {
+    status: FetchedPRStatus;
+    actionReason?: ActionReason;
+    waitReason?: WaitReason;
+    stalenessTier: StalenessTier;
+}
 /**
  * Granular reason why a PR needs addressing (contributor's turn).
  * Active values (produced by determineStatus): needs_response, needs_changes,
@@ -97,7 +104,7 @@ export interface FetchedPR {
     repo: string;
     number: number;
     title: string;
-    /** Computed by `PRMonitor.determineStatus()` based on the fields below. */
+    /** Computed by `determineStatus()` based on the fields below. */
     status: FetchedPRStatus;
     /** Granular reason for needs_addressing status. Undefined when waiting_on_maintainer. */
     actionReason?: ActionReason;
@@ -414,12 +421,6 @@ export interface LocalRepoCache {
     /** ISO 8601 timestamp of when the scan was performed */
     cachedAt: string;
 }
-/** Metadata for a snoozed PR's CI failure. */
-export interface SnoozeInfo {
-    reason: string;
-    snoozedAt: string;
-    expiresAt: string;
-}
 /** Filter for excluding repos below a minimum star count from PR count queries. */
 export interface StarFilter {
     minStars: number;
@@ -479,12 +480,14 @@ export interface AgentConfig {
     aiPolicyBlocklist?: string[];
     /** PR URLs manually shelved by the user. Shelved PRs are excluded from capacity and actionable issues. Auto-unshelved when maintainers engage. */
     shelvedPRUrls?: string[];
-    /** Issue/PR URLs dismissed by the user, mapped to ISO timestamp of when dismissed. Issues with new responses after the dismiss timestamp resurface automatically. Named dismissedIssues for state backward compatibility (#416). */
+    /** Issue URLs dismissed by the user, mapped to ISO timestamp of when dismissed. Issues with new responses after the dismiss timestamp resurface automatically. */
     dismissedIssues?: Record<string, string>;
-    /** PR URLs with snoozed CI failures, mapped to snooze metadata. Snoozed PRs are excluded from actionable CI failure list until expiry. */
-    snoozedPRs?: Record<string, SnoozeInfo>;
     /** Manual status overrides for PRs. Maps PR URL to override metadata. Auto-clears when the PR has new activity. */
     statusOverrides?: Record<string, StatusOverride>;
+    /** Project categories the user is interested in (e.g., devtools, nonprofit). Used to prioritize search results. */
+    projectCategories?: ProjectCategory[];
+    /** GitHub organizations the user wants to prioritize in issue search. Org names only (not owner/repo). */
+    preferredOrgs?: string[];
 }
 /** Status of a user's comment thread on a GitHub issue. */
 export type IssueConversationStatus = 'new_response' | 'waiting' | 'acknowledged';
@@ -523,7 +526,10 @@ export type CommentedIssue = CommentedIssueWithResponse | CommentedIssueWithoutR
 export declare const DEFAULT_CONFIG: AgentConfig;
 /** Initial state written to `~/.oss-autopilot/state.json` on first run. Uses v2 architecture. */
 export declare const INITIAL_STATE: AgentState;
-export type SearchPriority = 'merged_pr' | 'starred' | 'normal';
+export declare const PROJECT_CATEGORIES: readonly ["nonprofit", "devtools", "infrastructure", "web-frameworks", "data-ml", "education"];
+export type ProjectCategory = (typeof PROJECT_CATEGORIES)[number];
+/** Priority tier for issue search results. Ordered: merged_pr > preferred_org > starred > normal. */
+export type SearchPriority = 'merged_pr' | 'preferred_org' | 'starred' | 'normal';
 export interface IssueCandidate {
     issue: TrackedIssue;
     vettingResult: IssueVettingResult;

package/dist/core/types.js

@@ -28,7 +28,8 @@ export const DEFAULT_CONFIG = {
     aiPolicyBlocklist: ['matplotlib/matplotlib'],
     shelvedPRUrls: [],
     dismissedIssues: {},
-    snoozedPRs: {},
+    projectCategories: [],
+    preferredOrgs: [],
 };
 /** Initial state written to `~/.oss-autopilot/state.json` on first run. Uses v2 architecture. */
 export const INITIAL_STATE = {
@@ -39,3 +40,12 @@ export const INITIAL_STATE = {
     events: [],
     lastRunAt: new Date().toISOString(),
 };
+// -- Project category types --
+export const PROJECT_CATEGORIES = [
+    'nonprofit',
+    'devtools',
+    'infrastructure',
+    'web-frameworks',
+    'data-ml',
+    'education',
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oss-autopilot/core",
-  "version": "0.49.0",
+  "version": "0.51.0",
   "description": "CLI and core library for managing open source contributions",
   "type": "module",
   "bin": {

package/dist/commands/override.d.ts

@@ -1,21 +0,0 @@
-/**
- * Override command
- * Manually override a PR's status (needs_addressing ↔ waiting_on_maintainer).
- * Overrides auto-clear when the PR has new activity.
- */
-import type { FetchedPRStatus } from '../core/types.js';
-export interface OverrideOutput {
-    url: string;
-    status: FetchedPRStatus;
-}
-export interface ClearOverrideOutput {
-    url: string;
-    cleared: boolean;
-}
-export declare function runOverride(options: {
-    prUrl: string;
-    status: string;
-}): Promise<OverrideOutput>;
-export declare function runClearOverride(options: {
-    prUrl: string;
-}): Promise<ClearOverrideOutput>;

package/dist/commands/override.js

@@ -1,35 +0,0 @@
-/**
- * Override command
- * Manually override a PR's status (needs_addressing ↔ waiting_on_maintainer).
- * Overrides auto-clear when the PR has new activity.
- */
-import { getStateManager } from '../core/index.js';
-import { PR_URL_PATTERN, validateGitHubUrl, validateUrl } from './validation.js';
-const VALID_STATUSES = ['needs_addressing', 'waiting_on_maintainer'];
-export async function runOverride(options) {
-    validateUrl(options.prUrl);
-    validateGitHubUrl(options.prUrl, PR_URL_PATTERN, 'PR');
-    if (!VALID_STATUSES.includes(options.status)) {
-        throw new Error(`Invalid status "${options.status}". Must be one of: ${VALID_STATUSES.join(', ')}`);
-    }
-    const status = options.status;
-    const stateManager = getStateManager();
-    // Use current time as lastActivityAt — the CLI doesn't have cached PR data.
-    // This means the override will auto-clear on the next daily run if the PR's
-    // updatedAt is after this timestamp (which is the desired behavior: the override
-    // will persist until new activity occurs on the PR).
-    const lastActivityAt = new Date().toISOString();
-    stateManager.setStatusOverride(options.prUrl, status, lastActivityAt);
-    stateManager.save();
-    return { url: options.prUrl, status };
-}
-export async function runClearOverride(options) {
-    validateUrl(options.prUrl);
-    validateGitHubUrl(options.prUrl, PR_URL_PATTERN, 'PR');
-    const stateManager = getStateManager();
-    const cleared = stateManager.clearStatusOverride(options.prUrl);
-    if (cleared) {
-        stateManager.save();
-    }
-    return { url: options.prUrl, cleared };
-}

package/dist/commands/snooze.d.ts

@@ -1,24 +0,0 @@
-/**
- * Snooze/Unsnooze commands
- * Manages snoozing CI failure notifications for PRs with known upstream/infrastructure issues.
- * Snoozed PRs are excluded from the actionable CI failure list until the snooze expires.
- */
-export interface SnoozeOutput {
-    snoozed: boolean;
-    url: string;
-    days: number;
-    reason: string;
-    expiresAt: string | undefined;
-}
-export interface UnsnoozeOutput {
-    unsnoozed: boolean;
-    url: string;
-}
-export declare function runSnooze(options: {
-    prUrl: string;
-    reason: string;
-    days?: number;
-}): Promise<SnoozeOutput>;
-export declare function runUnsnooze(options: {
-    prUrl: string;
-}): Promise<UnsnoozeOutput>;

package/dist/commands/snooze.js

@@ -1,40 +0,0 @@
-/**
- * Snooze/Unsnooze commands
- * Manages snoozing CI failure notifications for PRs with known upstream/infrastructure issues.
- * Snoozed PRs are excluded from the actionable CI failure list until the snooze expires.
- */
-import { getStateManager } from '../core/index.js';
-import { PR_URL_PATTERN, validateGitHubUrl, validateUrl, validateMessage } from './validation.js';
-const DEFAULT_SNOOZE_DAYS = 7;
-export async function runSnooze(options) {
-    validateUrl(options.prUrl);
-    validateGitHubUrl(options.prUrl, PR_URL_PATTERN, 'PR');
-    validateMessage(options.reason);
-    const days = options.days ?? DEFAULT_SNOOZE_DAYS;
-    if (!Number.isFinite(days) || days <= 0) {
-        throw new Error('Snooze duration must be a positive number of days.');
-    }
-    const stateManager = getStateManager();
-    const added = stateManager.snoozePR(options.prUrl, options.reason, days);
-    if (added) {
-        stateManager.save();
-    }
-    const snoozeInfo = stateManager.getSnoozeInfo(options.prUrl);
-    return {
-        snoozed: added,
-        url: options.prUrl,
-        days,
-        reason: options.reason,
-        expiresAt: snoozeInfo?.expiresAt,
-    };
-}
-export async function runUnsnooze(options) {
-    validateUrl(options.prUrl);
-    validateGitHubUrl(options.prUrl, PR_URL_PATTERN, 'PR');
-    const stateManager = getStateManager();
-    const removed = stateManager.unsnoozePR(options.prUrl);
-    if (removed) {
-        stateManager.save();
-    }
-    return { unsnoozed: removed, url: options.prUrl };
-}