@skaile/workspaces 5.18.1 → 6.0.0

package/dist/{chunk-T2TQAH2X.js → chunk-L4YKW5AY.js}

@@ -1,20 +1,20 @@
-import { factoryAssetRoots } from './chunk-KC6HGWXN.js';
-import { deployedBase } from './chunk-5TBFN46Z.js';
-import { DEFAULT_DRIVER_ID } from './chunk-5BEFNLOR.js';
-import { parseSourceEntries, resolveSkWorkspaceConfig } from './chunk-2NOLF7B2.js';
+import { factoryAssetRoots } from './chunk-OTIB4D2K.js';
+import { deployedBase } from './chunk-5KRMNUL4.js';
+import { DEFAULT_HARNESS_ID } from './chunk-Z7ZEZZB6.js';
+import { parseSourceEntries, resolveSkWorkspaceConfig } from './chunk-OHNKYHRR.js';
 import { globalSkaileDir } from './chunk-L5VSIPQD.js';
-import { driverTargetForDriver, SUPPORTED_DRIVER_TARGETS } from './chunk-IG5LZ3WU.js';
-import { sha256Hex, compositeSha256, orderedAsset, ASSET_KEY_ORDER } from './chunk-CKICWXMU.js';
+import { harnessNameForHarnessId, SUPPORTED_HARNESSES } from './chunk-VTETQCR6.js';
+import { sha256Hex, compositeSha256, orderedAsset, ASSET_KEY_ORDER } from './chunk-UQ33Y4DM.js';
 import { parseAssetRefLoose } from './chunk-WDXZA7QW.js';
-import { validateRegistry, mergeRegistries, validateMergedRegistry } from './chunk-MJHSLODD.js';
+import { validateRegistry, mergeRegistries, validateMergedRegistry } from './chunk-LSI2IVFT.js';
 import fs, { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync, readdirSync, realpathSync } from 'fs';
 import path, { join, resolve, dirname, basename } from 'path';
-import { parse, parseDocument, Document, isMap, isSeq, stringify, isScalar } from 'yaml';
+import { parseDocument, Document, isMap, isSeq, parse, stringify, isScalar, visit } from 'yaml';
 import { isDeepStrictEqual } from 'util';
 import { spawnSync } from 'child_process';
 import fsp from 'fs/promises';
 import { fileURLToPath, pathToFileURL } from 'url';
