@skaile/workspaces 3.19.0 → 3.20.1

package/dist/{chunk-RPVTPVGX.js → chunk-MBARHWMZ.js}

@@ -2,10 +2,10 @@ import { SUPPORTED_DRIVER_TARGETS, globalBackendRoot } from './chunk-MENCWIHW.js
 import { decodeSkaileManifest, SKAILE_MANIFEST_FILENAME } from './chunk-P4VHQA4N.js';
 import { scanDirectory, parseFrontmatter, bundleDepRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs } from './chunk-MKZOK4JU.js';
 import { isValidAssetName, slugifyAssetName, parseAssetRef, assetRefToStr } from './chunk-GEEW6SY2.js';
-import { existsSync, mkdirSync, renameSync, readdirSync, rmdirSync, readFileSync, writeFileSync, rmSync, lstatSync, symlinkSync } from 'fs';
+import { existsSync, mkdirSync, renameSync, readdirSync, rmdirSync, readFileSync, writeFileSync, lstatSync, symlinkSync, rmSync } from 'fs';
 import { readdir, stat, cp } from 'fs/promises';
 import { homedir } from 'os';
-import { join, dirname, relative, resolve, parse as parse$1, basename } from 'path';
+import { join, dirname, relative, resolve, parse as parse$1, basename, sep } from 'path';
 import { parse, stringify } from 'yaml';
 import { spawnSync } from 'child_process';
 import semver from 'semver';
@@ -358,13 +358,13 @@ function getGlobalCacheDir() {
 }
 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 normalized = trimmed.replace(/^git@([^:]+):/, "$1/").replace(/^[a-z][a-z0-9+.-]*:\/\//i, "").replace(/^[^/]*@/, "").replace(/\.git$/i, "").replace(/\/+$/, "");
   const m = /^([^/]+)\/([^/]+)\/([^/]+)$/.exec(normalized);
   if (m) {
     const [, host, owner, repo] = m;
     return `${host.toLowerCase()}/${owner}/${repo}`;
   }
-  return lastSegment(trimmed);
+  return lastSegment(normalized);
 }
 function lastSegment(url) {
   return url.replace(/\.git$/i, "").replace(/\/+$/, "").split(/[/:]/).pop() || "source";
@@ -397,22 +397,34 @@ function cloneRepo(url, branch, dest) {
   });
   return fallback.status === 0;
 }
