jishushell 0.4.10 → 0.4.17

package/INSTALL-NOTICE

@@ -32,16 +32,14 @@ software bundled with or installed by this product.
               https://github.com/abiosoft/colima/blob/main/LICENSE
     Author  : Abiola Ibrahim
 
-  Nomad v1.11.3+ (>= 1.7.0)
-    URL     : https://github.com/hashicorp/nomad
-    License : Business Source License 1.1 (BSL 1.1)
-              https://github.com/hashicorp/nomad/blob/main/LICENSE
-    Licensor: International Business Machines Corporation (IBM)
-    Work    : Nomad Version 1.7.0 or later. (c) 2024 IBM Corp.
-
-    You, as the operator deploying this software, are the end user of
-    Nomad and are solely responsible for ensuring your use complies with
-    the BSL 1.1 terms, including any restrictions on competitive or
-    commercial use. For licensing details and FAQ, see:
-    https://www.hashicorp.com/license-faq
+  Nomad v1.6.5 (last MPL 2.0 release in the 1.6.x line)
+    URL     : https://github.com/hashicorp/nomad/tree/v1.6.5
+    License : Mozilla Public License 2.0
+              https://github.com/hashicorp/nomad/blob/v1.6.5/LICENSE
+    Author  : HashiCorp, Inc.
+
+    JishuShell pins Nomad to v1.6.5, the final release in the 1.6.x series
+    distributed under MPL 2.0. Nomad 1.6.6 and later (including 1.7.0+) are
+    licensed under the Business Source License 1.1 (BSL 1.1) and are not
+    used by JishuShell.
 

package/dist/cli/app.d.ts

@@ -0,0 +1,3 @@
+export declare function run(rest: string[]): Promise<void>;
+export declare function brief(): string;
+export declare function printHelp(): void;

package/dist/cli/app.js

