@skaile/workspaces 6.14.0 → 6.16.0

package/dist/{chunk-BNLXZXZN.js → chunk-BRAOB37W.js}

@@ -1,17 +1,18 @@
 import { globalCacheRoot, globalSkaileDir, mergeLegacyEntriesInto, mergeLegacyEntriesKeyed } from './chunk-L5VSIPQD.js';
 import { SUPPORTED_HARNESSES, globalHarnessRoot } from './chunk-VTETQCR6.js';
-import { decodeSkaileManifest, compositeSha256, listAssetFiles, SKAILE_MANIFEST_FILENAME, sha256Hex } from './chunk-MS2IXLTC.js';
-import { scanDirectory, parseFrontmatter, parseRequires, dedupeRequirementRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs, assetDepRefs, agentYamlRequires, yamlQuotingHint } from './chunk-VS6XC5JE.js';
+import { decodeSkaileManifest, manifestTextPublisherProblems, SKAILE_MANIFEST_FILENAME, compositeSha256, listAssetFiles, sha256Hex } from './chunk-PMXTBWFD.js';
+import { scanDirectory, parseFrontmatter, parseRequires, dedupeRequirementRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs, assetDepRefs, agentYamlRequires, yamlQuotingHint } from './chunk-2MTRRK37.js';
 import { readPluginGroupings } from './chunk-RVRB27AN.js';
-import { isValidAssetName, slugifyAssetName, depToStr, parseAssetRef, isValidPublisher, PUBLISHER_HINT, assetRefToStr } from './chunk-7HRZACI4.js';
+import { isValidAssetName, slugifyAssetName, depToStr, parseAssetRef, parsePublisher, assetRefToStr } from './chunk-HW4BDJPC.js';
 import { isRetentionValue } from './chunk-C3CAXQMA.js';
 import { existsSync, readFileSync, mkdirSync, readdirSync, rmdirSync, rmSync, writeFileSync, lstatSync, symlinkSync, realpathSync, constants, statSync } from 'fs';
 import { readdir, stat, cp, rm, open, readFile } from 'fs/promises';
-import { join, posix, relative, resolve, sep, dirname, parse as parse$1, isAbsolute, basename } from 'path';
+import { resolve, join, posix, relative, sep, dirname, parse as parse$1, isAbsolute, basename } from 'path';
 import { parse, stringify } from 'yaml';
 import { spawnSync } from 'child_process';
 import { createHash } from 'crypto';
 import semver2 from 'semver';
+import { homedir } from 'os';
 import fg from 'fast-glob';
 
 // core/src/type-guards.ts
@@ -478,6 +479,71 @@ function unknownConfigKeyDiagnostics(raw) {
   }
   return out;
 }
+var DEFAULT_PORTS = {
+  http: "80",
+  https: "443",
+  ssh: "22",
+  git: "9418"
+};
+function stripRepoSuffix(p) {
+  return p.replace(/\/+$/, "").replace(/\.git$/i, "").replace(/\/+$/, "");
+}
+function localPath(p) {
+  const folded = posix.normalize(p);
+  const stripped = stripRepoSuffix(folded);
+  for (const candidate of [folded.replace(/\/+$/, ""), stripped]) {
+    if (candidate !== "" && existsSync(candidate)) {
+      try {
+        return stripRepoSuffix(realpathSync(candidate));
+      } catch {
+      }
+    }
+  }
+  return stripped === "" ? "/" : stripped;
+}
+function unescapeUrlPath(p) {
+  try {
+    return decodeURIComponent(p);
+  } catch {
+    return p;
+  }
+}
+function remoteIdentity(rawHost, rawPath, scheme) {
+  let host = rawHost.toLowerCase();
+  const port = /:(\d+)$/.exec(host);
+  if (port) {
+    if (DEFAULT_PORTS[scheme] === port[1]) host = host.slice(0, port.index);
+  }
+  let path = stripRepoSuffix(posix.normalize(`/${rawPath}`)).replace(/^\/+/, "");
+  if (host === "github.com") path = path.toLowerCase();
+  return { host, path, key: `${host}/${path}` };
+}
+function repoIdentity(url) {
+  const s = url.trim();
+  const scheme = /^([a-z][a-z0-9+.-]*):\/\/([^/]*)(\/.*)?$/i.exec(s);
+  if (scheme) {
+    const name = (scheme[1] ?? "").toLowerCase();
+    const authority = scheme[2] ?? "";
+    const rest = scheme[3] ?? "";
+    const host = authority.slice(authority.lastIndexOf("@") + 1);
+    if (name === "file" && (host === "" || host.toLowerCase() === "localhost")) {
+      const path = localPath(unescapeUrlPath(rest));
+      return { host: "", path: path.replace(/^\/+/, ""), key: path };
+    }
+    return remoteIdentity(host, rest, name);
+  }
+  if (/^(?:\/|\.{1,2}(?:\/|$)|~\/)/.test(s)) {
+    const abs = s.startsWith("~/") ? resolve(homedir(), s.slice(2)) : resolve(s);
+    const path = localPath(abs);
+    return { host: "", path: path.replace(/^\/+/, ""), key: path };
+  }
+  const scp = /^[^@/\s:]+@([^:/\s]+):(.*)$/.exec(s);
+  if (scp) return remoteIdentity(scp[1] ?? "", scp[2] ?? "", "ssh");
+  return { host: "", path: s, key: s };
+}
+function sameRepo(a, b) {
+  return repoIdentity(a).key === repoIdentity(b).key;
+}
 function fileSha256(p) {
   return sha256Hex(readFileSync(p));
 }
