dlw-machine-setup 0.9.2 → 0.9.4

package/bin/installer.js

@@ -1612,14 +1612,14 @@ var require_lib = __commonJS({
 var require_ansi_escapes = __commonJS({
   "node_modules/ansi-escapes/index.js"(exports2, module2) {
     "use strict";
-    var ansiEscapes4 = module2.exports;
-    module2.exports.default = ansiEscapes4;
+    var ansiEscapes5 = module2.exports;
+    module2.exports.default = ansiEscapes5;
     var ESC = "\x1B[";
     var OSC = "\x1B]";
     var BEL = "\x07";
     var SEP = ";";
     var isTerminalApp = process.env.TERM_PROGRAM === "Apple_Terminal";
-    ansiEscapes4.cursorTo = (x, y) => {
+    ansiEscapes5.cursorTo = (x, y) => {
       if (typeof x !== "number") {
         throw new TypeError("The `x` argument is required");
       }
@@ -1628,7 +1628,7 @@ var require_ansi_escapes = __commonJS({
       }
       return ESC + (y + 1) + ";" + (x + 1) + "H";
     };
-    ansiEscapes4.cursorMove = (x, y) => {
+    ansiEscapes5.cursorMove = (x, y) => {
       if (typeof x !== "number") {
         throw new TypeError("The `x` argument is required");
       }
@@ -1645,46 +1645,46 @@ var require_ansi_escapes = __commonJS({
       }
       return ret;
     };
-    ansiEscapes4.cursorUp = (count = 1) => ESC + count + "A";
-    ansiEscapes4.cursorDown = (count = 1) => ESC + count + "B";
-    ansiEscapes4.cursorForward = (count = 1) => ESC + count + "C";
-    ansiEscapes4.cursorBackward = (count = 1) => ESC + count + "D";
-    ansiEscapes4.cursorLeft = ESC + "G";
-    ansiEscapes4.cursorSavePosition = isTerminalApp ? "\x1B7" : ESC + "s";
-    ansiEscapes4.cursorRestorePosition = isTerminalApp ? "\x1B8" : ESC + "u";
-    ansiEscapes4.cursorGetPosition = ESC + "6n";
-    ansiEscapes4.cursorNextLine = ESC + "E";
-    ansiEscapes4.cursorPrevLine = ESC + "F";
-    ansiEscapes4.cursorHide = ESC + "?25l";
-    ansiEscapes4.cursorShow = ESC + "?25h";
-    ansiEscapes4.eraseLines = (count) => {
+    ansiEscapes5.cursorUp = (count = 1) => ESC + count + "A";
+    ansiEscapes5.cursorDown = (count = 1) => ESC + count + "B";
+    ansiEscapes5.cursorForward = (count = 1) => ESC + count + "C";
+    ansiEscapes5.cursorBackward = (count = 1) => ESC + count + "D";
+    ansiEscapes5.cursorLeft = ESC + "G";
+    ansiEscapes5.cursorSavePosition = isTerminalApp ? "\x1B7" : ESC + "s";
+    ansiEscapes5.cursorRestorePosition = isTerminalApp ? "\x1B8" : ESC + "u";
+    ansiEscapes5.cursorGetPosition = ESC + "6n";
+    ansiEscapes5.cursorNextLine = ESC + "E";
+    ansiEscapes5.cursorPrevLine = ESC + "F";
+    ansiEscapes5.cursorHide = ESC + "?25l";
+    ansiEscapes5.cursorShow = ESC + "?25h";
+    ansiEscapes5.eraseLines = (count) => {
       let clear = "";
       for (let i = 0; i < count; i++) {
-        clear += ansiEscapes4.eraseLine + (i < count - 1 ? ansiEscapes4.cursorUp() : "");
+        clear += ansiEscapes5.eraseLine + (i < count - 1 ? ansiEscapes5.cursorUp() : "");
       }
       if (count) {
-        clear += ansiEscapes4.cursorLeft;
+        clear += ansiEscapes5.cursorLeft;
       }
       return clear;
     };
-    ansiEscapes4.eraseEndLine = ESC + "K";
-    ansiEscapes4.eraseStartLine = ESC + "1K";
-    ansiEscapes4.eraseLine = ESC + "2K";
-    ansiEscapes4.eraseDown = ESC + "J";
-    ansiEscapes4.eraseUp = ESC + "1J";
-    ansiEscapes4.eraseScreen = ESC + "2J";
-    ansiEscapes4.scrollUp = ESC + "S";
-    ansiEscapes4.scrollDown = ESC + "T";
-    ansiEscapes4.clearScreen = "\x1Bc";
-    ansiEscapes4.clearTerminal = process.platform === "win32" ? `${ansiEscapes4.eraseScreen}${ESC}0f` : (
+    ansiEscapes5.eraseEndLine = ESC + "K";
+    ansiEscapes5.eraseStartLine = ESC + "1K";
+    ansiEscapes5.eraseLine = ESC + "2K";
+    ansiEscapes5.eraseDown = ESC + "J";
+    ansiEscapes5.eraseUp = ESC + "1J";
+    ansiEscapes5.eraseScreen = ESC + "2J";
+    ansiEscapes5.scrollUp = ESC + "S";
+    ansiEscapes5.scrollDown = ESC + "T";
+    ansiEscapes5.clearScreen = "\x1Bc";
+    ansiEscapes5.clearTerminal = process.platform === "win32" ? `${ansiEscapes5.eraseScreen}${ESC}0f` : (
       // 1. Erases the screen (Only done in case `2` is not supported)
       // 2. Erases the whole screen including scrollback buffer
       // 3. Moves cursor to the top-left position
       // More info: https://www.real-world-systems.com/docs/ANSIcode.html
-      `${ansiEscapes4.eraseScreen}${ESC}3J${ESC}H`
+      `${ansiEscapes5.eraseScreen}${ESC}3J${ESC}H`
     );
-    ansiEscapes4.beep = BEL;
-    ansiEscapes4.link = (text, url) => {
+    ansiEscapes5.beep = BEL;
+    ansiEscapes5.link = (text, url) => {
       return [
         OSC,
         "8",
@@ -1700,7 +1700,7 @@ var require_ansi_escapes = __commonJS({
         BEL
       ].join("");
     };
-    ansiEscapes4.image = (buffer, options = {}) => {
+    ansiEscapes5.image = (buffer, options = {}) => {
       let ret = `${OSC}1337;File=inline=1`;
       if (options.width) {
         ret += `;width=${options.width}`;
@@ -1713,7 +1713,7 @@ var require_ansi_escapes = __commonJS({
       }
       return ret + ":" + buffer.toString("base64") + BEL;
     };
-    ansiEscapes4.iTerm = {
+    ansiEscapes5.iTerm = {
       setCwd: (cwd = process.cwd()) => `${OSC}50;CurrentDir=${cwd}${BEL}`,
       annotation: (message, options = {}) => {
         let ret = `${OSC}1337;`;
@@ -3103,9 +3103,60 @@ var esm_default4 = createPrompt((config, done) => {
   ];
 });
 
+// node_modules/@inquirer/password/dist/esm/index.mjs
+var import_ansi_escapes3 = __toESM(require_ansi_escapes(), 1);
+var esm_default5 = createPrompt((config, done) => {
+  const { validate = () => true } = config;
+  const theme = makeTheme(config.theme);
+  const [status, setStatus] = useState("pending");
+  const [errorMsg, setError] = useState();
+  const [value, setValue] = useState("");
+  const isLoading = status === "loading";
+  const prefix = usePrefix({ isLoading, theme });
+  useKeypress(async (key, rl) => {
+    if (status !== "pending") {
+      return;
+    }
+    if (isEnterKey(key)) {
+      const answer = value;
+      setStatus("loading");
+      const isValid = await validate(answer);
+      if (isValid === true) {
+        setValue(answer);
+        setStatus("done");
+        done(answer);
+      } else {
+        rl.write(value);
+        setError(isValid || "You must provide a valid value");
+        setStatus("pending");
+      }
+    } else {
+      setValue(rl.line);
+      setError(void 0);
+    }
+  });
+  const message = theme.style.message(config.message);
+  let formattedValue = "";
+  let helpTip;
+  if (config.mask) {
+    const maskChar = typeof config.mask === "string" ? config.mask : "*";
+    formattedValue = maskChar.repeat(value.length);
+  } else if (status !== "done") {
+    helpTip = `${theme.style.help("[input is masked]")}${import_ansi_escapes3.default.cursorHide}`;
+  }
+  if (status === "done") {
+    formattedValue = theme.style.answer(formattedValue);
+  }
+  let error = "";
+  if (errorMsg) {
+    error = theme.style.error(errorMsg);
+  }
+  return [[prefix, message, config.mask ? formattedValue : helpTip].join(" "), error];
+});
+
 // node_modules/@inquirer/select/dist/esm/index.mjs
 var import_yoctocolors_cjs4 = __toESM(require_yoctocolors_cjs(), 1);
-var import_ansi_escapes3 = __toESM(require_ansi_escapes(), 1);
+var import_ansi_escapes4 = __toESM(require_ansi_escapes(), 1);
 var selectTheme = {
   icon: { cursor: esm_default.pointer },
   style: {
@@ -3139,7 +3190,7 @@ function normalizeChoices2(choices) {
     };
   });
 }
-var esm_default5 = createPrompt((config, done) => {
+var esm_default6 = createPrompt((config, done) => {
   const { loop = true, pageSize = 7 } = config;
   const firstRender = useRef(true);
   const theme = makeTheme(selectTheme, config.theme);
@@ -3240,7 +3291,7 @@ ${theme.style.help("(Use arrow keys to reveal more choices)")}`;
   const choiceDescription = selectedChoice.description ? `
 ${theme.style.description(selectedChoice.description)}` : ``;
   return `${[prefix, message, helpTipTop].filter(Boolean).join(" ")}
-${page}${helpTipBottom}${choiceDescription}${import_ansi_escapes3.default.cursorHide}`;
+${page}${helpTipBottom}${choiceDescription}${import_ansi_escapes4.default.cursorHide}`;
 });
 
 // src/index.ts
@@ -5517,7 +5568,13 @@ var write_state_default = defineStep({
         instructions: target.instructions,
         mcpConfig: target.mcpConfig,
         contexts: "_ai-context/",
-        factory: ctx.installed.factoryInstalled ? "factory/" : null,
+        /* Factory v2 bundle lands assets under .claude/ via the
+         * Claude Code profile (agents/, skills/, factory/, hooks/, plus
+         * a merge into .claude/settings.json). The legacy 'factory/'
+         * top-level path was retired in installer v0.8.0 when the
+         * per-agent profile dispatch took over — keeping it here would
+         * mislead the uninstall preview which reads this field. */
+        factory: ctx.installed.factoryInstalled ? ".claude/" : null,
         abapHooks: ctx.installed.abapHooksInstalled ? ".claude/hooks/" : null,
         globalConfig: (0, import_path14.join)((0, import_os2.homedir)(), ".one-shot-installer")
       }
@@ -5821,7 +5878,7 @@ async function collectInputs(options, releaseVersion, factoryAvailable = false,
     loop: false
   });
   const selectedTechnologies = options.technologies.filter((p) => selectedIds.includes(p.id));
-  const agent = await esm_default5({
+  const agent = await esm_default6({
     message: "AI coding tool:",
     choices: options.agents,
     loop: false
@@ -5844,6 +5901,27 @@ async function collectInputs(options, releaseVersion, factoryAvailable = false,
       }
     }
   }
+  if (mcpConfig["sap_mcp_server"]) {
+    const sapUser = (await esm_default4({
+      message: "SAP MCP (ABAP F4P) username  (leave empty to skip):"
+    })).trim();
+    if (sapUser === "") {
+      delete mcpConfig["sap_mcp_server"];
+    } else {
+      const sapPassword = await esm_default5({
+        message: "SAP MCP (ABAP F4P) password:",
+        mask: "*"
+      });
+      if (sapPassword === "") {
+        delete mcpConfig["sap_mcp_server"];
+      } else {
+        const encoded = Buffer.from(`${sapUser}:${sapPassword}`).toString("base64");
+        if (mcpConfig["sap_mcp_server"].installCommand) {
+          mcpConfig["sap_mcp_server"].installCommand = mcpConfig["sap_mcp_server"].installCommand.replace(/__SAP_MCP_AUTH__/g, encoded);
+        }
+      }
+    }
+  }
   const projectInput = await esm_default4({
     message: "Project directory:",
     default: (0, import_path16.resolve)(process.cwd())
@@ -5897,15 +5975,13 @@ async function previewAndConfirm(config, options) {
   console.log(`    ${instructionFile.padEnd(domainColWidth + 14)}${instructionMode}`);
   console.log(`    ${mcpConfigFile.padEnd(domainColWidth + 14)}${mcpMode}`);
   console.log(`    ${".gitignore".padEnd(domainColWidth + 14)}${gitignoreMode}`);
-  if (config.installFactory) {
-    const factoryExists = (0, import_fs16.existsSync)((0, import_path16.join)(config.projectPath, "factory"));
-    const factoryMode = factoryExists ? yellow2("overwrite") : green2("create");
-    console.log(`    ${"factory/".padEnd(domainColWidth + 14)}${factoryMode}`);
-  }
-  if (config.installAbapHooks) {
-    const hooksDir = (0, import_path16.join)(config.projectPath, ".claude", "hooks");
-    const hooksMode = (0, import_fs16.existsSync)(hooksDir) ? yellow2("merge") : green2("create");
-    console.log(`    ${".claude/hooks/".padEnd(domainColWidth + 14)}${hooksMode}`);
+  if (config.installFactory || config.installAbapHooks) {
+    const claudeDir = (0, import_path16.join)(config.projectPath, ".claude");
+    const claudeMode = (0, import_fs16.existsSync)(claudeDir) ? yellow2("merge") : green2("create");
+    console.log(`    ${".claude/".padEnd(domainColWidth + 14)}${claudeMode}`);
+    const settingsPath = (0, import_path16.join)(config.projectPath, ".claude", "settings.json");
+    const settingsMode = (0, import_fs16.existsSync)(settingsPath) ? yellow2("merge") : green2("create");
+    console.log(`    ${".claude/settings.json".padEnd(domainColWidth + 14)}${settingsMode}`);
   }
   if (serverEntries.length > 0) {
     console.log("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlw-machine-setup",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "One-shot installer for The Machine toolchain",
   "bin": {
     "dlw-machine-setup": "bin/installer.js"