✨ feat: Enhance command display and add unit tests for extension entrypoint

Author: SigureMo

.github/workflows/unit-test.yml

@@ -41,3 +41,10 @@ jobs:
       - name: unit test
         run: |
           just ci-test
+
+      - name: e2e extension entrypoint
+        env:
+          UV_CACHE_DIR: /tmp/uv-cache
+          UV_TOOL_DIR: /tmp/uv-tools
+        run: |
+          ./gh-llm --help

gh-llm

@@ -8,4 +8,5 @@ if ! command -v uv >/dev/null 2>&1; then
   exit 1
 fi
 
+export GH_LLM_DISPLAY_CMD="gh llm"
 exec uvx --from "${SCRIPT_DIR}" gh-llm "$@"

src/gh_llm/cli.py

@@ -10,6 +10,7 @@
     parse_review_ids as _parse_review_ids,
     register_pr_parser,
 )
+from gh_llm.invocation import detect_prog_name
 
 
 def run(argv: list[str]) -> int:
@@ -30,7 +31,7 @@ def run(argv: list[str]) -> int:
 
 def _build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
-        prog="gh-llm",
+        prog=detect_prog_name(sys.argv[0]),
         description="LLM-friendly GitHub pull request timeline viewer",
     )
     parser.add_argument("-v", "--version", action="version", version=__version__)

src/gh_llm/commands/pr.py

@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING, Any
 
 from gh_llm.github_api import GitHubClient
