dsh-plugin-shop 0.5.3 → 0.5.4-beta.0

package/lib/client.js

@@ -4434,7 +4434,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 521,
+						"line": 525,
 						"column": 9
 					}
 				},
@@ -4452,7 +4452,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 677,
+						"line": 681,
 						"column": 9
 					}
 				},
@@ -4480,7 +4480,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 547,
+						"line": 551,
 						"column": 9
 					}
 				},
@@ -4507,7 +4507,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 666,
+						"line": 670,
 						"column": 3
 					}
 				},
@@ -4525,7 +4525,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 827,
+						"line": 831,
 						"column": 9
 					}
 				},
@@ -4580,7 +4580,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 769,
+						"line": 773,
 						"column": 9
 					}
 				},
@@ -4607,7 +4607,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 887,
+						"line": 891,
 						"column": 9
 					}
 				},
@@ -4625,7 +4625,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 871,
+						"line": 875,
 						"column": 9
 					}
 				}

package/lib/index.js

@@ -987,16 +987,31 @@ function collectEntryIds(entries, into) {
 /**
 * Does a live loader entry id belong to the package that owns `owned`?
 *
-* A boot-layer entry carries the bare id its bundle patch inserted. The
-* shop's own hot subtree mounts that same row as `mkt-<id>` inside an Include
-* tree, which the loader spells `include:<tree>:mkt-<id>` — the same plugin,
-* one restart earlier. Both spellings are the package's own row.
+* `owned` holds CONFIG ids — the ids a bundle patch's `insert` declares. A
+* LIVE id is that id under the namespace of every tree composed above it,
+* colon-joined, so the last segment is the declared id and the segments
+* before it name the trees:
+*
+* - `foo` — no tree above the entry at all (a harness that composes the
+*   entry list directly).
+* - `include:foo` — what a REAL dsh boot produces: app-boot mounts the whole
+*   profile as one root Include entry (`id: include`), so EVERY entry any
+*   bundle patch inserted is namespaced by it. Matching only the bare
+*   spelling found no row for any installed package, and the toggle answered
+*   "not in the running plugin tree" for all of them.
+* - `include:<tree>:mkt-foo` — the shop's own hot subtree, which prefixes its
+*   rows `mkt-` so a plugin installed this session cannot collide with a
+*   boot-layer id. The same plugin, one restart earlier.
+*
+* The last segment is therefore the answer, with `mkt-` stripped when a tree
+* namespace is present.
 */
 function ownsEntryId(owned, entryId) {
 	if (owned.has(entryId)) return true;
 	const colon = entryId.lastIndexOf(":");
 	if (colon === -1) return false;
 	const tail = entryId.slice(colon + 1);
+	if (owned.has(tail)) return true;
 	return tail.startsWith("mkt-") && owned.has(tail.slice(4));
 }
 //#endregion
@@ -1407,14 +1422,13 @@ let ShopGateway = (() => {
 				detail: `dsh-plugin-shop: ${args.name} contributes no plugin entries, so there is nothing to enable or disable`
 			};
 			const ownedSet = new Set(owned);
-			const rows = (await this.listInventory()).filter((entry) => ownsEntryId(ownedSet, entry.entryId)).map((entry) => entry.entryId);
-			if (rows.length === 0) return {
+			if ((await this.listInventory()).filter((entry) => ownsEntryId(ownedSet, entry.entryId)).length === 0) return {
 				ok: false,
 				detail: `dsh-plugin-shop: ${args.name} is installed but its entries are not in the running plugin tree; restart dsh to compose them`
 			};
 			setUserLayerRows({
 				profileDir,
-				rows: rows.map((id) => ({
+				rows: owned.map((id) => ({
 					id,
 					disabled: !args.enabled
 				}))

package/lib/typert.host.js

@@ -151,7 +151,7 @@ export const TYPERT = {
         typeSymbol: 'dsh-plugin-shop/types#ShopCatalogResult',
         schema: dsh_plugin_shop_shop_catalog_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":521,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":525,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/installed',
@@ -166,7 +166,7 @@ export const TYPERT = {
         typeSymbol: 'dsh-plugin-shop#shop/installed:result',
         schema: dsh_plugin_shop_shop_installed_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":677,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":681,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/installStart',
@@ -192,7 +192,7 @@ export const TYPERT = {
         typeSymbol: 'dsh-plugin-shop/types#ShopInstallResult',
         schema: dsh_plugin_shop_shop_installStart_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":547,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":551,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/installStatus',
@@ -217,7 +217,7 @@ export const TYPERT = {
         typeSymbol: 'dsh-plugin-shop/types#ShopInstallStatusResult',
         schema: dsh_plugin_shop_shop_installStatus_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":666,"column":3},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":670,"column":3},
     },
     {
       id: 'dsh-plugin-shop#shop/restart',
@@ -232,7 +232,7 @@ export const TYPERT = {
         typeSymbol: 'dsh-plugin-shop/types#ShopRestartResult',
         schema: dsh_plugin_shop_shop_restart_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":827,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":831,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/setEnabled',
@@ -283,7 +283,7 @@ export const TYPERT = {
         typeSymbol: 'dsh-plugin-shop/types#ShopUninstallResult',
         schema: dsh_plugin_shop_shop_uninstallStart_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":769,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":773,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/updateStart',
@@ -308,7 +308,7 @@ export const TYPERT = {
         typeSymbol: 'dsh-plugin-shop/types#ShopUpdateResult',
         schema: dsh_plugin_shop_shop_updateStart_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":887,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":891,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/version',
@@ -323,7 +323,7 @@ export const TYPERT = {
         typeSymbol: 'dsh-plugin-shop/types#ShopVersionResult',
         schema: dsh_plugin_shop_shop_version_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":871,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":875,"column":9},
     },
   ],
   model: {

package/lib/typert.remote-client.js

@@ -148,7 +148,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: 'dsh-plugin-shop/types#ShopCatalogResult',
         schema: dsh_plugin_shop_shop_catalog_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":521,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":525,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/installed',
@@ -163,7 +163,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: 'dsh-plugin-shop#shop/installed:result',
         schema: dsh_plugin_shop_shop_installed_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":677,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":681,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/installStart',
@@ -189,7 +189,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: 'dsh-plugin-shop/types#ShopInstallResult',
         schema: dsh_plugin_shop_shop_installStart_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":547,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":551,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/installStatus',
@@ -214,7 +214,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: 'dsh-plugin-shop/types#ShopInstallStatusResult',
         schema: dsh_plugin_shop_shop_installStatus_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":666,"column":3},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":670,"column":3},
     },
     {
       id: 'dsh-plugin-shop#shop/restart',
@@ -229,7 +229,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: 'dsh-plugin-shop/types#ShopRestartResult',
         schema: dsh_plugin_shop_shop_restart_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":827,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":831,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/setEnabled',
@@ -280,7 +280,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: 'dsh-plugin-shop/types#ShopUninstallResult',
         schema: dsh_plugin_shop_shop_uninstallStart_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":769,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":773,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/updateStart',
@@ -305,7 +305,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: 'dsh-plugin-shop/types#ShopUpdateResult',
         schema: dsh_plugin_shop_shop_updateStart_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":887,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":891,"column":9},
     },
     {
       id: 'dsh-plugin-shop#shop/version',
@@ -320,7 +320,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: 'dsh-plugin-shop/types#ShopVersionResult',
         schema: dsh_plugin_shop_shop_version_result$schema,
       },
-      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":871,"column":9},
+      sourceLocation: {"file":"packages/dsh-plugin-shop/src/host/index.ts","line":875,"column":9},
     },
   ],
 }

package/lib/types/host/profile.d.ts

@@ -68,9 +68,23 @@ export declare function ownedEntryIds(options: {
 /**
  * Does a live loader entry id belong to the package that owns `owned`?
  *
- * A boot-layer entry carries the bare id its bundle patch inserted. The
- * shop's own hot subtree mounts that same row as `mkt-<id>` inside an Include
- * tree, which the loader spells `include:<tree>:mkt-<id>` — the same plugin,
- * one restart earlier. Both spellings are the package's own row.
+ * `owned` holds CONFIG ids — the ids a bundle patch's `insert` declares. A
+ * LIVE id is that id under the namespace of every tree composed above it,
+ * colon-joined, so the last segment is the declared id and the segments
+ * before it name the trees:
+ *
+ * - `foo` — no tree above the entry at all (a harness that composes the
+ *   entry list directly).
+ * - `include:foo` — what a REAL dsh boot produces: app-boot mounts the whole
+ *   profile as one root Include entry (`id: include`), so EVERY entry any
+ *   bundle patch inserted is namespaced by it. Matching only the bare
+ *   spelling found no row for any installed package, and the toggle answered
+ *   "not in the running plugin tree" for all of them.
+ * - `include:<tree>:mkt-foo` — the shop's own hot subtree, which prefixes its
+ *   rows `mkt-` so a plugin installed this session cannot collide with a
+ *   boot-layer id. The same plugin, one restart earlier.
+ *
+ * The last segment is therefore the answer, with `mkt-` stripped when a tree
+ * namespace is present.
  */
 export declare function ownsEntryId(owned: ReadonlySet<string>, entryId: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-shop",
-  "version": "0.5.3",
+  "version": "0.5.4-beta.0",
   "description": "The DeepSeek Harness plugin shop: browse, install, enable, and update dsh plugins from a git-auditable catalog.",
   "repository": {
     "type": "git",