@tulex-cli/tulex-code 0.1.1

package/dist/src/config/migration/versions/v3-to-v4.js

@@ -0,0 +1,126 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getNestedProperty, setNestedPropertySafe, } from '../../../utils/settingsUtils.js';
+const GIT_CO_AUTHOR_PATH = 'general.gitCoAuthor';
+/**
+ * V3 -> V4 migration (gitCoAuthor boolean → object expansion).
+ *
+ * Before V4, `general.gitCoAuthor` was a single boolean that governed both
+ * commit message attribution and PR body attribution. V4 splits those into
+ * two independent sub-toggles so users can disable one without losing the
+ * other. This migration rewrites any stored boolean into `{ commit: v,
+ * pr: v }` so the user's prior choice carries over to both new toggles and
+ * the settings dialog reads the expected object shape.
+ *
+ * Compatibility strategy:
+ * - Boolean values are expanded in place.
+ * - Object values with `commit`/`pr` keys are left untouched (forward-
+ *   compatible — a user who edited their settings.json by hand to the new
+ *   shape is already on V4-equivalent data).
+ * - Any other present value (string, number, array, null) is dropped with
+ *   a warning so the caller sees an actionable message.
+ */
+export class V3ToV4Migration {
+    fromVersion = 3;
+    toVersion = 4;
+    shouldMigrate(settings) {
+        if (typeof settings !== 'object' || settings === null) {
+            return false;
+        }
+        const s = settings;
+        if (s['$version'] === 3) {
+            return true;
+        }
+        // Versionless settings file (no $version key): the V1/V2 migrations
+        // don't list `gitCoAuthor` as an indicator key (it post-dates them),
+        // so a settings file with ONLY this shape wouldn't trigger any
+        // earlier migration. Catch it here so:
+        //   - legacy boolean (`gitCoAuthor: false`) gets expanded to
+        //     `{commit: false, pr: false}` instead of being silently
+        //     overwritten by the dialog's schema defaults on first save;
+        //   - invalid shapes (`gitCoAuthor: "off"`, `gitCoAuthor: []`,
+        //     etc.) get reset by the migrate() body's drop-and-warn path
+        //     so runtime normalization doesn't quietly re-enable
+        //     attribution against the user's intent.
+        if (s['$version'] === undefined) {
+            const value = getNestedProperty(s, GIT_CO_AUTHOR_PATH);
+            if (value === undefined)
+                return false;
+            // Already in the v4 shape — leave the loader to stamp $version: 4.
+            if (typeof value === 'object' &&
+                value !== null &&
+                !Array.isArray(value)) {
+                return false;
+            }
+            // Anything else (boolean, string, number, array, null) needs
+            // rewriting via migrate().
+            return true;
+        }
+        return false;
+    }
+    migrate(settings, scope) {
+        if (typeof settings !== 'object' || settings === null) {
+            throw new Error('Settings must be an object');
+        }
+        const result = structuredClone(settings);
+        const warnings = [];
+        const value = getNestedProperty(result, GIT_CO_AUTHOR_PATH);
+        if (typeof value === 'boolean') {
+            // Legacy shape — rewrite as { commit, pr } preserving the prior choice.
+            setNestedPropertySafe(result, GIT_CO_AUTHOR_PATH, {
+                commit: value,
+                pr: value,
+            });
+        }
+        else if (typeof value === 'string') {
+            // String forms: a user who hand-edited `"gitCoAuthor": "off"` (or
+            // similar) to disable the feature must NOT see attribution
+            // silently re-enable just because we couldn't parse the literal
+            // shape. Map disable-intent strings to `{commit: false, pr: false}`,
+            // enable-intent strings to `{commit: true, pr: true}`, and
+            // anything else to disabled with a warning (safer-by-default
+            // than enabling against an ambiguous opt-out).
+            const lowered = value.trim().toLowerCase();
+            const disableIntent = ['false', 'no', 'off', '0', 'disabled', ''];
+            const enableIntent = ['true', 'yes', 'on', '1', 'enabled'];
+            if (enableIntent.includes(lowered)) {
+                setNestedPropertySafe(result, GIT_CO_AUTHOR_PATH, {
+                    commit: true,
+                    pr: true,
+                });
+            }
+            else if (disableIntent.includes(lowered)) {
+                setNestedPropertySafe(result, GIT_CO_AUTHOR_PATH, {
+                    commit: false,
+                    pr: false,
+                });
+            }
+            else {
+                setNestedPropertySafe(result, GIT_CO_AUTHOR_PATH, {
+                    commit: false,
+                    pr: false,
+                });
+                warnings.push(`Reset '${GIT_CO_AUTHOR_PATH}' in ${scope} settings to {commit: false, pr: false} because the stored string '${value}' was not a recognized boolean form.`);
+            }
+        }
+        else if (value !== undefined &&
+            (typeof value !== 'object' || value === null || Array.isArray(value))) {
+            // Invalid non-string shape (number, array, null). Drop and
+            // disable rather than re-enable on ambiguity — same
+            // safer-by-default contract as `pickBool` at runtime.
+            setNestedPropertySafe(result, GIT_CO_AUTHOR_PATH, {
+                commit: false,
+                pr: false,
+            });
+            warnings.push(`Reset '${GIT_CO_AUTHOR_PATH}' in ${scope} settings to {commit: false, pr: false} because the stored value was not a boolean or object.`);
+        }
+        // Object values (including the new shape) pass through unchanged.
+        result['$version'] = 4;
+        return { settings: result, warnings };
+    }
+}
+export const v3ToV4Migration = new V3ToV4Migration();
+//# sourceMappingURL=v3-to-v4.js.map

