Merge branch 'main' into jira-workbench-sync

Author: Sentry01

.github/plugin/marketplace.json

@@ -1487,6 +1487,33 @@
       "description": "Essential prompts, instructions, and chat modes for modern frontend web development including React, Angular, Vue, TypeScript, and CSS frameworks.",
       "version": "1.0.0"
     },
+    {
+      "name": "frugal",
+      "description": "Before your agent signs up for a paid API, LLM model, cloud service, SaaS plan, domain or anything else that costs money, it checks free tiers, right-sized plans and billing periods, startup, student, open-source and nonprofit programs, verified promo codes and cheaper alternatives, sized to the amount at stake. It never pays by itself.",
+      "version": "1.0.2",
+      "author": {
+        "name": "Nir Feinstein",
+        "url": "https://github.com/fainir"
+      },
+      "repository": "https://github.com/fainir/frugal",
+      "homepage": "https://github.com/fainir/frugal",
+      "license": "MIT",
+      "keywords": [
+        "cost-saving",
+        "finops",
+        "llm-costs",
+        "cloud-costs",
+        "saas",
+        "discounts",
+        "skill"
+      ],
+      "source": {
+        "source": "github",
+        "repo": "fainir/frugal",
+        "ref": "v1.0.2",
+        "sha": "0200e93415093562c926e3cdd8e4d3ba88883b6a"
+      }
+    },
     {
       "name": "gem-team",
       "source": "plugins/gem-team",
@@ -1712,6 +1739,29 @@
       "description": "Complete toolkit for building Model Context Protocol (MCP) servers in Kotlin using the official io.modelcontextprotocol:kotlin-sdk library. Includes instructions for best practices, a prompt for generating servers, and an expert chat mode for guidance.",
       "version": "1.0.0"
     },
