Merge remote-tracking branch 'origin/main' into s58-inline-editor-diff

# Conflicts:
#	src/extension.ts

package.json

@@ -64,16 +64,6 @@
         "title": "Ask Claude to Edit",
         "category": "Cowriting"
       },
-      {
-        "command": "cowriting.askClaude.submit",
-        "title": "Ask Claude to Edit",
-        "category": "Cowriting"
-      },
-      {
-        "command": "cowriting.askClaude.cancel",
-        "title": "Cancel",
-        "category": "Cowriting"
-      },
       {
         "command": "cowriting.editSelection",
         "title": "Ask Claude to Edit Selection",
@@ -148,14 +138,6 @@
           "command": "cowriting.rejectProposal",
           "when": "false"
         },
-        {
-          "command": "cowriting.askClaude.submit",
-          "when": "false"
-        },
-        {
-          "command": "cowriting.askClaude.cancel",
-          "when": "false"
-        },
         {
           "command": "cowriting.pinDiffBaseline",
           "when": "editorLangId == markdown"
@@ -232,11 +214,6 @@
           "command": "cowriting.reply",
           "group": "inline",
           "when": "commentController == cowriting.threads"
-        },
-        {
-          "command": "cowriting.askClaude.submit",
-          "group": "inline",
-          "when": "commentController == cowriting.askClaude"
         }
       ],
       "comments/commentThread/title": [
@@ -249,11 +226,6 @@
           "command": "cowriting.reopenThread",
           "group": "inline",
           "when": "commentController == cowriting.threads && commentThread =~ /^resolved$/"
-        },
-        {
-          "command": "cowriting.askClaude.cancel",
-          "group": "inline",
-          "when": "commentController == cowriting.askClaude"
         }
       ]
     },