package/dist/src/config/migration/versions/v3-to-v4.js.map

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

package/dist/src/config/migration/versions/v3-to-v4.test.d.ts

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

package/dist/src/config/migration/versions/v3-to-v4.test.js

@@ -0,0 +1,164 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { V3ToV4Migration } from './v3-to-v4.js';
+describe('V3ToV4Migration', () => {
+    const migration = new V3ToV4Migration();
+    describe('shouldMigrate', () => {
+        it('returns true for V3 settings', () => {
+            expect(migration.shouldMigrate({
+                $version: 3,
+                general: { gitCoAuthor: false },
+            })).toBe(true);
+        });
+        it('returns true for V3 settings without gitCoAuthor', () => {
+            // Even without the relevant key, the version must still bump.
+            expect(migration.shouldMigrate({ $version: 3 })).toBe(true);
+        });
+        it('returns false for V4 settings', () => {
+            expect(migration.shouldMigrate({
+                $version: 4,
+                general: { gitCoAuthor: { commit: true, pr: true } },
+            })).toBe(false);
+        });
+        it('returns false for non-object input', () => {
+            expect(migration.shouldMigrate(null)).toBe(false);
+            expect(migration.shouldMigrate('x')).toBe(false);
+            expect(migration.shouldMigrate(42)).toBe(false);
+        });
+        // `gitCoAuthor` post-dates the V1 indicator-key list, so a settings
+        // file that has ONLY this legacy boolean shape (no `$version`,
+        // no other migration-triggering keys) wouldn't fire any earlier
+        // migration. The v3→v4 step must catch it directly so the dialog
+        // doesn't silently overwrite the user's stored opt-out with the
+        // schema defaults on next save.
+        it('returns true for versionless settings with legacy boolean gitCoAuthor', () => {
+            expect(migration.shouldMigrate({
+                general: { gitCoAuthor: false },
+            })).toBe(true);
+        });
+        it('returns false for versionless settings without gitCoAuthor', () => {
+            expect(migration.shouldMigrate({ general: {} })).toBe(false);
+            expect(migration.shouldMigrate({})).toBe(false);
+        });
+        it('returns false for versionless settings with already-object gitCoAuthor', () => {
+            // User who hand-edited to the v4 shape — let the loader's
+            // version normalization handle it without rewriting.
+            expect(migration.shouldMigrate({
+                general: { gitCoAuthor: { commit: false, pr: true } },
+            })).toBe(false);
+        });
+        // Without the migration firing on invalid versionless values, the
+        // loader would stamp $version: 4 with `"off"` / `[]` / etc. left
+        // on disk, and runtime normalization would silently re-enable
+        // attribution. The migrate() body's drop-and-warn handles these
+        // — shouldMigrate has to fire so it gets a chance to run.
+        it.each([
+            ['"off"', 'off'],
+            ['empty array', []],
+            ['number', 42],
+            ['null', null],
+        ])('returns true for versionless settings with invalid gitCoAuthor (%s)', (_label, value) => {
+            expect(migration.shouldMigrate({
+                general: { gitCoAuthor: value },
+            })).toBe(true);
+        });
+    });
+    describe('migrate', () => {
+        it('expands legacy boolean true into { commit: true, pr: true }', () => {
+            const input = { $version: 3, general: { gitCoAuthor: true } };
+            const { settings, warnings } = migration.migrate(input, 'user');
+            expect(settings['general']['gitCoAuthor']).toEqual({ commit: true, pr: true });
+            expect(settings['$version']).toBe(4);
+            expect(warnings).toEqual([]);
+        });
+        it('expands legacy boolean false into { commit: false, pr: false }', () => {
+            const input = { $version: 3, general: { gitCoAuthor: false } };
+            const { settings } = migration.migrate(input, 'user');
+            expect(settings['general']['gitCoAuthor']).toEqual({ commit: false, pr: false });
+        });
+        it('leaves an already-object value untouched', () => {
+            const input = {
+                $version: 3,
+                general: { gitCoAuthor: { commit: false, pr: true } },
+            };
+            const { settings, warnings } = migration.migrate(input, 'user');
+            expect(settings['general']['gitCoAuthor']).toEqual({ commit: false, pr: true });
+            expect(warnings).toEqual([]);
+        });
+        it('bumps version when gitCoAuthor is absent', () => {
+            const input = { $version: 3, general: {} };
+            const { settings, warnings } = migration.migrate(input, 'user');
+            expect(settings['$version']).toBe(4);
+            expect(settings['general']['gitCoAuthor']).toBeUndefined();
+            expect(warnings).toEqual([]);
+        });
+        // String enable-intent forms map to {commit: true, pr: true};
+        // disable-intent forms map to {commit: false, pr: false}; an
+        // unrecognised string also defaults to disabled (safer-by-default
+        // — same contract as the runtime `pickBool`) but emits a warning.
+        it.each([
+            ['"true"', 'true', { commit: true, pr: true }, false],
+            ['"yes"', 'yes', { commit: true, pr: true }, false],
+            ['"on"', 'on', { commit: true, pr: true }, false],
+            ['"1"', '1', { commit: true, pr: true }, false],
+            ['"false"', 'false', { commit: false, pr: false }, false],
+            ['"no"', 'no', { commit: false, pr: false }, false],
+            ['"off"', 'off', { commit: false, pr: false }, false],
+            ['"0"', '0', { commit: false, pr: false }, false],
+            ['empty string', '', { commit: false, pr: false }, false],
+            ['"OFF" (case)', 'OFF', { commit: false, pr: false }, false],
+            ['unknown string', 'maybe', { commit: false, pr: false }, true],
+        ])('maps string %s to %j (warn=%s)', (_label, str, expected, expectWarn) => {
+            const input = { $version: 3, general: { gitCoAuthor: str } };
+            const { settings, warnings } = migration.migrate(input, 'user');
+            expect(settings['general']['gitCoAuthor']).toEqual(expected);
+            if (expectWarn) {
+                expect(warnings).toHaveLength(1);
+                expect(warnings[0]).toContain('gitCoAuthor');
+            }
+            else {
+                expect(warnings).toHaveLength(0);
+            }
+        });
+        // Non-string invalid values (null/array/number) get the
+        // safer-by-default disabled state with a warning.
+        it.each([
+            ['null', null],
+            ['array', []],
+            ['number', 42],
+        ])('treats %s as invalid and resets to disabled with a warning', (_label, bad) => {
+            const input = { $version: 3, general: { gitCoAuthor: bad } };
+            const { settings, warnings } = migration.migrate(input, 'user');
+            expect(settings['general']['gitCoAuthor']).toEqual({ commit: false, pr: false });
+            expect(warnings).toHaveLength(1);
+        });
+        it('leaves a partially-specified object unchanged', () => {
+            // Downstream normalizeGitCoAuthor fills missing sub-keys with defaults;
+            // the migration only reshapes, it does not paternalistically fill defaults.
+            const input = {
+                $version: 3,
+                general: { gitCoAuthor: { commit: false } },
+            };
+            const { settings, warnings } = migration.migrate(input, 'user');
+            expect(settings['general']['gitCoAuthor']).toEqual({ commit: false });
+            expect(warnings).toEqual([]);
+        });
+        it('does not mutate the input settings object', () => {
+            const input = { $version: 3, general: { gitCoAuthor: false } };
+            migration.migrate(input, 'user');
+            expect(input).toEqual({
+                $version: 3,
+                general: { gitCoAuthor: false },
+            });
+        });
+        it('throws for non-object input', () => {
+            expect(() => migration.migrate(null, 'user')).toThrow();
+            expect(() => migration.migrate('string', 'user')).toThrow();
+        });
+    });
+});
+//# sourceMappingURL=v3-to-v4.test.js.map

