@luckypiggy/zhihu-ai-cli 0.1.0-test.1 → 0.2.1-test.4

package/dist/install.js

@@ -4,14 +4,132 @@ import { homedir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
 import { lstatSync } from "node:fs";
 import { ConfigError, DEFAULT_PROFILE, captureProfileInstallSnapshot, normalizeProfileName, guardProfileConnectionChange, readProfileRaw, ProfileConnectionGuardError, restoreProfileInstallSnapshot, validateProfile, writeProfileInstallConfig, } from "./config.js";
-import { ProfileLock, ProfileLockError, withProfileLock } from "./profile-lock.js";
+import { ProfileLock, ProfileLockCancelledError, ProfileLockError, withProfileLock } from "./profile-lock.js";
 import { IntegrationHttpClient, HttpError, validateIntegrationInfo, } from "./http.js";
 import { AuthService } from "./auth-service.js";
 import { SecureCredentialStore } from "./credentials.js";
 import { installCodexSkill, resolveCodexSkillTarget, CodexSkillError, CODEX_SKILL_NAME, } from "./codex-skill.js";
 import { CliAuthError, mapFailure } from "./token-manager.js";
+import { CLI_RUNNER } from "./release.js";
+import { promptTerminalCredentials, TerminalPromptCancelledError, TerminalPromptInteractiveRequiredError } from "./terminal-prompt.js";
 const MAX_CA_BUNDLE_BYTES = 4 * 1024 * 1024;
 const CONTROL_PATTERN = /[\u0000-\u001f\u007f]/;
+const MESSAGES = {
+    en: {
+        languagePrompt: "Language / 语言 (zh-CN/en)",
+        profilePrompt: "Profile name (ZHIHU_PROFILE)",
+        baseUrlPrompt: "Zhihu Pilot base URL (ZHIHU_BASE_URL)",
+        advancedPrompt: "Configure advanced settings? (y/N)",
+        usernamePrompt: "Zhihu username",
+        tenantPrompt: "Tenant id (optional)",
+        captchaPrompt: "Captcha verification (optional)",
+        passwordPrompt: "Zhihu password: ",
+        caPrompt: "CA bundle path (optional)",
+        timeoutPrompt: "Request timeout in seconds",
+        overwritePrompt: "Overwrite the existing profile? (y/N)",
+        required: "A value is required. Please try again.",
+        invalidInput: "Input is too long or contains control characters. Please try again.",
+        skillInstalled: "Codex Skill installed. You can rerun the same install command if setup needs to be retried.",
+        skillUpdated: "Codex Skill updated. You can rerun the same install command if setup needs to be retried.",
+        skillUnchanged: "Codex Skill is already installed. You can rerun the same install command safely.",
+        cancelled: "Installation cancelled; you can rerun the same install command.",
+    },
+    zh: {
+        languagePrompt: "语言 / Language（zh-CN/en）",
+        profilePrompt: "Profile 名称（ZHIHU_PROFILE）",
+        baseUrlPrompt: "智护 Pilot 地址（ZHIHU_BASE_URL）",
+        advancedPrompt: "进入高级设置？（y/N）",
+        usernamePrompt: "智护用户名",
+        tenantPrompt: "租户 ID（可留空）",
+        captchaPrompt: "验证码（可留空）",
+        passwordPrompt: "智护密码：",
+        caPrompt: "CA bundle 路径（可留空）",
+        timeoutPrompt: "请求超时秒数",
+        overwritePrompt: "覆盖已有 Profile？（y/N）",
+        required: "此项不能为空，请重试。",
+        invalidInput: "输入过长或包含控制字符，请重试。",
+        skillInstalled: "Codex Skill 已安装；如需重试配置，可再次运行相同的安装命令。",
+        skillUpdated: "Codex Skill 已更新；如需重试配置，可再次运行相同的安装命令。",
+        skillUnchanged: "Codex Skill 已安装，可安全地再次运行相同的安装命令。",
+        cancelled: "安装已取消，可重新运行相同安装命令。",
+    },
+};
+function wizardMessages(language) {
+    return MESSAGES[language ?? "en"];
+}
+function languageAnswer(value) {
+    const normalized = value.trim().toLowerCase();
+    if (["zh", "zh-cn", "1", "中文", "中文（简体）", "中文(简体)"].includes(normalized))
+        return "zh";
+    if (["en", "english", "2", "英文"].includes(normalized))
+        return "en";
+    return undefined;
+}
+function yesAnswer(value) {
+    return /^(?:y|yes|是|好|1)$/i.test(value.trim());
+}
+export function localizedInstallMessage(code, language, message) {
+    const zh = language === "zh";
+    switch (code) {
+        case "SERVICE_CONFIGURATION_REQUIRED":
+            return zh
+                ? "智护服务尚未配置 CLI OAuth。请联系智护 Pilot 管理员完成服务端 CLI OAuth 配置后，再次运行相同的安装命令。"
+                : "The Pilot service is not configured for CLI OAuth. Ask a Pilot administrator to finish the server-side CLI OAuth configuration, then rerun the same install command.";
+        case "VERSION_INCOMPATIBLE":
+            return zh
+                ? "当前智护服务与 CLI 版本不兼容。请联系管理员确认服务版本，或使用匹配的 CLI 后重试。"
+                : "The configured Pilot service is not compatible with this CLI. Ask an administrator to confirm the service version, then retry with a matching CLI.";
+        case "TERMINAL_LOGIN_REQUIRED":
+            return zh
+                ? "当前智护仍提供旧版浏览器 OAuth。请升级或启用终端登录后，再次运行安装命令。"
+                : "This Pilot still exposes legacy browser OAuth. Upgrade or enable terminal login, then rerun the install command.";
+        case "INTERACTIVE_REQUIRED":
+            return zh
+                ? "登录需要交互式终端输入；如只配置 Skill，请使用 --skip-login。"
+                : "Login requires an interactive terminal. Use --skip-login for configuration-only setup.";
+        case "AUTH_LOGIN_FAILED":
+            return zh
+                ? "智护登录失败，请核对用户名和密码后重试。"
+                : "Zhihu login was rejected. Check the username and password and try again.";
+        case "AUTH_ACCOUNT_LOCKED":
+            return zh
+                ? "智护账号暂时被锁定，请稍后重试或联系管理员。"
+                : "Zhihu login is temporarily locked. Try again later or contact an administrator.";
+        case "AUTH_CAPTCHA_REQUIRED":
+            return zh
+                ? "智护登录需要验证码，请完成验证后重试。"
+                : "Zhihu login requires captcha verification. Complete the challenge and try again.";
+        case "NETWORK_ERROR":
+            return zh
+                ? "无法连接智护服务，请检查地址和网络后再次运行相同的安装命令。"
+                : "The Pilot service could not be reached. Check the address and network, then rerun the same install command.";
+        case "TIMEOUT":
+            return zh
+                ? "连接智护服务超时，请检查地址和网络后再次运行相同的安装命令。"
+                : "The Pilot service timed out. Check the address and network, then rerun the same install command.";
+        case "USER_CANCELLED":
+            return wizardMessages(language).cancelled;
+        case "CONFIG_EXISTS":
+            return zh
+                ? `${message}；如需替换，请确认覆盖或使用 --force，然后再次运行相同的安装命令。`
+                : `${message}. Confirm the overwrite or use --force, then rerun the same install command.`;
+        case "AUTH_ALREADY_LOGGED_IN":
+        case "CREDENTIAL_STORE_UNAVAILABLE":
+            return zh
+                ? `${message}。请先执行 ${CLI_RUNNER} auth logout，或使用新的 Profile，再重试。`
+                : `${message}. Run ${CLI_RUNNER} auth logout first, or use a new Profile, then retry.`;
+        default:
+            return message;
+    }
+}
+function localizeInstallError(error, language) {
+    if (!language || !(error instanceof InstallError))
+        return error;
+    const message = localizedInstallMessage(error.code, language, error.message);
+    if (message === error.message)
+        return error;
+    return new InstallError(error.code, message, { retryable: error.retryable, exitCode: error.exitCode });
+}
 export class InstallError extends Error {
     code;
     retryable;
@@ -27,6 +145,10 @@ export class InstallError extends Error {
 function fail(code, message, exitCode = 2) {
     throw new InstallError(code, message, { exitCode });
 }
+function throwIfAborted(signal) {
+    if (signal?.aborted)
+        fail("USER_CANCELLED", "Installation cancelled / 安装已取消");
+}
 function normalizeLanguage(value) {
     if (value === undefined)
         return DEFAULT_PROFILE.language;
@@ -47,19 +169,11 @@ function normalizeTimeout(value) {
     }
     return timeout;
 }
-function normalizeAuthMode(value) {
-    if (value === undefined || value === "")
-        return "browser";
-    if (value !== "browser") {
-        fail("INVALID_ARGUMENT", "ZHIHU_AUTH_MODE/--auth-mode must be browser");
-    }
-    return "browser";
-}
 /**
  * Environment configuration is deliberately limited to non-sensitive values.
  * Empty (or whitespace-only) values are treated as unset so an interactive
- * prompt/default can still be used.  Do not add token/username/password
- * fallbacks here: browser OAuth is the only supported authentication path.
+ * prompt/default can still be used. Passwords are intentionally excluded;
+ * there is no ZHIHU_PASSWORD fallback and no .env loading.
  */
 function nonEmptyEnvironmentValue(environment, name) {
     const value = environment[name];
@@ -106,30 +220,72 @@ function interactiveEnabled(inputValue, inputStream, outputStream) {
     return Boolean(inputStream.isTTY
         && outputStream.isTTY);
 }
-async function promptValue(rl, label, defaultValue, required = false, outputStream = output) {
+async function promptValue(rl, label, defaultValue, required = false, outputStream = output, messages = MESSAGES.en, signal) {
     for (let attempt = 0; attempt < 3; attempt += 1) {
         let answer;
         try {
-            answer = (await rl.question(`${label}${defaultValue === undefined ? "" : ` [${defaultValue}]`}: `)).trim();
+            const prompt = `${label}${defaultValue === undefined ? "" : ` [${defaultValue}]`}: `;
+            const inputStream = rl.input;
+            let removeCancellationListeners = () => { };
+            const cancellation = inputStream
+                ? new Promise((_resolve, reject) => {
+                    let cancelled = false;
+                    const cancel = () => {
+                        if (cancelled)
+                            return;
+                        cancelled = true;
+                        reject(new Error("interactive input closed"));
+                    };
+                    inputStream.once?.("end", cancel);
+                    inputStream.once?.("close", cancel);
+                    signal?.addEventListener("abort", cancel, { once: true });
+                    if (signal?.aborted)
+                        cancel();
+                    removeCancellationListeners = () => {
+                        inputStream.removeListener?.("end", cancel);
+                        inputStream.removeListener?.("close", cancel);
+                        signal?.removeEventListener("abort", cancel);
+                    };
+                })
+                : new Promise((_resolve, reject) => {
+                    const cancel = () => reject(new Error("installation cancelled"));
+                    signal?.addEventListener("abort", cancel, { once: true });
+                    if (signal?.aborted)
+                        cancel();
+                    removeCancellationListeners = () => signal?.removeEventListener("abort", cancel);
+                });
+            try {
+                answer = (await Promise.race([rl.question(prompt), cancellation])).trim();
+            }
+            finally {
+                removeCancellationListeners();
+            }
         }
         catch {
-            fail("USER_CANCELLED", "Installation was cancelled");
+            fail("USER_CANCELLED", "Installation cancelled / 安装已取消");
         }
         if (!answer && defaultValue !== undefined)
             answer = defaultValue;
         if (!answer && required) {
-            outputStream.write("A value is required. Please try again.\n");
+            outputStream.write(`${messages.required}\n`);
             continue;
         }
         if (answer.length <= 4096 && !CONTROL_PATTERN.test(answer))
             return answer;
-        outputStream.write("Input is too long or contains control characters. Please try again.\n");
+        outputStream.write(`${messages.invalidInput}\n`);
     }
-    fail("INVALID_ARGUMENT", "Too many invalid interactive inputs");
+    fail("INVALID_ARGUMENT", messages === MESSAGES.zh ? "交互输入无效次数过多。" : "Too many invalid interactive inputs");
 }
-async function confirmOverwrite(rl, outputStream) {
-    const answer = await promptValue(rl, "Overwrite the existing profile? (y/N)", "N", false, outputStream);
-    return /^(?:y|yes)$/i.test(answer);
+async function confirmOverwrite(rl, outputStream, messages, signal, inputStream = input) {
+    const temporary = rl ?? createInterface({ input: inputStream, output: outputStream });
+    try {
+        const answer = await promptValue(temporary, messages.overwritePrompt, "N", false, outputStream, messages, signal);
+        return yesAnswer(answer);
+    }
+    finally {
+        if (!rl)
+            temporary.close();
+    }
 }
 function existingProfile(profile, environment) {
     try {
@@ -170,16 +326,30 @@ async function rollbackProfile(snapshot, profile, environment, options = {}) {
 }
 export async function installWizard(inputValue) {
     const environment = inputValue.environment ?? process.env;
+    const externalSignal = inputValue.signal;
+    const cancellationController = new AbortController();
+    const onExternalAbort = () => cancellationController.abort();
+    if (externalSignal?.aborted)
+        cancellationController.abort();
+    else
+        externalSignal?.addEventListener("abort", onExternalAbort, { once: true });
+    const signal = cancellationController.signal;
     const inputStream = inputValue.input ?? input;
     const outputStream = inputValue.output ?? output;
     const interactive = interactiveEnabled(inputValue, inputStream, outputStream);
-    const rl = interactive ? createInterface({ input: inputStream, output: outputStream }) : undefined;
+    let rl = interactive ? createInterface({ input: inputStream, output: outputStream }) : undefined;
+    const onReadlineSigint = () => cancellationController.abort();
+    rl?.on("SIGINT", onReadlineSigint);
     let profileName = inputValue.profile;
     let baseUrl = inputValue.baseUrl;
-    let authMode = inputValue.authMode;
     let timeout = inputValue.timeout;
     let language = inputValue.language;
+    let username = nonEmptyEnvironmentValue(environment, "ZHIHU_USERNAME");
+    let tenantId = nonEmptyEnvironmentValue(environment, "ZHIHU_TENANT_ID");
+    let loginCredentials;
+    let selectedLanguage;
     try {
+        throwIfAborted(signal);
         // Stage 6B1 deliberately installs/ confirms the bundled Skill before it
         // reads customer configuration.  This makes `npx ... install` useful as a
         // one-line Codex bootstrap and ensures Skill failures cannot trigger
@@ -199,6 +369,7 @@ export async function installWizard(inputValue) {
                 codex = inputValue.codexInstaller
                     ? await inputValue.codexInstaller(codexOptions)
                     : installCodexSkill(codexOptions);
+                throwIfAborted(signal);
             }
             catch (error) {
                 if (error instanceof CodexSkillError) {
@@ -206,9 +377,6 @@ export async function installWizard(inputValue) {
                 }
                 throw error;
             }
-            if (interactive && !inputValue.json) {
-                outputStream.write("Skill installed, configure environment. Run zhihu install again to retry.\n");
-            }
         }
         // CLI/input values win over non-empty environment values; empty values are
         // intentionally ignored so users can fall back to a prompt/default.
@@ -216,8 +384,6 @@ export async function installWizard(inputValue) {
             profileName = nonEmptyEnvironmentValue(environment, "ZHIHU_PROFILE");
         if (baseUrl === undefined)
             baseUrl = nonEmptyEnvironmentValue(environment, "ZHIHU_BASE_URL");
-        if (authMode === undefined)
-            authMode = nonEmptyEnvironmentValue(environment, "ZHIHU_AUTH_MODE");
         if (inputValue.caFile === undefined) {
             const environmentCa = nonEmptyEnvironmentValue(environment, "ZHIHU_CA_BUNDLE");
             if (environmentCa !== undefined)
@@ -225,34 +391,56 @@ export async function installWizard(inputValue) {
         }
         if (timeout === undefined)
             timeout = nonEmptyEnvironmentValue(environment, "ZHIHU_TIMEOUT");
-        if (profileName === undefined && interactive)
-            profileName = await promptValue(rl, "Profile name (ZHIHU_PROFILE)", "production", false, outputStream);
-        if (profileName === undefined)
-            profileName = "production";
-        if (baseUrl === undefined && interactive)
-            baseUrl = await promptValue(rl, "Zhihu Pilot base URL (ZHIHU_BASE_URL)", undefined, true, outputStream);
+        // Select the language before the remaining prompts so every subsequent
+        // prompt, action hint and error uses the same locale.  A bilingual label
+        // keeps the first question understandable without assuming a locale.
+        if (language === undefined && interactive) {
+            language = await promptValue(rl, MESSAGES.en.languagePrompt, "en", true, outputStream, MESSAGES.en, signal);
+        }
+        selectedLanguage = languageAnswer(language ?? "en") ?? normalizeLanguage(language);
+        language = selectedLanguage;
+        const messages = wizardMessages(selectedLanguage);
+        if (interactive && !inputValue.json && codex) {
+            const skillMessage = codex.status === "unchanged"
+                ? messages.skillUnchanged
+                : codex.status === "updated" ? messages.skillUpdated : messages.skillInstalled;
+            outputStream.write(`${skillMessage}\n`);
+        }
+        if (baseUrl === undefined && interactive) {
+            baseUrl = await promptValue(rl, messages.baseUrlPrompt, undefined, true, outputStream, messages, signal);
+        }
         if (baseUrl === undefined)
             fail("INVALID_ARGUMENT", "--base-url or ZHIHU_BASE_URL is required when input is not interactive");
-        if (authMode === undefined && interactive)
-            authMode = await promptValue(rl, "Authentication mode (ZHIHU_AUTH_MODE)", "browser", false, outputStream);
-        if (inputValue.caFile === undefined && interactive) {
-            const caAnswer = await promptValue(rl, "CA bundle path (ZHIHU_CA_BUNDLE; optional)", "", false, outputStream);
-            inputValue = { ...inputValue, caFile: caAnswer };
+        if (profileName === undefined && interactive) {
+            profileName = await promptValue(rl, messages.profilePrompt, "production", false, outputStream, messages, signal);
         }
-        if (timeout === undefined && interactive)
-            timeout = await promptValue(rl, "Request timeout in seconds (ZHIHU_TIMEOUT)", "30", false, outputStream);
-        // Existing language flag/prompt remains compatible; it is intentionally
-        // after the Stage 6B1 environment set so the documented env order stays
-        // profile → base URL → auth mode → CA → timeout.
-        language = language === undefined && interactive
-            ? await promptValue(rl, "Language (zh-CN/en)", "en", false, outputStream)
-            : language;
+        if (profileName === undefined)
+            profileName = "production";
+        // CA and timeout are the only optional advanced settings. Authentication
+        // is always the fixed terminal username/password flow.
+        const advancedNeeded = inputValue.caFile === undefined || timeout === undefined;
+        if (interactive && advancedNeeded) {
+            const advanced = await promptValue(rl, messages.advancedPrompt, "N", false, outputStream, messages, signal);
+            if (yesAnswer(advanced)) {
+                if (inputValue.caFile === undefined) {
+                    const caAnswer = await promptValue(rl, messages.caPrompt, "", false, outputStream, messages, signal);
+                    inputValue = { ...inputValue, caFile: caAnswer };
+                }
+                if (timeout === undefined) {
+                    timeout = await promptValue(rl, messages.timeoutPrompt, "30", false, outputStream, messages, signal);
+                }
+            }
+        }
+        if (timeout === undefined)
+            timeout = "30";
+        if (inputValue.caFile === undefined)
+            inputValue = { ...inputValue, caFile: "" };
+        throwIfAborted(signal);
         profileName = normalizeProfileName(profileName);
         baseUrl = validateText(baseUrl, "--base-url", 2048);
-        normalizeAuthMode(authMode);
         const caFile = validateCaFile(inputValue.caFile);
         if (!interactive && !inputValue.skipLogin) {
-            fail("INVALID_ARGUMENT", "--skip-login is required when input is not interactive or --json is used");
+            fail("INTERACTIVE_REQUIRED", "Interactive terminal input is required for login; rerun with --skip-login for configuration-only setup");
         }
         let profile;
         try {
@@ -263,6 +451,8 @@ export async function installWizard(inputValue) {
                 language: normalizeLanguage(language),
                 ...(caFile ? { ca_bundle: caFile } : {}),
                 ...(inputValue.codexSkillDir !== undefined ? { codex_skill_dir: inputValue.codexSkillDir } : {}),
+                ...(username ? { username } : {}),
+                ...(tenantId ? { tenant_id: tenantId } : {}),
             });
         }
         catch (error) {
@@ -291,7 +481,8 @@ export async function installWizard(inputValue) {
         try {
             // Keep the strict validator at the install boundary even when a test or
             // host adapter supplies an IntegrationHttpClient-compatible object.
-            info = validateIntegrationInfo(await client.info(), true);
+            info = validateIntegrationInfo(await client.info({ signal }), true);
+            throwIfAborted(signal);
         }
         catch (error) {
             if (error instanceof HttpError) {
@@ -300,9 +491,47 @@ export async function installWizard(inputValue) {
             }
             throw error;
         }
+        if (!inputValue.skipLogin) {
+            // The service has been preflighted before credentials are requested.
+            // Close the setup readline before creating the password prompt so a TTY
+            // can enter raw mode without an echoing second reader.
+            rl?.close();
+            rl = undefined;
+            try {
+                loginCredentials = await promptTerminalCredentials({
+                    input: inputStream,
+                    output: outputStream,
+                    usernameLabel: messages.usernamePrompt,
+                    tenantLabel: messages.tenantPrompt,
+                    captchaLabel: messages.captchaPrompt,
+                    passwordLabel: messages.passwordPrompt,
+                    defaultUsername: username,
+                    defaultTenantId: tenantId,
+                    signal,
+                    secretPrompt: inputValue.secretPrompt,
+                    valuePrompt: inputValue.valuePrompt,
+                });
+            }
+            catch (error) {
+                if (error instanceof TerminalPromptCancelledError)
+                    fail("USER_CANCELLED", "Installation cancelled / 安装已取消");
+                if (error instanceof TerminalPromptInteractiveRequiredError)
+                    fail("INTERACTIVE_REQUIRED", "Interactive terminal input is required for password login");
+                fail("INVALID_ARGUMENT", "Username, tenant id, or password is invalid");
+            }
+            username = loginCredentials.username;
+            tenantId = loginCredentials.tenant_id;
+            // Persist only the non-sensitive hints entered by the user. The
+            // password remains one-shot input and is never part of ProfileConfig.
+            profile = validateProfile({
+                ...profile,
+                ...(username ? { username } : {}),
+                ...(tenantId ? { tenant_id: tenantId } : {}),
+            });
+        }
         let snapshot;
         let loggedIn = false;
-        const credentials = new SecureCredentialStore(profileName);
+        const credentials = (inputValue.authCredentialStoreFactory?.(profileName) ?? new SecureCredentialStore(profileName));
         const credentialProbeFactory = inputValue.credentialStoreFactory
             ?? ((name) => new SecureCredentialStore(name));
         let replacingExisting = inputValue.force === true;
@@ -311,12 +540,13 @@ export async function installWizard(inputValue) {
             // Hold the root lock until the complete install succeeds or rollback
             // finishes.  Otherwise a concurrent install can update current_profile
             // after our snapshot and a later rollback would overwrite its result.
-            const rootLock = new ProfileLock("install-root", { environment });
+            const rootLock = new ProfileLock("install-root", { environment, signal });
             releaseRootLock = await rootLock.acquire();
+            throwIfAborted(signal);
             if (existingProfile(profileName, environment) && !inputValue.force) {
                 if (!interactive)
                     fail("CONFIG_EXISTS", `Profile ${profileName} already exists; use --force to replace it`);
-                if (!(await confirmOverwrite(rl, outputStream))) {
+                if (!(await confirmOverwrite(rl, outputStream, wizardMessages(selectedLanguage), signal, inputStream))) {
                     fail("USER_CANCELLED", "Existing profile was not changed");
                 }
                 replacingExisting = true;
@@ -340,27 +570,37 @@ export async function installWizard(inputValue) {
                     await guardProfileConnectionChange(profileName, previous, profile, credentialProbeFactory);
                 }
                 return writeProfileInstallConfig(profileName, profile, environment);
-            }, { environment });
+            }, { environment, signal });
+            throwIfAborted(signal);
             if (!inputValue.skipLogin) {
-                const auth = new AuthService(client, credentials, profileName, {
-                    onBrowserFailure: (authorizationUrl) => outputStream.write(`Browser launch failed. Open this URL manually: ${authorizationUrl}\n`),
-                });
-                await auth.login();
+                const auth = inputValue.authServiceFactory
+                    ? inputValue.authServiceFactory(client, credentials, profileName, environment)
+                    : new AuthService(client, credentials, profileName, { environment });
+                if (!loginCredentials)
+                    fail("INTERACTIVE_REQUIRED", "Interactive terminal input is required for login");
+                await auth.login(loginCredentials, { signal });
                 loggedIn = true;
+                // Mark the remote session as owned before checking cancellation. If an
+                // abort lands in this small window, the rollback path must still
+                // revoke the issued session and delete its local credential.
+                throwIfAborted(signal);
             }
             let doctor;
             if (inputValue.doctor) {
+                throwIfAborted(signal);
                 try {
                     doctor = await inputValue.doctor(environment, profileName, profile);
                 }
                 catch {
                     doctor = { status: "unavailable" };
                 }
+                throwIfAborted(signal);
             }
             return {
                 action: "install",
                 profile: profileName,
                 base_url: profile.base_url,
+                language: profile.language,
                 status: "installed",
                 service: stableServiceInfo(info),
                 login: { status: loggedIn ? "logged_in" : "skipped" },
@@ -374,7 +614,7 @@ export async function installWizard(inputValue) {
             let cleanupFailure;
             if (loggedIn) {
                 try {
-                    await new AuthService(client, credentials, profileName).logout();
+                    await new AuthService(client, credentials, profileName, { environment }).logout();
                 }
                 catch {
                     cleanupFailure = "the remote login session could not be revoked";
@@ -400,7 +640,7 @@ export async function installWizard(inputValue) {
             if (rollbackFailure)
                 throw rollbackFailure;
             if (cleanupFailure) {
-                throw new InstallError("AUTH_RELOGIN_REQUIRED", `Installation failed; ${cleanupFailure}. Run zhihu auth logout or login again before retrying.`, { exitCode: 3 });
+                throw new InstallError("AUTH_RELOGIN_REQUIRED", `Installation failed; ${cleanupFailure}. Run ${CLI_RUNNER} auth logout or login again before retrying.`, { exitCode: 3 });
             }
             if (error instanceof InstallError)
                 throw error;
@@ -412,6 +652,9 @@ export async function installWizard(inputValue) {
             if (error instanceof CodexSkillError) {
                 throw new InstallError(error.code, error.message, { exitCode: error.exitCode });
             }
+            if (error instanceof ProfileLockCancelledError || signal?.aborted) {
+                throw new InstallError("USER_CANCELLED", "Installation cancelled / 安装已取消", { exitCode: 2 });
+            }
             if (error instanceof CliAuthError) {
                 throw new InstallError(error.code, error.message, { retryable: error.retryable, exitCode: error.exitCode });
             }
@@ -429,7 +672,15 @@ export async function installWizard(inputValue) {
             releaseRootLock?.();
         }
     }
+    catch (error) {
+        const localized = localizeInstallError(error, selectedLanguage);
+        if (localized !== error)
+            throw localized;
+        throw error;
+    }
     finally {
+        rl?.removeListener("SIGINT", onReadlineSigint);
         rl?.close();
+        externalSignal?.removeEventListener("abort", onExternalAbort);
     }
 }

package/dist/profile-lock.js

@@ -9,8 +9,32 @@ export class ProfileLockError extends Error {
         this.name = "ProfileLockError";
     }
 }
-function sleep(milliseconds) {
-    return new Promise((resolve) => setTimeout(resolve, milliseconds));
+export class ProfileLockCancelledError extends Error {
+    code = "USER_CANCELLED";
+    constructor() {
+        super("The profile lock acquisition was cancelled");
+        this.name = "ProfileLockCancelledError";
+    }
+}
+function sleep(milliseconds, signal) {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(new ProfileLockCancelledError());
+            return;
+        }
+        let timer;
+        const onAbort = () => {
+            if (timer !== undefined)
+                clearTimeout(timer);
+            signal?.removeEventListener("abort", onAbort);
+            reject(new ProfileLockCancelledError());
+        };
+        timer = setTimeout(() => {
+            signal?.removeEventListener("abort", onAbort);
+            resolve();
+        }, milliseconds);
+        signal?.addEventListener("abort", onAbort, { once: true });
+    });
 }
 export function profileLockPath(profile, environment = process.env) {
     const name = normalizeProfileName(profile);
@@ -27,6 +51,7 @@ export class ProfileLock {
             timeoutMs: options.timeoutMs ?? 15000,
             staleMs: options.staleMs ?? 120000,
             retryMs: options.retryMs ?? 40,
+            signal: options.signal,
         };
         if (!Number.isFinite(this.options.timeoutMs) || this.options.timeoutMs < 1)
             throw new ProfileLockError("Profile lock timeout is invalid");
@@ -35,8 +60,12 @@ export class ProfileLock {
     }
     async acquire() {
         const started = Date.now();
+        if (this.options.signal?.aborted)
+            throw new ProfileLockCancelledError();
         mkdirSync(dirname(this.path), { recursive: true, mode: 0o700 });
         while (Date.now() - started <= this.options.timeoutMs) {
+            if (this.options.signal?.aborted)
+                throw new ProfileLockCancelledError();
             try {
                 const descriptor = openSync(this.path, "wx", 0o600);
                 try {
@@ -54,7 +83,7 @@ export class ProfileLock {
                 }
                 if (this.removeIfStale())
                     continue;
-                await sleep(this.options.retryMs);
+                await sleep(this.options.retryMs, this.options.signal);
             }
         }
         throw new ProfileLockError();

package/dist/release.js

@@ -0,0 +1,24 @@
+/**
+ * Release identity shared by the CLI, Codex Skill marker and public test
+ * package builder. Keep these values together so a staged public package
+ * cannot accidentally advertise a different runner or marker version.
+ */
+export const CLI_PACKAGE_NAME = "@luckypiggy/zhihu-ai-cli";
+export const CLI_VERSION = "0.2.1-test.4";
+/** Runner used by the canonical package and offline deliveries. */
+export const CLI_RUNNER = "npx --yes @luckypiggy/zhihu-ai-cli@0.2.1-test.4";
+export const CLI_DOCTOR_COMMAND = "npx --yes @luckypiggy/zhihu-ai-cli@0.2.1-test.4 doctor";
+/** Build a user-facing command from the runner for the current package. */
+export function cliCommand(...arguments_) {
+    return [CLI_RUNNER, ...arguments_].join(" ");
+}
+/**
+ * The public smoke-test package is intentionally version-pinned. A floating
+ * dist-tag would make an installed Skill non-reproducible and could silently
+ * change the command that Codex executes later.
+ */
+export const PUBLIC_TEST_PACKAGE_NAME = "@luckypiggy/zhihu-ai-cli";
+export const PUBLIC_TEST_PACKAGE_VERSION = "0.2.1-test.4";
+export const PUBLIC_TEST_DIST_TAG = "test";
+export const PUBLIC_TEST_RUNNER = `npx --yes ${PUBLIC_TEST_PACKAGE_NAME}@${PUBLIC_TEST_PACKAGE_VERSION}`;
+export const PUBLIC_TEST_DOCTOR_COMMAND = `${PUBLIC_TEST_RUNNER} doctor`;