@skaile/workspaces 0.45.0 → 0.46.0

package/dist/{chunk-COSTF7QW.js → chunk-WTFJFW7F.js}

@@ -1,7 +1,7 @@
 import { decodeSkaileManifest, SKAILE_MANIFEST_FILENAME } from './chunk-DZCK7GRW.js';
 import { scanDirectory, parseFrontmatter, bundleDepRefs, fromMcpServerMdContent } from './chunk-6IDBWPK2.js';
 import { isValidAssetName, slugifyAssetName, parseAssetRef, assetRefToStr } from './chunk-GEEW6SY2.js';
-import { existsSync, mkdirSync, renameSync, readdirSync, rmdirSync, readFileSync, writeFileSync, lstatSync, symlinkSync, rmSync, cpSync } from 'fs';
+import { existsSync, mkdirSync, renameSync, readdirSync, rmdirSync, readFileSync, writeFileSync, rmSync, lstatSync, symlinkSync, cpSync } from 'fs';
 import { homedir } from 'os';
 import { join, dirname, resolve, relative, parse as parse$1, basename } from 'path';
 import { parse, stringify } from 'yaml';
@@ -66,6 +66,22 @@ function getGlobalCacheDir() {
   mergeLegacyEntriesInto(dir, join(home, "sources"), hasOwnGit);
   return dir;
 }
