From 93bb310257e935d48c69d45986f6484056b331ca Mon Sep 17 00:00:00 2001
From: Naotiki <j22413@inc.kisarazu.ac.jp>
Date: Thu, 27 Apr 2023 20:46:12 +0900
Subject: [PATCH] =?UTF-8?q?Udon=20local=20EGP=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/artifacts/ese_core_js_0_0_B.xml         |   2 +-
 .idea/artifacts/ese_core_jvm_0_0_B.xml        |   2 +-
 .idea/codeStyles/Project.xml                  |   3 +
 .idea/compiler.xml                            |   6 +
 .idea/gradle.xml                              |  13 --
 .idea/kotlinc.xml                             |   2 +-
 clients/androidApp/build.gradle.kts           |   2 +
 .../main/java/me/naotiki/ese/MainActivity.kt  | 106 ++++++++++++--
 .../src/main/res/values-night/themes.xml      |   4 +-
 .../androidApp/src/main/res/values/themes.xml |   2 +-
 .../src/androidMain/kotlin/tryRunBlocking.kt  |   1 +
 .../src/commonMain/kotlin/Terminal.kt         | 138 +++++++++---------
 .../src/commonMain/kotlin/ViewModel.kt        |  34 +++++
 .../commonMain/kotlin/component/TextLog.kt    |   7 +-
 clients/cuiApp/build.gradle.kts               |   1 -
 clients/desktopApp/build.gradle.kts           |   1 -
 clients/desktopApp/src/main/kotlin/Main.kt    |  13 +-
 clients/webApp/src/jsMain/kotlin/main.js.kt   |   3 -
 docs/Version.md                               |  19 +++
 ese-core/build.gradle.kts                     |  27 +++-
 .../kotlin/me/naotiki/ese/core/ClientImpl.kt  |   7 +
 .../kotlin/me/naotiki/ese/core/Entry.kt       |  25 ++--
 .../ese/core/commands/parser/Executable.kt    |   2 +-
 .../me/naotiki/ese/core/ClientPlatformImpl.kt |   4 +
 .../me/naotiki/ese/core/ClientPlatformImpl.kt |  16 ++
 .../naotiki/ese/core/secure/EseClassLoader.kt |   4 +-
 .../naotiki/ese/core/vfs/PlatformCommands.kt  |  93 ++++++++----
 ese-gradle-plugin/build.gradle.kts            |  19 ++-
 .../src/main/kotlin/EseGradlePlugin.kt        |  38 +++--
 .../src/main/kotlin/RunEsePluginTask.kt       |  24 +++
 ese-gradle-plugin/src/main/kotlin/Versions.kt |   5 +
 ese-lib/build.gradle.kts                      |   9 +-
 ese-lib/settings.gradle.kts                   |  12 +-
 ese-lib/src/main/kotlin/Main.kt               |  24 ++-
 34 files changed, 475 insertions(+), 193 deletions(-)
 create mode 100644 clients/composeShared/src/commonMain/kotlin/ViewModel.kt
 create mode 100644 docs/Version.md
 create mode 100644 ese-core/src/jsMain/kotlin/me/naotiki/ese/core/ClientPlatformImpl.kt
 create mode 100644 ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/ClientPlatformImpl.kt
 create mode 100644 ese-gradle-plugin/src/main/kotlin/RunEsePluginTask.kt
 create mode 100644 ese-gradle-plugin/src/main/kotlin/Versions.kt

diff --git a/.idea/artifacts/ese_core_js_0_0_B.xml b/.idea/artifacts/ese_core_js_0_0_B.xml
index 0dcb678..0d4e409 100644
--- a/.idea/artifacts/ese_core_js_0_0_B.xml
+++ b/.idea/artifacts/ese_core_js_0_0_B.xml
@@ -2,7 +2,7 @@
   <artifact type="jar" name="ese-core-js-0.0-B">
     <output-path>$PROJECT_DIR$/ese-core/build/libs</output-path>
     <root id="archive" name="ese-core-js-0.0-B.jar">
-      <element id="module-output" name="ese-lib.ese-core.jsMain" />
+      <element id="module-output" name="Ese.ese-core.jsMain" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/ese_core_jvm_0_0_B.xml b/.idea/artifacts/ese_core_jvm_0_0_B.xml
index 9fe8bd4..f3dda90 100644
--- a/.idea/artifacts/ese_core_jvm_0_0_B.xml
+++ b/.idea/artifacts/ese_core_jvm_0_0_B.xml
@@ -2,7 +2,7 @@
   <artifact type="jar" name="ese-core-jvm-0.0-B">
     <output-path>$PROJECT_DIR$/ese-core/build/libs</output-path>
     <root id="archive" name="ese-core-jvm-0.0-B.jar">
-      <element id="module-output" name="ese-lib.ese-core.jvmMain" />
+      <element id="module-output" name="Ese.ese-core.jvmMain" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 1bec35e..fc3105b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <AndroidXmlCodeStyleSettings>
+      <option name="USE_CUSTOM_SETTINGS" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index f1e33a2..2c89b79 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -12,10 +12,16 @@
       <module name="ese-dev-plugin" target="17" />
       <module name="ese-dev-plugin.main" target="17" />
       <module name="ese-dev-plugin.test" target="17" />
+      <module name="ese-gradle-plugin" target="17" />
+      <module name="ese-gradle-plugin.main" target="17" />
+      <module name="ese-gradle-plugin.test" target="17" />
       <module name="ese-lib.core.main" target="17" />
       <module name="ese-lib.core.test" target="17" />
       <module name="me.naotiki.ese-gradle-plugin.main" target="17" />
       <module name="me.naotiki.ese-gradle-plugin.test" target="17" />
+      <module name="me.naotiki.ese.dev.ese-gradle-plugin" target="17" />
+      <module name="me.naotiki.ese.dev.ese-gradle-plugin.main" target="17" />
+      <module name="me.naotiki.ese.dev.ese-gradle-plugin.test" target="17" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 58e76bb..3f93fcb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -26,22 +26,9 @@
         </option>
       </GradleProjectSettings>
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT">
-            <builds>
-              <build path="$PROJECT_DIR$/ese-gradle-plugin" name="ese-gradle-plugin">
-                <projects>
-                  <project path="$PROJECT_DIR$/ese-gradle-plugin" />
-                </projects>
-              </build>
-            </builds>
-          </compositeBuild>
-        </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$/ese-lib" />
         <option name="modules">
           <set>
