@m14i/sith 1.21.0 → 1.22.0

package/dist/commands/skills.d.ts

@@ -1,2 +1,7 @@
+import React from "react";
+declare function SkillsMenu({ onClose }: {
+    onClose?: () => void;
+}): React.ReactElement;
+export { SkillsMenu };
 export declare function skillsCommand(): void;
 //# sourceMappingURL=skills.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/commands/skills.tsx"],"names":[],"mappings":"AAuIA,wBAAgB,aAAa,IAAI,IAAI,CAEpC"}
+{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/commands/skills.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmB,MAAM,OAAO,CAAC;AA+BxC,iBAAS,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CAAE,GAAG,KAAK,CAAC,YAAY,CAuI7E;AAED,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,wBAAgB,aAAa,IAAI,IAAI,CAEpC"}

package/dist/components/TerminalUI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerminalUI.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/components/TerminalUI.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAgC,MAAM,OAAO,CAAC;AA0JrD,wBAAgB,UAAU,IAAI,KAAK,CAAC,YAAY,CA8R/C;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC"}
+{"version":3,"file":"TerminalUI.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/components/TerminalUI.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAwC,MAAM,OAAO,CAAC;AA4I7D,wBAAgB,UAAU,IAAI,KAAK,CAAC,YAAY,CA0N/C;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC"}

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,eAAO,MAAM,cAAc,EAAE,UAAU,EA6CtC,CAAC;AAGF,eAAO,MAAM,aAAa;;;;;;;;;;;CAWhB,CAAC;AAGX,eAAO,MAAM,UAAU;;;;;;CAMb,CAAC;AAGX,eAAO,MAAM,cAAc;;;CAGjB,CAAC;AAGX,eAAO,MAAM,UAAU,mOAOb,CAAC"}
+{"version":3,"file":"","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,eAAO,MAAM,cAAc,EAAE,UAAU,EA8CtC,CAAC;AAGF,eAAO,MAAM,aAAa;;;;;;;;;;;CAWhB,CAAC;AAGX,eAAO,MAAM,UAAU;;;;;;CAMb,CAAC;AAGX,eAAO,MAAM,cAAc;;;CAGjB,CAAC;AAGX,eAAO,MAAM,UAAU,mOAOb,CAAC"}

package/dist/index.js

@@ -42966,9 +42966,9 @@ which.sync = whichSync
 
 __nccwpck_require__.a(module, async (__webpack_handle_async_dependencies__, __webpack_async_result__) => { try {
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
-/* harmony export */   Q: () => (/* binding */ dockerCommand),
-/* harmony export */   l: () => (/* binding */ runShellDirect)
+/* harmony export */   Q: () => (/* binding */ dockerCommand)
 /* harmony export */ });
+/* unused harmony export runShellDirect */
 /* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(3024);
 /* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__nccwpck_require__.n(node_fs__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(6760);
@@ -42980,7 +42980,7 @@ __nccwpck_require__.a(module, async (__webpack_handle_async_dependencies__, __we
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(2864);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__nccwpck_require__.n(react__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(6878);
-/* harmony import */ var _utils_skills_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(6400);
+/* harmony import */ var _utils_launcher_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(5800);
 /* harmony import */ var _nix_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(9922);
 /* harmony import */ var _skills_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(9805);
 var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([ink__WEBPACK_IMPORTED_MODULE_3__, _skills_js__WEBPACK_IMPORTED_MODULE_8__]);
@@ -43075,7 +43075,7 @@ function Menu() {
         switch (value) {
             case "shell":
                 exit();
-                await runShell();
+                await (0,_utils_launcher_js__WEBPACK_IMPORTED_MODULE_6__/* .launchShell */ .k1)();
                 return;
             case "skills":
                 exit();
@@ -43231,7 +43231,7 @@ async function dockerCommand(options) {
     (0,ink__WEBPACK_IMPORTED_MODULE_3__/* .render */ .XX)(react__WEBPACK_IMPORTED_MODULE_4___default().createElement(Menu, null));
 }
 async function runShellDirect() {
-    await runShell();
+    await launchShell();
 }
 async function pullDocker() {
     console.log("📦 Pulling prebuilt Docker image...");
@@ -43290,51 +43290,6 @@ async function buildDocker() {
         process.exit(1);
     }
 }
-async function runShell() {
-    const skillsDir = (0,_utils_skills_js__WEBPACK_IMPORTED_MODULE_6__/* .getSkillsDir */ .YJ)();
-    const opencodeConfigPath = (0,_utils_skills_js__WEBPACK_IMPORTED_MODULE_6__/* .getOpenCodeConfigPath */ .Jn)();
-    console.log("🚀 Starting interactive shell...");
-    console.log(`Mounting workspace to ${_config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.workspaceMount}`);
-    console.log(`Mounting skills from ${skillsDir} to ${_config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.skillsMount}`);
-    console.log('Press Ctrl+D or type "exit" to leave');
-    console.log();
-    // Try to get GitHub token from gh CLI if not in env
-    let githubToken = process.env.GITHUB_TOKEN || "";
-    if (!githubToken) {
-        try {
-            const { stdout } = await (0,execa__WEBPACK_IMPORTED_MODULE_9__/* .execa */ .Ho)("gh", ["auth", "token"]);
-            githubToken = stdout.trim();
-        }
-        catch {
-            // Ignore if gh CLI not available or not authenticated
-        }
-    }
-    const claudeOauthToken = process.env.CLAUDE_CODE_OAUTH_TOKEN || "";
-    const dockerArgs = [
-        "run",
-        "--rm",
-        "-it",
-        "-v",
-        `${process.cwd()}:${_config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.workspaceMount}`,
-        "-v",
-        `${skillsDir}:${_config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.skillsMount}`,
-        "-v",
-        `${opencodeConfigPath}:${_config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.opencodeConfigMount}`,
-        "-e",
-        `GITHUB_TOKEN=${githubToken}`,
-        ...(claudeOauthToken
-            ? ["-e", `CLAUDE_CODE_OAUTH_TOKEN=${claudeOauthToken}`]
-            : []),
-        "--entrypoint",
-        "nix-shell",
-        _config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.imageName,
-        _config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.shellEntrypoint,
-    ];
-    await (0,execa__WEBPACK_IMPORTED_MODULE_9__/* .execa */ .Ho)("docker", dockerArgs, {
-        stdio: "inherit",
-        reject: false,
-    });
-}
 
 __webpack_async_result__();
 } catch(e) { __webpack_async_result__(e); } });
@@ -43536,7 +43491,8 @@ async function nixCommand(options) {
 
 __nccwpck_require__.a(module, async (__webpack_handle_async_dependencies__, __webpack_async_result__) => { try {
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
-/* harmony export */   a: () => (/* binding */ skillsCommand)
+/* harmony export */   a: () => (/* binding */ skillsCommand),
+/* harmony export */   c: () => (/* binding */ SkillsMenu)
 /* harmony export */ });
 /* harmony import */ var ink__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(3816);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(2864);
@@ -43559,11 +43515,12 @@ function statusIcon(row) {
             return row.installed ? "✅" : "☐";
     }
 }
-function SkillsMenu() {
+function SkillsMenu({ onClose }) {
     const { exit } = (0,ink__WEBPACK_IMPORTED_MODULE_0__/* .useApp */ .nm)();
     const [selectedIndex, setSelectedIndex] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(0);
     const [rows, setRows] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(_config_js__WEBPACK_IMPORTED_MODULE_2__/* .SKILLS_CATALOG */ .XI.map((s) => ({
         installed: (0,_utils_skills_js__WEBPACK_IMPORTED_MODULE_3__/* .isInstalled */ .j$)(s.name),
+        autoLoad: (0,_utils_skills_js__WEBPACK_IMPORTED_MODULE_3__/* .getSkillAutoLoad */ .z8)(s.name),
         status: "idle",
         message: "",
     })));
@@ -43588,6 +43545,7 @@ function SkillsMenu() {
                 await (0,_utils_skills_js__WEBPACK_IMPORTED_MODULE_3__/* .installSkill */ .rP)(skill);
                 setRow(index, {
                     installed: true,
+                    autoLoad: skill.autoLoad ?? false,
                     status: "done",
                     message: "Installed",
                 });
@@ -43616,8 +43574,26 @@ function SkillsMenu() {
             }
             return;
         }
+        if (input === "a") {
+            const row = rows[selectedIndex];
+            if (row.installed && row.status !== "working") {
+                const newAutoLoad = !row.autoLoad;
+                (0,_utils_skills_js__WEBPACK_IMPORTED_MODULE_3__/* .setSkillAutoLoad */ .lJ)(_config_js__WEBPACK_IMPORTED_MODULE_2__/* .SKILLS_CATALOG */ .XI[selectedIndex].name, newAutoLoad);
+                setRow(selectedIndex, {
+                    autoLoad: newAutoLoad,
+                    status: "done",
+                    message: newAutoLoad ? "Auto-load on" : "On-demand",
+                });
+            }
+            return;
+        }
         if (input === "q" || key.escape) {
-            exit();
+            if (onClose) {
+                onClose();
+            }
+            else {
+                exit();
+            }
         }
     });
     return (react__WEBPACK_IMPORTED_MODULE_1___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", paddingX: 1 },
@@ -43634,13 +43610,17 @@ function SkillsMenu() {
                     " ",
                     skill.name.padEnd(12)),
                 react__WEBPACK_IMPORTED_MODULE_1___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { dimColor: !isSelected }, skill.description),
+                row.installed ? (react__WEBPACK_IMPORTED_MODULE_1___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { color: row.autoLoad ? "green" : "yellow" },
+                    " ",
+                    row.autoLoad ? "[auto]" : "[on-demand]")) : null,
                 row.message ? (react__WEBPACK_IMPORTED_MODULE_1___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { color: row.status === "error" ? "red" : "green" },
                     " ",
                     row.message)) : null));
         }),
         react__WEBPACK_IMPORTED_MODULE_1___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { marginTop: 1 },