+function sourceCacheKey(url) {
+  const trimmed = url.trim();
+  const normalized = trimmed.replace(/^git@([^:]+):/, "$1/").replace(/^[a-z][a-z0-9+.-]*:\/\//i, "").replace(/\.git$/i, "").replace(/\/+$/, "");
+  const m = /^([^/]+)\/([^/]+)\/([^/]+)$/.exec(normalized);
+  if (m) {
+    const [, host, owner, repo] = m;
+    return `${host.toLowerCase()}/${owner}/${repo}`;
+  }
+  return lastSegment(trimmed);
+}
+function lastSegment(url) {
+  return url.replace(/\.git$/i, "").replace(/\/+$/, "").split(/[/:]/).pop() || "source";
+}
+function sourceShortName(cacheKeyOrUrl) {
+  return sourceCacheKey(cacheKeyOrUrl).replace(/\/+$/, "").split("/").pop() || "source";
+}
 var GIT_ENV = { ...process.env, GIT_TERMINAL_PROMPT: "0" };
 function cloneRepo(url, branch, dest) {
   mkdirSync(dest, { recursive: true });
@@ -125,6 +141,20 @@ function checkoutPin(repoDir, pin) {
   const r2 = spawnSync("git", ["-C", repoDir, "checkout", pin], { stdio: "pipe", env: GIT_ENV });
   return r2.status === 0;
 }
+function getRepoRemoteUrl(repoDir) {
+  const r = spawnSync("git", ["-C", repoDir, "remote", "get-url", "origin"], {
+    encoding: "utf8",
+    stdio: "pipe",
+    env: GIT_ENV
+  });
+  return r.status === 0 ? r.stdout.trim() : null;
+}
+function remoteUrlMatches(repoDir, expectedUrl) {
+  if (!hasOwnGit(repoDir)) return true;
+  const actual = getRepoRemoteUrl(repoDir);
+  if (!actual) return true;
+  return sourceCacheKey(actual) === sourceCacheKey(expectedUrl);
+}
 function linksFile(projectDir) {
   return join(projectDir, ".skaile", "links.yaml");
 }
@@ -184,10 +214,14 @@ function resolveLinkedOverride(name, projectDir) {
 function ensureLocalPathRepo(decl, reposDir, opts) {
   const projectDir = opts?.projectDir ?? resolve(reposDir, "..");
   const resolved = resolve(projectDir, decl.path);
-  if (existsSync(resolved)) return resolved;
+  if (existsSync(resolved)) {
+    if (!decl.url || remoteUrlMatches(resolved, decl.url)) return resolved;
+    rmSync(resolved, { recursive: true, force: true });
+  }
   if (!decl.url) {
     throw new Error(`Local repository path not found: ${decl.path} (resolved: ${resolved})`);
   }
+  mkdirSync(dirname(resolved), { recursive: true });
   if (!cloneRepo(decl.url, decl.branch ?? "main", resolved)) {
     throw new Error(`Failed to clone ${decl.url} into ${resolved}`);
   }
@@ -198,9 +232,12 @@ function ensureRemoteRepo(decl, name, reposDir, opts) {
   const branch = decl.branch ?? "main";
   const globalCache = getGlobalCacheDir();
   const cacheDest = join(globalCache, name);
-  if (existsSync(join(cacheDest, ".git"))) {
+  const cached = existsSync(join(cacheDest, ".git"));
+  if (cached && remoteUrlMatches(cacheDest, decl.url)) {
     if (!opts?.pin) pullRepo(cacheDest, branch);
   } else {
+    if (cached) rmSync(cacheDest, { recursive: true, force: true });
+    mkdirSync(dirname(cacheDest), { recursive: true });
     if (!cloneRepo(decl.url, branch, cacheDest)) {
       throw new Error(`Failed to clone ${decl.url} (branch: ${branch})`);
     }
@@ -296,7 +333,10 @@ function resolveRepoDir(decl, name, reposDir, projectDir) {
   const projectDest = join(reposDir, name);
   if (existsSync(projectDest)) return projectDest;
   const globalDest = join(getGlobalCacheDir(), name);
-  if (existsSync(join(globalDest, ".git"))) return globalDest;
+  if (existsSync(join(globalDest, ".git"))) {
+    if (decl.url && !remoteUrlMatches(globalDest, decl.url)) return null;
+    return globalDest;
+  }
   return null;
 }
 var CanonicalRefConflictError = class extends Error {
@@ -512,7 +552,8 @@ function checkRepoStatus(decl, name, reposDir, projectDir) {
   };
   if (decl.path) return base;
   let dest = join(getGlobalCacheDir(), name);
-  if (!existsSync(join(dest, ".git"))) {
+  const globalOk = existsSync(join(dest, ".git")) && (!decl.url || remoteUrlMatches(dest, decl.url));
+  if (!globalOk) {
     dest = join(reposDir, name);
   }
   if (!existsSync(join(dest, ".git"))) {
@@ -1564,14 +1605,11 @@ function stageMaterializedSkills(projectDir, skillsDir, opts) {
   }
   return staged;
 }
-function sourceSlug(url) {
-  return url.replace(/\.git$/, "").split(/[/:]/).pop() ?? "source";
-}
 function buildSourceClones(sources) {
   const sourcesDir = getGlobalCacheDir();
   const clones = [];
   for (const s of sources) {
-    const localPath = join(sourcesDir, sourceSlug(s.url));
+    const localPath = join(sourcesDir, sourceCacheKey(s.url));
     if (!existsSync(localPath)) continue;
     const commit = getRepoCommit(localPath) ?? "0".repeat(40);
     clones.push({ localPath, sourceUrl: s.url, commit, tag: s.pin });
@@ -1714,6 +1752,6 @@ function resolveAgentDir(projectDir) {
   return resolve(projectDir, definition);
 }
 
-export { COMPACTION_DEFAULTS, CanonicalRefConflictError, DEFAULT_RECIPE_ATTR, SKAILE_YAML_DEFAULT, SKAILE_YAML_SUFFIX, SK_WORKSPACE_DEFAULT_NAME, SK_WORKSPACE_SUFFIX, __resetCacheMigrationMemo, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneRepo, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, globalCacheRoot, isWorkspaceConfigFilename, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, mergeLegacyEntriesInto, mergeSkWorkspaceConfigs, migrateLegacyDir, normalizeConfig, pullRepo, readLinks, resolveAgentDir, resolveAll, resolveAsset, resolveSkWorkspaceConfig, saveSkWorkspaceConfig, scanRepo, stageMaterializedSkills, unlinkRepo, validateAssetRecipeAttr, validateAssetRecipeFlake, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
-//# sourceMappingURL=chunk-COSTF7QW.js.map
-//# sourceMappingURL=chunk-COSTF7QW.js.map
+export { COMPACTION_DEFAULTS, CanonicalRefConflictError, DEFAULT_RECIPE_ATTR, SKAILE_YAML_DEFAULT, SKAILE_YAML_SUFFIX, SK_WORKSPACE_DEFAULT_NAME, SK_WORKSPACE_SUFFIX, __resetCacheMigrationMemo, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneRepo, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, globalCacheRoot, isWorkspaceConfigFilename, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, mergeLegacyEntriesInto, mergeSkWorkspaceConfigs, migrateLegacyDir, normalizeConfig, pullRepo, readLinks, resolveAgentDir, resolveAll, resolveAsset, resolveSkWorkspaceConfig, saveSkWorkspaceConfig, scanRepo, sourceCacheKey, sourceShortName, stageMaterializedSkills, unlinkRepo, validateAssetRecipeAttr, validateAssetRecipeFlake, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
+//# sourceMappingURL=chunk-WTFJFW7F.js.map
+//# sourceMappingURL=chunk-WTFJFW7F.js.map