agentic-devtools 0.2.34__tar.gz → 0.2.36__tar.gz

{agentic_devtools-0.2.34 → agentic_devtools-0.2.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-devtools
-Version: 0.2.34
+Version: 0.2.36
 Summary: AI assistant helper commands for the Dragonfly platform
 Author: Dragonfly Team
 License-Expression: MIT

{agentic_devtools-0.2.34 → agentic_devtools-0.2.36}/agentic_devtools/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.34'
-__version_tuple__ = version_tuple = (0, 2, 34)
+__version__ = version = '0.2.36'
+__version_tuple__ = version_tuple = (0, 2, 36)
 
 __commit_id__ = commit_id = None

{agentic_devtools-0.2.34 → agentic_devtools-0.2.36}/agentic_devtools/cli/azure_devops/review_commands.py

@@ -717,15 +717,25 @@ def setup_pull_request_review() -> None:
 
         from ...state import set_bootstrap_state
 
-        set_bootstrap_state(worktree_key=f"PR{pull_request_id}")
+        # Normalize Jira issue key once and use consistently for scoping and state.
+        if isinstance(jira_issue_key, str):
+            jira_issue_key_norm = jira_issue_key.strip() or None
+        else:
+            jira_issue_key_norm = None
+
+        # Ensure all subsequent uses in this function see the normalized value.
+        jira_issue_key = jira_issue_key_norm
+
+        worktree_key = jira_issue_key if jira_issue_key else f"PR{pull_request_id}"
+        set_bootstrap_state(worktree_key=worktree_key)
 
         # Re-set context keys that were read from the old (_unscoped) state
         # directory.  set_bootstrap_state() may have changed the resolved
         # state dir, so downstream commands (e.g., get_pull_request_details)
         # that call get_value() would find an empty scoped state.json.
         set_value("pull_request_id", str(pull_request_id))
-        if jira_issue_key:
-            set_value("jira.issue_key", jira_issue_key)
+        if jira_issue_key_norm:
+            set_value("jira.issue_key", jira_issue_key_norm)
         if include_reviewed:
             set_value("include_reviewed", "true")
         if review_model_id:

{agentic_devtools-0.2.34 → agentic_devtools-0.2.36}/agentic_devtools/cli/copilot/auto_start.py

@@ -10,6 +10,7 @@ Responsibilities
 1. Validate ``--worktree-path`` is an existing directory — exit 1 if not.
 2. Check for the sentinel file — exit early (0) if already triggered.
 3. Check copilot CLI availability — exit 1 if unavailable (before creating sentinel).
+3b. Check ``agdt-advance-workflow`` reachability — exit 1 if not found on PATH.
 4. Build copilot args — exit 1 if the prompt exceeds argv limits.
 5. Create the sentinel file atomically (``O_CREAT|O_EXCL``) — exit 0 without
    starting a session if another process already created it (race-free guard).
@@ -24,6 +25,7 @@ from __future__ import annotations
 
 import argparse
 import os
+import shutil
 import subprocess
 import sys
 
@@ -85,6 +87,7 @@ def copilot_auto_start_cmd(argv: list[str] | None = None) -> None:
     2. Sentinel check — exit 0 immediately if already triggered (best-effort
        stale task cleanup first).
     3. Pre-flight: check copilot CLI availability; exit 1 if not available.
+    3b. Pre-flight: check ``agdt-advance-workflow`` reachability; exit 1 if not found.
     4. Build copilot args; exit 1 if prompt exceeds argv limits.
     5. Create sentinel file atomically (``O_CREAT|O_EXCL``); exit 0 without
        running if another concurrent invocation already created it.
@@ -155,6 +158,20 @@ def copilot_auto_start_cmd(argv: list[str] | None = None) -> None:
         )
         sys.exit(1)
 
