@prover-coder-ai/docker-git 1.0.13 → 1.0.15

package/dist/src/docker-git/menu-actions.js

@@ -2,7 +2,7 @@ import {} from "@effect-template/lib/core/domain";
 import { readProjectConfig } from "@effect-template/lib/shell/config";
 import { runDockerComposeDown, runDockerComposeLogs, runDockerComposePs } from "@effect-template/lib/shell/docker";
 import { renderError } from "@effect-template/lib/usecases/errors";
-import { downAllDockerGitProjects, listProjectItems, listRunningProjectItems } from "@effect-template/lib/usecases/projects";
+import { downAllDockerGitProjects, listProjectItems, listProjectStatus, listRunningProjectItems } from "@effect-template/lib/usecases/projects";
 import { runDockerComposeUpWithPortCheck } from "@effect-template/lib/usecases/projects-up";
 import { Effect, Match, pipe } from "effect";
 import { startCreateView } from "./menu-create.js";
@@ -80,6 +80,10 @@ const runDeleteAction = (context) => {
     context.runner.runEffect(loadSelectView(listProjectItems, "Delete", context));
 };
 const runComposeAction = (action, context) => {
+    if (action._tag === "Status" && context.state.activeDir === null) {
+        runWithSuspendedTui(listProjectStatus, context, "docker compose ps (all projects)");
+        return;
+    }
     if (!requireActiveProject(context)) {
         return;
     }

package/dist/src/docker-git/menu-input-handler.js

@@ -0,0 +1,67 @@
+import { handleCreateInput } from "./menu-create.js";
+import { handleMenuInput } from "./menu-menu.js";
+import { handleSelectInput } from "./menu-select.js";
+const activateInput = (input, key, context) => {
+    if (context.inputStage === "active") {
+        return { activated: false, allowProcessing: true };
+    }
+    if (input.trim().length > 0) {
+        context.setInputStage("active");
+        return { activated: true, allowProcessing: true };
+    }
+    if (key.upArrow || key.downArrow || key.return) {
+        context.setInputStage("active");
+        return { activated: true, allowProcessing: false };
+    }
+    if (input.length > 0) {
+        context.setInputStage("active");
+        return { activated: true, allowProcessing: true };
+    }
+    return { activated: false, allowProcessing: false };
+};
+const shouldHandleMenuInput = (input, key, context) => {
+    const activation = activateInput(input, key, context);
+    if (activation.activated && !activation.allowProcessing) {
+        return false;
+    }
+    return activation.allowProcessing;
+};
+export const handleUserInput = (input, key, context) => {
+    if (context.busy || context.sshActive) {
+        return;
+    }
+    if (context.view._tag === "Menu") {
+        if (!shouldHandleMenuInput(input, key, context)) {
+            return;
+        }
+        handleMenuInput(input, key, {
+            selected: context.selected,
+            setSelected: context.setSelected,
+            state: context.state,
+            runner: context.runner,
+            exit: context.exit,
+            setView: context.setView,
+            setMessage: context.setMessage
+        });
+        return;
+    }
+    if (context.view._tag === "Create") {
+        handleCreateInput(input, key, context.view, {
+            state: context.state,
+            setView: context.setView,
+            setMessage: context.setMessage,
+            runner: context.runner,
+            setActiveDir: context.setActiveDir
+        });
+        return;
+    }
+    handleSelectInput(input, key, context.view, {
+        setView: context.setView,
+        setMessage: context.setMessage,
+        setActiveDir: context.setActiveDir,
+        activeDir: context.state.activeDir,
+        runner: context.runner,
+        setSshActive: context.setSshActive,
+        setSkipInputs: context.setSkipInputs
+    });
+};

package/dist/src/docker-git/menu-render.js

@@ -36,9 +36,11 @@ const renderMenuMessage = (el, message) => {
         .split("\n")
         .map((line, index) => el(Text, { key: `${index}-${line}`, color: "magenta" }, line)));
 };
