chief-clancy 0.5.6 → 0.5.8

package/dist/scripts/once/fetch-ticket.js

@@ -0,0 +1,59 @@
+import { fetchIssue as fetchGitHubIssue, resolveUsername, } from '../../scripts/board/github/github.js';
+import { buildAuthHeader, fetchTicket as fetchJiraTicket, } from '../../scripts/board/jira/jira.js';
+import { fetchIssue as fetchLinearIssue } from '../../scripts/board/linear/linear.js';
+// ─── Board-specific fetch ────────────────────────────────────────────────────
+export async function fetchTicket(config) {
+    switch (config.provider) {
+        case 'jira': {
+            const { env } = config;
+            const auth = buildAuthHeader(env.JIRA_USER, env.JIRA_API_TOKEN);
+            const ticket = await fetchJiraTicket(env.JIRA_BASE_URL, auth, env.JIRA_PROJECT_KEY, env.CLANCY_JQL_STATUS ?? 'To Do', env.CLANCY_JQL_SPRINT, env.CLANCY_LABEL);
+            if (!ticket)
+                return undefined;
+            const blockerStr = ticket.blockers.length
+                ? `Blocked by: ${ticket.blockers.join(', ')}`
+                : 'None';
+            return {
+                key: ticket.key,
+                title: ticket.title,
+                description: ticket.description,
+                parentInfo: ticket.epicKey ?? 'none',
+                blockers: blockerStr,
+            };
+        }
+        case 'github': {
+            const { env } = config;
+            const username = await resolveUsername(env.GITHUB_TOKEN);
+            const ticket = await fetchGitHubIssue(env.GITHUB_TOKEN, env.GITHUB_REPO, env.CLANCY_LABEL, username);
+            if (!ticket)
+                return undefined;
+            return {
+                key: ticket.key,
+                title: ticket.title,
+                description: ticket.description,
+                parentInfo: ticket.milestone ?? 'none',
+                blockers: 'None',
+            };
+        }
+        case 'linear': {
+            const { env } = config;
+            const ticket = await fetchLinearIssue({
+                LINEAR_API_KEY: env.LINEAR_API_KEY,
+                LINEAR_TEAM_ID: env.LINEAR_TEAM_ID,
+                CLANCY_LABEL: env.CLANCY_LABEL,
+            });
+            if (!ticket)
+                return undefined;
+            return {
+                key: ticket.key,
+                title: ticket.title,
+                description: ticket.description,
+                parentInfo: ticket.parentIdentifier ?? 'none',
+                blockers: 'None',
+                linearIssueId: ticket.issueId,
+                issueId: ticket.issueId,
+            };
+        }
+    }
+}
+//# sourceMappingURL=fetch-ticket.js.map

package/dist/scripts/once/fetch-ticket.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-ticket.js","sourceRoot":"","sources":["../../../src/scripts/once/fetch-ticket.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,IAAI,gBAAgB,EAC9B,eAAe,GAChB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,eAAe,EACf,WAAW,IAAI,eAAe,GAC/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAKlF,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAmB;IAEnB,QAAQ,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;YACvB,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;YAChE,MAAM,MAAM,GAAG,MAAM,eAAe,CAClC,GAAG,CAAC,aAAa,EACjB,IAAI,EACJ,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,iBAAiB,IAAI,OAAO,EAChC,GAAG,CAAC,iBAAiB,EACrB,GAAG,CAAC,YAAY,CACjB,CAAC;YAEF,IAAI,CAAC,MAAM;gBAAE,OAAO,SAAS,CAAC;YAE9B,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM;gBACvC,CAAC,CAAC,eAAe,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC7C,CAAC,CAAC,MAAM,CAAC;YAEX,OAAO;gBACL,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,UAAU,EAAE,MAAM,CAAC,OAAO,IAAI,MAAM;gBACpC,QAAQ,EAAE,UAAU;aACrB,CAAC;QACJ,CAAC;QAED,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACzD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,GAAG,CAAC,YAAY,EAChB,GAAG,CAAC,WAAW,EACf,GAAG,CAAC,YAAY,EAChB,QAAQ,CACT,CAAC;YAEF,IAAI,CAAC,MAAM;gBAAE,OAAO,SAAS,CAAC;YAE9B,OAAO;gBACL,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,UAAU,EAAE,MAAM,CAAC,SAAS,IAAI,MAAM;gBACtC,QAAQ,EAAE,MAAM;aACjB,CAAC;QACJ,CAAC;QAED,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;YACvB,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC;gBACpC,cAAc,EAAE,GAAG,CAAC,cAAc;gBAClC,cAAc,EAAE,GAAG,CAAC,cAAc;gBAClC,YAAY,EAAE,GAAG,CAAC,YAAY;aAC/B,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM;gBAAE,OAAO,SAAS,CAAC;YAE9B,OAAO;gBACL,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,UAAU,EAAE,MAAM,CAAC,gBAAgB,IAAI,MAAM;gBAC7C,QAAQ,EAAE,MAAM;gBAChB,aAAa,EAAE,MAAM,CAAC,OAAO;gBAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;aACxB,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/scripts/once/git-token.d.ts

