@localskills/cli 0.12.0 → 0.12.1

package/dist/index.js

@@ -1144,7 +1144,7 @@ ${l}
 } }).prompt();
 
 // src/lib/config.ts
-import { readFileSync, writeFileSync, mkdirSync, existsSync, chmodSync, copyFileSync } from "fs";
+import { readFileSync, writeFileSync, mkdirSync, existsSync, chmodSync, copyFileSync, renameSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
 var CONFIG_DIR = join(homedir(), ".localskills");
@@ -1214,6 +1214,21 @@ function validateV3(config) {
   if (!config.profiles[DEFAULT_PROFILE_NAME]) {
     config.profiles[DEFAULT_PROFILE_NAME] = { ...DEFAULT_PROFILE, installed_skills: {} };
   }
+  for (const name of Object.keys(config.profiles)) {
+    const profile = config.profiles[name];
+    if (!profile || typeof profile !== "object") {
+      config.profiles[name] = { ...DEFAULT_PROFILE, installed_skills: {} };
+      continue;
+    }
+    if (!profile.installed_skills || typeof profile.installed_skills !== "object") {
+      profile.installed_skills = {};
+    }
+    if (!profile.defaults || typeof profile.defaults !== "object") {
+      profile.defaults = { ...DEFAULT_PROFILE.defaults };
+    }
+    if (profile.token === void 0) profile.token = null;
+    if (profile.anonymous_key === void 0) profile.anonymous_key = null;
+  }
   if (!config.active_profile || !config.profiles[config.active_profile]) {
     config.active_profile = DEFAULT_PROFILE_NAME;
   }
@@ -1266,9 +1281,11 @@ function loadFullConfig() {
 }
 function saveFullConfig(config) {
   mkdirSync(CONFIG_DIR, { recursive: true, mode: 448 });
-  writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2) + "\n", {
+  const tmpPath = `${CONFIG_PATH}.${process.pid}.tmp`;
+  writeFileSync(tmpPath, JSON.stringify(config, null, 2) + "\n", {
     mode: 384
   });
+  renameSync(tmpPath, CONFIG_PATH);
   try {
     chmodSync(CONFIG_DIR, 448);
     chmodSync(CONFIG_PATH, 384);
@@ -1349,6 +1366,13 @@ function migrateV2toV3(v2) {
     }
   };
 }
+function resolveInstalledSkillKey(config, ref) {
+  if (config.installed_skills[ref]) return ref;
+  for (const [key, record] of Object.entries(config.installed_skills)) {
+    if (record.slug === ref) return key;
+  }
+  return null;
+}
 function getToken() {
   return loadConfig().token;
 }
@@ -1616,7 +1640,7 @@ var whoamiCommand = new Command("whoami").description("Show current user info").
 // src/commands/install.ts
 import { Command as Command2 } from "commander";
 import { mkdirSync as mkdirSync7, rmSync as rmSync4, cpSync } from "fs";
-import { dirname as dirname5 } from "path";
+import { dirname as dirname5, resolve as resolvePathAbs } from "path";
 
 // ../../packages/shared/dist/utils/semver.js
 var SEMVER_RE = /^\d+\.\d+\.\d+$/;
@@ -1669,14 +1693,17 @@ function requireAuth(client) {
   }
 }
 function buildVersionQuery(range) {
-  if (!range) return "";
+  if (!range || range === "latest") return "";
   if (isValidSemVer(range)) {
     return `?semver=${encodeURIComponent(range)}`;
   }
   if (isValidSemVerRange(range)) {
     return `?range=${encodeURIComponent(range)}`;
   }
-  console.error(`Invalid version specifier: ${range}`);
+  console.error(
+    `Invalid version specifier: ${range}
+Expected an exact version (1.2.3), a range (^1.2.3, ~1.2.3, >=1.2.3), "*", or "latest".`
+  );
   process.exit(1);
 }
 function formatVersionLabel(semver, version2) {
@@ -1703,14 +1730,17 @@ import { join as join13, resolve as resolve3 } from "path";
 import { homedir as homedir8 } from "os";
 
 // src/lib/installers/cursor.ts
-import { existsSync as existsSync4 } from "fs";
+import { existsSync as existsSync5 } from "fs";
 import { join as join3 } from "path";
 import { homedir as homedir2 } from "os";
 
 // src/lib/content-transform.ts
 function yamlEscape(value) {
-  if (value.includes(":") || value.includes("#") || value.includes('"') || value.includes("'") || value.startsWith("{") || value.startsWith("[")) {
-    return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+  const needsQuoting = /[\r\n:#"']/.test(value) || // structural characters anywhere
+  /^[\s\-?*&!|>%@`{[\]}]/.test(value) || // YAML indicator at the start
+  /\s$/.test(value);
+  if (needsQuoting) {
+    return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\r/g, "\\r").replace(/\n/g, "\\n")}"`;
   }
   return value;
 }
@@ -1745,7 +1775,7 @@ function stripFrontmatter(content) {
 }
 
 // src/lib/installers/common.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync3, writeFileSync as writeFileSync2, unlinkSync as unlinkSync2 } from "fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync4, writeFileSync as writeFileSync3, unlinkSync as unlinkSync2 } from "fs";
 import { join as join2 } from "path";
 
 // src/lib/symlink.ts
@@ -1799,6 +1829,61 @@ function isSymlinkInto(linkPath, dir) {
   }
 }
 
+// src/lib/marked-sections.ts
+import { existsSync as existsSync3, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
+import { dirname as dirname2 } from "path";
+var START_MARKER = (slug) => `<!-- localskills:start:${slug} -->`;
+var END_MARKER = (slug) => `<!-- localskills:end:${slug} -->`;
+function upsertSection(filePath, slug, content) {
+  mkdirSync3(dirname2(filePath), { recursive: true });
+  let existing = "";
+  if (existsSync3(filePath)) {
+    existing = readFileSync2(filePath, "utf-8");
+  }
+  const start = START_MARKER(slug);
+  const end = END_MARKER(slug);
+  const section = `${start}
+${content}
+${end}`;
+  const startIdx = existing.indexOf(start);
+  const endIdx = startIdx === -1 ? -1 : existing.indexOf(end, startIdx + start.length);
+  let result;
+  if (startIdx !== -1 && endIdx !== -1) {
+    result = existing.slice(0, startIdx) + section + existing.slice(endIdx + end.length);
+  } else {
+    const separator = existing.length > 0 && !existing.endsWith("\n\n") ? "\n\n" : "";
+    result = existing + separator + section + "\n";
+  }
+  writeFileSync2(filePath, result);
+}
+function removeSection(filePath, slug) {
+  if (!existsSync3(filePath)) return false;
+  const existing = readFileSync2(filePath, "utf-8");
+  const start = START_MARKER(slug);
+  const end = END_MARKER(slug);
+  const startIdx = existing.indexOf(start);
+  const endIdx = startIdx === -1 ? -1 : existing.indexOf(end, startIdx + start.length);
+  if (startIdx === -1 || endIdx === -1) return false;
+  let before = existing.slice(0, startIdx);
+  let after = existing.slice(endIdx + end.length);
+  while (before.endsWith("\n\n")) before = before.slice(0, -1);
+  while (after.startsWith("\n\n")) after = after.slice(1);
+  const result = (before + after).trim();
+  writeFileSync2(filePath, result ? result + "\n" : "");
+  return true;
+}
+function listSections(filePath) {
+  if (!existsSync3(filePath)) return [];
+  const content = readFileSync2(filePath, "utf-8");
+  const regex = /<!-- localskills:start:(.+?) -->/g;
+  const slugs = [];
+  let match;
+  while ((match = regex.exec(content)) !== null) {
+    slugs.push(match[1]);
+  }
+  return slugs;
+}
+
 // src/lib/installers/common.ts
 function safeSlugName(slug) {
   return slug.replace(/\//g, "-");
@@ -1808,18 +1893,26 @@ function installFileOrSymlink(opts, targetPath) {
   if (opts.method === "symlink") {
     createSymlink(opts.cachePath, targetPath);
   } else {
-    mkdirSync3(join2(targetPath, ".."), { recursive: true });
-    writeFileSync2(targetPath, opts.content);
+    mkdirSync4(join2(targetPath, ".."), { recursive: true });
+    removeSymlink(targetPath);
+    writeFileSync3(targetPath, opts.content);
   }
   return targetPath;
 }
 function uninstallFile(installation) {
   if (installation.method === "symlink") {
     removeSymlink(installation.path);
-  } else if (existsSync3(installation.path)) {
+  } else if (existsSync4(installation.path)) {
     unlinkSync2(installation.path);
   }
 }
+function installationIntact(installation, slug) {
+  if (!existsSync4(installation.path)) return false;
+  if (installation.method === "section") {
+    return listSections(installation.path).includes(slug);
+  }
+  return true;
+}
 function defaultTransformContent(content) {
   return toPlainMD(content);
 }
@@ -1837,8 +1930,8 @@ function detect(projectDir) {
   const home = homedir2();
   const cwd = projectDir || process.cwd();
   return {
-    global: existsSync4(join3(home, ".cursor")),
-    project: existsSync4(join3(cwd, ".cursor"))
+    global: existsSync5(join3(home, ".cursor")),
+    project: existsSync5(join3(cwd, ".cursor"))
   };
 }
 function resolvePath(slug, scope, projectDir, _contentType) {
@@ -1873,7 +1966,7 @@ var cursorAdapter = {
 };
 
 // src/lib/installers/claude.ts
-import { existsSync as existsSync5, rmSync as rmSync2, statSync, readdirSync } from "fs";
+import { existsSync as existsSync6, rmSync as rmSync2, statSync, readdirSync } from "fs";
 import { join as join4 } from "path";
 import { homedir as homedir3 } from "os";
 var descriptor2 = {
@@ -1888,8 +1981,8 @@ function detect2(projectDir) {
   const home = homedir3();
   const cwd = projectDir || process.cwd();
   return {
-    global: existsSync5(join4(home, ".claude")),
-    project: existsSync5(join4(cwd, ".claude"))
+    global: existsSync6(join4(home, ".claude")),
+    project: existsSync6(join4(cwd, ".claude"))
   };
 }
 function claudeBase(scope, projectDir) {
@@ -1920,7 +2013,7 @@ function uninstall2(installation, _slug) {
   const target = installation.path;
   if (isSymlink(target)) {
     removeSymlink(target);
-  } else if (existsSync5(target)) {
+  } else if (existsSync6(target)) {
     if (statSync(target).isDirectory()) {
       rmSync2(target, { recursive: true, force: true });
     } else {
@@ -1929,7 +2022,7 @@ function uninstall2(installation, _slug) {
   }
   const parentDir = join4(target, "..");
   try {
-    if (existsSync5(parentDir) && readdirSync(parentDir).length === 0) {
+    if (existsSync6(parentDir) && readdirSync(parentDir).length === 0) {
       rmSync2(parentDir, { recursive: true });
     }
   } catch {
@@ -1954,13 +2047,14 @@ import { join as join6 } from "path";
 import { homedir as homedir5 } from "os";
 
 // src/lib/detect.ts
-import { existsSync as existsSync6 } from "fs";
+import { existsSync as existsSync7 } from "fs";
 import { execFileSync } from "child_process";
 import { homedir as homedir4 } from "os";
 import { join as join5 } from "path";
 function commandExists(cmd) {
   try {
-    execFileSync("which", [cmd], { stdio: "ignore" });
+    const finder = process.platform === "win32" ? "where" : "which";
+    execFileSync(finder, [cmd], { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -1970,76 +2064,21 @@ function detectInstalledPlatforms(projectDir) {
   const detected = [];
   const home = homedir4();
   const cwd = projectDir || process.cwd();
-  if (existsSync6(join5(home, ".cursor")) || existsSync6(join5(cwd, ".cursor")))
+  if (existsSync7(join5(home, ".cursor")) || existsSync7(join5(cwd, ".cursor")))
     detected.push("cursor");
-  if (existsSync6(join5(home, ".claude")) || commandExists("claude"))
+  if (existsSync7(join5(home, ".claude")) || commandExists("claude"))
     detected.push("claude");
   if (commandExists("codex")) detected.push("codex");
-  if (existsSync6(join5(home, ".codeium")) || existsSync6(join5(cwd, ".windsurf")))
+  if (existsSync7(join5(home, ".codeium")) || existsSync7(join5(cwd, ".windsurf")))
     detected.push("windsurf");
-  if (existsSync6(join5(cwd, ".clinerules"))) detected.push("cline");
-  if (existsSync6(join5(cwd, ".github"))) detected.push("copilot");
-  if (commandExists("opencode") || existsSync6(join5(cwd, ".opencode")))
+  if (existsSync7(join5(cwd, ".clinerules"))) detected.push("cline");
+  if (existsSync7(join5(cwd, ".github"))) detected.push("copilot");
+  if (commandExists("opencode") || existsSync7(join5(cwd, ".opencode")))
     detected.push("opencode");
   if (commandExists("aider")) detected.push("aider");
   return detected;
 }
 
-// src/lib/marked-sections.ts
-import { existsSync as existsSync7, readFileSync as readFileSync2, writeFileSync as writeFileSync3, mkdirSync as mkdirSync4 } from "fs";
-import { dirname as dirname2 } from "path";
-var START_MARKER = (slug) => `<!-- localskills:start:${slug} -->`;
-var END_MARKER = (slug) => `<!-- localskills:end:${slug} -->`;
-function upsertSection(filePath, slug, content) {
-  mkdirSync4(dirname2(filePath), { recursive: true });
-  let existing = "";
-  if (existsSync7(filePath)) {
-    existing = readFileSync2(filePath, "utf-8");
-  }
-  const start = START_MARKER(slug);
-  const end = END_MARKER(slug);
-  const section = `${start}
-${content}
-${end}`;
-  const startIdx = existing.indexOf(start);
-  const endIdx = existing.indexOf(end);
-  let result;
-  if (startIdx !== -1 && endIdx !== -1) {
-    result = existing.slice(0, startIdx) + section + existing.slice(endIdx + end.length);
-  } else {
-    const separator = existing.length > 0 && !existing.endsWith("\n\n") ? "\n\n" : "";
-    result = existing + separator + section + "\n";
-  }
-  writeFileSync3(filePath, result);
-}
-function removeSection(filePath, slug) {
-  if (!existsSync7(filePath)) return false;
-  const existing = readFileSync2(filePath, "utf-8");
-  const start = START_MARKER(slug);
-  const end = END_MARKER(slug);
-  const startIdx = existing.indexOf(start);
-  const endIdx = existing.indexOf(end);
-  if (startIdx === -1 || endIdx === -1) return false;
-  let before = existing.slice(0, startIdx);
-  let after = existing.slice(endIdx + end.length);
-  while (before.endsWith("\n\n")) before = before.slice(0, -1);
-  while (after.startsWith("\n\n")) after = after.slice(1);
-  const result = (before + after).trim();
-  writeFileSync3(filePath, result ? result + "\n" : "");
-  return true;
-}
-function listSections(filePath) {
-  if (!existsSync7(filePath)) return [];
-  const content = readFileSync2(filePath, "utf-8");
-  const regex = /<!-- localskills:start:(.+?) -->/g;
-  const slugs = [];
-  let match;
-  while ((match = regex.exec(content)) !== null) {
-    slugs.push(match[1]);
-  }
-  return slugs;
-}
-
 // src/lib/installers/codex.ts
 var descriptor3 = {
   id: "codex",
@@ -2474,6 +2513,16 @@ function getPlatformFile(slug, platform, skill) {
   writeFileSync6(filePath, transformed);
   return filePath;
 }
+function regenerateTextPlatformFiles(slug, installations, skill) {
+  for (const inst of installations) {
+    if ((inst.format ?? "text") !== "text") continue;
+    if (inst.method !== "symlink") continue;
+    try {
+      getPlatformFile(slug, inst.platform, skill);
+    } catch {
+    }
+  }
+}
 function getRawContent(slug) {
   const filePath = join13(getCacheDir(slug), "raw.md");
   if (!existsSync13(filePath)) return null;
@@ -2607,13 +2656,14 @@ async function interactiveTargets(detectedPlatforms) {
   }));
   return { platforms, scope, method };
 }
-async function interactiveUninstall(installedSlugs) {
+async function interactiveUninstall(installedSkills) {
   We("localskills uninstall");
   return cancelGuard(await Je({
     message: "Which skill would you like to uninstall?",
-    options: installedSlugs.map((s) => ({
-      value: s,
-      label: s
+    options: Object.entries(installedSkills).map(([key, record]) => ({
+      value: key,
+      label: record.name || record.slug || key,
+      hint: record.slug && record.slug !== key ? record.slug : void 0
     }))
   }));
 }
@@ -2653,7 +2703,9 @@ function parsePlatforms(raw) {
 }
 function buildSkillRecord(cacheKey, skill, version2, resolvedSemver, requestedRange, existingInstallations, newInstallations) {
   return {
-    slug: cacheKey,
+    // The human slug (when known), so `uninstall`/`pull <slug>` can resolve
+    // records that are keyed by publicId.
+    slug: skill.slug ?? cacheKey,
     name: skill.name,
     type: skill.type ?? "skill",
     hash: skill.contentHash,
@@ -2701,7 +2753,7 @@ var installCommand = new Command2("install").description("Install a skill locall
     let method;
     let projectDir;
     if (typeof opts.project === "string") {
-      projectDir = opts.project;
+      projectDir = resolvePathAbs(opts.project);
     }
     const explicitPlatforms = parsePlatforms(opts.target);
     const explicitScope = opts.global ? "global" : opts.project !== void 0 ? "project" : null;
@@ -2718,7 +2770,12 @@ var installCommand = new Command2("install").description("Install a skill locall
       spinner2.start("Fetching available skills...");
       const res2 = await client.get("/api/skills");
       spinner2.stop("Fetched skills.");
-      if (!res2.success || !res2.data || res2.data.length === 0) {
+      if (!res2.success || !res2.data) {
+        console.error(`Error: ${res2.error || "Failed to fetch skills."}`);
+        process.exit(1);
+        return;
+      }
+      if (res2.data.length === 0) {
         console.error("No skills available.");
         process.exit(1);
         return;
@@ -2747,6 +2804,9 @@ var installCommand = new Command2("install").description("Install a skill locall
       const atIdx = slug.lastIndexOf("@");
       requestedRange = slug.substring(atIdx + 1);
       slug = slug.substring(0, atIdx);
+      if (requestedRange === "" || requestedRange === "latest") {
+        requestedRange = null;
+      }
     }
     const versionQuery = buildVersionQuery(requestedRange);
     const spinner = bt2();
@@ -2866,6 +2926,11 @@ var installCommand = new Command2("install").description("Install a skill locall
     const { skill, content, version: version2, semver: resolvedSemver } = resData;
     spinner.stop(`Fetched ${skill.name} ${formatVersionLabel(resolvedSemver, version2)}`);
     store(cacheKey, content, skill, version2);
+    regenerateTextPlatformFiles(
+      cacheKey,
+      config.installed_skills[cacheKey]?.installations ?? [],
+      skill
+    );
     const contentType = skill.type ?? "skill";
     const installations = [];
     const results = [];
@@ -2918,6 +2983,11 @@ var installCommand = new Command2("install").description("Install a skill locall
       const methodLabel = actualMethod === "symlink" ? "symlinked" : actualMethod === "section" ? "section" : "copied";
       results.push(`${desc.name} \u2192 ${installedPath} (${methodLabel})`);
     }
+    if (installations.length === 0) {
+      R2.error("Nothing was installed \u2014 no selected platform supports this scope.");
+      process.exit(1);
+      return;
+    }
     config.installed_skills[cacheKey] = buildSkillRecord(
       cacheKey,
       skill,
@@ -2939,25 +3009,26 @@ var installCommand = new Command2("install").description("Install a skill locall
 import { Command as Command3 } from "commander";
 var uninstallCommand = new Command3("uninstall").description("Uninstall a skill").argument("[slug]", "Skill slug (omit for interactive selection)").option("--purge", "Also remove from cache").action(async (slugArg, opts) => {
   const config = loadConfig();
-  const installedSlugs = Object.keys(config.installed_skills);
-  if (installedSlugs.length === 0) {
+  if (Object.keys(config.installed_skills).length === 0) {
     console.log("No installed skills.");
     return;
   }
   let slug;
   if (slugArg) {
-    slug = slugArg;
+    const resolved = resolveInstalledSkillKey(config, slugArg);
+    if (!resolved) {
+      console.error(`Skill "${slugArg}" is not installed.`);
+      process.exit(1);
+      return;
+    }
+    slug = resolved;
   } else {
-    slug = await interactiveUninstall(installedSlugs);
+    slug = await interactiveUninstall(config.installed_skills);
   }
   const installed = config.installed_skills[slug];
-  if (!installed) {
-    console.error(`Skill "${slug}" is not installed.`);
-    process.exit(1);
-    return;
-  }
   We(`localskills uninstall ${slug}`);
   let removed = 0;
+  const failed = [];
   for (const installation of installed.installations) {
     try {
       const adapter = getAdapter(installation.platform);
@@ -2970,13 +3041,26 @@ var uninstallCommand = new Command3("uninstall").description("Uninstall a skill"
       R2.warn(
         `${installation.platform} \u2014 failed to remove: ${err instanceof Error ? err.message : String(err)}`
       );
+      failed.push(installation);
     }
   }
-  delete config.installed_skills[slug];
+  if (failed.length === 0) {
+    delete config.installed_skills[slug];
+  } else {
+    installed.installations = failed;
+    R2.warn(
+      `${failed.length} target(s) could not be removed and remain tracked. Fix the issue and run \`localskills uninstall ${slug}\` again.`
+    );
+    process.exitCode = 1;
+  }
   saveConfig(config);
   if (opts?.purge) {
-    purge(slug);
-    R2.info("Cache purged.");
+    if (failed.length === 0) {
+      purge(slug);
+      R2.info("Cache purged.");
+    } else {
+      R2.warn("Skipped cache purge because some targets could not be removed.");
+    }
   }
   Le(
     `Uninstalled ${slug} from ${removed} target(s).`
@@ -3079,7 +3163,18 @@ function installedAsPackage(inst) {
 }
 var pullCommand = new Command5("pull").description("Pull latest versions of all installed skills").argument("[slug]", "Pull a specific skill (omit for all)").action(async (slugArg) => {
   const config = loadConfig();
-  const slugs = slugArg ? [slugArg] : Object.keys(config.installed_skills);
+  let slugs;
+  if (slugArg) {
+    const resolved = resolveInstalledSkillKey(config, slugArg);
+    if (!resolved) {
+      console.error(`Skill "${slugArg}" is not installed.`);
+      process.exit(1);
+      return;
+    }
+    slugs = [resolved];
+  } else {
+    slugs = Object.keys(config.installed_skills);
+  }
   if (slugs.length === 0) {
     console.log("No installed skills. Use `localskills install` first.");
     return;
@@ -3108,9 +3203,16 @@ var pullCommand = new Command5("pull").description("Pull latest versions of all
     const format = resData.format ?? "text";
     const { skill, version: version2 } = resData;
     if (skill.contentHash === installed.hash) {
-      spinner.stop(`${slug} \u2014 up to date`);
-      skipped++;
-      continue;
+      const broken = installed.installations.some(
+        (inst) => !installationIntact(inst, slug)
+      );
+      if (!broken) {
+        spinner.stop(`${slug} \u2014 up to date`);
+        skipped++;
+        continue;
+      }
+      spinner.stop(`${slug} \u2014 content unchanged but installation broken, repairing...`);
+      spinner.start(`Repairing ${slug}...`);
     }
     let allHandled = true;
     if (format === "package") {
@@ -3193,7 +3295,17 @@ var pullCommand = new Command5("pull").description("Pull latest versions of all
             continue;
           }
           if (installation.method === "symlink") {
-            getPlatformFile(slug, installation.platform, skill);
+            const cachePath = getPlatformFile(slug, installation.platform, skill);
+            const installedPath = adapter.install({
+              slug,
+              content: transformed,
+              scope: installation.scope,
+              method: "symlink",
+              cachePath,
+              projectDir: installation.projectDir,
+              contentType: skill.type
+            });
+            installation.path = installedPath;
             installation.format = "text";
             continue;
           }
@@ -3614,7 +3726,12 @@ var publishCommand = new Command6("publish").description("Publish local skills t
     const client = new ApiClient();
     requireAuth(client);
     const teamsRes = await client.get("/api/tenants");
-    if (!teamsRes.success || !teamsRes.data || teamsRes.data.length === 0) {
+    if (!teamsRes.success || !teamsRes.data) {
+      console.error(`Error: ${teamsRes.error || "Failed to fetch your teams."}`);
+      process.exit(1);
+      return;
+    }
+    if (teamsRes.data.length === 0) {
       console.error(
         "No teams found. Create a team at localskills.sh first."
       );
@@ -3940,6 +4057,7 @@ var shareCommand = new Command8("share").description("Share a skill anonymously
   }
   await ensureAnonymousIdentity();
   const client = new ApiClient();
+  const tenantId = await resolveShareTenant(client);
   if (fileArg) {
     const filePath = resolve6(fileArg);
     if (!existsSync17(filePath)) {
@@ -3952,7 +4070,8 @@ var shareCommand = new Command8("share").description("Share a skill anonymously
       const ok2 = await uploadAnonymousPackage(client, {
         name: skillName2,
         dir: filePath,
-        type: contentType2
+        type: contentType2,
+        tenantId
       });
       Le(ok2 ? "Done!" : "Share failed.");
       if (!ok2) process.exit(1);
@@ -3968,7 +4087,7 @@ var shareCommand = new Command8("share").description("Share a skill anonymously
     const defaultName = titleFromSlug(defaultSlug);
     const skillName = opts.name || defaultName;
     const contentType = opts.type === "rule" ? "rule" : "skill";
-    const ok = await uploadAnonymousSkill(client, { name: skillName, content, type: contentType });
+    const ok = await uploadAnonymousSkill(client, { name: skillName, content, type: contentType, tenantId });
     Le(ok ? "Done!" : "Share failed.");
     if (!ok) process.exit(1);
     return;
@@ -4008,11 +4127,13 @@ var shareCommand = new Command8("share").description("Share a skill anonymously
     const ok = selected.format === "package" && selected.dir ? await uploadAnonymousPackage(client, {
       name,
       dir: selected.dir,
-      type: selected.contentType
+      type: selected.contentType,
+      tenantId
     }) : await uploadAnonymousSkill(client, {
       name,
       content: selected.content,
-      type: selected.contentType
+      type: selected.contentType,
+      tenantId
     });
     Le(ok ? "Done!" : "Share failed.");
     if (!ok) process.exit(1);
@@ -4060,19 +4181,36 @@ async function ensureAnonymousIdentity() {
   setToken(res.data.token);
   s.stop(`Connected as ${res.data.username}`);
 }
-async function uploadAnonymousSkill(client, params) {
+async function resolveShareTenant(client) {
   const s = bt2();
-  s.start(`Sharing "${params.name}"...`);
+  s.start("Looking up your team...");
   const teamsRes = await client.get("/api/tenants");
   if (!teamsRes.success || !teamsRes.data || teamsRes.data.length === 0) {
-    s.stop("Failed to find your team. Try running `localskills share` again.");
+    s.stop(
+      `Failed to find your team: ${teamsRes.error || "no teams"}. Try running \`localskills share\` again.`
+    );
     process.exit(1);
   }
-  const tenantId = teamsRes.data[0].id;
+  const teams = teamsRes.data;
+  if (teams.length === 1) {
+    s.stop("Team found.");
+    return teams[0].id;
+  }
+  s.stop(`You belong to ${teams.length} teams.`);
+  return cancelGuard(
+    await Je({
+      message: "Share under which team?",
+      options: teams.map((t) => ({ value: t.id, label: t.name, hint: t.slug }))
+    })
+  );
+}
+async function uploadAnonymousSkill(client, params) {
+  const s = bt2();
+  s.start(`Sharing "${params.name}"...`);
   const res = await client.post("/api/skills", {
     name: params.name,
     content: params.content,
-    tenantId,
+    tenantId: params.tenantId,
     visibility: "unlisted",
     type: params.type
   });
@@ -4096,16 +4234,9 @@ async function uploadAnonymousPackage(client, params) {
   }
   for (const w of packed.warnings) R2.warn(w);
   s.start(`Sharing "${params.name}" (${packed.fileCount} files)...`);
-  const teamsRes = await client.get("/api/tenants");
-  if (!teamsRes.success || !teamsRes.data || teamsRes.data.length === 0) {
-    s.stop("Failed to find your team. Try running `localskills share` again.");
-    process.exit(1);
-    return false;
-  }
-  const tenantId = teamsRes.data[0].id;
   const form = new FormData();
   form.append("name", params.name);
-  form.append("tenantId", tenantId);
+  form.append("tenantId", params.tenantId);
   form.append("visibility", "unlisted");
   form.append("type", params.type);
   form.append("file", zipBlob(packed.zip), "skill.zip");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localskills/cli",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "CLI for localskills.sh — install agent skills locally",
   "type": "module",
   "bin": {