@spaceflow/core 0.13.0 → 0.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spaceflow/core",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "Spaceflow 核心能力库",
   "license": "MIT",
   "author": "Lydanne",
@@ -99,7 +99,7 @@
     "zod-to-json-schema": "^3.25.1",
     "commander": "^12.1.0",
     "i18next": "^25.8.4",
-    "@spaceflow/shared": "0.4.0"
+    "@spaceflow/shared": "0.6.0"
   },
   "devDependencies": {
     "@swc/core": "1.15.3",

package/src/cli-runtime/di/container.ts

@@ -25,6 +25,7 @@ interface ServiceRegistration<T = unknown> {
  */
 export class ServiceContainer implements SpaceflowContext {
   private registrations = new Map<string, ServiceRegistration>();
+  private _cwd!: string;
   private _config!: IConfigReader;
   private _output!: IOutputService;
   private _storage!: IStorageService;
@@ -32,7 +33,13 @@ export class ServiceContainer implements SpaceflowContext {
   /**
    * 设置核心服务（config, output, storage）
    */
-  setCoreServices(config: IConfigReader, output: IOutputService, storage: IStorageService): void {
+  setCoreServices(
+    config: IConfigReader,
+    output: IOutputService,
+    storage: IStorageService,
+    cwd: string,
+  ): void {
+    this._cwd = cwd;
     this._config = config;
     this._output = output;
     this._storage = storage;
@@ -95,6 +102,10 @@ export class ServiceContainer implements SpaceflowContext {
     }
   }
 
+  get cwd(): string {
+    return this._cwd;
+  }
+
   get config(): IConfigReader {
     return this._config;
   }

package/src/cli-runtime/di/services.ts

@@ -6,6 +6,7 @@ import {
   LlmProxyService,
   FileAdapter,
 } from "@spaceflow/core";
+import { findProjectRoot } from "@spaceflow/shared";
 import { join } from "path";
 import type { ServiceContainer } from "./container";
 import { UnifiedConfigReader } from "./config";
@@ -14,13 +15,13 @@ import { UnifiedConfigReader } from "./config";
  * 初始化服务容器
  */
 export function initializeContainer(container: ServiceContainer, cwd?: string): void {
-  const workDir = cwd || process.cwd();
+  const workDir = cwd || process.env.SPACEFLOW_CWD || findProjectRoot();
   // 初始化核心服务（.env 已在 CLI 壳子阶段加载）
   const config = new UnifiedConfigReader(workDir);
   const output = new OutputService();
   const storageDir = join(workDir, ".spaceflow", "cache");
   const storage = new StorageService(new FileAdapter(storageDir));
-  container.setCoreServices(config, output, storage);
+  container.setCoreServices(config, output, storage, workDir);
   // 注册服务工厂
   registerServiceFactories(container);
 }

package/src/cli-runtime/extension-loader.ts

@@ -11,6 +11,16 @@ export class ExtensionLoader {
 
   constructor(private readonly ctx: SpaceflowContext) {}
 
+  /** 当前工作目录（项目根） */
+  get cwd(): string {
+    return this.ctx.cwd;
+  }
+
+  /** 获取上下文（供内部命令使用） */
+  getContext(): SpaceflowContext {
+    return this.ctx;
+  }
+
   /**
    * 注册扩展
    */
@@ -56,19 +66,19 @@ export class ExtensionLoader {
   }
 
   /**
-   * 获取所有 MCP 服务
-   * 返回扩展中定义的 mcp 字段
+   * 获取所有 MCP 工具
+   * 返回扩展中定义的 tools 字段
    */
-  getMcpServers(): Array<{ extensionName: string; mcp: NonNullable<ExtensionDefinition["mcp"]> }> {
-    const mcpServers: Array<{
+  getTools(): Array<{ extensionName: string; tools: NonNullable<ExtensionDefinition["tools"]> }> {
+    const result: Array<{
       extensionName: string;
-      mcp: NonNullable<ExtensionDefinition["mcp"]>;
+      tools: NonNullable<ExtensionDefinition["tools"]>;
     }> = [];
     for (const ext of this.extensions.values()) {
-      if (ext.mcp) {
-        mcpServers.push({ extensionName: ext.name, mcp: ext.mcp });
+      if (ext.tools && ext.tools.length > 0) {
+        result.push({ extensionName: ext.name, tools: ext.tools });
       }
     }
-    return mcpServers;
+    return result;
   }
 }

package/src/commands/mcp/index.ts

@@ -25,9 +25,9 @@ export const mcpExtension = defineExtension({
       ],
       run: async (_args, options, ctx) => {
         const verbose = (options?.verbose ? 2 : 1) as VerboseLevel;
-        const inspector = options?.inspector as boolean | undefined;
         const extensionLoader = ctx.getService<ExtensionLoader>("extensionLoader");
         const mcpService = new McpService(extensionLoader);
+        const inspector = options?.inspector as boolean | undefined;
         await mcpService.startServer(verbose, inspector);
       },
     },

package/src/commands/mcp/mcp.service.ts

@@ -21,29 +21,24 @@ export class McpService {
       return;
     }
     if (shouldLog(verbose, 1)) {
-      const cwd = process.env.SPACEFLOW_CWD || process.cwd();
+      const cwd = this.extensionLoader.cwd;
       console.error(t("mcp:cwdInfo", { cwd }));
-      if (!process.env.SPACEFLOW_CWD) {
-        console.error(t("mcp:cwdEnvHint"));
-      }
       console.error(t("mcp:scanning"));
     }
 
-    // 获取所有扩展（已在 exec() 阶段通过 registerExtension 注册完毕）
     const extensions = this.extensionLoader.getExtensions();
-    const mcpServers = this.extensionLoader.getMcpServers();
+    const extensionTools = this.extensionLoader.getTools();
 
     if (shouldLog(verbose, 2)) {
       console.error(t("mcp:foundExtensions", { count: extensions.length }));
     }
 
-    // 收集所有扩展的 MCP 工具
     const allTools: Array<{ tool: McpToolMetadata; handler: any; ctx: any }> = [];
-    for (const { extensionName, mcp } of mcpServers) {
+    for (const { extensionName, tools } of extensionTools) {
       if (shouldLog(verbose, 2)) {
-        console.error(`   扩展 ${extensionName} 提供 ${mcp.tools.length} 个 MCP 工具`);
+        console.error(`   扩展 ${extensionName} 提供 ${tools.length} 个 MCP 工具`);
       }
-      for (const tool of mcp.tools) {
+      for (const tool of tools) {
         if (shouldLog(verbose, 3)) {
           console.error(`      - ${tool.name}: ${tool.description}`);
         }
@@ -57,7 +52,7 @@ export class McpService {
             methodName: "handler",
           },
           handler: tool.handler,
-          ctx: this.extensionLoader["ctx"], // 获取 SpaceflowContext
+          ctx: this.extensionLoader.getContext(),
         });
       }
     }

package/src/extension-system/define-extension.ts

@@ -1,4 +1,4 @@
-import type { ExtensionDefinition, McpServerDefinition } from "./types";
+import type { ExtensionDefinition } from "./types";
 
 /**
  * 定义扩展
@@ -6,20 +6,6 @@ import type { ExtensionDefinition, McpServerDefinition } from "./types";
  * @param definition 扩展定义
  * @returns 扩展定义（原样返回，仅用于类型推断）
  */
-export function defineExtension(
-  definition: ExtensionDefinition,
-): ExtensionDefinition {
-  return definition;
-}
-
-/**
- * 定义 MCP 服务器
- * 这是一个类型安全的工厂函数，用于创建 MCP 服务器定义
- * @param definition MCP 服务器定义
- * @returns MCP 服务器定义（原样返回，仅用于类型推断）
- */
-export function defineMcpServer(
-  definition: McpServerDefinition,
-): McpServerDefinition {
+export function defineExtension(definition: ExtensionDefinition): ExtensionDefinition {
   return definition;
 }

package/src/extension-system/extension.interface.ts

@@ -1,9 +1,3 @@
-/** .spaceflow 目录名 */
-export const SPACEFLOW_DIR = ".spaceflow";
-
-/** package.json 文件名 */
-export const PACKAGE_JSON = "package.json";
-
 /**
  * Extension 元数据
  */

package/src/extension-system/types.ts

@@ -19,6 +19,8 @@ export interface OptionDefinition {
  * 命令和 MCP 工具共用此上下文
  */
 export interface SpaceflowContext {
+  /** 当前工作目录（优先 SPACEFLOW_CWD 环境变量） */
+  readonly cwd: string;
   /** 配置读取器 */
   readonly config: IConfigReader;
   /** 输出服务 */
@@ -152,20 +154,6 @@ export interface McpToolDefinition {
   handler: (input: unknown, ctx: SpaceflowContext) => Promise<unknown>;
 }
 
-/**
- * MCP 服务器定义
- */
-export interface McpServerDefinition {
-  /** 服务器名称 */
-  name: string;
-  /** 服务器版本 */
-  version?: string;
-  /** 服务器描述 */
-  description?: string;
-  /** 工具列表 */
-  tools: McpToolDefinition[];
-}
-
 /**
  * 扩展定义
  */
@@ -184,8 +172,8 @@ export interface ExtensionDefinition {
   configDependencies?: string[];
   /** 命令列表 */
   commands: CommandDefinition[];
-  /** MCP 服务器定义 */
-  mcp?: McpServerDefinition;
+  /** MCP 工具列表 */
+  tools?: McpToolDefinition[];
   /** 服务定义列表 */
   services?: ServiceDefinition[];
   /**

package/src/index.ts

@@ -48,7 +48,7 @@ export * from "./shared/spaceflow-dir";
 export * from "./shared/rspack-config";
 
 // MCP - Model Context Protocol 支持
-// 注意：McpServerDefinition 和 McpToolDefinition 已在 extension-system/types.ts 中定义
+// 注意：McpToolDefinition 已在 extension-system/types.ts 中定义（用于 defineExtension 的 tools 字段）
 // 这里只导出装饰器和工具函数，避免重复导出
 export {
   MCP_SERVER_METADATA,