@@ -0,0 +1,13 @@
+import type { BoardConfig } from '../../scripts/shared/env-schema/env-schema.js';
+import type { RemoteInfo } from '../../types/index.js';
+/**
+ * Resolve a git host token from the board config's env.
+ *
+ * For GitHub boards, `GITHUB_TOKEN` is always present.
+ * For Jira/Linear boards, check the shared optional vars.
+ */
+export declare function resolveGitToken(config: BoardConfig, remote: RemoteInfo): {
+    token: string;
+    username?: string;
+} | undefined;
+//# sourceMappingURL=git-token.d.ts.map

package/dist/scripts/once/git-token.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-token.d.ts","sourceRoot":"","sources":["../../../src/scripts/once/git-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAInD;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,UAAU,GACjB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAmBlD"}

package/dist/scripts/once/git-token.js

@@ -0,0 +1,30 @@
+import { sharedEnv } from './board-ops.js';
+/**
+ * Resolve a git host token from the board config's env.
+ *
+ * For GitHub boards, `GITHUB_TOKEN` is always present.
+ * For Jira/Linear boards, check the shared optional vars.
+ */
+export function resolveGitToken(config, remote) {
+    const env = sharedEnv(config);
+    switch (remote.host) {
+        case 'github':
+            if (env.GITHUB_TOKEN)
+                return { token: env.GITHUB_TOKEN };
+            break;
+        case 'gitlab':
+            if (env.GITLAB_TOKEN)
+                return { token: env.GITLAB_TOKEN };
+            break;
+        case 'bitbucket':
+            if (env.BITBUCKET_USER && env.BITBUCKET_TOKEN)
+                return { token: env.BITBUCKET_TOKEN, username: env.BITBUCKET_USER };
+            break;
+        case 'bitbucket-server':
+            if (env.BITBUCKET_TOKEN)
+                return { token: env.BITBUCKET_TOKEN };
+            break;
+    }
+    return undefined;
+}
+//# sourceMappingURL=git-token.js.map

package/dist/scripts/once/git-token.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-token.js","sourceRoot":"","sources":["../../../src/scripts/once/git-token.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAmB,EACnB,MAAkB;IAElB,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAE9B,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,QAAQ;YACX,IAAI,GAAG,CAAC,YAAY;gBAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC;YACzD,MAAM;QACR,KAAK,QAAQ;YACX,IAAI,GAAG,CAAC,YAAY;gBAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC;YACzD,MAAM;QACR,KAAK,WAAW;YACd,IAAI,GAAG,CAAC,cAAc,IAAI,GAAG,CAAC,eAAe;gBAC3C,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,QAAQ,EAAE,GAAG,CAAC,cAAc,EAAE,CAAC;YACtE,MAAM;QACR,KAAK,kBAAkB;YACrB,IAAI,GAAG,CAAC,eAAe;gBAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC;YAC/D,MAAM;IACV,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/scripts/once/once.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"once.d.ts","sourceRoot":"","sources":["../../../src/scripts/once/once.ts"],"names":[],"mappings":"AAsuBA;;;;;;;;;GASG;AACH,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA2SvD"}
+{"version":3,"file":"once.d.ts","sourceRoot":"","sources":["../../../src/scripts/once/once.ts"],"names":[],"mappings":"AAqDA;;;;;;;;;GASG;AACH,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsUvD"}