package/dist/src/config/migration/versions/v3-to-v4.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"v3-to-v4.test.js","sourceRoot":"","sources":["../../../../../src/config/migration/versions/v3-to-v4.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,MAAM,SAAS,GAAG,IAAI,eAAe,EAAE,CAAC;IAExC,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,CACJ,SAAS,CAAC,aAAa,CAAC;gBACtB,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;aAChC,CAAC,CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC1D,8DAA8D;YAC9D,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;YACvC,MAAM,CACJ,SAAS,CAAC,aAAa,CAAC;gBACtB,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;aACrD,CAAC,CACH,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC5C,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClD,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjD,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,oEAAoE;QACpE,+DAA+D;QAC/D,gEAAgE;QAChE,iEAAiE;QACjE,gEAAgE;QAChE,gCAAgC;QAChC,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;YAC/E,MAAM,CACJ,SAAS,CAAC,aAAa,CAAC;gBACtB,OAAO,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;aAChC,CAAC,CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YACpE,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7D,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;YAChF,0DAA0D;YAC1D,qDAAqD;YACrD,MAAM,CACJ,SAAS,CAAC,aAAa,CAAC;gBACtB,OAAO,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;aACtD,CAAC,CACH,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,kEAAkE;QAClE,iEAAiE;QACjE,8DAA8D;QAC9D,gEAAgE;QAChE,0DAA0D;QAC1D,EAAE,CAAC,IAAI,CAAC;YACN,CAAC,OAAO,EAAE,KAAK,CAAC;YAChB,CAAC,aAAa,EAAE,EAAE,CAAC;YACnB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACd,CAAC,MAAM,EAAE,IAAI,CAAC;SACf,CAAC,CACA,qEAAqE,EACrE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAChB,MAAM,CACJ,SAAS,CAAC,aAAa,CAAC;gBACtB,OAAO,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;aAChC,CAAC,CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;YACrE,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC;YAC9D,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAG7D,CAAC;YAEF,MAAM,CACH,QAAQ,CAAC,SAAS,CAA6B,CAAC,aAAa,CAAC,CAChE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YACtC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;YACxE,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC;YAC/D,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAGnD,CAAC;YAEF,MAAM,CACH,QAAQ,CAAC,SAAS,CAA6B,CAAC,aAAa,CAAC,CAChE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,MAAM,KAAK,GAAG;gBACZ,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;aACtD,CAAC;YACF,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAG7D,CAAC;YAEF,MAAM,CACH,QAAQ,CAAC,SAAS,CAA6B,CAAC,aAAa,CAAC,CAChE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YACvC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAC3C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAG7D,CAAC;YAEF,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,CACH,QAAQ,CAAC,SAAS,CAA6B,CAAC,aAAa,CAAC,CAChE,CAAC,aAAa,EAAE,CAAC;YAClB,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,8DAA8D;QAC9D,6DAA6D;QAC7D,kEAAkE;QAClE,kEAAkE;QAClE,EAAE,CAAC,IAAI,CAAC;YACN,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,CAAC;YACrD,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,CAAC;YACnD,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,CAAC;YACjD,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,CAAC;YAC/C,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC;YACzD,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC;YACnD,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC;YACrD,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC;YACjD,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC;YACzD,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC;YAC5D,CAAC,gBAAgB,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC;SAChE,CAAC,CACA,gCAAgC,EAChC,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,CAAC;YAC7D,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAG7D,CAAC;YACF,MAAM,CACH,QAAQ,CAAC,SAAS,CAA6B,CAAC,aAAa,CAAC,CAChE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpB,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACjC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACnC,CAAC;QACH,CAAC,CACF,CAAC;QAEF,wDAAwD;QACxD,kDAAkD;QAClD,EAAE,CAAC,IAAI,CAAC;YACN,CAAC,MAAM,EAAE,IAAI,CAAC;YACd,CAAC,OAAO,EAAE,EAAE,CAAC;YACb,CAAC,QAAQ,EAAE,EAAE,CAAC;SACf,CAAC,CACA,4DAA4D,EAC5D,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YACd,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,CAAC;YAC7D,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAG7D,CAAC;YAEF,MAAM,CACH,QAAQ,CAAC,SAAS,CAA6B,CAAC,aAAa,CAAC,CAChE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACvD,wEAAwE;YACxE,4EAA4E;YAC5E,MAAM,KAAK,GAAG;gBACZ,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;aAC5C,CAAC;YACF,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAG7D,CAAC;YAEF,MAAM,CACH,QAAQ,CAAC,SAAS,CAA6B,CAAC,aAAa,CAAC,CAChE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7B,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACnD,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC;YAC/D,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAEjC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;gBACpB,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;aAChC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACrC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YACxD,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { SettingScope, type LoadedSettings } from './settings.js';
+export declare function hasOwnModelProviders(settingsObj: unknown): boolean;
+/**
+ * Returns which writable scope (Workspace/User) owns the effective modelProviders
+ * configuration.
+ *
+ * Note: Workspace scope is only considered when the workspace is trusted.
+ */
+export declare function getModelProvidersOwnerScope(settings: LoadedSettings): SettingScope | undefined;
+/**
+ * Choose the settings scope to persist a model selection.
+ * Prefer persisting back to the scope that contains the effective modelProviders
+ * config, otherwise fall back to the legacy trust-based heuristic.
+ */
+export declare function getPersistScopeForModelSelection(settings: LoadedSettings): SettingScope;

package/dist/src/config/modelProvidersScope.js

@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { SettingScope } from './settings.js';
+export function hasOwnModelProviders(settingsObj) {
+    if (!settingsObj || typeof settingsObj !== 'object') {
+        return false;
+    }
+    const obj = settingsObj;
+    // Treat an explicitly configured empty object (modelProviders: {}) as "owned"
+    // by this scope, which is important when mergeStrategy is REPLACE.
+    return Object.prototype.hasOwnProperty.call(obj, 'modelProviders');
+}
+/**
+ * Returns which writable scope (Workspace/User) owns the effective modelProviders
+ * configuration.
+ *
+ * Note: Workspace scope is only considered when the workspace is trusted.
+ */
+export function getModelProvidersOwnerScope(settings) {
+    if (settings.isTrusted && hasOwnModelProviders(settings.workspace.settings)) {
+        return SettingScope.Workspace;
+    }
+    if (hasOwnModelProviders(settings.user.settings)) {
+        return SettingScope.User;
+    }
+    return undefined;
+}
+/**
+ * Choose the settings scope to persist a model selection.
+ * Prefer persisting back to the scope that contains the effective modelProviders
+ * config, otherwise fall back to the legacy trust-based heuristic.
+ */
+export function getPersistScopeForModelSelection(settings) {
+    return getModelProvidersOwnerScope(settings) ?? SettingScope.User;
+}
+//# sourceMappingURL=modelProvidersScope.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"modelProvidersScope.js","sourceRoot":"","sources":["../../../src/config/modelProvidersScope.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAuB,MAAM,eAAe,CAAC;AAElE,MAAM,UAAU,oBAAoB,CAAC,WAAoB;IACvD,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,GAAG,GAAG,WAAsC,CAAC;IACnD,8EAA8E;IAC9E,mEAAmE;IACnE,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;AACrE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CACzC,QAAwB;IAExB,IAAI,QAAQ,CAAC,SAAS,IAAI,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5E,OAAO,YAAY,CAAC,SAAS,CAAC;IAChC,CAAC;IAED,IAAI,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjD,OAAO,YAAY,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gCAAgC,CAC9C,QAAwB;IAExB,OAAO,2BAA2B,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC;AACpE,CAAC"}

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

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

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

@@ -0,0 +1,66 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, expect, it } from 'vitest';
+import { SettingScope } from './settings.js';
+import { getPersistScopeForModelSelection } from './modelProvidersScope.js';
+function makeSettings({ isTrusted, userModelProviders, workspaceModelProviders, }) {
+    const userSettings = {};
+    const workspaceSettings = {};
+    // When undefined, treat as "not present in this scope" (the key is omitted),
+    // matching how LoadedSettings is shaped when a settings file doesn't define it.
+    if (userModelProviders !== undefined) {
+        userSettings['modelProviders'] = userModelProviders;
+    }
+    if (workspaceModelProviders !== undefined) {
+        workspaceSettings['modelProviders'] = workspaceModelProviders;
+    }
+    return {
+        isTrusted,
+        user: { settings: userSettings },
+        workspace: { settings: workspaceSettings },
+    };
+}
+describe('getPersistScopeForModelSelection', () => {
+    it('prefers workspace when trusted and workspace defines modelProviders', () => {
+        const settings = makeSettings({
+            isTrusted: true,
+            workspaceModelProviders: {},
+            userModelProviders: { anything: true },
+        });
+        expect(getPersistScopeForModelSelection(settings)).toBe(SettingScope.Workspace);
+    });
+    it('falls back to user when workspace does not define modelProviders', () => {
+        const settings = makeSettings({
+            isTrusted: true,
+            workspaceModelProviders: undefined,
+            userModelProviders: {},
+        });
+        expect(getPersistScopeForModelSelection(settings)).toBe(SettingScope.User);
+    });
+    it('ignores workspace modelProviders when workspace is untrusted', () => {
+        const settings = makeSettings({
+            isTrusted: false,
+            workspaceModelProviders: {},
+            userModelProviders: undefined,
+        });
+        expect(getPersistScopeForModelSelection(settings)).toBe(SettingScope.User);
+    });
+    it('falls back to legacy trust heuristic when neither scope defines modelProviders', () => {
+        const trusted = makeSettings({
+            isTrusted: true,
+            userModelProviders: undefined,
+            workspaceModelProviders: undefined,
+        });
+        expect(getPersistScopeForModelSelection(trusted)).toBe(SettingScope.User);
+        const untrusted = makeSettings({
+            isTrusted: false,
+            userModelProviders: undefined,
+            workspaceModelProviders: undefined,
+        });
+        expect(getPersistScopeForModelSelection(untrusted)).toBe(SettingScope.User);
+    });
+});
+//# sourceMappingURL=modelProvidersScope.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"modelProvidersScope.test.js","sourceRoot":"","sources":["../../../src/config/modelProvidersScope.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,gCAAgC,EAAE,MAAM,0BAA0B,CAAC;AAE5E,SAAS,YAAY,CAAC,EACpB,SAAS,EACT,kBAAkB,EAClB,uBAAuB,GAKxB;IACC,MAAM,YAAY,GAA4B,EAAE,CAAC;IACjD,MAAM,iBAAiB,GAA4B,EAAE,CAAC;IAEtD,6EAA6E;IAC7E,gFAAgF;IAChF,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;QACrC,YAAY,CAAC,gBAAgB,CAAC,GAAG,kBAAkB,CAAC;IACtD,CAAC;IACD,IAAI,uBAAuB,KAAK,SAAS,EAAE,CAAC;QAC1C,iBAAiB,CAAC,gBAAgB,CAAC,GAAG,uBAAuB,CAAC;IAChE,CAAC;IAED,OAAO;QACL,SAAS;QACT,IAAI,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE;QAChC,SAAS,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE;KACU,CAAC;AACzD,CAAC;AAED,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAChD,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,QAAQ,GAAG,YAAY,CAAC;YAC5B,SAAS,EAAE,IAAI;YACf,uBAAuB,EAAE,EAAE;YAC3B,kBAAkB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;SACvC,CAAC,CAAC;QAEH,MAAM,CAAC,gCAAgC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CACrD,YAAY,CAAC,SAAS,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,QAAQ,GAAG,YAAY,CAAC;YAC5B,SAAS,EAAE,IAAI;YACf,uBAAuB,EAAE,SAAS;YAClC,kBAAkB,EAAE,EAAE;SACvB,CAAC,CAAC;QAEH,MAAM,CAAC,gCAAgC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,QAAQ,GAAG,YAAY,CAAC;YAC5B,SAAS,EAAE,KAAK;YAChB,uBAAuB,EAAE,EAAE;YAC3B,kBAAkB,EAAE,SAAS;SAC9B,CAAC,CAAC;QAEH,MAAM,CAAC,gCAAgC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,GAAG,EAAE;QACxF,MAAM,OAAO,GAAG,YAAY,CAAC;YAC3B,SAAS,EAAE,IAAI;YACf,kBAAkB,EAAE,SAAS;YAC7B,uBAAuB,EAAE,SAAS;SACnC,CAAC,CAAC;QACH,MAAM,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE1E,MAAM,SAAS,GAAG,YAAY,CAAC;YAC7B,SAAS,EAAE,KAAK;YAChB,kBAAkB,EAAE,SAAS;YAC7B,uBAAuB,EAAE,SAAS;SACnC,CAAC,CAAC;QACH,MAAM,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/config/path-freshness.test.d.ts

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

