@baize-ai/core 0.2.0 → 0.3.1

package/cli/commands/add.js

@@ -31,6 +31,7 @@ import { promptYesNo, prompt, promptSecret } from '../lib/prompts.js';
 import { writeEnvEntries } from '../lib/env.js';
 import { hasConfigureHook, runConfigureHook } from '../lib/configure-hook.js';
 import { registerService } from '../lib/service.js';
+import { acquireLock, releaseLock } from '../lib/lock.js';
 import { bold, dim, green, red, yellow, cyan, success, error, warn, heading } from '../lib/colors.js';
 
 function printManualCaddyRoutes(result) {
@@ -328,109 +329,147 @@ export async function addComponent(args) {
     return;
   }
 
-  // 5. Display component info (terminal only)
-  if (!jsonOutput) {
-    const versionInfo = branch ? ` (branch: ${bold(branch)})` : (resolved.version ? `@${bold(resolved.version)}` : '');
-    console.log(`\n${heading('Component:')} ${bold(resolved.name)}${versionInfo}`);
-    console.log(`${heading(resolved.sourceHeading)} ${dim(resolved.sourceLabel)}`);
-
-    if (resolved.deliveredVia) {
-      console.log(`${heading('File:')} ${dim(resolved.deliveredVia.path)}`);
-      console.log(`${heading('Checksum:')} ${resolved.deliveredVia.verified ? green('sha256 verified') : warn('NOT VERIFIED (--trust-file)')}`);
-    }
-
-    if (resolved.isThirdParty) {
-      console.log(warn('Third-party component — not verified by Baize team.'));
-    }
-
-    if (regInfo.description) console.log(`${heading('Description:')} ${regInfo.description}`);
-    if (regInfo.type) console.log(`${heading('Type:')} ${regInfo.type}`);
-  }
-
-  // 6. User confirmation (skip in JSON mode — confirmation handled at application layer)
-  if (!skipConfirm && !jsonOutput) {
-    console.log('');
-    const confirmed = await promptYesNo('Proceed with installation? [Y/n]: ', true);
-    if (!confirmed) {
-      console.log(dim('Installation cancelled.'));
-      return;
-    }
-  }
-
-  // 7. Download
-  const skillDir = path.join(SKILLS_DIR, resolved.name);
-
-  if (fs.existsSync(skillDir)) {
+  // 5. Acquire the component lock — protects every write below (download,
+  // manifest baseline, registration). --check preview mode returned above and
+  // never holds the lock. Held through confirmation; released in the finally
+  // block, and explicitly on process.exit paths (which bypass finally).
+  const lockResult = acquireLock(resolved.name);
+  if (!lockResult.success) {
     if (jsonOutput) {
       console.log(JSON.stringify({
         action: 'add', component: resolved.name, success: false,
-        error: 'skill_dir_exists', message: `Skill directory already exists: ${skillDir}. Remove it first or use "baize upgrade".`,
-        reply: `Cannot install ${resolved.name}: skill directory already exists. Use "upgrade ${resolved.name}" instead.`,
+        error: 'component_locked', message: lockResult.error,
+        reply: `Error: ${lockResult.error}`,
       }, null, 2));
     } else {
-      console.error(`\n${error(`Skill directory already exists: ${dim(skillDir)}`)}`);
-      console.error(dim('Remove it first or use "baize upgrade".'));
+      console.error(error(lockResult.error));
     }
     process.exit(1);
   }
 
-  const downloadLabel = branch ? `${resolved.name} (branch: ${branch})` : resolved.name;
-  if (!jsonOutput) console.log(`\n${cyan('Downloading')} ${bold(downloadLabel)}...`);
+  try {
+    // 6. Display component info (terminal only)
+    if (!jsonOutput) {
+      const versionInfo = branch ? ` (branch: ${bold(branch)})` : (resolved.version ? `@${bold(resolved.version)}` : '');
+      console.log(`\n${heading('Component:')} ${bold(resolved.name)}${versionInfo}`);
+      console.log(`${heading(resolved.sourceHeading)} ${dim(resolved.sourceLabel)}`);
 
-  let downloadResult;
-  if (!resolved.source) {
-    // No release tag found and no --branch specified
-    const errType = resolved.fetchError ? 'fetch_failed' : 'no_release';
-    const errMsg = resolved.fetchError
-      ? `Could not check for releases: ${resolved.fetchError}`
-      : `No release found for ${resolved.name}.`;
-    if (jsonOutput) {
-      console.log(JSON.stringify({
-        action: 'add', component: resolved.name, success: false,
-        error: errType, message: `${errMsg} Use --branch to install from a branch.`,
-        reply: `${errMsg} Use "add ${resolved.name} --branch main" to install from the main branch.`,
-      }, null, 2));
-    } else {
-      console.error(error(errMsg));
-      console.log(dim(`Use "baize add ${resolved.name} --branch main" to install from the main branch.`));
+      if (resolved.deliveredVia) {
+        console.log(`${heading('File:')} ${dim(resolved.deliveredVia.path)}`);
+        console.log(`${heading('Checksum:')} ${resolved.deliveredVia.verified ? green('sha256 verified') : warn('NOT VERIFIED (--trust-file)')}`);
+      }
+
+      if (resolved.isThirdParty) {
+        console.log(warn('Third-party component — not verified by Baize team.'));
+      }
+
+      if (regInfo.description) console.log(`${heading('Description:')} ${regInfo.description}`);
+      if (regInfo.type) console.log(`${heading('Type:')} ${regInfo.type}`);
     }
-    process.exit(1);
-  }
-  // Identity/transport split: acquisition (when present) says where the bytes
-  // come from this once; resolved.source stays the persisted identity.
-  downloadResult = acquireSource(resolved.acquisition || resolved.source, skillDir);
 
-  if (!downloadResult.success) {
-    if (jsonOutput) {
-      console.log(JSON.stringify({
-        action: 'add', component: resolved.name, success: false,
-        error: 'download_failed', message: `Download failed: ${downloadResult.error}`,
-        reply: `Failed to download ${resolved.name}: ${downloadResult.error}`,
-      }, null, 2));
-    } else {
-      console.error(error(`Download failed: ${downloadResult.error}`));
+    // 7. User confirmation (skip in JSON mode — confirmation handled at application layer)
+    if (!skipConfirm && !jsonOutput) {
+      console.log('');
+      const confirmed = await promptYesNo('Proceed with installation? [Y/n]: ', true);
+      if (!confirmed) {
+        console.log(dim('Installation cancelled.'));
+        return;
+      }
     }
-    cleanup(skillDir);
-    process.exit(1);
-  }
 
-  if (!jsonOutput) console.log(`  ${success('Download complete.')}`);
+    // 8. Download
+    const skillDir = path.join(SKILLS_DIR, resolved.name);
+
+    if (fs.existsSync(skillDir)) {
+      // Orphan residue: the skill dir exists but the component was never
+      // registered in components.json — a previous install was interrupted
+      // after extraction (slow download + timeout, crash, killed tab). Remove
+      // it and proceed, so a retry succeeds instead of deadlocking on
+      // "already exists" (web console had no in-UI recovery path).
+      const registered = loadComponents()[resolved.name];
+      if (!registered) {
+        if (!jsonOutput) {
+          console.error(dim(`检测到未完成安装的残留目录，自动清理后继续：${skillDir}`));
+        }
+        fs.rmSync(skillDir, { recursive: true, force: true });
+      } else {
+        if (jsonOutput) {
+          console.log(JSON.stringify({
+            action: 'add', component: resolved.name, success: false,
+            error: 'skill_dir_exists', message: `Skill directory already exists: ${skillDir}. Remove it first or use "baize upgrade".`,
+            reply: `Cannot install ${resolved.name}: skill directory already exists. Use "upgrade ${resolved.name}" instead.`,
+          }, null, 2));
+        } else {
+          console.error(`\n${error(`Skill directory already exists: ${dim(skillDir)}`)}`);
+          console.error(dim('Remove it first or use "baize upgrade".'));
+        }
+        releaseLock(resolved.name);
+        process.exit(1);
+      }
+    }
 
-  // 8. Commit the authoritative install baseline (manifest + originals)
-  try {
-    const manifest = generateManifest(skillDir);
-    saveMergeBaseline(skillDir, skillDir, manifest);
-  } catch (err) {
-    if (!jsonOutput) console.log(`  ${warn(`Could not save install baseline: ${err.message}`)}`);
-  }
+    const downloadLabel = branch ? `${resolved.name} (branch: ${branch})` : resolved.name;
+    if (!jsonOutput) console.log(`\n${cyan('Downloading')} ${bold(downloadLabel)}...`);
+
+    let downloadResult;
+    if (!resolved.source) {
+      // No release tag found and no --branch specified
+      const errType = resolved.fetchError ? 'fetch_failed' : 'no_release';
+      const errMsg = resolved.fetchError
+        ? `Could not check for releases: ${resolved.fetchError}`
+        : `No release found for ${resolved.name}.`;
+      if (jsonOutput) {
+        console.log(JSON.stringify({
+          action: 'add', component: resolved.name, success: false,
+          error: errType, message: `${errMsg} Use --branch to install from a branch.`,
+          reply: `${errMsg} Use "add ${resolved.name} --branch main" to install from the main branch.`,
+        }, null, 2));
+      } else {
+        console.error(error(errMsg));
+        console.log(dim(`Use "baize add ${resolved.name} --branch main" to install from the main branch.`));
+      }
+      releaseLock(resolved.name);
+      process.exit(1);
+    }
+    // Identity/transport split: acquisition (when present) says where the bytes
+    // come from this once; resolved.source stays the persisted identity.
+    downloadResult = acquireSource(resolved.acquisition || resolved.source, skillDir);
+
+    if (!downloadResult.success) {
+      if (jsonOutput) {
+        console.log(JSON.stringify({
+          action: 'add', component: resolved.name, success: false,
+          error: 'download_failed', message: `Download failed: ${downloadResult.error}`,
+          reply: `Failed to download ${resolved.name}: ${downloadResult.error}`,
+        }, null, 2));
+      } else {
+        console.error(error(`Download failed: ${downloadResult.error}`));
+      }
+      cleanup(skillDir);
+      releaseLock(resolved.name);
+      process.exit(1);
+    }
+
+    if (!jsonOutput) console.log(`  ${success('Download complete.')}`);
+
+    // 9. Commit the authoritative install baseline (manifest + originals)
+    try {
+      const manifest = generateManifest(skillDir);
+      saveMergeBaseline(skillDir, skillDir, manifest);
+    } catch (err) {
+      if (!jsonOutput) console.log(`  ${warn(`Could not save install baseline: ${err.message}`)}`);
+    }
 
-  // 9. Detect component type and install accordingly
-  const componentType = detectComponentType(skillDir);
+    // 10. Detect component type and install accordingly
+    const componentType = detectComponentType(skillDir);
 
-  if (componentType === 'declarative') {
-    await installDeclarative(resolved, skillDir, skipConfirm, jsonOutput, branch);
-  } else {
-    installAI(resolved, skillDir, branch);
+    if (componentType === 'declarative') {
+      await installDeclarative(resolved, skillDir, skipConfirm, jsonOutput, branch);
+    } else {
+      installAI(resolved, skillDir, branch);
+    }
+  } finally {
+    releaseLock(resolved.name);
   }
 }
 
@@ -487,6 +526,7 @@ async function installDeclarative(resolved, skillDir, skipConfirm, jsonOutput, b
           console.error(`  ${error(`npm install failed: ${err.message}`)}`);
         }
         cleanup(skillDir);
+        releaseLock(resolved.name);
         process.exit(1);
       }
     }

package/cli/commands/component.js

@@ -955,11 +955,11 @@ function handleSelfCheckOnly({ jsonOutput, branch, beta = false }) {
     } else {
       // Fallback: fetch changelog from remote
       try {
-        const rawChangelog = fetchRawFile('baize-ai/baize-core', 'CHANGELOG.md', `v${check.latest}`);
+        const rawChangelog = fetchRawFile('baize01-ai/baize-core', 'CHANGELOG.md', `v${check.latest}`);
         changelog = filterChangelog(rawChangelog, check.current);
       } catch {
         try {
-          const rawChangelog = fetchRawFile('baize-ai/baize-core', 'CHANGELOG.md');
+          const rawChangelog = fetchRawFile('baize01-ai/baize-core', 'CHANGELOG.md');
           changelog = filterChangelog(rawChangelog, check.current);
         } catch {
           // CHANGELOG.md may not exist
@@ -1250,8 +1250,31 @@ export async function uninstallComponent(args) {
     return handleUninstallCheck(target, { jsonOutput });
   }
 
-  const ok = await handleRemoveFlow(target, { purge: explicitPurge, skipConfirm: skipConfirm || explicitConfirm, force, jsonOutput });
-  if (!ok) process.exit(1);
+  // Acquire the component lock — protects every removal write below (service,
+  // bins, Caddy routes, skill/data dirs, components.json). --check preview
+  // mode returns above and never holds the lock.
+  const lockResult = acquireLock(target);
+  if (!lockResult.success) {
+    if (jsonOutput) {
+      const errOutput = { action: 'uninstall', component: target, success: false, error: lockResult.error };
+      errOutput.reply = formatC4Reply('error', { message: lockResult.error });
+      console.log(JSON.stringify(errOutput, null, 2));
+    } else {
+      console.error(`Error: ${lockResult.error}`);
+    }
+    process.exit(1);
+  }
+
+  try {
+    const ok = await handleRemoveFlow(target, { purge: explicitPurge, skipConfirm: skipConfirm || explicitConfirm, force, jsonOutput });
+    if (!ok) {
+      // Release before exit — process.exit() bypasses the finally block
+      releaseLock(target);
+      process.exit(1);
+    }
+  } finally {
+    releaseLock(target);
+  }
 }
 
 /**

package/cli/commands/doctor.js

@@ -1,7 +1,7 @@
 /**
  * baize doctor — diagnose installation health and auto-fix via Claude.
  *
- * Design: https://github.com/baize-ai/baize-core/issues/202
+ * Design: https://github.com/baize01-ai/baize-core/issues/202
  *
  * Layer 1: Diagnose all checks. Ensure Claude CLI is reachable.
  * Layer 2: If Claude is available, delegate all fixes to `claude -p`.
@@ -811,7 +811,7 @@ export async function doctorCommand(args) {
       const targets = [];
 
       if (coreVersion.success) {
-        targets.push({ name: 'baize-core', repo: 'baize-ai/baize-core', current: coreVersion.version });
+        targets.push({ name: 'baize-core', repo: 'baize01-ai/baize-core', current: coreVersion.version });
       }
 
       for (const [name, info] of Object.entries(components)) {

package/cli/commands/init.js

@@ -867,6 +867,11 @@ function syncCoreSkills() {
 
 /**
  * Install npm dependencies for all skills that need them.
+ * Idempotent: if a skill's dependencies are already installed AND loadable
+ * (native modules included), the install is skipped. This is what makes the
+ * Docker image reproducible — the image bakes deps at build time (with a
+ * local-compile fallback), so runtime init must NOT reinstall them (a reinstall
+ * can pull a broken platform prebuild, e.g. better-sqlite3 Mach-O on linux).
  */
 function installSkillDependencies() {
   const entries = fs.readdirSync(SKILLS_DIR, { withFileTypes: true });
@@ -880,6 +885,10 @@ function installSkillDependencies() {
       const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
       if (!pkg.dependencies || Object.keys(pkg.dependencies).length === 0) continue;
 
+      if (skillDepsUsable(skillDir, pkg.dependencies)) {
+        continue;
+      }
+
       console.log(`  ${cyan(`Installing ${bold(entry.name)} dependencies...`)}`);
       execSync('npm install --production', {
         cwd: skillDir,
@@ -892,6 +901,25 @@ function installSkillDependencies() {
   }
 }
 
+/**
+ * True when every dependency of the skill is already installed AND require()-able
+ * from the skill directory (catches broken native modules: prebuild downloads of
+ * the wrong platform still leave a node_modules entry, but require() fails).
+ */
+function skillDepsUsable(skillDir, dependencies) {
+  const names = Object.keys(dependencies);
+  if (names.length === 0) return true;
+  for (const name of names) {
+    const probe = `require(${JSON.stringify(name)});`;
+    try {
+      execFileSync(process.execPath, ['-e', probe], { cwd: skillDir, stdio: 'ignore' });
+    } catch {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * Ensure a web-console password exists in .env.
  * Reads from BAIZE_WEB_PASSWORD (new name), falls back to WEB_CONSOLE_PASSWORD (legacy).

package/cli/commands/self-uninstall.js

@@ -1,7 +1,7 @@
 /**
  * baize uninstall --self — Remove baize entirely from the system.
  *
- * Design: https://github.com/baize-ai/baize-core/issues/212
+ * Design: https://github.com/baize01-ai/baize-core/issues/212
  *
  * Phase 1: Stop services (tmux sessions + PM2 baize services)
  * Phase 2: Uninstall the baize npm package

package/cli/lib/__tests__/instruction-split.test.js

@@ -85,7 +85,7 @@ describe('split instruction assembler', () => {
     // pins alongside the reviewed content change (issue #722 content redraft).
     const managedHeader = '> **Baize-managed system instructions.** This file is replaced during upgrades. Put all custom instructions in `~/baize/BAIZE.md`.\n\n';
     const expected = {
-      claude: '53b8adaa0898c8e460c5a56009b5921060c0d38aa189e7f50dca199070d1098b',
+      claude: '38b978aef11ae181a7fe5bc94e13f25275de6fe85313b836a00b70095c294053',
       codex: '1caab5d34fbe6ec9c858f94953fdc5d1abce27167f91597875ba6b091600c4e1',
     };
     for (const runtime of ['claude', 'codex']) {

package/cli/lib/a2a.js

@@ -0,0 +1,235 @@
+/**
+ * A2A CLI delegation helpers (D19 contract §6).
+ *
+ * All `baize a2a` subcommands delegate to the @baize-ai/baize-a2a channel's
+ * scripts/cli.js, which emits a single JSON object on stdout with --json
+ * (success exit 0; failure = error detail on stderr + exit 1).
+ *
+ * Resolution precedence:
+ *   BAIZE_A2A_PATH env → project node_modules (@baize-ai/baize-a2a)
+ *   → global npm package (npm root -g + @baize-ai/baize-a2a)
+ *   → dev sibling repo (../baize-a2a relative to the core checkout).
+ */
+
+import { spawn, execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+/**
+ * Ordered candidate paths for the baize-a2a scripts/cli.js entry (excluding
+ * the BAIZE_A2A_PATH env override, which takes precedence in a2aCliPath()).
+ */
+export function a2aCliCandidates() {
+  const candidates = [
+    // a2a installed as a channel (`baize add` → ~/baize/.claude/skills/a2a/)
+    path.join(process.env.BAIZE_DIR || path.join(os.homedir(), 'baize'), '.claude', 'skills', 'a2a', 'scripts', 'cli.js'),
+    // a2a installed into the same node_modules as this checkout
+    path.join(__dirname, '..', '..', 'node_modules', '@baize-ai', 'baize-a2a', 'scripts', 'cli.js'),
+    // core installed as a dependency with a2a as a sibling package
+    path.join(__dirname, '..', '..', '..', '@baize-ai', 'baize-a2a', 'scripts', 'cli.js'),
+  ];
+  try {
+    const npmRoot = execFileSync('npm', ['root', '-g'], { encoding: 'utf8', timeout: 10000 }).trim();
+    candidates.push(path.join(npmRoot, '@baize-ai', 'baize-a2a', 'scripts', 'cli.js'));
+  } catch {
+    // npm unavailable — skip the global layout
+  }
+  // Dev-time sibling repo (../baize-a2a next to baize-core)
+  candidates.push(path.join(__dirname, '..', '..', '..', 'baize-a2a', 'scripts', 'cli.js'));
+  return candidates;
+}
+
+/**
+ * Locate the baize-a2a scripts/cli.js entry.
+ * @returns {string|null} absolute path, or null when not found.
+ */
+export function a2aCliPath() {
+  const envPath = process.env.BAIZE_A2A_PATH;
+  if (envPath) {
+    if (fs.existsSync(envPath)) {
+      // Accept either the cli.js file itself or the package directory.
+      if (fs.statSync(envPath).isDirectory()) {
+        const inner = path.join(envPath, 'scripts', 'cli.js');
+        if (fs.existsSync(inner)) return inner;
+      } else {
+        return envPath;
+      }
+    }
+  }
+  return a2aCliCandidates().find((c) => fs.existsSync(c)) || null;
+}
+
+/**
+ * Run a baize-a2a CLI command, always with --json appended.
+ *
+ * The child gets a piped stdin that is ended immediately: the baize-a2a CLI
+ * merges a JSON object from stdin (contract §6) and blocks until stdin EOF,
+ * so an 'ignore' stream would hang it forever.
+ *
+ * @param {string[]} args argv after the subcommand (e.g. ['enable', '--admin', url])
+ * @param {object} [opts]
+ * @param {string} [opts.cliPath] resolved cli.js path (defaults to a2aCliPath())
+ * @param {number} [opts.timeout] exec timeout ms (default 120s; task sync uses 10min+)
+ * @param {Function} [opts.spawnFn] injectable spawn for tests
+ * @returns {Promise<{success:boolean, json?:object, output?:string, error?:string}>}
+ */
+export function runA2aCli(args, { cliPath = a2aCliPath(), timeout = 120000, spawnFn = spawn } = {}) {
+  const cli = typeof cliPath === 'function' ? cliPath() : cliPath;
+  if (!cli) {
+    return Promise.resolve({
+      success: false,
+      error: '未找到 baize-a2a CLI（设置 BAIZE_A2A_PATH 或安装 @baize-ai/baize-a2a）',
+    });
+  }
+  const argv = args.includes('--json') ? [...args] : [...args, '--json'];
+  return new Promise((resolve) => {
+    const child = spawnFn(process.execPath, [cli, ...argv], {
+      env: { ...process.env },
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    let stdout = '';
+    let stderr = '';
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (settled) return;
+      settled = true;
+      child.kill('SIGTERM');
+      resolve({ success: false, error: `a2a 命令超时（${Math.round(timeout / 1000)}s）`, output: (stdout || stderr).trim() });
+    }, timeout);
+    child.stdout.on('data', (d) => { stdout += String(d); });
+    child.stderr.on('data', (d) => { stderr += String(d); });
+    child.on('error', (err) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      resolve({ success: false, error: err.message });
+    });
+    child.on('close', (code) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      const raw = stdout.trim();
+      let json = null;
+      try {
+        json = raw ? JSON.parse(raw) : null;
+      } catch {
+        // non-JSON stdout
+      }
+      if (code === 0) {
+        resolve({ success: true, json: json || {}, output: raw });
+        return;
+      }
+      const detail = (json?.error || stderr.trim() || raw || `exit ${code}`).slice(-1500);
+      resolve({ success: false, error: detail, json, output: raw || stderr.trim() });
+    });
+    child.stdin.end();
+  });
+}
+
+// ── Human-readable output ───────────────────────────────────────────────────
+
+const KEY_LABELS = {
+  status: [
+    ['enabled', '启用'],
+    ['agentId', 'Agent ID'],
+    ['registered', '已注册'],
+    ['registrationStatus', '注册状态'],
+    ['advertiseUrl', '宣告地址'],
+    ['endpoint', 'Endpoint'],
+    ['version', '版本'],
+  ],
+  enable: [
+    ['agentId', 'Agent ID'],
+    ['registrationId', '注册 ID'],
+    ['status', '状态'],
+  ],
+  send: [
+    ['status', '状态'],
+    ['requestId', 'Request ID'],
+  ],
+  task: [
+    ['taskId', '任务 ID'],
+    ['status', '状态'],
+    ['result', '结果'],
+    ['error', '错误'],
+  ],
+  'task-status': [
+    ['taskId', '任务 ID'],
+    ['status', '状态'],
+    ['message', '消息'],
+    ['result', '结果'],
+    ['createdAt', '创建时间'],
+    ['updatedAt', '更新时间'],
+    ['completedAt', '完成时间'],
+  ],
+  'task-cancel': [
+    ['taskId', '任务 ID'],
+    ['status', '状态'],
+  ],
+};
+
+function boolText(value) {
+  if (value === true || value === 'true') return '是';
+  if (value === false || value === 'false') return '否';
+  return value;
+}
+
+function listBlock(title, rows) {
+  if (!rows.length) return [`${title}：（无）`];
+  return [`${title}：`, ...rows.map((r) => `  • ${r}`)];
+}
+
+/**
+ * Format a delegated JSON result for terminal display.
+ * Falls back to pretty-printed JSON for unknown shapes.
+ */
+export function formatA2aOutput(kind, json) {
+  const lines = [];
+  const pushKV = (k, v) => {
+    if (v !== undefined && v !== null && v !== '') lines.push(`${k}: ${v}`);
+  };
+
+  if (kind === 'peer-list') {
+    const peers = json.peers || [];
+    lines.push(...listBlock('Peer 目录', peers.map((p) => {
+      const skills = Array.isArray(p.skills) && p.skills.length
+        ? `（skills: ${p.skills.map((s) => (typeof s === 'string' ? s : s.id || s.name)).join(', ')}）` : '';
+      const expiry = p.expiresAt ? `，缓存至 ${p.expiresAt}` : '';
+      return `${p.agentId}${skills}${expiry}\n    endpoint: ${p.endpoint || '-'}`;
+    })));
+  } else if (kind === 'search') {
+    const agents = json.agents || [];
+    lines.push(...listBlock('搜索结果', agents.map((a) => {
+      const meta = [a.status, a.team, a.role].filter(Boolean).join(' · ');
+      const labels = Array.isArray(a.labels) && a.labels.length ? `，labels: ${a.labels.join(', ')}` : '';
+      const reach = a.reachability != null ? `，reachability: ${a.reachability}` : '';
+      return `${a.agentId}${a.name ? `（${a.name}）` : ''}${meta ? ` — ${meta}` : ''}${labels}${reach}`;
+    })));
+  } else if (kind === 'disable') {
+    return json.ok === true ? 'A2A 已停用' : JSON.stringify(json, null, 2);
+  } else if (kind === 'status') {
+    const pairs = KEY_LABELS.status;
+    for (const [k, label] of pairs) {
+      if (k === 'enabled' || k === 'registered') {
+        if (json[k] !== undefined) lines.push(`${label}: ${boolText(json[k])}`);
+      } else {
+        pushKV(label, json[k]);
+      }
+    }
+  } else if (kind === 'task') {
+    // async task returns early; sync task may carry result/error
+    for (const [k, label] of KEY_LABELS.task) pushKV(label, json[k]);
+    if (json.status === 'failed' && json.error) lines.push(`错误: ${json.error}`);
+  } else if (KEY_LABELS[kind]) {
+    for (const [k, label] of KEY_LABELS[kind]) pushKV(label, json[k]);
+  } else {
+    return JSON.stringify(json, null, 2);
+  }
+
+  return lines.length ? lines.join('\n') : JSON.stringify(json, null, 2);
+}

package/cli/lib/lock.js

@@ -1,6 +1,6 @@
 /**
- * File-based lock utilities for component upgrades
- * Prevents concurrent upgrades of the same component
+ * File-based lock utilities for component operations
+ * Prevents concurrent operations (add / upgrade / uninstall) on the same component
  */
 
 import fs from 'node:fs';
@@ -60,7 +60,7 @@ export function acquireLock(component) {
         // Valid lock exists
         return {
           success: false,
-          error: `Component "${component}" is being upgraded by PID ${lockData.pid}`,
+          error: `Component "${component}" is being operated on by PID ${lockData.pid}`,
           existingPid: lockData.pid,
         };
       }

package/cli/lib/self-upgrade.js

@@ -27,7 +27,7 @@ import { deployManifestTemplate } from './runtime/tmux-env.js';
 import { writeCodexConfig } from './runtime-setup.js';
 import { getCoreEcosystemPath, restartManagedProcess } from './pm2.js';
 
-const REPO = 'baize-ai/baize-core';
+const REPO = 'baize01-ai/baize-core';
 
 // ---------------------------------------------------------------------------
 // Version helpers

package/docker-compose.yml

@@ -12,7 +12,7 @@
 
 services:
   baize:
-    image: ghcr.io/baize-ai/baize-core:latest
+    image: ghcr.io/baize01-ai/baize-core:latest
     container_name: baize
     restart: unless-stopped