package/dist/scripts/once/once.js

@@ -10,431 +10,21 @@
  */
 import { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { closeIssue, fetchIssue as fetchGitHubIssue, isValidRepo, pingGitHub, resolveUsername, } from '../../scripts/board/github/github.js';
-import { buildAuthHeader, fetchTicket as fetchJiraTicket, isSafeJqlValue, pingJira, transitionIssue as transitionJiraIssue, } from '../../scripts/board/jira/jira.js';
-import { fetchIssue as fetchLinearIssue, isValidTeamId, pingLinear, transitionIssue as transitionLinearIssue, } from '../../scripts/board/linear/linear.js';
 import { computeTargetBranch, computeTicketBranch, } from '../../scripts/shared/branch/branch.js';
 import { invokeClaudeSession } from '../../scripts/shared/claude-cli/claude-cli.js';
 import { detectBoard } from '../../scripts/shared/env-schema/env-schema.js';
 import { checkFeasibility } from '../../scripts/shared/feasibility/feasibility.js';
 import { formatDuration } from '../../scripts/shared/format/format.js';
-import { checkout, currentBranch, deleteBranch, ensureBranch, fetchRemoteBranch, pushBranch, squashMerge, } from '../../scripts/shared/git-ops/git-ops.js';
+import { checkout, currentBranch, diffAgainstBranch, ensureBranch, fetchRemoteBranch, } from '../../scripts/shared/git-ops/git-ops.js';
 import { sendNotification } from '../../scripts/shared/notify/notify.js';
 import { runPreflight } from '../../scripts/shared/preflight/preflight.js';
-import { appendProgress, countReworkCycles, findEntriesWithStatus, } from '../../scripts/shared/progress/progress.js';
+import { appendProgress, countReworkCycles, } from '../../scripts/shared/progress/progress.js';
 import { buildPrompt, buildReworkPrompt, } from '../../scripts/shared/prompt/prompt.js';
-import { checkPrReviewState as checkBitbucketPrReviewState, checkServerPrReviewState as checkBitbucketServerPrReviewState, createPullRequest as createBitbucketPr, createServerPullRequest as createBitbucketServerPr, fetchPrReviewComments as fetchBitbucketPrReviewComments, fetchServerPrReviewComments as fetchBitbucketServerPrReviewComments, } from '../../scripts/shared/pull-request/bitbucket/bitbucket.js';
-import { checkPrReviewState as checkGitHubPrReviewState, createPullRequest as createGitHubPr, fetchPrReviewComments as fetchGitHubPrReviewComments, } from '../../scripts/shared/pull-request/github/github.js';
-import { checkMrReviewState as checkGitLabMrReviewState, createMergeRequest as createGitLabMr, fetchMrReviewComments as fetchGitLabMrReviewComments, } from '../../scripts/shared/pull-request/gitlab/gitlab.js';
-import { buildPrBody } from '../../scripts/shared/pull-request/pr-body/pr-body.js';
-import { buildApiBaseUrl, detectRemote, } from '../../scripts/shared/remote/remote.js';
 import { bold, dim, green, red, yellow } from '../../utils/ansi/ansi.js';
-// ─── Helpers ──────────────────────────────────────────────────────────────────
-/** Type-safe access to shared env vars across all board configs. */
-function sharedEnv(config) {
-    return config.env;
-}
-// ─── Board-specific fetch ────────────────────────────────────────────────────
-async function fetchTicket(config) {
-    switch (config.provider) {
-        case 'jira': {
-            const { env } = config;
-            const auth = buildAuthHeader(env.JIRA_USER, env.JIRA_API_TOKEN);
-            const ticket = await fetchJiraTicket(env.JIRA_BASE_URL, auth, env.JIRA_PROJECT_KEY, env.CLANCY_JQL_STATUS ?? 'To Do', env.CLANCY_JQL_SPRINT, env.CLANCY_LABEL);
-            if (!ticket)
-                return undefined;
-            const blockerStr = ticket.blockers.length
-                ? `Blocked by: ${ticket.blockers.join(', ')}`
-                : 'None';
-            return {
-                key: ticket.key,
-                title: ticket.title,
-                description: ticket.description,
-                parentInfo: ticket.epicKey ?? 'none',
-                blockers: blockerStr,
-            };
-        }
-        case 'github': {
-            const { env } = config;
-            const username = await resolveUsername(env.GITHUB_TOKEN);
-            const ticket = await fetchGitHubIssue(env.GITHUB_TOKEN, env.GITHUB_REPO, env.CLANCY_LABEL, username);
-            if (!ticket)
-                return undefined;
-            return {
-                key: ticket.key,
-                title: ticket.title,
-                description: ticket.description,
-                parentInfo: ticket.milestone ?? 'none',
-                blockers: 'None',
-            };
-        }
-        case 'linear': {
-            const { env } = config;
-            const ticket = await fetchLinearIssue({
-                LINEAR_API_KEY: env.LINEAR_API_KEY,
-                LINEAR_TEAM_ID: env.LINEAR_TEAM_ID,
-                CLANCY_LABEL: env.CLANCY_LABEL,
-            });
-            if (!ticket)
-                return undefined;
-            return {
-                key: ticket.key,
-                title: ticket.title,
-                description: ticket.description,
-                parentInfo: ticket.parentIdentifier ?? 'none',
-                blockers: 'None',
-                linearIssueId: ticket.issueId,
-                issueId: ticket.issueId,
-            };
-        }
-    }
-}
-// ─── PR-based rework detection ────────────────────────────────────────────────
-/**
- * Check open PRs for review feedback requesting changes.
- *
- * Scans progress.txt for tickets with status PR_CREATED, then checks
- * the corresponding PR's review state on the detected remote platform.
- * If a reviewer has requested changes, returns the ticket and feedback.
- *
- * This is best-effort — errors are swallowed so the orchestrator
- * can fall through to fresh ticket fetch.
- */
-async function fetchReworkFromPrReview(config) {
-    const prCreated = findEntriesWithStatus(process.cwd(), 'PR_CREATED');
-    const reworked = findEntriesWithStatus(process.cwd(), 'REWORK');
-    const candidates = [...prCreated, ...reworked];
-    if (candidates.length === 0)
-        return undefined;
-    const platformOverride = sharedEnv(config).CLANCY_GIT_PLATFORM;
-    const remote = detectRemote(platformOverride);
-    if (remote.host === 'none' ||
-        remote.host === 'unknown' ||
-        remote.host === 'azure') {
-        return undefined;
-    }
-    const creds = resolveGitToken(config, remote);
-    if (!creds)
-        return undefined;
-    const apiBase = buildApiBaseUrl(remote, sharedEnv(config).CLANCY_GIT_API_URL);
-    if (!apiBase)
-        return undefined;
-    // Limit to first 5 candidates to avoid rate limits
-    const toCheck = candidates.slice(0, 5);
-    for (const entry of toCheck) {
-        const branch = computeTicketBranch(config.provider, entry.key);
-        // Convert progress timestamp (YYYY-MM-DD HH:MM) to ISO 8601 for API filtering.
-        // Only comments created AFTER this timestamp should trigger rework,
-        // preventing stale inline comments from causing infinite rework loops.
-        // Parse local timestamp (YYYY-MM-DD HH:MM) and convert to ISO 8601.
-        // Falls back to undefined if timestamp is invalid (skips filtering).
-        let since;
-        if (entry.timestamp) {
-            const date = new Date(entry.timestamp.replace(' ', 'T'));
-            since = Number.isNaN(date.getTime()) ? undefined : date.toISOString();
-        }
-        let reviewState;
-        switch (remote.host) {
-            case 'github':
-                reviewState = await checkGitHubPrReviewState(creds.token, `${remote.owner}/${remote.repo}`, branch, remote.owner, apiBase, since);
-                break;
-            case 'gitlab':
-                reviewState = await checkGitLabMrReviewState(creds.token, apiBase, remote.projectPath, branch, since);
-                break;
-            case 'bitbucket':
-                reviewState = await checkBitbucketPrReviewState(creds.username, creds.token, remote.workspace, remote.repoSlug, branch, since);
-                break;
-            case 'bitbucket-server':
-                reviewState = await checkBitbucketServerPrReviewState(creds.token, apiBase, remote.projectKey, remote.repoSlug, branch, since);
-                break;
-        }
-        if (reviewState?.changesRequested) {
-            // Fetch review comments for the PR
-            let feedback = [];
-            switch (remote.host) {
-                case 'github':
-                    feedback = await fetchGitHubPrReviewComments(creds.token, `${remote.owner}/${remote.repo}`, reviewState.prNumber, apiBase, since);
-                    break;
-                case 'gitlab':
-                    feedback = await fetchGitLabMrReviewComments(creds.token, apiBase, remote.projectPath, reviewState.prNumber, since);
-                    break;
-                case 'bitbucket':
-                    feedback = await fetchBitbucketPrReviewComments(creds.username, creds.token, remote.workspace, remote.repoSlug, reviewState.prNumber, since);
-                    break;
-                case 'bitbucket-server':
-                    feedback = await fetchBitbucketServerPrReviewComments(creds.token, apiBase, remote.projectKey, remote.repoSlug, reviewState.prNumber, since);
-                    break;
-            }
-            const ticket = {
-                key: entry.key,
-                title: entry.summary,
-                description: '',
-                parentInfo: 'none',
-                blockers: 'None',
-            };
-            return { ticket, feedback, prNumber: reviewState.prNumber };
-        }
-    }
-    return undefined;
-}
-// ─── Board-specific ping ─────────────────────────────────────────────────────
-async function pingBoard(config) {
-    switch (config.provider) {
-        case 'jira': {
-            const { env } = config;
-            const auth = buildAuthHeader(env.JIRA_USER, env.JIRA_API_TOKEN);
-            return pingJira(env.JIRA_BASE_URL, env.JIRA_PROJECT_KEY, auth);
-        }
-        case 'github':
-            return pingGitHub(config.env.GITHUB_TOKEN, config.env.GITHUB_REPO);
-        case 'linear':
-            return pingLinear(config.env.LINEAR_API_KEY);
-    }
-}
-// ─── Board-specific validation ───────────────────────────────────────────────
-function validateInputs(config) {
-    switch (config.provider) {
-        case 'jira': {
-            const { env } = config;
-            if (!isSafeJqlValue(env.JIRA_PROJECT_KEY)) {
-                return '✗ JIRA_PROJECT_KEY contains invalid characters';
-            }
-            if (env.CLANCY_LABEL && !isSafeJqlValue(env.CLANCY_LABEL)) {
-                return '✗ CLANCY_LABEL contains invalid characters';
-            }
-            if (env.CLANCY_JQL_STATUS && !isSafeJqlValue(env.CLANCY_JQL_STATUS)) {
-                return '✗ CLANCY_JQL_STATUS contains invalid characters';
-            }
-            return undefined;
-        }
-        case 'github': {
-            if (!isValidRepo(config.env.GITHUB_REPO)) {
-                return '✗ GITHUB_REPO format is invalid — expected owner/repo';
-            }
-            return undefined;
-        }
-        case 'linear': {
-            if (!isValidTeamId(config.env.LINEAR_TEAM_ID)) {
-                return '✗ LINEAR_TEAM_ID contains invalid characters';
-            }
-            return undefined;
-        }
-    }
-}
-// ─── Board-specific transitions ──────────────────────────────────────────────
-async function transitionToStatus(config, ticket, statusName) {
-    switch (config.provider) {
-        case 'jira': {
-            const { env } = config;
-            const auth = buildAuthHeader(env.JIRA_USER, env.JIRA_API_TOKEN);
-            const issueKey = ticket.key;
-            const ok = await transitionJiraIssue(env.JIRA_BASE_URL, auth, issueKey, statusName);
-            if (ok)
-                console.log(`  → Transitioned to ${statusName}`);
-            break;
-        }
-        case 'github': {
-            // GitHub Issues only has open/closed — status transitions not applicable
-            // closeIssue is called separately after merge
-            break;
-        }
-        case 'linear': {
-            const { env } = config;
-            if (!ticket.linearIssueId)
-                break;
-            const ok = await transitionLinearIssue(env.LINEAR_API_KEY, env.LINEAR_TEAM_ID, ticket.linearIssueId, statusName);
-            if (ok)
-                console.log(`  → Transitioned to ${statusName}`);
-            break;
-        }
-    }
-}
-// ─── PR/MR creation ──────────────────────────────────────────────────────────
-/**
- * Resolve a git host token from the board config's env.
- *
- * For GitHub boards, `GITHUB_TOKEN` is always present.
- * For Jira/Linear boards, check the shared optional vars.
- */
-function resolveGitToken(config, remote) {
-    const env = sharedEnv(config);
-    switch (remote.host) {
-        case 'github':
-            if (env.GITHUB_TOKEN)
-                return { token: env.GITHUB_TOKEN };
-            break;
-        case 'gitlab':
-            if (env.GITLAB_TOKEN)
-                return { token: env.GITLAB_TOKEN };
-            break;
-        case 'bitbucket':
-            if (env.BITBUCKET_USER && env.BITBUCKET_TOKEN)
-                return { token: env.BITBUCKET_TOKEN, username: env.BITBUCKET_USER };
-            break;
-        case 'bitbucket-server':
-            if (env.BITBUCKET_TOKEN)
-                return { token: env.BITBUCKET_TOKEN };
-            break;
-    }
-    return undefined;
-}
-/**
- * Attempt to create a PR/MR on the detected remote platform.
- */
-async function attemptPrCreation(config, remote, ticketBranch, targetBranch, title, body) {
-    const creds = resolveGitToken(config, remote);
-    if (!creds)
-        return undefined;
-    const apiBase = buildApiBaseUrl(remote, sharedEnv(config).CLANCY_GIT_API_URL);
-    if (!apiBase)
-        return undefined;
-    switch (remote.host) {
-        case 'github':
-            return createGitHubPr(creds.token, `${remote.owner}/${remote.repo}`, ticketBranch, targetBranch, title, body, apiBase);
-        case 'gitlab':
-            return createGitLabMr(creds.token, apiBase, remote.projectPath, ticketBranch, targetBranch, title, body);
-        case 'bitbucket':
-            return createBitbucketPr(creds.username, creds.token, remote.workspace, remote.repoSlug, ticketBranch, targetBranch, title, body);
-        case 'bitbucket-server':
-            return createBitbucketServerPr(creds.token, apiBase, remote.projectKey, remote.repoSlug, ticketBranch, targetBranch, title, body);
-        default:
-            return undefined;
-    }
-}
-/**
- * Build a manual PR/MR URL for the user to click.
- */
-function buildManualPrUrl(remote, ticketBranch, targetBranch) {
-    const encodedTicket = encodeURIComponent(ticketBranch);
-    const encodedTarget = encodeURIComponent(targetBranch);
-    if (remote.host === 'github') {
-        return `https://${remote.hostname}/${remote.owner}/${remote.repo}/compare/${encodedTarget}...${encodedTicket}`;
-    }
-    if (remote.host === 'gitlab') {
-        return `https://${remote.hostname}/${remote.projectPath}/-/merge_requests/new?merge_request[source_branch]=${encodedTicket}&merge_request[target_branch]=${encodedTarget}`;
-    }
-    if (remote.host === 'bitbucket') {
-        return `https://${remote.hostname}/${remote.workspace}/${remote.repoSlug}/pull-requests/new?source=${encodedTicket}&dest=${encodedTarget}`;
-    }
-    return undefined;
-}
-// ─── Delivery paths ──────────────────────────────────────────────────────────
-/**
- * Epic/parent flow: squash merge locally, delete branch, transition to Done.
- */
-async function deliverViaEpicMerge(config, ticket, ticketBranch, targetBranch) {
-    checkout(targetBranch);
-    const commitMsg = `feat(${ticket.key}): ${ticket.title}`;
-    const hadChanges = squashMerge(ticketBranch, commitMsg);
-    if (!hadChanges) {
-        console.log(yellow('⚠ No changes staged after squash merge. Claude may not have committed any work.'));
-    }
-    deleteBranch(ticketBranch);
-    // Transition to Done / close issue (best-effort)
-    const statusDone = config.env.CLANCY_STATUS_DONE;
-    if (config.provider === 'github') {
-        const issueNumber = parseInt(ticket.key.replace('#', ''), 10);
-        if (Number.isNaN(issueNumber)) {
-            console.log(`⚠ Could not parse issue number from ${ticket.key}. Close it manually on GitHub.`);
-        }
-        else {
-            const closed = await closeIssue(config.env.GITHUB_TOKEN, config.env.GITHUB_REPO, issueNumber);
-            if (!closed) {
-                console.log(`⚠ Could not close issue ${ticket.key}. Close it manually on GitHub.`);
-            }
-        }
-    }
-    else if (statusDone) {
-        await transitionToStatus(config, ticket, statusDone);
-    }
-    appendProgress(process.cwd(), ticket.key, ticket.title, 'DONE');
-}
-/**
- * PR flow: push branch to remote, create PR/MR, transition to In Review.
- *
- * @returns `false` if the push failed (caller should handle early return).
- */
-async function deliverViaPullRequest(config, ticket, ticketBranch, targetBranch, startTime) {
-    const pushed = pushBranch(ticketBranch);
-    if (!pushed) {
-        console.log(yellow(`⚠ Could not push ${ticketBranch} to origin.`));
-        console.log(dim('  The branch is still available locally. Push manually:'));
-        console.log(dim(`  git push -u origin ${ticketBranch}`));
-        appendProgress(process.cwd(), ticket.key, ticket.title, 'PUSH_FAILED');
-        checkout(targetBranch);
-        const elapsed = formatDuration(Date.now() - startTime);
-        console.log('');
-        console.log(yellow(`⚠ ${ticket.key} implemented but push failed`) +
-            dim(` (${elapsed})`));
-        return false;
-    }
-    console.log(green(`  ✓ Pushed ${ticketBranch}`));
-    // Attempt PR/MR creation
-    const platformOverride = sharedEnv(config).CLANCY_GIT_PLATFORM;
-    const remote = detectRemote(platformOverride);
-    const prTitle = `feat(${ticket.key}): ${ticket.title}`;
-    const prBody = buildPrBody(config, {
-        key: ticket.key,
-        title: ticket.title,
-        description: ticket.description,
-        provider: config.provider,
-    });
-    if (remote.host !== 'none' &&
-        remote.host !== 'unknown' &&
-        remote.host !== 'azure') {
-        const pr = await attemptPrCreation(config, remote, ticketBranch, targetBranch, prTitle, prBody);
-        if (pr?.ok) {
-            console.log(green(`  ✓ PR created: ${pr.url}`));
-            appendProgress(process.cwd(), ticket.key, ticket.title, 'PR_CREATED');
-        }
-        else if (pr && !pr.ok && pr.alreadyExists) {
-            console.log(yellow(`  ⚠ A PR/MR already exists for ${ticketBranch}. Branch pushed.`));
-            appendProgress(process.cwd(), ticket.key, ticket.title, 'PUSHED');
-        }
-        else if (pr && !pr.ok) {
-            console.log(yellow(`  ⚠ PR/MR creation failed: ${pr.error}`));
-            const manualUrl = buildManualPrUrl(remote, ticketBranch, targetBranch);
-            if (manualUrl) {
-                console.log(dim(`  Create one manually: ${manualUrl}`));
-            }
-            else {
-                console.log(dim('  Branch pushed — create a PR/MR manually.'));
-            }
-            appendProgress(process.cwd(), ticket.key, ticket.title, 'PUSHED');
-        }
-        else {
-            // No token available for this platform
-            const manualUrl = buildManualPrUrl(remote, ticketBranch, targetBranch);
-            if (manualUrl) {
-                console.log(dim(`  Create a PR: ${manualUrl}`));
-            }
-            else {
-                console.log(dim('  Branch pushed to remote. Create a PR/MR manually.'));
-            }
-            appendProgress(process.cwd(), ticket.key, ticket.title, 'PUSHED');
-        }
-    }
-    else if (remote.host === 'none') {
-        console.log(yellow(`⚠ No git remote configured. Branch available locally: ${ticketBranch}`));
-        appendProgress(process.cwd(), ticket.key, ticket.title, 'LOCAL');
-    }
-    else {
-        // Unknown or Azure remote — just note the push
-        console.log(dim('  Branch pushed to remote. Create a PR/MR manually.'));
-        appendProgress(process.cwd(), ticket.key, ticket.title, 'PUSHED');
-    }
-    // Transition to In Review (not Done — PR hasn't been merged yet)
-    // For GitHub Issues: do NOT close — PR body has "Closes #N" for auto-close on merge
-    if (config.provider !== 'github') {
-        const statusReview = config.env.CLANCY_STATUS_REVIEW ?? config.env.CLANCY_STATUS_DONE;
-        if (statusReview) {
-            await transitionToStatus(config, ticket, statusReview);
-        }
-    }
-    // Switch back to target branch
-    checkout(targetBranch);
-    return true;
-}
+import { pingBoard, sharedEnv, transitionToStatus, validateInputs, } from './board-ops.js';
+import { deliverViaEpicMerge, deliverViaPullRequest } from './deliver.js';
+import { fetchTicket } from './fetch-ticket.js';
+import { fetchReworkFromPrReview, postReworkActions } from './rework.js';
 // ─── Main orchestrator ───────────────────────────────────────────────────────
 /**
  * Run the once orchestrator — full ticket lifecycle.
@@ -489,6 +79,9 @@ export async function run(argv) {
         // 5. Check rework — PR-based detection, then fresh ticket
         let isRework = false;
         let prFeedback;
+        let reworkPrNumber;
+        let reworkDiscussionIds;
+        let reworkReviewers;
         let ticket;
         // PR-based rework (automatic, no config needed)
         try {
@@ -497,6 +90,9 @@ export async function run(argv) {
                 isRework = true;
                 ticket = prRework.ticket;
                 prFeedback = prRework.feedback;
+                reworkPrNumber = prRework.prNumber;
+                reworkDiscussionIds = prRework.discussionIds;
+                reworkReviewers = prRework.reviewers;
                 console.log(yellow(`  ↻ PR rework: [${ticket.key}] ${ticket.title}`));
             }
         }
@@ -609,7 +205,7 @@ export async function run(argv) {
                 description: ticket.description,
                 provider: config.provider,
                 feedbackComments: prFeedback ?? [],
-                previousContext: undefined, // V1: no diff context yet
+                previousContext: diffAgainstBranch(targetBranch),
             });
         }
         else {
@@ -631,11 +227,17 @@ export async function run(argv) {
         const hasParent = ticket.parentInfo !== 'none';
         if (isRework) {
             // PR-flow rework: push to existing branch, PR updates automatically
-            const delivered = await deliverViaPullRequest(config, ticket, ticketBranch, targetBranch, startTime);
-            if (!delivered)
+            const delivered = await deliverViaPullRequest(config, ticket, ticketBranch, targetBranch, startTime, true);
+            if (!delivered) {
+                appendProgress(process.cwd(), ticket.key, ticket.title, 'PUSH_FAILED');
                 return;
-            // Override progress to REWORK (deliverViaPullRequest logs PR_CREATED/PUSHED)
-            appendProgress(process.cwd(), ticket.key, ticket.title, 'REWORK');
+            }
+            // Log single REWORK entry (skipLog prevents deliverViaPullRequest from double-logging)
+            appendProgress(process.cwd(), ticket.key, ticket.title, 'REWORK', reworkPrNumber);
+            // Post-rework actions (all best-effort)
+            if (reworkPrNumber != null) {
+                await postReworkActions(config, reworkPrNumber, prFeedback ?? [], reworkDiscussionIds, reworkReviewers);
+            }
         }
         else if (hasParent) {
             await deliverViaEpicMerge(config, ticket, ticketBranch, targetBranch);