@@ -0,0 +1,156 @@
+import { existsSync, readFileSync } from "fs";
+// ── ANSI colour helpers ───────────────────────────────────────────────────
+const isTTY = process.stdout.isTTY ?? false;
+const c = {
+    bold: (s) => isTTY ? `\x1b[1m${s}\x1b[0m` : s,
+    green: (s) => isTTY ? `\x1b[32m${s}\x1b[0m` : s,
+    red: (s) => isTTY ? `\x1b[31m${s}\x1b[0m` : s,
+    cyan: (s) => isTTY ? `\x1b[36m${s}\x1b[0m` : s,
+    dim: (s) => isTTY ? `\x1b[2m${s}\x1b[0m` : s,
+};
+function log(msg) { process.stdout.write(msg + "\n"); }
+// ── Command implementations ───────────────────────────────────────────────
+async function cmdList(args) {
+    const { listApps } = await import("../services/app-manager.js");
+    const apps = listApps();
+    if (args.includes("--json")) {
+        console.log(JSON.stringify(apps.map(a => ({
+            id: a.spec.id, name: a.spec.name, version: a.spec.version,
+            task_count: a.spec.tasks.length, installed_at: a.manifest.installed_at,
+        })), null, 2));
+        return;
+    }
+    log("");
+    log(c.bold("  Installed Apps"));
+    log(c.dim("  ─────────────────────────────────────────────────────"));
+    if (apps.length === 0) {
+        log(c.dim("  (no apps installed)"));
+    }
+    else {
+        for (const a of apps) {
+            log(`  ${c.cyan(a.spec.id.padEnd(30))}  ${(a.spec.version || "").padEnd(10)}  ${c.dim(a.spec.name || "")}`);
+        }
+    }
+    log("");
+}
+async function cmdShow(id) {
+    const { getApp } = await import("../services/app-manager.js");
+    const app = getApp(id);
+    if (!app) {
+        log(c.red(`  ✗  App "${id}" not found.`));
+        process.exitCode = 1;
+        return;
+    }
+    console.log(JSON.stringify(app, null, 2));
+}
+async function cmdInstall(yamlPath) {
+    if (!existsSync(yamlPath)) {
+        log(c.red(`  ✗  File not found: ${yamlPath}`));
+        process.exitCode = 1;
+        return;
+    }
+    const yamlText = readFileSync(yamlPath, "utf-8");
+    const { installApp } = await import("../services/app-manager.js");
+    const result = await installApp(yamlText);
+    log(c.green(`  ✓  Installed app: ${result.spec.id} (${result.spec.name || ""} v${result.spec.version || "?"})`));
+}
+async function cmdUninstall(id) {
+    const { uninstallApp, getApp } = await import("../services/app-manager.js");
+    if (!getApp(id)) {
+        log(c.red(`  ✗  App "${id}" not found.`));
+        process.exitCode = 1;
+        return;
+    }
+    uninstallApp(id);
+    log(c.green(`  ✓  Uninstalled app: ${id}`));
+}
+async function cmdCreateInstance(appId, instanceId, name) {
+    const { getApp, resolveRequires } = await import("../services/app-manager.js");
+    const { createInstance } = await import("../services/instance-manager.js");
+    const appData = getApp(appId);
+    if (!appData) {
+        log(c.red(`  ✗  App "${appId}" not found.`));
+        process.exitCode = 1;
+        return;
+    }
+    let resolvedEnv = {};
+    try {
+        resolvedEnv = resolveRequires(appData.spec);
+    }
+    catch (e) {
+        log(c.red(`  ✗  ${e.message}`));
+        process.exitCode = 1;
+        return;
+    }
+    const specWithEnv = Object.keys(resolvedEnv).length > 0
+        ? {
+            ...appData.spec,
+            tasks: appData.spec.tasks.map((t) => t.role === "service" ? { ...t, env: { ...t.env, ...resolvedEnv } } : t),
+        }
+        : appData.spec;
+    await createInstance(instanceId, name, "", undefined, undefined, specWithEnv);
+    log(c.green(`  ✓  Created instance "${instanceId}" from app "${appId}"`));
+}
+// ── Entry point ───────────────────────────────────────────────────────────
+export async function run(rest) {
+    const appCmd = rest[0];
+    try {
+        if (appCmd === "list") {
+            await cmdList(rest.slice(1));
+        }
+        else if (appCmd === "show" && rest[1]) {
+            await cmdShow(rest[1]);
+        }
+        else if (appCmd === "install" && rest[1]) {
+            await cmdInstall(rest[1]);
+        }
+        else if (appCmd === "uninstall" && rest[1]) {
+            await cmdUninstall(rest[1]);
+        }
+        else if (appCmd === "create-instance" && rest[1]) {
+            const appId = rest[1];
+            const instanceId = rest[2];
+            const name = rest[3] || instanceId;
+            if (!instanceId) {
+                console.error("Usage: jishushell app create-instance <app-id> <instance-id> [name]");
+                process.exit(1);
+            }
+            await cmdCreateInstance(appId, instanceId, name);
+        }
+        else if (appCmd === "help" || appCmd === "--help" || appCmd === "-h") {
+            printHelp();
+        }
+        else {
+            printHelp();
+            if (appCmd)
+                process.exit(1);
+        }
+    }
+    catch (err) {
+        log(c.red(`  ✗  ${err.message}`));
+        process.exitCode = 1;
+    }
+}
+export function brief() {
+    return "  app <install|list|show|uninstall|create-instance>   App Spec 管理";
+}
+export function printHelp() {
+    console.log(`
+Usage: jishushell app <command> [options]
+
+Commands:
+  list [--json]                              列出已安装的 App
+  show <app-id>                              查看 App 详情（JSON）
+  install <yaml-file>                        从 YAML 文件安装 App
+  uninstall <app-id>                         卸载 App
+  create-instance <app-id> <inst-id> [name]  从 App 创建实例
+  help                                       显示此帮助
+
+Examples:
+  jishushell app install ./my-app.yaml
+  jishushell app create-instance my-app inst1 "My Instance"
+  jishushell app list
+  jishushell app show my-app
+`);
+}
+//# sourceMappingURL=app.js.map