package/dist/src/config/path-freshness.test.js

@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import * as path from 'node:path';
+import { homedir } from 'node:os';
+import { getUserSettingsDir, getUserSettingsPath } from './settings.js';
+import { getTrustedFoldersPath } from './trustedFolders.js';
+// Regression guard: `QWEN_HOME` is resolved by `preResolveHomeEnvOverrides()`
+// AFTER any module that imports a settings/trustedFolders path has loaded.
+// A top-level `const` would freeze the pre-bootstrap value and split state
+// across callers. Each test mutates `process.env.QWEN_HOME` post-load and
+// asserts the exported path getters reflect the new value.
+describe('settings/trustedFolders path getters are lazy', () => {
+    let originalQwenHome;
+    let originalTrustedPath;
+    beforeEach(() => {
+        originalQwenHome = process.env['QWEN_HOME'];
+        originalTrustedPath = process.env['QWEN_CODE_TRUSTED_FOLDERS_PATH'];
+        delete process.env['QWEN_HOME'];
+        delete process.env['QWEN_CODE_TRUSTED_FOLDERS_PATH'];
+    });
+    afterEach(() => {
+        if (originalQwenHome === undefined)
+            delete process.env['QWEN_HOME'];
+        else
+            process.env['QWEN_HOME'] = originalQwenHome;
+        if (originalTrustedPath === undefined)
+            delete process.env['QWEN_CODE_TRUSTED_FOLDERS_PATH'];
+        else
+            process.env['QWEN_CODE_TRUSTED_FOLDERS_PATH'] = originalTrustedPath;
+    });
+    it('getUserSettingsPath() reflects QWEN_HOME set after module load', () => {
+        const defaultPath = getUserSettingsPath();
+        expect(defaultPath).toBe(path.join(homedir(), '.qwen', 'settings.json'));
+        process.env['QWEN_HOME'] = '/tmp/qwen-lazy-test';
+        expect(getUserSettingsPath()).toBe(path.join('/tmp/qwen-lazy-test', 'settings.json'));
+    });
+    it('getUserSettingsDir() reflects QWEN_HOME set after module load', () => {
+        expect(getUserSettingsDir()).toBe(path.join(homedir(), '.qwen'));
+        process.env['QWEN_HOME'] = '/tmp/qwen-lazy-test';
+        expect(getUserSettingsDir()).toBe(path.normalize('/tmp/qwen-lazy-test'));
+    });
+    it('getTrustedFoldersPath() reflects QWEN_HOME set after module load', () => {
+        expect(getTrustedFoldersPath()).toBe(path.join(homedir(), '.qwen', 'trustedFolders.json'));
+        process.env['QWEN_HOME'] = '/tmp/qwen-lazy-test';
+        expect(getTrustedFoldersPath()).toBe(path.join('/tmp/qwen-lazy-test', 'trustedFolders.json'));
+    });
+});
+//# sourceMappingURL=path-freshness.test.js.map