-            <option value="$PROJECT_DIR$/ese-core" />
-            <option value="$PROJECT_DIR$/ese-gradle-plugin" />
             <option value="$PROJECT_DIR$/ese-lib" />
           </set>
         </option>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 7e49269..0ad7d74 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="1.8" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.20" />
+    <option name="version" value="1.8.10" />
   </component>
 </project>
\ No newline at end of file
diff --git a/clients/androidApp/build.gradle.kts b/clients/androidApp/build.gradle.kts
index e758a78..10414d9 100644
--- a/clients/androidApp/build.gradle.kts
+++ b/clients/androidApp/build.gradle.kts
@@ -12,6 +12,8 @@ kotlin {
         val androidMain by getting {
             dependencies {
                 implementation(projects.composeShared)
+                val nav_version = "2.5.3"
+                implementation("androidx.navigation:navigation-compose:$nav_version")
             }
         }
     }
diff --git a/clients/androidApp/src/main/java/me/naotiki/ese/MainActivity.kt b/clients/androidApp/src/main/java/me/naotiki/ese/MainActivity.kt
index 91a1b53..e848686 100644
--- a/clients/androidApp/src/main/java/me/naotiki/ese/MainActivity.kt
+++ b/clients/androidApp/src/main/java/me/naotiki/ese/MainActivity.kt
@@ -1,36 +1,114 @@
 package me.naotiki.ese
 
 import AppContainer
-import LocalDefaultFont
 import Terminal
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.text.BasicText
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.Text
-import androidx.compose.material.TextField
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.sp
+import androidx.navigation.NavBackStackEntry
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
 import initializeComposeCommon
+import kotlinx.coroutines.CoroutineScope
+import me.naotiki.ese.Screen.Companion.buildRoute
+import me.naotiki.ese.core.PlatformImpl
 import me.naotiki.ese.core.appName
+import me.naotiki.ese.core.initializePlatformImpl
 import targetActivity
+import java.io.File
+
+
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         println("Starting... ${appName}")
-        targetActivity=this
+
+        targetActivity = this
         initializeComposeCommon()
