@m14i/sith 1.7.6 → 1.8.1

package/README.md

@@ -10,42 +10,54 @@ Standardize and share your OpenCode setup with a fully dockerized environment, d
 
 ## Usage
 
+### Installation
+
+**Install globally (recommended):**
+```bash
+npm install -g @m14i/sith
+```
+
+**Or use npx (slower, pulls image every time):**
+```bash
+npx @m14i/sith@latest
+```
+
 ### Quick Start
 
 ```bash
 # Interactive menu (recommended)
-npx @m14i/sith
-
-# Pull prebuilt image directly
-npx @m14i/sith --pull
+sith
+# Options: Enter Shell | Configuration (Pull/Build)
 
-# Run shell
-npx @m14i/sith shell
+# Direct commands (skip menu)
+sith --it          # Launch shell immediately
+sith --pull        # Pull prebuilt image
+sith --build       # Build from scratch
 ```
 
 ### Distribution Options
 
 | Method | Command | Speed | Trust Model | Use Case |
 |--------|---------|-------|-------------|----------|
-| **Prebuilt (Recommended)** | `npx @m14i/sith --pull` | ⚡ Fast | GitHub Actions + Cosign | Production, CI/CD |
-| **Local Build** | `npx @m14i/sith --build` | 🐌 Slow | Your machine | Air-gapped, custom builds |
+| **Prebuilt (Recommended)** | `sith --pull` | ⚡ Fast | GitHub Actions + Cosign | Production, CI/CD |
+| **Local Build** | `sith --build` | 🐌 Slow | Your machine | Air-gapped, custom builds |
 
 ### Commands
 
 | Command | Description |
 |---------|-------------|
-| `npx @m14i/sith` | Interactive menu with options |
-| `npx @m14i/sith --pull` | Pull prebuilt image from GHCR |
-| `npx @m14i/sith --build` | Build Docker image from scratch |
-| `npx @m14i/sith shell` | Launch interactive shell in container |
-| `npx @m14i/sith --help` | Show all available commands |
+| `sith` | Interactive menu with options |
+| `sith --it` | Launch interactive shell in container |
+| `sith --pull` | Pull prebuilt image from GHCR |
+| `sith --build` | Build Docker image from scratch |
+| `sith --help` | Show all available commands |
 
 ### Prebuilt Image Details
 
 **Pull and verify:**
 ```bash
 # Pull (supports linux/amd64 and linux/arm64)
-npx @m14i/sith --pull
+sith --pull
 
 # Or use Docker directly
 docker pull ghcr.io/merzoukemanouri/sith:latest
@@ -71,12 +83,12 @@ To use GitHub Copilot models, set the `GITHUB_TOKEN` environment variable:
 **Quick start (using GitHub CLI):**
 ```bash
 export GITHUB_TOKEN=$(gh auth token)
-npx @m14i/sith shell
+sith --it
 ```
 
 **Or inline:**
 ```bash
-GITHUB_TOKEN=$(gh auth token) npx @m14i/sith shell
+GITHUB_TOKEN=$(gh auth token) sith --it
 ```
 
 **Manual token:**
@@ -85,7 +97,7 @@ GITHUB_TOKEN=$(gh auth token) npx @m14i/sith shell
 3. Export it:
 ```bash
 export GITHUB_TOKEN=gho_your_token_here
