@skaile/workspaces 5.6.1 → 5.8.0

package/dist/{chunk-2W4LBLIN.js → chunk-JAKOMFC6.js}

@@ -1,15 +1,16 @@
-import { globalCacheRoot, globalSkaileDir, mergeLegacyEntriesInto, mergeLegacyEntriesKeyed } from './chunk-MFHKHXDE.js';
+import { globalCacheRoot, globalSkaileDir, mergeLegacyEntriesInto, mergeLegacyEntriesKeyed } from './chunk-L5VSIPQD.js';
 import { SUPPORTED_DRIVER_TARGETS, globalHarnessRoot } from './chunk-CPSIPIX7.js';
-import { decodeSkaileManifest, compositeSha256, listAssetFiles, SKAILE_MANIFEST_FILENAME, sha256Hex } from './chunk-7ZHLYXTI.js';
+import { decodeSkaileManifest, compositeSha256, listAssetFiles, SKAILE_MANIFEST_FILENAME, sha256Hex } from './chunk-BTE2V4IW.js';
 import { readPluginGroupings } from './chunk-RVRB27AN.js';
-import { scanDirectory, parseFrontmatter, assetDepRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs } from './chunk-PA7WLID3.js';
-import { isValidAssetName, slugifyAssetName, parseAssetRef, assetRefToStr } from './chunk-AO7VJ6G6.js';
+import { scanDirectory, parseFrontmatter, assetDepRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs } from './chunk-GTILM2CI.js';
+import { isValidAssetName, slugifyAssetName, parseAssetRef, assetRefToStr } from './chunk-QVNRCDTV.js';
 import { isRetentionValue } from './chunk-C3CAXQMA.js';
 import { existsSync, readFileSync, mkdirSync, writeFileSync, lstatSync, symlinkSync, rmSync, readdirSync, constants, statSync } from 'fs';
 import { readdir, stat, cp, rm, open, readFile } from 'fs/promises';
 import { join, posix, relative, resolve, dirname, sep, parse as parse$1, basename } from 'path';
 import { parse, stringify } from 'yaml';
 import { spawnSync } from 'child_process';
+import { createHash } from 'crypto';
 import semver from 'semver';
 import fg from 'fast-glob';
 
