@skaile/workspaces 6.4.0 → 6.6.0

package/dist/{chunk-6WQGJF65.js → chunk-6SXSVKQY.js}

@@ -1,13 +1,13 @@
 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-U6S5CXKB.js';
-import { scanDirectory, parseFrontmatter, parseRequires, dedupeRequirementRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs, assetDepRefs, agentYamlRequires, yamlQuotingHint } from './chunk-VV2DJT4I.js';
+import { decodeSkaileManifest, compositeSha256, listAssetFiles, SKAILE_MANIFEST_FILENAME, sha256Hex } from './chunk-E2EC6SAX.js';
+import { scanDirectory, parseFrontmatter, parseRequires, dedupeRequirementRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs, assetDepRefs, agentYamlRequires, yamlQuotingHint } from './chunk-GNUA7XT2.js';
 import { readPluginGroupings } from './chunk-RVRB27AN.js';
-import { isValidAssetName, slugifyAssetName, depToStr, parseAssetRef, assetRefToStr } from './chunk-IZQOO6MN.js';
+import { isValidAssetName, slugifyAssetName, depToStr, parseAssetRef, assetRefToStr } from './chunk-V5KG6CCV.js';
 import { isRetentionValue } from './chunk-C3CAXQMA.js';
-import { existsSync, readFileSync, mkdirSync, writeFileSync, lstatSync, symlinkSync, rmSync, readdirSync, realpathSync, constants, statSync } from 'fs';
+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, dirname, sep, parse as parse$1, isAbsolute, basename } from 'path';
+import { join, posix, relative, resolve, sep, dirname, parse as parse$1, isAbsolute, basename } from 'path';
 import { parse, stringify } from 'yaml';
 import { spawnSync } from 'child_process';
 import { createHash } from 'crypto';
@@ -270,6 +270,9 @@ function mergeAgentInstances(base, overlay) {
   }
   return out;
 }