package/dist/src/config/path-freshness.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"path-freshness.test.js","sourceRoot":"","sources":["../../../src/config/path-freshness.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,8EAA8E;AAC9E,2EAA2E;AAC3E,2EAA2E;AAC3E,0EAA0E;AAC1E,2DAA2D;AAE3D,QAAQ,CAAC,+CAA+C,EAAE,GAAG,EAAE;IAC7D,IAAI,gBAAoC,CAAC;IACzC,IAAI,mBAAuC,CAAC;IAE5C,UAAU,CAAC,GAAG,EAAE;QACd,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5C,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QACpE,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChC,OAAO,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;;YAC/D,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC;QACjD,IAAI,mBAAmB,KAAK,SAAS;YACnC,OAAO,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;;YAClD,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,GAAG,mBAAmB,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,WAAW,GAAG,mBAAmB,EAAE,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;QAEzE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,qBAAqB,CAAC;QACjD,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC,IAAI,CAChC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,eAAe,CAAC,CAClD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;QAEjE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,qBAAqB,CAAC;QACjD,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAClC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,qBAAqB,CAAC,CACrD,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,qBAAqB,CAAC;QACjD,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAClC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CACxD,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { SandboxConfig } from '@tulex-cli/tulex-cli-core';
+import type { Settings } from './settings.js';
+interface SandboxCliArgs {
+    sandbox?: boolean | string;
+    sandboxImage?: string;
+}
+export declare function loadSandboxConfig(settings: Settings, argv: SandboxCliArgs): Promise<SandboxConfig | undefined>;
+export {};

package/dist/src/config/sandboxConfig.js

@@ -0,0 +1,74 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { FatalSandboxError } from '@tulex-cli/tulex-cli-core';
+import commandExists from 'command-exists';
+import * as os from 'node:os';
+import { getPackageJson } from '../utils/package.js';
+const VALID_SANDBOX_COMMANDS = [
+    'docker',
+    'podman',
+    'sandbox-exec',
+];
+function isSandboxCommand(value) {
+    return VALID_SANDBOX_COMMANDS.includes(value);
+}
+function getSandboxCommand(sandbox) {
+    // If the SANDBOX env var is set, we're already inside the sandbox.
+    if (process.env['SANDBOX']) {
+        return '';
+    }
+    // note environment variable takes precedence over argument (from command line or settings)
+    const environmentConfiguredSandbox = process.env['QWEN_SANDBOX']?.toLowerCase().trim() ?? '';
+    sandbox =
+        environmentConfiguredSandbox?.length > 0
+            ? environmentConfiguredSandbox
+            : sandbox;
+    if (sandbox === '1' || sandbox === 'true')
+        sandbox = true;
+    else if (sandbox === '0' || sandbox === 'false' || !sandbox)
+        sandbox = false;
+    if (sandbox === false) {
+        return '';
+    }
+    if (typeof sandbox === 'string' && sandbox) {
+        if (!isSandboxCommand(sandbox)) {
+            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;
+        }
+        throw new FatalSandboxError(`Missing sandbox command '${sandbox}' (from QWEN_SANDBOX)`);
+    }
+    // look for seatbelt, docker, or podman, in that order
+    // for container-based sandboxing, require sandbox to be enabled explicitly
+    if (os.platform() === 'darwin' && commandExists.sync('sandbox-exec')) {
+        return 'sandbox-exec';
+    }
+    else if (commandExists.sync('docker') && sandbox === true) {
+        return 'docker';
+    }
+    else if (commandExists.sync('podman') && sandbox === true) {
+        return 'podman';
+    }
+    // throw an error if user requested sandbox but no command was found
+    if (sandbox === true) {
+        throw new FatalSandboxError('QWEN_SANDBOX is true but failed to determine command for sandbox; ' +
+            'install docker or podman or specify command in QWEN_SANDBOX');
+    }
+    return '';
+}
+export async function loadSandboxConfig(settings, argv) {
+    const sandboxOption = argv.sandbox ?? settings.tools?.sandbox;
+    const command = getSandboxCommand(sandboxOption);
+    const packageJson = await getPackageJson();
+    const image = argv.sandboxImage ??
+        process.env['QWEN_SANDBOX_IMAGE'] ??
+        settings.tools?.sandboxImage ??
+        packageJson?.config?.sandboxImageUri;
+    return command && image ? { command, image } : undefined;
+}
+//# sourceMappingURL=sandboxConfig.js.map

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

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