@@ -517,20 +518,27 @@ function getGlobalCacheDir() {
   return dir;
 }
 function sourceCacheKey(url) {
-  const trimmed = url.trim();
-  const normalized = trimmed.replace(/^git@([^:]+):/, "$1/").replace(/^[a-z][a-z0-9+.-]*:\/\//i, "").replace(/^[^/]*@/, "").replace(/\.git$/i, "").replace(/\/+$/, "");
+  const normalized = normalizeSourceKeyUrl(url);
   const m = /^([^/]+)\/([^/]+)\/([^/]+)$/.exec(normalized);
   if (m) {
     const [, host, owner, repo] = m;
     return `${host.toLowerCase()}/${owner}/${repo}`;
   }
-  return lastSegment(normalized);
+  const hash = createHash("sha256").update(normalized).digest("hex").slice(0, 8);
+  return `${lastSegment(normalized)}-${hash}`;
+}
+function legacySourceCacheKey(url) {
+  const legacy = lastSegment(normalizeSourceKeyUrl(url));
+  return legacy === sourceCacheKey(url) ? void 0 : legacy;
+}
+function normalizeSourceKeyUrl(url) {
+  return url.trim().replace(/^git@([^:]+):/, "$1/").replace(/^[a-z][a-z0-9+.-]*:\/\//i, "").replace(/^[^/]*@/, "").replace(/\.git$/i, "").replace(/\/+$/, "");
 }
 function lastSegment(url) {
   return url.replace(/\.git$/i, "").replace(/\/+$/, "").split(/[/:]/).pop() || "source";
 }
-function sourceShortName(cacheKeyOrUrl) {
-  return sourceCacheKey(cacheKeyOrUrl).replace(/\/+$/, "").split("/").pop() || "source";
+function sourceShortName(urlOrCacheKey) {
+  return lastSegment(normalizeSourceKeyUrl(urlOrCacheKey));
 }
 function storeManifestSlug(url) {
   return sourceCacheKey(url).replace(/[/\\:]+/g, "__");
@@ -567,6 +575,7 @@ function gitFailure(r) {
   return `git exited with status ${r.status}`;
 }
 function pullRepoResult(dest, branch) {
+  attachToBranch(dest, branch);
   const pull = spawnSync("git", ["-C", dest, "pull", "--depth=1", "--ff-only"], {
     stdio: "pipe",
     env: GIT_ENV
@@ -606,8 +615,37 @@ function checkoutPin(repoDir, pin) {
   const r2 = spawnSync("git", ["-C", repoDir, "checkout", pin], { stdio: "pipe", env: GIT_ENV });
   return r2.status === 0;
 }
+function currentBranch(repoDir) {
+  const r = spawnSync("git", ["-C", repoDir, "symbolic-ref", "--short", "-q", "HEAD"], {
+    encoding: "utf8",
+    stdio: "pipe"
+  });
+  return r.status === 0 ? r.stdout.trim() || null : null;
+}
+function attachToBranch(repoDir, preferred) {
+  if (currentBranch(repoDir)) return true;
+  let candidates = [preferred];
+  if (!preferred) {
+    const originHead = spawnSync(
+      "git",
+      ["-C", repoDir, "symbolic-ref", "--short", "-q", "refs/remotes/origin/HEAD"],
+      { encoding: "utf8", stdio: "pipe" }
+    );
+    const tracked = originHead.status === 0 ? originHead.stdout.trim().replace(/^origin\//, "") : "";
+    candidates = [tracked, "main", "master"];
+  }
+  for (const candidate of candidates) {
+    if (!candidate) continue;
+    spawnSync("git", ["-C", repoDir, "checkout", "-q", candidate], {
+      stdio: "pipe",
+      env: GIT_ENV
+    });
+    if (currentBranch(repoDir)) return true;
+  }
+  return false;
+}
 function getRepoRemoteUrl(repoDir) {
-  const r = spawnSync("git", ["-C", repoDir, "remote", "get-url", "origin"], {
+  const r = spawnSync("git", ["-C", repoDir, "config", "--get", "remote.origin.url"], {
     encoding: "utf8",
     stdio: "pipe",
     env: GIT_ENV
@@ -919,6 +957,14 @@ async function resolveAll(deps, opts) {
   const overridesApplied = /* @__PURE__ */ new Set();
   const overridesByRef = new Map(opts.overrides.map((o) => [o.ref, o]));
   const presets = [];
+  const declaredByKey = /* @__PURE__ */ new Map();
+  for (const declared of opts.declaredRefs ?? []) {
+    try {
+      const p = parseAssetRef(declared);
+      if (p.publisher) declaredByKey.set(`${p.publisher}/${p.kind}:${p.name}`, declared);
+    } catch {
+    }
+  }
   async function visit(refStr, parent, depChain, presetChain) {
     const ref = parseAssetRef(refStr);
     if (!ref.publisher) throw new Error(`dep "${refStr}" missing publisher`);
@@ -980,12 +1026,10 @@ async function resolveAll(deps, opts) {
     resolvedBy.set(key, parent);
     const childPresets = isPreset ? [...presetChain, key] : presetChain;
     for (const depRef of chosen.deps ?? []) {
-      await visit(
-        qualifyPublisher(depRef, chosen.publisher),
-        key,
-        [...depChain, refStr],
-        childPresets
-      );
+      const qualified = qualifyPublisher(depRef, chosen.publisher);
+      const dep = parseAssetRef(qualified);
+      const declared = declaredByKey.get(`${dep.publisher}/${dep.kind}:${dep.name}`);
+      await visit(declared ?? qualified, key, [...depChain, refStr], childPresets);
     }
   }
   for (const dep of deps) {
@@ -2495,11 +2539,15 @@ function findAgentDirsByName(root, name, depth) {
   visit(root, depth);
   return matches;
 }
+function agentSourceCacheDir(projectDir) {
+  return join(projectDir, ".skaile", "cache", "agents");
+}
 function resolveAgentRef(projectDir, definition) {
   const name = agentRefName(definition);
   const trees = [
     { root: join(projectDir, ".skaile", "assets", "agent"), depth: 1 },
-    { root: join(projectDir, "agents"), depth: 1 }
+    { root: join(projectDir, "agents"), depth: 1 },
+    { root: agentSourceCacheDir(projectDir), depth: 1 }
   ];
   const aiAssetsDir = findAiAssetsDir(projectDir);
   if (aiAssetsDir) trees.push({ root: aiAssetsDir, depth: AI_ASSETS_AGENT_WALK_DEPTH });
@@ -2543,6 +2591,6 @@ function resolveAgentDefinitionDir(projectDir, definition) {
   return resolve(projectDir, definition);
 }
 
-export { AGENT_INSTANCE_ID_PATTERN, AGENT_INSTANCE_LIFECYCLES, AGENT_INSTANCE_MEMORY_SCOPES, AGENT_INSTANCE_TRIGGER_KINDS, AgentRefResolutionError, COMPACTION_DEFAULTS, CanonicalRefConflictError, DEFAULT_AGENT_INSTANCE_ID, DEFAULT_RECIPE_ATTR, PresetDepthError, SKAILE_YAML_DEFAULT, SKAILE_YAML_SUFFIX, SKILL_ALLOWLIST_FILE, SKILL_ALLOWLIST_VERSION, SK_WORKSPACE_DEFAULT_NAME, SK_WORKSPACE_SUFFIX, STAGED_SKILL_MARKER, UnknownAssetKindError, agentInstanceDiagnostics, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneRepo, coerceVersion, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, effectiveAgentInstances, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isStagedSkillMarkerFor, isWorkspaceConfigFilename, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, matchPin, mergeAgentInstances, mergeAgentPermissions, mergeSkWorkspaceConfigs, normalizeAgentInstances, normalizeConfig, pullRepo, pullRepoResult, readLinks, readSkillAllowList, resolveAgentDefinitionDir, resolveAgentDir, resolveAll, resolveAsset, resolveCompactionThresholdPercent, resolveGlobalHarnesses, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, resolveSourcePublisher, saveSkWorkspaceConfig, scanRepo, sourceCacheKey, sourceShortName, stageMaterializedSkills, stagedSkillMarkerState, storeManifestSlug, unlinkRepo, unstageSkill, validateAssetRecipeAttr, validateAssetRecipeFlake, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
-//# sourceMappingURL=chunk-2W4LBLIN.js.map
-//# sourceMappingURL=chunk-2W4LBLIN.js.map
+export { AGENT_INSTANCE_ID_PATTERN, AGENT_INSTANCE_LIFECYCLES, AGENT_INSTANCE_MEMORY_SCOPES, AGENT_INSTANCE_TRIGGER_KINDS, AgentRefResolutionError, COMPACTION_DEFAULTS, CanonicalRefConflictError, DEFAULT_AGENT_INSTANCE_ID, DEFAULT_RECIPE_ATTR, MAX_PRESET_DEPTH, PresetDepthError, SKAILE_YAML_DEFAULT, SKAILE_YAML_SUFFIX, SKILL_ALLOWLIST_FILE, SKILL_ALLOWLIST_VERSION, SK_WORKSPACE_DEFAULT_NAME, SK_WORKSPACE_SUFFIX, STAGED_SKILL_MARKER, UnknownAssetKindError, agentInstanceDiagnostics, agentSourceCacheDir, attachToBranch, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneRepo, coerceVersion, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, effectiveAgentInstances, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isStagedSkillMarkerFor, isWorkspaceConfigFilename, legacySourceCacheKey, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, matchPin, mergeAgentInstances, mergeAgentPermissions, mergeSkWorkspaceConfigs, normalizeAgentInstances, normalizeConfig, pullRepo, pullRepoResult, readLinks, readSkillAllowList, resolveAgentDefinitionDir, resolveAgentDir, resolveAll, resolveAsset, resolveCompactionThresholdPercent, resolveGlobalHarnesses, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, resolveSourcePublisher, saveSkWorkspaceConfig, scanRepo, sourceCacheKey, sourceShortName, stageMaterializedSkills, stagedSkillMarkerState, storeManifestSlug, unlinkRepo, unstageSkill, validateAssetRecipeAttr, validateAssetRecipeFlake, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
+//# sourceMappingURL=chunk-JAKOMFC6.js.map
+//# sourceMappingURL=chunk-JAKOMFC6.js.map