+        initializePlatformImpl(object :PlatformImpl{
+            override fun getEseHomeDir(): File? {
+                return getExternalFilesDir(null)
+            }
+        })
+        var file: File? = null
+        /*val launcher = registerForActivityResult(object : ActivityResultContracts.OpenDocumentTree() {
+            override fun createIntent(context: Context, input: Uri?): Intent {
+                return super.createIntent(context, input).apply {
+                    flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
+                }
+            }
+        }) {
+            if (it != null) {
+                contentResolver.takePersistableUriPermission(it, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                DocumentFile.fromTreeUri(this, it)
+
+            }
+        }*/
+
         setContent {
             AppContainer {
-                Terminal()
+                val navController = rememberNavController()
+                Scaffold(topBar = {
+                    TopAppBar(title = {
+                        Text("Ese Android")
+                    }, actions = {
+                        IconButton({
+                            navController.navigate(Screen.Settings.route) {
+                                // Pop up to the start destination of the graph to
+                                // avoid building up a large stack of destinations
+                                // on the back stack as users select items
+
+                                popUpTo(navController.graph.startDestinationId) {
+                                    saveState = true
+                                    
+                                }
+                                // Avoid multiple copies of the same destination when
+                                // reselecting the same item
+                                launchSingleTop = true
+                                // Restore state when reselecting a previously selected item
+                                restoreState = true
+                            }
+                        }) {
+                            Icon(Icons.Default.Settings,null)
+                        }
+                    })
+                }) { paddingValues ->
+                    val coroutineScope= rememberCoroutineScope()
+                    NavHost(navController, Screen.Terminal.route, Modifier.padding(paddingValues)) {
+                        buildRoute(coroutineScope)
+                    }
+
+                }
+            }
+        }
+    }
+}
+
+enum class Screen(val route: String, val content: @Composable (NavBackStackEntry,CoroutineScope) -> Unit) {
+    Terminal("terminal", {_,c->
+        Terminal()
+    }),
+    Settings("settings", {a,b->
+        Text("設定")
+    });
+
+    companion object{
+        fun NavGraphBuilder.buildRoute(coroutineScope: CoroutineScope) {
+            values().forEach {
+                composable(it.route,content={nav->
+                    it.content(nav,coroutineScope)
+
+                })
             }
         }
     }
diff --git a/clients/androidApp/src/main/res/values-night/themes.xml b/clients/androidApp/src/main/res/values-night/themes.xml
index 4d801c4..fb8175a 100644
--- a/clients/androidApp/src/main/res/values-night/themes.xml
+++ b/clients/androidApp/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
-    <style name="Theme.EseLinux" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="Theme.EseLinux" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryDark">@color/purple_700</item>
diff --git a/clients/androidApp/src/main/res/values/themes.xml b/clients/androidApp/src/main/res/values/themes.xml
index 1b88c13..b0b7d58 100644
--- a/clients/androidApp/src/main/res/values/themes.xml
+++ b/clients/androidApp/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.EseLinux" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="Theme.EseLinux" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryDark">@color/purple_700</item>
diff --git a/clients/composeShared/src/androidMain/kotlin/tryRunBlocking.kt b/clients/composeShared/src/androidMain/kotlin/tryRunBlocking.kt
index 811c233..67b7d15 100644
--- a/clients/composeShared/src/androidMain/kotlin/tryRunBlocking.kt
+++ b/clients/composeShared/src/androidMain/kotlin/tryRunBlocking.kt
@@ -1,4 +1,5 @@
 import android.app.Activity
+import android.content.Context
 import android.view.KeyEvent.*
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Row
diff --git a/clients/composeShared/src/commonMain/kotlin/Terminal.kt b/clients/composeShared/src/commonMain/kotlin/Terminal.kt
index 55efd6e..62dd44d 100644
--- a/clients/composeShared/src/commonMain/kotlin/Terminal.kt
+++ b/clients/composeShared/src/commonMain/kotlin/Terminal.kt
@@ -23,10 +23,8 @@ import component.rememberTextLogState
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.consumeEach
 import kotlinx.coroutines.launch
-import me.naotiki.ese.core.ClientImpl
-import me.naotiki.ese.core.EseSystem
+import me.naotiki.ese.core.*
 import me.naotiki.ese.core.EseSystem.IO
-import me.naotiki.ese.core.Shell
 import me.naotiki.ese.core.Shell.Expression
 import me.naotiki.ese.core.utils.splitArgs
 import kotlin.coroutines.CoroutineContext
@@ -38,23 +36,19 @@ expect fun <T> tryRunBlocking(
 )
 
 expect fun exitApp(code: Int): Unit
-class TerminalViewModel(prompt: Prompt, logState: TextLogState) {
+class TerminalViewModel(val prompt: Prompt,val  logState: TextLogState,) {
 
-    val channnel = IO.readChannel
+    val channnel get() = IO.readChannel
     val commandHistory get() = Expression.commandHistory
 
     private val clientImpl = object : ClientImpl {
         override fun getClientName(): String = clientName
         override suspend fun prompt(promptText: String, value: String) {
-
             prompt.newPrompt(promptText, value)
         }
-
-
         override fun exit() {
             exitApp(0)
         }
-
         override fun clear() {
             //textLogs = ""
             logState.clear()
@@ -89,6 +83,8 @@ class TerminalViewModel(prompt: Prompt, logState: TextLogState) {
 
 
     suspend fun initialize() {
+        EseSystem.ClientImpl=clientImpl
+        if (eseInitialized) return
         me.naotiki.ese.core.initialize(clientImpl, platformInitMessage)
     }
 
@@ -116,7 +112,6 @@ fun Terminal() {
     val viewModel = rememberTerminalViewModel(prompt, textLogState)
     var historyIndex by remember { mutableStateOf(-1) }
     val coroutine = rememberCoroutineScope()
-    //  val stateVertical = rememberScrollState(0)
     LaunchedEffect(Unit) {
         launch {
             try {
@@ -127,7 +122,6 @@ fun Terminal() {
             }
         }
         viewModel.channnel.consumeEach {
-            println("Log $it:${it.code}")
             textLogState.addChar(it)
         }
     }
@@ -149,62 +143,62 @@ fun Terminal() {
                     historyIndex = -1
                 }
 
-                    BasicTextField(
-                        prompt.textFieldValue,
+                BasicTextField(
+                    prompt.textFieldValue,
 
-                        onValueChange = {
-                            prompt.updateTextFieldValue(it) { value, _ ->
-                                lastInput = value
-                            }
-                        },
-                        keyboardActions = KeyboardActions {
+                    onValueChange = {
+                        prompt.updateTextFieldValue(it) { value, _ ->
+                            lastInput = value
+                        }
+                    },
+                    keyboardActions = KeyboardActions {
+                        onSend()
+                    },
+                    textStyle =
+                    TextStyle(
+                        color = Color.White,
+                        fontSize =
+                        20.sp,
+                        fontFamily = LocalDefaultFont.current
+                    ),
+                    cursorBrush = SolidColor(Color.White),
+                    modifier = Modifier.fillMaxWidth().weight(1f).onPreviewKeyEvent {
+                        if (!prompt.isEnable) return@onPreviewKeyEvent false
+                        return@onPreviewKeyEvent if ((it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType
+                                .KeyDown
+                        ) {
                             onSend()
-                        },
-                        textStyle =
-                        TextStyle(
-                            color = Color.White,
-                            fontSize =
-                            20.sp,
-                            fontFamily = LocalDefaultFont.current
-                        ),
-                        cursorBrush = SolidColor(Color.White),
-                        modifier = Modifier.fillMaxWidth().weight(1f).onPreviewKeyEvent {
-                            if (!prompt.isEnable) return@onPreviewKeyEvent false
-                            return@onPreviewKeyEvent if ((it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType
-                                    .KeyDown
-                            ) {
-                                onSend()
-                                true
-                            } else if ((it.key == Key.DirectionUp || it.key == Key.DirectionDown) && it.type == KeyEventType.KeyDown) {
-                                historyIndex = when (it.key) {
-                                    Key.DirectionUp -> minOf(historyIndex + 1, viewModel.commandHistory.lastIndex)
-                                    Key.DirectionDown -> maxOf(historyIndex - 1, -1)
-                                    else -> -1
-                                }
-                                viewModel.commandHistory.getOrNull(historyIndex).let { s ->
-                                    prompt.updateValue((s ?: "").also { lastInput = it })
-                                }
-                                true
-                            } else if (it.key == Key.Tab && it.type == KeyEventType.KeyDown) {
-                                prompt.updateValue(viewModel.nextSuggest(lastInput))
-                                true
-                            } else false
-                        }.focusRequester(focusRequester),
-                        keyboardOptions = KeyboardOptions(
-                            keyboardType = KeyboardType.Ascii,
-                            imeAction = ImeAction.Send
-                        ),
-                    )
-                    LaunchedEffect(Unit) {
-                        //Focusをロック
-                        focusRequester.requestFocus()
-                        focusRequester.captureFocus()
-                        //VK登録
-                        VirtualKeyboardManager.addListener {
-                            if (it.isCtrlPressed&&it.key==Key.C){
-                                Shell.Expression.cancelJob()
-                                true
-                            }else
+                            true
+                        } else if ((it.key == Key.DirectionUp || it.key == Key.DirectionDown) && it.type == KeyEventType.KeyDown) {
+                            historyIndex = when (it.key) {
+                                Key.DirectionUp -> minOf(historyIndex + 1, viewModel.commandHistory.lastIndex)
+                                Key.DirectionDown -> maxOf(historyIndex - 1, -1)
+                                else -> -1
+                            }
+                            viewModel.commandHistory.getOrNull(historyIndex).let { s ->
+                                prompt.updateValue((s ?: "").also { lastInput = it })
+                            }
+                            true
+                        } else if (it.key == Key.Tab && it.type == KeyEventType.KeyDown) {
+                            prompt.updateValue(viewModel.nextSuggest(lastInput))
+                            true
+                        } else false
+                    }.focusRequester(focusRequester),
+                    keyboardOptions = KeyboardOptions(
+                        keyboardType = KeyboardType.Ascii,
+                        imeAction = ImeAction.Send
+                    ),
+                )
+                LaunchedEffect(Unit) {
+                    //Focusをロック
+                    focusRequester.requestFocus()
+                    focusRequester.captureFocus()
+                    //VK登録
+                    VirtualKeyboardManager.addListener {
+                        if (it.isCtrlPressed && it.key == Key.C) {
+                            Shell.Expression.cancelJob()
+                            true
+                        } else
                             if ((it.key == Key.DirectionUp || it.key == Key.DirectionDown) && it.type == KeyEventType.KeyDown) {
                                 historyIndex = when (it.key) {
                                     Key.DirectionUp -> minOf(historyIndex + 1, viewModel.commandHistory.lastIndex)
@@ -219,8 +213,8 @@ fun Terminal() {
                                 prompt.updateValue(viewModel.nextSuggest(lastInput))
                                 true
                             } else false
-                        }
                     }
+                }
 
 
             }
@@ -230,12 +224,13 @@ fun Terminal() {
     }
 }
 
-object VirtualKeyboardManager{
-    private val listeners= mutableListOf<(KeyEvent)->Boolean>()
-    fun addListener(onPressed:(KeyEvent)->Boolean){
+object VirtualKeyboardManager {
+    private val listeners = mutableListOf<(KeyEvent) -> Boolean>()
+    fun addListener(onPressed: (KeyEvent) -> Boolean) {
         listeners.add(onPressed)
     }
-    fun press(keyEvent: KeyEvent){
+
+    fun press(keyEvent: KeyEvent) {
         listeners.forEach {
             if (it(keyEvent)) {
                 return
@@ -243,5 +238,6 @@ object VirtualKeyboardManager{
         }
     }
 }
+
 @Composable
-expect fun VirtualKeyboard(modifier: Modifier=Modifier)
\ No newline at end of file
+expect fun VirtualKeyboard(modifier: Modifier = Modifier)
\ No newline at end of file
diff --git a/clients/composeShared/src/commonMain/kotlin/ViewModel.kt b/clients/composeShared/src/commonMain/kotlin/ViewModel.kt
new file mode 100644
index 0000000..f45b1d0
--- /dev/null
+++ b/clients/composeShared/src/commonMain/kotlin/ViewModel.kt
@@ -0,0 +1,34 @@
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import kotlin.reflect.KProperty
+
+interface ViewModel {
+
+}
+
+@PublishedApi
+internal object ViewModelStore {
+    @PublishedApi
+    internal val store = mutableMapOf<String, ViewModel>()
+    inline fun <reified T : ViewModel> getOrCreate(builder: () -> ViewModel): T {
+        return store.getOrPut(T::class.simpleName!!, builder) as T
+    }
+}
+
+class ViewModelInstance<T : ViewModel>(val builder: () -> ViewModel) {
+    inline operator fun <reified R : T> getValue(t: R?, property: KProperty<*>): R {
+        return ViewModelStore.getOrCreate<R>(builder)
+    }
+}
+
+inline fun <reified T : ViewModel> viewModel(noinline builder: () -> T): ViewModelInstance<T> {
+    return ViewModelInstance(builder)
+}
+
+
+@Composable
+inline fun <reified T : ViewModel> rememberViewModel(noinline builder: () -> T) {
+    return remember(builder) {
+        ViewModelStore.getOrCreate<T>(builder)
+    }
+}
\ No newline at end of file
diff --git a/clients/composeShared/src/commonMain/kotlin/component/TextLog.kt b/clients/composeShared/src/commonMain/kotlin/component/TextLog.kt
index 4015640..158f9ef 100644
--- a/clients/composeShared/src/commonMain/kotlin/component/TextLog.kt
+++ b/clients/composeShared/src/commonMain/kotlin/component/TextLog.kt
@@ -1,7 +1,8 @@
 package component
 
-import PlatformBackend
 import LocalDefaultFont
+import Platform
+import PlatformBackend
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
@@ -16,9 +17,9 @@ import androidx.compose.ui.text.*
 import androidx.compose.ui.text.style.LineBreak
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.TextUnit
-import platform
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import platform
 import kotlin.text.Regex.Companion.fromLiteral
 
 expect fun getSystemLineSeparator():String
@@ -103,7 +104,6 @@ fun TextLog(
     footer: @Composable (() -> Unit)? = null
 ) {
 
-
     Box(modifier = Modifier.fillMaxSize().then(modifier)) {
         SelectionContainer {
             LazyColumn(Modifier.fillMaxWidth(), state = lazyListState, reverseLayout = true) {
@@ -147,7 +147,6 @@ fun TextLog(
                                     } else {
                                         text.subSequence(start, end)
                                     }
-                                println("L$it : $shown")
                                 BasicText(
                                     shown,
                                     Modifier.fillMaxWidth(),
diff --git a/clients/cuiApp/build.gradle.kts b/clients/cuiApp/build.gradle.kts
index 19efb88..e079d77 100644
--- a/clients/cuiApp/build.gradle.kts
+++ b/clients/cuiApp/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     kotlin("jvm")
-    id("org.jetbrains.dokka") version "1.7.20"
 }
 
 group = "me.naotiki.ese"
diff --git a/clients/desktopApp/build.gradle.kts b/clients/desktopApp/build.gradle.kts
index 1d0cf3c..6c96c8d 100644
--- a/clients/desktopApp/build.gradle.kts
+++ b/clients/desktopApp/build.gradle.kts
@@ -4,7 +4,6 @@ import org.gradle.kotlin.dsl.support.zipTo
 plugins {
     kotlin("jvm")
     id("org.jetbrains.compose")
-    id("org.jetbrains.dokka") version "1.7.20"
     application
     id("com.github.johnrengelman.shadow") version "7.1.2"
     distribution
diff --git a/clients/desktopApp/src/main/kotlin/Main.kt b/clients/desktopApp/src/main/kotlin/Main.kt
index 1ef982b..759e311 100644
--- a/clients/desktopApp/src/main/kotlin/Main.kt
+++ b/clients/desktopApp/src/main/kotlin/Main.kt
@@ -25,15 +25,26 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.awaitApplication
 import component.assistant.CommandPanel
 import component.assistant.EasyFileView
+import me.naotiki.ese.core.PlatformImpl
 import me.naotiki.ese.core.appName
+import me.naotiki.ese.core.getEseHomeDirByProp
+import me.naotiki.ese.core.initializePlatformImpl
 import org.jetbrains.compose.splitpane.ExperimentalSplitPaneApi
 import org.jetbrains.compose.splitpane.HorizontalSplitPane
 import org.jetbrains.compose.splitpane.SplitPaneState
+import java.io.File
 
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalSplitPaneApi::class)
+@OptIn(ExperimentalComposeUiApi::class)
 suspend fun main(vararg args: String) {
     println("Starting... $appName")
+    println(System.getProperties().map {(k,v)->
+        "$k : $v"
+    }.joinToString("\n"))
     initializeComposeCommon(args)
+    val clientPlatformImpl= object : PlatformImpl {
+        override fun getEseHomeDir(): File = getEseHomeDirByProp()
+    }
+    initializePlatformImpl(clientPlatformImpl)
     awaitApplication {
         val appViewModel = rememberAppViewModel()
         // ... Content goes here ...
diff --git a/clients/webApp/src/jsMain/kotlin/main.js.kt b/clients/webApp/src/jsMain/kotlin/main.js.kt
index 36746c3..2a19369 100644
--- a/clients/webApp/src/jsMain/kotlin/main.js.kt
+++ b/clients/webApp/src/jsMain/kotlin/main.js.kt
@@ -1,10 +1,7 @@
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.Button
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.window.Window
 import me.naotiki.ese.core.Shell
diff --git a/docs/Version.md b/docs/Version.md
new file mode 100644
index 0000000..f20790c
--- /dev/null
+++ b/docs/Version.md
@@ -0,0 +1,19 @@
+# Ese Versions
+忘れるのでメモ
+
+[セマンティック・バージョニング](https://semver.org/lang/ja/)を使用
+
+|  変数   | 形式       | 説明                          |
+|:-----:|----------|-----------------------------|
+|   X   | 整数       | メジャーバージョン                   |
+|   Y   | 整数       | マイナーバージョン                   |
+|   Z   | 整数       | パッチ                         |
+|  PRE  | 文字列(数字可) | プレリリースの場合 (例、alpha→beta→rc) |
+`X.Y.Z(-PRE)`
+#### 例
+- `1.0.0`
+- `1.0.1-beta`
+- `0.1.4-alpha1`
+
+## Ese Gradle PluginとEse Coreの関係
+Ese Gradle PluginとEse Coreのバージョンは同期します。
\ No newline at end of file
diff --git a/ese-core/build.gradle.kts b/ese-core/build.gradle.kts
index 2e7f29a..34a9af8 100644
--- a/ese-core/build.gradle.kts
+++ b/ese-core/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon
 import java.awt.SystemColor.text
@@ -5,10 +6,13 @@ import java.awt.SystemColor.text
 plugins {
     kotlin("multiplatform") //version "1.8.10"
     kotlin("plugin.serialization") version "1.8.10"
+    id("org.jetbrains.dokka") version "1.8.10"
+    `maven-publish`
+    signing
 }
 
 group = "me.naotiki"
-version = "0.0-B"
+version = "0.0.1-dev2"
 
 repositories {
     mavenCentral()
@@ -85,13 +89,10 @@ kotlin {
 
 
     sourceSets {
-        val generated by creating{
+        val commonMain by getting {
             kotlin{
                 srcDir(buildDir.resolve("generated"))
             }
-        }
-        val commonMain by getting {
-            dependsOn(generated)
             dependencies {
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
@@ -119,3 +120,19 @@ kotlin {
             val nativeTest by getting*/
     }
 }
+
+publishing {
+    this.repositories {
+        maven {
+            name = "localPluginRepository"
+            url = uri("../local-plugin-repository")
+        }
+    }
+    publications {
+        create<MavenPublication>("maven") {
+            groupId = "me.naotiki.ese"
+            from(components["kotlin"])
+            artifactId="core"
+        }
+    }
+}
diff --git a/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/ClientImpl.kt b/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/ClientImpl.kt
index 17e5889..11dcf83 100644
--- a/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/ClientImpl.kt
+++ b/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/ClientImpl.kt
@@ -6,4 +6,11 @@ interface ClientImpl {
     fun exit()
 
     fun clear()
+}
+
+expect interface PlatformImpl
+lateinit var platformImpl: PlatformImpl
+    private set
+fun initializePlatformImpl(impl: PlatformImpl){
+    platformImpl=impl
 }
\ No newline at end of file
diff --git a/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/Entry.kt b/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/Entry.kt
index fba276f..7772785 100644
--- a/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/Entry.kt
+++ b/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/Entry.kt
@@ -33,12 +33,15 @@ fun programArg(args: List<String>) {
     }
 }
 
-
-
-private var initialized = false
-suspend fun initialize( clientImpl: ClientImpl,initMessage:String="") {
-    check(!initialized)
-    ClientImpl =clientImpl
+/**
+ * Ese Coreが初期化されたかどうか
+ * */
+var eseInitialized = false
+    private set
+
+suspend fun initialize(clientImpl: ClientImpl, initMessage: String = "") {
+    check(!eseInitialized)
+    ClientImpl = clientImpl
     var userName: String
     EseSystem.IO.printChannel.println(
         """
@@ -68,12 +71,12 @@ suspend fun initialize( clientImpl: ClientImpl,initMessage:String="") {
     newUser.setHomeDir { user, group ->
         fileDSL(FileTree.home, UserManager.uRoot) {
             dir(user.name, user, group) {
-                    "LOG:" + textFile(
-                        "Readme.txt",
-                        """
+                "LOG:" + textFile(
+                    "Readme.txt",
+                    """
             TODO:なんか書く
             """.trimIndent()
-                    ).parent?.name
+                ).parent?.name
 
             }
         }
@@ -81,7 +84,7 @@ suspend fun initialize( clientImpl: ClientImpl,initMessage:String="") {
     FileSystem.setCurrentPath(newUser.dir!!)
     UserManager.setUser(newUser)
 
-    initialized = true
+    eseInitialized = true
     while (true/*TODO 終了機能*/) {
         val input = EseSystem.IO.newPromptAsync(clientImpl, "${UserManager.user.name}:${FileSystem.currentPath.value}>")
             .ifBlank {
diff --git a/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/commands/parser/Executable.kt b/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/commands/parser/Executable.kt
index a7ecbf1..c832a9d 100644
--- a/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/commands/parser/Executable.kt
+++ b/ese-core/src/commonMain/kotlin/me/naotiki/ese/core/commands/parser/Executable.kt
@@ -229,7 +229,7 @@ abstract class Executable<R>(val name: String, val description: String? = null)
                 },
                 onFailure = {
                     if (it is EseError) {
-                        out.println(it.errorName)
+                        out.println(it.buildErrorMessage())
                     } else {
                         out.println(it.stackTraceToString())
 
diff --git a/ese-core/src/jsMain/kotlin/me/naotiki/ese/core/ClientPlatformImpl.kt b/ese-core/src/jsMain/kotlin/me/naotiki/ese/core/ClientPlatformImpl.kt
new file mode 100644
index 0000000..05b7622
--- /dev/null
+++ b/ese-core/src/jsMain/kotlin/me/naotiki/ese/core/ClientPlatformImpl.kt
@@ -0,0 +1,4 @@
+package me.naotiki.ese.core
+
+actual interface PlatformImpl
+
diff --git a/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/ClientPlatformImpl.kt b/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/ClientPlatformImpl.kt
new file mode 100644
index 0000000..76eb622
--- /dev/null
+++ b/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/ClientPlatformImpl.kt
@@ -0,0 +1,16 @@
+package me.naotiki.ese.core
+
+import me.naotiki.ese.core.commands.parser.ArgType
+import java.io.File
+
+actual interface PlatformImpl{
+    fun getEseHomeDir(): File?
+}
+
+const val eseHomePropName="ese.homedir"
+private const val developmentEseHome="EseHome"
+val eseHomeDirPath = System.getProperty(eseHomePropName, developmentEseHome)
+//For Desktop
+fun getEseHomeDirByProp():File{
+    return File(eseHomeDirPath)
+}
\ No newline at end of file
diff --git a/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/secure/EseClassLoader.kt b/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/secure/EseClassLoader.kt
index 0a05fb1..492c857 100644
--- a/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/secure/EseClassLoader.kt
+++ b/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/secure/EseClassLoader.kt
@@ -10,7 +10,7 @@ import java.util.jar.JarFile
 object PluginLoader {
     fun loadPluginFromFile(file: File): EsePlugin? {
         val jarFile = JarFile(file)
-        val className = jarFile.manifest.mainAttributes.getValue("Plugin-Class")
+        val className = jarFile.manifest.mainAttributes.getValue("Ese-Plugin-Class")
         return runCatching { EseClassLoader(file).loadClass(className).getConstructor().newInstance() }.fold({
             it as? EsePlugin
         }, {
@@ -34,7 +34,7 @@ private class EseClassLoader(
         try {
             val path = name.replace('.', '/') + ".class"
             val jarInputStream = URL("jar:" + pluginFile.toURI().toURL() + "!/" + path).openStream()
-            val allClassBytes: ByteArray = jarInputStream.readAllBytes()//TODO readBytes
+            val allClassBytes: ByteArray = jarInputStream.readAllBytes()//TODO readBytes?
             val classReader = ClassReader(allClassBytes)
 
             // クラスにデバッグ情報がある場合、
diff --git a/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/vfs/PlatformCommands.kt b/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/vfs/PlatformCommands.kt
index 6345447..d61dd8b 100644
--- a/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/vfs/PlatformCommands.kt
+++ b/ese-core/src/jvmMain/kotlin/me/naotiki/ese/core/vfs/PlatformCommands.kt
@@ -1,17 +1,17 @@
 package me.naotiki.ese.core.vfs
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import me.naotiki.ese.core.EseSystem
+import me.naotiki.ese.core.EseError
 import me.naotiki.ese.core.EseSystem.IO
 import me.naotiki.ese.core.appName
 import me.naotiki.ese.core.commands.parser.ArgType
 import me.naotiki.ese.core.commands.parser.Executable
+import me.naotiki.ese.core.platformImpl
 import me.naotiki.ese.core.secure.PluginLoader
 import me.naotiki.ese.core.user.User
 import me.naotiki.ese.core.utils.normalizeYesNoAnswer
+import me.naotiki.ese.core.vfs.Udon.SearchType.*
 import java.io.File
-import java.util.jar.JarFile
+import java.io.FileFilter
 
 actual val platformCommands: List<Executable<*>> =
     listOf(Udon())
@@ -38,16 +38,13 @@ class Status : Executable<Unit>(
     }
 }
 
-//Pluginsフォルダなど
-val dataDir = File(System.getProperty("compose.application.resources.dir") ?: "client-gui/resources/common/")
 
-class Udon : Executable<Unit>("udon", "UDON is a Downloader Of Noodles") {
+class Udon : Executable<Unit>("udon", "Udon : Downloader Of Noodles") {
     var agree = false
-    override val subCommands: List<SubCommand<*>>
-    = listOf(Install(),LocalInstall())
+    override val subCommands: List<SubCommand<*>> = listOf(Install(), LocalInstall(), Search())
 
-    //さぶこまんど
-    inner class Install : SubCommand<Unit>("world", "世界中からインストールします。") {
+    //うどんワールド
+    inner class Install : SubCommand<Unit>("world", "世界中からNoodleをインストールします。") {
 
         val pkgName by argument(ArgType.String, "packageName", "パッケージ名")
         override suspend fun execute(user: User, rawArgs: List<String>) {
@@ -56,39 +53,79 @@ class Udon : Executable<Unit>("udon", "UDON is a Downloader Of Noodles") {
         }
     }
 
+    //ディレクトリの存在が保証されます。
+    private fun getPluginDirOrThrow(): File {
+        return platformImpl.getEseHomeDir()?.takeIf { it.exists() }
+            ?: throw EseError.CommandExecutionError("Ese Homeフォルダーが見つかりませんでした。")
+    }
+
     inner class LocalInstall : SubCommand<Unit>("local", "ローカルファイルからインストールします。") {
         val pkgName by argument(ArgType.String, "packageName", "パッケージ名")
         override suspend fun execute(user: User, rawArgs: List<String>) {
-            val pluginDir = File(dataDir, "plugins")
-            if (!pluginDir.exists()) {
-                out.println("pluginフォルダーが見つかりませんでした。\n${pluginDir.absolutePath}に作成してください。")
-            }
-            val file = pluginDir.listFiles { dir, name -> name.endsWith(".$fileExtension") }.orEmpty().singleOrNull {
+            val pluginDir = getPluginDirOrThrow()
+            val ndlFile = pluginDir.getPluginFiles {
                 it.nameWithoutExtension == pkgName
-            } ?: return
-            val jarFile = withContext(Dispatchers.IO) {
-                JarFile(file)
-            }
-            val targetClassName = jarFile.manifest.mainAttributes.getValue("Plugin-Class")
+            }.single()
             var ans: Boolean?
             do {
                 ans = normalizeYesNoAnswer(
-                    IO.newPrompt(client, "プラグイン ${file.nameWithoutExtension} を本当にインストールしますか？(yes/no)")
+                    IO.newPrompt(client, "Noodle ${ndlFile.nameWithoutExtension} を本当にインストールしますか？(yes/no)")
                 )
             } while (ans == null)
             if (ans != true) {
-
                 return
             }
-            val plugin = PluginLoader.loadPluginFromFile(file)
+            val plugin = PluginLoader.loadPluginFromFile(ndlFile)
+
+            plugin?.init(user)?:throw EseError.CommandExecutionError("UDON ERROR:Noodle 「${ndlFile.nameWithoutExtension}」を ロードできませんでした")
+        }
+    }
+
+    private enum class SearchType {
+        First,
+        Last,
+        Contains,
+        Complete,
+    }
+
+    inner class Search : SubCommand<Unit>("search", "Noodleを検索します") {
+
+        val ndlName by argument(ArgType.String, "packageName", "パッケージ名")
+        private val type by option(ArgType.Choice<SearchType>(), "type", "t", "検索方法").default(First)
+        private val isLocal by option(ArgType.Boolean, "local", description = "ローカルファイルのみを検索します")
+        private val isWorld by option(ArgType.Boolean, "world", description = "ローカルファイルのみを検索します")
+        override suspend fun execute(user: User, rawArgs: List<String>) {
+
+            if (isLocal != false) {
+
+                out.println("Search ${platformImpl.getEseHomeDir()?.absolutePath}")
+                val eseDir = getPluginDirOrThrow()
+                val files = eseDir.getPluginFiles {
+                    when (type) {
+                        First -> it.nameWithoutExtension.startsWith(ndlName)
+                        Last -> it.nameWithoutExtension.endsWith(ndlName)
+                        Contains -> it.nameWithoutExtension.contains(ndlName)
+                        Complete -> it.nameWithoutExtension.contentEquals(ndlName)//TODO REGEXでパッケージ名規約作成→バージョン部と区別
+                    }
+                }
+                out.println("${files.size}件 ヒット")
+                files.forEach {
+                    out.println("${it.nameWithoutExtension} \n  → ${it.absolutePath} ")
+                }
+            }
+
+            if (isWorld != false) {
+
+            }
+
 
-            plugin?.init(user)
         }
     }
 
     override suspend fun execute(user: User, rawArgs: List<String>) {
         out.println(
             """
+            Udon : Downloader Of Noodles.
             Udon は $appName のプラグインマネージャーです。
             """.trimIndent()
         )
@@ -96,6 +133,12 @@ class Udon : Executable<Unit>("udon", "UDON is a Downloader Of Noodles") {
 
     companion object {
         const val fileExtension = "ndl"
+
+        fun File.getPluginFiles(predicate: (File) -> Boolean): Array<out File> {
+            return listFiles(FileFilter {
+                it.name.endsWith(".$fileExtension") && predicate(it)
+            }).orEmpty()
+        }
     }
 }
 
diff --git a/ese-gradle-plugin/build.gradle.kts b/ese-gradle-plugin/build.gradle.kts
index 5e6e88a..4f0821a 100644
--- a/ese-gradle-plugin/build.gradle.kts
+++ b/ese-gradle-plugin/build.gradle.kts
@@ -1,5 +1,6 @@
+
 group="me.naotiki.ese.dev"
-version = "1.0.0-SNAPSHOT"
+version = "0.0.1-dev2"
 
 plugins {
     kotlin("jvm") version "1.8.10"
@@ -13,10 +14,24 @@ repositories {
 }
 
 gradlePlugin{
+
+    website.set("https://github.com/naotiki/Ese")
+    vcsUrl.set("https://github.com/naotiki/Ese.git")
     plugins {
         create("esePlugin"){
-            id="$group.plugin"
+            id="me.naotiki.ese.gradle-plugin"
+            displayName = "Gradle Plugin for Ese Plugin Development"
+            description = "A Gradle Plugin for Ese Plugin Development"
             implementationClass = "me.naotiki.ese.dev.plugin.EseGradlePlugin"
+            tags.set(listOf("ese"))
         }
     }
 }
+publishing {
+    repositories {
+        maven {
+            name = "localPluginRepository"
+            url = uri("../local-plugin-repository")
+        }
+    }
+}
\ No newline at end of file
diff --git a/ese-gradle-plugin/src/main/kotlin/EseGradlePlugin.kt b/ese-gradle-plugin/src/main/kotlin/EseGradlePlugin.kt
index 4df4fc6..49ab689 100644
--- a/ese-gradle-plugin/src/main/kotlin/EseGradlePlugin.kt
+++ b/ese-gradle-plugin/src/main/kotlin/EseGradlePlugin.kt
@@ -1,10 +1,14 @@
 package me.naotiki.ese.dev.plugin
+
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.provider.Property
 import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.properties
+import org.gradle.kotlin.dsl.register
 import java.io.File
 
 interface EseGradlePluginExtension {
@@ -15,51 +19,61 @@ interface EseGradlePluginExtension {
 class EseGradlePlugin : Plugin<Project> {
 
     override fun apply(project: Project) {
-        val extension = project.extensions.create("EseConfig",EseGradlePluginExtension::class.java)
-        val jarTask=project.tasks.named("jar",Jar::class.java) {
+        project.dependencies {
+            add(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, "$eseCore:$eseVersion")
+        }
+        val extension = project.extensions.create("EseConfig", EseGradlePluginExtension::class.java)
+        val jarTask = project.tasks.named("jar", Jar::class.java) {
             doFirst {
                 manifest {
-                    attributes(mapOf(
-                        "Ese-Format-Version" to "1",
-                        "Ese-Plugin-Class" to extension.pluginClass.get())
+                    attributes(
+                        mapOf(
+                            "Ese-Format-Version" to "1",
+                            "Ese-Plugin-Class" to extension.pluginClass.get()
+                        )
                     )
                 }
             }
 
-            }
+        }
 
-        project.tasks.create("createEsePlugin") {
+        val createEsePlugin = project.tasks.create("createEsePlugin") {
             val outDir = project.file(project.buildDir).resolve("ese")
             group = "build"
             description = "Create Ese Plugin File (Noodle File)"
             inputs.file(jarTask.get().archiveFile)
-            outputs.dir(outDir)
+            if (extension.pluginName.orNull!=null){
+                outputs.file(outDir.resolve(extension.pluginName.get()+".ndl"))
+            }
             dependsOn("assemble")
             /* doFirst {
                  project.delete{
                      delete(outDir)
                  }
              }*/
-             doLast {
+            doLast {
                 // outDir.mkdir()
                 project.copy {
                     from(jarTask.get().archiveFile)
-
                     into(outDir)
                     rename { "${extension.pluginName.get()}.ndl" }
                 }
                 /*project.delete {
                     delete(jarTask.get().archiveFile)
                 }*/
-                println(extension.pluginClass.get())
             }
 
         }
+        project.tasks.register<RunEsePluginTask>("runEsePlugin") {
+            dependsOn(createEsePlugin)
+            inputs.file(createEsePlugin.outputs.files.singleFile)
+        }
 
     }
 
     data class EsePluginConfig(val name: String, val description: String, val version: String)
 }
-fun Project.esePlugin(block: EseGradlePluginExtension.() -> Unit){
+
+fun Project.esePlugin(block: EseGradlePluginExtension.() -> Unit) {
     configure<EseGradlePluginExtension>(block)
 }
\ No newline at end of file
diff --git a/ese-gradle-plugin/src/main/kotlin/RunEsePluginTask.kt b/ese-gradle-plugin/src/main/kotlin/RunEsePluginTask.kt
new file mode 100644
index 0000000..9450960
--- /dev/null
+++ b/ese-gradle-plugin/src/main/kotlin/RunEsePluginTask.kt
@@ -0,0 +1,24 @@
+package me.naotiki.ese.dev.plugin
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.TaskAction
+import org.gradle.internal.enterprise.test.FileProperty
+import java.io.File
+
+abstract class RunEsePluginTask: DefaultTask() {
+
+    @get:Input
+    abstract val eseClientPath : Property<String>
+
+    @TaskAction
+    fun runEsePlugin(){
+        println(
+            inputs.files.singleFile.absolutePath)
+        ProcessBuilder(eseClientPath.get(),"-p","")
+    }
+}
\ No newline at end of file
diff --git a/ese-gradle-plugin/src/main/kotlin/Versions.kt b/ese-gradle-plugin/src/main/kotlin/Versions.kt
new file mode 100644
index 0000000..805a230
--- /dev/null
+++ b/ese-gradle-plugin/src/main/kotlin/Versions.kt
@@ -0,0 +1,5 @@
+package me.naotiki.ese.dev.plugin
+
+const val eseCore="me.naotiki.ese:core"
+
+const val eseVersion="0.0.1-dev2"
\ No newline at end of file
diff --git a/ese-lib/build.gradle.kts b/ese-lib/build.gradle.kts
index df3b5d7..f5b853f 100644
--- a/ese-lib/build.gradle.kts
+++ b/ese-lib/build.gradle.kts
@@ -2,7 +2,8 @@ import me.naotiki.ese.dev.plugin.esePlugin
 
 plugins {
     kotlin("jvm") version "1.8.20"
-    id("me.naotiki.ese.dev.plugin")
+
+    id("me.naotiki.ese.gradle-plugin") version "0.0.1-dev2"
 }
 
 group = "me.naotiki"
@@ -12,16 +13,16 @@ kotlin{
 }
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 esePlugin {
     pluginClass.set("Main")
-    pluginName.set("ExamplePlugin")
+    pluginName.set("Test")
 }
 dependencies {
-    implementation(project(":ese-core"))
 }
 
 tasks.getByName<Test>("test") {
     useJUnitPlatform()
     jvmArgs("-Djava.security.policy")
-}
\ No newline at end of file
+}
diff --git a/ese-lib/settings.gradle.kts b/ese-lib/settings.gradle.kts
index debdeea..5e91c86 100644
--- a/ese-lib/settings.gradle.kts
+++ b/ese-lib/settings.gradle.kts
@@ -1,7 +1,13 @@
 pluginManagement {
-    includeBuild("../ese-gradle-plugin")
+    //includeBuild("../ese-gradle-plugin")
+    repositories {
+        mavenCentral()
+        maven {
+            name = "localPluginRepository"
+            url = uri("../local-plugin-repository")
+        }
+
+    }
 }
 
 rootProject.name = "ese-lib"
-
-includeFlat("ese-core")
\ No newline at end of file
diff --git a/ese-lib/src/main/kotlin/Main.kt b/ese-lib/src/main/kotlin/Main.kt
index 772ebc2..a8aeb15 100644
--- a/ese-lib/src/main/kotlin/Main.kt
+++ b/ese-lib/src/main/kotlin/Main.kt
@@ -1,24 +1,20 @@
 import me.naotiki.ese.core.EseSystem
-import me.naotiki.ese.core.IO
 import me.naotiki.ese.core.api.EsePlugin
 import me.naotiki.ese.core.commands.parser.Executable
 import me.naotiki.ese.core.user.User
-import me.naotiki.ese.core.vfs.FileSystem
-import me.naotiki.ese.core.vfs.FileTree
 import me.naotiki.ese.core.vfs.Path.Companion.toPath
 import me.naotiki.ese.core.vfs.dsl.dir
 import me.naotiki.ese.core.vfs.dsl.executable
 import me.naotiki.ese.core.vfs.dsl.fileDSL
 import me.naotiki.ese.core.vfs.toDirectoryOrNull
-import java.io.File
 
 class Main : EsePlugin {
-    override suspend fun init(user: User) {
+    /*override suspend fun init(user: User) {
         println("[Plugin] 到達")
-        /*@Suppress("removal")
+        *//*@Suppress("removal")
         Policy.getPolicy()!!.getPermissions(CodeSource(URL(null), emptyArray<CodeSigner>())).elements().toList().map {
             it.name
-        }.log("[Plugin]")*/
+        }.log("[Plugin]")*//*
         Runtime::class.members.single().call()
         Runtime::javaClass.call().getMethod("").invoke("")
 
@@ -26,23 +22,23 @@ class Main : EsePlugin {
         EseSystem.IO.printChannel.println("インストール完了\nはろー！${user.name}さん！")
         Runtime.getRuntime().exec("notepad.exe")
         File("/home/naotiki/").resolve("eselinux").mkdir()
-    }
+    }*/
 
-    /*override*//* fun init2(user: User) {
-        val installDir = fs.tryResolve("/opt".toPath())?.toDirectoryOrNull()
-            ?: fileDSL(fileTree.root, user) {
+    override suspend fun init(user: User) {
+        val installDir = EseSystem.FileTree.tryResolve("/opt".toPath())?.toDirectoryOrNull()
+            ?: fileDSL(EseSystem.FileTree.root, user) {
                 dir("/opt")
             }
         fileDSL(installDir, user) {
             dir("ExamplePlugin") {
-                fileTree.executableEnvPaths += dir("bin") {
+                EseSystem.FileTree.executableEnvPaths += dir("bin") {
                     executable(PluginCommand())
                 }
             }
         }
         println("[Plugin] 到達")
-        io.outputStream.println("インストール完了\nはろー！${user.export().name}さん！")
-    }*/
+        EseSystem.IO.printChannel.println("インストール完了\nはろー！${user.name}さん！")
+    }
 }
 
 class PluginCommand : Executable<Unit>("example", "ExamplePluginプラグインによって追加されたコマンド") {