@pennyfarthing/core 11.3.8 → 11.5.0-alpha.0

package/pennyfarthing-dist/pf/jira/cli.py

@@ -12,7 +12,7 @@ Commands:
     move         Transition issue status
     assign       Assign issue to user
     link         Link two issues
-    search       Search issues by JQL
+    search       Search issues (plain text or JQL)
     create epic  Create epic + stories from YAML
     create story Create single story from YAML
     sync         Sync epic to Jira
@@ -90,7 +90,7 @@ def move(key, status, dry_run):
     elif result.get("success"):
         click.echo(f"Moved {key} to '{status}'")
     else:
-        click.echo(f"Failed: {result.get('reason', 'unknown')}", err=True)
+        click.echo(f"Failed: {result.get('error', 'unknown')}", err=True)
         raise SystemExit(1)
 
 
@@ -108,7 +108,7 @@ def assign(key, user, dry_run):
     elif result.get("success"):
         click.echo(f"Assigned {key} to {user}")
     else:
-        click.echo(f"Failed: {result.get('reason', 'unknown')}", err=True)
+        click.echo(f"Failed: {result.get('error', 'unknown')}", err=True)
         raise SystemExit(1)
 
 
@@ -129,21 +129,131 @@ def link(parent_key, child_key, link_type, dry_run):
     if result.get("success"):
         click.echo(f"Linked {parent_key} -> {child_key} ({link_type})")
     else:
-        click.echo(f"Failed: {result.get('reason', 'unknown')}", err=True)
+        click.echo(f"Failed: {result.get('error', 'unknown')}", err=True)
         raise SystemExit(1)
 
 
 @jira.command()
-@click.argument("jql")
-def search(jql):
-    """Search issues using JQL (delegates to jira CLI)."""
-    import subprocess
+@click.argument("query")
+@click.option("--project", "-p", default=None, help="Jira project key (default: from config)")
+@click.option("--max-results", "-n", default=50, type=int, help="Maximum results (default: 50)")
+@click.option("--status", "-s", default=None, help="Filter by status (e.g. 'In Progress', 'Done')")
+@click.option("--type", "-t", "issue_type", default=None, help="Filter by issue type (e.g. Story, Epic, Bug)")
+@click.option("--json-output", "--json", "json_out", is_flag=True, help="Output as JSON")
+def search(query, project, max_results, status, issue_type, json_out):
+    """Search issues using plain text or JQL.
 
-    result = subprocess.run(
-        ["jira", "issue", "list", "--jql", jql, "--plain"],
-        capture_output=False,
+    \b
+    Plain text queries search summary, description, and comments.
+    JQL queries (detected automatically) are passed through directly.
+
+    \b
+    Examples:
+      pf jira search "BikeRack reconnect"
+      pf jira search "sprint fix" --project MSSCI
+      pf jira search "status = 'In Progress' AND assignee = currentUser()"
+      pf jira search "install" --status "To Do" --type Story
+    """
+    import json as json_mod
+
+    from pf.jira.client import JIRA_PROJECT, get_client
+
+    client = get_client()
+    proj = project or JIRA_PROJECT
+
+    jql = _build_search_jql(query, proj, status, issue_type)
+
+    issues = client.search_issues_sync(
+        jql,
+        fields=["key", "summary", "status", "assignee", "customfield_10031", "issuetype"],
+        max_results=max_results,
     )