-            react__WEBPACK_IMPORTED_MODULE_1___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { dimColor: true }, "\u2191\u2193 navigate Enter install/uninstall q quit"))));
+            react__WEBPACK_IMPORTED_MODULE_1___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { dimColor: true }, "\u2191\u2193 navigate Enter install/uninstall a toggle auto-load q quit"))));
 }
+
 function skillsCommand() {
     (0,ink__WEBPACK_IMPORTED_MODULE_0__/* .render */ .XX)(react__WEBPACK_IMPORTED_MODULE_1___default().createElement(SkillsMenu, null));
 }
@@ -43803,17 +43783,15 @@ __nccwpck_require__.a(module, async (__webpack_handle_async_dependencies__, __we
 /* harmony export */   t: () => (/* binding */ renderTerminalUI)
 /* harmony export */ });
 /* unused harmony export TerminalUI */
-/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(6181);
 /* harmony import */ var ink__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(3816);
 /* harmony import */ var ink_text_input__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(9046);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(2864);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__nccwpck_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _commands_skills_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(9805);
 /* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(6878);
-/* harmony import */ var _utils_dockerArgs_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(4495);
-/* harmony import */ var _utils_githubToken_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(1460);
+/* harmony import */ var _utils_launcher_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(5800);
 /* harmony import */ var _utils_messageUtils_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(5534);
-/* harmony import */ var _utils_slashCommands_js__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(9987);
+/* harmony import */ var _utils_slashCommands_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(9987);
 /* harmony import */ var _ConfigModal_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(3636);
 var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([ink__WEBPACK_IMPORTED_MODULE_0__, ink_text_input__WEBPACK_IMPORTED_MODULE_1__, _commands_skills_js__WEBPACK_IMPORTED_MODULE_3__, _ConfigModal_js__WEBPACK_IMPORTED_MODULE_6__]);
 ([ink__WEBPACK_IMPORTED_MODULE_0__, ink_text_input__WEBPACK_IMPORTED_MODULE_1__, _commands_skills_js__WEBPACK_IMPORTED_MODULE_3__, _ConfigModal_js__WEBPACK_IMPORTED_MODULE_6__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
@@ -43826,8 +43804,6 @@ var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([ink_
 
 
 
-
-
 const TOOLS = [
     {
         value: "opencode",
@@ -43836,13 +43812,16 @@ const TOOLS = [
     },
     { value: "claude", label: "Claude Code", description: "Anthropic Claude" },
 ];
-function ToolPicker({ selectedIndex }) {
-    return (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", justifyContent: "center", alignItems: "center", paddingY: 2 },
-        react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", marginBottom: 2 }, _config_js__WEBPACK_IMPORTED_MODULE_4__/* .ASCII_LOGO */ .mF.map((line, index) => (
+function SithHeader() {
+    return (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", alignItems: "center", paddingY: 1 },
+        react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column" }, _config_js__WEBPACK_IMPORTED_MODULE_4__/* .ASCII_LOGO */ .mF.map((line, index) => (
         // biome-ignore lint/suspicious/noArrayIndexKey: static array, order never changes
         react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { key: index, color: "red", bold: true }, line)))),
-        react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", alignItems: "center", marginTop: 1, marginBottom: 2 },
-            react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { dimColor: true }, "Turn your context to the dark side")),
+        react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { dimColor: true }, "Turn your context to the dark side")));
+}
+function ToolPicker({ selectedIndex }) {
+    return (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", justifyContent: "center", alignItems: "center", paddingY: 2 },
+        react__WEBPACK_IMPORTED_MODULE_2___default().createElement(SithHeader, null),
         react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", borderStyle: "single", borderColor: "gray", paddingX: 4, paddingY: 1 },
             react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { marginBottom: 1 },
                 react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { color: "cyan", bold: true }, "Select AI Tool")),
@@ -43858,12 +43837,8 @@ function ToolPicker({ selectedIndex }) {
 }
 function WelcomeScreen({ tool }) {
     const toolLabel = TOOLS.find((t) => t.value === tool)?.label ?? tool;
-    return (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", justifyContent: "center", alignItems: "center", paddingY: 2 },
-        react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", marginBottom: 2 }, _config_js__WEBPACK_IMPORTED_MODULE_4__/* .ASCII_LOGO */ .mF.map((line, index) => (
-        // biome-ignore lint/suspicious/noArrayIndexKey: static array, order never changes
-        react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { key: index, color: "red", bold: true }, line)))),
-        react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", alignItems: "center", marginTop: 1 },
-            react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { dimColor: true }, "Turn your context to the dark side"),
+    return (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", justifyContent: "center", alignItems: "center" },
+        react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", alignItems: "center" },
             react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { color: "cyan" },
                 "Tool: ",
                 react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { bold: true }, toolLabel))),
