merlion 0.1.4 → 0.1.6

package/README.md

@@ -3,6 +3,7 @@
 Merlion is a terminal coding agent focused on two goals:
 - high coding quality (benchmarking Claude Code / Codex style workflows)
 - lower token cost through practical context + tool design
+- provider-agnostic OpenAI-compatible runtime (`openrouter` / `openai` / custom URL)
 
 ## Quick Start (Recommended)
 
@@ -10,7 +11,7 @@ Merlion is a terminal coding agent focused on two goals:
 
 ```bash
 npm install -g merlion
-export OPENROUTER_API_KEY=your_key_here
+# first run will guide provider/key/model setup interactively
 merlion --repl
 ```
 
@@ -18,7 +19,7 @@ If you prefer local install in a project:
 
 ```bash
 npm install merlion
-export OPENROUTER_API_KEY=your_key_here
+# first run will guide provider/key/model setup interactively
 npx merlion --repl
 ```
 
@@ -28,10 +29,20 @@ npx merlion --repl
 git clone https://github.com/StevenSLXie/Merlion.git
 cd Merlion
 npm install
-export OPENROUTER_API_KEY=your_key_here
+# first run will guide provider/key/model setup interactively
 npm run merlion -- --repl
 ```
 
+Optional non-interactive env configuration:
+
+```bash
+export MERLION_PROVIDER=openrouter   # openrouter | openai | custom
+export MERLION_API_KEY=your_key_here
+export MERLION_MODEL=qwen/qwen3-coder
+export MERLION_BASE_URL=https://openrouter.ai/api/v1
+merlion --repl
+```
+
 ## Common Usage
 
 ```bash
@@ -52,6 +63,7 @@ merlion --resume <session-id>
 Merlion 是一个终端代码代理，核心目标是：
 - 代码质量对标 Claude Code / Codex 这类工程化工作流
 - 通过上下文与工具设计尽量节省 token，从而降低成本
+- 支持 OpenAI-compatible provider（`openrouter` / `openai` / 自定义 URL）
 
 ## 快速开始（推荐）
 
@@ -59,7 +71,7 @@ Merlion 是一个终端代码代理，核心目标是：
 
 ```bash
 npm install -g merlion
-export OPENROUTER_API_KEY=your_key_here
+# 首次运行会交互引导 provider/key/model 配置
 merlion --repl
 ```
 
@@ -67,7 +79,7 @@ merlion --repl
 
 ```bash
 npm install merlion
-export OPENROUTER_API_KEY=your_key_here
+# 首次运行会交互引导 provider/key/model 配置
 npx merlion --repl
 ```
 
@@ -77,10 +89,20 @@ npx merlion --repl
 git clone https://github.com/StevenSLXie/Merlion.git
 cd Merlion
 npm install
-export OPENROUTER_API_KEY=your_key_here
+# 首次运行会交互引导 provider/key/model 配置
 npm run merlion -- --repl
 ```
 
+也可以用环境变量非交互配置：
+
+```bash
+export MERLION_PROVIDER=openrouter   # openrouter | openai | custom
+export MERLION_API_KEY=your_key_here
+export MERLION_MODEL=qwen/qwen3-coder
+export MERLION_BASE_URL=https://openrouter.ai/api/v1
+merlion --repl
+```
+
 ## 常用命令
 
 ```bash

