@encorearia/install 1.1.0 → 1.2.0

package/bin/install.mjs

@@ -1,15 +1,18 @@
 #!/usr/bin/env node
 import process from 'node:process';
+import { readFileSync } from 'node:fs';
 import { request, ensureDeviceLogin } from '../lib/api.mjs';
 import { atomicInstall } from '../lib/atomic-install.mjs';
 import { loadCredentials } from '../lib/credentials.mjs';
 import { detectTargets, targetRoot } from '../lib/targets.mjs';
 import { loadTrustedKeys, verifyPackage } from '../lib/verify.mjs';
+import { bindApiOrigin } from '../lib/credentials.mjs';
 
 const args = process.argv.slice(2);
 const baseURL = String(valueAfter('--api') || process.env.ENCOREARIA_API_BASE || 'https://encorearia.com').replace(/\/$/, '');
+bindApiOrigin(baseURL);
 const targetArg = valueAfter('--target');
-const installerVersion = '1.1.0';
+const installerVersion = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
 
 if (args.includes('--list')) {
   const target = (await detectTargets(targetArg ? targetArg.split(',') : []))[0];
@@ -30,18 +33,23 @@ if (args.includes('--list')) {
   process.exit(0);
 }
 
-if (positionalArgument()) fail('Usage: npx @encorearia/install [--target codex,claude-code] [--api URL]');
+if (positionalArgument()) fail('用法：npx @encorearia/install [--target codex,claude-code] [--api URL]');
 const pkg = await request(baseURL, '/api/agent/shell');
 const trust = await loadTrustedKeys(baseURL);
 verifyPackage(pkg, trust, installerVersion);
 const targets = await detectTargets(targetArg ? targetArg.split(',') : []);
 const primaryTarget = targets[0];
 await ensureDeviceLogin(baseURL, '', pkg.manifest.shell_version, primaryTarget);
-const shellID = pkg.manifest.shell_id || 'encorearia-unified';
+const shellID = pkg.manifest.shell_id || 'encorearia';
 for (const target of targets) {
   const destination = await atomicInstall(targetRoot(target), shellID, pkg.files, pkg.manifest);
-  process.stdout.write(`Installed to ${target}: ${destination}\n`);
+  process.stdout.write(`已安装到 ${displayTarget(target)}：${destination}\n`);
 }
+process.stdout.write('\n安可集已就绪。你可以直接对 AI 说：\n');
+process.stdout.write('  · 看看我的服务\n');
+process.stdout.write('  · 帮我调用 <服务名>\n');
+process.stdout.write('  · 查我的钱包余额\n');
+process.stdout.write('浏览更多服务或充值：https://encorearia.com\n');
 
 function valueAfter(flag) {
   const index = args.indexOf(flag);
@@ -58,6 +66,12 @@ function positionalArgument() {
   return '';
 }
 
+function displayTarget(target) {
+  if (target === 'codex') return 'Codex';
+  if (target === 'claude-code') return 'Claude Code';
+  return target;
+}
+
 function fail(message) {
   process.stderr.write(message + '\n');
   process.exit(1);

package/lib/credentials.mjs

@@ -2,10 +2,30 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
+import { createHash } from 'node:crypto';
+
 const service = 'encorearia-agent';
-const account = 'default';
+export const OFFICIAL_API = 'https://encorearia.com';
+let originSuffix = '';
+
+// 凭据按 API 来源隔离：官方地址用默认文件；其它地址仅限本机调试或显式允许，
+// 且各用独立文件——防止 `--api` 指向任意第三方后把官方登录凭据发过去（钓鱼偷 token）。
+export function bindApiOrigin(baseURL) {
+  let canonical;
+  try { canonical = new URL(String(baseURL || '')).origin; } catch { canonical = String(baseURL || '').replace(/\/+$/, ''); }
+  if (canonical === OFFICIAL_API) { originSuffix = ''; return; }
+  let host = '';
+  try { host = new URL(canonical).hostname; } catch { host = ''; }
+  const loopback = host === 'localhost' || host === '127.0.0.1' || host === '::1' || host === '[::1]';
+  if (!loopback && process.env.ENCOREARIA_ALLOW_CUSTOM_API !== '1') {
+    throw new Error('--api 只允许官方地址或本机调试地址；如确需自定义请设 ENCOREARIA_ALLOW_CUSTOM_API=1（凭据将与官方隔离）');
+  }
+  originSuffix = '-' + createHash('sha256').update(canonical).digest('hex').slice(0, 12);
+}
+
+const account = () => 'default' + originSuffix;
 export const credentialsDirectory = () => process.env.ENCOREARIA_CONFIG_DIR || path.join(os.homedir(), '.encorearia');
-const file = () => path.join(credentialsDirectory(), 'credentials.json');
+const file = () => path.join(credentialsDirectory(), 'credentials' + originSuffix + '.json');
 
 async function keytar() {
   try { return (await import('keytar')).default; } catch { return null; }
@@ -14,7 +34,7 @@ async function keytar() {
 export async function loadCredentials() {
   const keychain = await keytar();
   if (keychain) {
-    const raw = await keychain.getPassword(service, account);
+    const raw = await keychain.getPassword(service, account());
     if (raw) return JSON.parse(raw);
   }
   try { return JSON.parse(await fs.readFile(file(), 'utf8')); } catch { return null; }
@@ -23,7 +43,7 @@ export async function loadCredentials() {
 export async function saveCredentials(value) {
   const keychain = await keytar();
   if (keychain) {
-    await keychain.setPassword(service, account, JSON.stringify(value));
+    await keychain.setPassword(service, account(), JSON.stringify(value));
     return;
   }
   const dir = path.dirname(file());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@encorearia/install",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Verify and install signed Encore Aria call-shell skills for Codex and Claude Code.",
   "type": "module",
   "bin": {