@@ -43891,77 +43866,30 @@ function TerminalUI() {
     const [input, setInput] = (0,react__WEBPACK_IMPORTED_MODULE_2__.useState)("");
     const [messages, setMessages] = (0,react__WEBPACK_IMPORTED_MODULE_2__.useState)([]);
     const [showConfigModal, setShowConfigModal] = (0,react__WEBPACK_IMPORTED_MODULE_2__.useState)(false);
-    const [nextMessageId, setNextMessageId] = (0,react__WEBPACK_IMPORTED_MODULE_2__.useState)(1);
+    const [showSkillsMenu, setShowSkillsMenu] = (0,react__WEBPACK_IMPORTED_MODULE_2__.useState)(false);
+    const nextMessageId = (0,react__WEBPACK_IMPORTED_MODULE_2__.useRef)(1);
     const [selectedTool, setSelectedTool] = (0,react__WEBPACK_IMPORTED_MODULE_2__.useState)(null);
     const [toolPickerIndex, setToolPickerIndex] = (0,react__WEBPACK_IMPORTED_MODULE_2__.useState)(0);
     const addMessage = (0,react__WEBPACK_IMPORTED_MODULE_2__.useCallback)((text, type = "system") => {
         const newMessage = {
-            id: nextMessageId,
+            id: nextMessageId.current++,
             text,
             type,
             timestamp: new Date(),
         };
         setMessages((previousMessages) => [...previousMessages, newMessage]);
-        setNextMessageId((previousId) => previousId + 1);
-    }, [nextMessageId]);
+    }, []);
     const handleDockerShell = (0,react__WEBPACK_IMPORTED_MODULE_2__.useCallback)(async () => {
         exit();
-        console.log("🚀 Starting Docker shell...");
-        console.log(`Mounting current directory to ${_config_js__WEBPACK_IMPORTED_MODULE_4__/* .DOCKER_CONFIG */ .e6.workspaceMount}`);
-        console.log('Press Ctrl+D or type "exit" to leave');
-        console.log();
-        const githubToken = await (0,_utils_githubToken_js__WEBPACK_IMPORTED_MODULE_8__/* .getGitHubToken */ .l)();
-        const claudeOauthToken = process.env.CLAUDE_CODE_OAUTH_TOKEN || "";
-        const dockerArgs = (0,_utils_dockerArgs_js__WEBPACK_IMPORTED_MODULE_5__/* .buildDockerShellCommand */ .ac)(githubToken, claudeOauthToken);
-        await (0,execa__WEBPACK_IMPORTED_MODULE_9__/* .execa */ .Ho)("docker", dockerArgs, { stdio: "inherit", reject: false });
-        console.log();
-        console.log("✅ Exited shell");
+        await (0,_utils_launcher_js__WEBPACK_IMPORTED_MODULE_5__/* .launchShell */ .k1)();
     }, [exit]);
     const handleOpenCode = (0,react__WEBPACK_IMPORTED_MODULE_2__.useCallback)(async (prompt) => {
         exit();
-        console.log("🚀 Starting OpenCode...");
-        console.log(`Mounting current directory to ${_config_js__WEBPACK_IMPORTED_MODULE_4__/* .DOCKER_CONFIG */ .e6.workspaceMount}`);
-        if (prompt) {
-            console.log(`Prompt: ${prompt}`);
-        }
-        console.log();
-        const githubToken = await (0,_utils_githubToken_js__WEBPACK_IMPORTED_MODULE_8__/* .getGitHubToken */ .l)();
-        const claudeOauthToken = process.env.CLAUDE_CODE_OAUTH_TOKEN || "";
-        const dockerArgs = (0,_utils_dockerArgs_js__WEBPACK_IMPORTED_MODULE_5__/* .buildDockerOpencodeCommand */ .Xs)(githubToken, prompt, claudeOauthToken);
-        try {
-            await (0,execa__WEBPACK_IMPORTED_MODULE_9__/* .execa */ .Ho)("docker", dockerArgs, { stdio: "inherit" });
-            console.log();
-            console.log("✅ Exited OpenCode");
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : "Failed to start OpenCode";
-            console.error(`❌ ${errorMessage}`);
-            process.exit(1);
-        }
+        await (0,_utils_launcher_js__WEBPACK_IMPORTED_MODULE_5__/* .launchOpencode */ .Tg)(prompt);
     }, [exit]);
     const handleClaudeCode = (0,react__WEBPACK_IMPORTED_MODULE_2__.useCallback)(async (prompt) => {
         exit();
-        console.log("🤖 Starting Claude Code...");
-        console.log(`Mounting current directory to ${_config_js__WEBPACK_IMPORTED_MODULE_4__/* .DOCKER_CONFIG */ .e6.workspaceMount}`);
-        if (prompt) {
-            console.log(`Prompt: ${prompt}`);
-        }
-        console.log();
-        const githubToken = await (0,_utils_githubToken_js__WEBPACK_IMPORTED_MODULE_8__/* .getGitHubToken */ .l)();
-        const claudeOauthToken = process.env.CLAUDE_CODE_OAUTH_TOKEN || "";
-        const dockerArgs = (0,_utils_dockerArgs_js__WEBPACK_IMPORTED_MODULE_5__/* .buildDockerClaudeCodeCommand */ .fn)(githubToken, prompt, claudeOauthToken);
-        try {
-            await (0,execa__WEBPACK_IMPORTED_MODULE_9__/* .execa */ .Ho)("docker", dockerArgs, { stdio: "inherit" });
-            console.log();
-            console.log("✅ Exited Claude Code");
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error
-                ? error.message
-                : "Failed to start Claude Code";
-            console.error(`❌ ${errorMessage}`);
-            process.exit(1);
-        }
+        await (0,_utils_launcher_js__WEBPACK_IMPORTED_MODULE_5__/* .launchClaude */ .Q7)(prompt);
     }, [exit]);
     const handleSlashCommand = (0,react__WEBPACK_IMPORTED_MODULE_2__.useCallback)(async (command, userInput) => {
         if (!command) {
@@ -43973,15 +43901,14 @@ function TerminalUI() {
                 await handleDockerShell();
                 break;
             case "skills":
-                exit();
-                (0,_commands_skills_js__WEBPACK_IMPORTED_MODULE_3__/* .skillsCommand */ .a)();
+                setShowSkillsMenu(true);
                 break;
             case "config":
                 setShowConfigModal(true);
                 break;
             case "help": {
                 addMessage("Available commands:", "info");
-                const availableCommands = (0,_utils_slashCommands_js__WEBPACK_IMPORTED_MODULE_10__/* .getAvailableCommands */ .K)();
+                const availableCommands = (0,_utils_slashCommands_js__WEBPACK_IMPORTED_MODULE_8__/* .getAvailableCommands */ .K)();
                 for (const cmd of availableCommands) {
                     addMessage(`  ${cmd.command} - ${cmd.description}`, "info");
                 }
@@ -43996,14 +43923,14 @@ function TerminalUI() {
                 addMessage("Switched to Claude Code", "success");
                 break;
         }
-    }, [addMessage, handleDockerShell, exit]);
+    }, [addMessage, handleDockerShell]);
     const handleSubmit = (0,react__WEBPACK_IMPORTED_MODULE_2__.useCallback)(async (value) => {
         const trimmedValue = value.trim();
         if (!trimmedValue) {
             return;
         }
         setInput("");
-        const command = (0,_utils_slashCommands_js__WEBPACK_IMPORTED_MODULE_10__/* .parseSlashCommand */ .M)(trimmedValue);
+        const command = (0,_utils_slashCommands_js__WEBPACK_IMPORTED_MODULE_8__/* .parseSlashCommand */ .M)(trimmedValue);
         if (command) {
             await handleSlashCommand(command, trimmedValue);
         }
@@ -44057,13 +43984,17 @@ function TerminalUI() {
         return (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column" },
             react__WEBPACK_IMPORTED_MODULE_2___default().createElement(_ConfigModal_js__WEBPACK_IMPORTED_MODULE_6__/* .ConfigModal */ .y, { onClose: handleConfigModalClose, onMessage: handleConfigModalMessage })));
     }
+    if (showSkillsMenu) {
+        return (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column" },
+            react__WEBPACK_IMPORTED_MODULE_2___default().createElement(_commands_skills_js__WEBPACK_IMPORTED_MODULE_3__/* .SkillsMenu */ .c, { onClose: () => setShowSkillsMenu(false) })));
+    }
     if (selectedTool === null) {
         return react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ToolPicker, { selectedIndex: toolPickerIndex });
     }