-    raise SystemExit(result.returncode)
+
+    if json_out:
+        click.echo(json_mod.dumps(issues, indent=2))
+        return
+
+    if not issues:
+        click.echo(f"No issues found. JQL: {jql}")
+        return
+
+    click.echo(f"Found {len(issues)} issue(s):\n")
+    _print_search_results(issues)
+
+
+def _is_jql(query: str) -> bool:
+    """Detect if a query string looks like JQL rather than plain text."""
+    jql_keywords = [
+        " = ", " != ", " ~ ", " !~ ", " IN ", " NOT IN ",
+        " AND ", " OR ", " ORDER BY ", " >= ", " <= ",
+        " IS ", " WAS ", " CHANGED ",
+    ]
+    upper = f" {query} ".upper()
+    return any(kw.upper() in upper for kw in jql_keywords)
+
+
+def _build_search_jql(
+    query: str,
+    project: str,
+    status: str | None,
+    issue_type: str | None,
+) -> str:
+    """Build JQL from query string, project, and optional filters."""
+    if _is_jql(query):
+        jql = query
+        if project and "project" not in query.lower():
+            jql = f"project = {project} AND ({jql})"
+    else:
+        jql = f'project = {project} AND text ~ "{query}"'
+
+    if status:
+        jql += f' AND status = "{status}"'
+    if issue_type:
+        jql += f' AND issuetype = "{issue_type}"'
+
+    jql += " ORDER BY updated DESC"
+    return jql
+
+
+def _print_search_results(issues: list) -> None:
+    """Format and print search results as a table."""
+    from pf.jira.client import get_jira_field
+
+    rows = []
+    for issue in issues:
+        key = issue.get("key", "?")
+        summary = get_jira_field(issue, "fields.summary", "")
+        status_name = get_jira_field(issue, "fields.status.name", "?")
+        issue_type = get_jira_field(issue, "fields.issuetype.name", "?")
+        assignee = get_jira_field(issue, "fields.assignee.displayName", "Unassigned")
+        points = get_jira_field(issue, "fields.customfield_10031")
+        pts_str = str(int(points)) if points else "-"
+        rows.append((key, issue_type, summary, status_name, pts_str, assignee))
+
+    if not rows:
+        return
+
+    # Column widths
+    key_w = max(len(r[0]) for r in rows)
+    type_w = max(len(r[1]) for r in rows)
+    status_w = max(len(r[3]) for r in rows)
+    pts_w = 3
+    # Summary gets the rest, capped at 50
+    sum_w = 50
+
+    header = (
+        f"{'Key':<{key_w}}  {'Type':<{type_w}}  {'Summary':<{sum_w}}  "
+        f"{'Status':<{status_w}}  {'Pts':<{pts_w}}  Assignee"
+    )
+    click.echo(header)
+    click.echo("-" * len(header))
+
+    for key, itype, summary, st, pts, assignee in rows:
+        trunc = (summary[:sum_w - 1] + "…") if len(summary) > sum_w else summary
+        click.echo(
+            f"{key:<{key_w}}  {itype:<{type_w}}  {trunc:<{sum_w}}  "
+            f"{st:<{status_w}}  {pts:<{pts_w}}  {assignee}"
+        )
 
 
 @jira.group()
@@ -247,7 +357,7 @@ def create_standalone(title, points, description, dry_run):
     if result.get("success"):
         click.echo("Transitioned to Done")
     else:
-        click.echo(f"Warning: could not transition to Done: {result.get('reason')}")
+        click.echo(f"Warning: could not transition to Done: {result.get('error')}")
 
     click.echo(f"\n{jira_key}: {title}")
     click.echo(f"https://1898andco.atlassian.net/browse/{jira_key}")
@@ -337,7 +447,7 @@ def sprint_add(sprint_id, issue_key, dry_run):
     if result.get("success"):
         click.echo(f"Added {issue_key} to sprint {sprint_id}")
     else:
-        click.echo(f"Failed: {result.get('reason', 'unknown')}", err=True)
+        click.echo(f"Failed: {result.get('error', 'unknown')}", err=True)
         raise SystemExit(1)
 
 

package/pennyfarthing-dist/pf/jira/client.py

@@ -122,76 +122,6 @@ def is_jira_cli_available() -> bool:
     return shutil.which("jira") is not None
 
 
-def get_issue(issue_key: str) -> dict[str, Any] | None:
-    """Fetch issue details from Jira.
-
-    Args:
-        issue_key: Jira issue key (e.g., "MSSCI-12398")
-
-    Returns:
-        Issue data as dict, or None if not found
-    """
-    if not is_jira_cli_available():
-        return None
-
-    result = subprocess.run(
-        ["jira", "issue", "view", issue_key, "--raw"],
-        capture_output=True,
-        text=True,
-    )
-
-    if result.returncode != 0:
-        return None
-
-    try:
-        return json.loads(result.stdout)
-    except json.JSONDecodeError:
-        return None
-
-
-def update_issue_status(issue_key: str, status: str) -> bool:
-    """Transition an issue to a new status.
-
-    Args:
-        issue_key: Jira issue key
-        status: Target status name
-
-    Returns:
-        True if successful, False otherwise
-    """
-    if not is_jira_cli_available():
-        return False
-
-    result = subprocess.run(
-        ["jira", "issue", "move", issue_key, status],
-        capture_output=True,
-        text=True,
-    )
-
-    return result.returncode == 0
-
-
-def add_comment(issue_key: str, comment: str) -> bool:
-    """Add a comment to an issue.
-
-    Args:
-        issue_key: Jira issue key
-        comment: Comment text
-
-    Returns:
-        True if successful, False otherwise
-    """
-    if not is_jira_cli_available():
-        return False
-
-    result = subprocess.run(
-        ["jira", "issue", "comment", "add", issue_key, "--body", comment],
-        capture_output=True,
-        text=True,
-    )
-
-    return result.returncode == 0
-
 
 def get_jira_field(issue_json: dict[str, Any], field_path: str, default: Any = None) -> Any:
     """Extract field from Jira issue JSON using dot notation.
@@ -226,13 +156,13 @@ def get_story_points(issue_key: str, issue_json: dict[str, Any] | None = None) -
 
     Args:
         issue_key: Jira issue key
-        issue_json: Optional pre-fetched issue JSON
+        issue_json: Optional pre-fetched issue JSON (required if no default client)
 
     Returns:
         Story points as int, or None if not set
     """
     if issue_json is None:
