@umsai/ums-code 0.0.14-v1 → 0.0.14-v2

package/dist/src/config/keyBindings.d.ts

@@ -0,0 +1,66 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Command enum for all available keyboard shortcuts
+ */
+export declare enum Command {
+    RETURN = "return",
+    ESCAPE = "escape",
+    HOME = "home",
+    END = "end",
+    KILL_LINE_RIGHT = "killLineRight",
+    KILL_LINE_LEFT = "killLineLeft",
+    CLEAR_INPUT = "clearInput",
+    CLEAR_SCREEN = "clearScreen",
+    HISTORY_UP = "historyUp",
+    HISTORY_DOWN = "historyDown",
+    NAVIGATION_UP = "navigationUp",
+    NAVIGATION_DOWN = "navigationDown",
+    ACCEPT_SUGGESTION = "acceptSuggestion",
+    COMPLETION_UP = "completionUp",
+    COMPLETION_DOWN = "completionDown",
+    SUBMIT = "submit",
+    NEWLINE = "newline",
+    OPEN_EXTERNAL_EDITOR = "openExternalEditor",
+    PASTE_CLIPBOARD_IMAGE = "pasteClipboardImage",
+    SHOW_ERROR_DETAILS = "showErrorDetails",
+    TOGGLE_TOOL_DESCRIPTIONS = "toggleToolDescriptions",
+    TOGGLE_IDE_CONTEXT_DETAIL = "toggleIDEContextDetail",
+    QUIT = "quit",
+    EXIT = "exit",
+    SHOW_MORE_LINES = "showMoreLines",
+    REVERSE_SEARCH = "reverseSearch",
+    SUBMIT_REVERSE_SEARCH = "submitReverseSearch",
+    ACCEPT_SUGGESTION_REVERSE_SEARCH = "acceptSuggestionReverseSearch"
+}
+/**
+ * Data-driven key binding structure for user configuration
+ */
+export interface KeyBinding {
+    /** The key name (e.g., 'a', 'return', 'tab', 'escape') */
+    key?: string;
+    /** The key sequence (e.g., '\x18' for Ctrl+X) - alternative to key name */
+    sequence?: string;
+    /** Control key requirement: true=must be pressed, false=must not be pressed, undefined=ignore */
+    ctrl?: boolean;
+    /** Shift key requirement: true=must be pressed, false=must not be pressed, undefined=ignore */
+    shift?: boolean;
+    /** Command/meta key requirement: true=must be pressed, false=must not be pressed, undefined=ignore */
+    command?: boolean;
+    /** Paste operation requirement: true=must be paste, false=must not be paste, undefined=ignore */
+    paste?: boolean;
+}
+/**
+ * Configuration type mapping commands to their key bindings
+ */
+export type KeyBindingConfig = {
+    readonly [C in Command]: readonly KeyBinding[];
+};
+/**
+ * Default key binding configuration
+ * Matches the original hard-coded logic exactly
+ */
+export declare const defaultKeyBindings: KeyBindingConfig;

package/dist/src/config/keyBindings.js

