@aryacode/dsh-engineering 0.4.3 → 0.4.4

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [0.4.4] - 2026-10-25
+
+### Changed
+
+- **One row per product instead of one per surface.** The Plugins page now lists five rows — `l5x`,
+  `ftview`, `mwi`, `viewers`, `optix` — instead of sixteen. Each product row mounts its whole surface,
+  so one switch turns a product off instead of four.
+- **The optional surfaces are the row's config.** `entries/l5x.js` mounts read + guidance and takes
+  `editing`, `studio` and `live` (all off by default); `entries/ftview.js` takes `edit` and `studio`
+  (both on); `entries/mwi.js` takes `edit` (off). The defaults are unchanged — a read-only profile
+  still pays only for the read surfaces — but the toggle now lives with the product it belongs to.
+- Row ids change from `l5x-read` / `ftview-edit` / `mwi-verify` to `l5x` / `ftview` / `mwi`, so a
+  profile's per-row enable state resets once on upgrade. The product-level defaults are identical.
+- Legacy subpath exports are kept (`./l5x/read`, `./ftview/edit`, `./mwi/verify`, …) so a profile
+  patch that still names one of them keeps working.
+
+### Note
+
+The grouping is plugin-side by choice: `cordis:group` exists in the patch format, but the Plugins
+page skips group rows (`plugin-manager/src/index.ts`: "Group rows are containers … their children
+carry the switches"), so a group switch is a shell feature rather than a bundle one. Collapsing the
+row list is what a bundle can do on its own, without a harness change to maintain across DSH
+upgrades.
+
 ## [0.4.3] - 2026-10-25
 
 ### Fixed

package/README.md

@@ -4,7 +4,7 @@
 MotionWorks IEC and FactoryTalk Optix sit behind a single install, one row per surface. A row is the
 switch: disable it and that plugin unloads, so its tool schemas leave the request.
 
-`@aryacode/dsh-engineering` · 79 tools · 16 rows · 4 products · MIT
+`@aryacode/dsh-engineering` · 79 tools · 5 rows · 4 products · MIT
 
 ---
 
@@ -14,17 +14,18 @@ A general assistant pays for every tool schema on every request. An automation e
 surfaces — reading a 3 MB L5X, comparing two projects, staging ladder edits, talking to a controller —
 but only one or two of them at a time.
 
-This bundle splits those surfaces into independently switchable rows. The expensive ones are off by
-default, so a read-only profile pays for the read tools and nothing else:
+This bundle splits those surfaces into one row per product. The expensive surfaces are a switch inside
+the row, off by default, so a read-only profile pays for the read tools and nothing else:
 
-| Row | Default | What a disabled row removes |
-|---|---|---|
-| `l5x-editing` | off | the nine `draft_*` schemas |
-| `l5x-studio` | off | the Logix Designer SDK and supervised controller schemas |
-| `l5x-live` | off | the EtherNet/IP polling and trend schemas |
-| `mwi-edit` | off | the seven MotionWorks edit schemas |
+| Product row | Config option | Default | What turning it on adds |
+|---|---|---|---|
+| `l5x` | `editing` | off | the nine `draft_*` schemas |
+| `l5x` | `studio` | off | the Logix Designer SDK and supervised controller schemas |
+| `l5x` | `live` | off | the EtherNet/IP polling and trend schemas |
+| `ftview` | `edit`, `studio` | on | staged ME edits and the Studio handoff |
+| `mwi` | `edit` | off | the seven MotionWorks edit schemas |
 
-The previews are independent of the tools — switching L5X tools off does not remove the ladder viewer.
+The previews are independent of the tools — switching a product off does not remove the ladder viewer.
 Both previews mount from **one** row (`viewers`), because a package registers exactly one browser
 bundle.
 
@@ -47,21 +48,23 @@ Tool groups, by product:
 
 ## Switches
 
-A row is a plugin. Disabling it in the profile (or on the Plugins page) unmounts that plugin and its
-tool schemas stop being sent; the guidance skill keeps its own row so reading guidance and reading
-tools switch separately.
+A row is a plugin. Disabling it in the profile (or on the Plugins page) unmounts that product and its
+tool schemas stop being sent. Each product's optional surfaces are config on the same row, so the
+cheap decision — is this product on at all — takes one switch, and the fine decision lives one level
+down:
 
-| Row | Surface | Default | Why the default |
-|---|---|---|---|
-| `l5x-read`, `l5x-read-skill` | offline reads, checks, comparison + guidance | on | cheap and safe |
-| `l5x-editing` | nine staged `draft_*` tools | **off** | a read-only profile should not pay for them |
-| `l5x-studio` | Logix Designer SDK and supervised controller | **off** | needs Studio 5000 installed |
-| `l5x-live` | EtherNet/IP polling and trends | **off** | needs a controller address |
-| `viewers` | ladder + ME display previews | on | adds no model context |
-| `ftview-read`, `ftview-read-skill`, `ftview-edit`, `ftview-studio` | FactoryTalk View ME read, edits, Studio handoff | on | small enough to default on |
-| `mwi-session`, `mwi-read`, `mwi-read-skill`, `mwi-verify` | MotionWorks IEC session, reads, verify + guidance | on | — |
-| `mwi-edit` | seven staged MotionWorks edits | **off** | the largest schemas in the bundle |
-| `optix` | FactoryTalk Optix Studio authoring | on | separate component package |
+| Row | Mounts | Config options (default) |
+|---|---|---|
+| `l5x` | offline reads, checks, comparison and the `rockwell-l5x` guidance; optionally drafts, SDK, live | `editing` (off), `studio` (off), `live` (off) |
+| `ftview` | FactoryTalk View ME read, guidance and edits; optionally the Studio handoff | `edit` (on), `studio` (on) |
+| `mwi` | MotionWorks IEC session, reads, verify and guidance; optionally the edits | `edit` (off) |
+| `viewers` | ladder + ME display previews | — |
+| `optix` | FactoryTalk Optix Studio authoring | — |
+
+**Why the row list collapsed.** The Plugins page lists a bundle's rows flat and skips `cordis:group`
+containers (`plugin-manager/src/index.ts`: *"Group rows are containers … their children carry the
+switches"*), so a group switch is a shell feature, not a bundle one. Five product rows with config is
+what a bundle can do on its own — no harness change to carry across DSH upgrades.
 
 **No capability policy.** Earlier releases also carried a per-skill tool filter (`policyOnly` /
 `toolPolicy`) that gated tools by skill state. That filter is an AryaAI harness feature and is **not
@@ -108,6 +111,7 @@ Where each surface actually stands, based on what has been exercised.
 
 | Version | What landed |
 |---|---|
+| **0.4.4** | One row per product: five rows, optional surfaces moved into each row's config |
 | **0.4.0** | Both previews fold into the bundle's own client face — one package, one browser bundle, 16 rows |
 | **0.3.0** | FactoryTalk Optix becomes a bundle component; 79 tools total |
 | **0.2.0** | MotionWorks IEC ports into the bundle — 24 tools over the COM bridge and saved-model engine, verified live; edit off by default |
@@ -142,38 +146,23 @@ another bundle owns.
 ```mermaid
 flowchart TB
   Profile["Profile bundle list"] --> Bundle["@aryacode/dsh-engineering"]
-  Bundle -->|insert| L5XRead["l5x-read (on)"]
-  L5XRead --> L5XSkill["l5x-read-skill (on)"]
-  Bundle -->|insert| L5XEdit["l5x-editing (off)"]
-  Bundle -->|insert| L5XStudio["l5x-studio (off)"]
-  Bundle -->|insert| L5XLive["l5x-live (off)"]
+  Bundle -->|insert| L5X["l5x (on) — read + guidance; editing / studio / live off"]
+  Bundle -->|insert| FTV["ftview (on) — read, edits, Studio handoff"]
+  Bundle -->|insert| MWI["mwi (on) — session, read, verify; edit off"]
   Bundle -->|insert| Viewers["viewers (on) — ladder + ME display previews"]
-  Bundle -->|insert| FTV["ftview-read / edit / studio (on)"]
-  Bundle -->|insert| MWI["mwi-session / read / verify (on), edit (off)"]
   Bundle -->|insert| Optix["optix (on)"]
 ```
 
 Row ids are stable. Profiles and patches address these ids, so per-row enable state survives upgrades
 even when the implementation behind a row is replaced.
 
-| Row id | Package entry | Default |
+| Row id | Package entry | Config options |
 |---|---|---|
-| `l5x-read` | `dsh-engineering-l5x` | on |
-| `l5x-read-skill` | `dsh-engineering-l5x/skill` | on |
-| `l5x-editing` | `dsh-engineering-l5x/editing` | off |
-| `l5x-studio` | `dsh-engineering-l5x/studio` | off |
-| `l5x-live` | `dsh-engineering-l5x/live` | off |
-| `viewers` | `@aryacode/dsh-engineering` (its own client face: ladder + ME display previews) | on |
-| `ftview-read` | `dsh-engineering-ftview` | on |
-| `ftview-read-skill` | `dsh-engineering-ftview/skill` | on |
-| `ftview-edit` | `dsh-engineering-ftview/edit` | on |
-| `ftview-studio` | `dsh-engineering-ftview/studio` | on |
-| `mwi-session` | `dsh-engineering-mwi` | on |
-| `mwi-read` | `dsh-engineering-mwi/read` | on |
-| `mwi-read-skill` | `dsh-engineering-mwi/skill` | on |
-| `mwi-verify` | `dsh-engineering-mwi/verify` | on |
-| `mwi-edit` | `dsh-engineering-mwi/edit` | off |
-| `optix` | `@aryacode/dsh-tool-ft-optix` | on |
+| `l5x` | `dsh-engineering-l5x` | `editing` off · `studio` off · `live` off |
+| `ftview` | `dsh-engineering-ftview` | `edit` on · `studio` on |
+| `mwi` | `dsh-engineering-mwi` | `edit` off |
+| `viewers` | `@aryacode/dsh-engineering` (its own client face: ladder + ME display previews) | — |
+| `optix` | `@aryacode/dsh-tool-ft-optix` | — |
 
 ## Safety
 

package/cordis.patch.yml

@@ -1,67 +1,42 @@
 # AryaCode engineering bundle.
 #
-# One layer lives here: the product rows. Each row mounts one surface of the
-# bundle, and the row is the switch — disabling `l5x-editing`, `l5x-studio`,
-# `l5x-live` or `mwi-edit` unloads that plugin, so its tool schemas never reach
-# the request. Row ids are stable, so per-entry enable state survives upgrades
-# even as the package behind a row is rebuilt.
+# Five product rows, one switch each. A row mounts a product's whole surface —
+# its read tools, its guidance and its optional parts — so the Plugins page
+# shows a product per row instead of a surface per row.
+#
+# The optional parts are the row's config, not separate rows:
+#
+#   l5x    → editing, studio, live   (all off by default)
+#   ftview → edit, studio            (both on by default)
+#   mwi    → edit                    (off by default)
+#
+# That keeps the context decision with the product it belongs to: a read-only
+# profile pays for the read surface, and the expensive schemas are one switch
+# inside the row instead of four more toggles in the list.
 #
 # The patch only ever inserts. It must never target a row another bundle owns:
 # a profile without that row makes composition fail ("patch: entry ... not
-# found"), and in 0.4.0/0.4.1 that is exactly why the bundle could not be
-# installed.
+# found"), which is why 0.4.0 and 0.4.1 could not be installed.
 #
-# The per-skill tool filter (`policyOnly` / `toolPolicy` / `capabilities`) is an
-# AryaAI harness feature. The AryaCode line's `@deepseek-ai/dsh-tool-skill` has
-# no such config, so a capability layer here would either fail composition or be
-# rejected by the plugin's schema. Rows are the switch in this product; when
-# that filter ships here, it belongs in a bundle mount of its own.
+# There is no per-skill tool filter here (`policyOnly` / `toolPolicy`): that is
+# an AryaAI harness feature and the AryaCode line's `@deepseek-ai/dsh-tool-skill`
+# has no such config. The row is the switch.
 - insert:
-    - id: l5x-read
+    - id: l5x
       name: '@aryacode/dsh-engineering/l5x'
-    - id: l5x-read-skill
-      name: '@aryacode/dsh-engineering/l5x/skill'
-    # Editing is its own entry so a read-only profile does not pay for nine
-    # draft schemas. It consumes the read entry's project service.
-    - id: l5x-editing
-      name: '@aryacode/dsh-engineering/l5x/editing'
-      disabled: true
-    # The SDK entry needs Studio 5000 installed, so it stays off until asked for.
-    - id: l5x-studio
-      name: '@aryacode/dsh-engineering/l5x/studio'
-      disabled: true
-    # Live reads need a controller address; the row is the switch.
-    - id: l5x-live
-      name: '@aryacode/dsh-engineering/l5x/live'
-      disabled: true
+    # FactoryTalk View ME: read, edits and the Studio handoff. Small enough that
+    # everything is on; the row's config can drop the edits or the handoff.
+    - id: ftview
+      name: '@aryacode/dsh-engineering/ftview'
+    # MotionWorks IEC: session, reads, verify and guidance on; edits opt-in.
+    - id: mwi
+      name: '@aryacode/dsh-engineering/mwi'
     # Both previews (the L5X ladder viewer and the FactoryTalk View ME display
     # preview) are this bundle's own client face. A package registers exactly one
-    # browser bundle, so one row mounts both; switching the L5X or FTView *tools*
-    # off leaves this row alone, because a client face adds no model context.
+    # browser bundle, so one row mounts both; a client face adds no model
+    # context, so this row is independent of every product row above.
     - id: viewers
       name: '@aryacode/dsh-engineering'
-    # FactoryTalk View ME: read, edit and Studio entries plus the display
-    # preview. The old plugin is retired, so these mount by default.
-    - id: ftview-read
-      name: '@aryacode/dsh-engineering/ftview'
-    - id: ftview-read-skill
-      name: '@aryacode/dsh-engineering/ftview/skill'
-    - id: ftview-edit
-      name: '@aryacode/dsh-engineering/ftview/edit'
-    - id: ftview-studio
-      name: '@aryacode/dsh-engineering/ftview/studio'
-    # MotionWorks IEC: the redesigned rows. Editing is off by default, like L5X.
-    - id: mwi-session
-      name: '@aryacode/dsh-engineering/mwi'
-    - id: mwi-read
-      name: '@aryacode/dsh-engineering/mwi/read'
-    - id: mwi-read-skill
-      name: '@aryacode/dsh-engineering/mwi/skill'
-    - id: mwi-verify
-      name: '@aryacode/dsh-engineering/mwi/verify'
-    - id: mwi-edit
-      name: '@aryacode/dsh-engineering/mwi/edit'
-      disabled: true
     # FactoryTalk Optix stays a separate package, mounted as a component row.
     - id: optix
       name: '@aryacode/dsh-tool-ft-optix'

package/entries/ftview.js

@@ -0,0 +1,37 @@
+/**
+ * The FactoryTalk View ME product row: one switch for read, edits, Studio
+ * handoff and the skill.
+ *
+ * All four surfaces are on by default — the whole product is small enough that
+ * a reader who opens an export wants the edits and the handoff too.
+ */
+import z from '@deepseek-ai/schemastery'
+import * as read from '../vendor/ftview/lib/index.js'
+import * as skill from '../vendor/ftview/lib/skill.js'
+import * as edit from '../vendor/ftview/lib/edit.js'
+import * as studio from '../vendor/ftview/lib/studio.js'
+
+export const name = 'engineering-ftview'
+/** Union of the parts' requirements: the read entry owns the view service. */
+export const inject = ['tools', 'fs']
+
+export const Config = z.object({
+  edit: z.boolean().default(true).description(
+    'Staged display and HMI-tag edits, validated then written to a new export folder.',
+  ),
+  studio: z.boolean().default(true).description(
+    'FactoryTalk View Studio discovery and the manual import plan. Runs no vendor utility.',
+  ),
+})
+
+/**
+ * Mount the FactoryTalk View surface.
+ * @param ctx - plugin context.
+ * @param config - the two optional surfaces, on by default.
+ */
+export function apply(ctx, config = {}) {
+  ctx.plugin(read)
+  ctx.plugin(skill)
+  if (config.edit !== false) ctx.plugin(edit)
+  if (config.studio !== false) ctx.plugin(studio)
+}

package/entries/l5x.js

@@ -0,0 +1,44 @@
+/**
+ * The Studio 5000 L5X product row: one switch for the whole L5X surface.
+ *
+ * The parts are the vendored entries; this module mounts them, so the Plugins
+ * page shows one row per product instead of one per surface. The three
+ * expensive surfaces stay off by default and are switched from this row's
+ * config form, which is the same decision the old separate rows encoded —
+ * just reachable from the product row instead of from the list.
+ */
+import z from '@deepseek-ai/schemastery'
+import * as read from '../vendor/l5x/lib/index.js'
+import * as skill from '../vendor/l5x/lib/skill.js'
+import * as editing from '../vendor/l5x/lib/editing.js'
+import * as studio from '../vendor/l5x/lib/studio.js'
+import * as live from '../vendor/l5x/lib/live.js'
+
+export const name = 'engineering-l5x'
+/** Union of the parts' requirements: the read entry owns the project service. */
+export const inject = ['tools', 'fs']
+
+export const Config = z.object({
+  editing: z.boolean().default(false).description(
+    'Nine staged draft tools (draft_rung, draft_apply, ...). Off by default: a read-only profile should not pay for these schemas.',
+  ),
+  studio: z.boolean().default(false).description(
+    'Logix Designer SDK and supervised controller tools. Needs Studio 5000 with the SDK service installed.',
+  ),
+  live: z.boolean().default(false).description(
+    'EtherNet/IP polling and trend tools. Needs a reachable controller address.',
+  ),
+})
+
+/**
+ * Mount the L5X surface.
+ * @param ctx - plugin context.
+ * @param config - the three optional surfaces, all off unless enabled.
+ */
+export function apply(ctx, config = {}) {
+  ctx.plugin(read)
+  ctx.plugin(skill)
+  if (config.editing === true) ctx.plugin(editing)
+  if (config.studio === true) ctx.plugin(studio)
+  if (config.live === true) ctx.plugin(live)
+}

package/entries/mwi.js

@@ -0,0 +1,36 @@
+/**
+ * The MotionWorks IEC product row: one switch for the session, read, verify and
+ * edit surfaces plus the skill.
+ *
+ * Editing is the largest schema set in the bundle, so it stays off until the
+ * row's config form turns it on.
+ */
+import z from '@deepseek-ai/schemastery'
+import * as session from '../vendor/mwi/lib/index.js'
+import * as read from '../vendor/mwi/lib/read.js'
+import * as skill from '../vendor/mwi/lib/skill.js'
+import * as verify from '../vendor/mwi/lib/verify.js'
+import * as edit from '../vendor/mwi/lib/edit.js'
+
+export const name = 'engineering-mwi'
+/** The whole product needs the tool registry. */
+export const inject = ['tools']
+
+export const Config = z.object({
+  edit: z.boolean().default(false).description(
+    'Seven staged edit tools (code, declarations, structure, blocks, POU packages). Off by default: the largest schemas in the bundle.',
+  ),
+})
+
+/**
+ * Mount the MotionWorks IEC surface.
+ * @param ctx - plugin context.
+ * @param config - the optional edit surface, off unless enabled.
+ */
+export function apply(ctx, config = {}) {
+  ctx.plugin(session)
+  ctx.plugin(read)
+  ctx.plugin(skill)
+  ctx.plugin(verify)
+  if (config.edit === true) ctx.plugin(edit)
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aryacode/dsh-engineering",
-  "version": "0.4.3",
-  "description": "AryaCode engineering bundle: one install surface and one tool-exposure policy for the Studio 5000 L5X, FactoryTalk View and MotionWorks IEC plugins, with skill links for Optix and CAD.",
+  "version": "0.4.4",
+  "description": "AryaCode engineering bundle: one install surface for the Studio 5000 L5X, FactoryTalk View ME, MotionWorks IEC and FactoryTalk Optix surfaces, one row per product, with the ladder and display previews.",
   "keywords": [
     "dsh",
     "deepseek-harness",
@@ -30,6 +30,7 @@
   },
   "files": [
     "cordis.patch.yml",
+    "entries/**/*",
     "lib/**/*",
     "locale/*.json",
     "vendor/**/*",
@@ -75,16 +76,19 @@
     },
     "./client": "./lib/client.js",
     "./package.json": "./package.json",
-    "./l5x": "./vendor/l5x/lib/index.js",
+    "./l5x": "./entries/l5x.js",
+    "./ftview": "./entries/ftview.js",
+    "./mwi": "./entries/mwi.js",
+    "./l5x/read": "./vendor/l5x/lib/index.js",
     "./l5x/skill": "./vendor/l5x/lib/skill.js",
     "./l5x/editing": "./vendor/l5x/lib/editing.js",
     "./l5x/live": "./vendor/l5x/lib/live.js",
     "./l5x/studio": "./vendor/l5x/lib/studio.js",
-    "./ftview": "./vendor/ftview/lib/index.js",
+    "./ftview/read": "./vendor/ftview/lib/index.js",
     "./ftview/skill": "./vendor/ftview/lib/skill.js",
     "./ftview/edit": "./vendor/ftview/lib/edit.js",
     "./ftview/studio": "./vendor/ftview/lib/studio.js",
-    "./mwi": "./vendor/mwi/lib/index.js",
+    "./mwi/session": "./vendor/mwi/lib/index.js",
     "./mwi/read": "./vendor/mwi/lib/read.js",
     "./mwi/skill": "./vendor/mwi/lib/skill.js",
     "./mwi/verify": "./vendor/mwi/lib/verify.js",