@encorearia/install 1.0.0 → 1.1.0

package/README.md

@@ -33,6 +33,23 @@ the trust anchor is empty instead of accepting an API-supplied key. It is the
 expected repository state until the first production release key has been
 created securely.
 
+## Install the unified entry
+
+Install one account-level Encore Aria shell. It can list the services available
+on the platform and call any published service by its short slug or public id.
+It does not embed a creator or service identifier in the installed files.
+
+```sh
+npx @encorearia/install --target codex,claude-code
+```
+
+The first run opens the device approval page. After approval, use `list` in the
+installed shell to view service slugs, then invoke a service with its slug. The
+installer stores one account-level credential at `~/.encorearia/credentials.json`.
+
+Use `npx @encorearia/install --list` to authenticate if necessary and print the
+currently available service list.
+
 ## Rotate a key
 
 1. Generate a new key with a new `KEY_ID`.

package/bin/install.mjs

@@ -9,44 +9,38 @@ import { loadTrustedKeys, verifyPackage } from '../lib/verify.mjs';
 const args = process.argv.slice(2);
 const baseURL = String(valueAfter('--api') || process.env.ENCOREARIA_API_BASE || 'https://encorearia.com').replace(/\/$/, '');
 const targetArg = valueAfter('--target');
-const installerVersion = '1.0.0';
+const installerVersion = '1.1.0';
 
 if (args.includes('--list')) {
   const target = (await detectTargets(targetArg ? targetArg.split(',') : []))[0];
   let credentials = await loadCredentials();
-  if (!credentials?.access_token) {
-    const loginService = valueAfter('--service');
-    if (!loginService) fail('--list 首次使用需要同时提供 --service <id>');
-    credentials = await ensureDeviceLogin(baseURL, loginService, 'list', target);
-  }
+  if (!credentials?.access_token) credentials = await ensureDeviceLogin(baseURL, '', 'list', target);
   let services;
-  try { services = await request(baseURL, '/api/agent/services', {}, credentials); }
-  catch (error) {
-    const loginService = valueAfter('--service');
-    if (!loginService) throw new Error(`设备授权已失效；请使用 --service <id> 重新授权。${error.message}`);
-    credentials = await ensureDeviceLogin(baseURL, loginService, 'list', target);
+  try {
+    services = await request(baseURL, '/api/agent/services', {}, credentials);
+  } catch {
+    credentials = await ensureDeviceLogin(baseURL, '', 'list', target);
     services = await request(baseURL, '/api/agent/services', {}, credentials);
   }
   for (const item of services) {
-    process.stdout.write(`${item.service_public_id}\t${item.title}\t${item.currency} ${(item.price_cents / 100).toFixed(2)}\t${item.active_installs} installs\n`);
+    const serviceRef = item.slug || item.service_public_id;
+    const trial = item.trial_available ? '\ttrial' : '';
+    process.stdout.write(`${serviceRef}\t${item.title}\t${item.currency} ${(item.price_cents / 100).toFixed(2)}\t${item.summary || ''}${trial}\n`);
   }
   process.exit(0);
 }
 
-const serviceID = positionalServiceID();
-if (!serviceID) fail('Usage: npx @encorearia/install <service_public_id> [--target codex,claude-code] [--api URL]');
-const pkg = await request(baseURL, '/api/callable-services/' + encodeURIComponent(serviceID) + '/shell');
+if (positionalArgument()) fail('Usage: 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];
-const credentials = await ensureDeviceLogin(baseURL, serviceID, pkg.manifest.shell_version, primaryTarget);
+await ensureDeviceLogin(baseURL, '', pkg.manifest.shell_version, primaryTarget);
+const shellID = pkg.manifest.shell_id || 'encorearia-unified';
 for (const target of targets) {
-  const destination = await atomicInstall(targetRoot(target), serviceID, pkg.files, pkg.manifest);
-  await request(baseURL, '/api/agent/installs', { method: 'POST', body: JSON.stringify({
-    service_public_id: serviceID, shell_version: pkg.manifest.shell_version, client_target: target,
-  }) }, credentials);
-  process.stdout.write(`已安装到 ${target}: ${destination}\n`);
+  const destination = await atomicInstall(targetRoot(target), shellID, pkg.files, pkg.manifest);
+  process.stdout.write(`Installed to ${target}: ${destination}\n`);
 }
 
 function valueAfter(flag) {
@@ -54,8 +48,8 @@ function valueAfter(flag) {
   return index >= 0 ? args[index + 1] : '';
 }
 
-function positionalServiceID() {
-  const valuedFlags = new Set(['--api', '--target', '--service']);
+function positionalArgument() {
+  const valuedFlags = new Set(['--api', '--target']);
   for (let index = 0; index < args.length; index += 1) {
     const value = args[index];
     if (valuedFlags.has(value)) { index += 1; continue; }

package/lib/api.mjs

@@ -69,9 +69,11 @@ export async function ensureDeviceLogin(baseURL, serviceID, shellVersion, client
   if (credentials?.access_token) {
     try { await request(baseURL, '/api/agent/me', {}, credentials); return credentials; } catch {}
   }
-  const start = await request(baseURL, '/api/agent/device/start', { method: 'POST', body: JSON.stringify({
-    service_public_id: serviceID, shell_version: shellVersion, client_name: os.hostname(), client_target: clientTarget,
-  }) });
+  const payload = {
+    shell_version: shellVersion, client_name: os.hostname(), client_target: clientTarget,
+  };
+  if (serviceID) payload.service_public_id = serviceID;
+  const start = await request(baseURL, '/api/agent/device/start', { method: 'POST', body: JSON.stringify(payload) });
   process.stdout.write(`请在浏览器确认设备：${start.verification_uri_complete}\n验证码：${start.user_code}\n`);
   openBrowser(start.verification_uri_complete);
   let interval = start.interval_seconds || 5;

package/lib/atomic-install.mjs

@@ -1,12 +1,12 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-export async function atomicInstall(root, serviceID, files, manifest = null) {
-  if (!/^[A-Za-z0-9_-]{1,100}$/.test(serviceID)) throw new Error('Unsafe service identifier.');
+export async function atomicInstall(root, shellID, files, manifest = null) {
+  if (!/^[A-Za-z0-9_-]{1,100}$/.test(shellID)) throw new Error('Unsafe shell identifier.');
   await fs.mkdir(root, { recursive: true, mode: 0o700 });
-  const destination = path.join(root, serviceID);
-  const temporary = path.join(root, `.${serviceID}.tmp-${process.pid}-${Date.now()}`);
-  const backup = path.join(root, `.${serviceID}.backup-${process.pid}-${Date.now()}`);
+  const destination = path.join(root, shellID);
+  const temporary = path.join(root, `.${shellID}.tmp-${process.pid}-${Date.now()}`);
+  const backup = path.join(root, `.${shellID}.backup-${process.pid}-${Date.now()}`);
   if (manifest) await assertNoRollback(destination, manifest);
   await fs.mkdir(temporary, { recursive: false, mode: 0o700 });
   try {
@@ -18,6 +18,7 @@ export async function atomicInstall(root, serviceID, files, manifest = null) {
     }
     if (manifest) {
       await fs.writeFile(path.join(temporary, '.encorearia-release.json'), JSON.stringify({
+        shell_id: manifest.shell_id || manifest.service_public_id,
         service_public_id: manifest.service_public_id,
         shell_version: manifest.shell_version,
         signing_key_id: manifest.signing_key_id,
@@ -44,7 +45,9 @@ async function assertNoRollback(destination, manifest) {
   let current;
   try { current = JSON.parse(await fs.readFile(path.join(destination, '.encorearia-release.json'), 'utf8')); }
   catch { return; }
-  if (current.service_public_id !== manifest.service_public_id) throw new Error('Installed service identity does not match the signed package.');
+  const currentIdentity = current.shell_id || current.service_public_id;
+  const incomingIdentity = manifest.shell_id || manifest.service_public_id;
+  if (!currentIdentity || currentIdentity !== incomingIdentity) throw new Error('Installed shell identity does not match the signed package.');
   const oldSequence = releaseSequence(current.shell_version);
   const newSequence = releaseSequence(manifest.shell_version);
   const olderSequence = newSequence[0] < oldSequence[0] || (newSequence[0] === oldSequence[0] && newSequence[1] < oldSequence[1]);

package/package.json

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