-        issue_json = get_issue(issue_key)
+        issue_json = get_client().get_issue_sync(issue_key)
     if not issue_json:
         return None
 
@@ -349,13 +279,11 @@ def get_current_user_email() -> str:
 class JiraClient:
     """Unified Jira REST API client with sync and async support.
 
-    Consolidates REST API access previously scattered across:
-    - jira_sync.py (httpx async)
-    - jira_epic_creation.py (curl subprocess)
+    Consolidates all Jira REST API access.
 
     Usage (sync):
         client = JiraClient()
-        issue = client.get_issue("MSSCI-12345")
+        issue = client.get_issue_sync("MSSCI-12345")
 
     Usage (async):
         client = JiraClient()
@@ -510,7 +438,7 @@ class JiraClient:
             "GET", f"/rest/api/3/issue/{issue_key}/transitions"
         )
         if not transitions_data:
-            return {"success": False, "reason": "Could not get transitions"}
+            return {"success": False, "error": "Could not get transitions"}
 
         transitions = transitions_data.get("transitions", [])
         transition_id = None
@@ -523,7 +451,7 @@ class JiraClient:
             available = [t.get("name") for t in transitions]
             return {
                 "success": False,
-                "reason": f"No transition to '{target_status}' available. "
+                "error": f"No transition to '{target_status}' available. "
                 f"Available: {available}",
             }
 
@@ -558,7 +486,7 @@ class JiraClient:
             if not users or not isinstance(users, list) or len(users) == 0:
                 return {
                     "success": False,
-                    "reason": f"User not found: {assignee_email}",
+                    "error": f"User not found: {assignee_email}",
                 }
             account_id = users[0].get("accountId")
         else:
@@ -571,6 +499,41 @@ class JiraClient:
         # Assign PUT returns empty body on success (204)
         return {"success": True}
 
+    def add_comment_sync(self, issue_key: str, comment: str) -> dict[str, Any]:
+        """Add a comment to a Jira issue via REST API.
+
+        Args:
+            issue_key: Jira issue key
+            comment: Comment body text
+
+        Returns:
+            Result dict with success status
+        """
+        payload = {
+            "body": {
+                "type": "doc",
+                "version": 1,
+                "content": [
+                    {
+                        "type": "paragraph",
+                        "content": [{"type": "text", "text": comment}],
+                    }
+                ],
+            }
+        }
+        result = self._call_api_sync(
+            "POST",
+            f"/rest/api/3/issue/{issue_key}/comment",
+            payload,
+        )
+        if result is None:
+            # POST comment returns the created comment on success;
+            # _call_api_sync returns None on empty/failed response
+            # but also returns None on JSON decode failure for 201 with empty body.
+            # Treat None as success since the API may return 201 with no body.
+            pass
+        return {"success": True}
+
     def add_to_sprint_sync(self, sprint_id: int | str, issue_key: str) -> dict[str, Any]:
         """Add issue to a sprint via Agile REST API.
 
@@ -609,9 +572,10 @@ class JiraClient:
 
         encoded_jql = urllib.parse.quote(jql)
         fields_param = ",".join(fields)
+        # Jira Cloud deprecated /rest/api/3/search — use /rest/api/3/search/jql
         result = self._call_api_sync(
             "GET",
-            f"/rest/api/3/search?jql={encoded_jql}&fields={fields_param}"
+            f"/rest/api/3/search/jql?jql={encoded_jql}&fields={fields_param}"
             f"&maxResults={max_results}",
         )
         if not result:
@@ -680,7 +644,7 @@ class JiraClient:
             target_status: Target status name (e.g., "In Progress", "Done")
 
         Returns:
-            Result dict with success status and optional reason
+            Result dict with success status and optional error
         """
         import httpx
 
@@ -694,7 +658,7 @@ class JiraClient:
                 if response.status_code != 200:
                     return {
                         "success": False,
-                        "reason": f"Could not get transitions: {response.status_code}",
+                        "error": f"Could not get transitions: {response.status_code}",
                     }
 
                 transitions = response.json().get("transitions", [])
@@ -707,7 +671,7 @@ class JiraClient:
                 if not transition_id:
                     return {
                         "success": False,
-                        "reason": f"No transition to '{target_status}' available",
+                        "error": f"No transition to '{target_status}' available",
                     }
 
                 # Execute transition
@@ -722,11 +686,11 @@ class JiraClient:
                     return {"success": True}
                 return {
                     "success": False,
-                    "reason": f"Transition failed: {response.status_code}",
+                    "error": f"Transition failed: {response.status_code}",
                 }
 
             except httpx.HTTPError as e:
-                return {"success": False, "reason": str(e)}
+                return {"success": False, "error": str(e)}
 
     async def update_fields_async(
         self, issue_key: str, fields: dict[str, Any]
@@ -756,10 +720,10 @@ class JiraClient:
 
                 if response.status_code in (200, 204):
                     return {"success": True}
-                return {"success": False, "reason": f"HTTP {response.status_code}"}
+                return {"success": False, "error": f"HTTP {response.status_code}"}
 
             except httpx.HTTPError as e:
-                return {"success": False, "reason": str(e)}
+                return {"success": False, "error": str(e)}
 
     async def sync_story_points_async(
         self,

package/pennyfarthing-dist/pf/jira/reconcile.py

@@ -252,7 +252,7 @@ def reconcile(
                 print("  Done")
                 fixed.append(key)
             else:
-                print(f"  Failed: {result.get('reason', 'unknown')}")
+                print(f"  Failed: {result.get('error', 'unknown')}")
 
         report_lines.extend([
             "",

package/pennyfarthing-dist/pf/jira/story.py

@@ -88,7 +88,7 @@ def fetch_jira_issue(jira_key: str) -> dict[str, Any] | None:
     Returns:
         Issue JSON if found, None otherwise
     """
-    return jira_client.get_issue(jira_key)
+    return jira_client.get_client().get_issue_sync(jira_key)
 
 
 def sync_story(
@@ -147,10 +147,11 @@ def sync_story(
             if dry_run:
                 actions.append(f"[DRY-RUN] {action}")
             else:
-                if jira_client.update_issue_status(jira_key, target_status):
+                result = jira_client.get_client().transition_sync(jira_key, target_status)
+                if result.get("success"):
                     actions.append(action)
                 else:
-                    errors.append(f"Failed to transition {jira_key}")
+                    errors.append(f"Failed to transition {jira_key}: {result.get('error', 'unknown')}")
         else:
             actions.append(f"status already {current_jira_status}")
 
@@ -173,7 +174,8 @@ def sync_story(
         if dry_run:
             actions.append(f"[DRY-RUN] {action}")
         else:
-            if jira_client.add_comment(jira_key, comment):
+            result = jira_client.get_client().add_comment_sync(jira_key, comment)
+            if result.get("success"):
                 actions.append(action)
             else:
                 errors.append(f"Failed to add comment to {jira_key}")

package/pennyfarthing-dist/pf/jira/sync.py

@@ -150,7 +150,7 @@ async def sync_story(
         if result.get("success"):
             actions.append(f"transitioned: {current_status} -> {target_status}")
         else:
-            actions.append(f"transition failed: {result.get('reason')}")
+            actions.append(f"transition failed: {result.get('error')}")
 
     # Sync points if requested
     story_points = story.get("points")
@@ -167,7 +167,7 @@ async def sync_story(
             else:
                 actions.append(f"synced points: {story_points}")
         else:
-            actions.append(f"points sync failed: {result.get('reason')}")
+            actions.append(f"points sync failed: {result.get('error')}")
 
     return SyncResult(
         story_id=story_id,

package/pennyfarthing-dist/pf/migration/__init__.py

@@ -8,7 +8,7 @@ to conform to the XML schema definitions:
 - Workflow step files -> guides/workflow-step-schema.md
 
 Usage:
-    python -m pf.migration [command] [options]
+    pf migration [command] [options]
 
 Commands:
     session   Migrate session files to XML format

package/pennyfarthing-dist/pf/migration/cli.py

@@ -3,7 +3,6 @@ Migration CLI - Click-based CLI for XML schema migration tools.
 
 Usage:
     pf migration [COMMAND] [ARGS]...
-    python -m pf.migration [COMMAND] [ARGS]...
 
 Commands:
     session   Migrate session files to XML format