package/dist/cli/app.js.map

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

package/dist/{doctor.d.ts → cli/doctor.d.ts}

@@ -6,7 +6,7 @@
  *   jishushell doctor --fix    检查并尝试自动修复
  *
  * Nomad 检查依据 install/jishu-install.sh 及 src/services/setup-manager.ts：
- *   - 二进制路径: ~/.jishushell/bin/nomad  (v1.11.3)
+ *   - 二进制路径: ~/.jishushell/bin/nomad  (v1.6.5)
  *   - 配置文件:   ~/.jishushell/nomad/nomad.hcl
  *   - 数据目录:   ~/.jishushell/nomad/data/
  *   - Alloc 目录: ~/.jishushell/nomad/data/alloc/
@@ -38,9 +38,14 @@ export interface DoctorCheck {
 }
 export interface DoctorOptions {
     fix?: boolean;
+    ai?: boolean;
 }
 export declare const ALL_CHECKS: DoctorCheck[];
 /**
  * 运行所有诊断检查，返回是否全部 error 级别检查通过。
  */
 export declare function runDoctorChecks(opts?: DoctorOptions): Promise<boolean>;
+export declare function brief(): string;
+export declare function printHelp(): void;
+export declare function runAiDiagnosis(): Promise<void>;
+export declare function run(rest: string[]): Promise<void>;

package/dist/{doctor.js → cli/doctor.js}

@@ -6,7 +6,7 @@
  *   jishushell doctor --fix    检查并尝试自动修复
  *
  * Nomad 检查依据 install/jishu-install.sh 及 src/services/setup-manager.ts：
- *   - 二进制路径: ~/.jishushell/bin/nomad  (v1.11.3)
+ *   - 二进制路径: ~/.jishushell/bin/nomad  (v1.6.5)
  *   - 配置文件:   ~/.jishushell/nomad/nomad.hcl
  *   - 数据目录:   ~/.jishushell/nomad/data/
  *   - Alloc 目录: ~/.jishushell/nomad/data/alloc/
@@ -21,9 +21,10 @@ import { existsSync, readFileSync, unlinkSync, } from "fs";
 import * as http from "http";
 import { homedir } from "os";
 import { join } from "path";