-function pullRepo(dest, branch) {
-  const r = spawnSync("git", ["-C", dest, "pull", "--depth=1", "--ff-only"], {
+function redactCredentials(text) {
+  return text.replace(/[^/\s@]+@/g, "***@");
+}
+function gitFailure(r) {
+  const stderr = r.stderr ? String(r.stderr).trim() : "";
+  if (stderr) return redactCredentials(stderr.split("\n").slice(-2).join(" ").trim());
+  if (r.error) return redactCredentials(r.error.message);
+  return `git exited with status ${r.status}`;
+}
+function pullRepoResult(dest, branch) {
+  const pull = spawnSync("git", ["-C", dest, "pull", "--depth=1", "--ff-only"], {
     stdio: "pipe",
     env: GIT_ENV
   });
-  if (r.status === 0) return true;
+  if (pull.status === 0) return { ok: true };
   const fetch = spawnSync("git", ["-C", dest, "fetch", "--depth=1", "origin", branch], {
     stdio: "pipe",
     env: GIT_ENV
   });
-  if (fetch.status !== 0) return false;
+  if (fetch.status !== 0) return { ok: false, error: gitFailure(fetch) };
   const reset = spawnSync("git", ["-C", dest, "reset", "--hard", `origin/${branch}`], {
     stdio: "pipe",
     env: GIT_ENV
   });
-  return reset.status === 0;
+  return reset.status === 0 ? { ok: true } : { ok: false, error: gitFailure(reset) };
+}
+function pullRepo(dest, branch) {
+  return pullRepoResult(dest, branch).ok;
 }
 function getRepoCommit(repoDir) {
   const r = spawnSync("git", ["-C", repoDir, "rev-parse", "HEAD"], {
@@ -504,40 +516,63 @@ function resolveLinkedOverride(name, projectDir) {
   }
   return linked;
 }
+function isManagedCacheDir(dir) {
+  const root = resolve(getGlobalCacheDir());
+  const target = resolve(dir);
+  return target === root || target.startsWith(root + sep);
+}
+function syncManagedClone(dest, url, branch, pin) {
+  const cached = existsSync(join(dest, ".git"));
+  if (cached && remoteUrlMatches(dest, url)) {
+    spawnSync("git", ["-C", dest, "remote", "set-url", "origin", url], {
+      stdio: "pipe",
+      env: GIT_ENV
+    });
+    if (!pin) {
+      const { ok, error } = pullRepoResult(dest, branch);
+      if (!ok) {
+        console.warn(
+          redactCredentials(
+            `[repo-manager] could not refresh source clone ${dest} (branch: ${branch}): ${error}. Using the cached commit.`
+          )
+        );
+      }
+    }
+  } else {
+    if (cached) rmSync(dest, { recursive: true, force: true });
+    mkdirSync(dirname(dest), { recursive: true });
+    if (!cloneRepo(url, branch, dest)) {
+      throw new Error(redactCredentials(`Failed to clone ${url} (branch: ${branch}) into ${dest}`));
+    }
+  }
+  if (pin && getRepoCommit(dest) === pin) return;
+  if (pin && !checkoutPin(dest, pin)) {
+    console.warn(
+      redactCredentials(
+        `[repo-manager] could not check out pin ${pin} in source clone ${dest}. Using the cached commit.`
+      )
+    );
+  }
+}
 function ensureLocalPathRepo(decl, reposDir, opts) {
   const projectDir = opts?.projectDir ?? resolve(reposDir, "..");
   const resolved = resolve(projectDir, decl.path);
-  if (existsSync(resolved)) {
-    if (!decl.url || remoteUrlMatches(resolved, decl.url)) return resolved;
-    rmSync(resolved, { recursive: true, force: true });
+  const exists = existsSync(resolved);
+  if (exists && (!decl.url || remoteUrlMatches(resolved, decl.url))) {
+    if (decl.url && !decl.factory && hasOwnGit(resolved) && isManagedCacheDir(resolved)) {
+      syncManagedClone(resolved, decl.url, decl.branch ?? "main", opts?.pin);
+    }
+    return resolved;
   }
   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}`);
-  }
-  if (opts?.pin) checkoutPin(resolved, opts.pin);
+  syncManagedClone(resolved, decl.url, decl.branch ?? "main", opts?.pin);
   return resolved;
 }
 function ensureRemoteRepo(decl, name, reposDir, opts) {
-  const branch = decl.branch ?? "main";
-  const globalCache = getGlobalCacheDir();
-  const cacheDest = join(globalCache, name);
-  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})`);
-    }
-  }
-  if (opts?.pin) {
-    checkoutPin(cacheDest, opts.pin);
-  }
+  const cacheDest = join(getGlobalCacheDir(), name);
+  syncManagedClone(cacheDest, decl.url, decl.branch ?? "main", opts?.pin);
   linkCacheIntoProject(cacheDest, reposDir, name);
   return cacheDest;
 }
@@ -1892,6 +1927,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, cloudConfigFromProfile, coerceVersion, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, globalCacheRoot, globalSkaileDir, isWorkspaceConfigFilename, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, matchPin, mergeLegacyEntriesInto, mergeLegacyEntriesKeyed, mergeSkWorkspaceConfigs, migrateLegacyDir, normalizeConfig, pullRepo, readLinks, resolveAgentDir, resolveAll, resolveAsset, resolveGlobalBackends, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, resolveSourcePublisher, saveSkWorkspaceConfig, scanRepo, sourceCacheKey, sourceShortName, stageMaterializedSkills, storeManifestSlug, unlinkRepo, validateAssetRecipeAttr, validateAssetRecipeFlake, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
-//# sourceMappingURL=chunk-RPVTPVGX.js.map
-//# sourceMappingURL=chunk-RPVTPVGX.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, cloudConfigFromProfile, coerceVersion, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, globalCacheRoot, globalSkaileDir, isWorkspaceConfigFilename, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, matchPin, mergeLegacyEntriesInto, mergeLegacyEntriesKeyed, mergeSkWorkspaceConfigs, migrateLegacyDir, normalizeConfig, pullRepo, pullRepoResult, readLinks, resolveAgentDir, resolveAll, resolveAsset, resolveGlobalBackends, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, resolveSourcePublisher, saveSkWorkspaceConfig, scanRepo, sourceCacheKey, sourceShortName, stageMaterializedSkills, storeManifestSlug, unlinkRepo, validateAssetRecipeAttr, validateAssetRecipeFlake, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
+//# sourceMappingURL=chunk-MBARHWMZ.js.map
+//# sourceMappingURL=chunk-MBARHWMZ.js.map