-import { createServer } from 'net';
+import { connect } from 'net';
 
 function defaultLibraryDir() {
   return join(globalSkaileDir(), "libraries");
@@ -28,7 +28,7 @@ function globalInstallDir() {
   return join(resolveLibraryDir(), GLOBAL_INSTALL_DIR_NAME);
 }
 function installRoots(globalInstall, projectDir) {
-  return SUPPORTED_DRIVER_TARGETS.map(
+  return SUPPORTED_HARNESSES.map(
     (target) => dirname(deployedBase("flow", target, globalInstall, projectDir))
   );
 }
@@ -43,6 +43,10 @@ function aiResourceRoots(projectDir = process.cwd()) {
   ];
   return [...new Set(roots)].filter((r) => existsSync(r));
 }
+function projectAssetRoots(projectDir = process.cwd()) {
+  const roots = [...installRoots(false, projectDir), ...factoryAssetRoots()];
+  return [...new Set(roots)].filter((r) => existsSync(r));
+}
 var LOCK_SCHEMA_VERSION = 4;
 function canonicalize(value) {
   if (Array.isArray(value)) return value.map(canonicalize);
@@ -66,11 +70,25 @@ function stringifyLock(data) {
     { lineWidth: 120 }
   );
 }
+function parseLockYaml(text) {
+  const doc = parseDocument(text);
+  if (doc.errors.length > 0) throw doc.errors[0];
+  visit(doc, {
+    Pair(_key, pair) {
+      if (!isScalar(pair.key) || pair.key.value !== "commit" && pair.key.value !== "sha256")
+        return;
+      const value = pair.value;
+      if (!isScalar(value) || typeof value.value === "string" || value.value === null) return;
+      if (typeof value.source === "string") value.value = value.source;
+    }
+  });
+  return doc.toJS();
+}
 function writeLock(lockPath, data) {
   const next = stringifyLock(data);
   if (existsSync(lockPath)) {
     try {
-      const prev = parse(readFileSync(lockPath, "utf8"));
+      const prev = parseLockYaml(readFileSync(lockPath, "utf8"));
       if (prev && typeof prev === "object" && typeof prev.locked_at === "string") {
         const same = stringifyLock({ ...prev, locked_at: data.locked_at });
         if (same === next) return false;
@@ -85,7 +103,7 @@ function readLock(lockPath) {
   if (!existsSync(lockPath)) return null;
   let raw;
   try {
-    raw = parse(readFileSync(lockPath, "utf8"));
+    raw = parseLockYaml(readFileSync(lockPath, "utf8"));
   } catch {
     return null;
   }
@@ -98,6 +116,25 @@ function readLock(lockPath) {
   }
   return r;
 }
+function assertLockHashes(lock) {
+  const isHex = (value) => typeof value === "string" && /^[0-9a-f]+$/i.test(value);
+  const badCommit = (value) => value !== void 0 && value !== "" && !isHex(value);
+  for (const [ref, entry] of Object.entries(lock.assets)) {
+    if (entry.source && badCommit(entry.source.commit)) {
+      throw new Error(`skaile.lock.yaml: commit of ${ref} is not a git sha`);
+    }
+    const files = entry.files ?? [];
+    const hasHash = entry.sha256 !== void 0 && entry.sha256 !== "";
+    if (hasHash && !isHex(entry.sha256) || files.some((f) => !isHex(f.sha256))) {
+      throw new Error(`skaile.lock.yaml: sha256 of ${ref} is not a hex digest`);
+    }
+  }
+  for (const source of lock.sources ?? []) {
+    if (badCommit(source.commit)) {
+      throw new Error(`skaile.lock.yaml: commit of ${source.url} is not a git sha`);
+    }
+  }
+}
 function computeHash(filePath) {
   return sha256Hex(readFileSync(filePath));
 }
@@ -595,11 +632,13 @@ function loadProviderRegistry(options = {}) {
   };
 }
 var SETTINGS_DEFAULTS = {
-  driver: DEFAULT_DRIVER_ID
+  harness: DEFAULT_HARNESS_ID
 };
 var LEGACY_FIELD_MAP = {
   defaultModel: "model",
-  defaultAgentType: "driver"
+  defaultAgentType: "harness",
+  // Pre-6.0 spelling of `harness`; read for one major, then removed.
+  driver: "harness"
 };
 var APIKEYS_REJECTION = "settings.json: `apiKeys` is no longer read \u2014 endpoints and credentials are AI provider registry entries in ~/.skaile/providers.yml. Run `skaile providers add <id> --preset <preset> --credential env:NAME` for each provider, then delete the field.";
 function mapLegacyFields(raw) {
@@ -680,7 +719,7 @@ function settingsFromWorkspaceConfig(projectDir) {
   if (ws.roles && Object.keys(ws.roles).length > 0) result.roles = ws.roles;
   const p = ws.agent_config?.default;
   if (!p) return result;
-  if (p.driver) result.driver = p.driver;
+  if (p.harness) result.harness = p.harness;
   if (p.model) result.model = p.model;
   if (p.skills_dir) result.skillsDir = p.skills_dir;
   if (p.agents_dir) result.agentsDir = p.agents_dir;
@@ -721,7 +760,7 @@ function configuredSettingsLayers(projectDir) {
   const acc = { settings: {}, sources: {} };
   const yamlLayer = settingsFromWorkspaceConfig(projectDir);
   foldLayer(acc, yamlLayer, path.join(path.resolve(projectDir), "skaile.yaml"));
-  const projectDriver = yamlLayer.driver;
+  const projectHarness = yamlLayer.harness;
   const globalPath = globalSettingsPath();
   const globalRaw = readSettingsJson(globalPath);
   if (globalRaw) foldLayer(acc, mapLegacyFields(globalRaw), globalPath);
@@ -731,14 +770,14 @@ function configuredSettingsLayers(projectDir) {
     const raw = readSettingsJson(filePath);
     if (raw) foldLayer(acc, mapLegacyFields(raw), filePath);
   }
-  if (projectDriver) {
-    acc.settings.driver = projectDriver;
-    acc.sources.driver = path.join(path.resolve(projectDir), "skaile.yaml");
+  if (projectHarness) {
+    acc.settings.harness = projectHarness;
+    acc.sources.harness = path.join(path.resolve(projectDir), "skaile.yaml");
   }
   return acc;
 }
-function resolveConfiguredDriverTarget(projectDir) {
-  return driverTargetForDriver(configuredSettingsLayers(projectDir).settings.driver);
+function resolveConfiguredHarnessName(projectDir) {
+  return harnessNameForHarnessId(configuredSettingsLayers(projectDir).settings.harness);
 }
 async function resolveSettings(projectDir, overrides) {
   return (await resolveSettingsWithSources(projectDir, overrides)).settings;
@@ -810,7 +849,7 @@ function installCommandFor(pkg, projectDir = process.cwd()) {
   return installCommand(detectPackageManager(projectDir), pkg);
 }
 
-// core/src/driver-sdk.ts
+// core/src/harness-sdk.ts
 var EXPORT_CONDITIONS = ["import", "node", "default"];
 function skaileInstallDir() {
   try {
@@ -897,7 +936,7 @@ function sdkLookupPlaces(projectDir) {
   const project = path.join(path.resolve(projectDir), "node_modules");
   return home ? `${project} and next to skaile (${home})` : `${project} and next to skaile`;
 }
-function driverSdkMissingError(label, pkg, projectDir, cause) {
+function harnessSdkMissingError(label, pkg, projectDir, cause) {
   const detail = cause instanceof Error && cause.message ? ` (load failed: ${firstLine(cause.message)})` : "";
   return new Error(
     `${label} not installed${detail}. Looked in ${sdkLookupPlaces(projectDir)}. Run: ${installCommandFor(pkg, projectDir)}`
@@ -906,10 +945,10 @@ function driverSdkMissingError(label, pkg, projectDir, cause) {
 function firstLine(text) {
   return text.split("\n", 1)[0]?.trim() ?? "";
 }
-async function loadDriverSdk(pkg, projectDir, fallback, label = pkg) {
+async function loadHarnessSdk(pkg, projectDir, fallback, label = pkg) {
   return loadFromProject(pkg, void 0, projectDir, fallback, label);
 }
-async function loadDriverSdkSubpath(pkg, subpath, projectDir, fallback, label = pkg) {
+async function loadHarnessSdkSubpath(pkg, subpath, projectDir, fallback, label = pkg) {
   return loadFromProject(pkg, subpath, projectDir, fallback, label);
 }
 async function loadFromProject(pkg, subpath, projectDir, fallback, label) {
@@ -935,24 +974,43 @@ async function loadFromProject(pkg, subpath, projectDir, fallback, label) {
   try {
     return await fallback();
   } catch (err) {
-    throw driverSdkMissingError(label, pkg, projectDir, cause ?? (dir ? err : void 0));
+    throw harnessSdkMissingError(label, pkg, projectDir, cause ?? (dir ? err : void 0));
   }
 }
 var WILDCARD_HOSTS = ["0.0.0.0", "::", "::0", "0:0:0:0:0:0:0:0"];
+var PROBE_TIMEOUT_MS = 1e3;
+function probeHosts(host) {
+  const hosts = ["127.0.0.1", "::1"];
+  if (host && !WILDCARD_HOSTS.includes(host) && !hosts.includes(host)) hosts.push(host);
+  return hosts;
+}
+function connectProbe(port, host, timeoutMs = PROBE_TIMEOUT_MS) {
+  return new Promise((resolve3) => {
+    const socket = connect({ port, host });
+    const done = (held) => {
+      socket.destroy();
+      resolve3(held);
+    };
+    socket.setTimeout(timeoutMs, () => done(false));
+    socket.once("connect", () => done(true));
+    socket.once("error", () => done(false));
+  });
+}
+async function portIsHeld(port, host) {
+  if (port === 0) return false;
+  const results = await Promise.all(probeHosts(host).map((h) => connectProbe(port, h)));
+  return results.some(Boolean);
+}
 function needsWildcardProbe(host, port, platform) {
   if (!host || port === 0 || platform !== "darwin") return false;
   return !WILDCARD_HOSTS.includes(host);
 }
 function holdsWildcard(port) {
-  return new Promise((resolve3) => {
-    const probe = createServer();
-    probe.once("error", (err) => resolve3(err.code === "EADDRINUSE"));
-    probe.listen(port, () => probe.close(() => resolve3(false)));
-  });
+  return portIsHeld(port);
 }
-async function listenWithProbe(server, port, host, platform = process.platform) {
-  if (needsWildcardProbe(host, port, platform) && await holdsWildcard(port)) {
-    throw Object.assign(new Error("wildcard probe"), { code: "EADDRINUSE" });
+async function listenWithProbe(server, port, host, _platform) {
+  if (await portIsHeld(port, host)) {
+    throw Object.assign(new Error("port probe"), { code: "EADDRINUSE" });
   }
   await new Promise((resolve3, reject) => {
     server.once("error", reject);
@@ -1086,7 +1144,11 @@ var WorkspaceYamlEditor = class _WorkspaceYamlEditor {
     const section = this._getAgentConfigSection();
     if (!section) return void 0;
     const node = section.get(profile, true);
-    return isMap(node) ? node.toJSON() : void 0;
+    if (!isMap(node)) return void 0;
+    const profileJson = node.toJSON();
+    const { driver, ...rest } = profileJson;
+    if (driver === void 0) return profileJson;
+    return rest.harness === void 0 && typeof driver === "string" ? { ...rest, harness: driver } : rest;
   }
   /**
    * Set fields on an agent config profile. Merges with existing values —
@@ -1104,6 +1166,11 @@ var WorkspaceYamlEditor = class _WorkspaceYamlEditor {
       section.set(profile, { ...values });
       return;
     }
+    const driverPair = existing.items.find((p) => isScalar(p.key) && p.key.value === "driver");
+    if (driverPair) {
+      if (existing.has("harness")) existing.delete("driver");
+      else driverPair.key.value = "harness";
+    }
     for (const [k, v] of Object.entries(values)) {
       if (v === void 0) continue;
       existing.set(k, v);
@@ -1400,6 +1467,6 @@ var WorkspaceYamlEditor = class _WorkspaceYamlEditor {
   }
 };
 
-export { AGENT_PROMPT_SECTION_ORDER, GLOBAL_INSTALL_DIR_NAME, LOCK_SCHEMA_VERSION, ManifestYamlEditor, PROVIDERS_FILENAME, SETTINGS_DEFAULTS, WorkspaceYamlEditor, aiResourceRoots, applyPatch, buildAgentPromptSections, buildLibraryLockEntries, buildLockFile, capMemoryContent, checkAgentSkillConformance, computeHash, defaultLibraryDir, detectPackageManager, driverSdkMissingError, extractForPatch, findProjectPackageDir, generatePatch, globalInstallDir, globalSettingsPath, holdsWildcard, installCommand, installCommandFor, listPatches, listenWithProbe, loadDriverSdk, loadDriverSdkSubpath, loadProviderRegistry, loadProviderRegistryFile, loadSettings, mapLegacyFields, maskApiKey, mergeLockFile, migrateSettings, needsWildcardProbe, projectSettingsPath, readLock, readPatch, readPluginsLockSlice, renderMemorySection, resolveConfiguredDriverTarget, resolveLibraryDir, resolveSettings, resolveSettingsWithSources, resyncLockSources, savePatch, saveProviderRegistryFile, saveSettings, sdkLookupPlaces, skaileInstallDir, userProviderRegistryPath, verifyLock, verifyLockEntry, walkForSettings, workspaceProviderRegistryPath, writeLock, writePluginsLockSlice };
-//# sourceMappingURL=chunk-T2TQAH2X.js.map
-//# sourceMappingURL=chunk-T2TQAH2X.js.map
+export { AGENT_PROMPT_SECTION_ORDER, GLOBAL_INSTALL_DIR_NAME, LOCK_SCHEMA_VERSION, ManifestYamlEditor, PROVIDERS_FILENAME, SETTINGS_DEFAULTS, WorkspaceYamlEditor, aiResourceRoots, applyPatch, assertLockHashes, buildAgentPromptSections, buildLibraryLockEntries, buildLockFile, capMemoryContent, checkAgentSkillConformance, computeHash, connectProbe, defaultLibraryDir, detectPackageManager, extractForPatch, findProjectPackageDir, generatePatch, globalInstallDir, globalSettingsPath, harnessSdkMissingError, holdsWildcard, installCommand, installCommandFor, listPatches, listenWithProbe, loadHarnessSdk, loadHarnessSdkSubpath, loadProviderRegistry, loadProviderRegistryFile, loadSettings, mapLegacyFields, maskApiKey, mergeLockFile, migrateSettings, needsWildcardProbe, portIsHeld, probeHosts, projectAssetRoots, projectSettingsPath, readLock, readPatch, readPluginsLockSlice, renderMemorySection, resolveConfiguredHarnessName, resolveLibraryDir, resolveSettings, resolveSettingsWithSources, resyncLockSources, savePatch, saveProviderRegistryFile, saveSettings, sdkLookupPlaces, skaileInstallDir, userProviderRegistryPath, verifyLock, verifyLockEntry, walkForSettings, workspaceProviderRegistryPath, writeLock, writePluginsLockSlice };
+//# sourceMappingURL=chunk-L4YKW5AY.js.map
+//# sourceMappingURL=chunk-L4YKW5AY.js.map