pgpm 4.27.0 → 4.28.1

package/commands/init/index.js

@@ -36,6 +36,7 @@ Options:
   --template, -t <path>   Full template path (e.g., pnpm/module) - combines dir and fromPath
   --boilerplate           Prompt to select from available boilerplates
   --create-workspace, -w  Create a workspace first, then create the module inside it
+  --use-skills            Use npx skills CLI for skill installation (slower, writes skills-lock.json)
 
 Examples:
   ${binaryName} init                                   Initialize new module (default)
@@ -65,6 +66,7 @@ async function handleInit(argv, prompter) {
     const noTty = Boolean(argv.noTty || argv['no-tty'] || argv.tty === false || process.env.CI === 'true');
     const useBoilerplatePrompt = Boolean(argv.boilerplate);
     const createWorkspace = Boolean(argv.createWorkspace || argv['create-workspace'] || argv.w);
+    const useNpxSkills = Boolean(argv.useSkills || argv['use-skills']);
     // Get fromPath from first positional arg
     const positionalFromPath = argv._?.[0];
     // Handle --template flag: parses "dir/fromPath" format and extracts both components
@@ -93,6 +95,7 @@ async function handleInit(argv, prompter) {
             dir,
             noTty,
             cwd,
+            useNpxSkills,
         });
     }
     // Regular init path: --template takes precedence, then positional arg, then default to 'module'
@@ -118,6 +121,7 @@ async function handleInit(argv, prompter) {
             dir,
             noTty,
             cwd,
+            useNpxSkills,
         });
     }
     // Default to module init (for 'module' type, 'generic' type, or unknown types)
@@ -130,6 +134,7 @@ async function handleInit(argv, prompter) {
         cwd,
         requiresWorkspace: inspection.config?.requiresWorkspace,
         createWorkspace,
+        useNpxSkills,
     }, wasExplicitModuleRequest);
 }
 async function handleBoilerplateInit(argv, prompter, ctx) {
@@ -195,6 +200,7 @@ async function handleBoilerplateInit(argv, prompter, ctx) {
             dir: ctx.dir,
             noTty: ctx.noTty,
             cwd: ctx.cwd,
+            useNpxSkills: ctx.useNpxSkills,
         });
     }
     // Default to module init (for 'module' type, 'generic' type, or unknown types)
@@ -207,9 +213,40 @@ async function handleBoilerplateInit(argv, prompter, ctx) {
         noTty: ctx.noTty,
         cwd: ctx.cwd,
         requiresWorkspace: inspection.config?.requiresWorkspace,
+        useNpxSkills: ctx.useNpxSkills,
     }, true);
 }