+    # 3b. Pre-flight: bail out early if agdt-* CLI commands are not on PATH.
+    #     This check prevents a confusing "command not found" error inside the
+    #     Copilot session after it has already started.
+    if not shutil.which("agdt-advance-workflow"):
+        print(
+            "agdt-copilot-auto-start: error: agdt-advance-workflow not found on PATH; "
+            "agentic-devtools CLI commands are not available. "
+            "Ensure agentic-devtools is installed and the Scripts directory is on your PATH. "
+            "Install options: 'pip install agentic-devtools', 'pipx install agentic-devtools', "
+            "or see the managed install at $HOME/.agdt/bin (or %USERPROFILE%\\.agdt\\bin on Windows).",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
     # 4. Build copilot args — bail out early if the prompt exceeds argv length limits.
     copilot_args = build_copilot_args(start_prompt, interactive=True)
     if copilot_args is None:

{agentic_devtools-0.2.34 → agentic_devtools-0.2.36}/agentic_devtools/cli/copilot/session.py

@@ -227,9 +227,7 @@ def _get_log_file_path(session_id: str, start_time: str) -> Path:
     return state_dir / _LOG_DIR_NAME / filename
 
 
-def _build_copilot_args(
-    prompt: str, *, interactive: bool = True, autopilot: bool = True
-) -> Optional[List[str]]:
+def _build_copilot_args(prompt: str, *, interactive: bool = True, autopilot: bool = True) -> Optional[List[str]]:
     """Build the copilot argument list.
 
     Uses the standalone ``copilot`` binary when available (preferred), falling
@@ -287,16 +285,13 @@ def _build_copilot_args(
         return args
     if interactive and autopilot:
         warnings.warn(
-            "--autopilot is not supported by the gh copilot extension fallback; "
-            "autopilot mode will not be activated.",
+            "--autopilot is not supported by the gh copilot extension fallback; autopilot mode will not be activated.",
             stacklevel=2,
         )
     return ["gh", "copilot", "suggest", prompt]
 
 
-def build_copilot_args(
-    prompt: str, *, interactive: bool = True, autopilot: bool = True
-) -> Optional[List[str]]:
+def build_copilot_args(prompt: str, *, interactive: bool = True, autopilot: bool = True) -> Optional[List[str]]:
     """Build the copilot argument list (public API).
 
     Public wrapper around the internal argument builder.  Use this when you

{agentic_devtools-0.2.34 → agentic_devtools-0.2.36}/agentic_devtools/cli/tasks/commands.py

@@ -311,7 +311,8 @@ def _parse_wait_args(_argv: Optional[List[str]] = None) -> argparse.Namespace:
         help="Maximum seconds since task start before timeout (default: 300)",
     )
 
-    return parser.parse_args(_argv or [])
+    args, _ = parser.parse_known_args(_argv)
+    return args
 
 
 def _check_task_timeout(task: BackgroundTask, timeout: float) -> bool:

{agentic_devtools-0.2.34 → agentic_devtools-0.2.36}/agentic_devtools/cli/workflows/commands.py

@@ -115,6 +115,37 @@ def _ensure_bootstrap_identity() -> None:
         )
 
 
