Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,57 @@
"command": "jj.commit",
"title": "Commit changes",
"category": "Jujutsu"
},
{
"command": "ukemi.refreshComments",
"title": "Refresh GitHub Comments",
"category": "Jujutsu",
"icon": "$(refresh)"
},
{
"command": "ukemi.replyAndResolve",
"title": "Reply & Resolve",
"category": "Jujutsu",
"icon": "$(check)"
},
{
"command": "ukemi.replyOnly",
"title": "Reply Only",
"category": "Jujutsu",
"icon": "$(reply)"
},
{
"command": "ukemi.markDone",
"title": "Mark Done",
"category": "Jujutsu",
"icon": "$(pass)"
}
],
"menus": {
"comments/commentThread/title": [
{
"command": "ukemi.markDone",
"group": "navigation",
"when": "commentController == ukemi-comments"
}
],
"comments/commentThread/context": [
{
"command": "ukemi.replyAndResolve",
"group": "navigation@1",
"when": "commentController == ukemi-comments"
},
{
"command": "ukemi.markDone",
"group": "navigation@2",
"when": "commentController == ukemi-comments"
},
{
"command": "ukemi.replyOnly",
"group": "navigation@3",
"when": "commentController == ukemi-comments"
}
],
"editor/title": [
{
"command": "jj.squashSelectedRanges",
Expand Down Expand Up @@ -278,6 +326,11 @@
"when": "view == jjGraphWebview && jjGraphView.nodesSelected",
"group": "navigation"
},
{
"command": "ukemi.refreshComments",
"when": "view == workbench.panel.comments",
"group": "navigation"
},
{
"command": "jj.selectGraphWebviewRepo",
"when": "view == jjGraphWebview",
Expand Down Expand Up @@ -504,6 +557,44 @@
"description": "Path to the jj executable. If not set, your PATH and common locations will be searched for a jj executable.",
"scope": "resource"
},
"ukemi.githubToken": {
"type": "string",
"default": "",
"description": "GitHub Personal Access Token (PAT) for fetching PR comments. If not set, the gh CLI's default authentication will be used.",
"scope": "resource"
},
"ukemi.githubTokens": {
"type": "object",
"default": {},
"description": "A map of GitHub organization names to Personal Access Tokens (PATs). Useful for working across multiple organizations with different auth requirements. PAT tokens need read/write access to Pull requests and Contents.",
"scope": "resource"
},
Comment on lines +560 to +571
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove both of these. Storing tokens in VSCode settings is not a good idea. None of the built-in GitHub extensions have this kind of storage. Either we rely entirely on gh CLI or we build a mechanism where the extension has its own OAuth flow.

"ukemi.ghPath": {
"type": "string",
"default": "",
"description": "Path to the gh executable. If not set, your PATH will be searched for a gh executable.",
"scope": "resource"
},
"ukemi.githubRemote": {
"type": "string",
"default": "origin",
"description": "The git remote name to use for identifying the GitHub organization and repository.",
"scope": "resource"
},
"ukemi.githubPRSearchLimit": {
"type": "number",
"default": 10,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the default should be 1. I'd expect people to have their working copy right on top of the latest branch state. How was 10 chosen?

"description": "The maximum number of parent commits to search for a matching GitHub PR.",
"scope": "resource",
"minimum": 0
},
"ukemi.githubPRPollInterval": {
"type": "number",
"default": 5,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does that seem like a long time? I always felt the regular GitHub extension was pretty snappy, so this seems like it would be pretty annoying. Just wondering how you came up with the number.

"description": "Interval in minutes for background polling of GitHub PR comments. Set to 0 to disable background polling.",
"scope": "resource",
"minimum": 0
},
"ukemi.graph.viewLayout": {
"type": "string",
"enum": [
Expand Down
Loading