flowent 0.1.0 → 0.1.1

package/backend/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flowent"
-version = "0.1.0"
+version = "0.1.1"
 description = "A workflow orchestration platform for multi-agent collaboration."
 readme = "README.md"
 authors = [

package/backend/src/flowent/main.py

@@ -105,7 +105,14 @@ class SkillSettingsRequest(BaseModel):
 class McpImportRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    duplicate_action: Literal["replace", "skip"] = "skip"
+    server_id: str
+    source: Literal["claude_code", "codex"]
+
+
+class McpImportPreviewRequest(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    source: Literal["claude_code", "codex"]
 
 
 def stream_event(event: str, data: dict[str, object]) -> str:
@@ -368,19 +375,24 @@ def create_app(
         saved_server = store.save_mcp_server(server)
         return await mcp_manager.sync_server(saved_server)
 
-    @app.get("/api/mcp/import/preview")
-    async def preview_mcp_import() -> McpImportDiscovery:
-        return discover_imported_mcp_servers(Path.cwd())
+    @app.post("/api/mcp/import/preview")
+    async def preview_mcp_import(
+        request: McpImportPreviewRequest,
+    ) -> McpImportDiscovery:
+        return discover_imported_mcp_servers(Path.cwd(), source=request.source)
 
     @app.post("/api/mcp/import")
     async def import_mcp_servers(request: McpImportRequest) -> list[StoredMcpServer]:
-        imported_servers = discover_imported_mcp_servers(Path.cwd()).servers
+        imported_servers = discover_imported_mcp_servers(
+            Path.cwd(),
+            source=request.source,
+        ).servers
         existing_servers = {server.id for server in store.read_mcp_servers()}
         for server in imported_servers:
-            if request.duplicate_action == "skip" and server.id in existing_servers:
+            if server.id != request.server_id:
+                continue
+            if server.id in existing_servers:
                 continue
-            if request.duplicate_action == "replace" and server.id in existing_servers:
-                await mcp_manager.delete_server(server.id)
             store.save_mcp_server(server)
             existing_servers.add(server.id)
         return mcp_manager.servers_with_status(store.read_mcp_servers())

package/backend/src/flowent/mcp_import.py

@@ -33,21 +33,26 @@ class McpImportDiscovery(BaseModel):
 def discover_imported_mcp_servers(
     cwd: Path | None = None,
     home: Path | None = None,
+    source: McpImportSource | None = None,
 ) -> McpImportDiscovery:
     workspace = (cwd or Path.cwd()).resolve(strict=False)
     user_home = (home or Path.home()).resolve(strict=False)
     sources: list[McpImportSourceResult] = []
 
-    for path, source in candidate_mcp_config_files(workspace, user_home):
+    for path, config_source in candidate_mcp_config_files(
+        workspace,
+        user_home,
+        source,
+    ):
         if not path.is_file():
             continue
         try:
-            servers = parse_mcp_config_file(path, source, workspace)
+            servers = parse_mcp_config_file(path, config_source, workspace)
             sources.append(
                 McpImportSourceResult(
                     path=str(path.resolve(strict=False)),
                     servers=servers,
-                    source=source,
+                    source=config_source,
                 )
             )
         except Exception as error:
@@ -55,7 +60,7 @@ def discover_imported_mcp_servers(
                 McpImportSourceResult(
                     error=str(error),
                     path=str(path.resolve(strict=False)),
-                    source=source,
+                    source=config_source,
                 )
             )
 
@@ -70,16 +75,26 @@ def discover_imported_mcp_servers(
 def candidate_mcp_config_files(
     cwd: Path,
     home: Path,
+    source: McpImportSource | None = None,
 ) -> list[tuple[Path, McpImportSource]]:
-    candidates: list[tuple[Path, McpImportSource]] = [
-        (cwd / ".mcp.json", "claude_code"),
-        (cwd / ".claude" / "settings.local.json", "claude_code"),
-        (cwd / ".claude" / "settings.json", "claude_code"),
-        (home / ".claude.json", "claude_code"),
-        (home / ".claude" / "settings.json", "claude_code"),
-        (cwd / ".codex" / "config.toml", "codex"),
-        (home / ".codex" / "config.toml", "codex"),
-    ]
+    candidates: list[tuple[Path, McpImportSource]] = []
+    if source in (None, "claude_code"):
+        candidates.extend(
+            [
+                (cwd / ".mcp.json", "claude_code"),
+                (cwd / ".claude" / "settings.local.json", "claude_code"),
+                (cwd / ".claude" / "settings.json", "claude_code"),
+                (home / ".claude.json", "claude_code"),
+                (home / ".claude" / "settings.json", "claude_code"),
+            ]
+        )
+    if source in (None, "codex"):
+        candidates.extend(
+            [
+                (cwd / ".codex" / "config.toml", "codex"),
+                (home / ".codex" / "config.toml", "codex"),
+            ]
+        )
     seen: set[tuple[Path, McpImportSource]] = set()
     unique_candidates: list[tuple[Path, McpImportSource]] = []
     for path, source in candidates: