@qduc/term2 0.3.1 → 0.5.0

package/dist/services/rtk-service.test.js

@@ -0,0 +1,274 @@
+import test from 'ava';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { createHash } from 'crypto';
+import { RTK_VERSION, RTK_REPO, RTK_ASSET_CHECKSUMS, resolveRtkAsset, getRtkBinaryPath, isRtkSupportedCommand, wrapWithRtk, ensureRtkInstalled, } from './rtk-service.js';
+// ── helpers ──────────────────────────────────────────────────────────────────
+function makeTmpDir(t) {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'term2-rtk-test-'));
+    t.teardown(() => fs.rmSync(dir, { recursive: true, force: true }));
+    return dir;
+}
+function noopLogger() {
+    return {
+        info: () => { },
+        warn: () => { },
+        error: () => { },
+        debug: () => { },
+        security: () => { },
+        setCorrelationId: () => { },
+        getCorrelationId: () => undefined,
+        clearCorrelationId: () => { },
+    };
+}
+// ── constants ─────────────────────────────────────────────────────────────────
+test('RTK_VERSION and RTK_REPO are set', (t) => {
+    t.is(typeof RTK_VERSION, 'string');
+    t.true(RTK_VERSION.startsWith('v'));
+    t.is(RTK_REPO, 'rtk-ai/rtk');
+});
+// ── resolveRtkAsset ──────────────────────────────────────────────────────────
+test('resolveRtkAsset maps linux x64 correctly', (t) => {
+    t.is(resolveRtkAsset('linux', 'x64'), 'rtk-x86_64-unknown-linux-musl.tar.gz');
+});
+test('RTK_ASSET_CHECKSUMS includes checksum for every supported asset', (t) => {
+    const supportedAssets = [
+        resolveRtkAsset('linux', 'x64'),
+        resolveRtkAsset('linux', 'arm64'),
+        resolveRtkAsset('darwin', 'x64'),
+        resolveRtkAsset('darwin', 'arm64'),
+    ];
+    for (const asset of supportedAssets) {
+        t.truthy(asset);
+        t.regex(RTK_ASSET_CHECKSUMS[asset], /^[0-9a-f]{64}$/);
+    }
+});
+test('resolveRtkAsset maps linux arm64 correctly', (t) => {
+    t.is(resolveRtkAsset('linux', 'arm64'), 'rtk-aarch64-unknown-linux-gnu.tar.gz');
+});
+test('resolveRtkAsset maps darwin x64 correctly', (t) => {
+    t.is(resolveRtkAsset('darwin', 'x64'), 'rtk-x86_64-apple-darwin.tar.gz');
+});
+test('resolveRtkAsset maps darwin arm64 correctly', (t) => {
+    t.is(resolveRtkAsset('darwin', 'arm64'), 'rtk-aarch64-apple-darwin.tar.gz');
+});
+test('resolveRtkAsset returns null for win32', (t) => {
+    t.is(resolveRtkAsset('win32', 'x64'), null);
+});
+test('resolveRtkAsset returns null for unknown arch', (t) => {
+    t.is(resolveRtkAsset('linux', 'mips'), null);
+});
+test('resolveRtkAsset returns null for unknown platform', (t) => {
+    t.is(resolveRtkAsset('freebsd', 'x64'), null);
+});
+// ── getRtkBinaryPath ─────────────────────────────────────────────────────────
+test('getRtkBinaryPath includes version and rtk binary name', (t) => {
+    const p = getRtkBinaryPath({ cacheDir: '/fake/cache' });
+    t.true(p.includes(RTK_VERSION), 'path should include version');
+    t.true(p.endsWith('rtk'), 'path should end with rtk');
+    t.true(p.startsWith('/fake/cache'), 'path should start with cacheDir');
+});
+// ── isRtkSupportedCommand ────────────────────────────────────────────────────
+const ALLOWLISTED = ['git', 'npm', 'pnpm', 'yarn', 'cargo', 'pytest', 'go', 'rg', 'grep', 'cat', 'ls'];
+for (const cmd of ALLOWLISTED) {
+    test(`isRtkSupportedCommand: '${cmd}' alone is supported`, (t) => {
+        t.true(isRtkSupportedCommand(cmd));
+    });
+    test(`isRtkSupportedCommand: '${cmd} with args' is supported`, (t) => {
+        t.true(isRtkSupportedCommand(`${cmd} status --short`));
+    });
+}
+test('isRtkSupportedCommand: non-allowlisted command is rejected', (t) => {
+    t.false(isRtkSupportedCommand('curl https://example.com'));
+    t.false(isRtkSupportedCommand('printf hello'));
+});
+test('isRtkSupportedCommand: supported when at least one top-level command is eligible', (t) => {
+    t.true(isRtkSupportedCommand('git status && git log'));
+    t.true(isRtkSupportedCommand('npm test || cat error.log'));
+    t.true(isRtkSupportedCommand('git status; git log'));
+    t.true(isRtkSupportedCommand('git log $(date)'));
+});
+test('isRtkSupportedCommand: supported when a chain mixes eligible and ineligible commands', (t) => {
+    t.true(isRtkSupportedCommand('curl https://x && git log'));
+    t.true(isRtkSupportedCommand('npm run dev & npm test'));
+});
+test('isRtkSupportedCommand: rejected when no top-level command is eligible', (t) => {
+    t.false(isRtkSupportedCommand('curl https://example.com'));
+    t.false(isRtkSupportedCommand('git status > out.txt'));
+    t.false(isRtkSupportedCommand('git log 2>&1'));
+    t.false(isRtkSupportedCommand('grep pattern < file.txt'));
+    t.false(isRtkSupportedCommand('npm install &'));
+});
+test('isRtkSupportedCommand: does not descend into subshells', (t) => {
+    t.false(isRtkSupportedCommand('(cd src && git log)'));
+});
+test('isRtkSupportedCommand: empty command is rejected', (t) => {
+    t.false(isRtkSupportedCommand(''));
+    t.false(isRtkSupportedCommand('   '));
+});
+test('isRtkSupportedCommand: malformed command does not throw and is rejected', (t) => {
+    t.notThrows(() => isRtkSupportedCommand('git log ('));
+    t.false(isRtkSupportedCommand('git log ('));
+});
+// ── wrapWithRtk ───────────────────────────────────────────────────────────────
+test('wrapWithRtk prefixes a single command with quoted rtkPath', (t) => {
+    t.is(wrapWithRtk('git status', '/path/to/rtk'), '"/path/to/rtk" git status');
+});
+test('wrapWithRtk handles path with spaces via quoting', (t) => {
+    t.is(wrapWithRtk('ls -la', '/path with spaces/rtk'), '"/path with spaces/rtk" ls -la');
+});
+test('wrapWithRtk wraps every eligible command in a logical/sequence chain', (t) => {
+    t.is(wrapWithRtk('npm run build && npm test', '/r'), '"/r" npm run build && "/r" npm test');
+    t.is(wrapWithRtk('git status; git log', '/r'), '"/r" git status; "/r" git log');
+});
+test('wrapWithRtk never wraps any command in a pipeline', (t) => {
+    // The producer's stdout is the next command's stdin; altering it would
+    // change the consumer's input. The whole pipeline is left untouched.
+    t.is(wrapWithRtk('git log | grep foo', '/r'), 'git log | grep foo');
+    t.is(wrapWithRtk('git log | grep x | head', '/r'), 'git log | grep x | head');
+    t.is(wrapWithRtk('git log | tee out.txt', '/r'), 'git log | tee out.txt');
+    t.is(wrapWithRtk('git log | grep x > out.txt', '/r'), 'git log | grep x > out.txt');
+});
+test('wrapWithRtk wraps eligible commands around a pipeline but not within it', (t) => {
+    t.is(wrapWithRtk('git status && git log | grep x', '/r'), '"/r" git status && git log | grep x');
+});
+test('isRtkSupportedCommand rejects standalone pipelines', (t) => {
+    t.false(isRtkSupportedCommand('git log | grep foo'));
+    t.false(isRtkSupportedCommand('git log | tee out.txt'));
+    t.false(isRtkSupportedCommand('git log | grep x > out.txt'));
+});
+test('wrapWithRtk leaves ineligible commands in a chain untouched', (t) => {
+    t.is(wrapWithRtk('curl https://x && git log', '/r'), 'curl https://x && "/r" git log');
+    t.is(wrapWithRtk('npm run dev & npm test', '/r'), 'npm run dev & "/r" npm test');
+    // A redirect on one branch must not block wrapping a sibling branch.
+    t.is(wrapWithRtk('git diff > f && git log', '/r'), 'git diff > f && "/r" git log');
+});
+test('wrapWithRtk does not descend into command substitution or subshells', (t) => {
+    t.is(wrapWithRtk('git log $(date)', '/r'), '"/r" git log $(date)');
+    t.is(wrapWithRtk('(cd src && git log)', '/r'), '(cd src && git log)');
+});
+test('wrapWithRtk returns the command unchanged when nothing is eligible', (t) => {
+    t.is(wrapWithRtk('git status > out.txt', '/r'), 'git status > out.txt');
+    t.is(wrapWithRtk('git log (', '/r'), 'git log (');
+});
+// ── ensureRtkInstalled ────────────────────────────────────────────────────────
+test.serial('ensureRtkInstalled returns path when binary already exists', async (t) => {
+    const cacheDir = makeTmpDir(t);
+    const binaryPath = getRtkBinaryPath({ cacheDir });
+    fs.mkdirSync(path.dirname(binaryPath), { recursive: true });
+    fs.writeFileSync(binaryPath, 'fake-binary');
+    fs.chmodSync(binaryPath, 0o755);
+    let fetchCalled = false;
+    const result = await ensureRtkInstalled({
+        loggingService: noopLogger(),
+        cacheDir,
+        platform: 'linux',
+        arch: 'x64',
+        fetchImpl: async () => {
+            fetchCalled = true;
+            return new Response('', { status: 200 });
+        },
+    });
+    t.is(result, binaryPath);
+    t.false(fetchCalled, 'fetch should not be called when binary exists');
+});
+test.serial('ensureRtkInstalled returns null for unsupported platform', async (t) => {
+    const cacheDir = makeTmpDir(t);
+    const warnMessages = [];
+    const result = await ensureRtkInstalled({
+        loggingService: { ...noopLogger(), warn: (msg) => warnMessages.push(msg) },
+        cacheDir,
+        platform: 'win32',
+        arch: 'x64',
+    });
+    t.is(result, null);
+    t.true(warnMessages.some((m) => m.includes('rtk')));
+});
+test.serial('ensureRtkInstalled returns null when fetch fails with non-ok response', async (t) => {
+    const cacheDir = makeTmpDir(t);
+    const warnMessages = [];
+    const result = await ensureRtkInstalled({
+        loggingService: { ...noopLogger(), warn: (msg) => warnMessages.push(msg) },
+        cacheDir,
+        platform: 'linux',
+        arch: 'x64',
+        fetchImpl: async () => new Response('Not Found', { status: 404 }),
+    });
+    t.is(result, null);
+    t.true(warnMessages.some((m) => m.includes('rtk')));
+});
+test.serial('ensureRtkInstalled returns null when fetch throws', async (t) => {
+    const cacheDir = makeTmpDir(t);
+    const warnMessages = [];
+    const result = await ensureRtkInstalled({
+        loggingService: { ...noopLogger(), warn: (msg) => warnMessages.push(msg) },
+        cacheDir,
+        platform: 'linux',
+        arch: 'x64',
+        fetchImpl: async () => {
+            throw new Error('network error');
+        },
+    });
+    t.is(result, null);
+    t.true(warnMessages.some((m) => m.includes('rtk')));
+});
+test.serial('ensureRtkInstalled returns null when extraction fails', async (t) => {
+    const cacheDir = makeTmpDir(t);
+    const warnMessages = [];
+    const result = await ensureRtkInstalled({
+        loggingService: { ...noopLogger(), warn: (msg) => warnMessages.push(msg) },
+        cacheDir,
+        platform: 'linux',
+        arch: 'x64',
+        fetchImpl: async () => new Response(new Uint8Array([0x1f, 0x8b]).buffer, { status: 200 }),
+        extractImpl: () => ({ status: 1 }),
+    });
+    t.is(result, null);
+    t.true(warnMessages.some((m) => m.includes('rtk')));
+});
+test.serial('ensureRtkInstalled returns null and does not install when checksum does not match', async (t) => {
+    const cacheDir = makeTmpDir(t);
+    const warnMessages = [];
+    const fakeBytes = Buffer.from('fake tarball content');
+    const result = await ensureRtkInstalled({
+        loggingService: { ...noopLogger(), warn: (msg) => warnMessages.push(msg) },
+        cacheDir,
+        platform: 'linux',
+        arch: 'x64',
+        fetchImpl: async () => new Response(fakeBytes, { status: 200 }),
+        assetChecksums: {
+            'rtk-x86_64-unknown-linux-musl.tar.gz': '0'.repeat(64),
+        },
+        extractImpl: () => {
+            t.fail('extract should not run when checksum verification fails');
+            return { status: 0 };
+        },
+    });
+    t.is(result, null);
+    t.false(fs.existsSync(getRtkBinaryPath({ cacheDir })));
+    t.true(warnMessages.some((m) => m.includes('checksum')));
+});
+test.serial('ensureRtkInstalled returns binary path on successful install', async (t) => {
+    const cacheDir = makeTmpDir(t);
+    const fakeBytes = Buffer.from('fake tarball content');
+    const checksum = createHash('sha256').update(fakeBytes).digest('hex');
+    const result = await ensureRtkInstalled({
+        loggingService: noopLogger(),
+        cacheDir,
+        platform: 'linux',
+        arch: 'x64',
+        fetchImpl: async () => new Response(fakeBytes, { status: 200 }),
+        assetChecksums: {
+            'rtk-x86_64-unknown-linux-musl.tar.gz': checksum,
+        },
+        extractImpl: (_tarPath, destDir) => {
+            fs.writeFileSync(path.join(destDir, 'rtk'), '#!/bin/sh\necho rtk');
+            return { status: 0 };
+        },
+    });
+    t.truthy(result);
+    t.true(result.endsWith('rtk'));
+    t.true(fs.existsSync(result));
+});
+//# sourceMappingURL=rtk-service.test.js.map

package/dist/services/rtk-service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rtk-service.test.js","sourceRoot":"","sources":["../../source/services/rtk-service.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EACL,WAAW,EACX,QAAQ,EACR,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,WAAW,EACX,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAG1B,gFAAgF;AAEhF,SAAS,UAAU,CAAC,CAAM;IACxB,MAAM,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACnE,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,UAAU;IACjB,OAAO;QACL,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;QACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;QACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;QACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;QACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;QAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;QAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;QACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;KAC7B,CAAC;AACJ,CAAC;AAED,iFAAiF;AAEjF,IAAI,CAAC,kCAAkC,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7C,CAAC,CAAC,EAAE,CAAC,OAAO,WAAW,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,gFAAgF;AAEhF,IAAI,CAAC,0CAA0C,EAAE,CAAC,CAAC,EAAE,EAAE;IACrD,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,sCAAsC,CAAC,CAAC;AAChF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iEAAiE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC5E,MAAM,eAAe,GAAG;QACtB,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC;QAC/B,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC;QACjC,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC;QAChC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC;KACnC,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;QACpC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,KAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACzD,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4CAA4C,EAAE,CAAC,CAAC,EAAE,EAAE;IACvD,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,sCAAsC,CAAC,CAAC;AAClF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2CAA2C,EAAE,CAAC,CAAC,EAAE,EAAE;IACtD,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,gCAAgC,CAAC,CAAC;AAC3E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6CAA6C,EAAE,CAAC,CAAC,EAAE,EAAE;IACxD,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,iCAAiC,CAAC,CAAC;AAC9E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wCAAwC,EAAE,CAAC,CAAC,EAAE,EAAE;IACnD,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;AAC9C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+CAA+C,EAAE,CAAC,CAAC,EAAE,EAAE;IAC1D,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,CAAC,CAAC,EAAE,EAAE;IAC9D,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,SAAgB,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC;AAEH,gFAAgF;AAEhF,IAAI,CAAC,uDAAuD,EAAE,CAAC,CAAC,EAAE,EAAE;IAClE,MAAM,CAAC,GAAG,gBAAgB,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,6BAA6B,CAAC,CAAC;IAC/D,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,0BAA0B,CAAC,CAAC;IACtD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,iCAAiC,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC;AAEH,gFAAgF;AAEhF,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AAEvG,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;IAC9B,IAAI,CAAC,2BAA2B,GAAG,sBAAsB,EAAE,CAAC,CAAC,EAAE,EAAE;QAC/D,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2BAA2B,GAAG,0BAA0B,EAAE,CAAC,CAAC,EAAE,EAAE;QACnE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,GAAG,iBAAiB,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,IAAI,CAAC,4DAA4D,EAAE,CAAC,CAAC,EAAE,EAAE;IACvE,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kFAAkF,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7F,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sFAAsF,EAAE,CAAC,CAAC,EAAE,EAAE;IACjG,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uEAAuE,EAAE,CAAC,CAAC,EAAE,EAAE;IAClF,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wDAAwD,EAAE,CAAC,CAAC,EAAE,EAAE;IACnE,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7D,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;AACxC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yEAAyE,EAAE,CAAC,CAAC,EAAE,EAAE;IACpF,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC;AAC9C,CAAC,CAAC,CAAC;AAEH,iFAAiF;AAEjF,IAAI,CAAC,2DAA2D,EAAE,CAAC,CAAC,EAAE,EAAE;IACtE,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,YAAY,EAAE,cAAc,CAAC,EAAE,2BAA2B,CAAC,CAAC;AAC/E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7D,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,uBAAuB,CAAC,EAAE,gCAAgC,CAAC,CAAC;AACzF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sEAAsE,EAAE,CAAC,CAAC,EAAE,EAAE;IACjF,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,2BAA2B,EAAE,IAAI,CAAC,EAAE,qCAAqC,CAAC,CAAC;IAC5F,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,qBAAqB,EAAE,IAAI,CAAC,EAAE,+BAA+B,CAAC,CAAC;AAClF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,CAAC,CAAC,EAAE,EAAE;IAC9D,uEAAuE;IACvE,qEAAqE;IACrE,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,oBAAoB,EAAE,IAAI,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACpE,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE,yBAAyB,CAAC,CAAC;IAC9E,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,uBAAuB,EAAE,IAAI,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAC1E,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,4BAA4B,EAAE,IAAI,CAAC,EAAE,4BAA4B,CAAC,CAAC;AACtF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yEAAyE,EAAE,CAAC,CAAC,EAAE,EAAE;IACpF,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,gCAAgC,EAAE,IAAI,CAAC,EAAE,qCAAqC,CAAC,CAAC;AACnG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oDAAoD,EAAE,CAAC,CAAC,EAAE,EAAE;IAC/D,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,4BAA4B,CAAC,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6DAA6D,EAAE,CAAC,CAAC,EAAE,EAAE;IACxE,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,2BAA2B,EAAE,IAAI,CAAC,EAAE,gCAAgC,CAAC,CAAC;IACvF,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE,6BAA6B,CAAC,CAAC;IACjF,qEAAqE;IACrE,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE,8BAA8B,CAAC,CAAC;AACrF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qEAAqE,EAAE,CAAC,CAAC,EAAE,EAAE;IAChF,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,sBAAsB,CAAC,CAAC;IACnE,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,qBAAqB,EAAE,IAAI,CAAC,EAAE,qBAAqB,CAAC,CAAC;AACxE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oEAAoE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC/E,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,sBAAsB,EAAE,IAAI,CAAC,EAAE,sBAAsB,CAAC,CAAC;IACxE,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC,CAAC,CAAC;AAEH,iFAAiF;AAEjF,IAAI,CAAC,MAAM,CAAC,4DAA4D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACpF,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,UAAU,GAAG,gBAAgB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAClD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAC5C,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAEhC,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;QACtC,cAAc,EAAE,UAAU,EAAE;QAC5B,QAAQ;QACR,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,KAAK;QACX,SAAS,EAAE,KAAK,IAAI,EAAE;YACpB,WAAW,GAAG,IAAI,CAAC;YACnB,OAAO,IAAI,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAC3C,CAAC;KACF,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACzB,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,+CAA+C,CAAC,CAAC;AACxE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,MAAM,CAAC,0DAA0D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAClF,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;QACtC,cAAc,EAAE,EAAE,GAAG,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAClF,QAAQ;QACR,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,MAAM,CAAC,uEAAuE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC/F,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;QACtC,cAAc,EAAE,EAAE,GAAG,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAClF,QAAQ;QACR,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,KAAK;QACX,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;KAClE,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,MAAM,CAAC,mDAAmD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC3E,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;QACtC,cAAc,EAAE,EAAE,GAAG,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAClF,QAAQ;QACR,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,KAAK;QACX,SAAS,EAAE,KAAK,IAAI,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;QACnC,CAAC;KACF,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,MAAM,CAAC,uDAAuD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC/E,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;QACtC,cAAc,EAAE,EAAE,GAAG,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAClF,QAAQ;QACR,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,KAAK;QACX,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QACzF,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;KACnC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,MAAM,CAAC,mFAAmF,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC3G,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAEtD,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;QACtC,cAAc,EAAE,EAAE,GAAG,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAClF,QAAQ;QACR,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,KAAK;QACX,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QAC/D,cAAc,EAAE;YACd,sCAAsC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;SACvD;QACD,WAAW,EAAE,GAAG,EAAE;YAChB,CAAC,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAClE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACvB,CAAC;KACF,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,MAAM,CAAC,8DAA8D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACtF,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;QACtC,cAAc,EAAE,UAAU,EAAE;QAC5B,QAAQ;QACR,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,KAAK;QACX,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QAC/D,cAAc,EAAE;YACd,sCAAsC,EAAE,QAAQ;SACjD;QACD,WAAW,EAAE,CAAC,QAAgB,EAAE,OAAe,EAAE,EAAE;YACjD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,qBAAqB,CAAC,CAAC;YACnE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACvB,CAAC;KACF,CAAC,CAAC;IAEH,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjB,CAAC,CAAC,IAAI,CAAC,MAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAO,CAAC,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC"}

package/dist/services/settings-persistence.d.ts

@@ -12,6 +12,7 @@ export declare function loadSettingsFromFile(opts: {
 }): {
     validated: Partial<SettingsData>;
     raw: any;
+    hadErrors: boolean;
 };
 export declare function saveSettingsToFile(opts: {
     settingsDir: string;

package/dist/services/settings-persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-persistence.d.ts","sourceRoot":"","sources":["../../source/services/settings-persistence.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC5C,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;CAC9C,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,GAAG;IAAE,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAE,CAuCjD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,YAAY,CAAC;IACvB,sBAAsB,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,GAAG,IAAI,CAwCP;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAsBpF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,EAChC,MAAM,GAAE,MAAW,GAClB,OAAO,CAqCT"}
+{"version":3,"file":"settings-persistence.d.ts","sourceRoot":"","sources":["../../source/services/settings-persistence.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC5C,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;CAC9C,CAAC;AAwBF,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,GAAG;IAAE,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAAC,GAAG,EAAE,GAAG,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAwCrE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,YAAY,CAAC;IACvB,sBAAsB,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,GAAG,IAAI,CAwCP;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAsBpF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,EAChC,MAAM,GAAE,MAAW,GAClB,OAAO,CAqCT"}

package/dist/services/settings-persistence.js

@@ -1,11 +1,33 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import deepEqual from 'fast-deep-equal';
+/**
+ * Try to parse each top-level section of the settings object independently.
+ * Valid sections are included in the result; invalid sections are omitted so
+ * they fall back to defaults in mergeSettings. The file on disk is never touched.
+ */
+function parsePartialSections(parsed, schema) {
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+        return {};
+    const shape = schema.shape;
+    if (!shape || typeof shape !== 'object')
+        return {};
+    const partial = {};
+    for (const [key, sectionSchema] of Object.entries(shape)) {
+        if (!(key in parsed))
+            continue;
+        const result = sectionSchema.safeParse(parsed[key]);
+        if (result.success) {
+            partial[key] = result.data;
+        }
+    }
+    return partial;
+}
 export function loadSettingsFromFile(opts) {
     try {
         const settingsFile = path.join(opts.settingsDir, 'settings.json');
         if (!fs.existsSync(settingsFile)) {
-            return { validated: {}, raw: {} };
+            return { validated: {}, raw: {}, hadErrors: false };
         }
         const content = fs.readFileSync(settingsFile, 'utf-8');
         const parsed = JSON.parse(content);
@@ -20,10 +42,11 @@ export function loadSettingsFromFile(opts) {
                     })),
                 });
             }
-            // Return empty object to trigger defaults
-            return { validated: {}, raw: parsed };
+            // Preserve valid top-level sections; invalid sections fall back to defaults
+            // via mergeSettings. The file is left unchanged for the user to fix.
+            return { validated: parsePartialSections(parsed, opts.schema), raw: parsed, hadErrors: true };
         }
-        return { validated: validated.data, raw: parsed };
+        return { validated: validated.data, raw: parsed, hadErrors: false };
     }
     catch (error) {
         if (!opts.disableLogging) {
@@ -32,7 +55,7 @@ export function loadSettingsFromFile(opts) {
                 settingsFile: path.join(opts.settingsDir, 'settings.json'),
             });
         }
-        return { validated: {}, raw: {} };
+        return { validated: {}, raw: {}, hadErrors: false };
     }
 }
 export function saveSettingsToFile(opts) {

package/dist/services/settings-persistence.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-persistence.js","sourceRoot":"","sources":["../../source/services/settings-persistence.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-persistence.js","sourceRoot":"","sources":["../../source/services/settings-persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,SAAS,MAAM,iBAAiB,CAAC;AAUxC;;;;GAIG;AACH,SAAS,oBAAoB,CAAC,MAAW,EAAE,MAAkB;IAC3D,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IAE9E,MAAM,KAAK,GAAI,MAAc,CAAC,KAA+C,CAAC;IAC9E,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IAEnD,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,KAAK,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzD,IAAI,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC;YAAE,SAAS;QAC/B,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACpD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;QAC7B,CAAC;IACH,CAAC;IACD,OAAO,OAAgC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAKpC;IACC,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAElE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QACtD,CAAC;QAED,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEnC,8BAA8B;QAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEhD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACzB,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,uCAAuC,EAAE;oBACjE,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC;wBAClD,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;wBAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;qBACvB,CAAC,CAAC;iBACJ,CAAC,CAAC;YACL,CAAC;YAED,4EAA4E;YAC5E,qEAAqE;YACrE,OAAO,EAAE,SAAS,EAAE,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAChG,CAAC;QAED,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,IAA6B,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IAC/F,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,8BAA8B,EAAE;gBACzD,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC7D,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC;aAC3D,CAAC,CAAC;QACL,CAAC;QAED,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACtD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAMlC;IACC,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAElE,0BAA0B;QAC1B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YACrC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,CAAC;QAED,sDAAsD;QACtD,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAE3D,0DAA0D;QAC1D,6EAA6E;QAC7E,8BAA8B;QAC9B,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,MAAM,eAAe,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;gBAC/D,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBAEnD,4DAA4D;gBAC5D,IAAI,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC,EAAE,CAAC;oBAC9C,OAAO,CAAC,0BAA0B;gBACpC,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,oEAAoE;gBACpE,0CAA0C;YAC5C,CAAC;QACH,CAAC;QAED,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,8BAA8B,EAAE;gBACzD,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC7D,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC;aAC3D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAsB;IAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IAErD,8DAA8D;IAC9D,IAAI,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC;QAC9B,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;QACvC,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC;QACxC,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;QACzC,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC;QACtC,mDAAmD;QACnD,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;QAClC,CAAC;IACH,CAAC;IAED,gCAAgC;IAChC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;QAC7B,wEAAwE;IAC1E,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAC5B,MAAW,EACX,MAAW,EACX,mBAAgC,EAChC,SAAiB,EAAE;IAEnB,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC;YAAE,SAAS;QAE1C,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QAElD,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAEhC,IAAI,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC;YACrB,mEAAmE;YACnE,IAAI,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,SAAS;YACX,CAAC;YACD,0EAA0E;YAC1E,IAAI,OAAO,WAAW,KAAK,WAAW,EAAE,CAAC;gBACvC,SAAS;YACX,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAEhC,mCAAmC;QACnC,IACE,WAAW;YACX,OAAO,WAAW,KAAK,QAAQ;YAC/B,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;YAC3B,WAAW;YACX,OAAO,WAAW,KAAK,QAAQ;YAC/B,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAC3B,CAAC;YACD,IAAI,cAAc,CAAC,WAAW,EAAE,WAAW,EAAE,mBAAmB,EAAE,OAAO,CAAC,EAAE,CAAC;gBAC3E,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/services/settings-persistence.test.js

@@ -22,17 +22,69 @@ test('hasMissingKeys: true when defaults introduce new key', (t) => {
     const source = { a: { b: 1, c: 2 } };
     t.true(hasMissingKeys(target, source, new Set()));
 });
-test('loadSettingsFromFile: returns empty validated when schema rejects', (t) => {
+test('loadSettingsFromFile: preserves valid sections when another section has an invalid value', (t) => {
     const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'term2-settings-'));
     t.teardown(() => fs.rmSync(dir, { recursive: true, force: true }));
-    fs.writeFileSync(path.join(dir, 'settings.json'), JSON.stringify({ agent: { maxTurns: -1 } }, null, 2), 'utf-8');
+    // agent section is invalid (maxTurns must be positive); app section is valid
+    const raw = { agent: { maxTurns: -1 }, app: { liteMode: true } };
+    fs.writeFileSync(path.join(dir, 'settings.json'), JSON.stringify(raw, null, 2), 'utf-8');
+    const out = loadSettingsFromFile({
+        settingsDir: dir,
+        schema: SettingsSchema,
+        disableLogging: true,
+    });
+    // Valid app section is preserved; invalid agent section is omitted (falls back to defaults)
+    t.is(out.validated?.app?.liteMode, true);
+    t.is(out.validated?.agent, undefined);
+    t.true(out.hadErrors);
+    t.deepEqual(out.raw, raw);
+});
+test('loadSettingsFromFile: falls back to default for a section containing invalid array items', (t) => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'term2-settings-'));
+    t.teardown(() => fs.rmSync(dir, { recursive: true, force: true }));
+    // providers array is invalid (one item has unknown type); app section is valid
+    const raw = {
+        providers: [
+            { name: 'good', type: 'openai-compatible', baseUrl: 'https://api.example.com' },
+            { name: 'bad', type: 'unknown-type' },
+        ],
+        app: { liteMode: true },
+    };
+    fs.writeFileSync(path.join(dir, 'settings.json'), JSON.stringify(raw, null, 2), 'utf-8');
+    const out = loadSettingsFromFile({
+        settingsDir: dir,
+        schema: SettingsSchema,
+        disableLogging: true,
+    });
+    // Entire providers section falls back to default; valid app section is preserved
+    t.is(out.validated?.providers, undefined);
+    t.is(out.validated?.app?.liteMode, true);
+    t.true(out.hadErrors);
+    t.deepEqual(out.raw, raw);
+});
+test('loadSettingsFromFile: returns empty validated when top-level value is not an object', (t) => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'term2-settings-'));
+    t.teardown(() => fs.rmSync(dir, { recursive: true, force: true }));
+    fs.writeFileSync(path.join(dir, 'settings.json'), JSON.stringify('not-an-object'), 'utf-8');
     const out = loadSettingsFromFile({
         settingsDir: dir,
         schema: SettingsSchema,
         disableLogging: true,
     });
     t.deepEqual(out.validated, {});
-    t.deepEqual(out.raw, { agent: { maxTurns: -1 } });
+    t.true(out.hadErrors);
+    t.is(out.raw, 'not-an-object');
+});
+test('loadSettingsFromFile: hadErrors is false when file is valid', (t) => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'term2-settings-'));
+    t.teardown(() => fs.rmSync(dir, { recursive: true, force: true }));
+    fs.writeFileSync(path.join(dir, 'settings.json'), JSON.stringify({ app: { liteMode: true } }, null, 2), 'utf-8');
+    const out = loadSettingsFromFile({
+        settingsDir: dir,
+        schema: SettingsSchema,
+        disableLogging: true,
+    });
+    t.false(out.hadErrors);
 });
 test('saveSettingsToFile: writes stripped settings', (t) => {
     const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'term2-settings-'));

package/dist/services/settings-persistence.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-persistence.test.js","sourceRoot":"","sources":["../../source/services/settings-persistence.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-persistence.test.js","sourceRoot":"","sources":["../../source/services/settings-persistence.test.ts"],"names":[],"mappings":"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"}