-function installSkills(skills, cwd) {
+function installSkills(skills, cwd, useNpxSkills) {
+    if (process.env.PGPM_SKIP_SKILL_INSTALL)
+        return;
+    if (useNpxSkills) {
+        installSkillsViaNpx(skills, cwd);
+    }
+    else {
+        installSkillsBuiltin(skills, cwd);
+    }
+}
+function installSkillsBuiltin(skills, cwd) {
+    const installer = new core_1.SkillInstaller({ toolName: core_1.DEFAULT_TEMPLATE_TOOL_NAME });
+    const result = installer.install(skills, cwd);
+    if (result.installed.length > 0) {
+        for (const name of result.installed) {
+            process.stdout.write(`  installed ${name}\n`);
+        }
+    }
+    if (result.failed.length > 0) {
+        process.stdout.write('\n⚠️  Some skills could not be installed automatically.\n');
+        process.stdout.write('Run the following commands manually:\n\n');
+        for (const f of result.failed) {
+            const source = f.source.includes('://')
+                ? f.source
+                : `https://github.com/${f.source}`;
+            process.stdout.write(`  npx skills add ${source} --skill ${f.skill}\n`);
+        }
+        process.stdout.write('\n');
+    }
+}
+function installSkillsViaNpx(skills, cwd) {
     const failed = [];
     for (const entry of skills) {
         const source = entry.source.includes('://')
@@ -294,7 +331,7 @@ async function handleWorkspaceInit(argv, prompter, ctx) {
     });
     if (templateInfo.config?.skills?.length) {
         process.stdout.write('\n📦 Installing skills...\n\n');
-        installSkills(templateInfo.config.skills, targetPath);
+        installSkills(templateInfo.config.skills, targetPath, Boolean(ctx.useNpxSkills));
     }
     const relPath = path_1.default.relative(process.cwd(), targetPath);
     process.stdout.write(`\n✨ Enjoy!\n\ncd ./${relPath}\n`);
@@ -555,7 +592,7 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
     if (moduleTemplateInfo.config?.skills?.length) {
         const skillsCwd = project.workspacePath || modulePath;
         process.stdout.write('\n📦 Installing skills...\n\n');
-        installSkills(moduleTemplateInfo.config.skills, skillsCwd);
+        installSkills(moduleTemplateInfo.config.skills, skillsCwd, Boolean(ctx.useNpxSkills));
     }
     const relPath = path_1.default.relative(process.cwd(), modulePath);
     process.stdout.write(`\n✨ Enjoy!\n\ncd ./${relPath}\n`);

package/esm/commands/init/index.js

@@ -1,7 +1,7 @@
 import { execSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
-import { DEFAULT_TEMPLATE_REPO, DEFAULT_TEMPLATE_TOOL_NAME, inspectTemplate, PgpmPackage, resolveBoilerplateBaseDir, scaffoldTemplate, scanBoilerplates, sluggify, } from '@pgpmjs/core';
+import { DEFAULT_TEMPLATE_REPO, DEFAULT_TEMPLATE_TOOL_NAME, inspectTemplate, PgpmPackage, resolveBoilerplateBaseDir, scaffoldTemplate, scanBoilerplates, SkillInstaller, sluggify, } from '@pgpmjs/core';
 import { resolveWorkspaceByType } from '@pgpmjs/env';
 import { errors } from '@pgpmjs/types';
 import { registerDefaultResolver } from 'inquirerer';
@@ -30,6 +30,7 @@ Options:
   --template, -t <path>   Full template path (e.g., pnpm/module) - combines dir and fromPath
   --boilerplate           Prompt to select from available boilerplates
   --create-workspace, -w  Create a workspace first, then create the module inside it
+  --use-skills            Use npx skills CLI for skill installation (slower, writes skills-lock.json)
 
 Examples:
   ${binaryName} init                                   Initialize new module (default)
@@ -58,6 +59,7 @@ async function handleInit(argv, prompter) {
     const noTty = Boolean(argv.noTty || argv['no-tty'] || argv.tty === false || process.env.CI === 'true');
     const useBoilerplatePrompt = Boolean(argv.boilerplate);
     const createWorkspace = Boolean(argv.createWorkspace || argv['create-workspace'] || argv.w);
+    const useNpxSkills = Boolean(argv.useSkills || argv['use-skills']);
     // Get fromPath from first positional arg
     const positionalFromPath = argv._?.[0];
     // Handle --template flag: parses "dir/fromPath" format and extracts both components
@@ -86,6 +88,7 @@ async function handleInit(argv, prompter) {
             dir,
             noTty,
             cwd,
+            useNpxSkills,
         });
     }
     // Regular init path: --template takes precedence, then positional arg, then default to 'module'
@@ -111,6 +114,7 @@ async function handleInit(argv, prompter) {
             dir,
             noTty,
             cwd,
+            useNpxSkills,
         });
     }
     // Default to module init (for 'module' type, 'generic' type, or unknown types)
@@ -123,6 +127,7 @@ async function handleInit(argv, prompter) {
         cwd,
         requiresWorkspace: inspection.config?.requiresWorkspace,
         createWorkspace,
+        useNpxSkills,
     }, wasExplicitModuleRequest);
 }
 async function handleBoilerplateInit(argv, prompter, ctx) {
@@ -188,6 +193,7 @@ async function handleBoilerplateInit(argv, prompter, ctx) {
             dir: ctx.dir,
             noTty: ctx.noTty,
             cwd: ctx.cwd,
+            useNpxSkills: ctx.useNpxSkills,
         });
     }
     // Default to module init (for 'module' type, 'generic' type, or unknown types)