-    const shouldShowWelcome = messages.length === 0;
     const recentMessages = messages.slice(-10);
     return (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", height: "100%" },
-        shouldShowWelcome ? (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(WelcomeScreen, { tool: selectedTool })) : (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", flexGrow: 1, marginBottom: 1 }, recentMessages.map((message) => (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(MessageItem, { key: message.id, message: message }))))),
+        react__WEBPACK_IMPORTED_MODULE_2___default().createElement(SithHeader, null),
+        messages.length === 0 ? (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(WelcomeScreen, { tool: selectedTool })) : (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column", flexGrow: 1, marginBottom: 1 }, recentMessages.map((message) => (react__WEBPACK_IMPORTED_MODULE_2___default().createElement(MessageItem, { key: message.id, message: message }))))),
         react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { flexDirection: "column" },
             react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Box */ .az, { borderStyle: "single", borderColor: "gray", paddingX: 1 },
                 react__WEBPACK_IMPORTED_MODULE_2___default().createElement(ink__WEBPACK_IMPORTED_MODULE_0__/* .Text */ .EY, { color: "cyan", bold: true }, "\u203A"),
@@ -44097,6 +44028,7 @@ const SKILLS_CATALOG = [
         name: "caveman",
         description: "Ultra-compressed communication (~75% token reduction)",
         homepage: "https://github.com/JuliusBrussee/caveman",
+        autoLoad: true,
         builtinInstructions: `---
 name: caveman
 description: Ultra-compressed communication mode (ultra — MAX compression, always active).
@@ -44181,27 +44113,22 @@ const ASCII_LOGO = [
 /***/ ((module, __unused_webpack___webpack_exports__, __nccwpck_require__) => {
 
 __nccwpck_require__.a(module, async (__webpack_handle_async_dependencies__, __webpack_async_result__) => { try {
-/* harmony import */ var node_child_process__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(1421);
-/* harmony import */ var node_child_process__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__nccwpck_require__.n(node_child_process__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(3024);
-/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__nccwpck_require__.n(node_fs__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(6760);
-/* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__nccwpck_require__.n(node_path__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var node_url__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(3136);
-/* harmony import */ var node_url__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__nccwpck_require__.n(node_url__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(9611);
-/* harmony import */ var commander__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(2202);
-/* harmony import */ var update_notifier__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(6213);
-/* harmony import */ var _commands_docker_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(5515);
-/* harmony import */ var _commands_nix_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(9922);
-/* harmony import */ var _commands_skills_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(9805);
-/* harmony import */ var _components_TerminalUI_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(3535);
-/* harmony import */ var _utils_dockerArgs_js__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(4495);
-/* harmony import */ var _utils_githubToken_js__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(1460);
-var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_commands_docker_js__WEBPACK_IMPORTED_MODULE_5__, _commands_skills_js__WEBPACK_IMPORTED_MODULE_7__, _components_TerminalUI_js__WEBPACK_IMPORTED_MODULE_8__]);
-([_commands_docker_js__WEBPACK_IMPORTED_MODULE_5__, _commands_skills_js__WEBPACK_IMPORTED_MODULE_7__, _components_TerminalUI_js__WEBPACK_IMPORTED_MODULE_8__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
-
-
+/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(3024);
+/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__nccwpck_require__.n(node_fs__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(6760);
+/* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__nccwpck_require__.n(node_path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var node_url__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(3136);
+/* harmony import */ var node_url__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__nccwpck_require__.n(node_url__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(9611);
+/* harmony import */ var commander__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(2202);
+/* harmony import */ var update_notifier__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(6213);
+/* harmony import */ var _commands_docker_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(5515);
+/* harmony import */ var _commands_nix_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(9922);
+/* harmony import */ var _commands_skills_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(9805);
+/* harmony import */ var _components_TerminalUI_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(3535);
+/* harmony import */ var _utils_launcher_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(5800);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_commands_docker_js__WEBPACK_IMPORTED_MODULE_4__, _commands_skills_js__WEBPACK_IMPORTED_MODULE_6__, _components_TerminalUI_js__WEBPACK_IMPORTED_MODULE_7__]);
+([_commands_docker_js__WEBPACK_IMPORTED_MODULE_4__, _commands_skills_js__WEBPACK_IMPORTED_MODULE_6__, _components_TerminalUI_js__WEBPACK_IMPORTED_MODULE_7__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
 
 
 
@@ -44214,19 +44141,19 @@ var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_com
 
 
 // Import package.json for version and update checks
-const __filename = (0,node_url__WEBPACK_IMPORTED_MODULE_3__.fileURLToPath)(import.meta.url);
-const __dirname = (0,node_path__WEBPACK_IMPORTED_MODULE_2__.dirname)(__filename);
-const pkg = JSON.parse((0,node_fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync)((0,node_path__WEBPACK_IMPORTED_MODULE_2__.join)(__dirname, "../package.json"), "utf-8"));
+const __filename = (0,node_url__WEBPACK_IMPORTED_MODULE_2__.fileURLToPath)(import.meta.url);
+const __dirname = (0,node_path__WEBPACK_IMPORTED_MODULE_1__.dirname)(__filename);
+const pkg = JSON.parse((0,node_fs__WEBPACK_IMPORTED_MODULE_0__.readFileSync)((0,node_path__WEBPACK_IMPORTED_MODULE_1__.join)(__dirname, "../package.json"), "utf-8"));
 const PROGRAM_NAME = "sith";
 const PROGRAM_VERSION = pkg.version;
 const PROGRAM_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.";
 // Check for updates (automatic background check)
-const notifier = (0,update_notifier__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .A)({ pkg });
+const notifier = (0,update_notifier__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)({ pkg });
 notifier.notify();
 async function checkForUpdates() {
-    console.log(chalk__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Ay.cyan("Checking for updates..."));
+    console.log(chalk__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Ay.cyan("Checking for updates..."));
     // Force update check by setting updateCheckInterval to 0
-    const notifier = (0,update_notifier__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .A)({
+    const notifier = (0,update_notifier__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)({
         pkg,
         updateCheckInterval: 0,
     });
@@ -44235,16 +44162,16 @@ async function checkForUpdates() {
     const update = notifier.update;
     if (update && update.latest !== pkg.version) {
         console.log();
-        console.log(chalk__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Ay.green(`Update available: ${chalk__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Ay.dim(pkg.version)} → ${chalk__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Ay.bold(update.latest)}`));
-        console.log(chalk__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Ay.cyan(`Run ${chalk__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Ay.bold(`npm install -g ${pkg.name}`)} to update`));
+        console.log(chalk__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Ay.green(`Update available: ${chalk__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Ay.dim(pkg.version)} → ${chalk__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Ay.bold(update.latest)}`));
+        console.log(chalk__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Ay.cyan(`Run ${chalk__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Ay.bold(`npm install -g ${pkg.name}`)} to update`));
         console.log();
     }
     else {
-        console.log(chalk__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Ay.green(`✓ You're on the latest version (${pkg.version})`));
+        console.log(chalk__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Ay.green(`✓ You're on the latest version (${pkg.version})`));
     }
 }
 function createProgram() {
-    const program = new commander__WEBPACK_IMPORTED_MODULE_4__/* .Command */ .uB();
+    const program = new commander__WEBPACK_IMPORTED_MODULE_3__/* .Command */ .uB();
     program
         .name(PROGRAM_NAME)
         .description(PROGRAM_DESCRIPTION)
@@ -44262,21 +44189,21 @@ function createProgram() {
             await checkForUpdates();
         }
         else if (options.nix) {
-            await (0,_commands_nix_js__WEBPACK_IMPORTED_MODULE_6__/* .runNixShell */ .nb)();
+            await (0,_commands_nix_js__WEBPACK_IMPORTED_MODULE_5__/* .runNixShell */ .nb)();
         }
         else if (options.nixInstall) {
-            await (0,_commands_nix_js__WEBPACK_IMPORTED_MODULE_6__/* .nixCommand */ .Dv)({ install: true });
+            await (0,_commands_nix_js__WEBPACK_IMPORTED_MODULE_5__/* .nixCommand */ .Dv)({ install: true });
         }
         else if (options.it) {
-            await (0,_commands_docker_js__WEBPACK_IMPORTED_MODULE_5__/* .runShellDirect */ .l)();
+            await (0,_utils_launcher_js__WEBPACK_IMPORTED_MODULE_8__/* .launchShell */ .k1)();
         }
         else if (options.legacy || options.pull || options.build) {
             // Use legacy menu for explicit pull/build or --legacy flag
-            await (0,_commands_docker_js__WEBPACK_IMPORTED_MODULE_5__/* .dockerCommand */ .Q)(options);
+            await (0,_commands_docker_js__WEBPACK_IMPORTED_MODULE_4__/* .dockerCommand */ .Q)(options);
         }
         else {
             // Default: show new terminal UI
-            (0,_components_TerminalUI_js__WEBPACK_IMPORTED_MODULE_8__/* .renderTerminalUI */ .t)();
+            (0,_components_TerminalUI_js__WEBPACK_IMPORTED_MODULE_7__/* .renderTerminalUI */ .t)();
         }
     });
     // Docker command - explicit Docker management
@@ -44286,21 +44213,21 @@ function createProgram() {
         .option("--pull", "Pull prebuilt Docker image (recommended)")
         .option("--build", "Build the Docker image from scratch")
         .action(async (options) => {
-        await (0,_commands_docker_js__WEBPACK_IMPORTED_MODULE_5__/* .dockerCommand */ .Q)(options);
+        await (0,_commands_docker_js__WEBPACK_IMPORTED_MODULE_4__/* .dockerCommand */ .Q)(options);
     });
     // Shell command - direct interactive shell (bypasses menu)
     program
         .command("shell")
         .description("Run interactive shell in Docker container")
         .action(async () => {
-        await (0,_commands_docker_js__WEBPACK_IMPORTED_MODULE_5__/* .runShellDirect */ .l)();
+        await (0,_utils_launcher_js__WEBPACK_IMPORTED_MODULE_8__/* .launchShell */ .k1)();
     });
     // Skills command - install/uninstall skills from catalog
     program
         .command("skills")
         .description("Manage skills (~/.sith/skills/)")
         .action(() => {
-        (0,_commands_skills_js__WEBPACK_IMPORTED_MODULE_7__/* .skillsCommand */ .a)();
+        (0,_commands_skills_js__WEBPACK_IMPORTED_MODULE_6__/* .skillsCommand */ .a)();
     });
     // Nix command - native Nix environment
     program
@@ -44309,7 +44236,7 @@ function createProgram() {
         .option("--install", "Install Nix package manager")
         .option("--shell", "Run Nix shell")
         .action(async (options) => {
-        await (0,_commands_nix_js__WEBPACK_IMPORTED_MODULE_6__/* .nixCommand */ .Dv)(options);
+        await (0,_commands_nix_js__WEBPACK_IMPORTED_MODULE_5__/* .nixCommand */ .Dv)(options);
     });
     // OpenCode command - launch OpenCode in Docker
     program
@@ -44317,10 +44244,7 @@ function createProgram() {
         .description("Launch OpenCode in Docker")
         .option("-p, --prompt <prompt>", "Prompt to pass to OpenCode")
         .action(async (options) => {
-        const token = await (0,_utils_githubToken_js__WEBPACK_IMPORTED_MODULE_12__/* .getGitHubToken */ .l)();
-        const claudeOauthToken = process.env.CLAUDE_CODE_OAUTH_TOKEN || "";
-        const args = (0,_utils_dockerArgs_js__WEBPACK_IMPORTED_MODULE_9__/* .buildDockerOpencodeCommand */ .Xs)(token, options.prompt, claudeOauthToken);
-        (0,node_child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync)("docker", args, { stdio: "inherit" });
+        await (0,_utils_launcher_js__WEBPACK_IMPORTED_MODULE_8__/* .launchOpencode */ .Tg)(options.prompt);
     });
     // Claude command - launch Claude Code in Docker
     program
@@ -44328,10 +44252,7 @@ function createProgram() {
         .description("Launch Claude Code in Docker")
         .option("-p, --prompt <prompt>", "Prompt to pass to Claude Code")
         .action(async (options) => {
-        const token = await (0,_utils_githubToken_js__WEBPACK_IMPORTED_MODULE_12__/* .getGitHubToken */ .l)();
-        const claudeOauthToken = process.env.CLAUDE_CODE_OAUTH_TOKEN || "";
-        const args = (0,_utils_dockerArgs_js__WEBPACK_IMPORTED_MODULE_9__/* .buildDockerClaudeCodeCommand */ .fn)(token, options.prompt, claudeOauthToken);
-        (0,node_child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync)("docker", args, { stdio: "inherit" });
+        await (0,_utils_launcher_js__WEBPACK_IMPORTED_MODULE_8__/* .launchClaude */ .Q7)(options.prompt);
     });
     return program;
 }
@@ -44344,39 +44265,49 @@ __webpack_async_result__();
 
 /***/ }),
 
-/***/ 4495:
+/***/ 5800:
 /***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => {
 
-/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
-/* harmony export */   Xs: () => (/* binding */ buildDockerOpencodeCommand),
-/* harmony export */   ac: () => (/* binding */ buildDockerShellCommand),
-/* harmony export */   fn: () => (/* binding */ buildDockerClaudeCodeCommand)
-/* harmony export */ });
-/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(3024);
-/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__nccwpck_require__.n(node_fs__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(6878);
-/* harmony import */ var _skills_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(6400);
 
+// EXPORTS
+__nccwpck_require__.d(__webpack_exports__, {
+  Q7: () => (/* binding */ launchClaude),
+  Tg: () => (/* binding */ launchOpencode),
+  k1: () => (/* binding */ launchShell)
+});
+
+// EXTERNAL MODULE: ./node_modules/.pnpm/execa@9.6.1/node_modules/execa/index.js + 136 modules
+var execa = __nccwpck_require__(6181);
+// EXTERNAL MODULE: ./src/config.ts
+var config = __nccwpck_require__(6878);
+// EXTERNAL MODULE: ./src/utils/skills.ts
+var skills = __nccwpck_require__(6400);
+;// CONCATENATED MODULE: ./src/utils/dockerArgs.ts
 
 
 function buildDockerShellCommand(githubToken, claudeOauthToken) {
+    (0,skills/* syncClaudeMd */.RK)();
     const args = [
         "run",
         "--rm",
         "-it",
         "-v",
-        `${process.cwd()}:${_config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.workspaceMount}`,
+        `${process.cwd()}:${config/* DOCKER_CONFIG */.e6.workspaceMount}`,
+        "-v",
+        `${(0,skills/* getSkillsDir */.YJ)()}:${config/* DOCKER_CONFIG */.e6.skillsMount}`,
         "-v",
-        `${(0,_skills_js__WEBPACK_IMPORTED_MODULE_2__/* .getSkillsDir */ .YJ)()}:${_config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.skillsMount}`,
+        `${(0,skills/* getSkillsDir */.YJ)()}:${config/* DOCKER_CONFIG */.e6.claudeSkillsMount}`,
         "-v",
-        `${(0,_skills_js__WEBPACK_IMPORTED_MODULE_2__/* .getOpenCodeConfigPath */ .Jn)()}:${_config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.opencodeConfigMount}`,
+        `${(0,skills/* getClaudeMdPath */.pF)()}:${config/* DOCKER_CONFIG */.e6.claudeConfigMount}/CLAUDE.md`,
+        "-v",
+        `${(0,skills/* getOpenCodeConfigPath */.Jn)()}:${config/* DOCKER_CONFIG */.e6.opencodeConfigMount}`,
         "-e",
         `GITHUB_TOKEN=${githubToken}`,
     ];
     if (claudeOauthToken) {
         args.push("-e", `CLAUDE_CODE_OAUTH_TOKEN=${claudeOauthToken}`);
     }
-    args.push("--entrypoint", "nix-shell", _config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.imageName, _config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.shellEntrypoint);
+    args.push("--entrypoint", "nix-shell", config/* DOCKER_CONFIG */.e6.imageName, config/* DOCKER_CONFIG */.e6.shellEntrypoint);
     return args;
 }
 function buildDockerOpencodeCommand(githubToken, prompt, claudeOauthToken) {
@@ -44385,18 +44316,18 @@ function buildDockerOpencodeCommand(githubToken, prompt, claudeOauthToken) {
         "--rm",
         "-it",
         "-v",
-        `${process.cwd()}:${_config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.workspaceMount}`,
+        `${process.cwd()}:${config/* DOCKER_CONFIG */.e6.workspaceMount}`,
         "-v",
-        `${(0,_skills_js__WEBPACK_IMPORTED_MODULE_2__/* .getSkillsDir */ .YJ)()}:${_config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.skillsMount}`,
+        `${(0,skills/* getSkillsDir */.YJ)()}:${config/* DOCKER_CONFIG */.e6.skillsMount}`,
         "-v",
-        `${(0,_skills_js__WEBPACK_IMPORTED_MODULE_2__/* .getOpenCodeConfigPath */ .Jn)()}:${_config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.opencodeConfigMount}`,
+        `${(0,skills/* getOpenCodeConfigPath */.Jn)()}:${config/* DOCKER_CONFIG */.e6.opencodeConfigMount}`,
         "-e",
         `GITHUB_TOKEN=${githubToken}`,
     ];
     if (claudeOauthToken) {
         args.push("-e", `CLAUDE_CODE_OAUTH_TOKEN=${claudeOauthToken}`);
     }
-    args.push("--entrypoint", "bash", _config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.imageName, "-c");
+    args.push("--entrypoint", "bash", config/* DOCKER_CONFIG */.e6.imageName, "-c");
     let opencodeCommand = "source /opt/sith/nix/nix-scripts/setup.sh && cd /workspace && opencode -m github-copilot/claude-sonnet-4.6";
     if (prompt) {
         const escapedPrompt = prompt.replace(/'/g, "'\\''");
@@ -44406,29 +44337,25 @@ function buildDockerOpencodeCommand(githubToken, prompt, claudeOauthToken) {
     return args;
 }
 function buildDockerClaudeCodeCommand(githubToken, prompt, claudeOauthToken) {
-    const claudeConfigDir = (0,_skills_js__WEBPACK_IMPORTED_MODULE_2__/* .getClaudeConfigDir */ .K1)();
-    const claudeMdPath = (0,_skills_js__WEBPACK_IMPORTED_MODULE_2__/* .getClaudeMdPath */ .pF)();
+    (0,skills/* syncClaudeMd */.RK)();
+    const claudeMdPath = (0,skills/* getClaudeMdPath */.pF)();
     const args = [
         "run",
         "--rm",
         "-it",
         "-v",
-        `${process.cwd()}:${_config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.workspaceMount}`,
+        `${process.cwd()}:${config/* DOCKER_CONFIG */.e6.workspaceMount}`,
         "-e",
         `GITHUB_TOKEN=${githubToken}`,
     ];
     if (claudeOauthToken) {
         args.push("-e", `CLAUDE_CODE_OAUTH_TOKEN=${claudeOauthToken}`);
     }
-    // Mount ~/.claude first so subsequent mounts can shadow entries within it
-    if (node_fs__WEBPACK_IMPORTED_MODULE_0___default().existsSync(claudeConfigDir)) {
-        args.push("-v", `${claudeConfigDir}:${_config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.claudeConfigMount}`);
-    }
-    // Skills dir overrides /root/.claude/skills inside the container
-    args.push("-v", `${(0,_skills_js__WEBPACK_IMPORTED_MODULE_2__/* .getSkillsDir */ .YJ)()}:${_config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.claudeSkillsMount}`);
+    // Mount only ~/.sith/ contents — never expose ~/.claude to the container
+    args.push("-v", `${(0,skills/* getSkillsDir */.YJ)()}:${config/* DOCKER_CONFIG */.e6.claudeSkillsMount}`);
     // Generated CLAUDE.md (with skill @imports) overrides any CLAUDE.md from ~/.claude
-    args.push("-v", `${claudeMdPath}:${_config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.claudeConfigMount}/CLAUDE.md`);
-    args.push("--entrypoint", "bash", _config_js__WEBPACK_IMPORTED_MODULE_1__/* .DOCKER_CONFIG */ .e6.imageName, "-c");
+    args.push("-v", `${claudeMdPath}:${config/* DOCKER_CONFIG */.e6.claudeConfigMount}/CLAUDE.md`);
+    args.push("--entrypoint", "bash", config/* DOCKER_CONFIG */.e6.imageName, "-c");
     let claudeCommand = "source /opt/sith/nix/nix-scripts/setup.sh && cd /workspace && /root/.npm-global/bin/claude";
     if (prompt) {
         const escapedPrompt = prompt.replace(/'/g, "'\\''");
@@ -44438,22 +44365,13 @@ function buildDockerClaudeCodeCommand(githubToken, prompt, claudeOauthToken) {
     return args;
 }
 
-
-/***/ }),
-
-/***/ 1460:
-/***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => {
-
-/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
-/* harmony export */   l: () => (/* binding */ getGitHubToken)
-/* harmony export */ });
-/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(6181);
+;// CONCATENATED MODULE: ./src/utils/githubToken.ts
 
 async function getGitHubToken() {
     if (process.env.GITHUB_TOKEN)
         return process.env.GITHUB_TOKEN;
     try {
-        const { stdout } = await (0,execa__WEBPACK_IMPORTED_MODULE_0__/* .execa */ .Ho)("gh", ["auth", "token"]);
+        const { stdout } = await (0,execa/* execa */.Ho)("gh", ["auth", "token"]);
         return stdout.trim();
     }
     catch {
@@ -44461,6 +44379,62 @@ async function getGitHubToken() {
     }
 }
 
+;// CONCATENATED MODULE: ./src/utils/launcher.ts
+
+
+
+
+function getClaudeOauthToken() {
+    return process.env.CLAUDE_CODE_OAUTH_TOKEN || "";
+}
+async function launchShell() {
+    console.log("🚀 Starting Docker shell...");
+    console.log(`Mounting current directory to ${config/* DOCKER_CONFIG */.e6.workspaceMount}`);
+    console.log('Press Ctrl+D or type "exit" to leave');
+    console.log();
+    const githubToken = await getGitHubToken();
+    const dockerArgs = buildDockerShellCommand(githubToken, getClaudeOauthToken());
+    await (0,execa/* execa */.Ho)("docker", dockerArgs, { stdio: "inherit", reject: false });
+    console.log();
+    console.log("✅ Exited shell");
+}
+async function launchOpencode(prompt) {
+    console.log("🚀 Starting OpenCode...");
+    console.log(`Mounting current directory to ${config/* DOCKER_CONFIG */.e6.workspaceMount}`);
+    if (prompt)
+        console.log(`Prompt: ${prompt}`);
+    console.log();
+    const githubToken = await getGitHubToken();
+    const dockerArgs = buildDockerOpencodeCommand(githubToken, prompt, getClaudeOauthToken());
+    try {
+        await (0,execa/* execa */.Ho)("docker", dockerArgs, { stdio: "inherit" });
+        console.log();
+        console.log("✅ Exited OpenCode");
+    }
+    catch (error) {
+        console.error(`❌ ${error instanceof Error ? error.message : "Failed to start OpenCode"}`);
+        process.exit(1);
+    }
+}
+async function launchClaude(prompt) {
+    console.log("🤖 Starting Claude Code...");
+    console.log(`Mounting current directory to ${config/* DOCKER_CONFIG */.e6.workspaceMount}`);
+    if (prompt)
+        console.log(`Prompt: ${prompt}`);
+    console.log();
+    const githubToken = await getGitHubToken();
+    const dockerArgs = buildDockerClaudeCodeCommand(githubToken, prompt, getClaudeOauthToken());
+    try {
+        await (0,execa/* execa */.Ho)("docker", dockerArgs, { stdio: "inherit" });
+        console.log();
+        console.log("✅ Exited Claude Code");
+    }
+    catch (error) {
+        console.error(`❌ ${error instanceof Error ? error.message : "Failed to start Claude Code"}`);
+        process.exit(1);
+    }
+}
+
 
 /***/ }),
 
@@ -44506,14 +44480,16 @@ function getMessagePrefix(type) {
 
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   Jn: () => (/* binding */ getOpenCodeConfigPath),
-/* harmony export */   K1: () => (/* binding */ getClaudeConfigDir),
+/* harmony export */   RK: () => (/* binding */ syncClaudeMd),
 /* harmony export */   YJ: () => (/* binding */ getSkillsDir),
 /* harmony export */   j$: () => (/* binding */ isInstalled),
+/* harmony export */   lJ: () => (/* binding */ setSkillAutoLoad),
 /* harmony export */   pF: () => (/* binding */ getClaudeMdPath),
 /* harmony export */   rP: () => (/* binding */ installSkill),
-/* harmony export */   wW: () => (/* binding */ uninstallSkill)
+/* harmony export */   wW: () => (/* binding */ uninstallSkill),
+/* harmony export */   z8: () => (/* binding */ getSkillAutoLoad)
 /* harmony export */ });
-/* unused harmony export findInstructionsFile */
+/* unused harmony exports getClaudeConfigDir, findInstructionsFile */
 /* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(3024);
 /* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__nccwpck_require__.n(node_fs__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var node_os__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(8161);
@@ -44528,8 +44504,9 @@ function getMessagePrefix(type) {
 
 
 const OPENCODE_SCHEMA = "https://opencode.ai/config.json";
+const DEFAULT_MODEL = "github-copilot/claude-sonnet-4.6";
 function defaultConfig() {
-    return { $schema: OPENCODE_SCHEMA, instructions: [] };
+    return { $schema: OPENCODE_SCHEMA, model: DEFAULT_MODEL, instructions: [] };
 }
 function getSkillsDir() {
     const dir = node_path__WEBPACK_IMPORTED_MODULE_2___default().join(node_os__WEBPACK_IMPORTED_MODULE_1___default().homedir(), ".sith", "skills");
@@ -44537,25 +44514,38 @@ function getSkillsDir() {
     return dir;
 }
 function getClaudeConfigDir() {
-    return node_path__WEBPACK_IMPORTED_MODULE_2___default().join(node_os__WEBPACK_IMPORTED_MODULE_1___default().homedir(), ".claude");
+    return path.join(os.homedir(), ".claude");
 }
 function getClaudeMdPath() {
     const claudeMdPath = node_path__WEBPACK_IMPORTED_MODULE_2___default().join(node_os__WEBPACK_IMPORTED_MODULE_1___default().homedir(), ".sith", "CLAUDE.md");
-    if (!node_fs__WEBPACK_IMPORTED_MODULE_0___default().existsSync(claudeMdPath)) {
-        node_fs__WEBPACK_IMPORTED_MODULE_0___default().mkdirSync(node_path__WEBPACK_IMPORTED_MODULE_2___default().dirname(claudeMdPath), { recursive: true });
-        node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(claudeMdPath, "");
+    node_fs__WEBPACK_IMPORTED_MODULE_0___default().mkdirSync(node_path__WEBPACK_IMPORTED_MODULE_2___default().dirname(claudeMdPath), { recursive: true });
+    try {
+        node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(claudeMdPath, "", { flag: "ax" });
+    }
+    catch {
+        // already exists
     }
     return claudeMdPath;
 }
 function getOpenCodeConfigPath() {
     const configPath = node_path__WEBPACK_IMPORTED_MODULE_2___default().join(node_os__WEBPACK_IMPORTED_MODULE_1___default().homedir(), ".sith", "opencode.json");
     // Docker bind-mount creates a directory if the source doesn't exist; ensure it's a file.
-    if (node_fs__WEBPACK_IMPORTED_MODULE_0___default().existsSync(configPath) && node_fs__WEBPACK_IMPORTED_MODULE_0___default().statSync(configPath).isDirectory()) {
-        node_fs__WEBPACK_IMPORTED_MODULE_0___default().rmSync(configPath, { recursive: true, force: true });
+    try {
+        if (node_fs__WEBPACK_IMPORTED_MODULE_0___default().statSync(configPath).isDirectory()) {
+            node_fs__WEBPACK_IMPORTED_MODULE_0___default().rmSync(configPath, { recursive: true, force: true });
+        }
     }
-    if (!node_fs__WEBPACK_IMPORTED_MODULE_0___default().existsSync(configPath)) {
-        node_fs__WEBPACK_IMPORTED_MODULE_0___default().mkdirSync(node_path__WEBPACK_IMPORTED_MODULE_2___default().dirname(configPath), { recursive: true });
-        node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(configPath, JSON.stringify(defaultConfig(), null, 2));
+    catch {
+        // doesn't exist yet
+    }
+    node_fs__WEBPACK_IMPORTED_MODULE_0___default().mkdirSync(node_path__WEBPACK_IMPORTED_MODULE_2___default().dirname(configPath), { recursive: true });
+    try {
+        node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(configPath, JSON.stringify(defaultConfig(), null, 2), {
+            flag: "ax",
+        });
+    }
+    catch {
+        // already exists
     }
     return configPath;
 }
@@ -44563,6 +44553,10 @@ function readConfig() {
     const parsed = JSON.parse(node_fs__WEBPACK_IMPORTED_MODULE_0___default().readFileSync(getOpenCodeConfigPath(), "utf8"));
     if (!Array.isArray(parsed.instructions))
         parsed.instructions = [];
+    if (!parsed.model) {
+        parsed.model = DEFAULT_MODEL;
+        writeConfig(parsed);
+    }
     return parsed;
 }
 function writeConfig(config) {
@@ -44576,8 +44570,21 @@ function addInstruction(containerPath) {
     }
 }
 function syncClaudeMd() {
-    const config = readConfig();
-    const lines = config.instructions.map((p) => `@${p.replace(_config_js__WEBPACK_IMPORTED_MODULE_3__/* .DOCKER_CONFIG */ .e6.skillsMount, _config_js__WEBPACK_IMPORTED_MODULE_3__/* .DOCKER_CONFIG */ .e6.claudeSkillsMount)}`);
+    const skillsDir = getSkillsDir();
+    const lines = [];
+    for (const name of node_fs__WEBPACK_IMPORTED_MODULE_0___default().readdirSync(skillsDir)) {
+        const skillDir = node_path__WEBPACK_IMPORTED_MODULE_2___default().join(skillsDir, name);
+        const skillJsonPath = node_path__WEBPACK_IMPORTED_MODULE_2___default().join(skillDir, "skill.json");
+        if (!node_fs__WEBPACK_IMPORTED_MODULE_0___default().existsSync(skillJsonPath))
+            continue;
+        const meta = JSON.parse(node_fs__WEBPACK_IMPORTED_MODULE_0___default().readFileSync(skillJsonPath, "utf8"));
+        if (meta.autoLoad !== true)
+            continue;
+        const instructionsFile = findInstructionsFile(skillDir);
+        if (instructionsFile) {
+            lines.push(`@${_config_js__WEBPACK_IMPORTED_MODULE_3__/* .DOCKER_CONFIG */ .e6.claudeSkillsMount}/${name}/${instructionsFile}`);
+        }
+    }
     node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(getClaudeMdPath(), lines.join("\n") + (lines.length ? "\n" : ""));
 }
 function removeInstructionsUnder(skillContainerDir) {
@@ -44599,13 +44606,45 @@ function findInstructionsFile(skillDir) {
 function isInstalled(name) {
     return node_fs__WEBPACK_IMPORTED_MODULE_0___default().existsSync(node_path__WEBPACK_IMPORTED_MODULE_2___default().join(getSkillsDir(), name, "skill.json"));
 }
+function getSkillAutoLoad(name) {
+    const skillJsonPath = node_path__WEBPACK_IMPORTED_MODULE_2___default().join(getSkillsDir(), name, "skill.json");
+    if (!node_fs__WEBPACK_IMPORTED_MODULE_0___default().existsSync(skillJsonPath))
+        return false;
+    const meta = JSON.parse(node_fs__WEBPACK_IMPORTED_MODULE_0___default().readFileSync(skillJsonPath, "utf8"));
+    return meta.autoLoad === true;
+}
+function setSkillAutoLoad(name, autoLoad) {
+    const skillDir = node_path__WEBPACK_IMPORTED_MODULE_2___default().join(getSkillsDir(), name);
+    const skillJsonPath = node_path__WEBPACK_IMPORTED_MODULE_2___default().join(skillDir, "skill.json");
+    if (!node_fs__WEBPACK_IMPORTED_MODULE_0___default().existsSync(skillJsonPath))
+        return;
+    const meta = JSON.parse(node_fs__WEBPACK_IMPORTED_MODULE_0___default().readFileSync(skillJsonPath, "utf8"));
+    meta.autoLoad = autoLoad;
+    node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(skillJsonPath, JSON.stringify(meta, null, 2));
+    if (autoLoad) {
+        const instructionsFile = findInstructionsFile(skillDir);
+        if (instructionsFile) {
+            addInstruction(`${_config_js__WEBPACK_IMPORTED_MODULE_3__/* .DOCKER_CONFIG */ .e6.skillsMount}/${name}/${instructionsFile}`);
+        }
+    }
+    else {
+        removeInstructionsUnder(`${_config_js__WEBPACK_IMPORTED_MODULE_3__/* .DOCKER_CONFIG */ .e6.skillsMount}/${name}/`);
+    }
+    syncClaudeMd();
+}
 async function installSkill(skill) {
     const targetDir = node_path__WEBPACK_IMPORTED_MODULE_2___default().join(getSkillsDir(), skill.name);
     if (skill.builtinInstructions) {
         node_fs__WEBPACK_IMPORTED_MODULE_0___default().mkdirSync(targetDir, { recursive: true });
         node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(node_path__WEBPACK_IMPORTED_MODULE_2___default().join(targetDir, "SKILL.md"), skill.builtinInstructions);
-        node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(node_path__WEBPACK_IMPORTED_MODULE_2___default().join(targetDir, "skill.json"), JSON.stringify({ name: skill.name, version: "builtin" }, null, 2));
-        addInstruction(`${_config_js__WEBPACK_IMPORTED_MODULE_3__/* .DOCKER_CONFIG */ .e6.skillsMount}/${skill.name}/SKILL.md`);
+        node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(node_path__WEBPACK_IMPORTED_MODULE_2___default().join(targetDir, "skill.json"), JSON.stringify({
+            name: skill.name,
+            version: "builtin",
+            autoLoad: skill.autoLoad ?? false,
+        }, null, 2));
+        if (skill.autoLoad === true) {
+            addInstruction(`${_config_js__WEBPACK_IMPORTED_MODULE_3__/* .DOCKER_CONFIG */ .e6.skillsMount}/${skill.name}/SKILL.md`);
+        }
         syncClaudeMd();
         return;
     }
@@ -44625,11 +44664,18 @@ async function installSkill(skill) {
             node_fs__WEBPACK_IMPORTED_MODULE_0___default().rmSync(targetDir, { recursive: true, force: true });
         node_fs__WEBPACK_IMPORTED_MODULE_0___default().cpSync(extracted, targetDir, { recursive: true });
         const skillJson = node_path__WEBPACK_IMPORTED_MODULE_2___default().join(targetDir, "skill.json");
-        if (!node_fs__WEBPACK_IMPORTED_MODULE_0___default().existsSync(skillJson)) {
-            node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(skillJson, JSON.stringify({ name: skill.name, version: "local" }, null, 2));
+        try {
+            node_fs__WEBPACK_IMPORTED_MODULE_0___default().writeFileSync(skillJson, JSON.stringify({
+                name: skill.name,
+                version: "local",
+                autoLoad: skill.autoLoad ?? false,
+            }, null, 2), { flag: "ax" });
+        }
+        catch {
+            // already exists (skill.json bundled in archive)
         }
         const instructionsFile = findInstructionsFile(targetDir);
-        if (instructionsFile) {
+        if (instructionsFile && skill.autoLoad === true) {
             addInstruction(`${_config_js__WEBPACK_IMPORTED_MODULE_3__/* .DOCKER_CONFIG */ .e6.skillsMount}/${skill.name}/${instructionsFile}`);
         }
         syncClaudeMd();

package/dist/types.d.ts

@@ -20,4 +20,5 @@ export interface SkillEntry {
     source?: string;
     homepage: string;
     builtinInstructions?: string;
+    autoLoad?: boolean;
 }

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,oBAAoB;IACpC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC7B"}
+{"version":3,"file":"","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,oBAAoB;IACpC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB"}

package/dist/utils/dockerArgs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dockerArgs.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/utils/dockerArgs.ts"],"names":[],"mappings":"AASA,wBAAgB,uBAAuB,CACtC,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,GACvB,MAAM,EAAE,CAwBV;AAED,wBAAgB,0BAA0B,CACzC,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,MAAM,GACvB,MAAM,EAAE,CA6BV;AAED,wBAAgB,4BAA4B,CAC3C,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,MAAM,GACvB,MAAM,EAAE,CA0CV"}
+{"version":3,"file":"dockerArgs.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/utils/dockerArgs.ts"],"names":[],"mappings":"AASA,wBAAgB,uBAAuB,CACtC,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,GACvB,MAAM,EAAE,CA6BV;AAED,wBAAgB,0BAA0B,CACzC,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,MAAM,GACvB,MAAM,EAAE,CA6BV;AAED,wBAAgB,4BAA4B,CAC3C,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,MAAM,GACvB,MAAM,EAAE,CAqCV"}

package/dist/utils/launcher.d.ts

@@ -0,0 +1,4 @@
+export declare function launchShell(): Promise<void>;
+export declare function launchOpencode(prompt?: string): Promise<void>;
+export declare function launchClaude(prompt?: string): Promise<void>;
+//# sourceMappingURL=launcher.d.ts.map

package/dist/utils/launcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/utils/launcher.ts"],"names":[],"mappings":"AAaA,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAgBjD;AAED,wBAAsB,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBnE;AAED,wBAAsB,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBjE"}

package/dist/utils/skills.d.ts

@@ -3,8 +3,11 @@ export declare function getSkillsDir(): string;
 export declare function getClaudeConfigDir(): string;
 export declare function getClaudeMdPath(): string;
 export declare function getOpenCodeConfigPath(): string;
+export declare function syncClaudeMd(): void;
 export declare function findInstructionsFile(skillDir: string): string | null;
 export declare function isInstalled(name: string): boolean;
+export declare function getSkillAutoLoad(name: string): boolean;
+export declare function setSkillAutoLoad(name: string, autoLoad: boolean): void;
 export declare function installSkill(skill: SkillEntry): Promise<void>;
 export declare function uninstallSkill(name: string): void;
 //# sourceMappingURL=skills.d.ts.map

package/dist/utils/skills.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/utils/skills.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAa9C,wBAAgB,YAAY,IAAI,MAAM,CAIrC;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAgB,eAAe,IAAI,MAAM,CAOxC;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAW9C;AAwCD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYpE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAwDnE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAOjD"}
+{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["file:///home/runner/work/sith/sith/src/utils/skills.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAe9C,wBAAgB,YAAY,IAAI,MAAM,CAIrC;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAgB,eAAe,IAAI,MAAM,CASxC;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAmB9C;AAwBD,wBAAgB,YAAY,IAAI,IAAI,CAoBnC;AAUD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYpE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAKtD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI,CAkBtE;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA6EnE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAOjD"}

package/docker/claude-defaults/CLAUDE.md

@@ -1,25 +1 @@
-CAVEMAN MODE ACTIVE — level: ultra
-
-Respond terse like smart caveman. All technical substance stay. Only fluff die.
-
-## Persistence
-
-ACTIVE EVERY RESPONSE. No revert after many turns. No filler drift. Still active if unsure. Off only: "stop caveman" / "normal mode".
-
-## Rules
-
-Drop: articles (a/an/the), filler (just/really/basically/actually/simply), pleasantries (sure/certainly/of course/happy to), hedging. Fragments OK. Short synonyms (big not extensive, fix not "implement a solution for"). Technical terms exact. Code blocks unchanged. Errors quoted exact.
-
-Pattern: `[thing] [action] [reason]. [next step].`
-
-## Ultra level
-
-Abbreviate (DB/auth/config/req/res/fn/impl), strip conjunctions, arrows for causality (X → Y), one word when one word enough.
-
-## Auto-Clarity
-
-Drop caveman for: security warnings, irreversible action confirmations, multi-step sequences where fragment order risks misread. Resume caveman after clear part done.
-
-## Boundaries
-
-Code/commits/PRs: write normal. "stop caveman" or "normal mode": revert.
+@/root/.claude/skills/caveman/SKILL.md

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m14i/sith",
-  "version": "1.21.0",
+  "version": "1.22.0",
   "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": {
@@ -19,7 +19,8 @@
     "lint": "biome check src/",
     "typecheck": "tsc --noEmit",
     "clean": "rm -rf dist",
-    "prepublishOnly": "pnpm build"
+    "prepublishOnly": "pnpm build",
+    "prepare": "husky"
   },
   "files": [
     "dist",
@@ -57,6 +58,8 @@
     "@types/update-notifier": "^6.0.8",
     "@vercel/ncc": "^0.38.1",
     "@vitest/coverage-v8": "^4.1.7",
+    "husky": "^9.1.7",
+    "lint-staged": "^17.0.7",
     "semantic-release": "^24.2.0",
     "tsx": "^4.7.2",
     "typescript": "^5.4.5",
@@ -65,6 +68,11 @@
   "engines": {
     "node": ">=18"
   },
+  "lint-staged": {
+    "src/**/*.{ts,tsx}": [
+      "biome check --write --unsafe"
+    ]
+  },
   "pnpm": {
     "overrides": {
       "esbuild": ">=0.28.1"