pygitcode 0.1.1__tar.gz → 0.1.2a0__tar.gz

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygitcode
-Version: 0.1.1
+Version: 0.1.2a0
 Summary: A CLI tool for GitCode (api.gitcode.com), modeled after GitHub CLI.
 Author-email: codeasier <825770651@qq.com>
 License-Expression: MIT
@@ -45,7 +45,6 @@ Dynamic: license-file
 [![PyPI](https://img.shields.io/pypi/v/pygitcode)](https://pypi.org/project/pygitcode/)
 [![Python](https://img.shields.io/pypi/pyversions/pygitcode)](https://pypi.org/project/pygitcode/)
 [![License](https://img.shields.io/pypi/l/pygitcode)](https://github.com/yourusername/pygitcode/blob/main/LICENSE)
-[![Tests](https://github.com/codeasier/gitcode-cli/workflows/Tests/badge.svg)](https://github.com/yourusername/pygitcode/actions)
 
 ## Installation
 
@@ -83,6 +82,15 @@ Set-Alias -Name gc -Value 'C:\Users\<user>\AppData\Roaming\Python\Python313\Scri
 # Login with your GitCode personal access token
 gc auth login
 
+# Check auth status
+gc auth status
+
+# Print the current auth token
+gc auth token
+
+# Logout
+gc auth logout
+
 # Or set environment variable
 export GC_TOKEN=your_token_here
 ```
@@ -103,12 +111,14 @@ gc issue view 42 --web
 
 # Create an issue
 gc issue create -t "Bug report" -b "Something is broken"
+gc issue create --label bug --label "help wanted"   # Multiple labels
 gc issue create --web    # Create in browser
 
-# Edit an issue (add/remove labels, assignees)
+# Edit an issue (add/remove labels, assignees, milestones)
 gc issue edit 42 -t "Updated title"
 gc issue edit 42 --add-label bug --remove-label "in progress"
 gc issue edit 42 --add-assignee @me --remove-assignee otheruser
+gc issue edit 42 --milestone v1.0 --remove-milestone
 
 # Comment on an issue
 gc issue comment 42 -b "Thanks for the report!"
@@ -116,8 +126,7 @@ gc issue comment 42 --editor    # Use system editor
 
 # Close / reopen / delete
 gc issue close 42
-gc issue reopen 42
-gc issue delete 42
+gc issue close 42 -c "Fixed in #50" --reason completed
 ```
 
 ### Pull Requests
@@ -132,6 +141,7 @@ gc pr list --web    # Open in browser
 # View a PR (identifier optional - infers from current branch)
 gc pr view           # View PR for current branch
 gc pr view 42        # By number
+gc pr view 42 --comments   # Include comments
 gc pr view https://gitcode.com/owner/repo/pulls/42
 gc pr view feature-branch
 
@@ -160,11 +170,13 @@ gc pr close --delete-branch    # Delete remote branch too
 gc pr merge          # Merge PR for current branch
 gc pr merge 42 -s    # Squash merge
 gc pr merge --rebase
+gc pr merge --delete-branch    # Delete remote branch after merge
 
-# Edit a PR (add/remove labels, assignees, reviewers)
+# Edit a PR (add/remove labels, assignees, reviewers, milestones)
 gc pr edit 42 -t "New title"
 gc pr edit --add-label bug --remove-label "needs review"
 gc pr edit --add-reviewer @me --remove-reviewer otheruser
+gc pr edit --milestone v1.0 --remove-milestone
 
 # Mark as ready or convert to draft
 gc pr ready          # Mark current branch's PR as ready
@@ -173,6 +185,8 @@ gc pr ready --undo   # Convert back to draft
 # Comment / review / diff (identifier optional)
 gc pr comment -b "LGTM"
 gc pr comment --path src/file.py --position 5 -b "Suggestion"
+gc pr comment --body-file comment.txt
+gc pr comment --editor
 
 gc pr review --approve
 gc pr review --comment -b "Looks good but needs tests"

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/README.md

@@ -5,7 +5,6 @@
 [![PyPI](https://img.shields.io/pypi/v/pygitcode)](https://pypi.org/project/pygitcode/)
 [![Python](https://img.shields.io/pypi/pyversions/pygitcode)](https://pypi.org/project/pygitcode/)
 [![License](https://img.shields.io/pypi/l/pygitcode)](https://github.com/yourusername/pygitcode/blob/main/LICENSE)
-[![Tests](https://github.com/codeasier/gitcode-cli/workflows/Tests/badge.svg)](https://github.com/yourusername/pygitcode/actions)
 
 ## Installation
 
@@ -43,6 +42,15 @@ Set-Alias -Name gc -Value 'C:\Users\<user>\AppData\Roaming\Python\Python313\Scri
 # Login with your GitCode personal access token
 gc auth login
 
+# Check auth status
+gc auth status
+
+# Print the current auth token
+gc auth token
+
+# Logout
+gc auth logout
+
 # Or set environment variable
 export GC_TOKEN=your_token_here
 ```
@@ -63,12 +71,14 @@ gc issue view 42 --web
 
 # Create an issue
 gc issue create -t "Bug report" -b "Something is broken"
+gc issue create --label bug --label "help wanted"   # Multiple labels
 gc issue create --web    # Create in browser
 
-# Edit an issue (add/remove labels, assignees)
+# Edit an issue (add/remove labels, assignees, milestones)
 gc issue edit 42 -t "Updated title"
 gc issue edit 42 --add-label bug --remove-label "in progress"
 gc issue edit 42 --add-assignee @me --remove-assignee otheruser
+gc issue edit 42 --milestone v1.0 --remove-milestone
 
 # Comment on an issue
 gc issue comment 42 -b "Thanks for the report!"
@@ -76,8 +86,7 @@ gc issue comment 42 --editor    # Use system editor
 
 # Close / reopen / delete
 gc issue close 42
-gc issue reopen 42
-gc issue delete 42
+gc issue close 42 -c "Fixed in #50" --reason completed
 ```
 
 ### Pull Requests
@@ -92,6 +101,7 @@ gc pr list --web    # Open in browser
 # View a PR (identifier optional - infers from current branch)
 gc pr view           # View PR for current branch
 gc pr view 42        # By number
+gc pr view 42 --comments   # Include comments
 gc pr view https://gitcode.com/owner/repo/pulls/42
 gc pr view feature-branch
 
@@ -120,11 +130,13 @@ gc pr close --delete-branch    # Delete remote branch too
 gc pr merge          # Merge PR for current branch
 gc pr merge 42 -s    # Squash merge
 gc pr merge --rebase
+gc pr merge --delete-branch    # Delete remote branch after merge
 
-# Edit a PR (add/remove labels, assignees, reviewers)
+# Edit a PR (add/remove labels, assignees, reviewers, milestones)
 gc pr edit 42 -t "New title"
 gc pr edit --add-label bug --remove-label "needs review"
 gc pr edit --add-reviewer @me --remove-reviewer otheruser
+gc pr edit --milestone v1.0 --remove-milestone
 
 # Mark as ready or convert to draft
 gc pr ready          # Mark current branch's PR as ready
@@ -133,6 +145,8 @@ gc pr ready --undo   # Convert back to draft
 # Comment / review / diff (identifier optional)
 gc pr comment -b "LGTM"
 gc pr comment --path src/file.py --position 5 -b "Suggestion"
+gc pr comment --body-file comment.txt
+gc pr comment --editor
 
 gc pr review --approve
 gc pr review --comment -b "Looks good but needs tests"

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pygitcode"
-version = "0.1.1"
+dynamic = ["version"]
 description = "A CLI tool for GitCode (api.gitcode.com), modeled after GitHub CLI."
 readme = "README.md"
 license = "MIT"
@@ -58,6 +58,9 @@ gitcode = "gitcode_cli.cli:main"
 [tool.setuptools.packages.find]
 where = ["src"]
 
+[tool.setuptools.dynamic]
+version = {attr = "gitcode_cli.__version__"}
+
 # --- pytest ---
 [tool.pytest.ini_options]
 testpaths = ["tests"]

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/src/gitcode_cli/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.1.0"
+__version__ = "0.1.2a0"

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/src/gitcode_cli/cli.py

@@ -1,5 +1,9 @@
 from __future__ import annotations
 
+import contextlib
+import importlib.metadata
+import sys
+
 import click
 
 from . import __version__
@@ -9,14 +13,32 @@ from .commands.pr import pr_group
 from .config import get_token
 from .context import AppContext
 from .errors import GCError
+from .utils import safe_echo
+
+
+def _configure_stdout_encoding() -> None:
+    if sys.platform != "win32":
+        return
+    for stream in (sys.stdout, sys.stderr):
+        if hasattr(stream, "reconfigure") and stream.isatty():
+            with contextlib.suppress(Exception):
+                stream.reconfigure(encoding="utf-8", errors="replace")  # type: ignore[attr-defined]
+
+
+def _get_version() -> str:
+    try:
+        return importlib.metadata.version("pygitcode")
+    except importlib.metadata.PackageNotFoundError:
+        return __version__
 
 
 @click.group(context_settings={"help_option_names": ["-h", "--help"]})
-@click.version_option(version=__version__, prog_name="gitcode")
+@click.version_option(version=_get_version(), prog_name="gitcode")
 @click.option("--repo", "repo_name", "-R", help="Repository in OWNER/REPO format (default: gitcode.com).")
 @click.option("--token", hidden=True, help="Override authentication token.")
 @click.pass_context
 def main(ctx: click.Context, repo_name: str | None, token: str | None) -> None:
+    _configure_stdout_encoding()
     ctx.ensure_object(dict)
     try:
         resolved_token = token or get_token()
@@ -32,7 +54,7 @@ def process_result(*_args: object, **_kwargs: object) -> None:
 
 @main.command("version")
 def version_command() -> None:
-    click.echo(f"gitcode version {__version__}")
+    safe_echo(f"gitcode version {_get_version()}")
 
 
 main.add_command(auth_group)

pygitcode-0.1.2a0/src/gitcode_cli/commands/auth.py

@@ -0,0 +1,54 @@
+from __future__ import annotations
+
+import click
+
+from ..config import get_token, load_config, save_config
+from ..utils import safe_echo
+
+
+@click.group("auth")
+def auth_group() -> None:
+    pass
+
+
+@auth_group.command("login")
+@click.option("--with-token", is_flag=True, help="Read token from stdin.")
+def auth_login(with_token: bool) -> None:
+    if with_token:
+        token = click.get_text_stream("stdin").read().strip()
+        if not token:
+            raise click.ClickException("No token provided on stdin.")
+    else:
+        token = click.prompt("GitCode token", hide_input=True)
+    save_config({"token": token})
+    safe_echo("Authentication saved.")
+
+
+@auth_group.command("logout")
+def auth_logout() -> None:
+    config = load_config()
+    if "token" not in config:
+        raise click.ClickException("Not logged in.")
+    del config["token"]
+    save_config(config)
+    safe_echo("Logged out.")
+
+
+@auth_group.command("status")
+def auth_status() -> None:
+    try:
+        token = get_token()
+    except Exception:
+        safe_echo("Not logged in. Run `gc auth login` to authenticate.")
+        return
+    masked = token[:4] + "****" if len(token) > 4 else "****"
+    safe_echo(f"Logged in to GitCode (token: {masked})")
+
+
+@auth_group.command("token")
+def auth_token() -> None:
+    try:
+        token = get_token()
+    except Exception as exc:
+        raise click.ClickException(str(exc)) from exc
+    safe_echo(token)

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/src/gitcode_cli/commands/issue.py

@@ -6,13 +6,13 @@ from ..cli_compat import get_body_from_options, normalize_multi_values
 from ..formatters import format_issue_detail, format_issue_list, output_result
 from ..repo import resolve_repo
 from ..services import IssueService
-from ..utils import open_in_browser, prompt_if_missing, read_body_file, resolve_issue_arg
+from ..utils import open_in_browser, prompt_if_missing, read_body_file, resolve_issue_arg, safe_echo, safe_number
 
 
 def _echo_issue_summary(items: list[dict]) -> None:
     output = format_issue_list(items)
     if output:
-        click.echo(output)
+        safe_echo(output)
 
 
 @click.group("issue")
@@ -118,11 +118,11 @@ def issue_view(
         data["comments"] = comment_items
 
         def default_formatter(data: dict) -> None:
-            click.echo(format_issue_detail(data))
+            safe_echo(format_issue_detail(data))
             if comment_items:
-                click.echo("\nComments:")
+                safe_echo("\nComments:")
                 for comment in comment_items:
-                    click.echo(f"- {comment.get('body') or ''}")
+                    safe_echo(f"- {comment.get('body') or ''}")
 
         output_result(
             data,
@@ -137,7 +137,7 @@ def issue_view(
         json_fields,
         jq_query,
         template,
-        default_formatter=lambda data: click.echo(format_issue_detail(data)),
+        default_formatter=lambda data: safe_echo(format_issue_detail(data)),
     )
 
 
@@ -146,7 +146,7 @@ def issue_view(
 @click.option("-t", "--title")
 @click.option("-b", "--body")
 @click.option("-a", "--assignee")
-@click.option("-l", "--label", "labels")
+@click.option("-l", "--label", "labels", multiple=True)
 @click.option("-m", "--milestone")
 @click.option("-F", "--body-file")
 @click.option("-w", "--web", is_flag=True, help="Open the issue in the web browser.")
@@ -160,7 +160,7 @@ def issue_create(
     title: str | None,
     body: str | None,
     assignee: str | None,
-    labels: str | None,
+    labels: tuple[str, ...] | None,
     milestone: str | None,
     body_file: str | None,
     web: bool,
@@ -176,22 +176,33 @@ def issue_create(
     title = prompt_if_missing(title, "Title")
     if body_file:
         body = read_body_file(body_file)
+    labels_str = normalize_multi_values(labels)
     service = IssueService(app.client())
-    item = service.create(owner, repo, title=title, body=body, assignee=assignee, labels=labels, milestone=milestone)
+    item = service.create(
+        owner, repo, title=title, body=body, assignee=assignee, labels=labels_str, milestone=milestone
+    )
     output_result(
         item,
         json_fields,
         jq_query,
         template,
-        default_formatter=lambda data: click.echo(data["html_url"]),
+        default_formatter=lambda data: safe_echo(data["html_url"]),
     )
 
 
 @issue_group.command("close")
 @click.option("-R", "--repo", "repo_name", help="Repository in OWNER/REPO format (default: gitcode.com).")
 @click.argument("identifier")
+@click.option("-c", "--comment", help="Leave a closing comment.")
+@click.option("-r", "--reason", type=click.Choice(["completed", "not_planned"]), help="Reason for closing.")
 @click.pass_context
-def issue_close(ctx: click.Context, repo_name: str | None, identifier: str) -> None:
+def issue_close(
+    ctx: click.Context,
+    repo_name: str | None,
+    identifier: str,
+    comment: str | None,
+    reason: str | None,
+) -> None:
     app = ctx.obj["app"]
     url_owner, url_repo, number = resolve_issue_arg(identifier)
     if url_owner:
@@ -200,8 +211,13 @@ def issue_close(ctx: click.Context, repo_name: str | None, identifier: str) -> N
     else:
         owner, repo = resolve_repo(repo_name or app.repo)
     service = IssueService(app.client())
-    item = service.update(owner, repo, number, state="closed")
-    click.echo(f"Closed issue #{item['number']}")
+    if comment:
+        service.comment(owner, repo, number, comment)
+    update_data: dict = {"state": "closed"}
+    if reason:
+        update_data["state_reason"] = reason
+    item = service.update(owner, repo, number, **update_data)
+    safe_echo(f"Closed issue #{safe_number(item, number)}")
 
 
 @issue_group.command("comment")
@@ -235,7 +251,7 @@ def issue_comment(
     body = prompt_if_missing(body, "Body")
     service = IssueService(app.client())
     item = service.comment(owner, repo, number, body)
-    click.echo(str(item["id"]))
+    safe_echo(str(item["id"]))
 
 
 @issue_group.command("reopen")
@@ -252,7 +268,7 @@ def issue_reopen(ctx: click.Context, repo_name: str | None, identifier: str) ->
         owner, repo = resolve_repo(repo_name or app.repo)
     service = IssueService(app.client())
     item = service.update(owner, repo, number, state="open")
-    click.echo(f"Reopened issue #{item['number']}")
+    safe_echo(f"Reopened issue #{safe_number(item, number)}")
 
 
 @issue_group.command("edit")
@@ -260,10 +276,13 @@ def issue_reopen(ctx: click.Context, repo_name: str | None, identifier: str) ->
 @click.argument("identifier")
 @click.option("-t", "--title")
 @click.option("-b", "--body")
+@click.option("-F", "--body-file")
 @click.option("-a", "--add-assignee")
 @click.option("-l", "--add-label")
 @click.option("--remove-assignee")
 @click.option("--remove-label")
+@click.option("-m", "--milestone")
+@click.option("--remove-milestone", is_flag=True, help="Remove the milestone from the issue.")
 @click.pass_context
 def issue_edit(
     ctx: click.Context,
@@ -271,10 +290,13 @@ def issue_edit(
     identifier: str,
     title: str | None,
     body: str | None,
+    body_file: str | None,
     add_assignee: str | None,
     add_label: str | None,
     remove_assignee: str | None,
     remove_label: str | None,
+    milestone: str | None,
+    remove_milestone: bool,
 ) -> None:
     app = ctx.obj["app"]
     url_owner, url_repo, number = resolve_issue_arg(identifier)
@@ -283,7 +305,8 @@ def issue_edit(
         owner, repo = url_owner, url_repo
     else:
         owner, repo = resolve_repo(repo_name or app.repo)
-    service = IssueService(app.client())
+    if body_file:
+        body = read_body_file(body_file)
     data = {
         k: v
         for k, v in {
@@ -293,13 +316,17 @@ def issue_edit(
             "labels": add_label,
             "unassignee": remove_assignee,
             "unset_labels": remove_label,
+            "milestone": milestone,
         }.items()
         if v is not None
     }
+    if remove_milestone:
+        data["milestone"] = ""
     if not data:
         raise click.UsageError("must specify at least one field to edit")
+    service = IssueService(app.client())
     item = service.update(owner, repo, number, **data)
-    click.echo(f"Edited issue #{item['number']}")
+    safe_echo(f"Edited issue #{safe_number(item, number)}")
 
 
 @issue_group.command("delete")
@@ -317,7 +344,7 @@ def issue_delete(ctx: click.Context, repo_name: str | None, identifier: str) ->
         owner, repo = resolve_repo(repo_name or app.repo)
     service = IssueService(app.client())
     service.delete(owner, repo, number)
-    click.echo(f"Deleted issue #{number}")
+    safe_echo(f"Deleted issue #{number}")
 
 
 @issue_group.command("status")
@@ -328,10 +355,10 @@ def issue_status(ctx: click.Context, repo_name: str | None) -> None:
     owner, repo = resolve_repo(repo_name or app.repo)
     service = IssueService(app.client())
     items = service.list(owner, repo, state="open")
-    click.echo("GitCode-limited approximation of gh issue status")
-    click.echo(f"Repository open issues for {owner}/{repo}:")
+    safe_echo("GitCode-limited approximation of gh issue status")
+    safe_echo(f"Repository open issues for {owner}/{repo}:")
     for item in items:
-        click.echo(f"  #{item['number']}\t{item['state']}\t{item['title']}")
+        safe_echo(f"  #{safe_number(item, '?')}\t{item['state']}\t{item['title']}")
 
 
 issue_group.add_command(issue_list, name="ls")

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/src/gitcode_cli/commands/pr.py

@@ -15,7 +15,15 @@ from ..cli_compat import (
 from ..formatters import format_pr_detail, format_pr_list, output_result
 from ..repo import resolve_repo
 from ..services import PullRequestService
-from ..utils import get_current_git_branch, open_in_browser, prompt_if_missing, resolve_pr_arg
+from ..utils import (
+    get_current_git_branch,
+    open_in_browser,
+    prompt_if_missing,
+    read_body_file,
+    resolve_pr_arg,
+    safe_echo,
+    safe_number,
+)
 
 
 @click.group("pr")
@@ -81,7 +89,7 @@ def pr_list(
     def default_formatter(data):
         output = format_pr_list(data)
         if output:
-            click.echo(output)
+            safe_echo(output)
 
     output_result(
         items,
@@ -96,6 +104,7 @@ def pr_list(
 @click.option("-R", "--repo", "repo_name", help="Repository in OWNER/REPO format (default: gitcode.com).")
 @click.argument("identifier", required=False)
 @click.option("-w", "--web", is_flag=True, help="Open the pull request in the web browser.")
+@click.option("-c", "--comments", is_flag=True, help="View pull request comments.")
 @click.option("--json", "json_fields", help="Output JSON. Optionally specify comma-separated fields.")
 @click.option("-q", "--jq", "jq_query", help="Filter JSON output using a jq expression.")
 @click.option("-t", "--template", help="Format output using a Go template string.")
@@ -105,6 +114,7 @@ def pr_view(
     repo_name: str | None,
     identifier: str | None,
     web: bool,
+    comments: bool,
     json_fields: str | None,
     jq_query: str | None,
     template: str | None,
@@ -119,12 +129,32 @@ def pr_view(
     if web:
         open_in_browser(item["html_url"])
         return
+    if comments:
+        comment_items = service.list_comments(owner, repo, number)
+        data = dict(item) if item else {}
+        data["comments"] = comment_items
+
+        def default_formatter(data: dict) -> None:
+            safe_echo(format_pr_detail(data))
+            if comment_items:
+                safe_echo("\nComments:")
+                for comment in comment_items:
+                    safe_echo(f"- {comment.get('body') or ''}")
+
+        output_result(
+            data,
+            json_fields,
+            jq_query,
+            template,
+            default_formatter=default_formatter,
+        )
+        return
     output_result(
         item,
         json_fields,
         jq_query,
         template,
-        default_formatter=lambda data: click.echo(format_pr_detail(data)),
+        default_formatter=lambda data: safe_echo(format_pr_detail(data)),
     )
 
 
@@ -214,7 +244,7 @@ def pr_create(
         "milestone": milestone,
     }
     if dry_run:
-        click.echo(json.dumps({k: v for k, v in payload.items() if v is not None}, indent=2, sort_keys=True))
+        safe_echo(json.dumps({k: v for k, v in payload.items() if v is not None}, indent=2, sort_keys=True))
         return
     service = PullRequestService(app.client())
     item = service.create(owner, repo, **payload)
@@ -223,7 +253,11 @@ def pr_create(
         json_fields,
         jq_query,
         template,
-        default_formatter=lambda data: click.echo(data["html_url"]),
+        default_formatter=lambda data: safe_echo(
+            data.get("html_url")
+            or data.get("url")
+            or (f"Created PR #{data['number']}" if "number" in data else "Created pull request")
+        ),
     )
 
 
@@ -250,12 +284,12 @@ def pr_close(
             branch = item.get("head", {}).get("ref")
             if branch:
                 subprocess.run(["git", "push", "origin", "--delete", branch], check=True)
-                click.echo(f"Deleted remote branch {branch}")
+                safe_echo(f"Deleted remote branch {branch}")
             else:
-                click.echo("Warning: could not determine branch to delete.", err=True)
+                safe_echo("Warning: could not determine branch to delete.", err=True)
         except Exception as exc:
-            click.echo(f"Warning: could not delete remote branch: {exc}", err=True)
-    click.echo(f"Closed pull request #{item['number']}")
+            safe_echo(f"Warning: could not delete remote branch: {exc}", err=True)
+    safe_echo(f"Closed pull request #{safe_number(item, number)}")
 
 
 @pr_group.command("merge")
@@ -264,22 +298,43 @@ def pr_close(
 @click.option("-m", "--merge", "merge_mode", flag_value="merge")
 @click.option("-s", "--squash", "merge_mode", flag_value="squash")
 @click.option("-r", "--rebase", "merge_mode", flag_value="rebase")
+@click.option("-d", "--delete-branch", is_flag=True, help="Delete the remote branch after merge.")
 @click.pass_context
-def pr_merge(ctx: click.Context, repo_name: str | None, identifier: str | None, merge_mode: str | None) -> None:
+def pr_merge(
+    ctx: click.Context,
+    repo_name: str | None,
+    identifier: str | None,
+    merge_mode: str | None,
+    delete_branch: bool,
+) -> None:
     app = ctx.obj["app"]
     owner, repo = resolve_repo(repo_name or app.repo)
     service = PullRequestService(app.client())
     resolved_identifier = resolve_pr_identifier_or_current_branch(identifier)
     owner, repo, number = resolve_pr_arg(resolved_identifier, owner, repo, service)
     number = int(number)
+    pr_item = service.get(owner, repo, number)
     item = service.merge(owner, repo, number, merge_method=merge_mode or "merge")
-    click.echo(item["message"])
+    safe_echo(item["message"])
+    if delete_branch:
+        try:
+            branch = pr_item.get("head", {}).get("ref")
+            if branch:
+                subprocess.run(["git", "push", "origin", "--delete", branch], check=True)
+                safe_echo(f"Deleted remote branch {branch}")
+            else:
+                safe_echo("Warning: could not determine branch to delete.", err=True)
+        except Exception as exc:
+            safe_echo(f"Warning: could not delete remote branch: {exc}", err=True)
 
 
 @pr_group.command("comment")
 @click.option("-R", "--repo", "repo_name", help="Repository in OWNER/REPO format (default: gitcode.com).")
 @click.argument("identifier", required=False)
 @click.option("-b", "--body")
+@click.option("-F", "--body-file")
+@click.option("-e", "--editor", is_flag=True)
+@click.option("-w", "--web", is_flag=True, help="Open the pull request in the web browser.")
 @click.option("--path")
 @click.option("--position", type=int)
 @click.pass_context
@@ -288,6 +343,9 @@ def pr_comment(
     repo_name: str | None,
     identifier: str | None,
     body: str | None,
+    body_file: str | None,
+    editor: bool,
+    web: bool,
     path: str | None,
     position: int | None,
 ) -> None:
@@ -297,9 +355,14 @@ def pr_comment(
     resolved_identifier = resolve_pr_identifier_or_current_branch(identifier)
     owner, repo, number = resolve_pr_arg(resolved_identifier, owner, repo, service)
     number = int(number)
+    if web:
+        pr_item = service.get(owner, repo, number)
+        open_in_browser(pr_item["html_url"])
+        return
+    body = get_body_from_options(body=body, body_file=body_file, editor=editor)
     body = prompt_if_missing(body, "Body")
     item = service.comment(owner, repo, number, body=body, path=path, position=position)
-    click.echo(str(item["id"]))
+    safe_echo(str(item["id"]))
 
 
 @pr_group.command("review")
@@ -337,16 +400,16 @@ def pr_review(
             raise click.ClickException("Body is required when using --comment or --request-changes.")
         item = service.comment(owner, repo, number, body=body)
         if comment:
-            click.echo("GitCode review API does not support comment reviews; posted a pull request comment instead.")
+            safe_echo("GitCode review API does not support comment reviews; posted a pull request comment instead.")
         else:
-            click.echo(
+            safe_echo(
                 "GitCode review API does not support request-changes reviews; posted a pull request comment instead."
             )
-        click.echo(f"Posted pull request comment {item['id']}")
+        safe_echo(f"Posted pull request comment {item['id']}")
         return
 
     item = service.review(owner, repo, number, body=body, force=force)
-    click.echo(f"Reviewed pull request #{number}")
+    safe_echo(f"Reviewed pull request #{number}")
 
 
 @pr_group.command("reopen")
@@ -361,7 +424,7 @@ def pr_reopen(ctx: click.Context, repo_name: str | None, identifier: str | None)
     owner, repo, number = resolve_pr_arg(resolved_identifier, owner, repo, service)
     number = int(number)
     item = service.update(owner, repo, number, state="open")
-    click.echo(f"Reopened pull request #{item['number']}")
+    safe_echo(f"Reopened pull request #{safe_number(item, number)}")
 
 
 @pr_group.command("edit")
@@ -369,6 +432,7 @@ def pr_reopen(ctx: click.Context, repo_name: str | None, identifier: str | None)
 @click.argument("identifier", required=False)
 @click.option("-t", "--title")
 @click.option("-b", "--body")
+@click.option("-F", "--body-file")
 @click.option("-B", "--base")
 @click.option("-a", "--add-assignee")
 @click.option("-l", "--add-label")
@@ -376,6 +440,8 @@ def pr_reopen(ctx: click.Context, repo_name: str | None, identifier: str | None)
 @click.option("--remove-assignee")
 @click.option("--remove-label")
 @click.option("--remove-reviewer")
+@click.option("-m", "--milestone")
+@click.option("--remove-milestone", is_flag=True, help="Remove the milestone from the pull request.")
 @click.pass_context
 def pr_edit(
     ctx: click.Context,
@@ -383,6 +449,7 @@ def pr_edit(
     identifier: str | None,
     title: str | None,
     body: str | None,
+    body_file: str | None,
     base: str | None,
     add_assignee: str | None,
     add_label: str | None,
@@ -390,6 +457,8 @@ def pr_edit(
     remove_assignee: str | None,
     remove_label: str | None,
     remove_reviewer: str | None,
+    milestone: str | None,
+    remove_milestone: bool,
 ) -> None:
     app = ctx.obj["app"]
     owner, repo = resolve_repo(repo_name or app.repo)
@@ -397,6 +466,8 @@ def pr_edit(
     resolved_identifier = resolve_pr_identifier_or_current_branch(identifier)
     owner, repo, number = resolve_pr_arg(resolved_identifier, owner, repo, service)
     number = int(number)
+    if body_file:
+        body = read_body_file(body_file)
     data = {
         k: v
         for k, v in {
@@ -409,13 +480,16 @@ def pr_edit(
             "unassignee": remove_assignee,
             "unset_labels": remove_label,
             "unset_reviewer": remove_reviewer,
+            "milestone": milestone,
         }.items()
         if v is not None
     }
+    if remove_milestone:
+        data["milestone"] = ""
     if not data:
         raise click.UsageError("must specify at least one field to edit")
     item = service.update(owner, repo, number, **data)
-    click.echo(f"Edited pull request #{item['number']}")
+    safe_echo(f"Edited pull request #{safe_number(item, number)}")
 
 
 @pr_group.command("diff")
@@ -429,7 +503,7 @@ def pr_diff(ctx: click.Context, repo_name: str | None, identifier: str | None) -
     resolved_identifier = resolve_pr_identifier_or_current_branch(identifier)
     owner, repo, number = resolve_pr_arg(resolved_identifier, owner, repo, service)
     diff_text = service.diff(owner, repo, int(number))
-    click.echo(diff_text)
+    safe_echo(diff_text)
 
 
 @pr_group.command("checkout")
@@ -451,7 +525,7 @@ def pr_checkout(ctx: click.Context, repo_name: str | None, identifier: str | Non
     try:
         subprocess.run(["git", "fetch", "origin", head_ref], check=True)
         subprocess.run(["git", "checkout", "-b", local_branch, f"origin/{head_ref}"], check=True)
-        click.echo(f"Checked out branch {local_branch}")
+        safe_echo(f"Checked out branch {local_branch}")
     except subprocess.CalledProcessError as exc:
         raise click.ClickException(f"Git checkout failed: {exc}") from exc
 
@@ -469,9 +543,9 @@ def pr_ready(ctx: click.Context, repo_name: str | None, identifier: str | None,
     owner, repo, number = resolve_pr_arg(resolved_identifier, owner, repo, service)
     item = service.update(owner, repo, int(number), draft=undo)
     if undo:
-        click.echo(f"Converted pull request #{item['number']} to draft")
+        safe_echo(f"Converted pull request #{safe_number(item, number)} to draft")
     else:
-        click.echo(f"Marked pull request #{item['number']} as ready for review")
+        safe_echo(f"Marked pull request #{safe_number(item, number)} as ready for review")
 
 
 @pr_group.command("status")
@@ -482,14 +556,14 @@ def pr_status(ctx: click.Context, repo_name: str | None) -> None:
     owner, repo = resolve_repo(repo_name or app.repo)
     service = PullRequestService(app.client())
     items = service.list(owner, repo, state="open")
-    click.echo(
+    safe_echo(
         f"Open pull requests in {owner}/{repo}  (GitCode API approximation -- user-specific filtering is not available)"
     )
     if items:
         for item in items:
-            click.echo(f"  #{item['number']}\t{item['state']}\t{item['title']}")
+            safe_echo(f"  #{safe_number(item, '?')}\t{item['state']}\t{item['title']}")
     else:
-        click.echo("  No open pull requests")
+        safe_echo("  No open pull requests")
 
 
 pr_group.add_command(pr_list, name="ls")

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/src/gitcode_cli/formatters.py

@@ -7,6 +7,8 @@ import subprocess
 
 import click
 
+from .utils import safe_echo
+
 
 def dump_json(data, fields: list[str] | None = None) -> str:
     if fields:
@@ -147,17 +149,17 @@ def render_template(data, template: str) -> str:
 def output_result(data, json_fields: str | None, jq_query: str | None, template: str | None, default_formatter):
     if jq_query:
         data = apply_jq(data, jq_query)
-        click.echo(dump_json(data))
+        safe_echo(dump_json(data))
         return
     if json_fields:
         fields = [f.strip() for f in json_fields.split(",")]
-        click.echo(dump_json(data, fields=fields))
+        safe_echo(dump_json(data, fields=fields))
         return
     if template:
         if isinstance(data, list):
             for item in data:
-                click.echo(render_template(item, template))
+                safe_echo(render_template(item, template))
         else:
-            click.echo(render_template(data, template))
+            safe_echo(render_template(data, template))
         return
     default_formatter(data)

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/src/gitcode_cli/services/pulls.py

@@ -41,6 +41,9 @@ class PullRequestService:
         filtered_payload = {k: v for k, v in payload.items() if v is not None}
         return self.client.post(f"/repos/{owner}/{repo}/pulls/{number}/review", json=filtered_payload)
 
+    def list_comments(self, owner: str, repo: str, number: int) -> Any | None:
+        return self.client.get(f"/repos/{owner}/{repo}/pulls/{number}/comments")
+
     def diff(self, owner: str, repo: str, number: int) -> str:
         response = self.client.request(
             "GET",

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/src/gitcode_cli/utils.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 import re
 import subprocess
+import sys
 import webbrowser
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 import click
 
@@ -60,6 +61,15 @@ def open_in_browser(url: str) -> None:
     webbrowser.open(url)
 
 
+def safe_number(item: Any, fallback: int | str) -> int | str:
+    if isinstance(item, dict):
+        if "number" in item and item["number"] is not None:
+            return item["number"]
+        if "iid" in item and item["iid"] is not None:
+            return item["iid"]
+    return fallback
+
+
 # --- Issue / PR identifier resolvers ---
 
 ISSUE_URL_RE = re.compile(r"https?://[^/]+/(?P<owner>[^/]+)/(?P<repo>[^/]+)/issues/(?P<number>\d+)")
@@ -116,3 +126,13 @@ def resolve_pr_arg(identifier: str, owner: str, repo: str, service: PullRequestS
             return owner, repo, str(item["number"])
 
     raise click.ClickException(f"No open pull request found for branch '{identifier}'.")
+
+
+def safe_echo(message: str | None = None, err: bool = False) -> None:
+    try:
+        click.echo(message, err=err)
+    except UnicodeEncodeError:
+        stream = sys.stderr if err else sys.stdout
+        encoding = stream.encoding or "utf-8"
+        encoded = (message or "").encode(encoding, errors="replace").decode(encoding, errors="replace")
+        click.echo(encoded, err=err)

{pygitcode-0.1.1 → pygitcode-0.1.2a0}/src/pygitcode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygitcode
-Version: 0.1.1
+Version: 0.1.2a0
 Summary: A CLI tool for GitCode (api.gitcode.com), modeled after GitHub CLI.
 Author-email: codeasier <825770651@qq.com>
 License-Expression: MIT
@@ -45,7 +45,6 @@ Dynamic: license-file
 [![PyPI](https://img.shields.io/pypi/v/pygitcode)](https://pypi.org/project/pygitcode/)
 [![Python](https://img.shields.io/pypi/pyversions/pygitcode)](https://pypi.org/project/pygitcode/)
 [![License](https://img.shields.io/pypi/l/pygitcode)](https://github.com/yourusername/pygitcode/blob/main/LICENSE)
-[![Tests](https://github.com/codeasier/gitcode-cli/workflows/Tests/badge.svg)](https://github.com/yourusername/pygitcode/actions)
 
 ## Installation
 
@@ -83,6 +82,15 @@ Set-Alias -Name gc -Value 'C:\Users\<user>\AppData\Roaming\Python\Python313\Scri
 # Login with your GitCode personal access token
 gc auth login
 
+# Check auth status
+gc auth status
+
+# Print the current auth token
+gc auth token
+
+# Logout
+gc auth logout
+
 # Or set environment variable
 export GC_TOKEN=your_token_here
 ```
@@ -103,12 +111,14 @@ gc issue view 42 --web
 
 # Create an issue
 gc issue create -t "Bug report" -b "Something is broken"
+gc issue create --label bug --label "help wanted"   # Multiple labels
 gc issue create --web    # Create in browser
 
-# Edit an issue (add/remove labels, assignees)
+# Edit an issue (add/remove labels, assignees, milestones)
 gc issue edit 42 -t "Updated title"
 gc issue edit 42 --add-label bug --remove-label "in progress"
 gc issue edit 42 --add-assignee @me --remove-assignee otheruser
+gc issue edit 42 --milestone v1.0 --remove-milestone
 
 # Comment on an issue
 gc issue comment 42 -b "Thanks for the report!"
@@ -116,8 +126,7 @@ gc issue comment 42 --editor    # Use system editor
 
 # Close / reopen / delete
 gc issue close 42
-gc issue reopen 42
-gc issue delete 42
+gc issue close 42 -c "Fixed in #50" --reason completed
 ```
 
 ### Pull Requests
@@ -132,6 +141,7 @@ gc pr list --web    # Open in browser
 # View a PR (identifier optional - infers from current branch)
 gc pr view           # View PR for current branch
 gc pr view 42        # By number
+gc pr view 42 --comments   # Include comments
 gc pr view https://gitcode.com/owner/repo/pulls/42
 gc pr view feature-branch
 
@@ -160,11 +170,13 @@ gc pr close --delete-branch    # Delete remote branch too
 gc pr merge          # Merge PR for current branch
 gc pr merge 42 -s    # Squash merge
 gc pr merge --rebase
+gc pr merge --delete-branch    # Delete remote branch after merge
 
-# Edit a PR (add/remove labels, assignees, reviewers)
+# Edit a PR (add/remove labels, assignees, reviewers, milestones)
 gc pr edit 42 -t "New title"
 gc pr edit --add-label bug --remove-label "needs review"
 gc pr edit --add-reviewer @me --remove-reviewer otheruser
+gc pr edit --milestone v1.0 --remove-milestone
 
 # Mark as ready or convert to draft
 gc pr ready          # Mark current branch's PR as ready
@@ -173,6 +185,8 @@ gc pr ready --undo   # Convert back to draft
 # Comment / review / diff (identifier optional)
 gc pr comment -b "LGTM"
 gc pr comment --path src/file.py --position 5 -b "Suggestion"
+gc pr comment --body-file comment.txt
+gc pr comment --editor
 
 gc pr review --approve
 gc pr review --comment -b "Looks good but needs tests"

pygitcode-0.1.1/src/gitcode_cli/commands/auth.py

@@ -1,23 +0,0 @@
-from __future__ import annotations
-
-import click
-
-from ..config import save_config
-
-
-@click.group("auth")
-def auth_group() -> None:
-    pass
-
-
-@auth_group.command("login")
-@click.option("--with-token", is_flag=True, help="Read token from stdin.")
-def auth_login(with_token: bool) -> None:
-    if with_token:
-        token = click.get_text_stream("stdin").read().strip()
-        if not token:
-            raise click.ClickException("No token provided on stdin.")
-    else:
-        token = click.prompt("GitCode token", hide_input=True)
-    save_config({"token": token})
-    click.echo("Authentication saved.")