dazscript-framework 1.0.41 → 1.0.42

package/README.md

@@ -256,11 +256,19 @@ export default defineConfig({
     defaultMenuPath: '/MyScripts',
     appDataPath: 'YourName/my-project',  // required
     bundleName: 'My Project',            // optional — used in the setup dialog title
+    assets: [
+        { from: './publishing/manual/User Guide.pdf', to: 'User Guide.pdf' },
+        { from: './licenses/NOTICE.txt', to: 'docs/NOTICE.txt' },
+    ],
 });
 ```
 
 `appDataPath` is required for builds that generate launcher shims and must be unique across your projects.
 
+Each `assets` entry copies one completed file during the existing postbuild asset stage. `from` is relative to the project root; `to` is relative to `outDir`. Nested destination directories are created automatically. Mappings are explicit—directories and globs are not expanded—and every declared source file is required. A missing source fails the build with its configured path. Both paths must remain inside their respective roots.
+
+Assets use the same stage as PNG icons, so `npm run build`, `npm run build:release`, and `npm run icons` copy them without product-specific scripts. The framework copies files only; it does not generate or convert PDFs.
+
 ---
 
 ### The `action(...)` Entrypoint
@@ -301,7 +309,7 @@ action({ text: 'My Script' }, MyScript);
 | `group` | Grouping label for related actions in Daz Studio |
 | `description` | Longer description for the action |
 | `icon` | Image path used for the installed custom action. Overrides discovered icon files. |
-| `bundle` | Generates a setup script beside the action. `true` → `Setup.dsa.ts`, a string → `Setup <name>.dsa.ts` |
+| `bundle` | Generates a setup script beside the action. `true` → `<bundleName> Setup.dsa.ts`, a string → `<name> Setup.dsa.ts` |
 
 ---
 
@@ -334,7 +342,7 @@ Individual script packages can wrap this command in `package.json` scripts such
 npm run installer
 ```
 
-This scans all `.dsa.ts` entry files, reads each top-level `action(...)` call, and generates `src/Setup.dsa.ts` automatically. No installer code to maintain by hand.
+This scans all `.dsa.ts` entry files, reads each top-level `action(...)` call, and generates `src/<bundleName> Setup.dsa.ts` automatically. Projects without a `bundleName` retain the legacy `src/Setup.dsa.ts` name. No installer code to maintain by hand.
 
 The generated setup dialog:
 
@@ -359,16 +367,16 @@ Custom action icons are selected from `action(...)` metadata and sibling image f
 3. `scriptname.png`
 4. `scriptname.dsa.png` legacy fallback
 
-`scriptname.action.png` is the installed custom action icon. Daz Studio uses the same action icon for menu and toolbar placements. `scriptname.png` is the preferred script/content icon fallback. `scriptname.dsa.png` is a legacy fallback kept for older projects and will be removed in a future breaking release.
+`scriptname.action.png` is the installed custom action icon. Daz Studio uses the same action icon for menu and toolbar placements. `scriptname.png` is the preferred script/content icon fallback. `scriptname.dsa.png` remains supported as legacy source input, but builds copy and reference it as `scriptname.png`.
 
-Setup dialog header assets are optional and are discovered beside `src/Setup.dsa.ts`:
+Setup dialog header assets are optional and are discovered in `src`:
 
 1. `src/Setup.header.png`
 2. `src/Setup.tip.png`
 3. `src/Setup.png`
 4. `src/Setup.dsa.png` legacy fallback
 