-export const renderMenu = (cwd, activeDir, selected, busy, message) => {
+export const renderMenu = (input) => {
+    const { activeDir, busy, cwd, message, runningDockerGitContainers, selected } = input;
     const el = React.createElement;
     const activeLabel = `Active: ${activeDir ?? "(none)"}`;
+    const runningLabel = `Running docker-git containers: ${runningDockerGitContainers}`;
     const cwdLabel = `CWD: ${cwd}`;
     const items = menuItems.map((item, index) => {
         const indexLabel = `${index + 1})`;
@@ -52,6 +54,7 @@ export const renderMenu = (cwd, activeDir, selected, busy, message) => {
     const hints = renderMenuHints(el);
     return renderLayout("docker-git", compactElements([
         el(Text, null, activeLabel),
+        el(Text, null, runningLabel),
         el(Text, null, cwdLabel),
         el(Box, { flexDirection: "column", marginTop: 1 }, ...items),
         hints,

package/dist/src/docker-git/menu-startup.js

@@ -0,0 +1,57 @@
+const dockerGitContainerPrefix = "dg-";
+const emptySnapshot = () => ({
+    activeDir: null,
+    runningDockerGitContainers: 0,
+    message: null
+});
+const uniqueDockerGitContainerNames = (runningContainerNames) => [
+    ...new Set(runningContainerNames.filter((name) => name.startsWith(dockerGitContainerPrefix)))
+];
+const detectKnownRunningProjects = (items, runningDockerGitNames) => {
+    const runningSet = new Set(runningDockerGitNames);
+    return items.filter((item) => runningSet.has(item.containerName));
+};
+const renderRunningHint = (runningCount) => runningCount === 1
+    ? "Detected 1 running docker-git container."
+    : `Detected ${runningCount} running docker-git containers.`;
+// CHANGE: infer initial menu state from currently running docker-git containers
+// WHY: avoid "(none)" confusion when containers are already up outside this TUI session
+// QUOTE(ISSUE): "У меня запущены контейнеры от docker-git но он говорит что они не запущены"
+// REF: issue-13
+// SOURCE: n/a
+// FORMAT THEOREM: forall startupState: snapshot(startupState) -> deterministic(menuState)
+// PURITY: CORE
+// EFFECT: n/a
+// INVARIANT: activeDir is set only when exactly one known project is running
+// COMPLEXITY: O(|containers| + |projects|)
+export const resolveMenuStartupSnapshot = (items, runningContainerNames) => {
+    const runningDockerGitNames = uniqueDockerGitContainerNames(runningContainerNames);
+    if (runningDockerGitNames.length === 0) {
+        return emptySnapshot();
+    }
+    const knownRunningProjects = detectKnownRunningProjects(items, runningDockerGitNames);
+    if (knownRunningProjects.length === 1 && runningDockerGitNames.length === 1) {
+        const selected = knownRunningProjects[0];
+        if (!selected) {
+            return emptySnapshot();
+        }
+        return {
+            activeDir: selected.projectDir,
+            runningDockerGitContainers: 1,
+            message: `Auto-selected active project: ${selected.displayName}.`
+        };
+    }
+    if (knownRunningProjects.length === 0) {
+        return {
+            activeDir: null,
+            runningDockerGitContainers: runningDockerGitNames.length,
+            message: `${renderRunningHint(runningDockerGitNames.length)} No matching project config found.`
+        };
+    }
+    return {
+        activeDir: null,
+        runningDockerGitContainers: runningDockerGitNames.length,
+        message: `${renderRunningHint(runningDockerGitNames.length)} Use Select project to choose active.`
+    };
+};
+export const defaultMenuStartupSnapshot = emptySnapshot;

package/dist/src/docker-git/menu.js

@@ -1,14 +1,16 @@
+import { runDockerPsNames } from "@effect-template/lib/shell/docker";
 import { InputReadError } from "@effect-template/lib/shell/errors";
 import { renderError } from "@effect-template/lib/usecases/errors";
+import { listProjectItems } from "@effect-template/lib/usecases/projects";
 import { NodeContext } from "@effect/platform-node";
 import { Effect, pipe } from "effect";
 import { render, useApp, useInput } from "ink";
 import React, { useEffect, useMemo, useState } from "react";
-import { handleCreateInput, resolveCreateInputs } from "./menu-create.js";
-import { handleMenuInput } from "./menu-menu.js";
+import { resolveCreateInputs } from "./menu-create.js";
+import { handleUserInput } from "./menu-input-handler.js";
 import { renderCreate, renderMenu, renderSelect, renderStepLabel } from "./menu-render.js";
-import { handleSelectInput } from "./menu-select.js";
 import { leaveTui, resumeTui } from "./menu-shared.js";
+import { defaultMenuStartupSnapshot, resolveMenuStartupSnapshot } from "./menu-startup.js";
 import { createSteps } from "./menu-types.js";
 // CHANGE: keep menu state in the TUI layer
 // WHY: provide a dynamic interface with live selection and inputs
@@ -35,76 +37,16 @@ const useRunner = (setBusy, setMessage) => {
     };
     return { runEffect };
 };
-const activateInput = (input, key, context) => {
-    if (context.inputStage === "active") {
-        return { activated: false, allowProcessing: true };
-    }
-    if (input.trim().length > 0) {
-        context.setInputStage("active");
-        return { activated: true, allowProcessing: true };
-    }
-    if (key.upArrow || key.downArrow || key.return) {
-        context.setInputStage("active");
-        return { activated: true, allowProcessing: false };
-    }
-    if (input.length > 0) {
-        context.setInputStage("active");
-        return { activated: true, allowProcessing: true };
-    }
-    return { activated: false, allowProcessing: false };
-};
-const shouldHandleMenuInput = (input, key, context) => {
-    const activation = activateInput(input, key, context);
-    if (activation.activated && !activation.allowProcessing) {
-        return false;
-    }
-    return activation.allowProcessing;
-};
-const handleUserInput = (input, key, context) => {
-    if (context.busy) {
-        return;
-    }
-    if (context.sshActive) {
-        return;
-    }
+const renderView = (context) => {
     if (context.view._tag === "Menu") {
-        if (!shouldHandleMenuInput(input, key, context)) {
-            return;
-        }
-        handleMenuInput(input, key, {
+        return renderMenu({
+            cwd: context.state.cwd,
+            activeDir: context.activeDir,
+            runningDockerGitContainers: context.runningDockerGitContainers,
             selected: context.selected,
-            setSelected: context.setSelected,
-            state: context.state,
-            runner: context.runner,
-            exit: context.exit,
-            setView: context.setView,
-            setMessage: context.setMessage
-        });
-        return;
-    }
-    if (context.view._tag === "Create") {
-        handleCreateInput(input, key, context.view, {
-            state: context.state,
-            setView: context.setView,
-            setMessage: context.setMessage,
-            runner: context.runner,
-            setActiveDir: context.setActiveDir
+            busy: context.busy,
+            message: context.message
         });
-        return;
-    }
-    handleSelectInput(input, key, context.view, {
-        setView: context.setView,
-        setMessage: context.setMessage,
-        setActiveDir: context.setActiveDir,
-        activeDir: context.state.activeDir,
-        runner: context.runner,
-        setSshActive: context.setSshActive,
-        setSkipInputs: context.setSkipInputs
-    });
-};
-const renderView = (context) => {
-    if (context.view._tag === "Menu") {
-        return renderMenu(context.state.cwd, context.activeDir, context.selected, context.busy, context.message);
     }
     if (context.view._tag === "Create") {
         const currentDefaults = resolveCreateInputs(context.state.cwd, context.view.values);
@@ -124,6 +66,7 @@ const renderView = (context) => {
 };
 const useMenuState = () => {
     const [activeDir, setActiveDir] = useState(null);
+    const [runningDockerGitContainers, setRunningDockerGitContainers] = useState(0);
     const [selected, setSelected] = useState(0);
     const [busy, setBusy] = useState(false);
     const [message, setMessage] = useState(null);
@@ -138,6 +81,8 @@ const useMenuState = () => {
     return {
         activeDir,
         setActiveDir,
+        runningDockerGitContainers,
+        setRunningDockerGitContainers,
         selected,
         setSelected,
         busy,
@@ -168,6 +113,28 @@ const useReadyGate = (setReady) => {
         };
     }, [setReady]);
 };
+const useStartupSnapshot = (setActiveDir, setRunningDockerGitContainers, setMessage) => {
+    useEffect(() => {
+        let cancelled = false;
+        const startup = pipe(Effect.all([listProjectItems, runDockerPsNames(process.cwd())]), Effect.map(([items, runningNames]) => resolveMenuStartupSnapshot(items, runningNames)), Effect.match({
+            onFailure: () => defaultMenuStartupSnapshot(),
+            onSuccess: (snapshot) => snapshot
+        }), Effect.provide(NodeContext.layer));
+        void Effect.runPromise(startup).then((snapshot) => {
+            if (cancelled) {
+                return;
+            }
+            setRunningDockerGitContainers(snapshot.runningDockerGitContainers);
+            setMessage(snapshot.message);
+            if (snapshot.activeDir !== null) {
+                setActiveDir(snapshot.activeDir);
+            }
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [setActiveDir, setMessage, setRunningDockerGitContainers]);
+};
 const useSigintGuard = (exit, sshActive) => {
     useEffect(() => {
         const handleSigint = () => {
@@ -186,6 +153,7 @@ const TuiApp = () => {
     const { exit } = useApp();
     const menu = useMenuState();
     useReadyGate(menu.setReady);
+    useStartupSnapshot(menu.setActiveDir, menu.setRunningDockerGitContainers, menu.setMessage);
     useSigintGuard(exit, menu.sshActive);
     useInput((input, key) => {
         if (!menu.ready) {
@@ -220,6 +188,7 @@ const TuiApp = () => {
         state: menu.state,
         view: menu.view,
         activeDir: menu.activeDir,
+        runningDockerGitContainers: menu.runningDockerGitContainers,
         selected: menu.selected,
         busy: menu.busy,
         message: menu.message

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prover-coder-ai/docker-git",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Minimal Vite-powered TypeScript console starter using Effect",
   "main": "dist/src/docker-git/main.js",
   "bin": {

package/src/docker-git/menu-actions.ts

@@ -6,6 +6,7 @@ import { renderError } from "@effect-template/lib/usecases/errors"
 import {
   downAllDockerGitProjects,
   listProjectItems,
+  listProjectStatus,
   listRunningProjectItems
 } from "@effect-template/lib/usecases/projects"
 import { runDockerComposeUpWithPortCheck } from "@effect-template/lib/usecases/projects-up"
@@ -195,6 +196,10 @@ const runDeleteAction = (context: MenuContext) => {
 }
 
 const runComposeAction = (action: MenuAction, context: MenuContext) => {
+  if (action._tag === "Status" && context.state.activeDir === null) {
+    runWithSuspendedTui(listProjectStatus, context, "docker compose ps (all projects)")
+    return
+  }
   if (!requireActiveProject(context)) {
     return
   }

package/src/docker-git/menu-input-handler.ts

@@ -0,0 +1,107 @@
+import { handleCreateInput } from "./menu-create.js"
+import { handleMenuInput } from "./menu-menu.js"
+import { handleSelectInput } from "./menu-select.js"
+import type { MenuKeyInput, MenuRunner, MenuState, MenuViewContext, ViewState } from "./menu-types.js"
+
+export type InputStage = "cold" | "active"
+
+export type MenuInputContext = MenuViewContext & {
+  readonly busy: boolean
+  readonly view: ViewState
+  readonly inputStage: InputStage
+  readonly setInputStage: (stage: InputStage) => void
+  readonly selected: number
+  readonly setSelected: (update: (value: number) => number) => void
+  readonly setSkipInputs: (update: (value: number) => number) => void
+  readonly sshActive: boolean
+  readonly setSshActive: (active: boolean) => void
+  readonly state: MenuState
+  readonly runner: MenuRunner
+  readonly exit: () => void
+}
+
+const activateInput = (
+  input: string,
+  key: Pick<MenuKeyInput, "upArrow" | "downArrow" | "return">,
+  context: Pick<MenuInputContext, "inputStage" | "setInputStage">
+): { readonly activated: boolean; readonly allowProcessing: boolean } => {
+  if (context.inputStage === "active") {
+    return { activated: false, allowProcessing: true }
+  }
+
+  if (input.trim().length > 0) {
+    context.setInputStage("active")
+    return { activated: true, allowProcessing: true }
+  }
+
+  if (key.upArrow || key.downArrow || key.return) {
+    context.setInputStage("active")
+    return { activated: true, allowProcessing: false }
+  }
+
+  if (input.length > 0) {
+    context.setInputStage("active")
+    return { activated: true, allowProcessing: true }
+  }
+
+  return { activated: false, allowProcessing: false }
+}
+
+const shouldHandleMenuInput = (
+  input: string,
+  key: Pick<MenuKeyInput, "upArrow" | "downArrow" | "return">,
+  context: Pick<MenuInputContext, "inputStage" | "setInputStage">
+): boolean => {
+  const activation = activateInput(input, key, context)
+  if (activation.activated && !activation.allowProcessing) {
+    return false
+  }
+  return activation.allowProcessing
+}
+
+export const handleUserInput = (
+  input: string,
+  key: MenuKeyInput,
+  context: MenuInputContext
+) => {
+  if (context.busy || context.sshActive) {
+    return
+  }
+
+  if (context.view._tag === "Menu") {
+    if (!shouldHandleMenuInput(input, key, context)) {
+      return
+    }
+    handleMenuInput(input, key, {
+      selected: context.selected,
+      setSelected: context.setSelected,
+      state: context.state,
+      runner: context.runner,
+      exit: context.exit,
+      setView: context.setView,
+      setMessage: context.setMessage
+    })
+    return
+  }
+
+  if (context.view._tag === "Create") {
+    handleCreateInput(input, key, context.view, {
+      state: context.state,
+      setView: context.setView,
+      setMessage: context.setMessage,
+      runner: context.runner,
+      setActiveDir: context.setActiveDir
+    })
+    return
+  }
+
+  handleSelectInput(input, key, context.view, {
+    setView: context.setView,
+    setMessage: context.setMessage,
+    setActiveDir: context.setActiveDir,
+    activeDir: context.state.activeDir,
+    runner: context.runner,
+    setSshActive: context.setSshActive,
+    setSkipInputs: context.setSkipInputs
+  })
+}

package/src/docker-git/menu-render.ts

@@ -103,15 +103,20 @@ const renderMenuMessage = (
   )
 }
 
-export const renderMenu = (
-  cwd: string,
-  activeDir: string | null,
-  selected: number,
-  busy: boolean,
-  message: string | null
-): React.ReactElement => {
+type MenuRenderInput = {
+  readonly cwd: string
+  readonly activeDir: string | null
+  readonly runningDockerGitContainers: number
+  readonly selected: number
+  readonly busy: boolean
+  readonly message: string | null
+}
+
+export const renderMenu = (input: MenuRenderInput): React.ReactElement => {
+  const { activeDir, busy, cwd, message, runningDockerGitContainers, selected } = input
   const el = React.createElement
   const activeLabel = `Active: ${activeDir ?? "(none)"}`
+  const runningLabel = `Running docker-git containers: ${runningDockerGitContainers}`
   const cwdLabel = `CWD: ${cwd}`
   const items = menuItems.map((item, index) => {
     const indexLabel = `${index + 1})`
@@ -134,6 +139,7 @@ export const renderMenu = (
     "docker-git",
     compactElements([
       el(Text, null, activeLabel),
+      el(Text, null, runningLabel),
       el(Text, null, cwdLabel),
       el(Box, { flexDirection: "column", marginTop: 1 }, ...items),
       hints,

package/src/docker-git/menu-startup.ts

@@ -0,0 +1,83 @@
+import type { ProjectItem } from "@effect-template/lib/usecases/projects"
+
+export type MenuStartupSnapshot = {
+  readonly activeDir: string | null
+  readonly runningDockerGitContainers: number
+  readonly message: string | null
+}
+
+const dockerGitContainerPrefix = "dg-"
+
+const emptySnapshot = (): MenuStartupSnapshot => ({
+  activeDir: null,
+  runningDockerGitContainers: 0,
+  message: null
+})
+
+const uniqueDockerGitContainerNames = (
+  runningContainerNames: ReadonlyArray<string>
+): ReadonlyArray<string> => [
+  ...new Set(runningContainerNames.filter((name) => name.startsWith(dockerGitContainerPrefix)))
+]
+
+const detectKnownRunningProjects = (
+  items: ReadonlyArray<ProjectItem>,
+  runningDockerGitNames: ReadonlyArray<string>
+): ReadonlyArray<ProjectItem> => {
+  const runningSet = new Set(runningDockerGitNames)
+  return items.filter((item) => runningSet.has(item.containerName))
+}
+
+const renderRunningHint = (runningCount: number): string =>
+  runningCount === 1
+    ? "Detected 1 running docker-git container."
+    : `Detected ${runningCount} running docker-git containers.`
+
+// CHANGE: infer initial menu state from currently running docker-git containers
+// WHY: avoid "(none)" confusion when containers are already up outside this TUI session
+// QUOTE(ISSUE): "У меня запущены контейнеры от docker-git но он говорит что они не запущены"
+// REF: issue-13
+// SOURCE: n/a
+// FORMAT THEOREM: forall startupState: snapshot(startupState) -> deterministic(menuState)
+// PURITY: CORE
+// EFFECT: n/a
+// INVARIANT: activeDir is set only when exactly one known project is running
+// COMPLEXITY: O(|containers| + |projects|)
+export const resolveMenuStartupSnapshot = (
+  items: ReadonlyArray<ProjectItem>,
+  runningContainerNames: ReadonlyArray<string>
+): MenuStartupSnapshot => {
+  const runningDockerGitNames = uniqueDockerGitContainerNames(runningContainerNames)
+  if (runningDockerGitNames.length === 0) {
+    return emptySnapshot()
+  }
+
+  const knownRunningProjects = detectKnownRunningProjects(items, runningDockerGitNames)
+  if (knownRunningProjects.length === 1 && runningDockerGitNames.length === 1) {
+    const selected = knownRunningProjects[0]
+    if (!selected) {
+      return emptySnapshot()
+    }
+    return {
+      activeDir: selected.projectDir,
+      runningDockerGitContainers: 1,
+      message: `Auto-selected active project: ${selected.displayName}.`
+    }
+  }
+
+  if (knownRunningProjects.length === 0) {
+    return {
+      activeDir: null,
+      runningDockerGitContainers: runningDockerGitNames.length,
+      message: `${renderRunningHint(runningDockerGitNames.length)} No matching project config found.`
+    }
+  }
+
+  return {
+    activeDir: null,
+    runningDockerGitContainers: runningDockerGitNames.length,
+    message: `${renderRunningHint(runningDockerGitNames.length)} Use Select project to choose active.`
+  }
+}
+
+export const defaultMenuStartupSnapshot = emptySnapshot