+from gh_llm.invocation import display_command_with
 from gh_llm.pager import DEFAULT_PAGE_SIZE, TimelinePager
 from gh_llm.render import (
     render_checks_section,
@@ -460,15 +461,14 @@ def cmd_pr_review_start(args: Any) -> int:
     print(f"PR: {meta.ref.number} ({repo})")
     print(f"Total hunks: {len(hunks)}")
     print(f"Δ full diff: `gh pr diff {meta.ref.number} --repo {repo}`")
-    print(
-        "Comment template: `gh-llm pr review-comment --path '<path>' --line <line> --side RIGHT --body '<review_comment>' "
-        f"--pr {meta.ref.number} --repo {repo}`"
+    comment_template_cmd = display_command_with(
+        f"pr review-comment --path '<path>' --line <line> --side RIGHT --body '<review_comment>' --pr {meta.ref.number} --repo {repo}"
     )
-    print(
-        "Suggestion template: `gh-llm pr review-suggest --path '<path>' --line <line> --side RIGHT "
-        "--body '<reason>' --suggestion '<replacement>' "
-        f"--pr {meta.ref.number} --repo {repo}`"
+    suggestion_template_cmd = display_command_with(
+        f"pr review-suggest --path '<path>' --line <line> --side RIGHT --body '<reason>' --suggestion '<replacement>' --pr {meta.ref.number} --repo {repo}"
     )
+    print(f"Comment template: `{comment_template_cmd}`")
+    print(f"Suggestion template: `{suggestion_template_cmd}`")
     print()
 
     if not visible:
@@ -480,12 +480,14 @@ def cmd_pr_review_start(args: Any) -> int:
         print(f"File: {hunk.path}")
         print(f"Header: {hunk.header}")
         print(f"Suggested anchor line (RIGHT): {hunk.anchor_line}")
-        print(
-            f"⏎ comment: `gh-llm pr review-comment --path '{hunk.path}' --line {hunk.anchor_line} --side RIGHT --body '<review_comment>' --pr {meta.ref.number} --repo {repo}`"
+        comment_cmd = display_command_with(
+            f"pr review-comment --path '{hunk.path}' --line {hunk.anchor_line} --side RIGHT --body '<review_comment>' --pr {meta.ref.number} --repo {repo}"
         )
-        print(
-            f"⏎ suggest: `gh-llm pr review-suggest --path '{hunk.path}' --line {hunk.anchor_line} --side RIGHT --body '<reason>' --suggestion '<replacement>' --pr {meta.ref.number} --repo {repo}`"
+        suggest_cmd = display_command_with(
+            f"pr review-suggest --path '{hunk.path}' --line {hunk.anchor_line} --side RIGHT --body '<reason>' --suggestion '<replacement>' --pr {meta.ref.number} --repo {repo}"
         )
+        print(f"⏎ comment: `{comment_cmd}`")
+        print(f"⏎ suggest: `{suggest_cmd}`")
         print("```diff")
         for line in hunk.lines:
             print(line)

src/gh_llm/github_api.py

@@ -9,6 +9,7 @@
 from typing import cast
 from urllib.parse import urlparse
 
+from gh_llm.invocation import display_command, display_command_with
 from gh_llm.models import CheckItem, PageInfo, PullRequestMeta, PullRequestRef, TimelineEvent, TimelinePage
 
 MAX_INLINE_TEXT = 8000
@@ -1254,13 +1255,15 @@ def _parse_node(
             source_repo = subject.repo
             detail = subject.detail
             summary_lines.append(f"referenced by PR #{source_number} {detail} ({source_repo})")
-            summary_lines.append(f"⏎ view: `gh-llm pr view {source_number} --repo {source_repo}`")
+            summary_lines.append(f"⏎ view: `{display_command_with(f'pr view {source_number} --repo {source_repo}')}`")
         elif subject is not None and subject.type == "Issue":
             source_number = subject.number
             source_repo = subject.repo
             detail = subject.detail
             summary_lines.append(f"referenced by issue #{source_number} {detail} ({source_repo})")
-            summary_lines.append(f"⏎ view (reserved): `gh-llm issue view {source_number} --repo {source_repo}`")
+            summary_lines.append(
+                f"⏎ view (reserved): `{display_command_with(f'issue view {source_number} --repo {source_repo}')}`"
+            )
         else:
             summary_lines.append("referenced by another item")
         if is_cross:
@@ -1285,13 +1288,15 @@ def _parse_node(
             source_repo = subject.repo
             detail = subject.detail
             summary_lines.append(f"cross-referenced by PR #{source_number} {detail} ({source_repo})")
-            summary_lines.append(f"⏎ view: `gh-llm pr view {source_number} --repo {source_repo}`")
+            summary_lines.append(f"⏎ view: `{display_command_with(f'pr view {source_number} --repo {source_repo}')}`")
         elif subject is not None and subject.type == "Issue":
             source_number = subject.number
             source_repo = subject.repo
             detail = subject.detail
             summary_lines.append(f"cross-referenced by issue #{source_number} {detail} ({source_repo})")
-            summary_lines.append(f"⏎ view (reserved): `gh-llm issue view {source_number} --repo {source_repo}`")
+            summary_lines.append(
+                f"⏎ view (reserved): `{display_command_with(f'issue view {source_number} --repo {source_repo}')}`"
+            )
         else:
             summary_lines.append("cross-referenced by another item")
         if is_cross:
@@ -1559,19 +1564,20 @@ def _render_review_thread_block(
     if minimized_hidden_count > 0:
         reason_text = ", ".join(sorted(minimized_reasons))
         lines.append(f"  ... {minimized_hidden_count} hidden review comments (reason: {reason_text}).")
+    reply_cmd = display_command_with(
+        f"pr thread-reply {thread_id} --body '<reply>' --pr {ref.number} --repo {ref.owner}/{ref.name}"
+    )
+    unresolve_cmd = display_command_with(
+        f"pr thread-unresolve {thread_id} --pr {ref.number} --repo {ref.owner}/{ref.name}"
+    )
+    resolve_cmd = display_command_with(f"pr thread-resolve {thread_id} --pr {ref.number} --repo {ref.owner}/{ref.name}")
     lines.append(f"  ◌ thread_id: {thread_id}")
     lines.append("  ⌨ reply_body: '<reply>'")
-    lines.append(
-        f"  ⏎ Reply via gh-llm: `gh-llm pr thread-reply {thread_id} --body '<reply>' --pr {ref.number} --repo {ref.owner}/{ref.name}`"
-    )
+    lines.append(f"  ⏎ Reply via {display_command()}: `{reply_cmd}`")
     if is_resolved:
-        lines.append(
-            f"  ⏎ Unresolve via gh-llm: `gh-llm pr thread-unresolve {thread_id} --pr {ref.number} --repo {ref.owner}/{ref.name}`"
-        )
+        lines.append(f"  ⏎ Unresolve via {display_command()}: `{unresolve_cmd}`")
     else:
-        lines.append(
-            f"  ⏎ Resolve via gh-llm: `gh-llm pr thread-resolve {thread_id} --pr {ref.number} --repo {ref.owner}/{ref.name}`"
-        )
+        lines.append(f"  ⏎ Resolve via {display_command()}: `{resolve_cmd}`")
     return lines, visible_comments, has_clipped_diff_hunk, details_collapsed_count
 
 
@@ -1664,11 +1670,12 @@ def _render_review_comment_block(
         lines.append(f"  Reactions: {reactions_summary}")
     comment_id = _as_optional_str(comment.get("id")) or ""
     if comment_id and author == viewer_login:
+        edit_cmd = display_command_with(
+            f"pr comment-edit {comment_id} --body '<comment_body>' --pr {ref.number} --repo {ref.owner}/{ref.name}"
+        )
         lines.append(f"  ◌ comment_id: {comment_id}")
         lines.append("  ⌨ comment_body: '<comment_body>'")
-        lines.append(
-            f"  ⏎ Edit comment via gh-llm: `gh-llm pr comment-edit {comment_id} --body '<comment_body>' --pr {ref.number} --repo {ref.owner}/{ref.name}`"
-        )
+        lines.append(f"  ⏎ Edit comment via {display_command()}: `{edit_cmd}`")
 
     if not body and not diff_hunk:
         lines.append("  (empty review comment)")

src/gh_llm/invocation.py

@@ -0,0 +1,28 @@
+from __future__ import annotations
+
+import os
+from pathlib import Path
+
+DEFAULT_DISPLAY_COMMAND = "gh-llm"
+DISPLAY_COMMAND_ENV = "GH_LLM_DISPLAY_CMD"
+
+
+def display_command() -> str:
+    raw = os.environ.get(DISPLAY_COMMAND_ENV, "").strip()
+    if raw:
+        return raw
+    return DEFAULT_DISPLAY_COMMAND
+
+
+def display_command_with(args: str) -> str:
+    suffix = args.strip()
+    if not suffix:
+        return display_command()
+    return f"{display_command()} {suffix}"
+
+
+def detect_prog_name(argv0: str) -> str:
+    name = Path(argv0).name
+    if name:
+        return name
+    return DEFAULT_DISPLAY_COMMAND

src/gh_llm/render.py

@@ -5,6 +5,8 @@
 from datetime import UTC
 from typing import TYPE_CHECKING
 
+from gh_llm.invocation import display_command, display_command_with
+
 if TYPE_CHECKING:
     from string.templatelib import Template
 
@@ -142,7 +144,7 @@ def render_checks_section(
     if not is_open:
         return [
             "## Checks",
-            f"Closed PR: checks are hidden by default. ⏎ run `gh-llm pr checks --pr {context.number} --repo {repo} --all`",
+            f"Closed PR: checks are hidden by default. ⏎ run `{display_command_with(f'pr checks --pr {context.number} --repo {repo} --all')}`",
             "",
         ]
 
@@ -167,13 +169,15 @@ def render_checks_section(
             elif item.details_url:
                 lines.append(f"   ⏎ details: `{item.details_url}`")
     if show_all:
-        lines.append(f"⏎ show only non-passed: `gh-llm pr checks --pr {context.number} --repo {repo}`")
+        lines.append(
+            f"⏎ show only non-passed: `{display_command_with(f'pr checks --pr {context.number} --repo {repo}')}`"
+        )
     elif hidden_count > 0:
         lines.append(
-            f"{hidden_count} passed checks hidden. ⏎ show all: `gh-llm pr checks --pr {context.number} --repo {repo} --all`"
+            f"{hidden_count} passed checks hidden. ⏎ show all: `{display_command_with(f'pr checks --pr {context.number} --repo {repo} --all')}`"
         )
     else:
-        lines.append(f"⏎ show all: `gh-llm pr checks --pr {context.number} --repo {repo} --all`")
+        lines.append(f"⏎ show all: `{display_command_with(f'pr checks --pr {context.number} --repo {repo} --all')}`")
     lines.append("")
     return lines
 
@@ -193,7 +197,7 @@ def render_hidden_gap(context: TimelineContext, hidden_pages: list[int]) -> list
         hidden_label,
         *[
             _render_template(
-                t"- ⏎ `gh-llm {context.kind} timeline-expand {page} --{selector_name} {context.number} --repo {repo}`"
+                t"- ⏎ `{display_command_with(f'{context.kind} timeline-expand {page} --{selector_name} {context.number} --repo {repo}')}`"
             )
             for page in hidden_pages
         ],
@@ -204,7 +208,10 @@ def render_hidden_gap(context: TimelineContext, hidden_pages: list[int]) -> list
 def _render_item(index: int, event: TimelineEvent, context: TimelineContext, command_group: str) -> list[str]:
     timestamp = event.timestamp.astimezone(UTC).strftime("%Y-%m-%d %H:%M UTC")
     selector_name = "issue" if command_group == "issue" else "pr"
-    details_action = f"⏎ run `gh-llm {command_group} details-expand {index} --{selector_name} {context.number} --repo {context.owner}/{context.name}`"
+    details_expand_cmd = display_command_with(
+        f"{command_group} details-expand {index} --{selector_name} {context.number} --repo {context.owner}/{context.name}"
+    )
+    details_action = f"⏎ run `{details_expand_cmd}`"
     display_summary = (event.summary or "").replace(
         "(details body collapsed)",
         f"(details body collapsed; {details_action})",
@@ -216,35 +223,36 @@ def _render_item(index: int, event: TimelineEvent, context: TimelineContext, com
         if event.reactions_summary:
             lines.append(f"   Reactions: {event.reactions_summary}")
         if event.editable_comment_id:
+            edit_cmd = display_command_with(
+                f"{command_group} comment-edit {event.editable_comment_id} --body '<comment_body>' --{selector_name} {context.number} --repo {context.owner}/{context.name}"
+            )
             lines.append(f"   ◌ comment_id: {event.editable_comment_id}")
             lines.append("   ⌨ comment_body: '<comment_body>'")
-            lines.append(
-                f"   ⏎ Edit comment via gh-llm: `gh-llm {command_group} comment-edit {event.editable_comment_id} --body '<comment_body>' --{selector_name} {context.number} --repo {context.owner}/{context.name}`"
-            )
+            lines.append(f"   ⏎ Edit comment via {display_command()}: `{edit_cmd}`")
     else:
         lines.extend(_indent_block(display_summary))
     if event.resolved_hidden_count > 0:
         repo = f"{context.owner}/{context.name}"
         lines.append(
             f"   {event.resolved_hidden_count} resolved review comments are collapsed; "
-            f"⏎ run `gh-llm pr review-expand {event.source_id} --pr {context.number} --repo {repo}`"
+            f"⏎ run `{display_command_with(f'pr review-expand {event.source_id} --pr {context.number} --repo {repo}')}`"
         )
     if event.minimized_hidden_count > 0:
         repo = f"{context.owner}/{context.name}"
         reason_suffix = f" (reason: {event.minimized_hidden_reasons})" if event.minimized_hidden_reasons else ""
         lines.append(
             f"   {event.minimized_hidden_count} hidden review comments are collapsed{reason_suffix}; "
-            f"⏎ run `gh-llm pr review-expand {event.source_id} --pr {context.number} --repo {repo}`"
+            f"⏎ run `{display_command_with(f'pr review-expand {event.source_id} --pr {context.number} --repo {repo}')}`"
         )
     if event.kind.startswith("review/"):
         detail_text = (event.full_text or event.summary or "").lower()
         if "diff hunk clipped" in detail_text:
             lines.append(
-                f"   ⏎ run `gh-llm pr review-expand {event.source_id} --pr {context.number} --repo {context.owner}/{context.name} --diff-hunk-lines 0` for full diff hunk context"
+                f"   ⏎ run `{display_command_with(f'pr review-expand {event.source_id} --pr {context.number} --repo {context.owner}/{context.name} --diff-hunk-lines 0')}` for full diff hunk context"
             )
     if event.is_truncated:
         lines.append(
-            f"   ⏎ run `gh-llm {command_group} event {index} --{selector_name} {context.number} --repo {context.owner}/{context.name}` for full content"
+            f"   ⏎ run `{display_command_with(f'{command_group} event {index} --{selector_name} {context.number} --repo {context.owner}/{context.name}')}` for full content"
         )
     if event.kind == "push/commit":
         lines.append(

tests/test_cli.py

@@ -1020,6 +1020,20 @@ def _events() -> list[dict[str, Any]]:
     return _base_events()
 
 
+def test_display_command_env_is_used_in_actions(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    monkeypatch.setenv("GH_LLM_DISPLAY_CMD", "gh llm")
+    monkeypatch.setattr(github_api.subprocess, "run", GhResponder().run)
+
+    code = cli.run(["pr", "view", "77928", "--repo", "PaddlePaddle/Paddle", "--page-size", "2"])
+    assert code == 0
+
+    out = capsys.readouterr().out
+    assert "gh llm pr timeline-expand 2 --pr 77928 --repo PaddlePaddle/Paddle" in out
+    assert "gh llm pr review-expand PRR_mock --pr 77928 --repo PaddlePaddle/Paddle" in out
+
+
 TEST_BASE_PAGE_SIZE = 2