package/dist/cli/markdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/cli/markdown.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,GAAG,OAAO,CAAA;IACtF,IAAI,EAAE,MAAM,CAAA;CACb;AAUD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGvD;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,EAAE,CA8D1E"}
+{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/cli/markdown.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,GAAG,OAAO,CAAA;IACtF,IAAI,EAAE,MAAM,CAAA;CACb;AAsID,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGvD;AA0FD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,EAAE,CAgB1E"}

package/dist/cli/markdown.js

@@ -1,74 +1,225 @@
+import { marked } from 'marked';
 import { sanitizeRenderableText } from "./sanitize.js";
-function normalizeInline(text) {
-    return text
-        .replace(/\[([^\]]+)\]\(([^)]+)\)/g, '$1 <$2>')
-        .replace(/`([^`]+)`/g, '$1')
-        .replace(/\*\*([^*]+)\*\*/g, '$1')
-        .replace(/__([^_]+)__/g, '$1');
+function pushRenderedLines(rendered, kind, text) {
+    const lines = sanitizeRenderableText(text).split('\n');
+    for (const line of lines) {
+        rendered.push({ kind, text: line });
+    }
+}
+function stripHtmlTags(text) {
+    return text.replace(/<[^>]+>/g, '');
+}
+function renderInlineTokens(tokens) {
+    if (!tokens || tokens.length === 0)
+        return '';
+    return tokens.map((token) => renderInlineToken(token)).join('');
+}
+function renderInlineToken(token) {
+    if (token.type === 'text') {
+        const textToken = token;
+        if (textToken.tokens && textToken.tokens.length > 0) {
+            return renderInlineTokens(textToken.tokens);
+        }
+        return sanitizeRenderableText(textToken.text ?? textToken.raw ?? '');
+    }
+    if (token.type === 'codespan') {
+        return sanitizeRenderableText(token.text);
+    }
+    if (token.type === 'strong' || token.type === 'em' || token.type === 'del') {
+        return renderInlineTokens(token.tokens);
+    }
+    if (token.type === 'link') {
+        const link = token;
+        const content = renderInlineTokens(link.tokens).trim();
+        if (content === '' || content === link.href)
+            return sanitizeRenderableText(link.href);
+        return `${content} <${sanitizeRenderableText(link.href)}>`;
+    }
+    if (token.type === 'image') {
+        const image = token;
+        const label = sanitizeRenderableText((image.text ?? '').trim());
+        if (label === '')
+            return `<${sanitizeRenderableText(image.href)}>`;
+        return `${label} <${sanitizeRenderableText(image.href)}>`;
+    }
+    if (token.type === 'escape') {
+        return sanitizeRenderableText(token.text);
+    }
+    if (token.type === 'html') {
+        return sanitizeRenderableText(stripHtmlTags(token.raw ?? ''));
+    }
+    if (token.type === 'br') {
+        return '\n';
+    }
+    return sanitizeRenderableText(token.raw ?? '');
+}
+function renderTable(token) {
+    const headers = token.header.map((cell) => renderInlineTokens(cell.tokens).replace(/\s+/g, ' ').trim());
+    const rows = token.rows.map((row) => row.map((cell) => renderInlineTokens(cell.tokens).replace(/\s+/g, ' ').trim()));
+    const columnCount = Math.max(headers.length, ...rows.map((row) => row.length));
+    const widths = new Array(columnCount).fill(3);
+    for (let i = 0; i < columnCount; i++) {
+        widths[i] = Math.max(widths[i] ?? 3, headers[i]?.length ?? 0, ...rows.map((row) => row[i]?.length ?? 0));
+    }
+    const pad = (value, width) => {
+        if (value.length >= width)
+            return value;
+        return `${value}${' '.repeat(width - value.length)}`;
+    };
+    const formatRow = (cells) => {
+        const values = [];
+        for (let i = 0; i < columnCount; i++) {
+            values.push(pad(cells[i] ?? '', widths[i] ?? 3));
+        }
+        return `| ${values.join(' | ')} |`;
+    };
+    const separator = `| ${widths.map((width) => '-'.repeat(width)).join(' | ')} |`;
+    const lines = [
+        { kind: 'table', text: formatRow(headers) },
+        { kind: 'table', text: separator }
+    ];
+    for (const row of rows) {
+        lines.push({ kind: 'table', text: formatRow(row) });
+    }
+    return lines;
+}
+function renderListItem(item, rendered, depth, orderedNumber) {
+    const nested = [];
+    renderBlockTokens(item.tokens ?? [], nested, depth + 1);
+    const indent = '  '.repeat(depth);
+    const bullet = orderedNumber === undefined ? '•' : `${orderedNumber}.`;
+    if (nested.length === 0) {
+        rendered.push({ kind: 'list', text: `${indent}${bullet}` });
+        return;
+    }
+    const [first, ...rest] = nested;
+    const firstText = first && first.text.trim() !== ''
+        ? `${indent}${bullet} ${first.text}`
+        : `${indent}${bullet}`;
+    rendered.push({ kind: 'list', text: firstText });
+    for (const line of rest) {
+        const continuation = `${indent}  `;
+        if (line.text.trim() === '') {
+            rendered.push({ kind: 'list', text: continuation.trimEnd() });
+            continue;
+        }
+        const kind = line.kind === 'plain' || line.kind === 'list'
+            ? 'list'
+            : line.kind;
+        rendered.push({ kind, text: `${continuation}${line.text}` });
+    }
 }
 export function looksLikeMarkdown(text) {
     if (text.trim() === '')
         return false;
     return /(^|\n)(#{1,6}\s+|[-*+]\s+|\d+\.\s+|>\s+|```|[-*_]{3,}\s*$|\|.+\|)/m.test(text);
 }