@@ -526,6 +592,7 @@ async function walkOne(clone, index, knownKinds) {
   }
   const manifestPaths = findManifestFiles(clone.localPath);
   const repoLevel = repoLevelManifest(
+    clone,
     [clone.overlayManifestPath, ...manifestPaths].filter((p) => !!p)
   );
   if (manifestPaths.length === 0) {
@@ -538,10 +605,12 @@ async function walkOne(clone, index, knownKinds) {
   }
   if (!produced) await walkFilenameConvention(clone, index, knownKinds, repoLevel);
 }
-function repoLevelManifest(paths) {
+function repoLevelManifest(clone, paths) {
   for (const p of paths) {
     if (!existsSync(p)) continue;
-    const { manifest } = decodeSkaileManifest(readFileSync(p, "utf8"));
+    const text = readFileSync(p, "utf8");
+    assertValidManifestPublishers(clone, text);
+    const { manifest } = decodeSkaileManifest(text);
     if (manifest.publisher) {
       return {
         publisher: manifest.publisher.replace(/^@/, ""),
@@ -565,17 +634,17 @@ function findManifestFiles(root) {
   walk(root);
   return found;
 }
-function assertValidManifestPublisher(clone, publisher) {
-  if (publisher === void 0 || isValidPublisher(publisher)) return;
+function assertValidManifestPublishers(clone, manifestText) {
+  const [first] = manifestTextPublisherProblems(manifestText);
+  if (first === void 0) return;
   throw new Error(
-    `${clone.sourceUrl}: skaile.manifest.yaml publisher "${publisher}" is invalid: ${PUBLISHER_HINT}`
+    `${clone.sourceUrl}: ${SKAILE_MANIFEST_FILENAME} ${first.where} \u2014 ${first.message}`
   );
 }
 async function walkWithManifest(clone, manifestPath, index) {
-  const { manifest } = decodeSkaileManifest(readFileSync(manifestPath, "utf8"));
-  for (const declared of [manifest.publisher, ...(manifest.assets ?? []).map((a) => a.publisher)]) {
-    assertValidManifestPublisher(clone, declared);
-  }
+  const manifestText = readFileSync(manifestPath, "utf8");
+  const { manifest } = decodeSkaileManifest(manifestText);
+  assertValidManifestPublishers(clone, manifestText);
   const repoRoot = clone.localPath;
   const manifestPublisher = manifest.publisher ?? clone.publisher ?? publisherFromGithubUrl(clone.sourceUrl);
   const manifestVersion = manifest.version ?? (clone.tag ? clone.tag.replace(/^v/, "") : void 0) ?? syntheticVersion(clone.commit);
@@ -702,7 +771,6 @@ var DIR_SCOPED_KINDS = /* @__PURE__ */ new Set([
   "knowledge"
 ]);
 async function walkFilenameConvention(clone, index, knownKinds, repoLevel = {}) {
-  assertValidManifestPublisher(clone, repoLevel.publisher);
   const publisher = repoLevel.publisher ?? clone.publisher ?? publisherFromGithubUrl(clone.sourceUrl);
   if (!publisher) {
     throw new Error(
@@ -825,12 +893,6 @@ function getGlobalCacheDir() {
 function sourceCacheKey(url) {
   return keyOfNormalizedUrl(normalizeSourceKeyUrl(url));
 }
-function isSameRemote(a, b) {
-  const ka = sourceCacheKey(a);
-  const kb = sourceCacheKey(b);
-  if (ka === kb) return true;
-  return ka.startsWith("github.com/") && ka.toLowerCase() === kb.toLowerCase();
-}
 function keyOfNormalizedUrl(normalized) {
   const m = /^([^/]+)\/([^/]+)\/([^/]+)$/.exec(normalized);
   if (m) {
@@ -1055,15 +1117,12 @@ function remoteUrlMatches(repoDir, expectedUrl) {
   if (!hasOwnGit(repoDir)) return true;
   const actual = getRepoRemoteUrl(repoDir);
   if (!actual) return true;
-  return sourceCacheKey(actual) === sourceCacheKey(expectedUrl);
+  return sameRepo(actual, expectedUrl);
 }
 function cloneOriginMismatch(repoDir, declaredUrl) {
   if (!hasOwnGit(repoDir) || remoteUrlMatches(repoDir, declaredUrl)) return void 0;
   const actual = getRepoRemoteUrl(repoDir);
   if (!actual) return void 0;
-  if (sourceCacheKey(actual.toLowerCase()) === sourceCacheKey(declaredUrl.toLowerCase())) {
-    return void 0;
-  }
   return redactCredentials(actual);
 }
 var PIN_LIST_LIMIT = 10;
@@ -1125,10 +1184,10 @@ function writeLinks(projectDir, links) {
   mkdirSync(dir, { recursive: true });
   writeFileSync(linksFile(projectDir), stringify(links));
 }
-function linkRepo(projectDir, repoName, localPath) {
-  const resolved = resolve(projectDir, localPath);
+function linkRepo(projectDir, repoName, localPath2) {
+  const resolved = resolve(projectDir, localPath2);
   if (!existsSync(resolved)) {
-    throw new Error(`Path not found: ${localPath} (resolved: ${resolved})`);
+    throw new Error(`Path not found: ${localPath2} (resolved: ${resolved})`);
   }
   const links = readLinks(projectDir);
   links[repoName] = resolved;
@@ -1761,19 +1820,10 @@ function parseSourceEntries(raw) {
     const pin = s.pin;
     if (typeof pin === "string" && pin.length > 0) entry.pin = pin;
     const publisher = s.publisher;
-    if (publisher !== void 0 && publisher !== null && typeof publisher !== "string") {
-      throw new SourceEntryError(
-        `sources[${i}] publisher must be a string: ${JSON.stringify(publisher)} (write it as "publisher: <name>")`
-      );
-    }
-    if (typeof publisher === "string" && publisher.length > 0) {
-      const bare = publisher.replace(/^@/, "");
-      if (!isValidPublisher(bare)) {
-        throw new SourceEntryError(
-          `sources[${i}] publisher "${publisher}" is invalid: ${PUBLISHER_HINT}`
-        );
-      }
-      entry.publisher = bare;
+    if (publisher !== void 0 && publisher !== null) {
+      const parsed = parsePublisher(publisher);
+      if (!parsed.ok) throw new SourceEntryError(`sources[${i}]: ${parsed.message}`);
+      entry.publisher = parsed.publisher;
     }
     if ("branch" in s) {
       throw new SourceEntryError(`sources[${i}] branch is not supported - use pin: <branch>`);
@@ -3152,11 +3202,11 @@ function buildSourceClones(sources) {
   const sourcesDir = getGlobalCacheDir();
   const clones = [];
   for (const s of sources) {
-    const localPath = join(sourcesDir, sourceCacheKey(s.url));
-    if (!existsSync(localPath)) continue;
-    const commit = getRepoCommit(localPath) ?? "0".repeat(40);
+    const localPath2 = join(sourcesDir, sourceCacheKey(s.url));
+    if (!existsSync(localPath2)) continue;
+    const commit = getRepoCommit(localPath2) ?? "0".repeat(40);
     clones.push({
-      localPath,
+      localPath: localPath2,
       sourceUrl: s.url,
       commit,
       tag: s.pin,
@@ -3433,6 +3483,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, AGENT_PROFILE_FIELDS, AgentRefResolutionError, COMPACTION_DEFAULTS, CanonicalRefConflictError, ConfigParseError, DEFAULT_AGENT_INSTANCE_ID, DEFAULT_RECIPE_ATTR, LegacyKeyError, 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, SourceEntryError, UnknownAssetKindError, agentBlockKeyDiagnostics, agentInstanceDiagnostics, agentSourceCacheDir, attachToBranch, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneIsOnPin, cloneOriginMismatch, cloneRepo, coerceVersion, configParseErrorOf, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, discardUnclonedSourceDir, effectiveAgentInstances, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, instanceChoiceText, isCommitOnRemote, isInsideProject, isSameRemote, isSourceCloned, isStagedSkillMarkerFor, isWorkspaceConfigFilename, legacySourceCacheKey, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, localConnectorMountDir, matchPin, mcpDeclarationFromMdContent, mergeAgentInstances, mergeAgentPermissions, mergeSkWorkspaceConfigs, missingPinMessage, normalizeAgentInstances, normalizeConfig, parseSourceEntries, primaryAgentRef, priorSourceCacheKeys, priorStoreManifestSlugs, pullRepo, pullRepoResult, readLinks, readSkillAllowList, resolveAgentDefinitionDir, resolveAgentDir, resolveAll, resolveAsset, resolveCompactionThresholdPercent, resolveGlobalHarnesses, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, resolveSourcePublisher, saveSkWorkspaceConfig, scanRepo, slashGitSourceCacheKey, sourceCacheKey, sourceShortName, stageMaterializedSkills, stagedSkillMarkerState, storeManifestSlug, symlinkEscapeOfProject, unlinkRepo, unpublishedCommitAdvice, unselectedInstanceIds, unstageSkill, validateAssetRecipeAttr, validateAssetRecipeFlake, valueShapeError, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
-//# sourceMappingURL=chunk-BNLXZXZN.js.map
-//# sourceMappingURL=chunk-BNLXZXZN.js.map
+export { AGENT_INSTANCE_ID_PATTERN, AGENT_INSTANCE_LIFECYCLES, AGENT_INSTANCE_MEMORY_SCOPES, AGENT_INSTANCE_TRIGGER_KINDS, AGENT_PROFILE_FIELDS, AgentRefResolutionError, COMPACTION_DEFAULTS, CanonicalRefConflictError, ConfigParseError, DEFAULT_AGENT_INSTANCE_ID, DEFAULT_RECIPE_ATTR, LegacyKeyError, 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, SourceEntryError, UnknownAssetKindError, agentBlockKeyDiagnostics, agentInstanceDiagnostics, agentSourceCacheDir, attachToBranch, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneIsOnPin, cloneOriginMismatch, cloneRepo, coerceVersion, configParseErrorOf, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, discardUnclonedSourceDir, effectiveAgentInstances, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, instanceChoiceText, isCommitOnRemote, isInsideProject, isSourceCloned, isStagedSkillMarkerFor, isWorkspaceConfigFilename, legacySourceCacheKey, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, localConnectorMountDir, matchPin, mcpDeclarationFromMdContent, mergeAgentInstances, mergeAgentPermissions, mergeSkWorkspaceConfigs, missingPinMessage, normalizeAgentInstances, normalizeConfig, parseSourceEntries, primaryAgentRef, priorSourceCacheKeys, priorStoreManifestSlugs, pullRepo, pullRepoResult, readLinks, readSkillAllowList, repoIdentity, resolveAgentDefinitionDir, resolveAgentDir, resolveAll, resolveAsset, resolveCompactionThresholdPercent, resolveGlobalHarnesses, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, resolveSourcePublisher, sameRepo, saveSkWorkspaceConfig, scanRepo, slashGitSourceCacheKey, sourceCacheKey, sourceShortName, stageMaterializedSkills, stagedSkillMarkerState, storeManifestSlug, symlinkEscapeOfProject, unlinkRepo, unpublishedCommitAdvice, unselectedInstanceIds, unstageSkill, validateAssetRecipeAttr, validateAssetRecipeFlake, valueShapeError, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
+//# sourceMappingURL=chunk-BRAOB37W.js.map
+//# sourceMappingURL=chunk-BRAOB37W.js.map