@nomad-e/bluma-cli 0.0.42 → 0.0.43

package/dist/main.js

@@ -142,9 +142,15 @@ function inputReducer(state, action, viewWidth) {
     }
     case "SET": {
       const t = action.payload.text.replace(/(||)/gm, "");
-      const moveToEnd = action.payload.moveCursorToEnd ?? true;
+      let newCursorPosition;
+      if (typeof action.payload.cursorPosition === "number") {
+        newCursorPosition = Math.min(action.payload.cursorPosition, t.length);
+      } else if (action.payload.moveCursorToEnd ?? true) {
+        newCursorPosition = t.length;
+      } else {
+        newCursorPosition = Math.min(state.cursorPosition, t.length);
+      }
       const newText = t;
-      const newCursorPosition = moveToEnd ? newText.length : Math.min(state.cursorPosition, newText.length);
       const newViewStart = adjustView(newCursorPosition, 0);
       return { text: newText, cursorPosition: newCursorPosition, viewStart: newViewStart };
     }
@@ -375,12 +381,16 @@ function useAtCompletion({
     let chosen = suggestions[selected].label;
     const isDir = suggestions[selected].isDir;
     chosen = chosen.replace(/\\/g, "/").replace(/\|/g, "");
-    let insertVal = chosen;
-    if (insertVal.includes("/")) {
-      insertVal = insertVal.replace(/\/+$/g, "");
-      const parts = insertVal.split("/");
-      insertVal = parts[parts.length - 1];
+    let insertVal = chosen.replace(/\/+$/g, "");
+    const currentPattern = res.pattern || "";
+    if (currentPattern.length > 0) {
+      const normalizedPattern = currentPattern.replace(/\/+$/g, "");
+      if (insertVal.startsWith(normalizedPattern)) {
+        insertVal = insertVal.slice(normalizedPattern.length);
+        insertVal = insertVal.replace(/^\/+/, "");
+      }
     }
+    insertVal = insertVal.split("\\").join("/");
     if (isDir && !insertVal.endsWith("/")) insertVal = insertVal + "/";
     const pattern = res.pattern || "";
     const lastSlash = pattern.lastIndexOf("/");
@@ -389,13 +399,16 @@ function useAtCompletion({
     const before = text.slice(0, segmentStart);
     const after = text.slice(cursorPosition);
     const newText = before + insertVal + after;
-    setText(newText + (isDir ? "" : " "), true);
+    const finalText = newText + " ";
+    setText(finalText, finalText.length);
+    globalThis.__BLUMA_FORCE_CURSOR_END__ = true;
+    update(finalText, finalText.length);
     if (isDir) {
       setOpen(false);
       setSuggestions([]);
       setTimeout(() => {
         setOpen(true);
-        update(newText, newText.length);
+        update(finalText, finalText.length);
       }, 0);
     } else {
       setOpen(false);
@@ -496,6 +509,12 @@ var InputPrompt = ({ onSubmit, isReadOnly, onInterrupt, disableWhileProcessing =
       setSlashOpen(false);
     }
   }, { isActive: slashOpen });
+  useEffect2(() => {
+    if (globalThis.__BLUMA_FORCE_CURSOR_END__) {
+      setText(text, text.length);
+      delete globalThis.__BLUMA_FORCE_CURSOR_END__;
+    }
+  }, [text, setText]);
   const cwd = process.cwd();
   const pathAutocomplete = useAtCompletion({ cwd, text, cursorPosition, setText });
   useInput2((input, key) => {
@@ -514,6 +533,7 @@ var InputPrompt = ({ onSubmit, isReadOnly, onInterrupt, disableWhileProcessing =
           if (m) {
             globalThis.__BLUMA_SUPPRESS_SUBMIT__ = true;
             pathAutocomplete.insertAtSelection();
+            return;
           }
         }
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomad-e/bluma-cli",
-  "version": "0.0.42",
+  "version": "0.0.43",
   "description": "BluMa independent agent for automation and advanced software engineering.",
   "author": "Alex Fonseca",
   "license": "Apache-2.0",