-import { AUTH_FILE, INSTANCES_DIR, JISHUSHELL_HOME, PANEL_CONFIG_FILE, ensureDirs, getNomadToken, getPanelConfig, } from "./config.js";
-import { loadNomadToken } from "./services/setup-manager.js";
-import { ensureDirContainer, writeConfigFile, writeSecretFile } from "./utils/fs.js";
+import { AUTH_FILE, DEFAULT_OPENCLAW_DOCKER_IMAGE, INSTANCES_DIR, JISHUSHELL_HOME, PANEL_CONFIG_FILE, ensureDirs, getNomadToken, getPanelConfig, } from "../config.js";
+import { loadNomadToken } from "../services/setup-manager.js";
+import { ensureDirContainer, writeConfigFile, writeSecretFile } from "../utils/fs.js";
+import { LOG_FILE as PANEL_LOG_FILE } from "../services/panel-manager.js";
 // ── ANSI 颜色（非 TTY 时自动禁用）──────────────────────────────────────────
 const isTTY = process.stdout.isTTY ?? false;
 const c = {
@@ -103,7 +104,7 @@ const NOMAD_DATA_DIR = join(NOMAD_DIR, "data");
 const NOMAD_ALLOC_DIR = join(NOMAD_DIR, "data", "alloc");
 const NOMAD_LOG = join(NOMAD_DIR, "nomad.log");
 const NOMAD_SERVICE = "/etc/systemd/system/nomad.service";
-const NOMAD_MIN_VER = "1.11.3";
+const NOMAD_MIN_VER = "1.6.5";
 function nomadEnabled() {
     return getPanelConfig().service_manager === "nomad";
 }
@@ -488,7 +489,7 @@ const checkSystemdEnabled = {
  * 检查 Nomad 二进制（~/.jishushell/bin/nomad）
  * 依据: install/jishu-install.sh _install_nomad_binary()
  * 安装路径: JISHUSHELL_BIN_DIR=${JISHUSHELL_HOME}/bin/nomad
- * 要求版本: NOMAD_VERSION=1.11.3
+ * 要求版本: NOMAD_VERSION=1.6.5
  */
 const checkNomadBin = {
     id: "nomad-bin", label: "Nomad 二进制", category: "Nomad", severity: "error",
@@ -780,25 +781,43 @@ const checkNomadJobs = {
 // 类别: AI 组件
 // ════════════════════════════════════════════════════════════════════════════
 const checkOpenclawPkg = {
-    id: "openclaw-pkg", label: "OpenClaw 包", category: "AI 组件", severity: "warning",
+    id: "openclaw-pkg", label: "OpenClaw 运行时", category: "AI 组件", severity: "warning",
     async check() {
         const oclawBin = join(JISHUSHELL_HOME, "packages/openclaw/bin/openclaw");
-        const oclawPkg = join(JISHUSHELL_HOME, "packages/openclaw/lib/node_modules/openclaw/package.json");
-        if (!existsSync(oclawBin))
-            return { ok: false, detail: "OpenClaw 未安装", hint: "jishushell install --skip-nomad --skip-docker", fixable: false };
+        const oclawPkgJson = join(JISHUSHELL_HOME, "packages/openclaw/lib/node_modules/openclaw/package.json");
+        const localBinOk = existsSync(oclawBin);
+        // Docker 镜像也是合法的运行时（与 setup-manager 逻辑一致）
+        const imageTag = getPanelConfig().openclaw_image || DEFAULT_OPENCLAW_DOCKER_IMAGE;
+        let dockerImageOk = false;
         try {
-            const pkg = JSON.parse(readFileSync(oclawPkg, "utf-8"));
-            return { ok: true, detail: `v${pkg.version}` };
+            execFileSync("docker", ["image", "inspect", imageTag], { stdio: "ignore", timeout: 5000 });
+            dockerImageOk = true;
         }
         catch {
-            return { ok: true, detail: "已安装（版本信息不可读）" };
+            try {
+                execFileSync("sudo", ["-n", "docker", "image", "inspect", imageTag], { stdio: "ignore", timeout: 5000 });
+                dockerImageOk = true;
+            }
+            catch { }
+        }
+        if (localBinOk) {
+            let ver = "已安装";
+            try {
+                ver = `v${JSON.parse(readFileSync(oclawPkgJson, "utf-8")).version}`;
+            }
+            catch { }
+            return { ok: true, detail: `本地包 ${ver}${dockerImageOk ? "，Docker 镜像已就绪" : ""}` };
+        }
+        if (dockerImageOk) {
+            return { ok: true, detail: `Docker 镜像已就绪（${imageTag}）` };
         }
+        return { ok: false, detail: "未安装（本地包与 Docker 镜像均缺失）", hint: "jishushell install", fixable: false };
     },
 };
 const checkOpenclawImage = {
     id: "openclaw-image", label: "OpenClaw Docker 镜像", category: "AI 组件", severity: "warning",
     async check() {
-        const imageTag = getPanelConfig().openclaw_image || "openclaw:v1.0";
+        const imageTag = getPanelConfig().openclaw_image || DEFAULT_OPENCLAW_DOCKER_IMAGE;
         let dockerAccessible = false;
         try {
             execFileSync("docker", ["info"], { stdio: "ignore", timeout: 4000 });
@@ -967,4 +986,314 @@ export async function runDoctorChecks(opts = {}) {
     log("");
     return errors.length === 0;
 }
+// ── CLI entry ──────────────────────────────────────────────────────────────
+export function brief() {
+    return "  doctor [--fix] [--ai]                           环境诊断、自动修复与 AI 分析";
+}
+export function printHelp() {
+    console.log(`
+Usage: jishushell doctor [options]
+
+Options:
+  --fix    尝试自动修复发现的问题
+  --ai     将诊断结果发给 LLM 进行智能分析（需配置 LLM provider）
+  help     显示此帮助
+`);
+}
+// ════════════════════════════════════════════════════════════════════════════
+// AI 诊断
+// ════════════════════════════════════════════════════════════════════════════
+/** Strip ANSI escape codes from a string. */
+function stripAnsi(s) {
+    // eslint-disable-next-line no-control-regex
+    return s.replace(/\x1b\[[0-9;]*m/g, "");
+}
+/** Silently run all checks and return a plain-text report (no ANSI). */
+async function collectDoctorReport() {
+    const categories = [...new Set(ALL_CHECKS.map((ch) => ch.category))];
+    const lines = ["=== JishuShell Doctor Report ===", ""];
+    for (const category of categories) {
+        lines.push(`[${category}]`);
+        for (const check of ALL_CHECKS.filter((ch) => ch.category === category)) {
+            const result = await check.check();
+            const status = result.ok ? "OK" : check.severity === "error" ? "ERROR" : "WARN";
+            lines.push(`  ${status}  ${check.label}: ${result.detail}`);
+            if (!result.ok && result.hint)
+                lines.push(`    hint: ${result.hint}`);
+        }
+        lines.push("");
+    }
+    return lines.join("\n");
+}
+/** Read the tail of a log file (plain text, no ANSI). */
+function tailFile(path, lines = 80) {
+    if (!existsSync(path))
+        return "";
+    try {
+        const content = readFileSync(path, "utf-8");
+        const tail = content.split("\n").slice(-lines).join("\n");
+        return stripAnsi(tail);
+    }
+    catch {
+        return "";
+    }
+}
+/** Collect journalctl output for a service (best-effort). */
+function journalTail(service, lines = 60) {
+    try {
+        return execSync(`journalctl -u ${service} -n ${lines} --no-pager 2>/dev/null`, {
+            encoding: "utf-8", timeout: 5000,
+        }).trim();
+    }
+    catch {
+        return "";
+    }
+}
+/** Collect instance status + recent logs for all local instances. */
+async function collectInstanceContext() {
+    const { listInstanceIds, readInstanceMeta, getSvc } = await import("../services/job-manager.js");
+    loadNomadToken();
+    const ids = listInstanceIds();
+    if (ids.length === 0)
+        return "No instances.";
+    const sections = [];
+    let svc = null;
+    try {
+        svc = await getSvc();
+    }
+    catch { /* Nomad not available */ }
+    for (const id of ids) {
+        const meta = readInstanceMeta(id);
+        const name = meta?.name || id;
+        const header = `--- Instance: ${name} (${id}) ---`;
+        const lines = [header];
+        // Status
+        if (svc) {
+            try {
+                const st = await svc.getStatus(id);
+                lines.push(`status: ${st.status}`);
+            }
+            catch (e) {
+                lines.push(`status: unavailable (${e.message})`);
+            }
+            // Logs (stderr first, then stdout)
+            for (const logType of ["stderr", "stdout"]) {
+                try {
+                    const logLines = await svc.getLogs(id, 60, logType);
+                    if (logLines.length > 0) {
+                        lines.push(`\n[${logType} tail]`);
+                        lines.push(...logLines.slice(-60));
+                    }
+                }
+                catch { /* skip */ }
+            }
+        }
+        else {
+            lines.push("status: Nomad unavailable");
+        }
+        sections.push(lines.join("\n"));
+    }
+    return sections.join("\n\n");
+}
+/** Build the full context string to send to the LLM. */
+async function buildAiContext() {
+    const parts = [];
+    // 1. Doctor checks
+    log(c.dim("  ✦ 收集诊断检查结果…"));
+    parts.push(await collectDoctorReport());
+    // 2. Panel log
+    log(c.dim("  ✦ 收集面板日志…"));
+    const panelLog = tailFile(PANEL_LOG_FILE, 80);
+    if (panelLog) {
+        parts.push(`=== Panel Log (${PANEL_LOG_FILE}) ===\n${panelLog}`);
+    }
+    // 3. Panel journalctl
+    const jLogs = journalTail("jishushell", 60);
+    if (jLogs) {
+        parts.push(`=== journalctl jishushell (last 60 lines) ===\n${jLogs}`);
+    }
+    // 4. Nomad log
+    const nomadLog = join(JISHUSHELL_HOME, "nomad", "nomad.log");
+    const nLog = tailFile(nomadLog, 60);
+    if (nLog) {
+        parts.push(`=== Nomad Log (${nomadLog}) ===\n${nLog}`);
+    }
+    // 5. Instance context
+    log(c.dim("  ✦ 收集实例状态与日志…"));
+    try {
+        const instCtx = await collectInstanceContext();
+        parts.push(`=== Instance Status & Logs ===\n${instCtx}`);
+    }
+    catch (e) {
+        parts.push(`=== Instance Status & Logs ===\nError collecting: ${e.message}`);
+    }
+    return parts.join("\n\n");
+}
+/** Validate that a usable LLM provider exists and return it (or null). */
+async function getDefaultProvider() {
+    const { decryptApiKey } = await import("../services/llm-proxy/encryption.js");
+    const config = getPanelConfig();
+    const providers = Array.isArray(config.providers) ? config.providers : [];
+    const dp = config.default_provider;
+    if (providers.length === 0 && dp && !dp.skipped) {
+        return {
+            id: dp.providerId || "default",
+            baseUrl: dp.baseUrl || "",
+            api: dp.api || "openai",
+            apiKey: dp.apiKey ? (() => { try {
+                return decryptApiKey(dp.apiKey);
+            }
+            catch {
+                return "";
+            } })() : undefined,
+            authHeader: dp.authHeader,
+            models: dp.models,
+            selectedModelId: dp.selectedModelId,
+        };
+    }
+    const provider = providers.find((p) => p.isDefault) || providers[0];
+    if (!provider)
+        return null;
+    return {
+        id: provider.id,
+        baseUrl: provider.baseUrl,
+        api: provider.api || "openai",
+        apiKey: provider.apiKey ? (() => { try {
+            return decryptApiKey(provider.apiKey);
+        }
+        catch {
+            return "";
+        } })() : undefined,
+        authHeader: provider.authHeader,
+        models: provider.models,
+        selectedModelId: provider.selectedModelId,
+    };
+}
+const AI_SYSTEM_PROMPT = `你是 JishuShell 的智能运维助手。
+JishuShell 是一个用于管理 OpenClaw（AI Agent 运行时）实例的面板，运行在 Linux/ARM 设备上，依赖 Docker 和 Nomad 进行容器编排。
+
+用户将提供系统诊断报告、日志和实例状态。
+你的任务：
+1. 识别所有异常项（ERROR/WARN）并解释可能的根本原因
+2. 按优先级给出具体的修复建议（优先 jishushell 命令，其次 shell 命令）
+3. 如果日志中有明显错误，指出具体错误行和含义
+4. 用中文回复，保持简洁，使用 Markdown 格式`;
+export async function runAiDiagnosis() {
+    log("");
+    log(c.bold(c.cyan("  JishuShell Doctor — AI 模式")));
+    log(c.dim("  ────────────────────────────────────────────────"));
+    log("");
+    // 1. Check that a provider exists
+    let provider;
+    try {
+        provider = await getDefaultProvider();
+    }
+    catch (e) {
+        log(c.red("  ✗ 无法加载 LLM 配置: " + e.message));
+        log(c.dim("  请先运行: jishushell llm add <id> --url <url> --key <key>"));
+        log("");
+        process.exit(1);
+    }
+    if (!provider) {
+        log(c.red("  ✗ 未配置任何 LLM provider，无法使用 --ai 模式"));
+        log("");
+        log(c.dim("  请先配置供应商，然后重新运行:"));
+        log(c.dim("    jishushell llm add <id> --url <url> --key <key>"));
+        log(c.dim("    或在 Web 界面「设置 → 模型供应商」中添加"));
+        log("");
+        process.exit(1);
+    }
+    const model = provider.selectedModelId
+        || (Array.isArray(provider.models) && provider.models[0]?.id)
+        || undefined;
+    if (!model) {
+        log(c.yellow(`  ! Provider '${provider.id}' 未配置默认模型`));
+        log(c.dim(`    请运行: jishushell llm update ${provider.id} --model <model-id>`));
+        log("");
+        process.exit(1);
+    }
+    log(c.dim(`  使用 provider: ${provider.id}  模型: ${model}`));
+    log("");
+    // 2. Collect context
+    log(c.bold("  ▸ 收集系统信息…"));
+    const context = await buildAiContext();
+    log("");
+    // 3. Call LLM
+    log(c.bold("  ▸ 发送给 AI 分析（请稍候…）"));
+    log("");
+    const apiKey = provider.apiKey || "";
+    const baseUrl = provider.baseUrl.replace(/\/$/, "");
+    const authHeader = (typeof provider.authHeader === "string" && provider.authHeader)
+        ? provider.authHeader : "Authorization";
+    const userMessage = `以下是 JishuShell 的系统诊断信息，请分析问题并给出修复建议：\n\n${context}`;
+    const body = {
+        model,
+        messages: [
+            { role: "system", content: AI_SYSTEM_PROMPT },
+            { role: "user", content: userMessage },
+        ],
+        stream: false,
+    };
+    const endpoints = [`${baseUrl}/v1/chat/completions`, `${baseUrl}/chat/completions`];
+    let lastErr = "";
+    for (const url of endpoints) {
+        try {
+            const resp = await fetch(url, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    [authHeader]: `Bearer ${apiKey}`,
+                },
+                body: JSON.stringify(body),
+                signal: AbortSignal.timeout(120_000),
+            });
+            if (resp.ok) {
+                const data = await resp.json();
+                const content = data?.choices?.[0]?.message?.content ?? "";
+                const usage = data?.usage;
+                log(c.bold(c.cyan("  ═══════════════════════════════════════════════")));
+                log(c.bold("  AI 诊断结果"));
+                log(c.bold(c.cyan("  ═══════════════════════════════════════════════")));
+                log("");
+                // Print result with light indentation
+                for (const line of content.split("\n")) {
+                    log("  " + line);
+                }
+                log("");
+                log(c.bold(c.cyan("  ═══════════════════════════════════════════════")));
+                if (usage) {
+                    log(c.dim(`  [${provider.id} / ${model}  tokens: ${usage.total_tokens ?? "?"}]`));
+                }
+                log("");
+                return;
+            }
+            else {
+                const text = await resp.text().catch(() => "");
+                lastErr = `HTTP ${resp.status}: ${text.slice(0, 300)}`;
+            }
+        }
+        catch (e) {
+            lastErr = e.message;
+        }
+    }
+    log(c.red(`  ✗ AI 请求失败 (${provider.id}): ${lastErr}`));
+    log(c.dim("  请检查 LLM provider 配置是否正确，或使用 --fix 尝试自动修复。"));
+    log("");
+    process.exit(1);
+}
+export async function run(rest) {
+    if (rest.includes("help") || rest.includes("--help") || rest.includes("-h")) {
+        printHelp();
+        return;
+    }
+    if (rest.includes("--ai")) {
+        // Run standard doctor first (to stdout), then AI analysis
+        await runDoctorChecks({ fix: false });
+        await runAiDiagnosis();
+        return;
+    }
+    const fix = rest.includes("--fix") || rest.includes("-f");
+    const ok = await runDoctorChecks({ fix });
+    process.exit(ok ? 0 : 1);
+}
 //# sourceMappingURL=doctor.js.map