-Header text can be placed in `src/Setup.header.html`, `src/Setup.header.md`, or `src/Setup.header.txt`, with `src/Setup.html`, `src/Setup.md`, and `src/Setup.txt` as script-named fallbacks. The installer generator embeds that text into `Setup.dsa.ts`, so Daz Studio does not need to read the text file at setup time. The setup dialog renders the header body with `DzTextBrowser` rich text support; no Markdown conversion is performed. The image remains a deployed PNG asset and is resolved relative to the generated setup script at runtime.
+Header text can be placed in `src/Setup.header.html`, `src/Setup.header.md`, or `src/Setup.header.txt`, with `src/Setup.html`, `src/Setup.md`, and `src/Setup.txt` as script-named fallbacks. The installer generator embeds that text into the generated setup script, so Daz Studio does not need to read the text file at setup time. The setup dialog renders the header body with `DzTextBrowser` rich text support; no Markdown conversion is performed. The image remains a deployed PNG asset and is resolved relative to the generated setup script at runtime.
 
 The same layout is available to custom dialogs through `add.header({ imagePath, html, text, height, imageWidth }).build()`. Use `html` for rich text, or `text` for escaped plain text.
 
@@ -398,7 +406,7 @@ The JSON can be an array or an object containing `actions`, `shortcuts`, or `acc
 
 Accepted shortcut fields are `shortcut`, `accelerator`, or `key`. Accepted action-name fields are `name` or `action`.
 
-At build time the JSON is embedded into generated `Setup.dsa.ts`; Daz Studio does not need to read the original JSON file at setup time. During setup, the `Keyboard Shortcuts` tab shows the action label, current shortcut, new shortcut, action type, and conflicts. The user chooses which shortcut rows to apply.
+At build time the JSON is embedded into the generated setup script; Daz Studio does not need to read the original JSON file at setup time. During setup, the `Keyboard Shortcuts` tab shows the action label, current shortcut, new shortcut, action type, and conflicts. The user chooses which shortcut rows to apply.
 
 Before changing a non-custom Daz Studio action shortcut, setup writes the original value to:
 
@@ -416,8 +424,8 @@ The `bundle` property on `action(...)` is separate from the project-level `bundl
 
 When `bundle` is set, the installer generator also writes a setup script beside that action:
 
-- `bundle: true` → writes `Setup.dsa.ts`
-- `bundle: 'Utilities'` → writes `Setup Utilities.dsa.ts`
+- `bundle: true` → writes `<bundleName> Setup.dsa.ts`, or `Setup.dsa.ts` when no project `bundleName` exists
+- `bundle: 'Utilities'` → writes `Utilities Setup.dsa.ts`
 
 Those bundle-scoped setup files use the same setup dialog helper and also receive the project `bundleName`.
 
@@ -536,6 +544,7 @@ Use `this.add` inside `build()` to construct the UI declaratively.
 | `add.radio(text)` | Radio button |
 | `add.comboBox()` | Drop-down list |
 | `add.listBox()` | Scrollable list |
+| `add.list.view<T>()` | Tree/list view; chain `.tabFocusWhenPopulated()` to skip empty or fully filtered lists during keyboard navigation |
 | `add.slider(min, max)` | Numeric slider |
 | `add.colorPicker()` | Color picker |
 | `add.nodeSelection()` | Daz Studio node selector |
