@pennyfarthing/core 7.0.2 → 7.4.1

package/pennyfarthing-dist/scripts/jira/jira-bidirectional-sync.test.mjs

@@ -0,0 +1,503 @@
+#!/usr/bin/env node
+/**
+ * jira-bidirectional-sync.test.mjs - Tests for bidirectional Jira sync
+ *
+ * Story: MSSCI-11842
+ * TDD Phase: RED
+ *
+ * Run with: node --test pennyfarthing-dist/scripts/utils/jira/jira-bidirectional-sync.test.mjs
+ */
+
+import { describe, it, beforeEach, afterEach, mock } from 'node:test';
+import assert from 'node:assert';
+
+// The module under test (will be created by Dev)
+// import { ... } from './jira-bidirectional-sync.mjs';
+
+// For now, import from jira-lib.mjs to test helper functions
+import {
+  mapStatusToJira,
+  mapJiraToStatus,
+  extractJiraKey
+} from './jira-lib.mjs';
+
+// =============================================================================
+// Test Fixtures
+// =============================================================================
+
+/**
+ * Sample YAML story data (as parsed from sprint YAML)
+ */
+const sampleYamlStories = [
+  {
+    id: 'MSSCI-11842',
+    title: 'Bidirectional sync script',
+    status: 'in_progress',
+    points: 4,
+    priority: 'P2'
+  },
+  {
+    id: 'MSSCI-11843',
+    title: 'Document Jira auto-creation',
+    status: 'backlog',
+    points: 2,
+    priority: 'P2'
+  },
+  {
+    id: 'MSSCI-11844',
+    title: 'YAML-only story',
+    status: 'backlog',
+    points: 3,
+    priority: 'P3'
+  }
+];
+
+/**
+ * Sample Jira story data (as returned from Jira API)
+ */
+const sampleJiraStories = [
+  {
+    key: 'MSSCI-11842',
+    fields: {
+      summary: 'Bidirectional sync script',
+      status: { name: 'In Progress' },
+      customfield_10031: 4, // Story points
+      priority: { name: 'Medium' }
+    }
+  },
+  {
+    key: 'MSSCI-11843',
+    fields: {
+      summary: 'Document Jira auto-creation',
+      status: { name: 'Done' }, // Different from YAML!
+      customfield_10031: 2,
+      priority: { name: 'Medium' }
+    }
+  },
+  {
+    key: 'MSSCI-11850',
+    fields: {
+      summary: 'Jira-only story',
+      status: { name: 'To Do' },
+      customfield_10031: 5,
+      priority: { name: 'High' }
+    }
+  }
+];
+
+// =============================================================================
+// AC1: Script syncs status changes both directions
+// =============================================================================
+
+describe('AC1: Bidirectional status sync', () => {
+
+  describe('YAML → Jira direction', () => {
+
+    it('should detect when YAML status differs from Jira status', async () => {
+      // Import the function that will be implemented
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {
+        syncStatus: true
+      });
+
+      // MSSCI-11843: YAML=backlog, Jira=Done
+      const story11843 = plan.changes.find(c => c.key === 'MSSCI-11843');
+      assert.ok(story11843, 'Should detect status difference for MSSCI-11843');
+      assert.strictEqual(story11843.yamlStatus, 'backlog');
+      assert.strictEqual(story11843.jiraStatus, 'Done');
+    });
+
+    it('should generate Jira update action when YAML is source of truth', async () => {
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {
+        syncStatus: true,
+        direction: 'yaml-to-jira'
+      });
+
+      const story11843 = plan.changes.find(c => c.key === 'MSSCI-11843');
+      assert.ok(story11843);
+      assert.strictEqual(story11843.action, 'update-jira');
+      assert.strictEqual(story11843.targetStatus, 'To Do'); // backlog maps to To Do
+    });
+
+  });
+
+  describe('Jira → YAML direction', () => {
+
+    it('should generate YAML update action when Jira is source of truth', async () => {
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {
+        syncStatus: true,
+        direction: 'jira-to-yaml'
+      });
+
+      const story11843 = plan.changes.find(c => c.key === 'MSSCI-11843');
+      assert.ok(story11843);
+      assert.strictEqual(story11843.action, 'update-yaml');
+      assert.strictEqual(story11843.targetStatus, 'done'); // Done maps to done
+    });
+
+    it('should correctly map Jira status to YAML status', () => {
+      // Test existing helper function
+      assert.strictEqual(mapJiraToStatus('To Do'), 'backlog');
+      assert.strictEqual(mapJiraToStatus('In Progress'), 'in-progress');
+      assert.strictEqual(mapJiraToStatus('Done'), 'done');
+      assert.strictEqual(mapJiraToStatus('In Review'), 'review');
+    });
+
+  });
+
+  describe('Bidirectional conflict detection', () => {
+
+    it('should detect conflicts when both systems changed', async () => {
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      // Simulate scenario where timestamps indicate both changed
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {
+        syncStatus: true,
+        direction: 'bidirectional',
+        lastSyncTime: new Date('2026-01-17T00:00:00Z')
+      });
+
+      const conflicts = plan.conflicts || [];
+      // Should identify potential conflicts for manual resolution
+      assert.ok(Array.isArray(conflicts));
+    });
+
+    it('should use Jira as default winner on conflict', async () => {
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {
+        syncStatus: true,
+        direction: 'bidirectional'
+        // No yamlWins flag, so Jira should win
+      });
+
+      // Default: Jira wins conflicts
+      const story11843 = plan.changes.find(c => c.key === 'MSSCI-11843');
+      if (story11843) {
+        assert.strictEqual(story11843.action, 'update-yaml');
+      }
+    });
+
+    it('should use YAML as winner when --yaml-wins flag is set', async () => {
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {
+        syncStatus: true,
+        direction: 'bidirectional',
+        yamlWins: true
+      });
+
+      const story11843 = plan.changes.find(c => c.key === 'MSSCI-11843');
+      if (story11843) {
+        assert.strictEqual(story11843.action, 'update-jira');
+      }
+    });
+
+  });
+
+});
+
+// =============================================================================
+// AC2: Points updated in Jira match sprint YAML
+// =============================================================================
+
+describe('AC2: Story points sync', () => {
+
+  it('should detect when YAML points differ from Jira points', async () => {
+    const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+    // Create test data with mismatched points
+    const yamlWithDifferentPoints = [
+      { id: 'MSSCI-11842', status: 'in_progress', points: 5 } // YAML says 5
+    ];
+    const jiraWithDifferentPoints = [
+      { key: 'MSSCI-11842', fields: { status: { name: 'In Progress' }, customfield_10031: 4 } } // Jira says 4
+    ];
+
+    const plan = generateSyncPlan(yamlWithDifferentPoints, jiraWithDifferentPoints, {
+      syncPoints: true
+    });
+
+    const pointsChange = plan.changes.find(c => c.key === 'MSSCI-11842' && c.field === 'points');
+    assert.ok(pointsChange, 'Should detect points difference');
+    assert.strictEqual(pointsChange.yamlPoints, 5);
+    assert.strictEqual(pointsChange.jiraPoints, 4);
+  });
+
+  it('should sync points from YAML to Jira', async () => {
+    const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+    const yamlStories = [{ id: 'MSSCI-11842', status: 'backlog', points: 8 }];
+    const jiraStories = [{ key: 'MSSCI-11842', fields: { status: { name: 'To Do' }, customfield_10031: 5 } }];
+
+    const plan = generateSyncPlan(yamlStories, jiraStories, {
+      syncPoints: true,
+      direction: 'yaml-to-jira'
+    });
+
+    const change = plan.changes.find(c => c.field === 'points');
+    assert.ok(change);
+    assert.strictEqual(change.action, 'update-jira');
+    assert.strictEqual(change.targetPoints, 8);
+  });
+
+  it('should sync points from Jira to YAML', async () => {
+    const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+    const yamlStories = [{ id: 'MSSCI-11842', status: 'backlog', points: 3 }];
+    const jiraStories = [{ key: 'MSSCI-11842', fields: { status: { name: 'To Do' }, customfield_10031: 5 } }];
+
+    const plan = generateSyncPlan(yamlStories, jiraStories, {
+      syncPoints: true,
+      direction: 'jira-to-yaml'
+    });
+
+    const change = plan.changes.find(c => c.field === 'points');
+    assert.ok(change);
+    assert.strictEqual(change.action, 'update-yaml');
+    assert.strictEqual(change.targetPoints, 5);
+  });
+
+  it('should not generate change when points match', async () => {
+    const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+    const yamlStories = [{ id: 'MSSCI-11842', status: 'backlog', points: 4 }];
+    const jiraStories = [{ key: 'MSSCI-11842', fields: { status: { name: 'To Do' }, customfield_10031: 4 } }];
+
+    const plan = generateSyncPlan(yamlStories, jiraStories, {
+      syncPoints: true
+    });
+
+    const pointsChange = plan.changes.find(c => c.key === 'MSSCI-11842' && c.field === 'points');
+    assert.ok(!pointsChange, 'Should not generate change when points match');
+  });
+
+});
+
+// =============================================================================
+// AC3: New stories in either system detected
+// =============================================================================
+
+describe('AC3: Detect new stories in either system', () => {
+
+  describe('YAML-only stories', () => {
+
+    it('should detect stories in YAML but not in Jira', async () => {
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {});
+
+      // MSSCI-11844 is in YAML but not in Jira fixtures
+      assert.ok(plan.yamlOnly, 'Plan should have yamlOnly array');
+      assert.ok(plan.yamlOnly.includes('MSSCI-11844'), 'Should detect MSSCI-11844 as YAML-only');
+    });
+
+    it('should report YAML-only stories for potential Jira creation', async () => {
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {
+        reportMissing: true
+      });
+
+      const yamlOnlyReport = plan.reports?.yamlOnly || [];
+      assert.ok(yamlOnlyReport.length > 0, 'Should report YAML-only stories');
+    });
+
+  });
+
+  describe('Jira-only stories', () => {
+
+    it('should detect stories in Jira but not in YAML', async () => {
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {});
+
+      // MSSCI-11850 is in Jira but not in YAML fixtures
+      assert.ok(plan.jiraOnly, 'Plan should have jiraOnly array');
+      assert.ok(plan.jiraOnly.includes('MSSCI-11850'), 'Should detect MSSCI-11850 as Jira-only');
+    });
+
+    it('should report Jira-only stories for potential YAML import', async () => {
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {
+        reportMissing: true
+      });
+
+      const jiraOnlyReport = plan.reports?.jiraOnly || [];
+      assert.ok(jiraOnlyReport.length > 0, 'Should report Jira-only stories');
+    });
+
+  });
+
+  describe('Stories in both systems', () => {
+
+    it('should identify stories present in both systems', async () => {
+      const { generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+      const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {});
+
+      assert.ok(plan.both, 'Plan should have both array');
+      // MSSCI-11842 and MSSCI-11843 are in both
+      assert.ok(plan.both.includes('MSSCI-11842'));
+      assert.ok(plan.both.includes('MSSCI-11843'));
+    });
+
+  });
+
+});
+
+// =============================================================================
+// AC4: Dry-run mode shows changes before applying
+// =============================================================================
+
+describe('AC4: Dry-run mode', () => {
+
+  it('should generate plan without executing changes in dry-run mode', async () => {
+    const { executeSyncPlan, generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+    const plan = generateSyncPlan(sampleYamlStories, sampleJiraStories, {
+      syncStatus: true,
+      syncPoints: true
+    });
+
+    // Execute with dry-run
+    const result = await executeSyncPlan(plan, { dryRun: true });
+
+    assert.ok(result.dryRun, 'Result should indicate dry-run mode');
+    assert.ok(result.wouldApply, 'Result should list what would be applied');
+    assert.strictEqual(result.applied, 0, 'Should not apply any changes');
+  });
+
+  it('should display planned changes in human-readable format', async () => {
+    const { formatSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+    const plan = {
+      changes: [
+        { key: 'MSSCI-11843', field: 'status', action: 'update-yaml', targetStatus: 'done' }
+      ],
+      yamlOnly: ['MSSCI-11844'],
+      jiraOnly: ['MSSCI-11850'],
+      both: ['MSSCI-11842', 'MSSCI-11843']
+    };
+
+    const output = formatSyncPlan(plan);
+
+    assert.ok(typeof output === 'string', 'Should return string output');
+    assert.ok(output.includes('MSSCI-11843'), 'Should include story keys');
+    assert.ok(output.includes('status'), 'Should include field names');
+  });
+
+  it('should not modify YAML file in dry-run mode', async () => {
+    const { executeSyncPlan, generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+    // This test verifies no file writes happen
+    const plan = generateSyncPlan(
+      [{ id: 'MSSCI-11842', status: 'backlog', points: 4 }],
+      [{ key: 'MSSCI-11842', fields: { status: { name: 'Done' }, customfield_10031: 4 } }],
+      { syncStatus: true, direction: 'jira-to-yaml' }
+    );
+
+    const result = await executeSyncPlan(plan, { dryRun: true });
+
+    assert.ok(result.dryRun);
+    assert.strictEqual(result.yamlModified, false, 'YAML should not be modified');
+  });
+
+  it('should not call Jira API in dry-run mode', async () => {
+    const { executeSyncPlan, generateSyncPlan } = await import('./jira-bidirectional-sync.mjs');
+
+    const plan = generateSyncPlan(
+      [{ id: 'MSSCI-11842', status: 'done', points: 4 }],
+      [{ key: 'MSSCI-11842', fields: { status: { name: 'To Do' }, customfield_10031: 4 } }],
+      { syncStatus: true, direction: 'yaml-to-jira' }
+    );
+
+    const result = await executeSyncPlan(plan, { dryRun: true });
+
+    assert.ok(result.dryRun);
+    assert.strictEqual(result.jiraApiCalls, 0, 'Should not make Jira API calls');
+  });
+
+});
+
+// =============================================================================
+// Integration: CLI argument parsing
+// =============================================================================
+
+describe('CLI argument parsing', () => {
+
+  it('should parse --dry-run flag', async () => {
+    const { parseCliArgs } = await import('./jira-bidirectional-sync.mjs');
+
+    const args = parseCliArgs(['--dry-run']);
+    assert.strictEqual(args.dryRun, true);
+  });
+
+  it('should parse --yaml-wins flag', async () => {
+    const { parseCliArgs } = await import('./jira-bidirectional-sync.mjs');
+
+    const args = parseCliArgs(['--yaml-wins']);
+    assert.strictEqual(args.yamlWins, true);
+  });
+
+  it('should parse --status and --points flags', async () => {
+    const { parseCliArgs } = await import('./jira-bidirectional-sync.mjs');
+
+    const args = parseCliArgs(['--status', '--points']);
+    assert.strictEqual(args.syncStatus, true);
+    assert.strictEqual(args.syncPoints, true);
+  });
+
+  it('should parse --all flag as status + points', async () => {
+    const { parseCliArgs } = await import('./jira-bidirectional-sync.mjs');
+
+    const args = parseCliArgs(['--all']);
+    assert.strictEqual(args.syncStatus, true);
+    assert.strictEqual(args.syncPoints, true);
+  });
+
+  it('should parse --sprint <id> option', async () => {
+    const { parseCliArgs } = await import('./jira-bidirectional-sync.mjs');
+
+    const args = parseCliArgs(['--sprint', '275']);
+    assert.strictEqual(args.sprintId, '275');
+  });
+
+});
+
+// =============================================================================
+// Helper function tests (using existing jira-lib.mjs)
+// =============================================================================
+
+describe('Helper functions from jira-lib.mjs', () => {
+
+  it('mapStatusToJira converts Pennyfarthing status to Jira', () => {
+    assert.strictEqual(mapStatusToJira('backlog'), 'To Do');
+    assert.strictEqual(mapStatusToJira('in_progress'), 'In Progress');
+    assert.strictEqual(mapStatusToJira('in-progress'), 'In Progress');
+    assert.strictEqual(mapStatusToJira('done'), 'Done');
+    assert.strictEqual(mapStatusToJira('review'), 'In Review');
+  });
+
+  it('mapJiraToStatus converts Jira status to Pennyfarthing', () => {
+    assert.strictEqual(mapJiraToStatus('To Do'), 'backlog');
+    assert.strictEqual(mapJiraToStatus('In Progress'), 'in-progress');
+    assert.strictEqual(mapJiraToStatus('Done'), 'done');
+    assert.strictEqual(mapJiraToStatus('In Review'), 'review');
+  });
+
+  it('extractJiraKey extracts key from URL or returns as-is', () => {
+    assert.strictEqual(extractJiraKey('MSSCI-11842'), 'MSSCI-11842');
+    assert.strictEqual(
+      extractJiraKey('https://1898andco.atlassian.net/browse/MSSCI-11842'),
+      'MSSCI-11842'
+    );
+  });
+
+});

package/pennyfarthing-dist/scripts/{utils → jira}/jira-claim-story.sh

@@ -23,7 +23,9 @@ set -e
 
 # Source common functions
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-source "${SCRIPT_DIR}/sprint-common.sh"
+PARENT_DIR="$(dirname "$SCRIPT_DIR")"
+source "${PARENT_DIR}/lib/common.sh"
+source "${PARENT_DIR}/sprint/sprint-common.sh"
 source "${SCRIPT_DIR}/jira-lib.sh"
 
 # Check dependencies (using jira-lib's robust check)
@@ -103,11 +105,11 @@ if [ "$ISSUE_JSON" = "{}" ]; then
     exit 3
 fi
 
-# Parse assignee
-ASSIGNEE=$(echo "$ISSUE_JSON" | jq -r '.fields.assignee.displayName // "Unassigned"')
-ASSIGNEE_EMAIL=$(echo "$ISSUE_JSON" | jq -r '.fields.assignee.emailAddress // ""')
-STATUS=$(echo "$ISSUE_JSON" | jq -r '.fields.status.name // "Unknown"')
-SUMMARY=$(echo "$ISSUE_JSON" | jq -r '.fields.summary // "No summary"')
+# Parse assignee (use printf to avoid zsh echo interpreting \n in JSON)
+ASSIGNEE=$(printf '%s' "$ISSUE_JSON" | jq -r '.fields.assignee.displayName // "Unassigned"')
+ASSIGNEE_EMAIL=$(printf '%s' "$ISSUE_JSON" | jq -r '.fields.assignee.emailAddress // ""')
+STATUS=$(printf '%s' "$ISSUE_JSON" | jq -r '.fields.status.name // "Unknown"')
+SUMMARY=$(printf '%s' "$ISSUE_JSON" | jq -r '.fields.summary // "No summary"')
 
 echo ""
 echo "📋 Issue: ${JIRA_ISSUE_KEY}"

package/pennyfarthing-dist/scripts/{utils/jira → jira}/jira-lib.mjs

@@ -170,9 +170,9 @@ export function getJiraField(issueJson, fieldPath, defaultValue = null) {
 }
 
 /**
- * Status mapping: Conductor -> Jira
+ * Status mapping: Pennyfarthing -> Jira
  */
-export function mapStatusToJira(conductorStatus) {
+export function mapStatusToJira(PennyfarthingStatus) {
   const mapping = {
     'backlog': 'To Do',
     'todo': 'To Do',
@@ -188,11 +188,11 @@ export function mapStatusToJira(conductorStatus) {
     'blocked': 'Blocked'
   };
 
-  return mapping[conductorStatus?.toLowerCase()] || 'To Do';
+  return mapping[PennyfarthingStatus?.toLowerCase()] || 'To Do';
 }
 
 /**
- * Status mapping: Jira -> Conductor
+ * Status mapping: Jira -> Pennyfarthing
  */
 export function mapJiraToStatus(jiraStatus) {
   const mapping = {
@@ -328,23 +328,23 @@ export function getStoryPoints(issueKey, issueJson = null) {
 /**
  * Sync story points via REST API (jira CLI doesn't handle custom fields well)
  */
-export async function syncStoryPoints(issueKey, conductorPoints, options = {}) {
+export async function syncStoryPoints(issueKey, PennyfarthingPoints, options = {}) {
   const { dryRun = false, currentJiraPoints = null } = options;
 
-  if (!conductorPoints || conductorPoints === 'null') {
-    return { success: false, reason: 'No points in Conductor' };
+  if (!PennyfarthingPoints || PennyfarthingPoints === 'null') {
+    return { success: false, reason: 'No points in Pennyfarthing' };
   }
 
   // Compare current points
   const jiraPoints = currentJiraPoints ?? getStoryPoints(issueKey);
   const jiraPointsInt = jiraPoints ? Math.floor(Number(jiraPoints)) : null;
 
-  if (jiraPointsInt === Number(conductorPoints)) {
+  if (jiraPointsInt === Number(PennyfarthingPoints)) {
     return { success: true, alreadySynced: true };
   }
 
   if (dryRun) {
-    warn(`[DRY-RUN] Would sync points for ${issueKey}: ${jiraPoints} -> ${conductorPoints}`);
+    warn(`[DRY-RUN] Would sync points for ${issueKey}: ${jiraPoints} -> ${PennyfarthingPoints}`);
     return { success: true, dryRun: true };
   }
 
@@ -361,7 +361,7 @@ export async function syncStoryPoints(issueKey, conductorPoints, options = {}) {
       },
       body: JSON.stringify({
         fields: {
-          customfield_10031: Number(conductorPoints)
+          customfield_10031: Number(PennyfarthingPoints)
         }
       })
     });

package/pennyfarthing-dist/scripts/{utils → jira}/jira-lib.sh

@@ -5,7 +5,8 @@
 
 # Source common utilities (for dry_run_check, escape_for_jql, get_issue_json, etc.)
 _JIRA_LIB_DIR="$(cd "$(dirname "${0:-$BASH_SOURCE[0]}")" && pwd)"
-source "${_JIRA_LIB_DIR}/common.sh"
+_SCRIPTS_DIR="$(dirname "$_JIRA_LIB_DIR")"
+source "${_SCRIPTS_DIR}/lib/common.sh"
 
 #############################################
 # Dependency Checks
@@ -287,21 +288,21 @@ get_story_points() {
     echo "$points"
 }
 
-# Sync story points from Conductor to Jira
-# Usage: sync_story_points <issue_key> <conductor_points> [jira_points]
+# Sync story points from Pennyfarthing to Jira
+# Usage: sync_story_points <issue_key> <Pennyfarthing_points> [jira_points]
 # Returns: 0 if synced, 1 if already correct, 2 if failed
 sync_story_points() {
     local key="$1"
-    local conductor_points="$2"
+    local Pennyfarthing_points="$2"
     local jira_points="${3:-}"
 
-    if dry_run_check "sync story points for $key: ${conductor_points}"; then
+    if dry_run_check "sync story points for $key: ${Pennyfarthing_points}"; then
         return 0
     fi
 
-    # Skip if no points defined in Conductor
-    if [ -z "$conductor_points" ] || [ "$conductor_points" = "null" ]; then
-        warn "  ⚠️  No story points defined in Conductor"
+    # Skip if no points defined in Pennyfarthing
+    if [ -z "$Pennyfarthing_points" ] || [ "$Pennyfarthing_points" = "null" ]; then
+        warn "  ⚠️  No story points defined in Pennyfarthing"
         return 1
     fi
 
@@ -312,7 +313,7 @@ sync_story_points() {
 
     # Compare as integers (Jira might return float like "5.0")
     local jira_points_int=$(echo "$jira_points" | cut -d'.' -f1)
-    if [ "$jira_points_int" = "$conductor_points" ]; then
+    if [ "$jira_points_int" = "$Pennyfarthing_points" ]; then
         return 1  # Already correct
     fi
 
@@ -326,7 +327,7 @@ sync_story_points() {
     http_code=$(curl -s -o /dev/null -w "%{http_code}" -X PUT \
         -u "${jira_user}:${JIRA_API_TOKEN}" \
         -H "Content-Type: application/json" \
-        -d "{\"fields\": {\"customfield_10031\": ${conductor_points}}}" \
+        -d "{\"fields\": {\"customfield_10031\": ${Pennyfarthing_points}}}" \
         "${api_url}" 2>&1)
 
     if [ "$http_code" = "204" ] || [ "$http_code" = "200" ]; then
@@ -341,13 +342,13 @@ sync_story_points() {
 # Status Mapping
 #############################################
 
-# map_status_to_jira CONDUCTOR_STATUS
-# Map Conductor status to Jira status name
+# map_status_to_jira Pennyfarthing_STATUS
+# Map Pennyfarthing status to Jira status name
 # Returns: Jira status string
 map_status_to_jira() {
-    local conductor_status="$1"
+    local Pennyfarthing_status="$1"
 
-    case "$conductor_status" in
+    case "$Pennyfarthing_status" in
         backlog|todo)
             echo "To Do"
             ;;
@@ -371,8 +372,8 @@ map_status_to_jira() {
 }
 
 # map_jira_to_status JIRA_STATUS
-# Map Jira status to Conductor status name
-# Returns: Conductor status string
+# Map Jira status to Pennyfarthing status name
+# Returns: Pennyfarthing status string
 map_jira_to_status() {
     local jira_status="$1"
 
@@ -412,7 +413,7 @@ get_pr_author() {
     fi
 
     # Extract org/repo/number from URL
-    # Example: https://github.com/1898andCo/conductor-ui/pull/42
+    # Example: https://github.com/1898andCo/Pennyfarthing-ui/pull/42
     if [[ "$pr_url" =~ github\.com/([^/]+)/([^/]+)/pull/([0-9]+) ]]; then
         local org="${BASH_REMATCH[1]}"
         local repo="${BASH_REMATCH[2]}"