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

package/dist/cli.js

@@ -2,7 +2,8 @@ import { existsSync, lstatSync } from "node:fs";
 import { isIP } from "node:net";
 import { isAbsolute, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { CLI_VERSION, MIN_NODE_MAJOR, } from "./contracts.js";
+import { CLI_VERSION, CLI_PACKAGE_NAME, MIN_NODE_MAJOR, } from "./contracts.js";
+import { CLI_DOCTOR_COMMAND, CLI_RUNNER } from "./release.js";
 import { ConfigError, DEFAULT_PROFILE, DEFAULT_PROFILE_NAME, checkProfile, configRoot, guardProfileConnectionChange, initializeProfile, ProfileConnectionGuardError, readConfigSnapshot, readProfileRaw, validateProfile, } from "./config.js";
 import { withProfileLock } from "./profile-lock.js";
 import { emitError, emitSuccess } from "./output.js";
@@ -13,6 +14,7 @@ import { IntegrationHttpClient, HttpError, validateIntegrationInfo, } from "./ht
 import { CliAuthError, TokenManager, mapFailure } from "./token-manager.js";
 import { CodexSkillError, inspectCodexSkill, installCodexSkill, uninstallCodexSkill, } from "./codex-skill.js";
 import { InstallError, installWizard } from "./install.js";
+import { promptTerminalCredentials, TerminalPromptCancelledError } from "./terminal-prompt.js";
 class CliFailure extends Error {
     shape;
     constructor(shape) {
@@ -120,7 +122,7 @@ function versionData() {
         cli_version: CLI_VERSION,
         node_version: process.versions.node,
         node_supported: major >= MIN_NODE_MAJOR,
-        package: "@luckypiggy/zhihu-ai-cli",
+        package: CLI_PACKAGE_NAME,
         stage: "p1-readonly",
     };
 }
@@ -208,16 +210,20 @@ export async function doctorData(environment = process.env, options = {}) {
         try {
             client = options.clientFactory ? options.clientFactory(profile) : new IntegrationHttpClient(profile);
             const info = validateIntegrationInfo(await client.info(), false);
-            const ready = info.status === "ready" && info.auth?.configured === true;
+            const legacyAuth = info.auth?.mode === "pilot_oauth_bff";
+            const ready = info.status === "ready"
+                && info.auth?.configured === true
+                && info.auth?.mode === "pilot_terminal_password";
             serviceValidatedReady = ready;
             service = {
                 ok: ready,
-                state: ready ? "ready" : "configuration_required",
+                state: ready ? "ready" : legacyAuth ? "terminal_login_required" : "configuration_required",
                 service: info.service,
                 protocol_version: info.protocol_version,
                 minimum_cli_version: info.minimum_cli_version,
                 compatible: true,
                 status: info.status,
+                ...(legacyAuth ? { detail: "This Pilot exposes legacy browser OAuth; terminal login is required for this CLI" } : {}),
                 capabilities: info.capabilities,
             };
             network = { ok: true, state: "reachable" };
@@ -326,21 +332,50 @@ function authService(flags) {
         throw mapFailure(error);
     }
     const credentials = new SecureCredentialStore(selected.name);
-    return new AuthService(client, credentials, selected.name, {
-        onBrowserFailure: (authorizationUrl) => {
-            process.stderr.write(`Browser launch failed. Open this URL manually: ${authorizationUrl}\n`);
-        },
-    });
+    return { service: new AuthService(client, credentials, selected.name), profile: selected.profile, profileName: selected.name };
 }
-async function authCommand(action, flags) {
+async function authCommand(action, flags, json = false) {
     if (action !== "login" && action !== "status" && action !== "logout")
         invalid("Use auth login, auth status, or auth logout");
-    const service = authService(flags);
-    if (action === "login")
-        return service.login();
+    for (const key of flags.keys())
+        if (key !== "profile")
+            invalid(`Unknown auth option: --${key}`);
+    const selected = authService(flags);
+    if (action === "login") {
+        if (json || !(process.stdin.isTTY
+            && process.stderr.isTTY)) {
+            throw new CliFailure({ code: "INTERACTIVE_REQUIRED", message: "Interactive terminal input is required for login; do not pass credentials through flags or environment variables", retryable: false, exit_code: 2 });
+        }
+        const controller = new AbortController();
+        const onSignal = () => controller.abort();
+        process.once("SIGINT", onSignal);
+        process.once("SIGTERM", onSignal);
+        try {
+            const credentials = await promptTerminalCredentials({
+                usernameLabel: selected.profile.language === "zh" ? "智护用户名" : "Zhihu username",
+                tenantLabel: selected.profile.language === "zh" ? "租户 ID（可留空）" : "Tenant id (optional)",
+                captchaLabel: selected.profile.language === "zh" ? "验证码（可留空）" : "Captcha verification (optional)",
+                passwordLabel: selected.profile.language === "zh" ? "智护密码：" : "Zhihu password: ",
+                defaultUsername: selected.profile.username,
+                defaultTenantId: selected.profile.tenant_id,
+                signal: controller.signal,
+            });
+            return await selected.service.login(credentials, { signal: controller.signal });
+        }
+        catch (error) {
+            if (error instanceof TerminalPromptCancelledError) {
+                throw new CliFailure({ code: "USER_CANCELLED", message: "Login cancelled", retryable: false, exit_code: 2 });
+            }
+            throw error;
+        }
+        finally {
+            process.removeListener("SIGINT", onSignal);
+            process.removeListener("SIGTERM", onSignal);
+        }
+    }
     if (action === "status")
-        return service.status();
-    return service.logout();
+        return selected.service.status();
+    return selected.service.logout();
 }
 async function capabilitiesCommand(action, flags) {
     if (action !== "list")
@@ -357,6 +392,108 @@ async function capabilitiesCommand(action, flags) {
     const tokenManager = new TokenManager(client, credentials, selected.name);
     return tokenManager.callReadOnly((accessToken) => client.capabilities(accessToken));
 }
+const A2A_CAPABILITIES = new Set([
+    "resource_query",
+    "incident_analysis",
+    "inspection_summary",
+    "knowledge_qa",
+]);
+function a2aTextOption(flags, key, maxChars, maxBytes) {
+    const value = flags.get(key);
+    if (typeof value !== "string")
+        invalid(`--${key} requires a value`);
+    const normalized = value.trim();
+    if (!normalized || Array.from(value).length > maxChars || Buffer.byteLength(value, "utf8") > maxBytes
+        || /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/.test(value)) {
+        invalid(`--${key} must be non-empty text up to ${maxChars} characters and ${maxBytes} UTF-8 bytes`);
+    }
+    return normalized;
+}
+function a2aTaskIdOption(flags) {
+    const value = flags.get("id");
+    if (typeof value !== "string" || !/^[A-Za-z0-9:_-]{1,128}$/.test(value)) {
+        invalid("--id must be an opaque A2A task id");
+    }
+    return value;
+}
+function a2aHumanSummary(data, language) {
+    if (!data || typeof data !== "object" || Array.isArray(data))
+        return undefined;
+    const value = data;
+    if (typeof value.task !== "string" || typeof value.target !== "string" || typeof value.result !== "string")
+        return undefined;
+    if (language === "zh") {
+        return [`目标员工：${value.target}`, `任务：${value.task}`, `结果：${value.result}`].join("\n");
+    }
+    return [`Target employee: ${value.target}`, `Task: ${value.task}`, `Result: ${value.result}`].join("\n");
+}
+async function a2aCommand(command, flags) {
+    const [_, action, subaction] = command;
+    const allowed = new Set(["profile", "capability", "message", "id"]);
+    for (const key of flags.keys())
+        if (!allowed.has(key))
+            invalid(`Unknown a2a option: --${key}`);
+    let operation;
+    let capability;
+    let message;
+    let taskId;
+    if (action === "capabilities" && command.length === 2) {
+        if (["capability", "message", "id"].some((key) => flags.has(key))) {
+            invalid("a2a capabilities does not accept --capability, --message, or --id");
+        }
+        operation = "capabilities";
+    }
+    else if (action === "delegate" && command.length === 2) {
+        if (flags.has("id"))
+            invalid("a2a delegate does not accept --id");
+        const rawCapability = a2aTextOption(flags, "capability", 128, 128);
+        if (!A2A_CAPABILITIES.has(rawCapability)) {
+            invalid("--capability must be resource_query, incident_analysis, inspection_summary, or knowledge_qa");
+        }
+        capability = rawCapability;
+        message = a2aTextOption(flags, "message", 8000, 16 * 1024);
+        operation = "delegate";
+    }
+    else if (action === "task" && subaction === "get" && command.length === 3) {
+        if (flags.has("capability") || flags.has("message"))
+            invalid("a2a task get does not accept --capability or --message");
+        taskId = a2aTaskIdOption(flags);
+        operation = "task";
+    }
+    else {
+        invalid("Use a2a capabilities, a2a delegate --capability <id> --message <text>, or a2a task get --id <id>");
+    }
+    const selected = selectedProfile(flags);
+    let client;
+    try {
+        client = new IntegrationHttpClient(selected.profile);
+    }
+    catch (error) {
+        throw mapFailure(error);
+    }
+    const credentials = new SecureCredentialStore(selected.name);
+    const tokenManager = new TokenManager(client, credentials, selected.name);
+    const controller = new AbortController();
+    const onSignal = () => controller.abort();
+    process.once("SIGINT", onSignal);
+    process.once("SIGTERM", onSignal);
+    try {
+        if (operation === "capabilities") {
+            const data = await tokenManager.callReadOnly((accessToken) => client.a2aCapabilities(accessToken, { signal: controller.signal }));
+            return { data };
+        }
+        if (operation === "delegate") {
+            const data = await tokenManager.callReadOnly((accessToken) => client.a2aDelegate(capability, message, accessToken, { signal: controller.signal }));
+            return { data, human: a2aHumanSummary(data, selected.profile.language) };
+        }
+        const data = await tokenManager.callReadOnly((accessToken) => client.a2aTask(taskId, accessToken, { signal: controller.signal }));
+        return { data, human: a2aHumanSummary(data, selected.profile.language) };
+    }
+    finally {
+        process.removeListener("SIGINT", onSignal);
+        process.removeListener("SIGTERM", onSignal);
+    }
+}
 async function employeesCommand(action, flags) {
     if (action !== "list")
         invalid("Use employees list");
@@ -861,7 +998,7 @@ function codexSkillCommand(action, flags) {
 }
 async function installCommand(flags, json) {
     const allowed = new Set([
-        "profile", "base-url", "auth-mode", "timeout", "language", "ca-file", "codex-skill-dir",
+        "profile", "base-url", "timeout", "language", "ca-file", "codex-skill-dir",
         "skip-login", "skip-codex", "force",
     ]);
     for (const key of flags.keys()) {
@@ -881,11 +1018,14 @@ async function installCommand(flags, json) {
             invalid(`--${key} requires a value`);
         return value;
     };
+    const controller = new AbortController();
+    const onSignal = () => controller.abort();
+    process.on("SIGINT", onSignal);
+    process.on("SIGTERM", onSignal);
     try {
         const result = await installWizard({
             profile: stringOption("profile"),
             baseUrl: stringOption("base-url"),
-            authMode: stringOption("auth-mode"),
             timeout: stringOption("timeout"),
             language: stringOption("language"),
             caFile: stringOption("ca-file"),
@@ -893,13 +1033,19 @@ async function installCommand(flags, json) {
             skipLogin: flags.get("skip-login") === true,
             skipCodex: flags.get("skip-codex") === true,
             force: flags.get("force") === true,
+            signal: controller.signal,
             json,
             doctor: (environment, profileName, profile) => doctorData(environment, {
                 ...(profileName ? { profile: profileName } : {}),
                 ...(profile ? { profileConfig: profile } : {}),
             }),
         });
-        return { ...result };
+        const data = { ...result };
+        // Keep the existing JSON install envelope stable; the locale is used only
+        // for the human summary and is intentionally not a new automation field.
+        if (json)
+            delete data.language;
+        return data;
     }
     catch (error) {
         if (error instanceof InstallError) {
@@ -912,6 +1058,56 @@ async function installCommand(flags, json) {
         }
         throw error;
     }
+    finally {
+        process.removeListener("SIGINT", onSignal);
+        process.removeListener("SIGTERM", onSignal);
+    }
+}
+export function installHumanSummary(data) {
+    const zh = data.language === "zh";
+    const profile = typeof data.profile === "string" ? data.profile : "-";
+    const baseUrl = typeof data.base_url === "string" ? data.base_url : "-";
+    const login = data.login?.status === "logged_in"
+        ? (zh ? "已登录" : "logged in")
+        : (zh ? "已跳过" : "skipped");
+    const skillStatus = data.codex?.status;
+    const skill = skillStatus === "unchanged"
+        ? (zh ? "已安装（可重复运行相同命令）" : "already installed (safe to rerun)")
+        : skillStatus === "updated"
+            ? (zh ? "已更新" : "updated")
+            : skillStatus === "skipped"
+                ? (zh ? "已跳过" : "skipped")
+                : (zh ? "已安装" : "installed");
+    if (zh) {
+        return [
+            "安装完成",
+            `Profile：${profile}`,
+            `智护地址：${baseUrl}`,
+            `登录：${login}`,
+            `Codex Skill：${skill}`,
+            "请新开一个 Codex 会话，让它重新发现智护 Skill。",
+            "可以试试：",
+            "- 用智护列出当前活动告警。",
+            "- 用智护查看资产 123 最近一小时 CPU 趋势。",
+            "- 用智护分析告警 456 的根因。",
+            `排查安装：${CLI_DOCTOR_COMMAND}`,
+            `Skill runner：${CLI_RUNNER}`,
+        ].join("\n");
+    }
+    return [
+        "Installation complete",
+        `Profile: ${profile}`,
+        `Pilot: ${baseUrl}`,
+        `Login: ${login}`,
+        `Codex Skill: ${skill}`,
+        "Open a new Codex session so it can discover the Zhihu Skill.",
+        "Try natural-language requests:",
+        "- List the current firing alarms.",
+        "- Show the last hour of CPU trend for asset 123.",
+        "- Diagnose the root cause of alarm 456.",
+        `Troubleshoot installation: ${CLI_DOCTOR_COMMAND}`,
+        `Skill runner: ${CLI_RUNNER}`,
+    ].join("\n");
 }
 function helpData() {
     return {
@@ -924,6 +1120,9 @@ function helpData() {
             "auth status",
             "auth logout",
             "capabilities list",
+            "a2a capabilities",
+            "a2a delegate --capability <id> --message <text>",
+            "a2a task get --id <opaque-task-id>",
             "employees list",
             "employees chat <employee-id> --message <text>",
             "assets list [--keyword <text>] [--model <name|code|id>] [--page N] [--page-size N]",
@@ -933,12 +1132,12 @@ function helpData() {
             "alarms get --id <id>",
             "incidents diagnose --alarm-id <id>",
             "inspections run [--model <name|code|id>] [--window 5m..24h]",
-            "install [--profile <name>] [--base-url <https-url>] [--auth-mode browser] [--timeout N] [--language zh-CN|en] [--ca-file <absolute-file>] [--codex-skill-dir <absolute-path>] [--skip-login] [--skip-codex] [--force]",
+            "install [--profile <name>] [--base-url <https-url>] [--timeout N] [--language zh-CN|en] [--ca-file <absolute-file>] [--codex-skill-dir <absolute-path>] [--skip-login] [--skip-codex] [--force]",
             "install codex [--profile <name>] [--codex-skill-dir <absolute-path>] [--force]",
             "uninstall codex [--profile <name>] [--codex-skill-dir <absolute-path>] [--force]",
         ],
         json: "Append --json for the stable success/error envelope",
-        note: "Authentication plus read-only employee, asset, metric, alarm, incident diagnosis, inspection queries, local installation, and the Codex Skill installer are available; install also accepts ZHIHU_PROFILE, ZHIHU_BASE_URL, ZHIHU_AUTH_MODE=browser, ZHIHU_CA_BUNDLE, and ZHIHU_TIMEOUT; write operations, MCP, customer URL delivery, and public npm publication remain unavailable",
+        note: "Authentication plus read-only employee, asset, metric, alarm, incident diagnosis, inspection queries, local installation, and the Codex Skill installer are available; login is terminal-only and passwords are never accepted through flags or environment variables; formal GA, write operations, and MCP are not available",
     };
 }
 async function run(parsed) {
@@ -966,7 +1165,8 @@ async function run(parsed) {
         return { data: await configInit(parsed.flags), exit_code: 0 };
     if (first === "install") {
         if (!second && parsed.command.length === 1) {
-            return { data: await installCommand(parsed.flags, parsed.json), exit_code: 0 };
+            const data = await installCommand(parsed.flags, parsed.json);
+            return { data, exit_code: 0, ...(parsed.json ? {} : { human: installHumanSummary(data) }) };
         }
         if (second !== "codex" || parsed.command.length !== 2)
             invalid("Use install or install codex");
@@ -978,7 +1178,11 @@ async function run(parsed) {
         return { data: codexSkillCommand("uninstall", parsed.flags), exit_code: 0 };
     }
     if (first === "auth")
-        return { data: await authCommand(second, parsed.flags), exit_code: 0 };
+        return { data: await authCommand(second, parsed.flags, parsed.json), exit_code: 0 };
+    if (first === "a2a") {
+        const result = await a2aCommand(parsed.command, parsed.flags);
+        return { data: result.data, exit_code: 0, ...(parsed.json || !result.human ? {} : { human: result.human }) };
+    }
     if (first === "capabilities") {
         if (parsed.command.length !== 2)
             invalid("Use capabilities list");

package/dist/codex-skill.js

@@ -3,7 +3,7 @@ import { createHash, randomBytes } from "node:crypto";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join, parse, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { CLI_VERSION, } from "./contracts.js";
+import { CLI_PACKAGE_NAME, CLI_VERSION, } from "./contracts.js";
 import { ConfigError, readConfigSnapshot, validateProfile, } from "./config.js";
 export const CODEX_SKILL_NAME = "zhihu-aiops";
 export const CODEX_SKILL_VERSION = CLI_VERSION;
@@ -118,7 +118,7 @@ function markerFor(files) {
         hashes[file] = sha256(files.get(file));
     return {
         owner: "zhihu-ai-cli",
-        package: "@luckypiggy/zhihu-ai-cli",
+        package: CLI_PACKAGE_NAME,
         skill: CODEX_SKILL_NAME,
         schema: CODEX_SKILL_SCHEMA,
         schema_version: CODEX_SKILL_SCHEMA,
@@ -219,7 +219,7 @@ function validMarker(value) {
     if (Object.keys(object).some((key) => !allowedKeys.has(key)))
         return false;
     if (object.owner !== "zhihu-ai-cli"
-        || object.package !== "@luckypiggy/zhihu-ai-cli"
+        || object.package !== CLI_PACKAGE_NAME
         || object.skill !== CODEX_SKILL_NAME
         || object.schema !== CODEX_SKILL_SCHEMA
         || object.schema_version !== CODEX_SKILL_SCHEMA

package/dist/config.js

@@ -2,6 +2,7 @@ import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { chmodSync, lstatSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync, } from "node:fs";
 import { CONFIG_SCHEMA_VERSION } from "./contracts.js";
+import { cliCommand } from "./release.js";
 export const DEFAULT_PROFILE_NAME = "default";
 export const DEFAULT_PROFILE = {
     base_url: "",
@@ -110,7 +111,7 @@ function validateBaseUrl(value) {
 }
 export function validateProfile(value) {
     const object = objectOrEmpty(value ?? {}, "Profile configuration");
-    const allowed = new Set(["base_url", "timeout_seconds", "language", "ca_bundle", "codex_skill_dir"]);
+    const allowed = new Set(["base_url", "timeout_seconds", "language", "ca_bundle", "codex_skill_dir", "username", "tenant_id"]);
     for (const key of Object.keys(object)) {
         if (!allowed.has(key))
             throw new ConfigError(`Profile field ${key} is not supported`);
@@ -124,12 +125,22 @@ export function validateProfile(value) {
         throw new ConfigError("Profile language must be zh or en");
     const caBundle = optionalString(object, "ca_bundle");
     const codexSkillDir = optionalString(object, "codex_skill_dir");
+    const username = optionalString(object, "username");
+    const tenantId = optionalString(object, "tenant_id");
+    if (username !== undefined && (username.length === 0 || /[\u0000-\u001f\u007f]/.test(username))) {
+        throw new ConfigError("Profile field username is invalid");
+    }
+    if (tenantId !== undefined && (tenantId.length === 0 || !/^[A-Za-z0-9_-]{1,128}$/.test(tenantId))) {
+        throw new ConfigError("Profile field tenant_id is invalid");
+    }
     return {
         base_url: validateBaseUrl(object.base_url),
         timeout_seconds: timeout,
         language,
         ...(caBundle ? { ca_bundle: caBundle } : {}),
         ...(codexSkillDir ? { codex_skill_dir: codexSkillDir } : {}),
+        ...(username ? { username } : {}),
+        ...(tenantId ? { tenant_id: tenantId } : {}),
     };
 }
 /**
@@ -158,13 +169,13 @@ export async function guardProfileConnectionChange(profileName, previous, next,
         }
         const credential = await store.get();
         if (credential) {
-            throw new ProfileConnectionGuardError("AUTH_ALREADY_LOGGED_IN", `Profile ${profileName} has an active login on another Pilot origin; run zhihu auth logout --profile ${profileName} or use a new profile`);
+            throw new ProfileConnectionGuardError("AUTH_ALREADY_LOGGED_IN", `Profile ${profileName} has an active login on another Pilot origin; run ${cliCommand("auth", "logout", "--profile", profileName)} or use a new profile`);
         }
     }
     catch (error) {
         if (error instanceof ProfileConnectionGuardError)
             throw error;
-        throw new ProfileConnectionGuardError("CREDENTIAL_STORE_UNAVAILABLE", `Unable to verify existing credentials for profile ${profileName}; run zhihu auth logout --profile ${profileName} before changing the Pilot origin`);
+        throw new ProfileConnectionGuardError("CREDENTIAL_STORE_UNAVAILABLE", `Unable to verify existing credentials for profile ${profileName}; run ${cliCommand("auth", "logout", "--profile", profileName)} before changing the Pilot origin`);
     }
 }
 export function writeJsonAtomic(path, value) {

package/dist/contracts.js

@@ -1,4 +1,4 @@
-export const CLI_VERSION = "0.1.0-test.1";
+export { CLI_PACKAGE_NAME, CLI_VERSION, CLI_RUNNER, CLI_DOCTOR_COMMAND, cliCommand, } from "./release.js";
 export const OUTPUT_SCHEMA_VERSION = "1.0";
 export const CONFIG_SCHEMA_VERSION = "1.0";
 export const MIN_NODE_MAJOR = 22;
@@ -11,5 +11,7 @@ export const P1_CAPABILITY_SCOPES = [
     "metrics:read",
     "alarms:read",
     "incidents:analyze",
+    "a2a:delegate:read",
+    "a2a:task:read",
     "inspections:run-readonly",
 ];