Merge pull request #55 from DiffyWebsite/diffy-skills

Merge Diffy skills into one plugin; container-based local capture; mi…

Author: gregurcom

.claude-plugin/marketplace.json

@@ -9,28 +9,20 @@
   },
   "plugins": [
     {
-      "name": "diffy-local",
-      "source": "./plugins/diffy-local",
-      "description": "Capture screenshots of a running app locally with the diffy-worker engine and upload them to Diffy.",
-      "version": "1.0.0",
+      "name": "diffy",
+      "source": "./plugins/diffy",
+      "description": "Diffy visual-regression testing: capture screenshots locally (in Diffy's screenshot-worker Docker container) or remotely on Diffy's servers, create projects, run visual diffs, and read results.",
+      "version": "2.0.0",
       "author": {
         "name": "Diffy"
       },
       "homepage": "https://diffy.website/",
       "category": "testing",
-      "tags": ["visual-regression", "screenshots", "diffy", "testing", "ui", "local", "playwright"]
-    },
-    {
-      "name": "diffy-remote",
-      "source": "./plugins/diffy-remote",
-      "description": "Run Diffy screenshots and environment diffs remotely on Diffy's servers (no local browser).",
-      "version": "1.0.0",
-      "author": {
-        "name": "Diffy"
-      },
-      "homepage": "https://diffy.website/",
-      "category": "testing",
-      "tags": ["visual-regression", "screenshots", "diffy", "testing", "ui", "remote", "ci"]
+      "tags": ["visual-regression", "screenshots", "diffy", "testing", "ui", "local", "remote", "docker", "ci"]
     }
-  ]
+  ],
+  "renames": {
+    "diffy-local": "diffy",
+    "diffy-remote": "diffy"
+  }
 }

plugins/README.md

@@ -1,42 +1,37 @@
-# Claude Code plugins for diffy-cli
+# Claude Code plugin for diffy-cli
 
-This directory holds Claude Code plugins distributed through the marketplace defined at
-[`../.claude-plugin/marketplace.json`](../.claude-plugin/marketplace.json). Both are built on the `diffy`
-CLI and differ only in **where the screenshots are captured**.
+This directory holds the Claude Code plugin distributed through the marketplace defined at
+[`../.claude-plugin/marketplace.json`](../.claude-plugin/marketplace.json).
 
-## `diffy-local`
+## `diffy`
 
-Capture screenshots of a **running app locally** with the `diffy-worker` engine (Diffy's production
-screenshot pipeline, run on your machine) and upload them to Diffy — create projects, upload screenshot
-sets, and run visual diffs. See [`diffy-local/README.md`](diffy-local/README.md).
+One plugin built on the `diffy` CLI with **two capture modes**:
 
-## `diffy-remote`
+- **Local** — capture a **running app on your machine** inside Diffy's published
+  `diffywebsite2/screenshot-worker` Docker container (the production rendering runtime, run locally) and
+  upload it. Requires Docker.
+- **Remote** — have **Diffy capture on its own servers** (no local browser or Docker) — screenshot an
+  environment or diff two environments server-side.
 
-Run screenshots and environment diffs **remotely on Diffy's servers** (no local browser or Playwright) —
-screenshot an environment, compare two environments, create projects, and read diffs. See
-[`diffy-remote/README.md`](diffy-remote/README.md).
-
-Install whichever fits your workflow (or both).
+When a request doesn't say where to capture, Claude asks whether to run **local** or **remote** (on
+app.diffy.website). See [`diffy/README.md`](diffy/README.md) for the full skill list.
 
 ## Install (once this repo is pushed)
 
 ```shell
 /plugin marketplace add diffywebsite/diffy-cli
-/plugin install diffy-local@diffy
-/plugin install diffy-remote@diffy
+/plugin install diffy@diffy
 ```
 
-Then the skills are available namespaced, e.g. `/diffy-local:visual-diff` or
-`/diffy-remote:compare-environments`. Claude also invokes them automatically based on your request.
+Then the skills are available namespaced, e.g. `/diffy:visual-diff` or `/diffy:compare-environments`.
+Claude also invokes them automatically based on your request.
 
 ## Local development / testing (no install)
 
 ```bash
 # from the repo root
-claude --plugin-dir ./plugins/diffy-local
-claude --plugin-dir ./plugins/diffy-remote
-claude plugin validate ./plugins/diffy-local    # run before publishing / submitting
-claude plugin validate ./plugins/diffy-remote
+claude --plugin-dir ./plugins/diffy
+claude plugin validate ./plugins/diffy    # run before publishing / submitting
 ```
 
 Use `/reload-plugins` inside a session to pick up edits without restarting.