@skaile/workspaces 5.11.0 → 5.12.0

package/dist/{chunk-ALEYHUC5.js → chunk-PNOGX36L.js}

@@ -1,9 +1,9 @@
 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-ZPWTOUTK.js';
+import { decodeSkaileManifest, compositeSha256, listAssetFiles, SKAILE_MANIFEST_FILENAME, sha256Hex } from './chunk-CTP3XBMF.js';
 import { readPluginGroupings } from './chunk-RVRB27AN.js';
-import { scanDirectory, parseFrontmatter, parseRequires, dedupeRequirementRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs, assetDepRefs } from './chunk-SBSA3IQA.js';
-import { isValidAssetName, slugifyAssetName, depToStr, parseAssetRef, assetRefToStr } from './chunk-BNMZVPYA.js';
+import { scanDirectory, parseFrontmatter, parseRequires, dedupeRequirementRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs, assetDepRefs, agentYamlRequires } from './chunk-XTVSNWLL.js';
+import { isValidAssetName, slugifyAssetName, depToStr, parseAssetRef, assetRefToStr } from './chunk-PNTXHTBC.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';
@@ -281,7 +281,20 @@ var MD_FILE_BY_KIND = Object.fromEntries(
 );
 async function buildProvenanceIndex(clones, opts) {
   const index = /* @__PURE__ */ new Map();
-  for (const clone of clones) await walkOne(clone, index, opts.knownKinds);
+  for (const clone of clones) {
+    if (!opts.onSourceError) {
+      await walkOne(clone, index, opts.knownKinds);
+      continue;
+    }
+    const scratch = /* @__PURE__ */ new Map();
+    try {
+      await walkOne(clone, scratch, opts.knownKinds);
+    } catch (err) {
+      opts.onSourceError(clone, err);
+      continue;
+    }
+    for (const [key, candidates] of scratch) for (const c of candidates) push(index, key, c);
+  }
   return index;
 }
 async function walkOne(clone, index, knownKinds) {
@@ -289,15 +302,31 @@ async function walkOne(clone, index, knownKinds) {
     if (await walkWithManifest(clone, clone.overlayManifestPath, index)) return;
   }
   const manifestPaths = findManifestFiles(clone.localPath);
+  const repoLevel = repoLevelManifest(
+    [clone.overlayManifestPath, ...manifestPaths].filter((p) => !!p)
+  );
   if (manifestPaths.length === 0) {
-    await walkFilenameConvention(clone, index, knownKinds);
+    await walkFilenameConvention(clone, index, knownKinds, repoLevel);
     return;
   }
   let produced = false;
   for (const p of manifestPaths) {
     if (await walkWithManifest(clone, p, index)) produced = true;
   }
-  if (!produced) await walkFilenameConvention(clone, index, knownKinds);
+  if (!produced) await walkFilenameConvention(clone, index, knownKinds, repoLevel);
+}
+function repoLevelManifest(paths) {
+  for (const p of paths) {
+    if (!existsSync(p)) continue;
+    const { manifest } = decodeSkaileManifest(readFileSync(p, "utf8"));
+    if (manifest.publisher) {
+      return {
+        publisher: manifest.publisher.replace(/^@/, ""),
+        version: manifest.version
+      };
+    }
+  }
+  return {};
 }
 function findManifestFiles(root) {
   const found = [];
@@ -440,14 +469,14 @@ var DIR_SCOPED_KINDS = /* @__PURE__ */ new Set([
   "connector",
   "knowledge"
 ]);
-async function walkFilenameConvention(clone, index, knownKinds) {
-  const publisher = publisherFromGithubUrl(clone.sourceUrl);
+async function walkFilenameConvention(clone, index, knownKinds, repoLevel = {}) {
+  const publisher = repoLevel.publisher ?? publisherFromGithubUrl(clone.sourceUrl);
   if (!publisher) {
     throw new Error(
       `${clone.sourceUrl}: publisher must be declared in skaile.manifest.yaml (non-GitHub source URL).`
     );
   }
-  const version = (clone.tag ? clone.tag.replace(/^v/, "") : void 0) ?? syntheticVersion(clone.commit);
+  const version = repoLevel.version ?? (clone.tag ? clone.tag.replace(/^v/, "") : void 0) ?? syntheticVersion(clone.commit);
   for (const e of await scanDirectory(clone.localPath, publisher, { knownKinds })) {
     const manifestAbs = e.source;
     const manifestRel = relative(clone.localPath, manifestAbs).replace(/\\/g, "/");
@@ -506,11 +535,24 @@ async function manifestDeps(repoRoot, files, kind) {
   const { refs, skipped } = await assetDepRefs(join(repoRoot, mf.path));
   return kind === "preset" ? { deps: refs, skippedItems: skipped } : { deps: refs };
 }
+function readAgentYamlRequires(repoRoot, files, kind) {
+  if (kind !== "agent") return [];
+  const yaml = files.find((f) => posix.basename(f.path) === "agent.yaml");
+  if (!yaml) return [];
+  try {
+    return agentYamlRequires(readFileSync(join(repoRoot, yaml.path), "utf8"));
+  } catch {
+    return [];
+  }
+}
 async function candidateDeps(repoRoot, files, kind, publisher, explicit) {
   const base = explicit ? { deps: explicit } : await manifestDeps(repoRoot, files, kind);
   if (kind === "preset" || kind === "flow") return base;
   const frontmatter = readContentFrontmatter(repoRoot, files, kind);
-  const declared = frontmatter ? parseRequires(frontmatter).map(depToStr) : [];
+  const declared = [
+    ...frontmatter ? parseRequires(frontmatter) : [],
+    ...readAgentYamlRequires(repoRoot, files, kind)
+  ].map(depToStr);
   if (declared.length === 0) return base;
   return { ...base, deps: dedupeRequirementRefs([...base.deps ?? [], ...declared], publisher) };
 }
@@ -627,18 +669,33 @@ function getRepoCommit(repoDir) {
   });
   return r.status === 0 ? r.stdout.trim() : null;
 }
-function checkoutPin(repoDir, pin) {
-  spawnSync("git", ["-C", repoDir, "fetch", "--depth=1", "origin", pin], {
+function isCommitOnRemote(repoDir, commit) {
+  if (!/^[0-9a-f]{7,64}$/i.test(commit) || !hasOwnGit(repoDir)) return true;
+  if (!getRepoRemoteUrl(repoDir)) return true;
+  const known = spawnSync("git", ["-C", repoDir, "cat-file", "-e", `${commit}^{commit}`], {
     stdio: "pipe",
     env: GIT_ENV
   });
-  const r = spawnSync("git", ["-C", repoDir, "checkout", "FETCH_HEAD"], {
+  if (known.status !== 0) return true;
+  const r = spawnSync("git", ["-C", repoDir, "branch", "-r", "--contains", commit], {
+    encoding: "utf8",
     stdio: "pipe",
     env: GIT_ENV
   });
-  if (r.status === 0) return true;
-  const r2 = spawnSync("git", ["-C", repoDir, "checkout", pin], { stdio: "pipe", env: GIT_ENV });
-  return r2.status === 0;
+  return r.status !== 0 || r.stdout.trim().length > 0;
+}
+function checkoutPin(repoDir, pin) {
+  const fetched = spawnSync("git", ["-C", repoDir, "fetch", "--depth=1", "origin", pin], {
+    stdio: "pipe",
+    env: GIT_ENV
+  });
+  const r = fetched.status === 0 ? spawnSync("git", ["-C", repoDir, "checkout", "FETCH_HEAD"], { stdio: "pipe", env: GIT_ENV }) : void 0;
+  const ok = r?.status === 0 || spawnSync("git", ["-C", repoDir, "checkout", pin], { stdio: "pipe", env: GIT_ENV }).status === 0;
+  if (!ok) return false;
+  if (/^[0-9a-f]{7,40}$/i.test(pin)) {
+    return getRepoCommit(repoDir)?.toLowerCase().startsWith(pin.toLowerCase()) === true;
+  }
+  return true;
 }
 function currentBranch(repoDir) {
   const r = spawnSync("git", ["-C", repoDir, "symbolic-ref", "--short", "-q", "HEAD"], {
@@ -744,7 +801,7 @@ function isManagedCacheDir(dir) {
   const target = resolve(dir);
   return target === root || target.startsWith(root + sep);
 }
-function syncManagedClone(dest, url, branch, pin) {
+function syncManagedClone(dest, url, branch, pin, strictPin = false) {
   const cached = existsSync(join(dest, ".git"));
   if (cached && remoteUrlMatches(dest, url)) {
     spawnSync("git", ["-C", dest, "remote", "set-url", "origin", url], {
@@ -770,6 +827,13 @@ function syncManagedClone(dest, url, branch, pin) {
   }
   if (pin && getRepoCommit(dest) === pin) return;
   if (pin && !checkoutPin(dest, pin)) {
+    if (strictPin) {
+      throw new Error(
+        redactCredentials(
+          `could not check out pin ${pin} in source clone ${dest}: the commit is not on the remote (an unpublished commit, or a rewritten branch)`
+        )
+      );
+    }
     console.warn(
       redactCredentials(
         `[repo-manager] could not check out pin ${pin} in source clone ${dest}. Using the cached commit.`
@@ -783,19 +847,25 @@ function ensureLocalPathRepo(decl, reposDir, opts) {
   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);
+      syncManagedClone(resolved, decl.url, decl.branch ?? "main", opts?.pin, opts?.strictPin);
     }
     return resolved;
   }
   if (!decl.url) {
     throw new Error(`Local repository path not found: ${decl.path} (resolved: ${resolved})`);
   }
-  syncManagedClone(resolved, decl.url, decl.branch ?? "main", opts?.pin);
+  syncManagedClone(resolved, decl.url, decl.branch ?? "main", opts?.pin, opts?.strictPin);
   return resolved;
 }
 function ensureRemoteRepo(decl, name, reposDir, opts) {
   const cacheDest = join(getGlobalCacheDir(), name);
-  syncManagedClone(cacheDest, decl.url, decl.branch ?? "main", opts?.pin);
+  syncManagedClone(
+    cacheDest,
+    decl.url,
+    decl.branch ?? "main",
+    opts?.pin,
+    opts?.strictPin
+  );
   linkCacheIntoProject(cacheDest, reposDir, name);
   return cacheDest;
 }
@@ -1926,6 +1996,15 @@ function validateConfigValues(config, diagnostics) {
   };
   for (const c of config.connectors ?? []) {
     checkAccess(c.access, `connectors.${c.id}.access`);
+    if (typeof c.driver !== "string" || c.driver === "") {
+      const legacy = c.adapter;
+      diagnostics.push({
+        code: "connector_missing_driver",
+        severity: "error",
+        message: legacy !== void 0 ? `Connector "${c.id}" sets \`adapter: ${String(legacy)}\`; the key is \`driver\`. Rename \`adapter\` to \`driver\`.` : `Connector "${c.id}" has no \`driver\`; the runner cannot mount it. Add \`driver: <name>\`.`,
+        path: `connectors.${c.id}.driver`
+      });
+    }
     checkUnavailable(c, diagnostics);
   }
   for (const m of config.mounts ?? []) checkAccess(m.access, `mounts.${m.id}.access`);
@@ -2461,6 +2540,7 @@ function collectMcpRefStrings(dependencies) {
 var MCP_LOOKUP_KINDS = /* @__PURE__ */ new Set(["mcp-server"]);
 async function buildMcpProvenanceIndex(sources, projectDir) {
   return sources.length > 0 ? await buildProvenanceIndex(buildSourceClones(sources), {
+    projectDir,
     // Only `mcp-server` refs are looked up in this index.
     knownKinds: MCP_LOOKUP_KINDS
   }) : /* @__PURE__ */ new Map();
@@ -2494,7 +2574,7 @@ async function loadMcpServerDeclarations(projectDir) {
   const explicit = config.mcp_servers ?? [];
   const materialized = loadMaterializedMcpDeclarations(projectDir);
   const mcpRefStrings = collectMcpRefStrings(config.dependencies);
-  const provenanceIndex = await buildMcpProvenanceIndex(config.sources ?? []);
+  const provenanceIndex = await buildMcpProvenanceIndex(config.sources ?? [], projectDir);
   const byId = /* @__PURE__ */ new Map();
   const order = [];
   const upsert = (decl) => {
@@ -2659,6 +2739,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, 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, 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, parseSourceEntries, 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-ALEYHUC5.js.map
-//# sourceMappingURL=chunk-ALEYHUC5.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, SourceEntryError, UnknownAssetKindError, agentInstanceDiagnostics, agentSourceCacheDir, attachToBranch, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneRepo, coerceVersion, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, effectiveAgentInstances, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isCommitOnRemote, isStagedSkillMarkerFor, isWorkspaceConfigFilename, legacySourceCacheKey, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, matchPin, mergeAgentInstances, mergeAgentPermissions, mergeSkWorkspaceConfigs, normalizeAgentInstances, normalizeConfig, parseSourceEntries, 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-PNOGX36L.js.map
+//# sourceMappingURL=chunk-PNOGX36L.js.map