+    {
+      "name": "launch-film",
+      "description": "Makes a 20 to 40 second launch film for a product from its website or App Store page: an MP4 at 1920x1080 with music, using the product's real logo, colors, fonts and screens. Everything renders locally with Chrome and ffmpeg, with no account or API key.",
+      "version": "0.2.0",
+      "author": {
+        "name": "Emin Budak",
+        "url": "https://eminbudak.com"
+      },
+      "repository": "https://github.com/EminBudak/launch-film",
+      "license": "MIT",
+      "keywords": [
+        "video",
+        "launch",
+        "brand",
+        "ffmpeg",
+        "marketing"
+      ],
+      "source": {
+        "source": "github",
+        "repo": "EminBudak/launch-film",
+        "sha": "940979bf3d82be136c4529a0b08aee7198ef178f"
+      }
+    },
     {
       "name": "markdstage",
       "description": "Create, edit, present, and export Markdown slides in a GitHub Copilot Canvas.",
@@ -1854,7 +1904,7 @@
     {
       "name": "microsoft-foundry",
       "description": "Skills and interactive Copilot canvas for designing, configuring, testing and deploying agents to Microsoft Foundry.",
-      "version": "1.0.18",
+      "version": "1.0.19",
       "author": {
         "name": "Microsoft",
         "url": "https://www.microsoft.com"
@@ -1875,7 +1925,7 @@
         "source": "github",
         "repo": "microsoft/foundry-dev-tools",
         "path": "microsoft-foundry",
-        "sha": "9d17511b8bbe1cf7071f52c579280925f69fd044"
+        "sha": "bba484bffc275cc9640f61b7b7357be0f943e16b"
       }
     },
     {
@@ -2942,7 +2992,7 @@
     {
       "name": "upgrade-agent",
       "description": "AI-powered upgrade assistant for upgrading and migrating applications. Helps modernize legacy code and upgrade .NET applications to current frameworks.",
-      "version": "1.1.777",
+      "version": "1.1.784",
       "author": {
         "name": "Microsoft",
         "url": "https://www.microsoft.com"
@@ -2961,8 +3011,8 @@
         "source": "github",
         "repo": "microsoft/upgrade-agent-plugins",
         "path": "plugins/upgrade-agent",
-        "ref": "v1.1.777",
-        "sha": "a45a385f7b89d603942e4c9ea6750083de1c1763"
+        "ref": "v1.1.784",
+        "sha": "cede9dcfbc09a06f0e63652e64fc7545ce5fe1df"
       }
     },
     {
@@ -3157,7 +3207,7 @@
     {
       "name": "wiqd",
       "description": "Developer toolkit for building, validating, provisioning, and publishing Microsoft 365 Copilot plugins, including extensibility capabilities such as declarative agents, skills, and connectors, using the wiqd CLI.",
-      "version": "0.22.0",
+      "version": "0.23.0",
       "author": {
         "name": "Microsoft",
         "url": "https://www.microsoft.com"
@@ -3179,7 +3229,7 @@
         "source": "github",
         "repo": "microsoft/wiqd",
         "path": "plugins/wiqd",
-        "sha": "882c8ef358161bdf589171919f9378a8129bde61"
+        "sha": "925de866de27950ad2e0d66ebab694c192b27ce1"
       }
     },
     {

extensions/backrooms-canvas/assets/preview.png

@@ -1201,6 +1201,33 @@
       "sha": "5837a9343db97d59107d146024b1dbd858625274"
     }
   },
+  {
+    "name": "frugal",
+    "description": "Before your agent signs up for a paid API, LLM model, cloud service, SaaS plan, domain or anything else that costs money, it checks free tiers, right-sized plans and billing periods, startup, student, open-source and nonprofit programs, verified promo codes and cheaper alternatives, sized to the amount at stake. It never pays by itself.",
+    "version": "1.0.2",
+    "author": {
+      "name": "Nir Feinstein",
+      "url": "https://github.com/fainir"
+    },
+    "repository": "https://github.com/fainir/frugal",
+    "homepage": "https://github.com/fainir/frugal",
+    "license": "MIT",
+    "keywords": [
+      "cost-saving",
+      "finops",
+      "llm-costs",
+      "cloud-costs",
+      "saas",
+      "discounts",
+      "skill"
+    ],
+    "source": {
+      "source": "github",
+      "repo": "fainir/frugal",
+      "ref": "v1.0.2",
+      "sha": "0200e93415093562c926e3cdd8e4d3ba88883b6a"
+    }
+  },
   {
     "name": "gh-skills-builder",
     "description": "Design, build, review, and publish GitHub Skills-style exercises with one coordinating agent and five Agent Skills for learner journeys, workflow-backed validation, and release readiness.",
@@ -1360,6 +1387,29 @@
       "sha": "2771046616a3c6bcd62916ed072f71feb5afd222"
     }
   },
+  {
+    "name": "launch-film",
+    "description": "Makes a 20 to 40 second launch film for a product from its website or App Store page: an MP4 at 1920x1080 with music, using the product's real logo, colors, fonts and screens. Everything renders locally with Chrome and ffmpeg, with no account or API key.",
+    "version": "0.2.0",
+    "author": {
+      "name": "Emin Budak",
+      "url": "https://eminbudak.com"
+    },
+    "repository": "https://github.com/EminBudak/launch-film",
+    "license": "MIT",
+    "keywords": [
+      "video",
+      "launch",
+      "brand",
+      "ffmpeg",
+      "marketing"
+    ],
+    "source": {
+      "source": "github",
+      "repo": "EminBudak/launch-film",
+      "sha": "940979bf3d82be136c4529a0b08aee7198ef178f"
+    }
+  },
   {
     "name": "markdstage",
     "description": "Create, edit, present, and export Markdown slides in a GitHub Copilot Canvas.",
@@ -1496,7 +1546,7 @@
   {
     "name": "microsoft-foundry",
     "description": "Skills and interactive Copilot canvas for designing, configuring, testing and deploying agents to Microsoft Foundry.",
-    "version": "1.0.18",
+    "version": "1.0.19",
     "author": {
       "name": "Microsoft",
       "url": "https://www.microsoft.com"
@@ -1517,7 +1567,7 @@
       "source": "github",
       "repo": "microsoft/foundry-dev-tools",
       "path": "microsoft-foundry",
-      "sha": "9d17511b8bbe1cf7071f52c579280925f69fd044"
+      "sha": "bba484bffc275cc9640f61b7b7357be0f943e16b"
     }
   },
   {
@@ -2296,7 +2346,7 @@
   {
     "name": "upgrade-agent",
     "description": "AI-powered upgrade assistant for upgrading and migrating applications. Helps modernize legacy code and upgrade .NET applications to current frameworks.",
-    "version": "1.1.777",
+    "version": "1.1.784",
     "author": {
       "name": "Microsoft",
       "url": "https://www.microsoft.com"
@@ -2315,8 +2365,8 @@
       "source": "github",
       "repo": "microsoft/upgrade-agent-plugins",
       "path": "plugins/upgrade-agent",
-      "ref": "v1.1.777",
-      "sha": "a45a385f7b89d603942e4c9ea6750083de1c1763"
+      "ref": "v1.1.784",
+      "sha": "cede9dcfbc09a06f0e63652e64fc7545ce5fe1df"
     }
   },
   {
@@ -2493,7 +2543,7 @@
   {
     "name": "wiqd",
     "description": "Developer toolkit for building, validating, provisioning, and publishing Microsoft 365 Copilot plugins, including extensibility capabilities such as declarative agents, skills, and connectors, using the wiqd CLI.",
-    "version": "0.22.0",
+    "version": "0.23.0",
     "author": {
       "name": "Microsoft",
       "url": "https://www.microsoft.com"
@@ -2515,7 +2565,7 @@
       "source": "github",
       "repo": "microsoft/wiqd",
       "path": "plugins/wiqd",
-      "sha": "882c8ef358161bdf589171919f9378a8129bde61"
+      "sha": "925de866de27950ad2e0d66ebab694c192b27ce1"
     }
   }
 ]

plugins/external.json

@@ -2,7 +2,7 @@
 name: git-commit
 description: 'Use this skill when the user wants to make a Git commit or split changes into more than one commit. Also use it when the user types "/commit" or asks for a conventional commit. The skill examines the diff, stages the related files, writes a Conventional Commits message, and runs git commit. Do not use it when the user wants only a commit message and no commit. Do not use it to push, open a pull request, rebase, or change the commit history.'
 license: MIT
-compatibility: 'Requires Git. The `--resolved` option of `git add` requires Git 2.56 or later.'
+compatibility: 'Requires Git. The `--resolved` option of `git add` requires Git 2.56 or later. Older versions use the fallback in step 3.'
 allowed-tools: shell(git:*)
 ---
 
@@ -74,11 +74,44 @@ git diff --staged
 git diff
 ```
 
-If there are no changes, tell the user. Do not make an empty commit.
+If there are no changes, run the checks at the start of step 3. If they find `MERGE_HEAD`, continue. If not, tell the user what `git status --long` shows. Do not make an empty commit.
 
 ### 3. Stage the files
 
-Put one logical change in each commit. If the staged files contain more than one change, first unstage the files of the other changes. Then stage the files for this change:
+First, check for an operation in progress. Run each command alone. Do not chain them with `&&`. In a subdirectory, run every command in this step as `git -C <root> ...`. `git rev-parse --show-toplevel` prints the root.
+
+```bash
+git rev-parse -q --verify --symbolic-full-name MERGE_HEAD
+git rev-parse -q --verify --symbolic-full-name CHERRY_PICK_HEAD
+git rev-parse -q --verify --symbolic-full-name REVERT_HEAD
+git diff --name-only --diff-filter=U --no-relative
+git status --long
+```
+
+A `rev-parse` command prints a ref name if its operation is in progress. If not, the command prints nothing and exits with status 1. The `git diff` command lists unmerged files. It finds conflicts that have no ref, for example from `git stash pop`. `git status --long` shows the other cases.
+
+**If an operation is in progress or there are unmerged files**, do not unstage files. Do not split the commit. The index holds the result of the operation. If you unstage a file, Git drops the changes of the other side or removes a conflict entry.
+
+- Stop and tell the user if `git status --long` shows "rebase in progress", "You are in the middle of an am session", "Cherry-pick currently in progress", or "Revert currently in progress".
+- Run `git status --porcelain=v2`. A line that starts with `u` shows an unmerged file. You can resolve the file only if all these conditions are true:
+  - The line starts with `u UU N...` or `u AA N...`.
+  - Each mode on the line is `100644`, `100755`, or `000000`.
+  - `git diff --no-relative` does not show `Binary files differ` for the file.
+- Ask the user how to resolve all other unmerged files. Git cannot find conflict markers in these files. `git add --resolved` and the checks below stage these files without a warning. Stage each of these files only after the user resolves it: `git add -- <path>`.
+- With Git 2.56 or later, stage the files that you can resolve with `git add --resolved -- <paths>`.
+- With older Git, check those files and stage them:
+
+```bash
+git diff --check -- path/to/file1 path/to/file2
+git add -- path/to/file1 path/to/file2
+```
+
+- Stage the files only if `git diff --check` finds no "leftover conflict marker" line. Ignore whitespace warnings from the other branch.
+- Then, with any Git version, run `git diff --name-only --no-relative` and `git ls-files --others --exclude-standard`. They list edits in other files. Skip the files that are still unmerged.
+- Show these paths to the user. Ask if they belong to the commit. Stage only the approved paths with `git add -- <paths>`.
+- Git quotes some paths, for example paths with non-ASCII characters. `git add` fails for a quoted path. Ask the user about these files.
+
+**If there is no operation and no unmerged file**, put one logical change in each commit. If the staged files contain more than one change, first unstage the files of the other changes. Then stage the files for this change:
 
 ```bash
 git reset -q -- path/to/other-file1 path/to/other-file2
@@ -89,7 +122,6 @@ git add -- src/components/
 
 - Put a glob in quotes. Without quotes, the shell expands the glob and does not find the files in subdirectories.
 - Do not use `git add -p` or `git add -i`. These commands wait for input from a person.
-- After you resolve a merge conflict, use `git add --resolved`. This command stages only the resolved files. If a file still has conflict markers, the command stops.
 - Examine the list of staged files with `git diff --staged --name-only`. Do not commit secrets, for example `.env` files, `credentials.json`, or private keys.
 
 ### 4. Write the message
@@ -102,6 +134,10 @@ Get each part from the diff:
 
 ### 5. Commit
 
+When step 3 finds `MERGE_HEAD`, `CHERRY_PICK_HEAD`, or `REVERT_HEAD`, run `git commit --no-edit` with no paths and no `--cleanup` option. This keeps the message that Git prepared. Do not write a new `-m` message. The message can keep the `Conflicts:` comment lines from Git. Do not remove them.
+
+In all other cases:
+
 Give each paragraph with a different `-m` option. Git puts a blank line between the paragraphs. This command works in Bash, PowerShell, and other shells.
 
 ```bash
@@ -114,7 +150,7 @@ For a long message, write the message to a temporary file. Then run `git commit
 ### 6. Make sure that the commit is correct
 
 ```bash
-git log -1 --stat
+git log -1 --stat --first-parent
 git status --porcelain
 ```