@rnbsolucoes/axion-code 0.1.53 → 0.1.54

package/README.md

@@ -116,16 +116,22 @@ as a development fallback.
 
 In the chat composer, **Enter sends** and **Ctrl+J inserts a newline**. Terminals
 do not report Shift+Enter or Ctrl+Enter as distinct keys to the app on Windows,
-so to use those keys for a line break, run once after install:
+so those keys must be mapped to send a newline.
+
+On the **first run**, Axion does this automatically for Windows Terminal: it maps
+**Shift+Enter** and **Ctrl+Enter** to send a newline (only when those keys are
+free — it never overwrites an existing binding), writes a `settings.json.axion-bak`
+backup, and prints a one-line notice. Reopen the terminal tab to apply. This runs
+at runtime (not via an npm `postinstall` hook) and only once, tracked by a marker
+in the local bin directory.
+
+Opt out with `AXION_SKIP_TERMINAL_SETUP=1`. Re-apply or repair anytime with:
 
 ```powershell
 axion terminal-setup
 ```
 
-It maps **Shift+Enter** and **Ctrl+Enter** to send a newline in Windows Terminal
-(idempotent, writes a `settings.json.axion-bak` backup). Reopen the terminal tab
-if the change does not take effect immediately. On other terminals, bind
-Shift+Enter / Ctrl+Enter to send a newline (`\n`) manually.
+On other terminals, bind Shift+Enter / Ctrl+Enter to send a newline (`\n`) manually.
 
 To classify the currently executed binary for support or security review, run:
 

package/npm/bin/axion.mjs

@@ -328,15 +328,18 @@ async function updateCommandHandler(args) {
   console.log("Axion Code update completed. Run axion again.");
 }
 