@@ -0,0 +1,141 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Command enum for all available keyboard shortcuts
+ */
+export var Command;
+(function (Command) {
+    // Basic bindings
+    Command["RETURN"] = "return";
+    Command["ESCAPE"] = "escape";
+    // Cursor movement
+    Command["HOME"] = "home";
+    Command["END"] = "end";
+    // Text deletion
+    Command["KILL_LINE_RIGHT"] = "killLineRight";
+    Command["KILL_LINE_LEFT"] = "killLineLeft";
+    Command["CLEAR_INPUT"] = "clearInput";
+    // Screen control
+    Command["CLEAR_SCREEN"] = "clearScreen";
+    // History navigation
+    Command["HISTORY_UP"] = "historyUp";
+    Command["HISTORY_DOWN"] = "historyDown";
+    Command["NAVIGATION_UP"] = "navigationUp";
+    Command["NAVIGATION_DOWN"] = "navigationDown";
+    // Auto-completion
+    Command["ACCEPT_SUGGESTION"] = "acceptSuggestion";
+    Command["COMPLETION_UP"] = "completionUp";
+    Command["COMPLETION_DOWN"] = "completionDown";
+    // Text input
+    Command["SUBMIT"] = "submit";
+    Command["NEWLINE"] = "newline";
+    // External tools
+    Command["OPEN_EXTERNAL_EDITOR"] = "openExternalEditor";
+    Command["PASTE_CLIPBOARD_IMAGE"] = "pasteClipboardImage";
+    // App level bindings
+    Command["SHOW_ERROR_DETAILS"] = "showErrorDetails";
+    Command["TOGGLE_TOOL_DESCRIPTIONS"] = "toggleToolDescriptions";
+    Command["TOGGLE_IDE_CONTEXT_DETAIL"] = "toggleIDEContextDetail";
+    Command["QUIT"] = "quit";
+    Command["EXIT"] = "exit";
+    Command["SHOW_MORE_LINES"] = "showMoreLines";
+    // Shell commands
+    Command["REVERSE_SEARCH"] = "reverseSearch";
+    Command["SUBMIT_REVERSE_SEARCH"] = "submitReverseSearch";
+    Command["ACCEPT_SUGGESTION_REVERSE_SEARCH"] = "acceptSuggestionReverseSearch";
+})(Command || (Command = {}));
+/**
+ * Default key binding configuration
+ * Matches the original hard-coded logic exactly
+ */
+export const defaultKeyBindings = {
+    // Basic bindings
+    [Command.RETURN]: [{ key: 'return' }],
+    // Original: key.name === 'escape'
+    [Command.ESCAPE]: [{ key: 'escape' }],
+    // Cursor movement
+    // Original: key.ctrl && key.name === 'a'
+    [Command.HOME]: [{ key: 'a', ctrl: true }],
+    // Original: key.ctrl && key.name === 'e'
+    [Command.END]: [{ key: 'e', ctrl: true }],
+    // Text deletion
+    // Original: key.ctrl && key.name === 'k'
+    [Command.KILL_LINE_RIGHT]: [{ key: 'k', ctrl: true }],
+    // Original: key.ctrl && key.name === 'u'
+    [Command.KILL_LINE_LEFT]: [{ key: 'u', ctrl: true }],
+    // Original: key.ctrl && key.name === 'c'
+    [Command.CLEAR_INPUT]: [{ key: 'c', ctrl: true }],
+    // Screen control
+    // Original: key.ctrl && key.name === 'l'
+    [Command.CLEAR_SCREEN]: [{ key: 'l', ctrl: true }],
+    // History navigation
+    // Original: key.ctrl && key.name === 'p'
+    [Command.HISTORY_UP]: [{ key: 'p', ctrl: true }],
+    // Original: key.ctrl && key.name === 'n'
+    [Command.HISTORY_DOWN]: [{ key: 'n', ctrl: true }],
+    // Original: key.name === 'up'
+    [Command.NAVIGATION_UP]: [{ key: 'up' }],
+    // Original: key.name === 'down'
+    [Command.NAVIGATION_DOWN]: [{ key: 'down' }],
+    // Auto-completion
+    // Original: key.name === 'tab' || (key.name === 'return' && !key.ctrl)
+    [Command.ACCEPT_SUGGESTION]: [{ key: 'tab' }, { key: 'return', ctrl: false }],
+    // Completion navigation (arrow or Ctrl+P/N)
+    [Command.COMPLETION_UP]: [{ key: 'up' }, { key: 'p', ctrl: true }],
+    [Command.COMPLETION_DOWN]: [{ key: 'down' }, { key: 'n', ctrl: true }],
+    // Text input
+    // Original: key.name === 'return' && !key.ctrl && !key.meta && !key.paste
+    // Must also exclude shift to allow shift+enter for newline
+    [Command.SUBMIT]: [
+        {
+            key: 'return',
+            ctrl: false,
+            command: false,
+            paste: false,
+            shift: false,
+        },
+    ],
+    // Original: key.name === 'return' && (key.ctrl || key.meta || key.paste)
+    // Split into multiple data-driven bindings
+    // Now also includes shift+enter for multi-line input
+    [Command.NEWLINE]: [
+        { key: 'return', ctrl: true },
+        { key: 'return', command: true },
+        { key: 'return', paste: true },
+        { key: 'return', shift: true },
+        { key: 'j', ctrl: true },
+    ],
+    // External tools
+    // Original: key.ctrl && (key.name === 'x' || key.sequence === '\x18')
+    [Command.OPEN_EXTERNAL_EDITOR]: [
+        { key: 'x', ctrl: true },
+        { sequence: '\x18', ctrl: true },
+    ],
+    // Original: key.ctrl && key.name === 'v'
+    [Command.PASTE_CLIPBOARD_IMAGE]: [{ key: 'v', ctrl: true }],
+    // App level bindings
+    // Original: key.ctrl && key.name === 'o'
+    [Command.SHOW_ERROR_DETAILS]: [{ key: 'o', ctrl: true }],
+    // Original: key.ctrl && key.name === 't'
+    [Command.TOGGLE_TOOL_DESCRIPTIONS]: [{ key: 't', ctrl: true }],
+    // Original: key.ctrl && key.name === 'g'
+    [Command.TOGGLE_IDE_CONTEXT_DETAIL]: [{ key: 'g', ctrl: true }],
+    // Original: key.ctrl && (key.name === 'c' || key.name === 'C')
+    [Command.QUIT]: [{ key: 'c', ctrl: true }],
+    // Original: key.ctrl && (key.name === 'd' || key.name === 'D')
+    [Command.EXIT]: [{ key: 'd', ctrl: true }],
+    // Original: key.ctrl && key.name === 's'
+    [Command.SHOW_MORE_LINES]: [{ key: 's', ctrl: true }],
+    // Shell commands
+    // Original: key.ctrl && key.name === 'r'
+    [Command.REVERSE_SEARCH]: [{ key: 'r', ctrl: true }],
+    // Original: key.name === 'return' && !key.ctrl
+    // Note: original logic ONLY checked ctrl=false, ignored meta/shift/paste
+    [Command.SUBMIT_REVERSE_SEARCH]: [{ key: 'return', ctrl: false }],
+    // Original: key.name === 'tab'
+    [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: [{ key: 'tab' }],
+};
+//# sourceMappingURL=keyBindings.js.map

package/dist/src/config/keyBindings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyBindings.js","sourceRoot":"","sources":["../../../src/config/keyBindings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,CAAN,IAAY,OAgDX;AAhDD,WAAY,OAAO;IACjB,iBAAiB;IACjB,4BAAiB,CAAA;IACjB,4BAAiB,CAAA;IAEjB,kBAAkB;IAClB,wBAAa,CAAA;IACb,sBAAW,CAAA;IAEX,gBAAgB;IAChB,4CAAiC,CAAA;IACjC,0CAA+B,CAAA;IAC/B,qCAA0B,CAAA;IAE1B,iBAAiB;IACjB,uCAA4B,CAAA;IAE5B,qBAAqB;IACrB,mCAAwB,CAAA;IACxB,uCAA4B,CAAA;IAC5B,yCAA8B,CAAA;IAC9B,6CAAkC,CAAA;IAElC,kBAAkB;IAClB,iDAAsC,CAAA;IACtC,yCAA8B,CAAA;IAC9B,6CAAkC,CAAA;IAElC,aAAa;IACb,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IAEnB,iBAAiB;IACjB,sDAA2C,CAAA;IAC3C,wDAA6C,CAAA;IAE7C,qBAAqB;IACrB,kDAAuC,CAAA;IACvC,8DAAmD,CAAA;IACnD,+DAAoD,CAAA;IACpD,wBAAa,CAAA;IACb,wBAAa,CAAA;IACb,4CAAiC,CAAA;IAEjC,iBAAiB;IACjB,2CAAgC,CAAA;IAChC,wDAA6C,CAAA;IAC7C,6EAAkE,CAAA;AACpE,CAAC,EAhDW,OAAO,KAAP,OAAO,QAgDlB;AA2BD;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAqB;IAClD,iBAAiB;IACjB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;IACrC,kCAAkC;IAClC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;IAErC,kBAAkB;IAClB,yCAAyC;IACzC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC1C,yCAAyC;IACzC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAEzC,gBAAgB;IAChB,yCAAyC;IACzC,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACrD,yCAAyC;IACzC,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACpD,yCAAyC;IACzC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAEjD,iBAAiB;IACjB,yCAAyC;IACzC,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAElD,qBAAqB;IACrB,yCAAyC;IACzC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAChD,yCAAyC;IACzC,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAClD,8BAA8B;IAC9B,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IACxC,gCAAgC;IAChC,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IAE5C,kBAAkB;IAClB,uEAAuE;IACvE,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC7E,4CAA4C;IAC5C,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAClE,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAEtE,aAAa;IACb,0EAA0E;IAC1E,2DAA2D;IAC3D,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAChB;YACE,GAAG,EAAE,QAAQ;YACb,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,KAAK;SACb;KACF;IACD,yEAAyE;IACzE,2CAA2C;IAC3C,qDAAqD;IACrD,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACjB,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE;QAC7B,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE;QAChC,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;QAC9B,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;QAC9B,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE;KACzB;IAED,iBAAiB;IACjB,sEAAsE;IACtE,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;QAC9B,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE;QACxB,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE;KACjC;IACD,yCAAyC;IACzC,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAE3D,qBAAqB;IACrB,yCAAyC;IACzC,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxD,yCAAyC;IACzC,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9D,yCAAyC;IACzC,CAAC,OAAO,CAAC,yBAAyB,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC/D,+DAA+D;IAC/D,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC1C,+DAA+D;IAC/D,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC1C,yCAAyC;IACzC,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAErD,iBAAiB;IACjB,yCAAyC;IACzC,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACpD,+CAA+C;IAC/C,yEAAyE;IACzE,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACjE,+BAA+B;IAC/B,CAAC,OAAO,CAAC,gCAAgC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;CAC7D,CAAC"}

package/dist/src/config/keyBindings.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/config/keyBindings.test.js

@@ -0,0 +1,51 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { Command, defaultKeyBindings } from './keyBindings.js';
+describe('keyBindings config', () => {
+    describe('defaultKeyBindings', () => {
+        it('should have bindings for all commands', () => {
+            const commands = Object.values(Command);
+            for (const command of commands) {
+                expect(defaultKeyBindings[command]).toBeDefined();
+                expect(Array.isArray(defaultKeyBindings[command])).toBe(true);
+            }
+        });
+        it('should have valid key binding structures', () => {
+            for (const [_, bindings] of Object.entries(defaultKeyBindings)) {
+                for (const binding of bindings) {
+                    // Each binding should have either key or sequence, but not both
+                    const hasKey = binding.key !== undefined;
+                    const hasSequence = binding.sequence !== undefined;
+                    expect(hasKey || hasSequence).toBe(true);
+                    expect(hasKey && hasSequence).toBe(false);
+                    // Modifier properties should be boolean or undefined
+                    if (binding.ctrl !== undefined) {
+                        expect(typeof binding.ctrl).toBe('boolean');
+                    }
+                    if (binding.shift !== undefined) {
+                        expect(typeof binding.shift).toBe('boolean');
+                    }
+                    if (binding.command !== undefined) {
+                        expect(typeof binding.command).toBe('boolean');
+                    }
+                    if (binding.paste !== undefined) {
+                        expect(typeof binding.paste).toBe('boolean');
+                    }
+                }
+            }
+        });
+        it('should export all required types', () => {
+            // Basic type checks
+            expect(typeof Command.HOME).toBe('string');
+            expect(typeof Command.END).toBe('string');
+            // Config should be readonly
+            const config = defaultKeyBindings;
+            expect(config[Command.HOME]).toBeDefined();
+        });
+    });
+});
+//# sourceMappingURL=keyBindings.test.js.map

package/dist/src/config/keyBindings.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyBindings.test.js","sourceRoot":"","sources":["../../../src/config/keyBindings.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/D,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAExC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;gBAClD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,KAAK,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAC/D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;oBAC/B,gEAAgE;oBAChE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,KAAK,SAAS,CAAC;oBACzC,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC;oBAEnD,MAAM,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACzC,MAAM,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAE1C,qDAAqD;oBACrD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;wBAC/B,MAAM,CAAC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC9C,CAAC;oBACD,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;wBAChC,MAAM,CAAC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC/C,CAAC;oBACD,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;wBAClC,MAAM,CAAC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACjD,CAAC;oBACD,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;wBAChC,MAAM,CAAC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC/C,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,oBAAoB;YACpB,MAAM,CAAC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,CAAC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAE1C,4BAA4B;YAC5B,MAAM,MAAM,GAAqB,kBAAkB,CAAC;YACpD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/config/sandboxConfig.d.ts

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { SandboxConfig } from '@umsai/ums-code-core';
-import { Settings } from './settings.js';
+import type { SandboxConfig } from '@umsai/ums-code-core';
+import type { Settings } from './settings.js';
 interface SandboxCliArgs {
     sandbox?: boolean | string;
     sandboxImage?: string;

package/dist/src/config/sandboxConfig.js

@@ -3,6 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { FatalSandboxError } from '@umsai/ums-code-core';
 import commandExists from 'command-exists';
 import * as os from 'node:os';
 import { getPackageJson } from '../utils/package.js';
@@ -16,11 +17,11 @@ function isSandboxCommand(value) {
 }
 function getSandboxCommand(sandbox) {
     // If the SANDBOX env var is set, we're already inside the sandbox.
-    if (process.env.SANDBOX) {
+    if (process.env['SANDBOX']) {
         return '';
     }
     // note environment variable takes precedence over argument (from command line or settings)
-    const environmentConfiguredSandbox = process.env.GEMINI_SANDBOX?.toLowerCase().trim() ?? '';
+    const environmentConfiguredSandbox = process.env['GEMINI_SANDBOX']?.toLowerCase().trim() ?? '';
     sandbox =
         environmentConfiguredSandbox?.length > 0
             ? environmentConfiguredSandbox
@@ -34,15 +35,13 @@ function getSandboxCommand(sandbox) {
     }
     if (typeof sandbox === 'string' && sandbox) {
         if (!isSandboxCommand(sandbox)) {
-            console.error(`ERROR: invalid sandbox command '${sandbox}'. Must be one of ${VALID_SANDBOX_COMMANDS.join(', ')}`);
-            process.exit(1);
+            throw new FatalSandboxError(`Invalid sandbox command '${sandbox}'. Must be one of ${VALID_SANDBOX_COMMANDS.join(', ')}`);
         }
         // confirm that specified command exists
         if (commandExists.sync(sandbox)) {
             return sandbox;
         }
-        console.error(`ERROR: missing sandbox command '${sandbox}' (from GEMINI_SANDBOX)`);
-        process.exit(1);
+        throw new FatalSandboxError(`Missing sandbox command '${sandbox}' (from GEMINI_SANDBOX)`);
     }
     // look for seatbelt, docker, or podman, in that order
     // for container-based sandboxing, require sandbox to be enabled explicitly
@@ -57,18 +56,17 @@ function getSandboxCommand(sandbox) {
     }
     // throw an error if user requested sandbox but no command was found
     if (sandbox === true) {
-        console.error('ERROR: GEMINI_SANDBOX is true but failed to determine command for sandbox; ' +
+        throw new FatalSandboxError('GEMINI_SANDBOX is true but failed to determine command for sandbox; ' +
             'install docker or podman or specify command in GEMINI_SANDBOX');
-        process.exit(1);
     }
     return '';
 }
 export async function loadSandboxConfig(settings, argv) {
-    const sandboxOption = argv.sandbox ?? settings.sandbox;
+    const sandboxOption = argv.sandbox ?? settings.tools?.sandbox;
     const command = getSandboxCommand(sandboxOption);
     const packageJson = await getPackageJson();
     const image = argv.sandboxImage ??
-        process.env.GEMINI_SANDBOX_IMAGE ??
+        process.env['GEMINI_SANDBOX_IMAGE'] ??
         packageJson?.config?.sandboxImageUri;
     return command && image ? { command, image } : undefined;
 }

package/dist/src/config/sandboxConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"sandboxConfig.js","sourceRoot":"","sources":["../../../src/config/sandboxConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sandboxConfig.js","sourceRoot":"","sources":["../../../src/config/sandboxConfig.ts"],"names":[],"mappings":"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"}

package/dist/src/config/settings.d.ts

@@ -3,19 +3,20 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { MCPServerConfig, BugCommandSettings, TelemetrySettings, AuthType } from '@umsai/ums-code-core';
-import { CustomTheme } from '../ui/themes/theme.js';
+import type { Settings, MemoryImportFormat } from './settingsSchema.js';
+export type { Settings, MemoryImportFormat };
 export declare const SETTINGS_DIRECTORY_NAME = ".ums";
-export declare const USER_SETTINGS_DIR: string;
 export declare const USER_SETTINGS_PATH: string;
+export declare const USER_SETTINGS_DIR: string;
 export declare const DEFAULT_EXCLUDED_ENV_VARS: string[];
 export declare function getSystemSettingsPath(): string;
-export declare function getWorkspaceSettingsPath(workspaceDir: string): string;
-export type DnsResolutionOrder = 'ipv4first' | 'verbatim';
+export declare function getSystemDefaultsPath(): string;
+export type { DnsResolutionOrder } from './settingsSchema.js';
 export declare enum SettingScope {
     User = "User",
     Workspace = "Workspace",
-    System = "System"
+    System = "System",
+    SystemDefaults = "SystemDefaults"
 }
 export interface CheckpointingSettings {
     enabled?: boolean;
@@ -25,67 +26,7 @@ export interface SummarizeToolOutputSettings {
 }
 export interface AccessibilitySettings {
     disableLoadingPhrases?: boolean;
-}
-export interface Settings {
-    theme?: string;
-    customThemes?: Record<string, CustomTheme>;
-    selectedAuthType?: AuthType;
-    useExternalAuth?: boolean;
-    sandbox?: boolean | string;
-    coreTools?: string[];
-    excludeTools?: string[];
-    toolDiscoveryCommand?: string;
-    toolCallCommand?: string;
-    mcpServerCommand?: string;
-    mcpServers?: Record<string, MCPServerConfig>;
-    allowMCPServers?: string[];
-    excludeMCPServers?: string[];
-    showMemoryUsage?: boolean;
-    contextFileName?: string | string[];
-    accessibility?: AccessibilitySettings;
-    telemetry?: TelemetrySettings;
-    usageStatisticsEnabled?: boolean;
-    preferredEditor?: string;
-    bugCommand?: BugCommandSettings;
-    checkpointing?: CheckpointingSettings;
-    autoConfigureMaxOldSpaceSize?: boolean;
-    /** The model name to use (e.g 'gemini-9.0-pro') */
-    model?: string;
-    enableOpenAILogging?: boolean;
-    fileFiltering?: {
-        respectGitIgnore?: boolean;
-        respectGeminiIgnore?: boolean;
-        enableRecursiveFileSearch?: boolean;
-    };
-    hideWindowTitle?: boolean;
-    hideTips?: boolean;
-    hideBanner?: boolean;
-    maxSessionTurns?: number;
-    sessionTokenLimit?: number;
-    maxFolderItems?: number;
-    summarizeToolOutput?: Record<string, SummarizeToolOutputSettings>;
-    vimMode?: boolean;
-    memoryImportFormat?: 'tree' | 'flat';
-    ideModeFeature?: boolean;
-    ideMode?: boolean;
-    disableAutoUpdate?: boolean;
-    disableUpdateNag?: boolean;
-    memoryDiscoveryMaxDirs?: number;
-    excludedProjectEnvVars?: string[];
-    dnsResolutionOrder?: DnsResolutionOrder;
-    sampling_params?: Record<string, unknown>;
-    systemPromptMappings?: Array<{
-        baseUrls: string[];
-        modelNames: string[];
-        template: string;
-    }>;
-    contentGenerator?: {
-        timeout?: number;
-        maxRetries?: number;
-    };
-    includeDirectories?: string[];
-    loadMemoryFromIncludeDirectories?: boolean;
-    tavilyApiKey?: string;
+    screenReader?: boolean;
 }
 export interface SettingsError {
     message: string;
@@ -95,17 +36,21 @@ export interface SettingsFile {
     settings: Settings;
     path: string;
 }
+export declare function migrateSettingsToV1(v2Settings: Record<string, unknown>): Record<string, unknown>;
 export declare class LoadedSettings {
-    constructor(system: SettingsFile, user: SettingsFile, workspace: SettingsFile, errors: SettingsError[]);
+    constructor(system: SettingsFile, systemDefaults: SettingsFile, user: SettingsFile, workspace: SettingsFile, errors: SettingsError[], isTrusted: boolean, migratedInMemorScopes: Set<SettingScope>);
     readonly system: SettingsFile;
+    readonly systemDefaults: SettingsFile;
     readonly user: SettingsFile;
     readonly workspace: SettingsFile;
     readonly errors: SettingsError[];
+    readonly isTrusted: boolean;
+    readonly migratedInMemorScopes: Set<SettingScope>;
     private _merged;
     get merged(): Settings;
     private computeMergedSettings;
     forScope(scope: SettingScope): SettingsFile;
-    setValue<K extends keyof Settings>(scope: SettingScope, key: K, value: Settings[K]): void;
+    setValue(scope: SettingScope, key: string, value: unknown): void;
 }
 export declare function setUpCloudShellEnvironment(envFilePath: string | null): void;
 export declare function loadEnvironment(settings?: Settings): void;