@domainlang/language 0.1.20 → 0.1.82

package/out/services/import-resolver.js

@@ -1,224 +1,16 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { URI } from 'langium';
 /**
- * ImportResolver resolves import statements using manifest-centric rules (PRS-010).
- *
- * Import Types (PRS-010):
- * - Local relative: ./path, ../path → Directory-first resolution
- * - Path aliases: @/path, @alias/path → Configurable in model.yaml paths section
- * - External: owner/package → Manifest dependencies
- *
- * Directory-First Resolution:
- * - ./types → ./types/index.dlang → ./types.dlang
- * - Module entry defaults to index.dlang (no model.yaml required)
+ * ImportResolver resolves import statements using WorkspaceManager and GitUrlResolver.
  */
 export class ImportResolver {
     constructor(services) {
         this.workspaceManager = services.imports.WorkspaceManager;
     }
     /**
-     * Resolve an import specifier relative to a Langium document.
+     * Resolve an import URL to a file URI using the workspace's GitUrlResolver.
      */
-    async resolveForDocument(document, specifier) {
-        const baseDir = path.dirname(document.uri.fsPath);
-        return this.resolveFrom(baseDir, specifier);
-    }
-    /**
-     * Resolve an import specifier from a base directory (non-LSP contexts).
-     */
-    async resolveFrom(baseDir, specifier) {
-        await this.workspaceManager.initialize(baseDir);
-        // Local relative paths (./path or ../path) - directory-first resolution
-        if (specifier.startsWith('./') || specifier.startsWith('../')) {
-            const resolved = path.resolve(baseDir, specifier);
-            return this.resolveLocalPath(resolved, specifier);
-        }
-        // Path aliases (@/path or @alias/path)
-        if (specifier.startsWith('@')) {
-            return this.resolvePathAlias(specifier);
-        }
-        // External dependency via manifest (owner/package format)
-        return this.resolveExternalDependency(specifier);
-    }
-    /**
-     * Resolves a path alias import.
-     *
-     * @param specifier - Import specifier starting with @ (e.g., "@/lib", "@shared/types")
-     */
-    async resolvePathAlias(specifier) {
-        const aliases = await this.workspaceManager.getPathAliases();
-        const root = this.workspaceManager.getWorkspaceRoot();
-        // Find matching alias
-        const aliasMatch = this.findMatchingAlias(specifier, aliases);
-        if (aliasMatch) {
-            const { alias: _alias, targetPath, remainder } = aliasMatch;
-            const manifestPath = await this.workspaceManager.getManifestPath();
-            const manifestDir = manifestPath ? path.dirname(manifestPath) : root;
-            const resolvedBase = path.resolve(manifestDir, targetPath);
-            const resolved = remainder ? path.join(resolvedBase, remainder) : resolvedBase;
-            return this.resolveLocalPath(resolved, specifier);
-        }
-        // Default: @/ maps to workspace root (implicit)
-        if (specifier.startsWith('@/')) {
-            const relativePath = specifier.slice(2);
-            const resolved = path.join(root, relativePath);
-            return this.resolveLocalPath(resolved, specifier);
-        }
-        throw new Error(`Unknown path alias '${specifier.split('/')[0]}' in import '${specifier}'.\n` +
-            `Hint: Define it in model.yaml paths section:\n` +
-            `  paths:\n` +
-            `    "${specifier.split('/')[0]}": "./some/path"`);
-    }
-    /**
-     * Finds the longest matching alias for a specifier.
-     */
-    findMatchingAlias(specifier, aliases) {
-        if (!aliases) {
-            return undefined;
-        }
-        // Sort by length descending to match most specific alias first
-        const sortedAliases = Object.entries(aliases)
-            .sort(([a], [b]) => b.length - a.length);
-        for (const [alias, targetPath] of sortedAliases) {
-            // Exact match
-            if (specifier === alias) {
-                return { alias, targetPath, remainder: '' };
-            }
-            // Prefix match (alias + /)
-            if (specifier.startsWith(`${alias}/`)) {
-                return { alias, targetPath, remainder: specifier.slice(alias.length + 1) };
-            }
-        }
-        return undefined;
-    }
-    /**
-     * Resolves an external dependency via manifest.
-     *
-     * NEW FORMAT (PRS-010): Import specifier is owner/package format.
-     */
-    async resolveExternalDependency(specifier) {
-        const manifest = await this.workspaceManager.getManifest();
-        if (!manifest) {
-            throw new Error(`External dependency '${specifier}' requires model.yaml.\n` +
-                `Hint: Create model.yaml and add the dependency:\n` +
-                `  dependencies:\n` +
-                `    ${specifier}:\n` +
-                `      ref: v1.0.0`);
-        }
-        const lock = await this.workspaceManager.getLockFile();
-        if (!lock) {
-            throw new Error(`Dependency '${specifier}' not installed.\n` +
-                `Hint: Run 'dlang install' to fetch dependencies and generate model.lock.`);
-        }
-        const mapped = await this.workspaceManager.resolveDependencyImport(specifier);
-        if (!mapped) {
-            throw new Error(`Dependency '${specifier}' not found in model.yaml.\n` +
-                `Hint: Add it to your dependencies:\n` +
-                `  dependencies:\n` +
-                `    ${specifier}:\n` +
-                `      ref: v1.0.0`);
-        }
-        const git = await this.workspaceManager.getGitResolver();
-        return git.resolve(mapped, { allowNetwork: false });
-    }
-    /**
-     * Resolves a local path using directory-first resolution.
-     *
-     * Per PRS-010 (updated design):
-     * - If path ends with .dlang → direct file import
-     * - If no extension → directory-first:
-     *   1. Try ./path/index.dlang (module default, no model.yaml required)
-     *   2. Try ./path.dlang (file fallback)
-     */
-    async resolveLocalPath(resolved, original) {
-        const ext = path.extname(resolved);
-        if (ext === '.dlang') {
-            // Direct file import
-            await assertFileExists(resolved, original);
-            return URI.file(resolved);
-        }
-        if (ext && ext !== '.dlang') {
-            throw new Error(`Invalid file extension '${ext}' in import '${original}'.\n` +
-                `Hint: DomainLang files must use the .dlang extension.`);
-        }
-        // No extension → directory-first resolution
-        return this.resolveDirectoryFirst(resolved, original);
-    }
-    /**
-     * Directory-first resolution: ./types → ./types/index.dlang → ./types.dlang
-     *
-     * Module entry defaults to index.dlang without requiring model.yaml.
-     * If the directory has model.yaml with custom entry, use that.
-     */
-    async resolveDirectoryFirst(resolved, original) {
-        // Step 1: Check if directory exists with index.dlang (or custom entry)
-        const isDirectory = await this.isDirectory(resolved);
-        if (isDirectory) {
-            // Check for model.yaml to get custom entry point
-            const moduleManifestPath = path.join(resolved, 'model.yaml');
-            const entryPoint = await this.readModuleEntry(moduleManifestPath);
-            const entryFile = path.join(resolved, entryPoint);
-            if (await this.fileExists(entryFile)) {
-                return URI.file(entryFile);
-            }
-            // Directory exists but no entry file
-            throw new Error(`Module '${original}' is missing its entry file.\n` +
-                `Expected: ${resolved}/${entryPoint}\n` +
-                `Hint: Create '${entryPoint}' in the module directory, or specify a custom entry in model.yaml:\n` +
-                `  model:\n` +
-                `    entry: main.dlang`);
-        }
-        // Step 2: Try .dlang file fallback
-        const fileWithExt = `${resolved}.dlang`;
-        if (await this.fileExists(fileWithExt)) {
-            return URI.file(fileWithExt);
-        }
-        // Neither directory nor file found
-        throw new Error(`Cannot resolve import '${original}'.\n` +
-            `Tried:\n` +
-            `  • ${resolved}/index.dlang (directory module)\n` +
-            `  • ${resolved}.dlang (file)\n` +
-            `Hint: Check that the path is correct and the file exists.`);
-    }
-    /**
-     * Reads the entry point from a module's model.yaml.
-     * Defaults to index.dlang if no manifest or no entry specified.
-     */
-    async readModuleEntry(manifestPath) {
-        try {
-            const content = await fs.readFile(manifestPath, 'utf-8');
-            const YAML = await import('yaml');
-            const manifest = YAML.parse(content);
-            return manifest?.model?.entry ?? 'index.dlang';
-        }
-        catch {
-            return 'index.dlang';
-        }
-    }
-    /**
-     * Checks if a path is a directory.
-     */
-    async isDirectory(targetPath) {
-        try {
-            const stat = await fs.stat(targetPath);
-            return stat.isDirectory();
-        }
-        catch {
-            return false;
-        }
-    }
-    /**
-     * Checks if a file exists.
-     */
-    async fileExists(filePath) {
-        try {
-            await fs.access(filePath);
-            return true;
-        }
-        catch {
-            return false;
-        }
+    async resolveImport(importUrl) {
+        const gitResolver = await this.workspaceManager.getGitResolver();
+        return gitResolver.resolve(importUrl);
     }
     /**
      * Get the current lock file (if loaded).
@@ -227,14 +19,4 @@ export class ImportResolver {
         return this.workspaceManager.getLockFile();
     }
 }
-async function assertFileExists(filePath, original) {
-    try {
-        await fs.access(filePath);
-    }
-    catch {
-        throw new Error(`Import file not found: '${original}'.\\n` +
-            `Resolved path: ${filePath}\\n` +
-            `Hint: Check that the file exists and the path is correct.`);
-    }
-}
 //# sourceMappingURL=import-resolver.js.map

package/out/services/import-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-resolver.js","sourceRoot":"","sources":["../../src/services/import-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"import-resolver.js","sourceRoot":"","sources":["../../src/services/import-resolver.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,OAAO,cAAc;IAGvB,YAAY,QAA4B;QACpC,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC;IAC9D,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CAAC,SAAiB;QACjC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC;QACjE,OAAO,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW;QACb,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;IAC/C,CAAC;CACJ"}

package/out/services/performance-optimizer.d.ts

@@ -7,7 +7,7 @@
  * - Cache warming strategies
  * - Stale cache detection
  */
-import type { LockFile } from './types.js';
+import type { LockFile } from './git-url-resolver.js';
 /**
  * Performance optimizer with in-memory caching.
  */

package/out/services/workspace-manager.d.ts

@@ -1,5 +1,10 @@
 import { GitUrlResolver } from './git-url-resolver.js';
-import type { LockFile, ModelManifest, PathAliases, WorkspaceManagerOptions } from './types.js';
+import type { LockFile } from './git-url-resolver.js';
+export interface WorkspaceManagerOptions {
+    readonly autoResolve?: boolean;
+    readonly manifestFiles?: readonly string[];
+    readonly lockFiles?: readonly string[];
+}
 /**
  * Coordinates workspace discovery, lock file lifecycle management, and git resolver configuration.
  */
@@ -28,11 +33,6 @@ export declare class WorkspaceManager {
      * Resolves the manifest file path within the workspace, if present.
      */
     getManifestPath(): Promise<string | undefined>;
-    /**
-     * Returns the parsed manifest when present, otherwise undefined.
-     * Uses cached contents when unchanged on disk.
-     */
-    getManifest(): Promise<ModelManifest | undefined>;
     /**
      * Returns the cached lock file or triggers resolution when missing.
      */
@@ -45,24 +45,6 @@ export declare class WorkspaceManager {
      * Reloads the lock file from disk, updating the git resolver.
      */
     refreshLockFile(): Promise<LockFile | undefined>;
-    /**
-     * Invalidates all cached data (manifest and lock file).
-     * Call this when config files change externally (e.g., from CLI commands).
-     *
-     * After invalidation, the next call to getManifest() or getLockFile()
-     * will re-read from disk.
-     */
-    invalidateCache(): void;
-    /**
-     * Invalidates only the manifest cache.
-     * Call this when model.yaml changes.
-     */
-    invalidateManifestCache(): void;
-    /**
-     * Invalidates only the lock file cache.
-     * Call this when model.lock changes.
-     */
-    invalidateLockCache(): void;
     /**
      * Provides the shared git URL resolver configured with the current lock file.
      */
@@ -72,25 +54,12 @@ export declare class WorkspaceManager {
      */
     regenerateLockFile(): Promise<LockFile>;
     /**
-     * Returns the path aliases from the manifest, if present.
-     */
-    getPathAliases(): Promise<PathAliases | undefined>;
-    /**
-     * Normalizes a dependency entry to its extended form.
-     * Handles both short form (string version) and extended form (object).
-     *
-     * In the new format, the key IS the owner/package, so source is derived from key
-     * ONLY for git dependencies (not for path-based local dependencies).
-     */
-    private normalizeDependency;
-    /**
-     * Resolves a manifest dependency to its git import string.
+     * Resolves a manifest dependency alias to its git import string.
      *
-     * NEW FORMAT (PRS-010): Dependencies are keyed by owner/package directly
-     * @param specifier - Import specifier (owner/package format, may include subpaths)
-     * @returns Resolved git import string or undefined when not found
+     * @param aliasPath - Alias from import statement (may include subpaths)
+     * @returns Resolved git import string or undefined when alias is unknown
      */
-    resolveDependencyImport(specifier: string): Promise<string | undefined>;
+    resolveDependencyImport(aliasPath: string): Promise<string | undefined>;
     private performInitialization;
     private ensureInitialized;
     private applyLockFile;
@@ -100,22 +69,6 @@ export declare class WorkspaceManager {
     private loadLockFileFromDisk;
     private tryReadLockFile;
     private loadManifest;
-    /**
-     * Validates manifest structure and dependency configurations.
-     * Throws detailed errors for invalid manifests.
-     *
-     * Supports both new format (owner/package: version) and extended format.
-     */
-    private validateManifest;
-    /**
-     * Validates path aliases for security and correctness.
-     */
-    private validatePathAliases;
-    /**
-     * Validates local path dependencies for security.
-     * Ensures paths don't escape workspace boundary.
-     */
-    private validateLocalPath;
     private parseJsonLockFile;
     private findWorkspaceRoot;
     private containsManifest;

package/out/services/workspace-manager.js

@@ -57,14 +57,6 @@ export class WorkspaceManager {
         }
         return undefined;
     }
-    /**
-     * Returns the parsed manifest when present, otherwise undefined.
-     * Uses cached contents when unchanged on disk.
-     */
-    async getManifest() {
-        await this.ensureInitialized();
-        return this.loadManifest();
-    }
     /**
      * Returns the cached lock file or triggers resolution when missing.
      */
@@ -78,16 +70,11 @@ export class WorkspaceManager {
                 this.lockFile = cached;
             }
             else {
-                if (this.options.allowNetwork === false) {
-                    throw new Error('Lock file (model.lock) not found and network access is disabled.\n' +
-                        'Hint: Run \'dlang install\' to generate the lock file.');
-                }
                 await this.generateLockFile();
             }
         }
         if (!this.lockFile) {
-            throw new Error('Unable to resolve workspace lock file.\n' +
-                'Hint: Ensure model.yaml exists and run \'dlang install\' to generate model.lock.');
+            throw new Error('Unable to resolve workspace lock file.');
         }
         return this.lockFile;
     }
@@ -107,38 +94,6 @@ export class WorkspaceManager {
         this.applyLockFile(loaded);
         return this.lockFile;
     }
-    /**
-     * Invalidates all cached data (manifest and lock file).
-     * Call this when config files change externally (e.g., from CLI commands).
-     *
-     * After invalidation, the next call to getManifest() or getLockFile()
-     * will re-read from disk.
-     */
-    invalidateCache() {
-        this.manifestCache = undefined;
-        this.lockFile = undefined;
-        // Re-apply undefined to git resolver to clear its lock file
-        if (this.gitResolver) {
-            this.gitResolver.setLockFile(undefined);
-        }
-    }
-    /**
-     * Invalidates only the manifest cache.
-     * Call this when model.yaml changes.
-     */
-    invalidateManifestCache() {
-        this.manifestCache = undefined;
-    }
-    /**
-     * Invalidates only the lock file cache.
-     * Call this when model.lock changes.
-     */
-    invalidateLockCache() {
-        this.lockFile = undefined;
-        if (this.gitResolver) {
-            this.gitResolver.setLockFile(undefined);
-        }
-    }
     /**
      * Provides the shared git URL resolver configured with the current lock file.
      */
@@ -161,79 +116,42 @@ export class WorkspaceManager {
         return this.lockFile;
     }
     /**
-     * Returns the path aliases from the manifest, if present.
-     */
-    async getPathAliases() {
-        const manifest = await this.getManifest();
-        return manifest?.paths;
-    }
-    /**
-     * Normalizes a dependency entry to its extended form.
-     * Handles both short form (string version) and extended form (object).
+     * Resolves a manifest dependency alias to its git import string.
      *
-     * In the new format, the key IS the owner/package, so source is derived from key
-     * ONLY for git dependencies (not for path-based local dependencies).
+     * @param aliasPath - Alias from import statement (may include subpaths)
+     * @returns Resolved git import string or undefined when alias is unknown
      */
-    normalizeDependency(key, dep) {
-        if (typeof dep === 'string') {
-            // Short form: "owner/package": "v1.0.0" or "main"
-            // Key is the source (owner/package format)
-            return { source: key, ref: dep };
-        }
-        // Extended form:
-        // - If has source: use as-is
-        // - If has path: it's a local dep, don't set source
-        // - If neither: derive source from key (owner/package becomes source)
-        if (dep.source || dep.path) {
-            return dep;
-        }
-        return { ...dep, source: key };
-    }
-    /**
-     * Resolves a manifest dependency to its git import string.
-     *
-     * NEW FORMAT (PRS-010): Dependencies are keyed by owner/package directly
-     * @param specifier - Import specifier (owner/package format, may include subpaths)
-     * @returns Resolved git import string or undefined when not found
-     */
-    async resolveDependencyImport(specifier) {
+    async resolveDependencyImport(aliasPath) {
         await this.ensureInitialized();
         const manifest = await this.loadManifest();
         const dependencies = manifest?.dependencies;
         if (!dependencies) {
             return undefined;
         }
-        // NEW: Dependencies are keyed by owner/package (e.g., "domainlang/core")
-        // Import specifier is also owner/package, potentially with subpath
-        for (const [key, dep] of Object.entries(dependencies)) {
-            const normalized = this.normalizeDependency(key, dep);
-            // Skip path-based dependencies (handled by path aliases)
-            if (normalized.path) {
-                continue;
-            }
-            if (!normalized.source) {
+        for (const [alias, dep] of Object.entries(dependencies)) {
+            if (!dep?.source) {
                 continue;
             }
-            // Match if specifier equals key or starts with key/
-            if (specifier === key || specifier.startsWith(`${key}/`)) {
-                const suffix = specifier.slice(key.length);
-                const ref = normalized.ref ?? '';
-                const refSegment = ref
-                    ? (ref.startsWith('@') ? ref : `@${ref}`)
+            if (aliasPath === alias || aliasPath.startsWith(`${alias}/`)) {
+                const suffix = aliasPath.slice(alias.length);
+                const version = dep.version ?? '';
+                const versionSegment = version
+                    ? (version.startsWith('@') ? version : `@${version}`)
                     : '';
-                return `${normalized.source}${refSegment}${suffix}`;
+                return `${dep.source}${versionSegment}${suffix}`;
             }
         }
         return undefined;
     }
     async performInitialization(startPath) {
-        this.workspaceRoot = await this.findWorkspaceRoot(startPath) ?? path.resolve(startPath);
-        // Per PRS-010: Project-local cache at .dlang/packages/ (like node_modules)
-        const cacheDir = path.join(this.workspaceRoot, '.dlang', 'packages');
-        this.gitResolver = new GitUrlResolver(cacheDir);
+        this.workspaceRoot = await this.findWorkspaceRoot(startPath);
+        if (!this.workspaceRoot) {
+            throw new Error('Workspace root (directory with model.yaml) not found.');
+        }
+        this.gitResolver = new GitUrlResolver();
         const loaded = await this.loadLockFileFromDisk();
         this.applyLockFile(loaded);
-        if (!this.lockFile && this.options.autoResolve !== false && this.options.allowNetwork !== false) {
+        if (!this.lockFile && this.options.autoResolve !== false) {
             await this.generateLockFile();
         }
     }
@@ -332,8 +250,6 @@ export class WorkspaceManager {
             }
             const content = await fs.readFile(manifestPath, 'utf-8');
             const manifest = (YAML.parse(content) ?? {});
-            // Validate manifest structure
-            this.validateManifest(manifest, manifestPath);
             this.manifestCache = {
                 manifest,
                 path: manifestPath,
@@ -349,98 +265,16 @@ export class WorkspaceManager {
             throw error;
         }
     }
-    /**
-     * Validates manifest structure and dependency configurations.
-     * Throws detailed errors for invalid manifests.
-     *
-     * Supports both new format (owner/package: version) and extended format.
-     */
-    validateManifest(manifest, manifestPath) {
-        // Validate path aliases
-        if (manifest.paths) {
-            this.validatePathAliases(manifest.paths, manifestPath);
-        }
-        if (!manifest.dependencies) {
-            return; // No dependencies to validate
-        }
-        for (const [key, dep] of Object.entries(manifest.dependencies)) {
-            const normalized = this.normalizeDependency(key, dep);
-            // Validate mutually exclusive source and path
-            if (normalized.source && normalized.path) {
-                throw new Error(`Invalid dependency '${key}' in ${manifestPath}:\n` +
-                    `Cannot specify both 'source' and 'path'.\n` +
-                    `Hint: Use 'source' for git dependencies or 'path' for local workspace dependencies.`);
-            }
-            // For string format, source is always derived from key (valid)
-            // For extended format without source or path, error
-            if (typeof dep !== 'string' && !normalized.source && !normalized.path) {
-                throw new Error(`Invalid dependency '${key}' in ${manifestPath}:\n` +
-                    `Must specify either 'source' or 'path'.\n` +
-                    `Hint: Add 'source: owner/repo' for git dependencies, or 'path: ./local/path' for local packages.`);
-            }
-            // Validate path is relative and within workspace
-            if (normalized.path) {
-                this.validateLocalPath(normalized.path, key, manifestPath);
-            }
-            // Validate source has ref when specified
-            if (normalized.source && !normalized.ref) {
-                throw new Error(`Invalid dependency '${key}' in ${manifestPath}:\n` +
-                    `Git dependencies must specify a 'ref' (git reference).\n` +
-                    `Hint: Add 'ref: v1.0.0' (tag), 'ref: main' (branch), or a commit SHA.`);
-            }
-        }
-    }
-    /**
-     * Validates path aliases for security and correctness.
-     */
-    validatePathAliases(paths, manifestPath) {
-        for (const [alias, targetPath] of Object.entries(paths)) {
-            // Validate alias starts with @
-            if (!alias.startsWith('@')) {
-                throw new Error(`Invalid path alias '${alias}' in ${manifestPath}:\n` +
-                    `Path aliases must start with '@'.\n` +
-                    `Hint: Rename to '@${alias}' in your model.yaml paths section.`);
-            }
-            // Validate target path doesn't escape workspace
-            this.validateLocalPath(targetPath, alias, manifestPath);
-        }
-    }
-    /**
-     * Validates local path dependencies for security.
-     * Ensures paths don't escape workspace boundary.
-     */
-    validateLocalPath(localPath, alias, manifestPath) {
-        // Reject absolute paths
-        if (path.isAbsolute(localPath)) {
-            throw new Error(`Invalid local path '${alias}' in ${manifestPath}:\n` +
-                `Cannot use absolute path '${localPath}'.\n` +
-                `Hint: Use relative paths (e.g., './lib', '../shared') for local dependencies.`);
-        }
-        // Resolve path relative to manifest directory
-        const manifestDir = path.dirname(manifestPath);
-        const resolvedPath = path.resolve(manifestDir, localPath);
-        const workspaceRoot = this.workspaceRoot || manifestDir;
-        // Check if resolved path is within workspace
-        const relativePath = path.relative(workspaceRoot, resolvedPath);
-        if (relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
-            throw new Error(`Invalid local path '${alias}' in ${manifestPath}:\n` +
-                `Path '${localPath}' resolves outside workspace boundary.\n` +
-                `Resolved: ${resolvedPath}\n` +
-                `Workspace: ${workspaceRoot}\n` +
-                `Hint: Local dependencies must be within the workspace. Consider moving the dependency or using a git-based source.`);
-        }
-    }
     parseJsonLockFile(content) {
         const parsed = JSON.parse(content);
         const version = typeof parsed.version === 'string' ? parsed.version : '1';
         const dependencies = {};
         for (const [key, value] of Object.entries(parsed.dependencies ?? {})) {
-            if (!value || typeof value.ref !== 'string' || typeof value.resolved !== 'string' || typeof value.commit !== 'string') {
+            if (!value || typeof value.version !== 'string' || typeof value.resolved !== 'string' || typeof value.commit !== 'string') {
                 continue;
             }
             dependencies[key] = {
-                ref: value.ref,
-                refType: value.refType ?? 'commit', // Default to commit for backwards compatibility
+                version: value.version,
                 resolved: value.resolved,
                 commit: value.commit,
                 integrity: value.integrity,