@@ -200,9 +206,40 @@ async function handleBoilerplateInit(argv, prompter, ctx) {
         noTty: ctx.noTty,
         cwd: ctx.cwd,
         requiresWorkspace: inspection.config?.requiresWorkspace,
+        useNpxSkills: ctx.useNpxSkills,
     }, true);
 }
-function installSkills(skills, cwd) {
+function installSkills(skills, cwd, useNpxSkills) {
+    if (process.env.PGPM_SKIP_SKILL_INSTALL)
+        return;
+    if (useNpxSkills) {
+        installSkillsViaNpx(skills, cwd);
+    }
+    else {
+        installSkillsBuiltin(skills, cwd);
+    }
+}
+function installSkillsBuiltin(skills, cwd) {
+    const installer = new SkillInstaller({ toolName: DEFAULT_TEMPLATE_TOOL_NAME });
+    const result = installer.install(skills, cwd);
+    if (result.installed.length > 0) {
+        for (const name of result.installed) {
+            process.stdout.write(`  installed ${name}\n`);
+        }
+    }
+    if (result.failed.length > 0) {
+        process.stdout.write('\n⚠️  Some skills could not be installed automatically.\n');
+        process.stdout.write('Run the following commands manually:\n\n');
+        for (const f of result.failed) {
+            const source = f.source.includes('://')
+                ? f.source
+                : `https://github.com/${f.source}`;
+            process.stdout.write(`  npx skills add ${source} --skill ${f.skill}\n`);
+        }
+        process.stdout.write('\n');
+    }
+}
+function installSkillsViaNpx(skills, cwd) {
     const failed = [];
     for (const entry of skills) {
         const source = entry.source.includes('://')
@@ -287,7 +324,7 @@ async function handleWorkspaceInit(argv, prompter, ctx) {
     });
     if (templateInfo.config?.skills?.length) {
         process.stdout.write('\n📦 Installing skills...\n\n');
-        installSkills(templateInfo.config.skills, targetPath);
+        installSkills(templateInfo.config.skills, targetPath, Boolean(ctx.useNpxSkills));
     }
     const relPath = path.relative(process.cwd(), targetPath);
     process.stdout.write(`\n✨ Enjoy!\n\ncd ./${relPath}\n`);
@@ -548,7 +585,7 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
     if (moduleTemplateInfo.config?.skills?.length) {
         const skillsCwd = project.workspacePath || modulePath;
         process.stdout.write('\n📦 Installing skills...\n\n');
-        installSkills(moduleTemplateInfo.config.skills, skillsCwd);
+        installSkills(moduleTemplateInfo.config.skills, skillsCwd, Boolean(ctx.useNpxSkills));
     }
     const relPath = path.relative(process.cwd(), modulePath);
     process.stdout.write(`\n✨ Enjoy!\n\ncd ./${relPath}\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "4.27.0",
+  "version": "4.28.1",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL Package Manager - Database migration and package management CLI",
   "main": "index.js",
@@ -46,15 +46,15 @@
   },
   "dependencies": {
     "@inquirerer/utils": "^3.3.7",
-    "@pgpmjs/core": "^6.23.0",
+    "@pgpmjs/core": "^6.24.0",
     "@pgpmjs/env": "^2.25.0",
-    "@pgpmjs/export": "^0.21.2",
+    "@pgpmjs/export": "^0.21.4",
     "@pgpmjs/logger": "^2.12.0",
     "@pgpmjs/types": "^2.29.0",
     "@pgsql/quotes": "^17.1.0",
     "appstash": "^0.7.0",
     "find-and-require-package-json": "^0.9.1",
-    "genomic": "^5.5.0",
+    "genomic": "^5.6.0",
     "inquirerer": "^4.8.1",
     "js-yaml": "^4.1.0",
     "pg-cache": "^3.12.0",
@@ -76,5 +76,5 @@
     "pg",
     "pgsql"
   ],
-  "gitHead": "30fdaaacfc61f86b3e466f0c4c3768550fd77a55"
+  "gitHead": "6d810d1b800a6e70ef25749415b69de17b066e50"
 }