-export function renderMarkdownLines(markdown) {
-    const lines = markdown.replace(/\r\n/g, '\n').split('\n');
-    const rendered = [];
-    let inCode = false;
-    let codeLanguage = 'text';
-    for (const line of lines) {
-        const raw = sanitizeRenderableText(line);
-        const fence = raw.trim().match(/^```(\S+)?$/);
-        if (fence) {
-            if (!inCode) {
-                codeLanguage = fence[1] ? sanitizeRenderableText(fence[1]) : 'text';
-                rendered.push({ kind: 'code_meta', text: `code:${codeLanguage}` });
-                inCode = true;
+function renderBlockTokens(tokens, rendered, listDepth) {
+    for (const token of tokens) {
+        if (token.type === 'space') {
+            rendered.push({ kind: 'plain', text: '' });
+            continue;
+        }
+        if (token.type === 'heading') {
+            const heading = token;
+            const text = renderInlineTokens(heading.tokens).trim();
+            rendered.push({ kind: 'heading', text });
+            continue;
+        }
+        if (token.type === 'paragraph') {
+            const paragraph = token;
+            pushRenderedLines(rendered, 'plain', renderInlineTokens(paragraph.tokens));
+            continue;
+        }
+        if (token.type === 'text') {
+            const textToken = token;
+            if (textToken.tokens && textToken.tokens.length > 0) {
+                pushRenderedLines(rendered, 'plain', renderInlineTokens(textToken.tokens));
             }
             else {
-                inCode = false;
-                codeLanguage = 'text';
+                pushRenderedLines(rendered, 'plain', textToken.text);
             }
             continue;
         }
-        if (inCode) {
-            rendered.push({ kind: 'code', text: raw });
+        if (token.type === 'blockquote') {
+            const blockquote = token;
+            const quoted = [];
+            renderBlockTokens(blockquote.tokens ?? [], quoted, listDepth);
+            if (quoted.length === 0) {
+                rendered.push({ kind: 'quote', text: '│' });
+            }
+            else {
+                for (const line of quoted) {
+                    rendered.push({
+                        kind: 'quote',
+                        text: line.text.trim() === '' ? '│' : `│ ${line.text}`
+                    });
+                }
+            }
             continue;
         }
-        if (/^\s*$/.test(raw)) {
-            rendered.push({ kind: 'plain', text: '' });
+        if (token.type === 'list') {
+            const list = token;
+            const start = typeof list.start === 'number'
+                ? list.start
+                : Number.parseInt(String(list.start ?? '1'), 10) || 1;
+            list.items.forEach((item, index) => {
+                const orderedNumber = list.ordered ? start + index : undefined;
+                renderListItem(item, rendered, listDepth, orderedNumber);
+            });
             continue;
         }
-        const heading = raw.match(/^\s*(#{1,6})\s+(.*)$/);
-        if (heading) {
-            const level = heading[1].length;
-            const prefix = '#'.repeat(level);
-            rendered.push({ kind: 'heading', text: `${prefix} ${normalizeInline(heading[2])}` });
+        if (token.type === 'list_item') {
+            renderListItem(token, rendered, listDepth);
             continue;
         }
-        const quote = raw.match(/^\s*>\s?(.*)$/);
-        if (quote) {
-            rendered.push({ kind: 'quote', text: `> ${normalizeInline(quote[1])}` });
+        if (token.type === 'code') {
+            const code = token;
+            const language = sanitizeRenderableText((code.lang ?? '').trim()) || 'text';
+            rendered.push({ kind: 'code_meta', text: `code:${language}` });
+            const body = sanitizeRenderableText(code.text ?? '');
+            const lines = body.split('\n');
+            if (lines.length === 0) {
+                rendered.push({ kind: 'code', text: '' });
+            }
+            else {
+                for (const line of lines)
+                    rendered.push({ kind: 'code', text: line });
+            }
             continue;
         }
-        const list = raw.match(/^\s*([-*+]|\d+\.)\s+(.*)$/);
-        if (list) {
-            rendered.push({ kind: 'list', text: `${list[1]} ${normalizeInline(list[2])}` });
+        if (token.type === 'hr') {
+            rendered.push({ kind: 'rule', text: '────────────────────────' });
             continue;
         }
-        if (/^\s*([-*_])\1\1+\s*$/.test(raw)) {
-            rendered.push({ kind: 'rule', text: '────────────────────────' });
+        if (token.type === 'table') {
+            rendered.push(...renderTable(token));
             continue;
         }
-        if (raw.includes('|') && /\|/.test(raw.trim())) {
-            rendered.push({ kind: 'table', text: normalizeInline(raw) });
+        if (token.type === 'html') {
+            const text = sanitizeRenderableText(stripHtmlTags(token.raw ?? '')).trim();
+            if (text !== '')
+                rendered.push({ kind: 'plain', text });
             continue;
         }
-        rendered.push({ kind: 'plain', text: normalizeInline(raw) });
+        const fallback = sanitizeRenderableText(token.raw ?? '').trim();
+        if (fallback !== '')
+            rendered.push({ kind: 'plain', text: fallback });
+    }
+}
+export function renderMarkdownLines(markdown) {
+    const input = sanitizeRenderableText(markdown.replace(/\r\n/g, '\n'));
+    const rendered = [];
+    try {
+        const tokens = marked.lexer(input);
+        renderBlockTokens(tokens, rendered, 0);
+    }
+    catch {
+        pushRenderedLines(rendered, 'plain', input);
     }
     while (rendered.length > 0) {
         const last = rendered[rendered.length - 1];
-        if (!last || last.kind !== 'plain' || last.text !== '')
+        if (!last || last.text !== '' || (last.kind !== 'plain' && last.kind !== 'list' && last.kind !== 'quote'))
             break;
         rendered.pop();
     }

package/dist/cli/markdown.js.map

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

package/dist/cli/status.js

@@ -39,7 +39,7 @@ export function formatPromptObservabilityLine(snapshot, prompt) {
     const prefixPct = formatPct(prompt.stable_prefix_tokens, prompt.estimated_input_tokens);
     const providerPct = formatPct(cachedTurn, prompt.estimated_input_tokens);
     const parts = [
-        `prompt ~${formatInt(prompt.estimated_input_tokens)} tok`,
+        `prompt ~${formatInt(prompt.estimated_input_tokens)} tok (tools ~${formatInt(prompt.tool_schema_tokens_estimate)})`,
         `roles s ${formatInt(prompt.role_tokens.system)} u ${formatInt(prompt.role_tokens.user)} a ${formatInt(prompt.role_tokens.assistant)} t ${formatInt(prompt.role_tokens.tool)}`,
         `Δroles s ${formatSignedInt(prompt.role_delta_tokens.system)} u ${formatSignedInt(prompt.role_delta_tokens.user)} a ${formatSignedInt(prompt.role_delta_tokens.assistant)} t ${formatSignedInt(prompt.role_delta_tokens.tool)}`,
         `stable ${formatInt(prompt.stable_prefix_tokens)} (${prefixPct})`,

package/dist/cli/status.js.map

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

package/dist/config/store.d.ts

@@ -1,4 +1,6 @@
+export type MerlionProvider = 'openrouter' | 'openai' | 'custom';
 export interface MerlionConfig {
+    provider?: MerlionProvider;
     apiKey?: string;
     model?: string;
     baseURL?: string;
@@ -23,5 +25,10 @@ export declare function writeConfig(config: MerlionConfig): Promise<void>;
  * Each field is taken from the highest-priority source that supplies a
  * non-empty string value.
  */
-export declare function mergeConfig(overrides: Partial<MerlionConfig>, fileConfig: MerlionConfig, defaults: Required<MerlionConfig>): Required<MerlionConfig>;
+export declare function mergeConfig(overrides: Partial<MerlionConfig>, fileConfig: MerlionConfig, defaults: {
+    provider: MerlionProvider;
+    apiKey: string;
+    model: string;
+    baseURL: string;
+}): Required<MerlionConfig>;
 //# sourceMappingURL=store.d.ts.map

package/dist/config/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/config/store.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,kFAAkF;AAClF,wBAAgB,SAAS,IAAI,MAAM,CAIlC;AAED,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED;;;GAGG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC,CAgBzD;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAMtE;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,EACjC,UAAU,EAAE,aAAa,EACzB,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,GAChC,QAAQ,CAAC,aAAa,CAAC,CAMzB"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/config/store.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAEhE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,eAAe,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,kFAAkF;AAClF,wBAAgB,SAAS,IAAI,MAAM,CAIlC;AAED,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED;;;GAGG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC,CAgBzD;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAMtE;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,EACjC,UAAU,EAAE,aAAa,EACzB,QAAQ,EAAE;IAAE,QAAQ,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACtF,QAAQ,CAAC,aAAa,CAAC,CAOzB"}

package/dist/config/store.js

@@ -55,6 +55,7 @@ export async function writeConfig(config) {
  */
 export function mergeConfig(overrides, fileConfig, defaults) {
     return {
+        provider: firstNonEmpty(overrides.provider, fileConfig.provider, defaults.provider),
         apiKey: firstNonEmpty(overrides.apiKey, fileConfig.apiKey, defaults.apiKey),
         model: firstNonEmpty(overrides.model, fileConfig.model, defaults.model),
         baseURL: firstNonEmpty(overrides.baseURL, fileConfig.baseURL, defaults.baseURL)

package/dist/config/store.js.map

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

package/dist/config/wizard.d.ts

@@ -1,5 +1,8 @@
-import { type MerlionConfig } from './store.ts';
-export declare const DEFAULT_MODEL = "google/gemini-2.5-flash-preview";
+import { type MerlionConfig, type MerlionProvider } from './store.ts';
+export declare const DEFAULT_PROVIDER: MerlionProvider;
+export declare const OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1";
+export declare const OPENAI_BASE_URL = "https://api.openai.com/v1";
+export declare const DEFAULT_MODEL = "qwen/qwen3-coder";
 export declare const DEFAULT_BASE_URL = "https://openrouter.ai/api/v1";
 export interface WizardIO {
     /** Prompt the user and return their answer (without the trailing newline). */
@@ -15,6 +18,9 @@ export interface WizardResult {
     ok: boolean;
     config: MerlionConfig;
 }
+export declare function normalizeProvider(value: unknown): MerlionProvider | null;
+export declare function defaultBaseURLForProvider(provider: MerlionProvider): string;
+export declare function defaultModelForProvider(provider: MerlionProvider): string;
 /**
  * Runs the interactive first-run setup wizard.
  *

package/dist/config/wizard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wizard.d.ts","sourceRoot":"","sources":["../../src/config/wizard.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,KAAK,aAAa,EAAE,MAAM,YAAY,CAAA;AAExE,eAAO,MAAM,aAAa,oCAAoC,CAAA;AAC9D,eAAO,MAAM,gBAAgB,iCAAiC,CAAA;AAE9D,MAAM,WAAW,QAAQ;IACvB,8EAA8E;IAC9E,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACzC,yDAAyD;IACzD,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC/C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1B;AAED,6DAA6D;AAC7D,wBAAgB,mBAAmB,IAAI,QAAQ,CA8B9C;AAED,MAAM,WAAW,YAAY;IAC3B,kEAAkE;IAClE,EAAE,EAAE,OAAO,CAAA;IACX,MAAM,EAAE,aAAa,CAAA;CACtB;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,cAAc,GAAE,aAAkB,EAClC,EAAE,GAAE,QAAgC,GACnC,OAAO,CAAC,YAAY,CAAC,CAsCvB"}
+{"version":3,"file":"wizard.d.ts","sourceRoot":"","sources":["../../src/config/wizard.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAA;AAE9F,eAAO,MAAM,gBAAgB,EAAE,eAA8B,CAAA;AAC7D,eAAO,MAAM,mBAAmB,iCAAiC,CAAA;AACjE,eAAO,MAAM,eAAe,8BAA8B,CAAA;AAC1D,eAAO,MAAM,aAAa,qBAAqB,CAAA;AAC/C,eAAO,MAAM,gBAAgB,iCAAsB,CAAA;AAEnD,MAAM,WAAW,QAAQ;IACvB,8EAA8E;IAC9E,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACzC,yDAAyD;IACzD,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC/C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1B;AAED,6DAA6D;AAC7D,wBAAgB,mBAAmB,IAAI,QAAQ,CA8B9C;AAED,MAAM,WAAW,YAAY;IAC3B,kEAAkE;IAClE,EAAE,EAAE,OAAO,CAAA;IACX,MAAM,EAAE,aAAa,CAAA;CACtB;AAgBD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAGxE;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,CAI3E;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,CAGzE;AAWD;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,cAAc,GAAE,aAAkB,EAClC,EAAE,GAAE,QAAgC,GACnC,OAAO,CAAC,YAAY,CAAC,CAsFvB"}