@skaile/workspaces 6.6.0 → 6.7.0

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

@@ -1,9 +1,9 @@
 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-E2EC6SAX.js';
+import { decodeSkaileManifest, compositeSha256, listAssetFiles, SKAILE_MANIFEST_FILENAME, sha256Hex } from './chunk-QC5BYUED.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-V5KG6CCV.js';
+import { isValidAssetName, slugifyAssetName, depToStr, parseAssetRef, isValidPublisher, PUBLISHER_HINT, assetRefToStr } from './chunk-V5KG6CCV.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';
@@ -279,6 +279,13 @@ function effectiveAgentInstances(config) {
   if (definition) out[DEFAULT_AGENT_INSTANCE_ID] = { ref: definition };
   return out;
 }
+function unselectedInstanceIds(config) {
+  if (primaryAgentRef(config)) return [];
+  return Object.keys(config.agent?.instances ?? {});
+}
+function instanceChoiceText(ids) {
+  return `${ids.join(", ")} (run with --instance ${ids.length === 1 ? ids[0] : "<id>"})`;
+}
 function agentInstanceDiagnostics(config) {
   if (config.agent?.definition && config.agent.instances?.[DEFAULT_AGENT_INSTANCE_ID]) {
     return [
@@ -785,6 +792,14 @@ function push(index, key, candidate) {
 function hasOwnGit(dir) {
   return existsSync(join(dir, ".git"));
 }
+function isGitCheckout(dir) {
+  const dotGit = join(dir, ".git");
+  try {
+    return statSync(dotGit).isFile() || existsSync(join(dotGit, "HEAD"));
+  } catch {
+    return false;
+  }
+}
 function getGlobalCacheDir() {
   const dir = join(globalCacheRoot(), "sources");
   const home = globalSkaileDir();
@@ -1024,6 +1039,15 @@ function remoteUrlMatches(repoDir, expectedUrl) {
   if (!actual) return true;
   return sourceCacheKey(actual) === sourceCacheKey(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);
+}
 function linksFile(projectDir) {
   return join(projectDir, ".skaile", "links.yaml");
 }
@@ -1086,13 +1110,15 @@ function isManagedCacheDir(dir) {
   return target === root || target.startsWith(root + sep);
 }
 function isSourceCloned(dest) {
-  return hasOwnGit(dest);
+  return isGitCheckout(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) && !isGitCheckout(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 {
@@ -1113,7 +1139,7 @@ ${line}`);
   console.warn(line);
 }
 function syncManagedClone(dest, url, branch, pin, strictPin = false) {
-  const cached = existsSync(join(dest, ".git"));
+  const cached = isGitCheckout(dest);
   if (cached && remoteUrlMatches(dest, url)) {
     spawnSync("git", ["-C", dest, "remote", "set-url", "origin", url], {
       stdio: "pipe",
@@ -1564,6 +1590,15 @@ function checkRepoStatus(decl, name, reposDir, projectDir) {
     upToDate: true
   };
   if (local) return base;
+  const wrongOrigin = managedPath !== void 0 && decl.url !== void 0 ? cloneOriginMismatch(managedPath, decl.url) : void 0;
+  if (managedPath !== void 0 && wrongOrigin !== void 0) {
+    return {
+      ...base,
+      localHead: getRepoCommit(managedPath) ?? "",
+      cloneOrigin: wrongOrigin,
+      error: `clone origin ${wrongOrigin} differs from declared ${redactCredentials(decl.url ?? "")}`
+    };
+  }
   let dest = managedPath ?? join(getGlobalCacheDir(), name);
   const globalOk = existsSync(join(dest, ".git")) && (!decl.url || remoteUrlMatches(dest, decl.url));
   if (!globalOk) {
@@ -1641,7 +1676,20 @@ function parseSourceEntries(raw) {
         `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;
+    if (typeof publisher === "string" && publisher.length > 0) {
+      if (!isValidPublisher(publisher.replace(/^@/, ""))) {
+        throw new SourceEntryError(
+          `sources[${i}] publisher "${publisher}" is invalid: ${PUBLISHER_HINT}`
+        );
+      }
+      entry.publisher = publisher;
+    }
+    const branch = s.branch;
+    if (branch !== void 0 && branch !== null && typeof branch !== "string") {
+      throw new SourceEntryError(
+        `sources[${i}] branch must be a string: ${JSON.stringify(branch)} (write it as "pin: <branch>")`
+      );
+    }
     return entry;
   });
 }
@@ -2446,7 +2494,7 @@ function validateConfigValues(config, diagnostics) {
       diagnostics.push({
         code: "connector_missing_id",
         severity: "error",
-        message: `Connector #${index + 1} has no \`id\`; the runner would mount it at .mounts/undefined. Add \`id: <name>\`.`,
+        message: `Connector #${index + 1} has no \`id\`; the runner cannot mount it or address it by name. Add \`id: <name>\`.`,
         path: `connectors[${index}].id`
       });
     } else if (seenConnectorIds.has(c.id)) {
@@ -2477,7 +2525,7 @@ function validateConfigValues(config, diagnostics) {
         path: `connectors.${hasId ? c.id : index}.driver`
       });
     }
-    checkUnavailable(c, diagnostics);
+    checkUnavailable(c, index, diagnostics);
   }
   for (const m of config.mounts ?? []) checkAccess(m.access, `mounts.${m.id}.access`);
   const networks = [
@@ -2509,7 +2557,8 @@ function validateConfigValues(config, diagnostics) {
     }
   }
 }
-function checkUnavailable(c, diagnostics) {
+function checkUnavailable(c, index, diagnostics) {
+  const hasId = typeof c.id === "string" && c.id !== "";
   const value = c.unavailable;
   if (value === void 0 || value === null || value === false) return;
   if (typeof value === "string" && value.trim() !== "") return;
@@ -2520,8 +2569,8 @@ function checkUnavailable(c, diagnostics) {
   diagnostics.push({
     code: "invalid_unavailable",
     severity: "warning",
-    message: `Connector "${c.id}" has a malformed "unavailable" marker \u2014 expected a reason string or { reason: string, detail?: string }. It is still treated as unavailable.`,
-    path: `connectors.${c.id}.unavailable`
+    message: `Connector ${hasId ? `"${c.id}"` : `#${index + 1}`} has a malformed "unavailable" marker \u2014 expected a reason string or { reason: string, detail?: string }. It is still treated as unavailable.`,
+    path: `connectors.${hasId ? c.id : index}.unavailable`
   });
 }
 var CANONICAL_KEY_ORDER = [
@@ -3282,6 +3331,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, 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
+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, 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, 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, unselectedInstanceIds, unstageSkill, validateAssetRecipeAttr, validateAssetRecipeFlake, valueShapeError, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
+//# sourceMappingURL=chunk-O7ADRMCR.js.map
+//# sourceMappingURL=chunk-O7ADRMCR.js.map