@skild/core 0.10.19 → 0.11.0

package/dist/index.d.ts

@@ -67,6 +67,10 @@ interface InstallRecord {
     sourceType: SourceType;
     installedAt: string;
     updatedAt?: string;
+    /**
+     * Derived at runtime from platform/scope/name.
+     * Stored install records omit this field to avoid machine-specific paths.
+     */
     installDir: string;
     contentHash: string;
     hasSkillMd: boolean;
@@ -96,7 +100,7 @@ interface LockEntry {
     registryUrl?: string;
     installedAt: string;
     updatedAt?: string;
-    installDir: string;
+    installDir?: string;
     contentHash: string;
 }
 interface Lockfile {

package/dist/index.js

@@ -95,6 +95,35 @@ function writeJsonFilePrivate(filePath, value) {
   } catch {
   }
 }
+function toPersistedInstallRecord(record) {
+  const { installDir: _installDir, installedDependencies, ...rest } = record;
+  const sanitizedDeps = installedDependencies?.map((dep) => {
+    const { installDir: _depInstallDir, ...depRest } = dep;
+    return depRest;
+  });
+  if (!sanitizedDeps) return rest;
+  return { ...rest, installedDependencies: sanitizedDeps };
+}
+function hydrateInstallRecord(installDir, record) {
+  const hydrated = { ...record, installDir };
+  if (hydrated.installedDependencies?.length) {
+    hydrated.installedDependencies = hydrated.installedDependencies.map((dep) => {
+      if (dep.sourceType === "inline") return dep;
+      return { ...dep, installDir: getSkillInstallDir(hydrated.platform, hydrated.scope, dep.name) };
+    });
+  }
+  return hydrated;
+}
+function toPersistedLockEntry(entry) {
+  const { installDir: _installDir, ...rest } = entry;
+  return rest;
+}
+function sanitizeLockfile(lockfile) {
+  const entries = Object.fromEntries(
+    Object.entries(lockfile.entries).map(([name, entry]) => [name, toPersistedLockEntry(entry)])
+  );
+  return { ...lockfile, entries };
+}
 function loadOrCreateGlobalConfig() {
   const filePath = getGlobalConfigPath();
   const existing = readJsonFile(filePath);
@@ -121,7 +150,7 @@ function loadLockfile(lockPath) {
   return readJsonFile(lockPath);
 }
 function saveLockfile(lockPath, lockfile) {
-  writeJsonFile(lockPath, lockfile);
+  writeJsonFile(lockPath, sanitizeLockfile(lockfile));
 }
 function getLockPath(scope) {
   return scope === "project" ? getProjectLockPath() : getGlobalLockPath();
@@ -136,7 +165,7 @@ function loadOrCreateLockfile(scope) {
 }
 function upsertLockEntry(scope, entry) {
   const lockfile = loadOrCreateLockfile(scope);
-  lockfile.entries[entry.name] = entry;
+  lockfile.entries[entry.name] = toPersistedLockEntry(entry);
   lockfile.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
   saveLockfile(getLockPath(scope), lockfile);
 }
@@ -148,12 +177,14 @@ function removeLockEntry(scope, name) {
 }
 function readInstallRecord(installDir) {
   const filePath = getSkillInstallRecordPath(installDir);
-  return readJsonFile(filePath);
+  const record = readJsonFile(filePath);
+  if (!record) return null;
+  return hydrateInstallRecord(installDir, record);
 }
 function writeInstallRecord(installDir, record) {
   ensureDir(getSkillMetadataDir(installDir));
   const filePath = getSkillInstallRecordPath(installDir);
-  writeJsonFile(filePath, record);
+  writeJsonFile(filePath, toPersistedInstallRecord(record));
 }
 
 // src/skill.ts
@@ -300,6 +331,7 @@ import fs6 from "fs";
 import os2 from "os";
 import path7 from "path";
 import degit from "degit";
+import simpleGit from "simple-git";
 
 // src/source.ts
 import path6 from "path";
@@ -460,6 +492,81 @@ function resetTargetDir(targetPath) {
   removeDir(targetPath);
   fs6.mkdirSync(targetPath, { recursive: true });
 }
+function splitSourceRef(source) {
+  const [base, ref] = source.split("#", 2);
+  return { base, ref: ref?.trim() || void 0 };
+}
+function parseGitCloneSpec(source) {
+  const trimmed = source.trim();
+  if (!trimmed) return null;
+  if (resolveLocalPath(trimmed)) return null;
+  const { base, ref } = splitSourceRef(trimmed);
+  const githubTreeWithPathMatch = base.match(/github\.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)\/(.+)/);
+  if (githubTreeWithPathMatch) {
+    const [, owner, repo, branch, subpath] = githubTreeWithPathMatch;
+    return { url: `https://github.com/${owner}/${repo}.git`, ref: branch, subpath };
+  }
+  const githubTreeMatch = base.match(/github\.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)$/);
+  if (githubTreeMatch) {
+    const [, owner, repo, branch] = githubTreeMatch;
+    return { url: `https://github.com/${owner}/${repo}.git`, ref: branch };
+  }
+  const githubRepoMatch = base.match(/github\.com\/([^/]+)\/([^/]+)/);
+  if (githubRepoMatch) {
+    const [, owner, repoRaw] = githubRepoMatch;
+    const repo = repoRaw.replace(/\.git$/, "");
+    return { url: `https://github.com/${owner}/${repo}.git`, ref };
+  }
+  const gitlabTreeWithPathMatch = base.match(/gitlab\.com\/([^/]+)\/([^/]+)\/-\/tree\/([^/]+)\/(.+)/);
+  if (gitlabTreeWithPathMatch) {
+    const [, owner, repo, branch, subpath] = gitlabTreeWithPathMatch;
+    return { url: `https://gitlab.com/${owner}/${repo}.git`, ref: branch, subpath };
+  }
+  const gitlabTreeMatch = base.match(/gitlab\.com\/([^/]+)\/([^/]+)\/-\/tree\/([^/]+)$/);
+  if (gitlabTreeMatch) {
+    const [, owner, repo, branch] = gitlabTreeMatch;
+    return { url: `https://gitlab.com/${owner}/${repo}.git`, ref: branch };
+  }
+  const gitlabRepoMatch = base.match(/gitlab\.com\/([^/]+)\/([^/]+)/);
+  if (gitlabRepoMatch) {
+    const [, owner, repoRaw] = gitlabRepoMatch;
+    const repo = repoRaw.replace(/\.git$/, "");
+    return { url: `https://gitlab.com/${owner}/${repo}.git`, ref };
+  }
+  const shorthandMatch = base.match(/^([^/]+)\/([^/]+)(?:\/(.+))?$/);
+  if (shorthandMatch && !base.includes(":") && !base.startsWith(".") && !base.startsWith("/")) {
+    const [, owner, repo, subpath] = shorthandMatch;
+    return { url: `https://github.com/${owner}/${repo}.git`, ref, subpath };
+  }
+  if (/^(https?:|git@|ssh:)/i.test(base)) {
+    return { url: base, ref };
+  }
+  return null;
+}
+async function cloneWithGit(spec, targetPath) {
+  const cloneOptions = spec.ref ? ["--depth", "1", "--branch", spec.ref] : ["--depth", "1"];
+  const git = simpleGit();
+  if (!spec.subpath) {
+    resetTargetDir(targetPath);
+    await git.clone(spec.url, targetPath, cloneOptions);
+    return spec.url;
+  }
+  const tempRoot = createTempDir(path7.join(os2.tmpdir(), "skild-git"), extractSkillName(spec.url));
+  try {
+    await git.clone(spec.url, tempRoot, cloneOptions);
+    const resolvedSubpath = path7.resolve(tempRoot, spec.subpath);
+    const resolvedRoot = path7.resolve(tempRoot);
+    if (!resolvedSubpath.startsWith(`${resolvedRoot}${path7.sep}`)) {
+      throw new SkildError("INVALID_SOURCE", `Subpath escapes repository root: ${spec.subpath}`, { subpath: spec.subpath });
+    }
+    ensureInstallableDir(resolvedSubpath);
+    resetTargetDir(targetPath);
+    copyDir(resolvedSubpath, targetPath);
+    return spec.url;
+  } finally {
+    removeDir(tempRoot);
+  }
+}
 async function cloneRemote(degitSrc, targetPath, mode) {
   const emitter = degit(degitSrc, { force: true, verbose: false, mode });
   await emitter.clone(targetPath);
@@ -512,6 +619,14 @@ async function materializeSourceToDir(input) {
     copyDir(localPath, targetDir);
     return { sourceType: "local", materializedFrom: localPath };
   }
+  const gitSpec = parseGitCloneSpec(input.source);
+  if (gitSpec) {
+    try {
+      const materializedFrom2 = await cloneWithGit(gitSpec, targetDir);
+      return { sourceType, materializedFrom: materializedFrom2 };
+    } catch {
+    }
+  }
   const degitPath = toDegitPath(input.source);
   const materializedFrom = await cloneRemoteWithFallback(degitPath, targetDir);
   return { sourceType, materializedFrom };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skild/core",
-  "version": "0.10.19",
+  "version": "0.11.0",
   "description": "Skild core library (headless) for installing, validating, and managing Agent Skills locally.",
   "type": "module",
   "main": "./dist/index.js",
@@ -20,6 +20,7 @@
     "degit": "^2.8.4",
     "js-yaml": "^4.1.0",
     "semver": "^7.6.3",
+    "simple-git": "^3.27.0",
     "tar": "^7.4.3"
   },
   "devDependencies": {