-npx @m14i/sith shell
+sith --it
 ```
 
 **Make it persistent (add to ~/.zshrc or ~/.bashrc):**

package/dist/commands/docker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/commands/docker.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAkC,oBAAoB,EAAE,MAAM,aAAa,CAAC;AA6PxF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBhF;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAEpD"}
+{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/commands/docker.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAkC,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAmRxF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBhF;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAEpD"}

package/dist/index.js

@@ -35471,9 +35471,13 @@ function findProjectRoot(startDir) {
 }
 const rootDir = findProjectRoot(__dirname);
 const menuItems = [
+    { label: "Enter Shell", value: "shell", icon: "🚀" },
+    { label: "Configuration", value: "config", icon: "⚙️" },
+];
+const configMenuItems = [
     { label: "Pull prebuilt image (recommended)", value: "pull", icon: "📦" },
     { label: "Build Docker image from scratch", value: "build", icon: "🔨" },
-    { label: "Exit", value: "exit", icon: "❌" },
+    { label: "Back", value: "back", icon: "◀️" },
 ];
 function Logo() {
     return (react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Box */ .az, { flexDirection: "column", marginBottom: 1 },
@@ -35502,6 +35506,7 @@ function Menu() {
     const [processStep, setProcessStep] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)("");
     const [processComplete, setProcessComplete] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false);
     const [processError, setProcessError] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null);
+    const [currentMenu, setCurrentMenu] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)("main");
     (0,ink__WEBPACK_IMPORTED_MODULE_1__/* .useInput */ .Ge)((_input, key) => {
         if (isProcessing) {
             return;
@@ -35511,20 +35516,30 @@ function Menu() {
             exit();
             return;
         }
+        const items = currentMenu === "main" ? menuItems : configMenuItems;
         if (key.upArrow) {
-            setSelectedIndex((prev) => (prev > 0 ? prev - 1 : menuItems.length - 1));
+            setSelectedIndex((prev) => (prev > 0 ? prev - 1 : items.length - 1));
         }
         else if (key.downArrow) {
-            setSelectedIndex((prev) => (prev < menuItems.length - 1 ? prev + 1 : 0));
+            setSelectedIndex((prev) => (prev < items.length - 1 ? prev + 1 : 0));
         }
         else if (key.return) {
-            handleSelection(menuItems[selectedIndex].value);
+            handleSelection(items[selectedIndex].value);
         }
     });
     async function handleSelection(value) {
         switch (value) {
-            case "exit":
+            case "shell":
                 exit();
+                await runShell();
+                return;
+            case "config":
+                setCurrentMenu("config");
+                setSelectedIndex(0);
+                return;
+            case "back":
+                setCurrentMenu("main");
+                setSelectedIndex(0);
                 return;
             case "pull":
                 await handlePullCommand();
@@ -35598,7 +35613,7 @@ function Menu() {
                     "Image: ",
                     _config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.imageName)),
             react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Box */ .az, { marginTop: 1 },
-                react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Text */ .EY, { dimColor: true }, "Run: npx @m14i/sith shell")),
+                react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Text */ .EY, { dimColor: true }, "Run: sith --it")),
             react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Box */ .az, { marginTop: 1 },
                 react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Text */ .EY, { dimColor: true }, "Press any key to exit..."))));
     }
@@ -35613,11 +35628,13 @@ function Menu() {
                     rootDir))));
     }
     // Render menu state
+    const items = currentMenu === "main" ? menuItems : configMenuItems;
+    const menuTitle = currentMenu === "main" ? "What would you like to do?" : "Configuration";
     return (react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Box */ .az, { flexDirection: "column" },
         react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Logo, null),
         react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Box */ .az, { flexDirection: "column", marginTop: 1 },
-            react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Text */ .EY, { bold: true }, "What would you like to do?"),
-            react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Box */ .az, { flexDirection: "column", marginTop: 1 }, menuItems.map((item, index) => {
+            react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Text */ .EY, { bold: true }, menuTitle),
+            react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Box */ .az, { flexDirection: "column", marginTop: 1 }, items.map((item, index) => {
                 const isSelected = index === selectedIndex;
                 return (react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Box */ .az, { key: item.value, marginY: 0 },
                     react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ink__WEBPACK_IMPORTED_MODULE_1__/* .Text */ .EY, { color: isSelected ? "cyan" : undefined },
@@ -35669,7 +35686,7 @@ async function pullDocker() {
         console.log("✅ Docker image ready!");
         console.log(`Image: ${_config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.imageName}`);
         console.log();
-        console.log("Run: npx @m14i/sith shell");
+        console.log("Run: sith --it");
     }
     catch (error) {
         console.error("❌ Pull failed");
@@ -35697,7 +35714,7 @@ async function buildDocker() {
         console.log("✅ Docker image built successfully!");
         console.log(`Image: ${_config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.imageName}`);
         console.log();
-        console.log("Run: npx @m14i/sith shell");
+        console.log("Run: sith --it");
     }
     catch (error) {
         console.error("❌ Build failed");
@@ -35720,10 +35737,8 @@ async function runShell() {
         `${process.cwd()}:${_config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.workspaceMount}`,
         "-e",
         `GITHUB_TOKEN=${process.env.GITHUB_TOKEN || ""}`,
-        "--entrypoint",
-        "nix-shell",
         _config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.imageName,
-        _config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.shellEntrypoint,
+        "bash",
     ];
     try {
         await (0,execa__WEBPACK_IMPORTED_MODULE_6__/* .execa */ .Ho)("docker", dockerArgs, {
@@ -35799,11 +35814,17 @@ function createProgram() {
         .description(PROGRAM_DESCRIPTION)
         .version(PROGRAM_VERSION)
         .option('--pull', 'Pull prebuilt Docker image (recommended)')
-        .option('--build', 'Build the Docker image from scratch');
-    // Default action - show interactive menu
+        .option('--build', 'Build the Docker image from scratch')
+        .option('--it', 'Launch interactive shell in Docker container');
+    // Default action - show interactive menu or run shell with --it
     program
         .action(async (options) => {
-        await (0,_commands_docker_js__WEBPACK_IMPORTED_MODULE_1__/* .dockerCommand */ .Q)(options);
+        if (options.it) {
+            await (0,_commands_docker_js__WEBPACK_IMPORTED_MODULE_1__/* .runShellDirect */ .l)();
+        }
+        else {
+            await (0,_commands_docker_js__WEBPACK_IMPORTED_MODULE_1__/* .dockerCommand */ .Q)(options);
+        }
     });
     // Docker command - explicit Docker management
     program

package/docker/Dockerfile

@@ -9,10 +9,11 @@
 # ============================================================================
 FROM nixos/nix:2.19.2 AS builder
 
-# Configuration Nix pour permettre les builds
+# Configuration Nix pour permettre les builds et activer flakes
 # Note: sandbox=false required for Docker-in-Docker compatibility
 RUN echo "sandbox = false" >> /etc/nix/nix.conf && \
-    echo "filter-syscalls = false" >> /etc/nix/nix.conf
+    echo "filter-syscalls = false" >> /etc/nix/nix.conf && \
+    echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf
 
 # Copier les fichiers de configuration des skills
 COPY docker/skills/rtk-config.toml /opt/sith/skills/rtk-config.toml
@@ -24,9 +25,10 @@ COPY docker/nix/ /opt/sith/nix/
 # Configurer npm pour utiliser le registry public
 RUN echo "registry=https://registry.npmjs.org/" > /root/.npmrc
 
-# Pré-charger l'environnement Nix (installe tous les packages)
-# Cela cache les dépendances dans le layer Docker
-RUN nix-shell /opt/sith/nix/shell.nix --run "echo '✅ Environment cached'"
+# Generate flake.lock and pre-build environment
+RUN cd /opt/sith/nix && \
+    nix flake lock && \
+    nix develop --command echo '✅ Flake environment cached'
 
 # Installer OpenCode CLI via script officiel
 RUN nix-shell /opt/sith/nix/shell.nix --run " \
@@ -46,10 +48,11 @@ LABEL description="OpenCode CI/CD avec Nix, GitHub Copilot et skills d'optimisat
 LABEL version="2.3.0"
 LABEL org.opencontainers.image.source="https://github.com/MerzoukeMansouri/sith"
 
-# Configuration Nix pour permettre les builds
+# Configuration Nix pour permettre les builds et activer flakes
 # Note: sandbox=false required for Docker-in-Docker compatibility
 RUN echo "sandbox = false" >> /etc/nix/nix.conf && \
-    echo "filter-syscalls = false" >> /etc/nix/nix.conf
+    echo "filter-syscalls = false" >> /etc/nix/nix.conf && \
+    echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf
 
 # Copier les fichiers de configuration des skills depuis builder
 COPY --from=builder /opt/sith/ /opt/sith/
@@ -99,13 +102,13 @@ ENV CAVEMAN_AUTO=true
 # Healthcheck pour vérifier que l'environnement est prêt
 # Note: RTK check is conditional on RTK_ENABLED to avoid false failures
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-    CMD nix-shell /opt/sith/nix/shell.nix --run "opencode --version && ([ \"\$RTK_ENABLED\" = \"false\" ] || command -v rtk)" || exit 1
+    CMD cd /opt/sith/nix && nix develop --command sh -c "opencode --version && ([ \"\$RTK_ENABLED\" = \"false\" ] || command -v rtk)" || exit 1
 
 # Répertoire de travail pour les projets
 WORKDIR /workspace
 
-# Point d'entrée via nix-shell
-ENTRYPOINT ["nix-shell", "/opt/sith/nix/shell.nix", "--run"]
+# Point d'entrée via nix develop (flakes)
+ENTRYPOINT ["sh", "-c", "cd /opt/sith/nix && nix develop --command"]
 
 # Commande par défaut
 CMD ["opencode --help"]

package/docker/nix/flake.nix

@@ -0,0 +1,56 @@
+{
+  description = "Sith - OpenCode Docker Environment";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+
+        # Load packages from config
+        packagesConfig = builtins.fromJSON (builtins.readFile ./nix-config/packages.json);
+
+        allPackages = pkgs.lib.flatten (
+          pkgs.lib.mapAttrsToList (category: config: config.packages) packagesConfig.categories
+        );
+
+        resolvePkg = pkgPath:
+          let
+            parts = pkgs.lib.splitString "." pkgPath;
+          in
+            if pkgs.lib.length parts == 1
+            then builtins.getAttr (pkgs.lib.head parts) pkgs
+            else if pkgs.lib.length parts == 2
+            then builtins.getAttr (pkgs.lib.elemAt parts 1) (builtins.getAttr (pkgs.lib.head parts) pkgs)
+            else throw "Package path too deep: ${pkgPath}";
+
+        packages = map resolvePkg allPackages;
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          name = "opencode-ci-environment";
+
+          buildInputs = packages;
+
+          shellHook = ''
+            # Source external setup script
+            if [ -f /opt/sith/nix/nix-scripts/setup.sh ]; then
+              source /opt/sith/nix/nix-scripts/setup.sh
+            fi
+          '';
+
+          LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
+          LANG = "en_US.UTF-8";
+          LC_ALL = "en_US.UTF-8";
+          LC_CTYPE = "en_US.UTF-8";
+
+          SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+          NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+        };
+      }
+    );
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m14i/sith",
-  "version": "1.7.6",
+  "version": "1.8.1",
   "description": "Turn your context to the dark side. Standardize and share your OpenCode setup with a fully dockerized environment, designed for seamless collaboration and CI integration.",
   "type": "module",
   "repository": {