Unify confusing Canvas Edit vs Generate skills (#137)

* Initial work to unify canvas skills

* Attempt at review

* Version

* Updates

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Rename to /canvas-app

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Author: lesaltzm

plugins/canvas-apps/AGENTS.md

@@ -25,29 +25,28 @@ CLAUDE.md                      ← Symlink → AGENTS.md
 references/
   TechnicalGuide.md            ← YAML syntax, control selection, layout strategies, Power Fx patterns
   DesignGuide.md               ← Aesthetic guidelines, anti-patterns, design process
+  QAChecks.md                  ← Runtime anti-pattern checks for self-QA
+  PlanTemplates.md             ← CREATE and EDIT plan document structures for canvas-app-planner
 agents/
-  canvas-app-planner.md        ← Plans app design; invoked by generate-canvas-app (sequential)
-  canvas-screen-builder.md     ← Builds one screen; invoked by generate-canvas-app (parallel)
-  canvas-edit-planner.md       ← Plans complex edits; invoked by edit-canvas-app (sequential)
-  canvas-screen-editor.md      ← Applies edits to one screen; invoked by edit-canvas-app (parallel)
+  canvas-app-planner.md        ← Discovers resources and writes plan document; invoked by canvas-app
+  canvas-screen-builder.md     ← Builds or modifies one screen; invoked by canvas-app (parallel)
 skills/
+  canvas-app/
+    SKILL.md                   ← Unified skill: create or edit a Canvas App (auto-detects mode)
   configure-canvas-mcp/
     SKILL.md                   ← Registers the Canvas Authoring MCP server with Claude Code
-  generate-canvas-app/
-    SKILL.md                   ← Orchestrates canvas-app-planner + canvas-screen-builder agents
-  edit-canvas-app/
-    SKILL.md                   ← Edits pa.yaml source files for an existing Canvas App
   add-data-source/
     SKILL.md                   ← Guides user to add a data source or connector in Studio, then verifies
+  generate-canvas-app/
+    SKILL.md                   ← [DEPRECATED] Redirects to canvas-app
 ```
 
 ## Skills
 
 | Skill | Description |
 |-------|-------------|
+| `/canvas-app` | Create or edit a Canvas App — auto-detects whether to generate from scratch or edit existing |
 | `/configure-canvas-mcp` | Register the Canvas Authoring MCP server with Claude Code |
-| `/generate-canvas-app` | Generate a complete Canvas App from a natural language description |
-| `/edit-canvas-app` | Edit an existing Canvas App from a natural language description of changes |
 | `/add-data-source` | Guide the user to add a data source, connection, or API connector in Studio, then verify it is available |
 
 ## Agents
@@ -56,10 +55,8 @@ Agents are invoked by skills via the `Task` tool — they are not user-invocable
 
 | Agent | Invoked By | Description |
 |-------|-----------|-------------|
-| `canvas-app-planner` | `generate-canvas-app` | Discovers resources, designs the app, presents plan for approval, writes plan document |
-| `canvas-screen-builder` | `generate-canvas-app` | Writes YAML for one screen based on the plan; runs in parallel with other builders; app validation/compilation is performed later by `generate-canvas-app` using `compile_canvas` |
-| `canvas-edit-planner` | `edit-canvas-app` | Reads existing .pa.yaml files, plans complex edits, presents edit plan for approval, writes canvas-edit-plan.md |
-| `canvas-screen-editor` | `edit-canvas-app` | Applies targeted edits to one screen's .pa.yaml; runs in parallel with other editors |
+| `canvas-app-planner` | `canvas-app` | Receives the approved plan from the skill. Discovers available controls, APIs, and data sources; gathers control property definitions (`describe_control`); writes `App.pa.yaml` (CREATE mode) and `canvas-app-plan.md` for downstream screen builders. |
+| `canvas-screen-builder` | `canvas-app` | For Create actions: writes YAML for one new screen based on the plan. For Modify actions: applies targeted edits to one existing screen. Runs in parallel with other builders; validation is performed later by `canvas-app` using `compile_canvas`. |
 
 ## MCP Tools
 

plugins/canvas-apps/README.md

@@ -25,33 +25,27 @@ claude --plugin-dir /path/to/power-platform-skills/plugins/canvas-apps
 
 ## Skills
 
-### `/configure-canvas-mcp`
-
-Register the Canvas Authoring MCP server with Claude Code or GitHub Copilot.
-
-**Usage:** Invoke directly with `/configure-canvas-mcp`, or use any of the keywords below to trigger the skill automatically:
-
-- `Configure MCP for Canvas Apps`
-- `Set up the Canvas Authoring MCP server`
-- `Connect Canvas Apps MCP`
-
-### `/generate-canvas-app`
+### `/canvas-app`
 
-Generate a complete Canvas App from a natural language description.
+Create or edit a Canvas App. Automatically detects whether to generate a new app from scratch
+or edit an existing one based on the current app state.
 
-**Usage:** Invoke directly with `/generate-canvas-app`, or use any of the keywords below to trigger the skill automatically:
+**Usage:** Invoke directly with `/canvas-app`, or use natural language to trigger it:
 
 - `Create a Canvas App for managing inventory`
 - `I need a Canvas App for tracking employee time off`
+- `Modify the form in my existing Canvas App to include validation`
+- `Edit my Canvas App to add a new screen for reports`
 
-### `/edit-canvas-app`
+### `/configure-canvas-mcp`
 
-Edit an existing Canvas App from a natural language description of changes.
+Register the Canvas Authoring MCP server with Claude Code or GitHub Copilot.
 
-**Usage:** Invoke directly with `/edit-canvas-app`, or use any of the keywords below to trigger the skill automatically:
+**Usage:** Invoke directly with `/configure-canvas-mcp`, or use any of the keywords below to trigger the skill automatically:
 
-- `Modify the form in my existing Canvas App to include validation`
-- `Edit my Canvas App to add a new screen for reports`
+- `Configure MCP for Canvas Apps`
+- `Set up the Canvas Authoring MCP server`
+- `Connect Canvas Apps MCP`
 
 ## MCP Tools