@cli-skill/cli 0.0.1-beta-d3a2d41 → 0.0.1-beta-16d46c3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cli-skill/cli",
-  "version": "0.0.1-beta-d3a2d41",
+  "version": "0.0.1-beta-16d46c3",
   "type": "module",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -18,7 +18,7 @@
     "check": "tsc --noEmit -p tsconfig.json"
   },
   "dependencies": {
-    "@cli-skill/core": "^0.0.1-beta-d3a2d41",
+    "@cli-skill/core": "^0.0.1-beta-16d46c3",
     "cac": "^6.7.14",
     "lodash": "^4.17.21"
   }

package/src/app.ts

@@ -9,7 +9,7 @@ import { registerListCommand } from "./commands/list";
 import { registerPublishCommand } from "./commands/publish";
 import { registerUninstallCommand } from "./commands/uninstall";
 
-export function createApp() {
+export function createApp(version: string) {
   const cli = cac("cli-skill");
 
   registerCreateCommand(cli);
@@ -23,6 +23,6 @@ export function createApp() {
   registerPublishCommand(cli);
 
   cli.help();
-  cli.version("0.1.0");
+  cli.version(version);
   return cli;
 }

package/src/constants.ts

@@ -1,10 +1,20 @@
 import path from "node:path";
+import { access } from "node:fs/promises";
 import { getResolvedBrowserSkillCliConfig } from "./config";
 
 export const LOCAL_CORE_PACKAGE_PATH = path.resolve(import.meta.dirname, "../../core");
 export const LOCAL_TEMPLATE_PACKAGE_PATH = path.resolve(import.meta.dirname, "../../templates");
 export const DEFAULT_TEMPLATE_NAME = "basic";
 
+export async function hasLocalTemplatesPackage(): Promise<boolean> {
+  try {
+    await access(path.join(LOCAL_TEMPLATE_PACKAGE_PATH, "package.json"));
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export async function getDefaultSkillsRoot(): Promise<string> {
   const config = await getResolvedBrowserSkillCliConfig();
   return config.skillsRoot;

package/src/index.ts

@@ -1,10 +1,11 @@
 import { createApp } from "./app";
 import { ensureBrowserSkillCliConfig } from "./config";
+import { getCliVersion } from "./version";
 export { createSkillProject } from "./project";
 
 async function main(argv = process.argv.slice(2)): Promise<void> {
   await ensureBrowserSkillCliConfig();
-  const cli = createApp();
+  const cli = createApp(await getCliVersion());
   cli.parse(["node", "cli-skill", ...argv], { run: false });
   await cli.runMatchedCommand();
 }

package/src/project.ts

@@ -4,6 +4,7 @@ import { pathToFileURL } from "node:url";
 import type { SkillDefinition } from "@cli-skill/core";
 import {
   DEFAULT_TEMPLATE_NAME,
+  hasLocalTemplatesPackage,
   LOCAL_CORE_PACKAGE_PATH,
   LOCAL_TEMPLATE_PACKAGE_PATH,
   getDefaultSkillsRoot,
@@ -30,6 +31,17 @@ async function getLocalCorePackageVersion(): Promise<string> {
   return corePackageJson.version;
 }
 
+async function getCliPackageVersion(): Promise<string> {
+  const cliPackageJsonPath = path.resolve(import.meta.dirname, "..", "package.json");
+  const cliPackageJson = JSON.parse(await readFile(cliPackageJsonPath, "utf8")) as SkillPackageJson;
+
+  if (typeof cliPackageJson.version !== "string" || cliPackageJson.version.length === 0) {
+    throw new Error(`Missing version in ${cliPackageJsonPath}`);
+  }
+
+  return cliPackageJson.version;
+}
+
 export async function createSkillProject(
   skillName: string,
   cliName = skillName,
@@ -38,12 +50,19 @@ export async function createSkillProject(
 ): Promise<string> {
   const resolvedTargetRoot = targetRoot ?? (await getDefaultSkillsRoot());
   const targetDir = path.join(resolvedTargetRoot, skillName);
-  const corePackageVersion = await getLocalCorePackageVersion();
+  const usingLocalTemplates = await hasLocalTemplatesPackage();
+  const cliPackageVersion = usingLocalTemplates ? undefined : await getCliPackageVersion();
+  const corePackageVersion = usingLocalTemplates
+    ? await getLocalCorePackageVersion()
+    : cliPackageVersion!;
+  const templatePackageSpec = usingLocalTemplates
+    ? `file:${LOCAL_TEMPLATE_PACKAGE_PATH}`
+    : `@cli-skill/templates@${cliPackageVersion!}`;
   await runBunx(
     [
       "--bun",
       "--package",
-      `file:${LOCAL_TEMPLATE_PACKAGE_PATH}`,
+      templatePackageSpec,
       "cli-skill-create-template",
       "--template",
       templateName,

package/src/version.ts

@@ -0,0 +1,20 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+
+let cachedVersion: string | undefined;
+
+export async function getCliVersion(): Promise<string> {
+  if (cachedVersion) {
+    return cachedVersion;
+  }
+
+  const packageJsonPath = path.resolve(import.meta.dirname, "..", "package.json");
+  const packageJson = JSON.parse(await readFile(packageJsonPath, "utf8")) as { version?: string };
+
+  if (typeof packageJson.version !== "string" || packageJson.version.length === 0) {
+    throw new Error(`Missing version in ${packageJsonPath}`);
+  }
+
+  cachedVersion = packageJson.version;
+  return cachedVersion;
+}