@@ -635,7 +644,7 @@ The `test/unit/` files are generated only when you run `dazscript init --unit-te
 | `npm run build:release` | Build with `--log-level warn`, then encrypt implementation bundles |
 | `npm run watch` | Recompile on every save |
 | `npm run installer` | Generate the setup dialog |
-| `npm run icons` | Copy icon assets to the output folder |
+| `npm run icons` | Copy PNG icons and configured assets to the output folder |
 | `npm test` | Run fast Node/Vitest tests |
 | `npm run test:integration` | Run a DAZ Studio headless integration fixture |
 

package/dist/scripts/icons.js

@@ -10,6 +10,27 @@ function copyFile(sourcePath, targetPath) {
   console.log(`copy ${path.relative(process.cwd(), targetPath)}`);
 }
 
+function resolveAssetPath(rootPath, configuredPath, field) {
+  const resolvedRoot = path.resolve(rootPath);
+  const resolvedPath = path.resolve(resolvedRoot, configuredPath);
+  const relativePath = path.relative(resolvedRoot, resolvedPath);
+  if (path.isAbsolute(configuredPath) || relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
+    throw new Error(`[dazscript assets] Asset ${field} path must stay inside its allowed root: ${configuredPath}`);
+  }
+  return resolvedPath;
+}
+
+function copyAssets(workdir, outDir, assets) {
+  (assets || []).forEach((asset) => {
+    const sourcePath = resolveAssetPath(workdir, asset.from, 'from');
+    const targetPath = resolveAssetPath(outDir, asset.to, 'to');
+    if (!fs.existsSync(sourcePath)) {
+      throw new Error(`[dazscript assets] Required asset not found: ${asset.from}`);
+    }
+    copyFile(sourcePath, targetPath);
+  });
+}
+
 function copyIcons(workdir, options) {
   const sourceRoot = path.resolve(workdir, 'src');
   const outDir = path.resolve(workdir, options.outDir || './out');
@@ -18,8 +39,12 @@ function copyIcons(workdir, options) {
 
   files.forEach((filePath) => {
     const relativePath = path.relative(sourceRoot, filePath);
-    copyFile(filePath, path.join(outDir, relativePath));
+    const outputRelativePath = relativePath.endsWith('.dsa.png')
+      ? `${relativePath.slice(0, -'.dsa.png'.length)}.png`
+      : relativePath;
+    copyFile(filePath, path.join(outDir, outputRelativePath));
   });
+  copyAssets(workdir, outDir, options.assets);
 }
 
 module.exports = {

package/dist/scripts/install-generator.js

@@ -37,6 +37,29 @@ function replaceEntryOutputSuffix(filePath, suffix) {
   return `${filePath}${suffix}`;
 }
 
+function removeSetupArtifacts(workdir, outDir, scriptsPath, sourceFilePath) {
+  const absoluteSourcePath = path.resolve(workdir, sourceFilePath);
+  if (fs.existsSync(absoluteSourcePath)) {
+    fs.unlinkSync(absoluteSourcePath);
+  }
+
+  const relativeSourcePath = path.relative(
+    path.resolve(workdir, scriptsPath),
+    absoluteSourcePath
+  );
+  if (relativeSourcePath.startsWith('..') || path.isAbsolute(relativeSourcePath)) {
+    return;
+  }
+
+  const outputFilePath = path.join(
+    path.resolve(workdir, outDir),
+    replaceEntrySourceSuffix(relativeSourcePath, '.dsa')
+  );
+  if (fs.existsSync(outputFilePath)) {
+    fs.unlinkSync(outputFilePath);
+  }
+}
+
 function getActionIconPath(filePath, decorator) {
   if (decorator.icon) {
     return decorator.icon;
@@ -64,9 +87,10 @@ function getActionIconPath(filePath, decorator) {
       : replaceEntryOutputSuffix(getPartialPath(filePath), '.png');
   }
 
-  return isBundleAction
-    ? path.parse(filePath).name.replace('.dsa', '.dsa.png')
-    : `${getPartialPath(filePath)}.png`;
+  return replaceEntryOutputSuffix(
+    isBundleAction ? path.parse(filePath).name : getPartialPath(filePath),
+    '.png'
+  );
 }
 
 function generateInstallerTemplate(data, options) {
@@ -200,7 +224,7 @@ function findActionEntryFiles(workdir, options) {
   });
 }
 
-function processScript(filePath, container, defaultMenuPath, setupOptions) {
+function processScript(workdir, filePath, container, defaultMenuPath, setupOptions, options) {
   const fileInfo = path.parse(filePath);
   const content = fs.readFileSync(filePath, 'utf-8').toString();
   const actionCall = findTopLevelActionCall(content, filePath);
@@ -251,11 +275,12 @@ function processScript(filePath, container, defaultMenuPath, setupOptions) {
   container.scripts.push(script);
 
   if (decorator.bundle !== undefined) {
-    let packageSetupFilePath = `Setup.dsa.ts`;
-
-    if (decorator.bundle !== true) {
-      packageSetupFilePath = `Setup ${decorator.bundle}.dsa.ts`;
-    }
+    const packageSetupFilePath = decorator.bundle === true
+      ? `${setupOptions.bundleName ? `${setupOptions.bundleName} ` : ''}Setup.dsa.ts`
+      : `${decorator.bundle} Setup.dsa.ts`;
+    const legacySetupFilePath = decorator.bundle === true
+      ? 'Setup.dsa.ts'
+      : `Setup ${decorator.bundle}.dsa.ts`;
 
     let bundleScriptContent = generateInstallerTemplate(
       JSON.stringify(container.scripts, null, 4),
@@ -265,14 +290,22 @@ function processScript(filePath, container, defaultMenuPath, setupOptions) {
       path.parse(filePath).dir,
       packageSetupFilePath
     );
+    if (legacySetupFilePath !== packageSetupFilePath) {
+      removeSetupArtifacts(
+        workdir,
+        options.outDir,
+        options.scriptsPath,
+        path.join(path.parse(filePath).dir, legacySetupFilePath)
+      );
+    }
     fs.writeFileSync(bundleScriptFilePath, bundleScriptContent);
   }
 }
 
-function processScripts(paths, container, defaultMenuPath, setupOptions) {
+function processScripts(workdir, paths, container, defaultMenuPath, setupOptions, options) {
   paths.forEach((filePath) => {
     console.log(`Processing ${filePath}`);
-    processScript(filePath, container, defaultMenuPath, setupOptions);
+    processScript(workdir, filePath, container, defaultMenuPath, setupOptions, options);
   });
 }
 
@@ -377,6 +410,10 @@ function generateInstallerFiles(workdir, options) {
     ? options.defaultMenuPath
     : `${options.defaultMenuPath}/`;
   const { config } = loadConfig(workdir);
+  const generatorOptions = {
+    scriptsPath: options.scriptsPath,
+    outDir: config.outDir || './out',
+  };
   const appDataPath = validateAppDataPath(options.appDataPath || config.appDataPath, workdir);
   const settingsPath = `${appDataPath}/Installer`;
   const bundleName = typeof config.bundleName === 'string' && config.bundleName.trim()
@@ -396,7 +433,7 @@ function generateInstallerFiles(workdir, options) {
   const container = { scripts: [] };
   const matches = findActionEntryFiles(workdir, options);
 
-  processScripts(matches, container, defaultMenuPath, setupOptions);
+  processScripts(workdir, matches, container, defaultMenuPath, setupOptions, generatorOptions);
 
   container.scripts = container.scripts.sort((a, b) => {
     const aKey = a.menuPath + a.filePath;
@@ -408,7 +445,11 @@ function generateInstallerFiles(workdir, options) {
     JSON.stringify(container.scripts, null, 4),
     setupOptions
   );
-  fs.writeFileSync(path.join(workdir, 'src', 'Setup.dsa.ts'), installerScriptContent);
+  const setupFileName = `${bundleName ? `${bundleName} ` : ''}Setup.dsa.ts`;
+  if (setupFileName !== 'Setup.dsa.ts') {
+    removeSetupArtifacts(workdir, generatorOptions.outDir, './src', path.join(workdir, 'src', 'Setup.dsa.ts'));
+  }
+  fs.writeFileSync(path.join(workdir, 'src', setupFileName), installerScriptContent);
 
   const installPath = path.join(workdir, 'src', 'Install.dsa.ts');
   const uninstallPath = path.join(workdir, 'src', 'Uninstall.dsa.ts');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dazscript-framework",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "author": "Freddy Diaz",
   "license": "MPL-2.0",
   "description": "",

package/src/dialog/builders/list-view-builder.items.test.ts

@@ -15,11 +15,14 @@ const listView = vi.hoisted(() => ({
     setSorting: vi.fn(),
     hide: vi.fn(),
     show: vi.fn(),
+    getWidget: vi.fn(() => focusWidget),
     selectedItem: vi.fn(() => null),
     doubleClicked: { scriptConnect: vi.fn() },
     contextMenuRequested: { scriptConnect: vi.fn() }
 }))
 
+const focusWidget = vi.hoisted(() => ({ focusPolicy: 15 }))
+
 vi.mock('./widget-builder', () => ({
     createWidget: () => ({ build: () => listView })
 }))
@@ -35,6 +38,7 @@ class FakeListViewItem {
     data: any
     open = false
     selectable = true
+    visible = true
     textByColumn: Record<number, string> = {}
 
     constructor(parent: any, public id: number) {
@@ -48,13 +52,17 @@ class FakeListViewItem {
 
 vi.stubGlobal('DzListView', { All: 0, Extended: 1 })
 vi.stubGlobal('DzListViewItem', FakeListViewItem)
+vi.stubGlobal('QtFocusPolicy', { NoFocus: 0 })
 
-import { ListViewBuilder } from './list-view-builder'
+import { filter } from '@dsf/helpers/list-view-helper'
+import { ListViewBuilder, ListViewRefreshOptions } from './list-view-builder'
 
 describe('ListViewBuilder item updates', () => {
     beforeEach(() => {
         listView.items = []
         vi.clearAllMocks()
+        vi.mocked(filter).mockReset()
+        focusWidget.focusPolicy = 15
     })
 
     it('keeps unchanged rows when data has no explicit id', () => {
@@ -75,4 +83,46 @@ describe('ListViewBuilder item updates', () => {
 
         expect(listView.items.map(item => item.textByColumn[0])).toEqual(['Action B'])
     })
+
+    it('removes empty lists from tab focus and restores populated lists', () => {
+        const items = new Observable<TreeNode<any>[]>([])
+
+        new ListViewBuilder<any, any>({ dialog: {}, layout: null } as any)
+            .tabFocusWhenPopulated()
+            .items(items)
+            .rebuildOnItemsChanged()
+            .columns(['Name'])
+            .text(item => [item.name])
+            .data(item => item.value)
+            .build()
+
+        expect(focusWidget.focusPolicy).toBe(0)
+
+        items.value = [new TreeNode('Action A', '', { name: 'ActionA' })]
+        expect(focusWidget.focusPolicy).toBe(15)
+
+        items.value = []
+        expect(focusWidget.focusPolicy).toBe(0)
+    })
+
+    it('removes fully filtered lists from tab focus', () => {
+        const refresh = new Observable<void>()
+
+        new ListViewBuilder<any, any>({ dialog: {}, layout: null } as any)
+            .tabFocusWhenPopulated()
+            .refresh(refresh, ListViewRefreshOptions.Filters)
+            .items(new Observable([new TreeNode('Action A', '', { name: 'ActionA' })]))
+            .filter({ keywords: new Observable(''), field: item => item.textByColumn[0] })
+            .columns(['Name'])
+            .text(item => [item.name])
+            .data(item => item.value)
+            .build()
+
+        vi.mocked(filter).mockImplementation((view: any) => {
+            view.items.forEach((item: any) => item.visible = false)
+        })
+        refresh.trigger()
+
+        expect(focusWidget.focusPolicy).toBe(0)
+    })
 })

package/src/dialog/builders/list-view-builder.ts

@@ -51,6 +51,12 @@ export class ListViewBuilder<TItem, TData> implements IWidgetBuilder<DzListView>
         return this
     }
 
+    /** Removes the list from keyboard tab focus when it has no visible selectable rows. */
+    tabFocusWhenPopulated(): this {
+        this.context.tabFocusWhenPopulated = true
+        return this
+    }
+
     /**
      * Binds the list rows to a collection of items
      * @param items
@@ -156,6 +162,7 @@ class ListViewBuilderContext<TItem, TData> {
     flat: Observable<boolean>
     refreshWhat: ListViewRefreshOptions = ListViewRefreshOptions.All
     itemsChangeMode: ListViewItemsChangeMode = 'update'
+    tabFocusWhenPopulated: boolean = false
     constructor(public readonly dialogContext: WidgetBuilderContext) { }
 }
 
@@ -235,8 +242,17 @@ class ListViewBindBuilder<TItem, TData> {
 
 const build = <TItem, TData>(context: ListViewBuilderContext<TItem, TData>): DzListView => {
     const listView = createWidget(context.dialogContext).build(DzListView)
+    const focusWidget = context.tabFocusWhenPopulated ? listView.getWidget() : null
+    const populatedFocusPolicy = focusWidget?.focusPolicy
     let rowId = -1
 
+    const syncTabFocus = () => {
+        if (!focusWidget) return
+        const hasNavigableRow = listView.getItems(DzListView.All)
+            .some(item => item.visible !== false && item.selectable !== false)
+        focusWidget.focusPolicy = hasNavigableRow ? populatedFocusPolicy : QtFocusPolicy.NoFocus
+    }
+
     if (context.visible) {
         if (context.visible.value === false)
             listView.hide()
@@ -294,6 +310,7 @@ const build = <TItem, TData>(context: ListViewBuilderContext<TItem, TData>): DzL
 
     const filterList = (keywords?: string) => {
         filter(listView, context.filter.field, keywords ?? context.filter?.keywords?.value, { selectOnFilter: context.filter.selectOnFilter ?? true, filters: context.filter.filters })
+        syncTabFocus()
     }
     let delayedFilter: Delayed | null = null
 
@@ -310,10 +327,15 @@ const build = <TItem, TData>(context: ListViewBuilderContext<TItem, TData>): DzL
         })
         listView.allColumnsShowFocus = true
 
-        if (context.visible.value === false)
+        if (context.visible.value === false) {
+            syncTabFocus()
             return
+        }
 
-        if (!items) return
+        if (!items) {
+            syncTabFocus()
+            return
+        }
 
         items.forEach((item) => {
             buildItem(item, listView)
@@ -334,6 +356,8 @@ const build = <TItem, TData>(context: ListViewBuilderContext<TItem, TData>): DzL
 
         if (context.filter?.keywords.value || context.filter?.filters)
             filterList()
+        else
+            syncTabFocus()
 
         if (selectedId) {
             listView.getItems(DzListView.All).forEach(item => {
@@ -400,6 +424,8 @@ const build = <TItem, TData>(context: ListViewBuilderContext<TItem, TData>): DzL
             if (!incomingPaths[path]) listView.deleteItem(li)
         })
 
+        syncTabFocus()
+
     }
 
     const onSelectionChanged = (callback: (item: DzListViewItem, data: TData) => void) => {

package/src/scripts/icons.test.ts

@@ -0,0 +1,63 @@
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { afterEach, expect, it } from 'vitest'
+
+const { copyIcons } = require('../../dist/scripts/icons')
+
+const tempDirs: string[] = []
+
+const makeProject = (): string => {
+    const projectDir = fs.mkdtempSync(path.join(os.tmpdir(), 'dsf-icons-'))
+    tempDirs.push(projectDir)
+    fs.mkdirSync(path.join(projectDir, 'src'), { recursive: true })
+    return projectDir
+}
+
+afterEach(() => {
+    while (tempDirs.length > 0) {
+        fs.rmSync(tempDirs.pop()!, { recursive: true, force: true })
+    }
+})
+
+it('copies a legacy dsa icon under the preferred output name', () => {
+    const projectDir = makeProject()
+    fs.writeFileSync(path.join(projectDir, 'src', 'Power Menu Favorite Actions.dsa.png'), 'legacy icon')
+
+    copyIcons(projectDir, { outDir: './out' })
+
+    expect(fs.readFileSync(path.join(projectDir, 'out', 'Power Menu Favorite Actions.png'), 'utf8')).toBe('legacy icon')
+    expect(fs.existsSync(path.join(projectDir, 'out', 'Power Menu Favorite Actions.dsa.png'))).toBe(false)
+})
+
+it('copies a declared asset from the project root into a nested output directory', () => {
+    const projectDir = makeProject()
+    fs.mkdirSync(path.join(projectDir, 'publishing', 'manual'), { recursive: true })
+    fs.writeFileSync(path.join(projectDir, 'publishing', 'manual', 'User Manual.pdf'), 'completed pdf')
+
+    copyIcons(projectDir, {
+        outDir: './build',
+        assets: [{ from: './publishing/manual/User Manual.pdf', to: 'docs/User Manual.pdf' }],
+    })
+
+    expect(fs.readFileSync(path.join(projectDir, 'build', 'docs', 'User Manual.pdf'), 'utf8')).toBe('completed pdf')
+})
+
+it('fails clearly when a declared asset is missing', () => {
+    const projectDir = makeProject()
+
+    expect(() => copyIcons(projectDir, {
+        outDir: './out',
+        assets: [{ from: './publishing/manual/User Manual.pdf', to: 'User Manual.pdf' }],
+    })).toThrow('[dazscript assets] Required asset not found: ./publishing/manual/User Manual.pdf')
+})
+
+it.each([
+    [{ from: '../User Manual.pdf', to: 'User Manual.pdf' }, 'from'],
+    [{ from: './User Manual.pdf', to: '../User Manual.pdf' }, 'to'],
+])('rejects an asset %s path outside its allowed root', (asset, field) => {
+    const projectDir = makeProject()
+
+    expect(() => copyIcons(projectDir, { outDir: './out', assets: [asset] }))
+        .toThrow(`[dazscript assets] Asset ${field} path must stay inside its allowed root`)
+})

package/src/scripts/install-generator.test.ts

@@ -7,13 +7,13 @@ const { generateInstallerFiles } = require('../../dist/scripts/install-generator
 
 const tempDirs: string[] = []
 
-const makeProject = (): string => {
+const makeProject = (bundleName?: string): string => {
     const projectDir = fs.mkdtempSync(path.join(os.tmpdir(), 'dsf-install-generator-'))
     tempDirs.push(projectDir)
     fs.mkdirSync(path.join(projectDir, 'src'), { recursive: true })
     fs.writeFileSync(
         path.join(projectDir, 'dazscript.config.cjs'),
-        "module.exports = { appDataPath: 'Test/ActionIcons' }\n"
+        `module.exports = { appDataPath: 'Test/ActionIcons'${bundleName ? `, bundleName: '${bundleName}'` : ''} }\n`
     )
     return projectDir
 }
@@ -33,7 +33,7 @@ const writeText = (projectDir: string, fileName: string, content: string): void
     fs.writeFileSync(path.join(projectDir, 'src', fileName), content)
 }
 
-const generateSetup = (projectDir: string): string => {
+const runGenerator = (projectDir: string): void => {
     const previousCwd = process.cwd()
     process.chdir(projectDir)
     try {
@@ -45,6 +45,10 @@ const generateSetup = (projectDir: string): string => {
     } finally {
         process.chdir(previousCwd)
     }
+}
+
+const generateSetup = (projectDir: string): string => {
+    runGenerator(projectDir)
     return fs.readFileSync(path.join(projectDir, 'src', 'Setup.dsa.ts'), 'utf8')
 }
 
@@ -55,6 +59,54 @@ afterEach(() => {
     }
 })
 
+describe('install generator setup naming', () => {
+    it('emits only the product-prefixed project setup name', () => {
+        const projectDir = makeProject('Power Menu')
+        writeScript(projectDir, 'power-menu')
+        fs.mkdirSync(path.join(projectDir, 'out'), { recursive: true })
+        fs.writeFileSync(path.join(projectDir, 'src', 'Setup.dsa.ts'), 'legacy source')
+        fs.writeFileSync(path.join(projectDir, 'out', 'Setup.dsa'), 'legacy output')
+
+        runGenerator(projectDir)
+
+        expect(fs.existsSync(path.join(projectDir, 'src', 'Power Menu Setup.dsa.ts'))).toBe(true)
+        expect(fs.existsSync(path.join(projectDir, 'src', 'Setup.dsa.ts'))).toBe(false)
+        expect(fs.existsSync(path.join(projectDir, 'out', 'Setup.dsa'))).toBe(false)
+    })
+
+    it('emits only the prefix-first action bundle setup name', () => {
+        const projectDir = makeProject('Power Menu')
+        writeScript(projectDir, 'utilities', ", bundle: 'Utilities'")
+        fs.mkdirSync(path.join(projectDir, 'out'), { recursive: true })
+        fs.writeFileSync(path.join(projectDir, 'src', 'Setup Utilities.dsa.ts'), 'legacy source')
+        fs.writeFileSync(path.join(projectDir, 'out', 'Setup Utilities.dsa'), 'legacy output')
+
+        runGenerator(projectDir)
+
+        expect(fs.existsSync(path.join(projectDir, 'src', 'Utilities Setup.dsa.ts'))).toBe(true)
+        expect(fs.existsSync(path.join(projectDir, 'src', 'Setup Utilities.dsa.ts'))).toBe(false)
+        expect(fs.existsSync(path.join(projectDir, 'out', 'Setup Utilities.dsa'))).toBe(false)
+    })
+
+    it('uses the project prefix for an unnamed action bundle setup', () => {
+        const projectDir = makeProject('Power Menu')
+        fs.mkdirSync(path.join(projectDir, 'src', 'tools'), { recursive: true })
+        fs.mkdirSync(path.join(projectDir, 'out', 'tools'), { recursive: true })
+        fs.writeFileSync(
+            path.join(projectDir, 'src', 'tools', 'utilities.dsa.ts'),
+            "action({ text: 'utilities', bundle: true }, function() {})\n"
+        )
+        fs.writeFileSync(path.join(projectDir, 'src', 'tools', 'Setup.dsa.ts'), 'legacy source')
+        fs.writeFileSync(path.join(projectDir, 'out', 'tools', 'Setup.dsa'), 'legacy output')
+
+        runGenerator(projectDir)
+
+        expect(fs.existsSync(path.join(projectDir, 'src', 'tools', 'Power Menu Setup.dsa.ts'))).toBe(true)
+        expect(fs.existsSync(path.join(projectDir, 'src', 'tools', 'Setup.dsa.ts'))).toBe(false)
+        expect(fs.existsSync(path.join(projectDir, 'out', 'tools', 'Setup.dsa'))).toBe(false)
+    })
+})
+
 describe('install generator action icons', () => {
     it('prefers the action icon convention over the script icon fallback', () => {
         const projectDir = makeProject()
@@ -82,14 +134,15 @@ describe('install generator action icons', () => {
         expect(setup).not.toContain('"icon": "./power-menu.dsa.png"')
     })
 
-    it('keeps the dsa-named script icon as a legacy fallback', () => {
+    it('normalizes the dsa-named legacy icon in generated setup', () => {
         const projectDir = makeProject()
         writeScript(projectDir, 'legacy-icon')
         writePng(projectDir, 'legacy-icon.dsa.png')
 
         const setup = generateSetup(projectDir)
 
-        expect(setup).toContain('"icon": "./legacy-icon.dsa.png"')
+        expect(setup).toContain('"icon": "./legacy-icon.png"')
+        expect(setup).not.toContain('"icon": "./legacy-icon.dsa.png"')
     })
 
     it('lets explicit action icon metadata override discovered icon files', () => {