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

package/dist/install.js

@@ -11,6 +11,7 @@ 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 { existingLocalRunnerCommand, localizedRunnerLockMessage } from "./local-runner.js";
 import { promptTerminalCredentials, TerminalPromptCancelledError, TerminalPromptInteractiveRequiredError } from "./terminal-prompt.js";
 const MAX_CA_BUNDLE_BYTES = 4 * 1024 * 1024;
 const CONTROL_PATTERN = /[\u0000-\u001f\u007f]/;
@@ -68,6 +69,9 @@ function languageAnswer(value) {
 function yesAnswer(value) {
     return /^(?:y|yes|是|好|1)$/i.test(value.trim());
 }
+function activeRunner() {
+    return existingLocalRunnerCommand(process.env) ?? CLI_RUNNER;
+}
 export function localizedInstallMessage(code, language, message) {
     const zh = language === "zh";
     switch (code) {
@@ -107,6 +111,8 @@ export function localizedInstallMessage(code, language, message) {
             return zh
                 ? "连接智护服务超时，请检查地址和网络后再次运行相同的安装命令。"
                 : "The Pilot service timed out. Check the address and network, then rerun the same install command.";
+        case "LOCAL_RUNNER_LOCK_TIMEOUT":
+            return localizedRunnerLockMessage(language);
         case "USER_CANCELLED":
             return wizardMessages(language).cancelled;
         case "CONFIG_EXISTS":
@@ -116,8 +122,8 @@ export function localizedInstallMessage(code, language, message) {
         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.`;
+                ? `${message}。请先执行 ${activeRunner()} auth logout，或使用新的 Profile，再重试。`
+                : `${message}. Run ${activeRunner()} auth logout first, or use a new Profile, then retry.`;
         default:
             return message;
     }
@@ -353,7 +359,8 @@ export async function installWizard(inputValue) {
         // 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
-        // network access, prompts, or Profile writes.
+        // network access, prompts, or Profile writes. The local runner lock is
+        // acquired only inside this step and is released before any Profile lock.
         let codex;
         if (!inputValue.skipCodex) {
             try {
@@ -640,7 +647,7 @@ export async function installWizard(inputValue) {
             if (rollbackFailure)
                 throw rollbackFailure;
             if (cleanupFailure) {
-                throw new InstallError("AUTH_RELOGIN_REQUIRED", `Installation failed; ${cleanupFailure}. Run ${CLI_RUNNER} auth logout or login again before retrying.`, { exitCode: 3 });
+                throw new InstallError("AUTH_RELOGIN_REQUIRED", `Installation failed; ${cleanupFailure}. Run ${activeRunner()} auth logout or login again before retrying.`, { exitCode: 3 });
             }
             if (error instanceof InstallError)
                 throw error;