Merge upstream/main into add-daily-focus-board-skill

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: fd1eae93-cc9f-4777-812c-a2a9872e1c2b

package-lock.json

@@ -760,16 +760,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -1009,16 +999,13 @@
       "license": "MIT"
     },
     "node_modules/tmp": {
-      "version": "0.0.33",
+      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.7.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "integrity": "sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
       "engines": {
-        "node": ">=0.6.0"
+        "node": ">=14.14"
       }
     },
     "node_modules/tr46": {

package.json

@@ -48,5 +48,8 @@
     "js-yaml": "^5.2.2",
     "vfile": "^6.0.3",
     "vfile-matter": "^5.0.1"
+  },
+  "overrides": {
+    "tmp": "0.2.7"
   }
 }

website/src/components/pages/PluginInstall.astro

@@ -8,7 +8,7 @@
  */
 export interface PluginInstallProps {
   isExternal?: boolean;
-  /** awesome-copilot plugin id (internal installs). */
+  /** awesome-copilot plugin id. */
   pluginId?: string | null;
   /** Upstream marketplace source (owner/repo or git URL) for external installs. */
   externalSource?: string | null;
@@ -36,6 +36,11 @@ let insidersUrl: string | null = null;
 let ghappUrl: string | null = null;
 
 if (isExternal) {
+  if (pluginId) {
+    ghappUrl = `ghapp://plugins/install?source=${encodeURIComponent(
+      `${pluginId}@${MARKETPLACE}`
+    )}`;
+  }
   if (externalSource) {
     vscodeUrl = `vscode://chat-plugin/install?source=${encodeURIComponent(
       externalSource
@@ -43,9 +48,6 @@ if (isExternal) {
     insidersUrl = `vscode-insiders://chat-plugin/install?source=${encodeURIComponent(
       externalSource
     )}`;
-    ghappUrl = `ghapp://plugins/marketplace/add?source=${encodeURIComponent(
-      externalSource
-    )}`;
   }
 } else if (pluginId) {
   const plugin = encodeURIComponent(pluginId);

website/src/pages/extension/[id].astro

@@ -264,6 +264,7 @@ if (!isExternal && item.ref) {
               <PluginInstall
                 slot="install"
                 isExternal={true}
+                pluginId={item.pluginName ?? item.id}
                 externalSource={externalSource || null}
                 label="Install this extension"
                 note="This extension is maintained in an external repository."

website/src/pages/plugin/[id].astro

@@ -219,7 +219,7 @@ if (isExternal) {
             installCommand={installCommand}
             label={isExternal ? "Install this plugin" : "Install"}
             note={isExternal
-              ? "This plugin is maintained in an external repository. Installing it adds the third-party marketplace before installing."
+              ? "This plugin is maintained in an external repository."
               : undefined}
           />
         </Sidebar>

website/src/scripts/pages/extensions-render.ts

@@ -100,9 +100,9 @@ export function renderExtensionsHtml(items: RenderableExtension[]): string {
       const pluginId = item.pluginName || item.id;
       const ghappInstallUrl =
         item.external
-          ? externalSource
+          ? pluginId
-            ? `ghapp://plugins/marketplace/add?source=${encodeURIComponent(
+            ? `ghapp://plugins/install?source=${encodeURIComponent(
-                externalSource
+                `${pluginId}@awesome-copilot`
               )}`
             : ""
           : pluginId