-function terminalSetupHandler() {
+function applyTerminalSetup({ auto = false } = {}) {
   // Map Shift+Enter and Ctrl+Enter to send a literal newline (LF). Axion's
   // composer inserts a line break on LF, while plain Enter (CR) still sends.
   // This is needed because terminals do not report Shift+Enter/Ctrl+Enter as
-  // distinct keys to the app on Windows.
+  // distinct keys to the app on Windows. In auto mode it stays silent, never
+  // clobbers an existing user binding, and swallows failures.
   if (!isWindows) {
-    console.log("axion terminal-setup currently automates Windows Terminal.");
-    console.log("On other terminals, bind Shift+Enter (and/or Ctrl+Enter) to send a newline (\\n).");
-    return;
+    if (!auto) {
+      console.log("axion terminal-setup currently automates Windows Terminal.");
+      console.log("On other terminals, bind Shift+Enter (and/or Ctrl+Enter) to send a newline (\\n).");
+    }
+    return { changed: false, reason: "unsupported" };
   }
   const localAppData = process.env.LOCALAPPDATA || join(process.env.USERPROFILE || root, "AppData", "Local");
   const candidates = [
@@ -346,16 +349,21 @@ function terminalSetupHandler() {
   ];
   const settingsPath = candidates.find((p) => existsSync(p));
   if (!settingsPath) {
-    console.log("Windows Terminal settings.json not found.");
-    console.log("If you use another terminal, bind Shift+Enter / Ctrl+Enter to send a newline (\\n).");
-    return;
+    if (!auto) {
+      console.log("Windows Terminal settings.json not found.");
+      console.log("If you use another terminal, bind Shift+Enter / Ctrl+Enter to send a newline (\\n).");
+    }
+    return { changed: false, reason: "not-found" };
   }
   let settings;
   try {
     settings = JSON.parse(readFileSync(settingsPath, "utf8"));
   } catch (err) {
-    console.error(`Could not parse ${settingsPath}: ${err.message}`);
-    process.exit(1);
+    if (!auto) {
+      console.error(`Could not parse ${settingsPath}: ${err.message}`);
+      process.exit(1);
+    }
+    return { changed: false, reason: "parse-error" };
   }
   if (!Array.isArray(settings.keybindings)) settings.keybindings = [];
   const wanted = ["shift+enter", "ctrl+enter"];
@@ -376,8 +384,15 @@ function terminalSetupHandler() {
     return c && c.action === "sendInput" && c.input === "\n";
   };
   if (wanted.every((keys) => settings.keybindings.some((k) => isOurs(k, keys)))) {
-    console.log("Windows Terminal is already set up: Shift+Enter and Ctrl+Enter insert a newline.");
-    return;
+    if (!auto) console.log("Windows Terminal is already set up: Shift+Enter and Ctrl+Enter insert a newline.");
+    return { changed: false, reason: "already" };
+  }
+  if (auto) {
+    // Never overwrite a binding the user assigned to these keys themselves.
+    for (const keys of wanted) {
+      const existing = settings.keybindings.find((k) => k && k.keys === keys);
+      if (existing && !isOurs(existing, keys)) return { changed: false, reason: "conflict" };
+    }
   }
   settings.keybindings = settings.keybindings.filter((k) => !(k && wanted.includes(k.keys)));
   for (const keys of wanted) {
@@ -387,11 +402,46 @@ function terminalSetupHandler() {
   try {
     copyFileSync(settingsPath, backup);
   } catch {}
-  writeFileSync(settingsPath, JSON.stringify(settings, null, 4));
-  console.log("Windows Terminal configured: Shift+Enter and Ctrl+Enter now insert a newline in Axion (Enter still sends).");
-  console.log(`Settings: ${settingsPath}`);
-  console.log(`Backup:   ${backup}`);
-  console.log("Reopen the terminal tab if the change does not take effect immediately.");
+  try {
+    writeFileSync(settingsPath, JSON.stringify(settings, null, 4));
+  } catch (err) {
+    if (!auto) {
+      console.error(err.message);
+      process.exit(1);
+    }
+    return { changed: false, reason: "write-error" };
+  }
+  if (!auto) {
+    console.log("Windows Terminal configured: Shift+Enter and Ctrl+Enter now insert a newline in Axion (Enter still sends).");
+    console.log(`Settings: ${settingsPath}`);
+    console.log(`Backup:   ${backup}`);
+    console.log("Reopen the terminal tab if the change does not take effect immediately.");
+  }
+  return { changed: true, settingsPath, backup };
+}
+
+function terminalSetupHandler() {
+  applyTerminalSetup({ auto: false });
+}
+
+function maybeFirstRunTerminalSetup() {
+  if (!isWindows || process.env.AXION_SKIP_TERMINAL_SETUP) return;
+  const marker = join(binDir, ".axion-terminal-setup-done");
+  if (existsSync(marker)) return;
+  try {
+    const res = applyTerminalSetup({ auto: true });
+    if (res.changed) {
+      console.log(
+        `Axion enabled Shift+Enter and Ctrl+Enter as newline keys in Windows Terminal ` +
+        `(reopen the tab to apply; backup at ${res.backup}, opt out with AXION_SKIP_TERMINAL_SETUP=1, ` +
+        `redo with 'axion terminal-setup').`
+      );
+    }
+  } catch {}
+  try {
+    mkdirSync(binDir, { recursive: true });
+    writeFileSync(marker, new Date().toISOString());
+  } catch {}
 }
 
 const args = process.argv.slice(2);
@@ -404,6 +454,8 @@ if (args[0] === "terminal-setup") {
   process.exit(0);
 }
 
+maybeFirstRunTerminalSetup();
+
 const updateInfo = await readUpdateInfo();
 ensureBinary();
 const run = spawnSync(exePath, process.argv.slice(2), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnbsolucoes/axion-code",
-  "version": "0.1.53",
+  "version": "0.1.54",
   "description": "Axion Code CLI harness for the Axion ecosystem.",
   "type": "module",
   "repository": {