@mlightcad/cad-simple-viewer 1.4.10 → 1.4.12

package/lib/editor/input/ui/AcEdInputManager.js

@@ -1,3 +1,18 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -73,12 +88,22 @@ var __values = (this && this.__values) || function(o) {
 import { AcGeBox2d } from '@mlightcad/data-model';
 import { AcApSettingManager } from '../../../app';
 import { AcApI18n } from '../../../i18n';
+import { AcEdSelectionSet } from '../AcEdSelectionSet';
 import { AcEdAngleHandler, AcEdDistanceHandler, AcEdDoubleHandler, AcEdIntegerHandler, AcEdPointHandler, AcEdStringHandler } from '../handler';
 import { AcEdKeywordHandler } from '../handler/AcEdKeywordHandler';
-import { AcEdPromptPointOptions } from '../prompt';
+import { AcEdPromptBoxResult, AcEdPromptDoubleResult, AcEdPromptEntityResult, AcEdPromptIntegerResult, AcEdPromptKeywordOptions, AcEdPromptPointOptions, AcEdPromptPointResult, AcEdPromptResult, AcEdPromptSelectionResult, AcEdPromptStatus } from '../prompt';
 import { AcEdCommandLine } from './AcEdCommandLine';
 import { AcEdFloatingInput } from './AcEdFloatingInput';
 import { AcEdFloatingMessage } from './AcEdFloatingMessage';
+var AcEdKeywordInputError = /** @class */ (function (_super) {
+    __extends(AcEdKeywordInputError, _super);
+    function AcEdKeywordInputError(keyword) {
+        var _this = _super.call(this, 'keyword') || this;
+        _this.keyword = keyword;
+        return _this;
+    }
+    return AcEdKeywordInputError;
+}(Error));
 /**
  * A fully type-safe TypeScript class providing CAD-style interactive user input
  * using floating HTML input boxes and mouse events. Supports collecting points,
@@ -98,11 +123,25 @@ var AcEdInputManager = /** @class */ (function () {
         this.lastPoint = null;
         /** Buffered command-line style inputs (each item is one Enter-confirmed value). */
         this._scriptInputs = [];
+        /** Current modifier key state during input sessions. */
+        this._modifierState = {
+            ctrlKey: false,
+            shiftKey: false,
+            altKey: false,
+            metaKey: false
+        };
+        /** Toggle-style Ctrl flip state (press Ctrl once to flip arc direction). */
+        this._ctrlArcFlip = false;
         /**
          * The flag to indicate whether it is currently in an “input acquisition” mode (e.g., point
          * selection, distance/angle prompt, string prompt, etc.),
          */
         this.active = false;
+        /**
+         * True only when the current input session explicitly expects entity selection
+         * (getEntity/getSelection). Used to gate view-level selection behavior.
+         */
+        this.entitySelectionActive = false;
         this.view = view;
         this.injectCSS();
         // Newly added UI overlays (command line, previews) are container-local.
@@ -129,6 +168,40 @@ var AcEdInputManager = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(AcEdInputManager.prototype, "isEntitySelectionActive", {
+        /**
+         * Whether current input session allows entity selection in the view.
+         */
+        get: function () {
+            return this.entitySelectionActive;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AcEdInputManager.prototype, "modifiers", {
+        /**
+         * Current modifier key state (Ctrl/Shift/Alt/Meta) during input sessions.
+         */
+        get: function () {
+            return this._modifierState;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AcEdInputManager.prototype, "toggles", {
+        /**
+         * Toggle-style input states (press once to flip, persists after keyup).
+         */
+        get: function () {
+            return { ctrlArcFlip: this._ctrlArcFlip };
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /** Reset toggle-style inputs to their default state. */
+    AcEdInputManager.prototype.resetToggles = function () {
+        this._ctrlArcFlip = false;
+    };
     /**
      * Queue scripted inputs for subsequent getXXX calls.
      * One array item equals one Enter-confirmed value.
@@ -152,7 +225,7 @@ var AcEdInputManager = /** @class */ (function () {
             return;
         AcEdInputManager.stylesInjected = true;
         var style = document.createElement('style');
-        style.textContent = "\n      .ml-jig-preview-rect {\n        position: absolute;\n        border: 1px dashed var(--line-color, #0f0);\n        background: rgba(0, 255, 0, 0.04);\n        pointer-events: none;\n        z-index: 9999;\n      }\n      .ml-jig-preview-line {\n        position: absolute;\n        height: 1px;\n        background: var(--line-color, #0f0);\n        transform-origin: 0 0;\n        pointer-events: none;\n        z-index: 9999;\n      }\n    ";
+        style.textContent = "\n      .ml-jig-preview-rect {\n        position: absolute;\n        border: 1px dashed var(--line-color, var(--ml-ui-canvas-line, #0f0));\n        background: var(--ml-ui-canvas-fill-mix, var(--ml-ui-canvas-fill, rgba(64, 158, 255, 0.12)));\n        pointer-events: none;\n        z-index: 9999;\n      }\n      .ml-jig-preview-line {\n        position: absolute;\n        height: 1px;\n        background: var(--line-color, var(--ml-ui-canvas-line, #0f0));\n        transform-origin: 0 0;\n        pointer-events: none;\n        z-index: 9999;\n      }\n    ";
         document.head.appendChild(style);
     };
     /**
@@ -171,15 +244,77 @@ var AcEdInputManager = /** @class */ (function () {
                 return value.toFixed(3);
         }
     };
+    AcEdInputManager.prototype.hasKeywords = function (options) {
+        var _a, _b;
+        var keywords = (_b = (_a = options.keywords) === null || _a === void 0 ? void 0 : _a.toArray()) !== null && _b !== void 0 ? _b : [];
+        return keywords.length > 0;
+    };
+    AcEdInputManager.prototype.buildKeywordOptions = function (options) {
+        var _a, _b;
+        var keywordOptions = new AcEdPromptKeywordOptions(options.message);
+        keywordOptions.appendKeywordsToMessage = options.appendKeywordsToMessage;
+        var keywords = (_b = (_a = options.keywords) === null || _a === void 0 ? void 0 : _a.toArray()) !== null && _b !== void 0 ? _b : [];
+        keywords.forEach(function (kw) {
+            var added = keywordOptions.keywords.add(kw.displayName, kw.globalName, kw.localName, kw.enabled, kw.visible);
+            if (options.keywords.default === kw) {
+                keywordOptions.keywords.default = added;
+            }
+        });
+        return keywordOptions;
+    };
+    AcEdInputManager.prototype.copyKeywords = function (source, target) {
+        var _a, _b;
+        target.appendKeywordsToMessage = source.appendKeywordsToMessage;
+        var keywords = (_b = (_a = source.keywords) === null || _a === void 0 ? void 0 : _a.toArray()) !== null && _b !== void 0 ? _b : [];
+        keywords.forEach(function (kw) {
+            var added = target.keywords.add(kw.displayName, kw.globalName, kw.localName, kw.enabled, kw.visible);
+            if (source.keywords.default === kw) {
+                target.keywords.default = added;
+            }
+        });
+    };
+    AcEdInputManager.prototype.startKeywordSession = function (options, allowTyping) {
+        var _this = this;
+        if (!this.hasKeywords(options))
+            return undefined;
+        var keywordOptions = this.buildKeywordOptions(options);
+        return {
+            promise: this._commandLine.getKeywords(keywordOptions, allowTyping),
+            cancel: function () { return _this._commandLine.cancelActiveSession(); }
+        };
+    };
+    AcEdInputManager.prototype.isPromptKeyword = function (error) {
+        return error instanceof AcEdKeywordInputError;
+    };
     /**
      * Public point input API.
      */
     AcEdInputManager.prototype.getPoint = function (options) {
-        var scriptedValue = this.tryGetScriptedPoint(options);
-        if (scriptedValue != null) {
-            return Promise.resolve(scriptedValue);
-        }
-        return this.getPointInternal(options);
+        return __awaiter(this, void 0, void 0, function () {
+            var value, error_1, result;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, this.getPointInternal(options)];
+                    case 1:
+                        value = _a.sent();
+                        return [2 /*return*/, new AcEdPromptPointResult(AcEdPromptStatus.OK, value)];
+                    case 2:
+                        error_1 = _a.sent();
+                        if (this.isPromptCancelled(error_1)) {
+                            return [2 /*return*/, new AcEdPromptPointResult(AcEdPromptStatus.Cancel)];
+                        }
+                        if (this.isPromptKeyword(error_1)) {
+                            result = new AcEdPromptPointResult(AcEdPromptStatus.Keyword);
+                            result.stringResult = error_1.keyword;
+                            return [2 /*return*/, result];
+                        }
+                        throw error_1;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
     };
     /**
      * Prompt the user to type a numeric value. If integerOnly is true, integers
@@ -194,141 +329,256 @@ var AcEdInputManager = /** @class */ (function () {
             };
         };
         return this.makeFloatingInputPromise({
-            message: options.message,
             inputCount: 1,
-            jig: options.jig,
-            showBaseLineOnly: false,
-            useBasePoint: false,
+            promptOptions: options,
             handler: handler,
             getDynamicValue: getDynamicValue
         });
     };
     /** Request a distance (number) from the user. */
     AcEdInputManager.prototype.getDistance = function (options) {
-        var _this = this;
-        var scriptedValue = this.tryGetScriptedNumber(new AcEdDistanceHandler(options));
-        if (scriptedValue != null) {
-            return Promise.resolve(scriptedValue);
-        }
-        // If no base point defined → fall back to typed numeric input
-        if (!this.lastPoint) {
-            // fallback to normal numeric input
-            return this.getNumberTyped(options, new AcEdDistanceHandler(options));
-        }
-        var getDynamicValue = function (pos) {
-            var dx = pos.x - _this.lastPoint.x;
-            var dy = pos.y - _this.lastPoint.y;
-            var dist = Math.sqrt(dx * dx + dy * dy);
-            return {
-                value: dist,
-                raw: { x: _this.formatNumber(dist, 'distance') }
-            };
-        };
-        var handler = new AcEdDistanceHandler(options);
-        return this.makeFloatingInputPromise({
-            message: options.message,
-            inputCount: 1,
-            jig: options.jig,
-            showBaseLineOnly: !options.useDashedLine,
-            useBasePoint: true,
-            basePoint: options.basePoint,
-            handler: handler,
-            getDynamicValue: getDynamicValue
+        return __awaiter(this, void 0, void 0, function () {
+            var handler, scriptedValue, value_1, getDynamicValue, value, error_2, result;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        handler = new AcEdDistanceHandler(options);
+                        scriptedValue = this.tryGetScriptedNumber(handler);
+                        if (scriptedValue != null) {
+                            return [2 /*return*/, new AcEdPromptDoubleResult(AcEdPromptStatus.OK, scriptedValue)];
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 5, , 6]);
+                        if (!!this.lastPoint) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.getNumberTyped(options, handler)];
+                    case 2:
+                        value_1 = _a.sent();
+                        return [2 /*return*/, new AcEdPromptDoubleResult(AcEdPromptStatus.OK, value_1)];
+                    case 3:
+                        getDynamicValue = function (pos) {
+                            var dx = pos.x - _this.lastPoint.x;
+                            var dy = pos.y - _this.lastPoint.y;
+                            var dist = Math.sqrt(dx * dx + dy * dy);
+                            return {
+                                value: dist,
+                                raw: { x: _this.formatNumber(dist, 'distance') }
+                            };
+                        };
+                        return [4 /*yield*/, this.makeFloatingInputPromise({
+                                inputCount: 1,
+                                promptOptions: options,
+                                handler: handler,
+                                getDynamicValue: getDynamicValue
+                            })];
+                    case 4:
+                        value = _a.sent();
+                        return [2 /*return*/, new AcEdPromptDoubleResult(AcEdPromptStatus.OK, value)];
+                    case 5:
+                        error_2 = _a.sent();
+                        if (this.isPromptCancelled(error_2)) {
+                            return [2 /*return*/, new AcEdPromptDoubleResult(AcEdPromptStatus.Cancel)];
+                        }
+                        if (this.isPromptKeyword(error_2)) {
+                            result = new AcEdPromptDoubleResult(AcEdPromptStatus.Keyword);
+                            result.stringResult = error_2.keyword;
+                            return [2 /*return*/, result];
+                        }
+                        throw error_2;
+                    case 6: return [2 /*return*/];
+                }
+            });
         });
     };
     /** Request an angle in degrees from the user. */
     AcEdInputManager.prototype.getAngle = function (options) {
-        var _this = this;
-        var scriptedValue = this.tryGetScriptedNumber(new AcEdAngleHandler(options));
-        if (scriptedValue != null) {
-            return Promise.resolve(scriptedValue);
-        }
-        var getDynamicValue = function (pos) {
-            var dx = pos.x - _this.lastPoint.x;
-            var dy = pos.y - _this.lastPoint.y;
-            var angleRad = Math.atan2(dy, dx);
-            var angleDeg = (angleRad * 180) / Math.PI;
-            return {
-                value: angleDeg,
-                raw: { x: _this.formatNumber(angleDeg, 'angle') }
-            };
-        };
-        var handler = new AcEdAngleHandler(options);
-        return this.makeFloatingInputPromise({
-            message: options.message,
-            inputCount: 1,
-            jig: options.jig,
-            showBaseLineOnly: !options.useDashedLine,
-            useBasePoint: true,
-            basePoint: options.basePoint,
-            handler: handler,
-            getDynamicValue: getDynamicValue
+        return __awaiter(this, void 0, void 0, function () {
+            var handler, scriptedValue, getDynamicValue, value, error_3, result;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        handler = new AcEdAngleHandler(options);
+                        scriptedValue = this.tryGetScriptedNumber(handler);
+                        if (scriptedValue != null) {
+                            return [2 /*return*/, new AcEdPromptDoubleResult(AcEdPromptStatus.OK, scriptedValue)];
+                        }
+                        getDynamicValue = function (pos) {
+                            var dx = pos.x - _this.lastPoint.x;
+                            var dy = pos.y - _this.lastPoint.y;
+                            var angleRad = Math.atan2(dy, dx);
+                            var angleDeg = (angleRad * 180) / Math.PI;
+                            return {
+                                value: angleDeg,
+                                raw: { x: _this.formatNumber(angleDeg, 'angle') }
+                            };
+                        };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.makeFloatingInputPromise({
+                                inputCount: 1,
+                                promptOptions: options,
+                                handler: handler,
+                                getDynamicValue: getDynamicValue
+                            })];
+                    case 2:
+                        value = _a.sent();
+                        return [2 /*return*/, new AcEdPromptDoubleResult(AcEdPromptStatus.OK, value)];
+                    case 3:
+                        error_3 = _a.sent();
+                        if (this.isPromptCancelled(error_3)) {
+                            return [2 /*return*/, new AcEdPromptDoubleResult(AcEdPromptStatus.Cancel)];
+                        }
+                        if (this.isPromptKeyword(error_3)) {
+                            result = new AcEdPromptDoubleResult(AcEdPromptStatus.Keyword);
+                            result.stringResult = error_3.keyword;
+                            return [2 /*return*/, result];
+                        }
+                        throw error_3;
+                    case 4: return [2 /*return*/];
+                }
+            });
         });
     };
     /** Request a double/float from the user. */
     AcEdInputManager.prototype.getDouble = function (options) {
-        var scriptedValue = this.tryGetScriptedNumber(new AcEdDoubleHandler(options));
-        if (scriptedValue != null) {
-            return Promise.resolve(scriptedValue);
-        }
-        return this.getNumberTyped(options, new AcEdDoubleHandler(options));
+        return __awaiter(this, void 0, void 0, function () {
+            var handler, scriptedValue, value, error_4, result;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        handler = new AcEdDoubleHandler(options);
+                        scriptedValue = this.tryGetScriptedNumber(handler);
+                        if (scriptedValue != null) {
+                            return [2 /*return*/, new AcEdPromptDoubleResult(AcEdPromptStatus.OK, scriptedValue)];
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.getNumberTyped(options, handler)];
+                    case 2:
+                        value = _a.sent();
+                        return [2 /*return*/, new AcEdPromptDoubleResult(AcEdPromptStatus.OK, value)];
+                    case 3:
+                        error_4 = _a.sent();
+                        if (this.isPromptCancelled(error_4)) {
+                            return [2 /*return*/, new AcEdPromptDoubleResult(AcEdPromptStatus.Cancel)];
+                        }
+                        if (this.isPromptKeyword(error_4)) {
+                            result = new AcEdPromptDoubleResult(AcEdPromptStatus.Keyword);
+                            result.stringResult = error_4.keyword;
+                            return [2 /*return*/, result];
+                        }
+                        throw error_4;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
     };
     /** Request an integer from the user. */
     AcEdInputManager.prototype.getInteger = function (options) {
-        var scriptedValue = this.tryGetScriptedNumber(new AcEdIntegerHandler(options));
-        if (scriptedValue != null) {
-            return Promise.resolve(scriptedValue);
-        }
-        return this.getNumberTyped(options, new AcEdIntegerHandler(options));
+        return __awaiter(this, void 0, void 0, function () {
+            var scriptedValue, value, error_5, result;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        scriptedValue = this.tryGetScriptedNumber(new AcEdIntegerHandler(options));
+                        if (scriptedValue != null) {
+                            return [2 /*return*/, new AcEdPromptIntegerResult(AcEdPromptStatus.OK, scriptedValue)];
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.getNumberTyped(options, new AcEdIntegerHandler(options))];
+                    case 2:
+                        value = _a.sent();
+                        return [2 /*return*/, new AcEdPromptIntegerResult(AcEdPromptStatus.OK, value)];
+                    case 3:
+                        error_5 = _a.sent();
+                        if (this.isPromptCancelled(error_5)) {
+                            return [2 /*return*/, new AcEdPromptIntegerResult(AcEdPromptStatus.Cancel)];
+                        }
+                        if (this.isPromptKeyword(error_5)) {
+                            result = new AcEdPromptIntegerResult(AcEdPromptStatus.Keyword);
+                            result.stringResult = error_5.keyword;
+                            return [2 /*return*/, result];
+                        }
+                        throw error_5;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
     };
     /**
      * Prompt the user to type an arbitrary string. Resolved when Enter is pressed.
      */
     AcEdInputManager.prototype.getString = function (options) {
-        var scriptedValue = this.tryGetScriptedValue(new AcEdStringHandler(options));
-        if (scriptedValue != null) {
-            return Promise.resolve(scriptedValue);
-        }
-        var getDynamicValue = function () {
-            return {
-                value: '',
-                raw: { x: '' }
-            };
-        };
-        var handler = new AcEdStringHandler(options);
-        return this.makeFloatingInputPromise({
-            message: options.message,
-            inputCount: 1,
-            jig: options.jig,
-            showBaseLineOnly: false,
-            useBasePoint: false,
-            handler: handler,
-            getDynamicValue: getDynamicValue
+        return __awaiter(this, void 0, void 0, function () {
+            var scriptedValue, getDynamicValue, handler, value, error_6;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        scriptedValue = this.tryGetScriptedValue(new AcEdStringHandler(options));
+                        if (scriptedValue != null) {
+                            return [2 /*return*/, new AcEdPromptResult(AcEdPromptStatus.OK, scriptedValue)];
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        getDynamicValue = function () {
+                            return {
+                                value: '',
+                                raw: { x: '' }
+                            };
+                        };
+                        handler = new AcEdStringHandler(options);
+                        return [4 /*yield*/, this.makeFloatingInputPromise({
+                                inputCount: 1,
+                                promptOptions: options,
+                                handler: handler,
+                                getDynamicValue: getDynamicValue
+                            })];
+                    case 2:
+                        value = _a.sent();
+                        return [2 /*return*/, new AcEdPromptResult(AcEdPromptStatus.OK, value)];
+                    case 3:
+                        error_6 = _a.sent();
+                        if (this.isPromptCancelled(error_6)) {
+                            return [2 /*return*/, new AcEdPromptResult(AcEdPromptStatus.Cancel)];
+                        }
+                        if (this.isPromptKeyword(error_6)) {
+                            return [2 /*return*/, new AcEdPromptResult(AcEdPromptStatus.Keyword, error_6.keyword)];
+                        }
+                        throw error_6;
+                    case 4: return [2 /*return*/];
+                }
+            });
         });
     };
     /**
      * Prompt the user to type a keyword. Resolved when Enter is pressed.
      */
     AcEdInputManager.prototype.getKeywords = function (options) {
-        var scriptedValue = this.tryGetScriptedValue(new AcEdKeywordHandler(options));
-        if (scriptedValue != null) {
-            return Promise.resolve(scriptedValue);
-        }
-        var getDynamicValue = function () {
-            return {
-                value: '',
-                raw: { x: '' }
-            };
-        };
-        var handler = new AcEdKeywordHandler(options);
-        return this.makeFloatingInputPromise({
-            message: options.message,
-            inputCount: 1,
-            jig: options.jig,
-            showBaseLineOnly: false,
-            useBasePoint: false,
-            handler: handler,
-            getDynamicValue: getDynamicValue
+        return __awaiter(this, void 0, void 0, function () {
+            var scriptedValue, result;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        scriptedValue = this.tryGetScriptedValue(new AcEdKeywordHandler(options));
+                        if (scriptedValue != null) {
+                            return [2 /*return*/, Promise.resolve(scriptedValue)];
+                        }
+                        return [4 /*yield*/, this._commandLine.getKeywords(options, true)];
+                    case 1:
+                        result = _a.sent();
+                        if (!result) {
+                            throw new Error('cancelled');
+                        }
+                        return [2 /*return*/, result];
+                }
+            });
         });
     };
     /**
@@ -337,8 +587,9 @@ var AcEdInputManager = /** @class */ (function () {
      * This method supports two selection modes:
      *
      * - **Click selection**: Clicking on an entity selects the entity under the cursor.
-     * - **Box selection**: Dragging the mouse to let the user specify a rectangular window,
-     *   and all entities intersecting that box are selected.
+     * - **Box selection**:
+     *   - left-to-right drag: window selection (entities fully inside the box)
+     *   - right-to-left drag: crossing selection (entities intersecting the box)
      *
      * The selection operation behaves similarly to AutoCAD's
      * `Editor.GetSelection()` API:
@@ -360,113 +611,176 @@ var AcEdInputManager = /** @class */ (function () {
      */
     AcEdInputManager.prototype.getSelection = function (options) {
         return __awaiter(this, void 0, void 0, function () {
+            var value, error_7;
             var _this = this;
             return __generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve, reject) {
-                        _this.active = true;
-                        _this._commandLine.setPrompt(options.message);
-                        var floatingMessage = new AcEdFloatingMessage(_this.view, {
-                            parent: _this.view.canvas,
-                            message: options.message
-                        });
-                        var selected = new Set();
-                        var startWcs = null;
-                        var previewEl = null;
-                        var cleanup = function () {
-                            _this.active = false;
-                            floatingMessage.dispose();
-                            previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
-                            _this._commandLine.clear();
-                            document.removeEventListener('keydown', keyHandler);
-                            _this.view.canvas.removeEventListener('mousedown', mouseDown);
-                            _this.view.canvas.removeEventListener('mousemove', mouseMove);
-                            _this.view.canvas.removeEventListener('mouseup', mouseUp);
-                        };
-                        /** ---------- Keyboard ---------- */
-                        var keyHandler = function (e) {
-                            if (e.key === 'Escape') {
-                                cleanup();
-                                reject(new Error('cancelled'));
-                                return;
-                            }
-                            if (e.key === 'Enter') {
-                                cleanup();
-                                resolve(__spreadArray([], __read(selected), false));
-                            }
-                        };
-                        /** ---------- Mouse ---------- */
-                        var mouseDown = function (e) {
-                            startWcs = _this.view.screenToWorld(_this.view.viewportToCanvas({ x: e.clientX, y: e.clientY }));
-                            previewEl = document.createElement('div');
-                            previewEl.className = 'ml-jig-preview-rect';
-                            _this.view.container.appendChild(previewEl);
-                        };
-                        var mouseMove = function (e) {
-                            if (!startWcs || !previewEl)
-                                return;
-                            var curWcs = _this.view.screenToWorld(_this.view.viewportToCanvas({ x: e.clientX, y: e.clientY }));
-                            var p1 = _this.view.worldToScreen(startWcs);
-                            var p2 = _this.view.worldToScreen(curWcs);
-                            var left = Math.min(p1.x, p2.x);
-                            var top = Math.min(p1.y, p2.y);
-                            var width = Math.abs(p1.x - p2.x);
-                            var height = Math.abs(p1.y - p2.y);
-                            Object.assign(previewEl.style, {
-                                left: "".concat(left, "px"),
-                                top: "".concat(top, "px"),
-                                width: "".concat(width, "px"),
-                                height: "".concat(height, "px")
-                            });
-                        };
-                        var mouseUp = function (e) {
-                            var e_1, _a;
-                            if (!startWcs)
-                                return;
-                            var endWcs = _this.view.screenToWorld(_this.view.viewportToCanvas({ x: e.clientX, y: e.clientY }));
-                            previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
-                            previewEl = null;
-                            // Click selection
-                            var dist = Math.hypot(endWcs.x - startWcs.x, endWcs.y - startWcs.y);
-                            if (dist < 2) {
-                                var picked = _this.view.pick(endWcs);
-                                if (picked.length > 0) {
-                                    selected.add(picked[0].id);
-                                    if (options.singleOnly) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, new Promise(function (resolve, reject) {
+                                _this.active = true;
+                                _this.entitySelectionActive = true;
+                                var keywordSession = _this.startKeywordSession(options, true);
+                                if (!keywordSession) {
+                                    _this._commandLine.setPrompt(options.message);
+                                }
+                                var floatingMessage = new AcEdFloatingMessage(_this.view, {
+                                    parent: _this.view.canvas,
+                                    message: options.message
+                                });
+                                var selected = new Set();
+                                var startWcs = null;
+                                var startCanvas = null;
+                                var previewEl = null;
+                                var settled = false;
+                                var cleanup = function () {
+                                    if (settled)
+                                        return;
+                                    settled = true;
+                                    _this.active = false;
+                                    _this.entitySelectionActive = false;
+                                    floatingMessage === null || floatingMessage === void 0 ? void 0 : floatingMessage.dispose();
+                                    previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
+                                    keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.cancel();
+                                    _this._commandLine.clear();
+                                    document.removeEventListener('keydown', keyHandler);
+                                    _this.view.canvas.removeEventListener('mousedown', mouseDown);
+                                    _this.view.canvas.removeEventListener('mousemove', mouseMove);
+                                    _this.view.canvas.removeEventListener('mouseup', mouseUp);
+                                };
+                                keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.promise.then(function (keyword) {
+                                    if (settled)
+                                        return;
+                                    if (!keyword) {
+                                        cleanup();
+                                        reject(new Error('cancelled'));
+                                        return;
+                                    }
+                                    cleanup();
+                                    reject(new AcEdKeywordInputError(keyword));
+                                });
+                                /** ---------- Keyboard ---------- */
+                                var keyHandler = function (e) {
+                                    if (e.key === 'Escape') {
+                                        cleanup();
+                                        reject(new Error('cancelled'));
+                                        return;
+                                    }
+                                    if (e.key === 'Enter') {
                                         cleanup();
                                         resolve(__spreadArray([], __read(selected), false));
                                     }
-                                }
-                            }
-                            else {
-                                // Box selection
-                                var box = new AcGeBox2d()
-                                    .expandByPoint(startWcs)
-                                    .expandByPoint(endWcs);
-                                _this.view.selectByBox(box);
-                                try {
-                                    for (var _b = __values(_this.view.selectionSet.ids), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                        var id = _c.value;
-                                        selected.add(id);
-                                        if (options.singleOnly)
-                                            break;
+                                };
+                                /** ---------- Mouse ---------- */
+                                var mouseDown = function (e) {
+                                    startCanvas = _this.view.viewportToCanvas({
+                                        x: e.clientX,
+                                        y: e.clientY
+                                    });
+                                    startWcs = _this.view.screenToWorld(startCanvas);
+                                    previewEl = document.createElement('div');
+                                    previewEl.className = 'ml-jig-preview-rect';
+                                    _this.view.container.appendChild(previewEl);
+                                };
+                                var mouseMove = function (e) {
+                                    if (!startWcs || !previewEl || !startCanvas)
+                                        return;
+                                    var curWcs = _this.view.screenToWorld(_this.view.viewportToCanvas({ x: e.clientX, y: e.clientY }));
+                                    var curCanvas = _this.view.viewportToCanvas({
+                                        x: e.clientX,
+                                        y: e.clientY
+                                    });
+                                    var p1 = _this.view.worldToScreen(startWcs);
+                                    var p2 = _this.view.worldToScreen(curWcs);
+                                    var left = Math.min(p1.x, p2.x);
+                                    var top = Math.min(p1.y, p2.y);
+                                    var width = Math.abs(p1.x - p2.x);
+                                    var height = Math.abs(p1.y - p2.y);
+                                    var mode = _this.view.getSelectionMode(startCanvas, curCanvas);
+                                    var action = _this.view.getSelectionActionFromEvent(e, 'add');
+                                    var style = _this.view.getSelectionPreviewStyle(mode, action);
+                                    Object.assign(previewEl.style, {
+                                        left: "".concat(left, "px"),
+                                        top: "".concat(top, "px"),
+                                        width: "".concat(width, "px"),
+                                        height: "".concat(height, "px"),
+                                        borderStyle: style.borderStyle,
+                                        background: style.background
+                                    });
+                                    previewEl.style.setProperty('--line-color', style.lineColor);
+                                };
+                                var mouseUp = function (e) {
+                                    var e_1, _a;
+                                    if (!startWcs || !startCanvas)
+                                        return;
+                                    var endWcs = _this.view.screenToWorld(_this.view.viewportToCanvas({ x: e.clientX, y: e.clientY }));
+                                    var endCanvas = _this.view.viewportToCanvas({
+                                        x: e.clientX,
+                                        y: e.clientY
+                                    });
+                                    previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
+                                    previewEl = null;
+                                    // Click selection
+                                    var action = _this.view.getSelectionActionFromEvent(e, 'add');
+                                    if (_this.view.isSelectionClick(startCanvas, endCanvas)) {
+                                        var picked = _this.view.pick(endWcs);
+                                        if (picked.length > 0) {
+                                            _this.view.applySelection([picked[0].id], action);
+                                        }
+                                        else if (action === 'replace') {
+                                            _this.view.selectionSet.clear();
+                                        }
                                     }
-                                }
-                                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                                finally {
+                                    else {
+                                        // Box selection
+                                        var box = new AcGeBox2d()
+                                            .expandByPoint(startWcs)
+                                            .expandByPoint(endWcs);
+                                        var mode = _this.view.getSelectionMode(startCanvas, endCanvas);
+                                        _this.view.selectByBoxWithMode(box, mode, action);
+                                    }
+                                    selected.clear();
                                     try {
-                                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                                        for (var _b = __values(_this.view.selectionSet.ids), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                            var id = _c.value;
+                                            selected.add(id);
+                                        }
                                     }
-                                    finally { if (e_1) throw e_1.error; }
-                                }
-                            }
-                            startWcs = null;
-                        };
-                        /** ---------- Attach ---------- */
-                        document.addEventListener('keydown', keyHandler);
-                        _this.view.canvas.addEventListener('mousedown', mouseDown);
-                        _this.view.canvas.addEventListener('mousemove', mouseMove);
-                        _this.view.canvas.addEventListener('mouseup', mouseUp);
-                    })];
+                                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                                    finally {
+                                        try {
+                                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                                        }
+                                        finally { if (e_1) throw e_1.error; }
+                                    }
+                                    if (options.singleOnly && action !== 'remove') {
+                                        if (selected.size > 0) {
+                                            cleanup();
+                                            resolve(__spreadArray([], __read(selected), false));
+                                        }
+                                    }
+                                    startWcs = null;
+                                    startCanvas = null;
+                                };
+                                document.addEventListener('keydown', keyHandler);
+                                _this.view.canvas.addEventListener('mousedown', mouseDown);
+                                _this.view.canvas.addEventListener('mousemove', mouseMove);
+                                _this.view.canvas.addEventListener('mouseup', mouseUp);
+                            })];
+                    case 1:
+                        value = _a.sent();
+                        return [2 /*return*/, new AcEdPromptSelectionResult(AcEdPromptStatus.OK, new AcEdSelectionSet(value))];
+                    case 2:
+                        error_7 = _a.sent();
+                        if (this.isPromptCancelled(error_7)) {
+                            return [2 /*return*/, new AcEdPromptSelectionResult(AcEdPromptStatus.Cancel)];
+                        }
+                        if (this.isPromptKeyword(error_7)) {
+                            return [2 /*return*/, new AcEdPromptSelectionResult(AcEdPromptStatus.Keyword, undefined, error_7.keyword)];
+                        }
+                        throw error_7;
+                    case 3: return [2 /*return*/];
+                }
             });
         });
     };
@@ -475,59 +789,104 @@ var AcEdInputManager = /** @class */ (function () {
      * Similar to Editor.GetEntity() in AutoCAD.
      */
     AcEdInputManager.prototype.getEntity = function (options) {
-        var _this = this;
-        return new Promise(function (resolve, reject) {
-            _this.active = true;
-            var floatingMessage = new AcEdFloatingMessage(_this.view, {
-                parent: _this.view.canvas,
-                message: options.message
-            });
-            _this._commandLine.setPrompt(options.message);
-            var cleanup = function () {
-                var _a;
-                _this.active = false;
-                (_a = options.jig) === null || _a === void 0 ? void 0 : _a.end();
-                document.removeEventListener('keydown', keyHandler);
-                _this.view.canvas.removeEventListener('mousedown', clickHandler);
-                floatingMessage.dispose();
-                _this._commandLine.clear();
-            };
-            /** Mouse click → try select entity */
-            var clickHandler = function (e) {
-                var pos = _this.view.screenToWorld(_this.view.viewportToCanvas({ x: e.clientX, y: e.clientY }));
-                var picked = _this.view.pick(pos);
-                // Clicked empty space
-                if (picked.length == 0) {
-                    // this.view.showMessage(options.rejectMessage)
-                    return;
-                }
-                // Locked layer
-                // if (picked.locked && !options.allowObjectOnLockedLayer) {
-                //   this.view.showMessage(options.rejectMessage)
-                //   return
-                // }
-                // Class filter
-                // if (!options.isClassAllowed(picked.className)) {
-                //   this.view.showMessage(options.rejectMessage)
-                //   return
-                // }
-                cleanup();
-                resolve(picked[0].id);
-            };
-            /** Keyboard handling */
-            var keyHandler = function (e) {
-                if (e.key === 'Escape') {
-                    cleanup();
-                    reject(new Error('cancelled'));
-                    return;
-                }
-                if (e.key === 'Enter' && options.allowNone) {
-                    cleanup();
-                    resolve(null);
+        return __awaiter(this, void 0, void 0, function () {
+            var value, error_8, result;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, new Promise(function (resolve, reject) {
+                                _this.active = true;
+                                _this.entitySelectionActive = true;
+                                var keywordSession = _this.startKeywordSession(options, true);
+                                var floatingMessage = new AcEdFloatingMessage(_this.view, {
+                                    parent: _this.view.canvas,
+                                    message: options.message
+                                });
+                                if (!keywordSession) {
+                                    _this._commandLine.setPrompt(options.message);
+                                }
+                                var settled = false;
+                                var cleanup = function () {
+                                    var _a;
+                                    if (settled)
+                                        return;
+                                    settled = true;
+                                    _this.active = false;
+                                    _this.entitySelectionActive = false;
+                                    (_a = options.jig) === null || _a === void 0 ? void 0 : _a.end();
+                                    document.removeEventListener('keydown', keyHandler);
+                                    _this.view.canvas.removeEventListener('mousedown', clickHandler);
+                                    floatingMessage === null || floatingMessage === void 0 ? void 0 : floatingMessage.dispose();
+                                    keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.cancel();
+                                    _this._commandLine.clear();
+                                };
+                                keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.promise.then(function (keyword) {
+                                    if (settled)
+                                        return;
+                                    if (!keyword) {
+                                        cleanup();
+                                        reject(new Error('cancelled'));
+                                        return;
+                                    }
+                                    cleanup();
+                                    reject(new AcEdKeywordInputError(keyword));
+                                });
+                                /** Mouse click → try select entity */
+                                var clickHandler = function (e) {
+                                    var pos = _this.view.screenToWorld(_this.view.viewportToCanvas({ x: e.clientX, y: e.clientY }));
+                                    var picked = _this.view.pick(pos);
+                                    // Clicked empty space
+                                    if (picked.length == 0) {
+                                        // this.view.showMessage(options.rejectMessage)
+                                        return;
+                                    }
+                                    // Locked layer
+                                    // if (picked.locked && !options.allowObjectOnLockedLayer) {
+                                    //   this.view.showMessage(options.rejectMessage)
+                                    //   return
+                                    // }
+                                    // Class filter
+                                    // if (!options.isClassAllowed(picked.className)) {
+                                    //   this.view.showMessage(options.rejectMessage)
+                                    //   return
+                                    // }
+                                    cleanup();
+                                    resolve(picked[0].id);
+                                };
+                                /** Keyboard handling */
+                                var keyHandler = function (e) {
+                                    if (e.key === 'Escape') {
+                                        cleanup();
+                                        reject(new Error('cancelled'));
+                                        return;
+                                    }
+                                    if (e.key === 'Enter' && options.allowNone) {
+                                        cleanup();
+                                        resolve(null);
+                                    }
+                                };
+                                document.addEventListener('keydown', keyHandler);
+                                _this.view.canvas.addEventListener('mousedown', clickHandler);
+                            })];
+                    case 1:
+                        value = _a.sent();
+                        return [2 /*return*/, new AcEdPromptEntityResult(AcEdPromptStatus.OK, value || undefined)];
+                    case 2:
+                        error_8 = _a.sent();
+                        if (this.isPromptCancelled(error_8)) {
+                            return [2 /*return*/, new AcEdPromptEntityResult(AcEdPromptStatus.Cancel)];
+                        }
+                        if (this.isPromptKeyword(error_8)) {
+                            result = new AcEdPromptEntityResult(AcEdPromptStatus.Keyword);
+                            result.stringResult = error_8.keyword;
+                            return [2 /*return*/, result];
+                        }
+                        throw error_8;
+                    case 3: return [2 /*return*/];
                 }
-            };
-            document.addEventListener('keydown', keyHandler);
-            _this.view.canvas.addEventListener('mousedown', clickHandler);
+            });
         });
     };
     /**
@@ -535,48 +894,68 @@ var AcEdInputManager = /** @class */ (function () {
      * Each corner may be specified by clicking on the canvas or typing "x,y".
      * A live HTML overlay rectangle previews the box as the user moves the mouse.
      */
-    AcEdInputManager.prototype.getBox = function () {
+    AcEdInputManager.prototype.getBox = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var message1, options1, p1, cwcsP1, previewEl, cleanup, drawPreview, message2, options2, p2;
+            var message1, options1, p1Result, p1, cwcsP1_1, previewEl_1, cleanup, drawPreview, message2, options2, p2, box, error_9;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        message1 = AcApI18n.t('main.inputManager.firstCorner');
+                        _a.trys.push([0, 3, , 4]);
+                        message1 = options.firstCornerMessage ||
+                            AcApI18n.t('main.inputManager.firstCorner');
                         options1 = new AcEdPromptPointOptions(message1);
-                        options1.useDashedLine = false;
-                        options1.useBasePoint = false;
+                        this.copyKeywords(options, options1);
+                        options1.useDashedLine = options.useDashedLine;
+                        options1.useBasePoint = options.useBasePoint;
                         return [4 /*yield*/, this.getPoint(options1)];
                     case 1:
-                        p1 = _a.sent();
-                        cwcsP1 = this.view.worldToScreen(p1);
-                        previewEl = document.createElement('div');
-                        previewEl.className = 'ml-jig-preview-rect';
-                        this.view.container.appendChild(previewEl);
+                        p1Result = _a.sent();
+                        if (p1Result.status !== AcEdPromptStatus.OK) {
+                            return [2 /*return*/, new AcEdPromptBoxResult(p1Result.status, undefined, p1Result.stringResult)];
+                        }
+                        p1 = p1Result.value;
+                        cwcsP1_1 = this.view.worldToScreen(p1);
+                        previewEl_1 = document.createElement('div');
+                        previewEl_1.className = 'ml-jig-preview-rect';
+                        this.view.container.appendChild(previewEl_1);
                         cleanup = function () {
-                            previewEl.remove();
+                            previewEl_1.remove();
                         };
                         drawPreview = function (pos) {
                             var cwcsP2 = _this.view.worldToScreen(pos);
-                            var left = Math.min(cwcsP2.x, cwcsP1.x);
-                            var top = Math.min(cwcsP2.y, cwcsP1.y);
-                            var width = Math.abs(cwcsP2.x - cwcsP1.x);
-                            var height = Math.abs(cwcsP2.y - cwcsP1.y);
-                            Object.assign(previewEl.style, {
+                            var left = Math.min(cwcsP2.x, cwcsP1_1.x);
+                            var top = Math.min(cwcsP2.y, cwcsP1_1.y);
+                            var width = Math.abs(cwcsP2.x - cwcsP1_1.x);
+                            var height = Math.abs(cwcsP2.y - cwcsP1_1.y);
+                            Object.assign(previewEl_1.style, {
                                 left: "".concat(left, "px"),
                                 top: "".concat(top, "px"),
                                 width: "".concat(width, "px"),
                                 height: "".concat(height, "px")
                             });
                         };
-                        message2 = AcApI18n.t('main.inputManager.secondCorner');
+                        message2 = options.secondCornerMessage ||
+                            AcApI18n.t('main.inputManager.secondCorner');
                         options2 = new AcEdPromptPointOptions(message2);
-                        options2.useDashedLine = false;
-                        options2.useBasePoint = false;
+                        this.copyKeywords(options, options2);
+                        options2.useDashedLine = options.useDashedLine;
+                        options2.useBasePoint = options.useBasePoint;
                         return [4 /*yield*/, this.getPointInternal(options2, cleanup, drawPreview)];
                     case 2:
                         p2 = _a.sent();
-                        return [2 /*return*/, new AcGeBox2d().expandByPoint(p1).expandByPoint(p2)];
+                        box = new AcGeBox2d().expandByPoint(p1).expandByPoint(p2);
+                        return [2 /*return*/, new AcEdPromptBoxResult(AcEdPromptStatus.OK, box)];
+                    case 3:
+                        error_9 = _a.sent();
+                        if (this.isPromptCancelled(error_9)) {
+                            return [2 /*return*/, new AcEdPromptBoxResult(AcEdPromptStatus.Cancel)];
+                        }
+                        if (this.isPromptKeyword(error_9)) {
+                            return [2 /*return*/, new AcEdPromptBoxResult(AcEdPromptStatus.Keyword, undefined, error_9.keyword)];
+                        }
+                        throw error_9;
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -586,33 +965,34 @@ var AcEdInputManager = /** @class */ (function () {
      * typed input OR mouse click.
      */
     AcEdInputManager.prototype.getPointInternal = function (options, cleanup, drawPreview) {
-        var _this = this;
-        var scriptedValue = this.tryGetScriptedPoint(options);
-        if (scriptedValue != null) {
-            cleanup === null || cleanup === void 0 ? void 0 : cleanup();
-            return Promise.resolve(scriptedValue);
-        }
-        var getDynamicValue = function (pos) {
-            return {
-                value: { x: pos.x, y: pos.y, z: 0 },
-                raw: {
-                    x: _this.formatNumber(pos.x, 'point'),
-                    y: _this.formatNumber(pos.y, 'point')
+        return __awaiter(this, void 0, void 0, function () {
+            var scriptedValue, getDynamicValue, handler;
+            var _this = this;
+            return __generator(this, function (_a) {
+                scriptedValue = this.tryGetScriptedPoint(options);
+                if (scriptedValue != null) {
+                    cleanup === null || cleanup === void 0 ? void 0 : cleanup();
+                    return [2 /*return*/, Promise.resolve(scriptedValue)];
                 }
-            };
-        };
-        var handler = new AcEdPointHandler(options);
-        return this.makeFloatingInputPromise({
-            message: options.message,
-            inputCount: 2,
-            jig: options.jig,
-            showBaseLineOnly: !options.useDashedLine,
-            useBasePoint: options.useBasePoint,
-            basePoint: options.basePoint,
-            cleanup: cleanup,
-            handler: handler,
-            getDynamicValue: getDynamicValue,
-            drawPreview: drawPreview
+                getDynamicValue = function (pos) {
+                    return {
+                        value: { x: pos.x, y: pos.y, z: 0 },
+                        raw: {
+                            x: _this.formatNumber(pos.x, 'point'),
+                            y: _this.formatNumber(pos.y, 'point')
+                        }
+                    };
+                };
+                handler = new AcEdPointHandler(options);
+                return [2 /*return*/, this.makeFloatingInputPromise({
+                        inputCount: 2,
+                        promptOptions: options,
+                        cleanup: cleanup,
+                        handler: handler,
+                        getDynamicValue: getDynamicValue,
+                        drawPreview: drawPreview
+                    })];
+            });
         });
     };
     /**
@@ -672,6 +1052,34 @@ var AcEdInputManager = /** @class */ (function () {
             return undefined;
         return { x: parts[0], y: parts[1] };
     };
+    AcEdInputManager.prototype.isPromptCancelled = function (error) {
+        return error instanceof Error && error.message === 'cancelled';
+    };
+    AcEdInputManager.prototype.updateModifierStateFromEvent = function (e) {
+        var next = {
+            ctrlKey: !!e.ctrlKey,
+            shiftKey: !!e.shiftKey,
+            altKey: !!e.altKey,
+            metaKey: !!e.metaKey
+        };
+        var prev = this._modifierState;
+        var changed = prev.ctrlKey !== next.ctrlKey ||
+            prev.shiftKey !== next.shiftKey ||
+            prev.altKey !== next.altKey ||
+            prev.metaKey !== next.metaKey;
+        if (changed) {
+            this._modifierState = next;
+        }
+        return changed;
+    };
+    AcEdInputManager.prototype.handleCtrlToggleKey = function (e) {
+        if (e.key !== 'Control' || e.repeat)
+            return false;
+        if (e.type !== 'keydown')
+            return false;
+        this._ctrlArcFlip = !this._ctrlArcFlip;
+        return true;
+    };
     /**
      * Creates a promise for floating input that will be resolved or rejected by user input.
      *
@@ -679,86 +1087,143 @@ var AcEdInputManager = /** @class */ (function () {
      * including handling the Escape key to cancel, resolving with user-provided
      * values, and guaranteeing cleanup of UI elements and event handlers.
      */
+    AcEdInputManager.prototype.resolvePromptDefaults = function (options) {
+        var hasBasePoint = 'basePoint' in options;
+        var hasUseBasePoint = 'useBasePoint' in options;
+        var hasUseDashedLine = 'useDashedLine' in options;
+        var basePoint = hasBasePoint && options.basePoint
+            ? options.basePoint
+            : undefined;
+        var useBasePoint = hasUseBasePoint ? options.useBasePoint : false;
+        var showBaseLineOnly = hasUseDashedLine ? !options.useDashedLine : false;
+        return {
+            message: options.message,
+            jig: options.jig,
+            basePoint: basePoint,
+            useBasePoint: useBasePoint,
+            showBaseLineOnly: showBaseLineOnly
+        };
+    };
     AcEdInputManager.prototype.makeFloatingInputPromise = function (options) {
-        var _this = this;
-        return new Promise(function (resolve, reject) {
-            _this.active = true;
-            var validate = function (raw) {
-                var value = options.handler.parse(raw.x, raw.y);
-                return {
-                    isValid: value != null,
-                    value: value !== null && value !== void 0 ? value : undefined
-                };
-            };
-            var basePoint = undefined;
-            if (options.useBasePoint) {
-                if (options.basePoint) {
-                    basePoint = options.basePoint;
-                }
-                else if (_this.lastPoint) {
-                    basePoint = { x: _this.lastPoint.x, y: _this.lastPoint.y };
-                }
-            }
-            _this._commandLine.setPrompt(options.message);
-            var floatingInput = new AcEdFloatingInput(_this.view, {
-                parent: _this.view.canvas,
-                inputCount: options.inputCount,
-                message: options.message,
-                disableOSnap: options.disableOSnap,
-                showBaseLineOnly: options.showBaseLineOnly,
-                basePoint: basePoint,
-                validate: validate,
-                getDynamicValue: options.getDynamicValue,
-                drawPreview: function (pos) {
-                    var _a;
-                    if (options.jig) {
-                        var defaults = options.getDynamicValue(pos);
-                        options.jig.update(defaults.value);
-                        options.jig.render();
-                    }
-                    (_a = options.drawPreview) === null || _a === void 0 ? void 0 : _a.call(options, pos);
-                },
-                onCommit: function (val) {
-                    var result = false;
-                    if (!options.onCommit || options.onCommit(val)) {
-                        resolver(val);
-                        result = true;
-                    }
-                    if (floatingInput.lastPoint) {
-                        _this.lastPoint = {
-                            x: floatingInput.lastPoint.x,
-                            y: floatingInput.lastPoint.y
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (resolve, reject) {
+                        _this.active = true;
+                        _this.entitySelectionActive = false;
+                        var settled = false;
+                        var validate = function (raw) {
+                            var value = options.handler.parse(raw.x, raw.y);
+                            return {
+                                isValid: value != null,
+                                value: value !== null && value !== void 0 ? value : undefined
+                            };
+                        };
+                        var promptDefaults = _this.resolvePromptDefaults(options.promptOptions);
+                        var keywordSession = _this.startKeywordSession(options.promptOptions, true);
+                        var basePoint = undefined;
+                        if (promptDefaults.useBasePoint) {
+                            if (promptDefaults.basePoint) {
+                                basePoint = promptDefaults.basePoint;
+                            }
+                            else if (_this.lastPoint) {
+                                basePoint = { x: _this.lastPoint.x, y: _this.lastPoint.y };
+                            }
+                        }
+                        var commandLineMessage = promptDefaults.message;
+                        if (!keywordSession) {
+                            _this._commandLine.setPrompt(commandLineMessage);
+                        }
+                        var floatingInput = new AcEdFloatingInput(_this.view, {
+                            parent: _this.view.canvas,
+                            inputCount: options.inputCount,
+                            message: promptDefaults.message,
+                            disableOSnap: options.disableOSnap,
+                            showBaseLineOnly: promptDefaults.showBaseLineOnly,
+                            basePoint: basePoint,
+                            allowPrompt: options.allowPrompt !== false,
+                            validate: validate,
+                            getDynamicValue: options.getDynamicValue,
+                            drawPreview: function (pos) {
+                                var _a;
+                                if (promptDefaults.jig) {
+                                    var defaults = options.getDynamicValue(pos);
+                                    promptDefaults.jig.update(defaults.value);
+                                    promptDefaults.jig.render();
+                                }
+                                (_a = options.drawPreview) === null || _a === void 0 ? void 0 : _a.call(options, pos);
+                            },
+                            onCommit: function (val) {
+                                var result = false;
+                                if (!options.onCommit || options.onCommit(val)) {
+                                    resolver(val);
+                                    result = true;
+                                }
+                                if (floatingInput.lastPoint) {
+                                    _this.lastPoint = {
+                                        x: floatingInput.lastPoint.x,
+                                        y: floatingInput.lastPoint.y
+                                    };
+                                }
+                                return result;
+                            },
+                            onCancel: function () { return rejector(); }
+                        });
+                        var cleanup = function () {
+                            var _a, _b;
+                            if (settled)
+                                return;
+                            settled = true;
+                            _this.active = false;
+                            _this.entitySelectionActive = false;
+                            (_a = options.cleanup) === null || _a === void 0 ? void 0 : _a.call(options);
+                            (_b = promptDefaults.jig) === null || _b === void 0 ? void 0 : _b.end();
+                            document.removeEventListener('keydown', escHandler);
+                            document.removeEventListener('keydown', modifierHandler);
+                            document.removeEventListener('keyup', modifierHandler);
+                            floatingInput.dispose();
+                            keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.cancel();
+                            _this._commandLine.clear();
+                        };
+                        var resolver = function (value) {
+                            cleanup();
+                            resolve(value);
                         };
-                    }
-                    return result;
-                },
-                onCancel: function () { return rejector(); }
+                        var rejector = function (err) {
+                            cleanup();
+                            reject(err !== null && err !== void 0 ? err : new Error('cancelled'));
+                        };
+                        var keywordRejector = function (keyword) {
+                            rejector(new AcEdKeywordInputError(keyword));
+                        };
+                        var escHandler = function (e) {
+                            if (e.key === 'Escape') {
+                                rejector();
+                            }
+                        };
+                        var modifierHandler = function (e) {
+                            var toggled = _this.handleCtrlToggleKey(e);
+                            var changed = _this.updateModifierStateFromEvent(e);
+                            if (toggled || changed) {
+                                floatingInput.requestPreviewRefresh();
+                            }
+                        };
+                        document.addEventListener('keydown', escHandler);
+                        document.addEventListener('keydown', modifierHandler);
+                        document.addEventListener('keyup', modifierHandler);
+                        // showAt() expects viewport coordinates; curMousePos is canvas-local.
+                        floatingInput.showAt(_this.view.canvasToViewport(_this.view.curMousePos));
+                        keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.promise.then(function (keyword) {
+                            if (settled)
+                                return;
+                            if (!keyword) {
+                                rejector();
+                                return;
+                            }
+                            keywordRejector(keyword);
+                        });
+                    })];
             });
-            var cleanup = function () {
-                var _a, _b;
-                _this.active = false;
-                (_a = options.cleanup) === null || _a === void 0 ? void 0 : _a.call(options);
-                (_b = options.jig) === null || _b === void 0 ? void 0 : _b.end();
-                document.removeEventListener('keydown', escHandler);
-                floatingInput.dispose();
-                _this._commandLine.clear();
-            };
-            var resolver = function (value) {
-                cleanup();
-                resolve(value);
-            };
-            var rejector = function () {
-                cleanup();
-                reject(new Error('cancelled'));
-            };
-            var escHandler = function (e) {
-                if (e.key === 'Escape') {
-                    rejector();
-                }
-            };
-            document.addEventListener('keydown', escHandler);
-            // showAt() expects viewport coordinates; curMousePos is canvas-local.
-            floatingInput.showAt(_this.view.canvasToViewport(_this.view.curMousePos));
         });
     };
     /** Inject styles only once */