@mearl/setup 3.0.0-beta.1 → 3.0.0-beta.10

package/dist/skills.js

@@ -4,11 +4,11 @@ import { homedir } from 'node:os';
 import { NodeCapabilityRegistry } from '@mearl/daemon-core/capabilities';
 import { inspectGlobalSkill, readTrackedSkillSources } from './skillSources.js';
 import { PresetInstallationStore } from './presetStore.js';
-import { findExecutable, isExecutable, prependCommandPath, prependNodePath, runCommand, } from '@mearl/daemon-core';
+import { findExecutable, isExecutable, npmExecEnvironment, prependCommandPath, prependNodePath, runCommand, } from '@mearl/daemon-core';
 export const SKILLS_CLI_PACKAGE = 'skills@1.5.0';
 export const MEARL_SKILL_SOURCE = SETUP_VERSION.includes('-beta.')
-    ? `https://github.com/F-loat/mearl/tree/v${SETUP_VERSION}`
-    : 'https://github.com/F-loat/mearl';
+    ? `https://github.com/mearlhq/mearl/tree/v${SETUP_VERSION}`
+    : 'https://github.com/mearlhq/mearl';
 const COMMAND_TIMEOUT_MS = 120_000;
 const ANSI_ESCAPE_PATTERN = new RegExp(String.raw `\u001B\[[0-?]*[ -/]*[@-~]`, 'g');
 export function stripAnsi(value) {
@@ -41,7 +41,7 @@ export function resolveSkillsInvocation(options = {}) {
     return {
         command: npx,
         argsPrefix: ['-y', SKILLS_CLI_PACKAGE],
-        env: prependNodePath(prependCommandPath(npx, env), processExecPath),
+        env: npmExecEnvironment(prependNodePath(prependCommandPath(npx, env), processExecPath)),
     };
 }
 /** Only the selected manager module is needed; browser and Provider factories stay in their hosts. */
@@ -59,9 +59,11 @@ export async function captureSkillsCli(options = {}) {
     const managedSkills = Object.fromEntries(Object.entries(current.preset?.skills ?? {}).filter(([, entry]) => entry.enabled !== false));
     const backend = registry.get('skills.manager')?.();
     if (backend !== undefined) {
+        if (backend?.readSources !== undefined && typeof backend.readSources !== 'function')
+            throw new Error('Invalid Skill source reader');
         if (!backend || typeof backend.id !== 'string' || !/^[a-z][a-z0-9-]{0,63}$/.test(backend.id) || typeof backend.cli !== 'function')
             throw new Error('The selected Skill manager requires a preset update for CLI operations');
-        return { id: backend.id, managedSkills, selection, inspectGlobal: (source, name, version) => inspectGlobalSkill(source, name, version, { externalManager: true, normalizeSource: backend.normalizeSource, readSources }), run: async (args, settings) => {
+        return { id: backend.id, managedSkills, selection, inspectGlobal: (source, name, version, inspection) => inspectGlobalSkill(source, name, version, { migrateFrom: inspection?.migrateFrom, externalManager: true, normalizeSource: backend.normalizeSource, readSources: backend.readSources ?? readSources }), run: async (args, settings) => {
                 const result = await backend.cli([...args], settings);
                 if (!result || !Number.isInteger(result.code) || typeof result.stdout !== 'string' || typeof result.stderr !== 'string')
                     throw new Error('Invalid Skill manager CLI result');
@@ -71,7 +73,7 @@ export async function captureSkillsCli(options = {}) {
     const invocation = resolveSkillsInvocation(options);
     if (!invocation)
         return undefined;
-    return { id: 'skills', managedSkills, selection, inspectGlobal: (source, name, version) => inspectGlobalSkill(source, name, version, { readSources }), run: (args, settings) => runner(invocation.command, [...invocation.argsPrefix, ...args], { ...settings, env: invocation.env }) };
+    return { id: 'skills', managedSkills, selection, inspectGlobal: (source, name, version, inspection) => inspectGlobalSkill(source, name, version, { migrateFrom: inspection?.migrateFrom, readSources }), run: (args, settings) => runner(invocation.command, [...invocation.argsPrefix, ...args], { ...settings, env: invocation.env }) };
 }
 export function parseInstalledSkills(output) {
     const value = JSON.parse(stripAnsi(output).trim());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearl/setup",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.10",
   "description": "One-shot environment setup and configuration for Mearl",
   "type": "module",
   "main": "dist/index.js",
@@ -45,6 +45,10 @@
     "./preset": {
       "types": "./dist/preset.d.ts",
       "import": "./dist/preset.js"
+    },
+    "./skill-source-receipts": {
+      "types": "./dist/skillSourceReceipts.d.ts",
+      "import": "./dist/skillSourceReceipts.js"
     }
   },
   "bin": {
@@ -64,31 +68,32 @@
   ],
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=20.18.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "commander": "^15.0.0",
-    "extract-zip": "^2.0.1",
+    "commander": "^14.0.3",
     "ws": "^8.18.3",
     "semver": "^7.8.5",
-    "@mearl/preset": "3.0.0-beta.1",
-    "@mearl/daemon-core": "3.0.0-beta.1",
-    "@mearl/client": "3.0.0-beta.1",
-    "@mearl/provider": "3.0.0-beta.1",
-    "@mearl/browser-core": "3.0.0-beta.1"
+    "adm-zip": "^0.6.1",
+    "@mearl/provider": "3.0.0-beta.10",
+    "@mearl/daemon-core": "3.0.0-beta.10",
+    "@mearl/client": "3.0.0-beta.10",
+    "@mearl/preset": "3.0.0-beta.10",
+    "@mearl/browser-core": "3.0.0-beta.10"
   },
   "devDependencies": {
     "@types/node": "^24.9.1",
     "@types/ws": "^8.18.1",
     "typescript": "^5.8.3",
-    "@types/semver": "^7.7.1"
+    "@types/semver": "^7.7.1",
+    "@types/adm-zip": "^0.5.7"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/F-loat/mearl.git",
+    "url": "git+https://github.com/mearlhq/mearl.git",
     "directory": "packages/setup"
   },
   "scripts": {

package/dist/presetUpgrade.d.ts

@@ -1,13 +0,0 @@
-import { type InstallationConfig } from '@mearl/preset/installation';
-import { PresetInstaller, type StagedPresetInstallation } from './preset.js';
-import { type DetectedGlobalPackage } from './packageManager.js';
-export declare const MEARL_INSTALLATION_CONFIG_URL = "https://f-loat.github.io/mearl/installation.json";
-/** Reuse the installation receipt as the retry marker; organization defaults come from deployment data. */
-export declare function prepareSetupPreset(options: {
-    source?: string;
-    installed?: Array<Pick<DetectedGlobalPackage, 'packageName' | 'packageRoot'>>;
-    env?: NodeJS.ProcessEnv;
-}, dependencies?: {
-    installer?: PresetInstaller;
-    configuration?: () => Promise<InstallationConfig>;
-}): Promise<StagedPresetInstallation | undefined>;

package/dist/presetUpgrade.js

@@ -1,42 +0,0 @@
-import { readFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { loadInstallationConfig } from '@mearl/preset/installation';
-import { PresetInstaller } from './preset.js';
-import { detectGlobalPackage } from './packageManager.js';
-import { detectMearlProfiles } from './profiles.js';
-export const MEARL_INSTALLATION_CONFIG_URL = 'https://f-loat.github.io/mearl/installation.json';
-function isLegacyPackage(installation) {
-    try {
-        const manifest = JSON.parse(readFileSync(join(installation.packageRoot, 'package.json'), 'utf8'));
-        return manifest.name === installation.packageName && typeof manifest.version === 'string' && /^[0-2]\.\d+\.\d+(?:[-+][\w.-]+)?$/.test(manifest.version);
-    }
-    catch {
-        return false;
-    }
-}
-/** Reuse the installation receipt as the retry marker; organization defaults come from deployment data. */
-export async function prepareSetupPreset(options, dependencies = {}) {
-    const env = options.env ?? process.env;
-    const installer = dependencies.installer ?? new PresetInstaller({ directory: env.MEARL_CAPABILITY_DIR });
-    if (options.source)
-        return installer.stage(options.source);
-    const current = await installer.store.current();
-    if (current.receipt)
-        return { revision: current.receipt.revision, activate: () => installer.resume(current.receipt.revision) };
-    if (current.activation)
-        return;
-    const client = options.installed === undefined ? detectGlobalPackage('@mearl/client', ['mearl'], { env }) : null;
-    const installed = options.installed ?? [...detectMearlProfiles({ env }).values(), ...(client ? [client] : [])];
-    if (!installed.some(isLegacyPackage))
-        return;
-    const configuration = dependencies.configuration ?? (() => {
-        const url = new URL(env.MEARL_INSTALLATION_CONFIG_URL || MEARL_INSTALLATION_CONFIG_URL);
-        if (url.protocol !== 'https:' && !(url.protocol === 'http:' && ['127.0.0.1', 'localhost', '[::1]'].includes(url.hostname)))
-            throw new Error('Installation configuration requires HTTPS or loopback HTTP');
-        return loadInstallationConfig(url, url.origin, AbortSignal.timeout(5_000));
-    });
-    const config = await configuration();
-    if (!config.legacyPreset)
-        throw new Error('Legacy upgrade preset is unavailable. Retry when the installation catalog is available, or select a preset with --preset.');
-    return installer.stage(config.presets[config.legacyPreset].source, { expectedRevision: null, expectedId: config.legacyPreset });
-}