@spaceflow/core 0.3.0 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spaceflow/core",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Spaceflow 核心能力库",
   "license": "MIT",
   "author": "Lydanne",

package/src/shared/source-utils/index.ts

@@ -22,6 +22,7 @@ export function isGitUrl(source: string): boolean {
  */
 export function isLocalPath(source: string): boolean {
   return (
+    source.startsWith("workspace:") ||
     source.startsWith("link:") ||
     source.startsWith("./") ||
     source.startsWith("../") ||

package/src/shared/spaceflow-dir/index.ts

@@ -2,7 +2,6 @@ import { existsSync, readFileSync, mkdirSync, writeFileSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
 import { SPACEFLOW_DIR, PACKAGE_JSON } from "../../extension-system/extension.interface";
-import { isPnpmWorkspace } from "../package-manager";
 
 /**
  * 获取 .spaceflow 目录路径
@@ -36,86 +35,65 @@ config-schema.json
     writeFileSync(gitignorePath, gitignoreContent);
   }
 
-  // 创建空的 pnpm-workspace.yaml，防止被父级 workspace 接管
-  const workspaceYamlPath = join(spaceflowDir, "pnpm-workspace.yaml");
-  if (!existsSync(workspaceYamlPath)) {
-    writeFileSync(workspaceYamlPath, "packages: []\n");
-  }
 }
 
 /**
- * 获取 @spaceflow/cli 的路径
- * @param isGlobal 是否为全局安装
- * @param cwd 工作目录，默认为 process.cwd()
+ * 获取 @spaceflow/core 的版本号
+ * 从 process.argv[1]（cli 入口）向上找到 @spaceflow/cli 的 package.json
+ * 读取其中声明的 @spaceflow/core 依赖版本，保证 cli 和 core 版本一致
  */
-export function getSpaceflowCliPath(isGlobal: boolean = false, cwd?: string): string {
-  const workDir = cwd || process.cwd();
-
-  if (isGlobal) {
-    // 全局安装：尝试找到 @spaceflow/cli 的实际路径进行 link
-    // 优先从当前项目的 cli 目录 link
-    const cliPath = join(workDir, "packages", "cli");
-    if (existsSync(join(cliPath, PACKAGE_JSON))) {
+export function getSpaceflowCoreVersion(): string {
+  const cliEntryPath = process.argv[1];
+  if (cliEntryPath) {
+    // cli 入口: .../node_modules/@spaceflow/cli/dist/cli.js → 往上两级是包根目录
+    const cliDir = join(cliEntryPath, "..", "..");
+    const cliPkgPath = join(cliDir, PACKAGE_JSON);
+    if (existsSync(cliPkgPath)) {
       try {
-        const content = readFileSync(join(cliPath, PACKAGE_JSON), "utf-8");
-        const pkg = JSON.parse(content);
-        if (pkg.name === "@spaceflow/cli") {
-          return `link:${cliPath}`;
+        const cliPkg = JSON.parse(readFileSync(cliPkgPath, "utf-8"));
+        if (cliPkg.name === "@spaceflow/cli") {
+          const coreVersion = cliPkg.dependencies?.["@spaceflow/core"];
+          if (coreVersion) {
+            return coreVersion;
+          }
         }
       } catch {
         // ignore
       }
     }
-    // 回退到 latest
-    return "latest";
-  }
-
-  // 本地安装：检查是否在 monorepo 中
-  if (isPnpmWorkspace(workDir)) {
-    return "workspace:*";
   }
-
-  // 尝试从项目 package.json 获取版本
-  const projectPkgPath = join(workDir, PACKAGE_JSON);
-  if (existsSync(projectPkgPath)) {
-    try {
-      const content = readFileSync(projectPkgPath, "utf-8");
-      const pkg = JSON.parse(content);
-      const version =
-        pkg.dependencies?.["@spaceflow/core"] || pkg.devDependencies?.["@spaceflow/core"];
-      if (version) return version;
-    } catch {
-      // ignore
-    }
-  }
-
   return "latest";
 }
 
 /**
- * 确保 .spaceflow/package.json 存在
- * 包含 @spaceflow/cli 作为依赖
+ * 确保 .spaceflow 目录及 package.json 存在，并保持 @spaceflow/core 版本与 cli 一致
  * @param spaceflowDir .spaceflow 目录路径
- * @param isGlobal 是否为全局安装
- * @param cwd 工作目录，默认为 process.cwd()
  */
-export function ensureSpaceflowPackageJson(
-  spaceflowDir: string,
-  isGlobal: boolean = false,
-  cwd?: string,
-): void {
-  // 确保目录存在
+export function ensureSpaceflowPackageJson(spaceflowDir: string): void {
   ensureSpaceflowDir(spaceflowDir);
 
-  // 确保 package.json 存在
   const packageJsonPath = join(spaceflowDir, PACKAGE_JSON);
-  if (!existsSync(packageJsonPath)) {
-    const cliPath = getSpaceflowCliPath(isGlobal, cwd);
+  const coreVersion = getSpaceflowCoreVersion();
+
+  if (existsSync(packageJsonPath)) {
+    // 已存在：检查并更新 @spaceflow/core 版本
+    try {
+      const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+      if (pkg.dependencies?.["@spaceflow/core"] !== coreVersion) {
+        pkg.dependencies = pkg.dependencies || {};
+        pkg.dependencies["@spaceflow/core"] = coreVersion;
+        writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + "\n");
+      }
+    } catch {
+      // ignore
+    }
+  } else {
+    // 不存在：创建
     const packageJson = {
       name: "spaceflow",
       private: true,
       dependencies: {
-        "@spaceflow/core": cliPath,
+        "@spaceflow/core": coreVersion,
       },
     };
     writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + "\n");