+def _ensure_bootstrap_identity_and_scope(worktree_key: str) -> None:
+    """Resolve identity and set worktree_key scope via set_bootstrap_state() before any state I/O.
+
+    Combines identity resolution and worktree scoping into a single call so that
+    the state directory is locked to the correct scoped path before any ``set_value()``
+    calls are made.  This prevents the ``_unscoped`` folder from being created when
+    identity resolution succeeds.
+
+    Follows the same guard and error-handling pattern as ``_ensure_bootstrap_identity()``:
+    skipped when state directory is overridden via env vars, and failures are logged as
+    warnings without blocking the workflow.
+
+    Args:
+        worktree_key: The worktree key to use for scoping (e.g. ``"DFLY-1234"`` or
+            ``"PR25858"``).  Issue key takes priority over PR ID when both are available,
+            matching the ``resolve_worktree_key()`` priority in ``agdt_branch.py``.
+    """
+    from ...state import set_bootstrap_state
+
+    env_state_override = os.getenv("AGENTIC_DEVTOOLS_STATE_DIR") or os.getenv("DFLY_AI_HELPERS_STATE_DIR")
+    if env_state_override:
+        return
+    try:
+        set_bootstrap_state(worktree_key=worktree_key)
+    except (OSError, json.JSONDecodeError, UnicodeError, subprocess.SubprocessError) as exc:
+        logging.getLogger(__name__).warning(
+            "Failed to initialize bootstrap state; proceeding with unscoped state: %s",
+            exc,
+        )
+
+
 def initiate_pull_request_review_workflow(
     pull_request_id: Optional[str] = None,
     issue_key: Optional[str] = None,
@@ -149,17 +180,13 @@ def initiate_pull_request_review_workflow(
     Either pull_request_id or issue_key must be provided via CLI/programmatic arguments;
     any existing state is cleared at the start of this command to ensure a fresh workflow.
     """
-    # Resolve identity before any state I/O to prevent _unscoped writes
-    _ensure_bootstrap_identity()
-    # Clear all previous state to ensure fresh workflow start
-    clear_state_for_workflow_initiation()
-
     import argparse
 
     from ...state import delete_value, get_value, set_value
     from ..azure_devops.helpers import find_jira_issue_from_pr, find_pr_from_jira_issue, get_pull_request_source_branch
     from .preflight import perform_auto_setup
 
+    # Parse CLI arguments first — no state I/O at this point, so no _unscoped dir is created.
     parser = argparse.ArgumentParser(
         description="Initiate the pull request review workflow",
         epilog="""
@@ -201,21 +228,50 @@ Examples:
     if interactive is None:
         interactive = False
 
-    # Set provided values in state (use set_value directly since we handle cross-lookup below)
-    if pull_request_id:
-        set_value("pull_request_id", pull_request_id)
-        if not issue_key:
-            # --pull-request-id was given without --issue-key: clear any stale issue key
-            # left by a prior run so the cross-lookup below derives a fresh value from
-            # the PR instead of silently reusing an unrelated Jira issue.
-            delete_value("jira.issue_key")
-    if issue_key:
-        set_value("jira.issue_key", issue_key)
-        if not pull_request_id:
+    # Resolve identity and set the worktree_key scope BEFORE any state I/O (including
+    # the clear below), so that get_state_dir() resolves to the correct scoped directory
+    # and never creates the _unscoped fallback folder.
+    # Priority: issue_key > pull_request_id (matching resolve_worktree_key() in agdt_branch.py).
+    # Normalize both values (strip whitespace) before building the worktree_key so that
+    # leading/trailing whitespace does not cause is_safe_dir_segment() to reject the segment
+    # and fall back to _unscoped.
+    _issue_key_norm = issue_key.strip() if isinstance(issue_key, str) else ""
+    _pr_id_norm = (
+        pull_request_id.strip()
+        if isinstance(pull_request_id, str)
+        else (str(pull_request_id) if pull_request_id is not None else "")
+    )
+    if _issue_key_norm:
+        _ensure_bootstrap_identity_and_scope(_issue_key_norm)
+    elif _pr_id_norm:
+        _ensure_bootstrap_identity_and_scope(f"PR{_pr_id_norm}")
+    else:
+        # Neither provided — fall back to identity-only; the error path below will exit.
+        _ensure_bootstrap_identity()
+
+    # Clear workflow tracking state (workflow, agdt_run_id) now that the bootstrap scope
+    # is set; load_state()/save_state() will use the correctly scoped directory.
+    clear_state_for_workflow_initiation()
+
+    # Set provided values in state using the NORMALIZED identifiers.  When both issue_key
+    # and pull_request_id are provided, write jira.issue_key FIRST so that the engine-side
+    # priority guard in set_value() (which checks the loaded state dict) sees the issue key
+    # and skips overwriting the bootstrap scope when pull_request_id is written immediately
+    # after.  Whitespace-only inputs normalize to an empty string and are treated as absent.
+    if _issue_key_norm:
+        set_value("jira.issue_key", _issue_key_norm)
+        if not _pr_id_norm:
             # --issue-key was given without --pull-request-id: clear any stale PR ID
             # left by a prior run so the cross-lookup below searches for the correct PR
             # instead of silently reusing an unrelated pull request.
             delete_value("pull_request_id")
+    if _pr_id_norm:
+        set_value("pull_request_id", _pr_id_norm)
+        if not _issue_key_norm:
+            # --pull-request-id was given without --issue-key: clear any stale issue key
+            # left by a prior run so the cross-lookup below derives a fresh value from
+            # the PR instead of silently reusing an unrelated Jira issue.
+            delete_value("jira.issue_key")
 
     # Get resolved values from state
     resolved_pr_id = get_value("pull_request_id")
@@ -1633,18 +1689,14 @@ def initiate_apply_pull_request_review_suggestions_workflow(
     Optional state:
     - jira.issue_key: Jira issue key for context
     """
-    # Resolve identity before any state I/O to prevent _unscoped writes
-    _ensure_bootstrap_identity()
-    # Clear all previous state to ensure fresh workflow start
-    clear_state_for_workflow_initiation()
-
     import argparse
 
-    from ...state import get_value, set_value
+    from ...state import delete_value, get_value, set_value
     from .preflight import check_worktree_and_branch, perform_auto_setup
 
-    # Parse CLI arguments — always parse to pick up --interactive even when
-    # pull_request_id/issue_key are supplied programmatically.
+    # Parse CLI arguments first — no state I/O at this point, so no _unscoped dir is created.
+    # Always parse to pick up --interactive even when pull_request_id/issue_key are supplied
+    # programmatically.
     parser = argparse.ArgumentParser(
         description="Initiate the apply-pull-request-review-suggestions workflow",
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -1685,13 +1737,50 @@ Examples:
     if interactive is None:
         interactive = False
 
-    # If pull_request_id provided via CLI, set it in state
-    if pull_request_id:
-        set_value("pull_request_id", pull_request_id)
+    # Resolve identity and set the worktree_key scope BEFORE any state I/O (including
+    # the clear below), so that get_state_dir() resolves to the correct scoped directory
+    # and never creates the _unscoped fallback folder.
+    # Priority: issue_key > pull_request_id (matching resolve_worktree_key() in agdt_branch.py).
+    # Normalize both values (strip whitespace) before building the worktree_key so that
+    # leading/trailing whitespace does not cause is_safe_dir_segment() to reject the segment
+    # and fall back to _unscoped.
+    _issue_key_norm = issue_key.strip() if isinstance(issue_key, str) else ""
+    _pr_id_norm = (
+        pull_request_id.strip()
+        if isinstance(pull_request_id, str)
+        else (str(pull_request_id) if pull_request_id is not None else "")
+    )
+    if _issue_key_norm:
+        _ensure_bootstrap_identity_and_scope(_issue_key_norm)
+    elif _pr_id_norm:
+        _ensure_bootstrap_identity_and_scope(f"PR{_pr_id_norm}")
+    else:
+        _ensure_bootstrap_identity()
 
-    # If issue_key provided via CLI, set it in state
-    if issue_key:
-        set_value("jira.issue_key", issue_key)
+    # Clear workflow tracking state (workflow, agdt_run_id) now that the bootstrap scope
+    # is set; load_state()/save_state() will use the correctly scoped directory.
+    clear_state_for_workflow_initiation()
+
+    # Set provided values in state.  When both issue_key and pull_request_id are provided,
+    # write jira.issue_key FIRST so that the engine-side priority guard in set_value()
+    # (which checks the loaded state dict) sees the issue key and skips overwriting the
+    # bootstrap scope when pull_request_id is written immediately after.
+    # Use the normalized values for both presence checks and state writes so that
+    # whitespace-only inputs are treated as absent and state remains canonical.
+    if _issue_key_norm:
+        set_value("jira.issue_key", _issue_key_norm)
+        if not _pr_id_norm:
+            # --issue-key was given without --pull-request-id: clear any stale PR ID
+            # left by a prior run so it is not silently reused.
+            delete_value("pull_request_id")
+
+    if _pr_id_norm:
+        set_value("pull_request_id", _pr_id_norm)
+        if not _issue_key_norm:
+            # --pull-request-id was given without --issue-key: clear any stale issue key
+            # left by a prior run so the derive-from-PR path below is not bypassed by
+            # an unrelated Jira issue that happened to be stored in state.
+            delete_value("jira.issue_key")
 
     # Get resolved values from state
     resolved_pr_id = get_value("pull_request_id")

{agentic_devtools-0.2.34 → agentic_devtools-0.2.36}/agentic_devtools/cli/workflows/preflight.py

@@ -283,6 +283,7 @@ def perform_auto_setup(
     Returns:
         True if the background task was started, False otherwise
     """
+    from ...state import set_value
     from .worktree_setup import start_worktree_setup_background
 
     print(f"\n{'=' * 80}")
@@ -304,6 +305,10 @@ def perform_auto_setup(
             interactive=interactive,
         )
 
+        # Automatically save the task ID to state so agdt-task-wait works
+        # without requiring the user to manually set background.task_id.
+        set_value("background.task_id", task_id)
+
         print(f"\n✅ Background task started: {task_id}")
         print("\n" + "=" * 80)
         print("NEXT STEPS")