@spaceflow/core 0.14.0 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spaceflow/core",
-  "version": "0.14.0",
+  "version": "0.16.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.5.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,39 @@ export class ExtensionLoader {
   }
 
   /**
-   * 获取所有 MCP 服务
-   * 返回扩展中定义的 mcp 字段
+   * 获取所有 MCP 工具
+   * 返回扩展中定义的 tools 字段
+   */
+  getTools(): Array<{ extensionName: string; tools: NonNullable<ExtensionDefinition["tools"]> }> {
+    const result: Array<{
+      extensionName: string;
+      tools: NonNullable<ExtensionDefinition["tools"]>;
+    }> = [];
+    for (const ext of this.extensions.values()) {
+      if (ext.tools && ext.tools.length > 0) {
+        result.push({ extensionName: ext.name, tools: ext.tools });
+      }
+    }
+    return result;
+  }
+
+  /**
+   * 获取所有 MCP 资源
+   * 返回扩展中定义的 resources 字段
    */
-  getMcpServers(): Array<{ extensionName: string; mcp: NonNullable<ExtensionDefinition["mcp"]> }> {
-    const mcpServers: Array<{
+  getResources(): Array<{
+    extensionName: string;
+    resources: NonNullable<ExtensionDefinition["resources"]>;
+  }> {
+    const result: Array<{
       extensionName: string;
-      mcp: NonNullable<ExtensionDefinition["mcp"]>;
+      resources: NonNullable<ExtensionDefinition["resources"]>;
     }> = [];
     for (const ext of this.extensions.values()) {
-      if (ext.mcp) {
-        mcpServers.push({ extensionName: ext.name, mcp: ext.mcp });
+      if (ext.resources && ext.resources.length > 0) {
+        result.push({ extensionName: ext.name, resources: ext.resources });
       }
     }
-    return mcpServers;
+    return result;
   }
 }

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

@@ -1,12 +1,19 @@
 import { t } from "@spaceflow/core";
-import type { VerboseLevel } from "@spaceflow/core";
+import type { VerboseLevel, McpResourceDefinition, SpaceflowContext } from "@spaceflow/core";
 import { shouldLog, type McpToolMetadata } from "@spaceflow/core";
+import { readConfigSync } from "@spaceflow/shared";
 import type { ExtensionLoader } from "../../cli-runtime/extension-loader";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
 import { spawn } from "child_process";
 
+/** 内部 resource 收集结构 */
+interface CollectedResource {
+  resource: McpResourceDefinition;
+  ctx: SpaceflowContext;
+}
+
 export class McpService {
   constructor(private readonly extensionLoader: ExtensionLoader) {}
 
@@ -21,27 +28,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"));
     }
 
     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 }));
     }
 
     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}`);
         }
@@ -55,21 +59,32 @@ export class McpService {
             methodName: "handler",
           },
           handler: tool.handler,
-          ctx: this.extensionLoader["ctx"],
+          ctx: this.extensionLoader.getContext(),
         });
       }
     }
 
-    if (allTools.length === 0) {
+    // 收集扩展 resources + 内置 resources
+    const allResources = this.collectResources(verbose);
+
+    if (allTools.length === 0 && allResources.length === 0) {
       console.error(t("mcp:noToolsFound"));
       console.error(t("mcp:noToolsHint"));
       process.exit(1);
     }
 
     if (shouldLog(verbose, 1)) {
-      console.error(t("mcp:toolsFound", { count: allTools.length }));
-      for (const { tool } of allTools) {
-        console.error(`   - ${tool.name}`);
+      if (allTools.length > 0) {
+        console.error(t("mcp:toolsFound", { count: allTools.length }));
+        for (const { tool } of allTools) {
+          console.error(`   - ${tool.name}`);
+        }
+      }
+      if (allResources.length > 0) {
+        console.error(t("mcp:resourcesFound", { count: allResources.length }));
+        for (const { resource } of allResources) {
+          console.error(`   - ${resource.name} (${resource.uri})`);
+        }
       }
     }
 
@@ -81,7 +96,93 @@ export class McpService {
     }
 
     // 被 MCP 客户端通过管道调用，正常启动 stdio server
-    await this.runServer(allTools, verbose);
+    await this.runServer(allTools, allResources, verbose);
+  }
+
+  /**
+   * 收集所有 MCP 资源（扩展 + 内置）
+   */
+  private collectResources(verbose?: VerboseLevel): CollectedResource[] {
+    const ctx = this.extensionLoader.getContext();
+    const allResources: CollectedResource[] = [];
+
+    // 1. 收集扩展声明的 resources
+    const extensionResources = this.extensionLoader.getResources();
+    for (const { extensionName, resources } of extensionResources) {
+      if (shouldLog(verbose, 2)) {
+        console.error(`   扩展 ${extensionName} 提供 ${resources.length} 个 MCP 资源`);
+      }
+      for (const resource of resources) {
+        allResources.push({ resource, ctx });
+      }
+    }
+
+    // 2. 内置资源：项目配置（过滤敏感字段）
+    allResources.push({
+      resource: {
+        name: "spaceflow-config",
+        uri: "spaceflow://config",
+        title: "Spaceflow Configuration",
+        description: "当前项目的 Spaceflow 配置（已过滤敏感字段）",
+        mimeType: "application/json",
+        handler: async (_uri, ctx) => {
+          const config = readConfigSync(ctx.cwd);
+          return JSON.stringify(this.sanitizeConfig(config), null, 2);
+        },
+      },
+      ctx,
+    });
+
+    // 3. 内置资源：扩展列表
+    allResources.push({
+      resource: {
+        name: "spaceflow-extensions",
+        uri: "spaceflow://extensions",
+        title: "Installed Extensions",
+        description: "当前项目已安装的 Spaceflow 扩展及其工具/资源",
+        mimeType: "application/json",
+        handler: async () => {
+          const extensions = this.extensionLoader.getExtensions();
+          const summary = extensions.map((ext) => ({
+            name: ext.name,
+            version: ext.version,
+            description: ext.description,
+            commands: ext.commands.map((c) => c.name),
+            tools: (ext.tools || []).map((t) => ({ name: t.name, description: t.description })),
+            resources: (ext.resources || []).map((r) => ({
+              name: r.name,
+              uri: r.uri,
+              description: r.description,
+            })),
+          }));
+          return JSON.stringify(summary, null, 2);
+        },
+      },
+      ctx,
+    });
+
+    return allResources;
+  }
+
+  /**
+   * 过滤配置中的敏感字段
+   */
+  private sanitizeConfig(config: Record<string, any>): Record<string, any> {
+    const sensitiveKeys = ["token", "apiKey", "appSecret", "authToken", "apikey", "secret"];
+    const sanitize = (obj: any): any => {
+      if (obj === null || obj === undefined || typeof obj !== "object") return obj;
+      if (Array.isArray(obj)) return obj.map(sanitize);
+      const result: Record<string, any> = {};
+      for (const [key, value] of Object.entries(obj)) {
+        if (sensitiveKeys.some((sk) => key.toLowerCase().includes(sk.toLowerCase()))) {
+          result[key] = value ? "***" : "";
+        } else {
+          result[key] = sanitize(value);
+        }
+      }
+      return result;
+    };
+    return sanitize(config);
   }
 
   /**
@@ -89,6 +190,7 @@ export class McpService {
    */
   private async runServer(
     allTools: Array<{ tool: McpToolMetadata; handler: any; ctx: any }>,
+    allResources: CollectedResource[],
     verbose?: VerboseLevel,
   ): Promise<void> {
     const server = new McpServer({ name: "spaceflow", version: "1.0.0" });
@@ -129,6 +231,43 @@ export class McpService {
       );
     }
 
+    // 注册所有资源（使用 v2 API: server.registerResource）
+    for (const { resource, ctx } of allResources) {
+      server.registerResource(
+        resource.name,
+        resource.uri,
+        {
+          title: resource.title,
+          description: resource.description,
+          mimeType: resource.mimeType || "application/json",
+        },
+        async (uri) => {
+          try {
+            const text = await resource.handler(uri.href, ctx);
+            return {
+              contents: [
+                {
+                  uri: uri.href,
+                  mimeType: resource.mimeType || "application/json",
+                  text,
+                },
+              ],
+            };
+          } catch (error) {
+            return {
+              contents: [
+                {
+                  uri: uri.href,
+                  mimeType: "text/plain",
+                  text: `Error: ${error instanceof Error ? error.message : String(error)}`,
+                },
+              ],
+            };
+          }
+        },
+      );
+    }
+
     // 启动 stdio 传输
     const transport = new StdioServerTransport();
     await server.connect(transport);

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;
   /** 输出服务 */
@@ -134,6 +136,29 @@ export interface ServiceDefinition {
   factory: (ctx: SpaceflowContext) => unknown;
 }
 
+/**
+ * MCP 资源定义
+ */
+export interface McpResourceDefinition {
+  /** 资源名称（唯一标识符） */
+  name: string;
+  /** 资源 URI（固定 URI，如 "config://spaceflow"） */
+  uri: string;
+  /** 资源标题（人类可读） */
+  title?: string;
+  /** 资源描述 */
+  description?: string;
+  /** MIME 类型（默认 application/json） */
+  mimeType?: string;
+  /**
+   * 资源读取处理函数
+   * @param uri 请求的 URI
+   * @param ctx Spaceflow 上下文
+   * @returns 资源内容（字符串）
+   */
+  handler: (uri: string, ctx: SpaceflowContext) => Promise<string>;
+}
+
 /**
  * MCP 工具定义
  */
@@ -152,20 +177,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 +195,10 @@ export interface ExtensionDefinition {
   configDependencies?: string[];
   /** 命令列表 */
   commands: CommandDefinition[];
-  /** MCP 服务器定义 */
-  mcp?: McpServerDefinition;
+  /** MCP 工具列表 */
+  tools?: McpToolDefinition[];
+  /** MCP 资源列表 */
+  resources?: McpResourceDefinition[];
   /** 服务定义列表 */
   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,

package/src/locales/en/mcp.json

@@ -16,6 +16,7 @@
   "noToolsFound": "❌ No MCP tools found",
   "noToolsHint": "   Hint: Make sure you have installed MCP-enabled extensions that export mcpService or getMcpTools\n   If the working directory is incorrect, set the environment variable in your MCP config:\n   \"env\": { \"SPACEFLOW_CWD\": \"/path/to/your/project\" }",
   "toolsFound": "✅ Found {{count}} MCP tools",
+  "resourcesFound": "📦 Found {{count}} MCP resources",
   "ttyHint": "💡 MCP Server must be started by an MCP client (e.g. Cursor, Claude Desktop) via pipe.\n   Add the following config to your MCP client:\n\n   \"spaceflow\": {\n     \"command\": \"npx\",\n     \"args\": [\"@spaceflow/cli\", \"mcp\"],\n     \"env\": { \"SPACEFLOW_CWD\": \"/path/to/your/project\" }\n   }",
   "serverStarted": "🚀 MCP Server started with {{count}} tools"
 }

package/src/locales/zh-cn/mcp.json

@@ -16,6 +16,7 @@
   "noToolsFound": "❌ 没有找到任何 MCP 工具",
   "noToolsHint": "   提示: 确保已安装支持 MCP 的扩展，并导出 mcpService 或 getMcpTools\n   如果工作目录不正确，请在 MCP 配置中设置环境变量:\n   \"env\": { \"SPACEFLOW_CWD\": \"/path/to/your/project\" }",
   "toolsFound": "✅ 共发现 {{count}} 个 MCP 工具",
+  "resourcesFound": "📦 共发现 {{count}} 个 MCP 资源",
   "ttyHint": "💡 MCP Server 需要由 MCP 客户端（如 Cursor、Claude Desktop）通过管道启动。\n   请将以下配置添加到你的 MCP 客户端中：\n\n   \"spaceflow\": {\n     \"command\": \"npx\",\n     \"args\": [\"@spaceflow/cli\", \"mcp\"],\n     \"env\": { \"SPACEFLOW_CWD\": \"/path/to/your/project\" }\n   }",
   "serverStarted": "🚀 MCP Server 已启动，共 {{count}} 个工具"
 }