+function primaryAgentRef(config) {
+  return config.agent?.definition || config.agent?.instances?.[DEFAULT_AGENT_INSTANCE_ID]?.ref;
+}
 function effectiveAgentInstances(config) {
   const out = { ...config.agent?.instances };
   const definition = config.agent?.definition;
@@ -388,7 +391,9 @@ var PROFILE_KEYS = [
   "query_params",
   "transport"
 ];
-var SUGGESTED_PROFILE_KEYS = PROFILE_KEYS.filter((k) => k !== "driver");
+var SUGGESTED_PROFILE_KEYS = PROFILE_KEYS.filter(
+  (k) => k !== "driver" && k !== "agent"
+);
 var SUGGESTED_TOP_LEVEL_KEYS = TOP_LEVEL_KEYS.filter(
   (k) => !["agent_config", "agentConfig", "global-harnesses", "global_backends"].includes(k)
 );
@@ -444,6 +449,15 @@ function unknownConfigKeyDiagnostics(raw) {
     const profiles = flat ? [["default", block, found.key]] : Object.entries(block).filter((e) => isRecord(e[1])).map(([name, p]) => [name, p, `${found.key}.${name}`]);
     for (const [, profile, where] of profiles) {
       for (const key of Object.keys(profile)) {
+        if (key === "agent") {
+          out.push({
+            code: "retired_agent_key",
+            severity: "warning",
+            message: `\`${where}.agent\` is ignored; nothing reads it. Remove it (run \`skaile migrate harness\`)`,
+            path: `${where}.agent`
+          });
+          continue;
+        }
         if (PROFILE_KEYS.includes(key)) continue;
         const near = nearestKey(key, SUGGESTED_PROFILE_KEYS);
         out.push({
@@ -811,9 +825,15 @@ function priorStoreManifestSlugs(url) {
   return priorSourceCacheKeys(url).filter((k) => k !== legacySourceCacheKey(url)).map((k) => k.replace(/[/\\:]+/g, "__"));
 }
 function normalizeSourceKeyUrl(url, beforeSlashFix = false) {
-  const bare = url.trim().replace(/^git@([^:]+):/, "$1/").replace(/^[a-z][a-z0-9+.-]*:\/\//i, "").replace(/^[^/]*@/, "");
+  const bare = foldLocalPath(
+    url.trim().replace(/^git@([^:]+):/, "$1/").replace(/^[a-z][a-z0-9+.-]*:\/\//i, "").replace(/^[^/]*@/, "")
+    // drop userinfo (user:token@) — never key on a secret
+  );
   return beforeSlashFix ? bare.replace(/\.git$/i, "").replace(/\/+$/, "") : bare.replace(/\/+$/, "").replace(/\.git$/i, "").replace(/\/+$/, "");
 }
+function foldLocalPath(p) {
+  return p.startsWith("/") ? posix.normalize(p) : p;
+}
 function lastSegment(url) {
   return url.replace(/\/+$/, "").replace(/\.git$/i, "").replace(/\/+$/, "").split(/[/:]/).pop() || "source";
 }
@@ -825,7 +845,19 @@ function storeManifestSlug(url) {
 }
 var GIT_ENV = { ...process.env, GIT_TERMINAL_PROMPT: "0" };
 function cloneRepo(url, branch, dest) {
+  const existed = existsSync(dest);
   mkdirSync(dest, { recursive: true });
+  const cloned = cloneInto(url, branch, dest);
+  if (!cloned && !hasOwnGit(dest)) {
+    if (existed) {
+      if (readdirSync(dest).length === 0) rmdirSync(dest);
+    } else {
+      rmSync(dest, { recursive: true, force: true });
+    }
+  }
+  return cloned;
+}
+function cloneInto(url, branch, dest) {
   const r = spawnSync(
     "git",
     ["clone", "--depth=1", "--filter=blob:none", "--sparse", "--branch", branch, url, dest],
@@ -947,6 +979,15 @@ function currentBranch(repoDir) {
   });
   return r.status === 0 ? r.stdout.trim() || null : null;
 }
+function originHeadBranch(repoDir) {
+  const r = spawnSync(
+    "git",
+    ["-C", repoDir, "symbolic-ref", "--short", "-q", "refs/remotes/origin/HEAD"],
+    { encoding: "utf8", stdio: "pipe" }
+  );
+  const name = r.status === 0 ? r.stdout.trim().replace(/^origin\//, "") : "";
+  return name || null;
+}
 function attachToBranch(repoDir, preferred) {
   if (currentBranch(repoDir)) return true;
   let candidates = [preferred];
@@ -1044,6 +1085,24 @@ function isManagedCacheDir(dir) {
   const target = resolve(dir);
   return target === root || target.startsWith(root + sep);
 }
+function isSourceCloned(dest) {
+  return hasOwnGit(dest);
+}
+function discardUnclonedSourceDir(dest) {
+  const root = resolve(getGlobalCacheDir());
+  const target = resolve(dest);
+  if (target === root || !target.startsWith(root + sep)) return;
+  if (existsSync(target) && !hasOwnGit(target)) rmSync(target, { recursive: true, force: true });
+  if (existsSync(target)) return;
+  for (let dir = dirname(target); dir !== root && dir.startsWith(root + sep); dir = dirname(dir)) {
+    try {
+      if (readdirSync(dir).length > 0) return;
+      rmdirSync(dir);
+    } catch {
+      return;
+    }
+  }
+}
 var warnedSourceClones = /* @__PURE__ */ new Set();
 function warnSourceClone(url, dest, what) {
   const line = redactCredentials(`! source clone ${sourceShortName(url)} ${what}`);
@@ -1072,8 +1131,10 @@ function syncManagedClone(dest, url, branch, pin, strictPin = false) {
     }
   } else {
     if (cached) rmSync(dest, { recursive: true, force: true });
+    else discardUnclonedSourceDir(dest);
     mkdirSync(dirname(dest), { recursive: true });
     if (!cloneRepo(url, branch, dest)) {
+      discardUnclonedSourceDir(dest);
       throw new Error(redactCredentials(`Failed to clone ${url} (branch: ${branch}) into ${dest}`));
     }
   }
@@ -1092,7 +1153,7 @@ function syncManagedClone(dest, url, branch, pin, strictPin = false) {
 function ensureLocalPathRepo(decl, reposDir, opts) {
   const projectDir = opts?.projectDir ?? resolve(reposDir, "..");
   const resolved = resolve(projectDir, decl.path);
-  const exists = existsSync(resolved);
+  const exists = existsSync(resolved) && !(decl.url && !decl.factory && isManagedCacheDir(resolved) && !hasOwnGit(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, opts?.strictPin);
@@ -1412,7 +1473,8 @@ async function gatherStoreCandidates(ref, publisher, sourceCandidates, opts) {
           files: m.files,
           sha256: m.sha256,
           deps: m.deps,
-          ...m.deps?.length ? { storeRequires: m.deps } : {}
+          ...m.deps?.length ? { storeRequires: m.deps } : {},
+          storeUrl: store.url
         });
       }
     }
@@ -1510,7 +1572,7 @@ function checkRepoStatus(decl, name, reposDir, projectDir) {
   if (!existsSync(join(dest, ".git"))) {
     return { ...base, error: "Not cloned yet" };
   }
-  const branch = decl.branch ?? "main";
+  const branch = decl.branch ?? currentBranch(dest) ?? originHeadBranch(dest) ?? "main";
   const localHead = getRepoCommit(dest);
   if (!localHead) return { ...base, error: "Failed to read local HEAD" };
   base.localHead = localHead;
@@ -1519,7 +1581,10 @@ function checkRepoStatus(decl, name, reposDir, projectDir) {
     stdio: "pipe",
     env: GIT_ENV
   });
-  if (fetchR.status !== 0) return { ...base, error: "Fetch failed" };
+  if (fetchR.status !== 0) {
+    const why = (fetchR.stderr ?? "").split("\n").map((l) => l.trim()).find((l) => l.length > 0);
+    return { ...base, error: why ? `Fetch failed: ${redactCredentials(why)}` : "Fetch failed" };
+  }
   const remoteR = spawnSync("git", ["-C", dest, "rev-parse", `origin/${branch}`], {
     encoding: "utf8",
     stdio: "pipe"
@@ -1571,6 +1636,11 @@ 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) entry.publisher = publisher;
     return entry;
   });
@@ -2563,6 +2633,7 @@ function mcpDeclFromCatalogEntry(entry) {
     decl.headers = m.headers;
   }
   if (entry.description) decl.description = entry.description;
+  if (typeof m.lazy === "boolean") decl.lazy = m.lazy;
   if (m.payload !== void 0) {
     const payload = parseCatalogPayload(m.payload);
     if (!payload) {
@@ -2650,7 +2721,8 @@ function mergeMcpDeclarations(base, overlay) {
     // merged `env` does too — the flag must not be lost by an overlay.
     instanceSecretsFolded: overlay.instanceSecretsFolded ?? base.instanceSecretsFolded,
     payload: overlay.payload ?? base.payload,
-    fields: overlay.fields ?? base.fields
+    fields: overlay.fields ?? base.fields,
+    lazy: overlay.lazy ?? base.lazy
   };
 }
 var unscopedTail = (x) => x.includes("/") ? x.split("/").pop() : x;
@@ -3193,8 +3265,7 @@ function resolveAgentRef(projectDir, definition) {
   );
 }
 function resolveAgentDir(projectDir) {
-  const config = resolveSkWorkspaceConfig(projectDir);
-  const definition = config.agent?.definition;
+  const definition = primaryAgentRef(resolveSkWorkspaceConfig(projectDir));
   if (!definition) return void 0;
   return resolveAgentDefinitionDir(projectDir, definition);
 }
@@ -3211,6 +3282,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, cloneRepo, coerceVersion, configParseErrorOf, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, effectiveAgentInstances, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isCommitOnRemote, isInsideProject, isStagedSkillMarkerFor, isWorkspaceConfigFilename, legacySourceCacheKey, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, localConnectorMountDir, matchPin, mcpDeclarationFromMdContent, mergeAgentInstances, mergeAgentPermissions, mergeSkWorkspaceConfigs, normalizeAgentInstances, normalizeConfig, parseSourceEntries, 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, unstageSkill, validateAssetRecipeAttr, validateAssetRecipeFlake, valueShapeError, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
-//# sourceMappingURL=chunk-6WQGJF65.js.map
-//# sourceMappingURL=chunk-6WQGJF65.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, cloneRepo, coerceVersion, configParseErrorOf, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, discardUnclonedSourceDir, effectiveAgentInstances, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isCommitOnRemote, isInsideProject, isSourceCloned, isStagedSkillMarkerFor, isWorkspaceConfigFilename, legacySourceCacheKey, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, localConnectorMountDir, matchPin, mcpDeclarationFromMdContent, mergeAgentInstances, mergeAgentPermissions, mergeSkWorkspaceConfigs, 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, unstageSkill, validateAssetRecipeAttr, validateAssetRecipeFlake, valueShapeError, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
+//# sourceMappingURL=chunk-6SXSVKQY.js.map
+//# sourceMappingURL=chunk-6SXSVKQY.js.map