@baize-ai/core 0.3.13 → 0.3.15

package/docker/entrypoint.sh

@@ -94,18 +94,9 @@ if ! baize init ${INIT_ARGS}; then
 fi
 ok "Workspace ready"
 mkdir -p "${BAIZE_DIR}/.baize"
-# ── Local-source skills override (BAIZE_LOCAL_SKILLS=1 images) ──────────────
-# Images built with BAIZE_LOCAL_SKILLS=1 bake the repo's skills into
-# /home/baize/.local-skills. syncSkills (npm postinstall) runs during init
-# with the npm-package skills as source, so apply the local override AFTER
-# init to keep un-released fixes (e.g. D44) authoritative.
-# Official images ship an empty .local-skills — this is a no-op there.
-if [ -d /home/baize/.local-skills ]; then
-  cp -rf /home/baize/.local-skills/. "${BAIZE_DIR}/.claude/skills/" 2>/dev/null \
-    && ok "Local-source skills applied (BAIZE_LOCAL_SKILLS=1)"
-fi
+printf '{"status":"ok","at":"%s"}\n' "$(date -Iseconds)" > "${BAIZE_DIR}/.baize/init-state.json"
+
 
-# ── Pass through channel env vars to .env ─────────────────────────────────────
 
 # ── Pass through channel env vars to .env ─────────────────────────────────────
 # baize init doesn't write channel tokens — those come from component installs.
@@ -161,6 +152,8 @@ PM2_PID=$!
 sleep 3
 ok "Services started"
 
+# ── Step 4: Start the configured agent runtime in tmux ───────────────────────
+
 # ── Step 4: Start the configured agent runtime in tmux ───────────────────────
 # Determine runtime: BAIZE_RUNTIME env var always wins; fall back to config.json.
 if [ -z "${BAIZE_RUNTIME:-}" ]; then

package/docker-compose.yml

@@ -57,9 +57,27 @@ services:
 
     # ── Health ────────────────────────────────────────────────────────────────
     healthcheck:
-      test: ["CMD", "pm2", "list"]
+      test:
+        - CMD
+        - node
+        - -e
+        - |
+          const fs = require('fs'), net = require('net');
+          // Core health = pm2 reports online. A2A (commercial component, D49):
+          // when installed and enabled, the container is only healthy if its
+          // daemon actually LISTENS (pm2 status alone masked the KI-015
+          // silent-idle shape); otherwise the check is skipped.
+          try { require('child_process').execSync('pm2 list', { stdio: 'ignore' }); } catch { process.exit(1); }
+          try {
+            const cfg = JSON.parse(fs.readFileSync('/home/baize/baize/components/a2a/config.json', 'utf8'));
+            if (cfg.enabled !== true) process.exit(0);
+            const s = net.connect({ host: '127.0.0.1', port: cfg.listenPort || 8443, timeout: 3000 });
+            s.on('connect', () => { s.destroy(); process.exit(0); });
+            s.on('error', () => process.exit(1));
+            s.on('timeout', () => { s.destroy(); process.exit(1); });
+          } catch { process.exit(0); }
       interval: 30s
-      timeout: 10s
+      timeout: 15s
       retries: 3
       start_period: 600s
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@baize-ai/core",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "type": "module",
-  "description": "Baize (\u767d\u6cfd) \u2014 autonomous AI agent infrastructure",
+  "description": "Baize (白泽) — autonomous AI agent infrastructure",
   "main": "cli/baize.js",
   "bin": {
     "baize": "./cli/baize.js"
@@ -46,4 +46,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/scripts/build-push-acr.sh

@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 # Multi-platform build + push to Aliyun ACR for the mainland distribution.
-# Usage:  bash build-push-acr.sh [VERSION]   (default 0.3.11)
+# Usage:  bash build-push-acr.sh [VERSION]   (default = latest published)
+# IMPORTANT: bump this default when a new version is published — it must
+# track @baize-ai/core latest (never point at an un-released version).
 # Requires: docker login already done, qemu-arm64 registered
 #           (apt install qemu-user-binfmt), registry mirror configured.
 set -euo pipefail
 
-VERSION="${1:-0.3.11}"
+VERSION="${1:-0.3.13}"
 ACR="crpi-8bg62qbrjs3cr3as.cn-hangzhou.personal.cr.aliyuncs.com/baize01/baize-core"
 
 echo "== Configure buildkit registry mirror (mainland Docker Hub access) =="

package/scripts/docker-publish.sh

@@ -30,22 +30,15 @@ ACR_NAMESPACE="${ACR_NAMESPACE:-baize01}"
 
 # ── Build ────────────────────────────────────────────────────────────────────
 echo "==> Building baize-core:${VERSION} (from npm @baize-ai/core@${VERSION})"
-BUILD_ARGS=(--build-arg "BAZE_CORE_VERSION=${VERSION}")
-rm -rf .docker-local-skills && mkdir -p .docker-local-skills
-if [ "${BAIZE_LOCAL_SKILLS:-0}" = "1" ]; then
-  BUILD_ARGS+=(--build-arg BAIZE_LOCAL_SKILLS=1)
-  echo "==> Overriding skills with LOCAL repo source (BAIZE_LOCAL_SKILLS=1) — un-released fixes baked in"
-  cp -r skills/. .docker-local-skills/
-  # Never ship host-compiled node_modules (mac binaries break linux runtime) —
-  # dependency binaries come from the image's own npm install.
-  find .docker-local-skills -type d -name node_modules -prune -exec rm -rf {} +
-fi
 docker build \
+  --build-arg BAZE_CORE_VERSION="${VERSION}" \
+  -t "${GHCR_IMAGE}:${VERSION}" \
+  -t "${GHCR_IMAGE}:latest" \
+  .
   "${BUILD_ARGS[@]}" \
   -t "${GHCR_IMAGE}:${VERSION}" \
   -t "${GHCR_IMAGE}:latest" \
   .
-rm -rf .docker-local-skills
 
 if [ -n "${ACR_REGISTRY}" ] && [ -n "${ACR_NAMESPACE}" ]; then
   ACR_IMAGE="${ACR_REGISTRY}/${ACR_NAMESPACE}/baize-core"

package/skills/web-console/public/app.js

@@ -1655,6 +1655,19 @@ async function loadA2aStatus(basePath) {
     state.textContent = enabled ? '已启用' : '未启用';
     state.className = `channel-state ${enabled ? 'ok' : 'warn'}`;
   }
+  // D48: certificate health — the daemon self-heals (re-registers) when the
+  // admin rotated its CA. Only claim "auto-healing" when the daemon is
+  // actually alive to run the 5-min renewal check; otherwise the user must
+  // act (daemon down / renewals exhausted).
+  const certValid = body.certValid === true;
+  const daemonUp = body.daemonHealthy === true;
+  let certLabel = '正常';
+  if (!certValid) {
+    certLabel = daemonUp ? '需续签（自动处理中）' : '证书待续签（daemon 未运行）';
+  }
+  const certRow = body.enabled === true
+    ? `<div class="conn-summary-row"><span class="conn-summary-name">证书状态</span><span class="conn-summary-detail"><span class="channel-state ${certValid ? 'ok' : 'warn'}">${certLabel}</span></span></div>`
+    : '';
   const rows = [
     ['启用', enabled ? '是' : '否'],
     ['Agent ID', body.agentId],
@@ -1664,7 +1677,7 @@ async function loadA2aStatus(basePath) {
     ['Endpoint', body.endpoint],
     ['版本', body.version],
   ].filter(([, v]) => v !== undefined && v !== null && v !== '');
-  el.innerHTML = rows.map(([k, v]) => `<div class="conn-summary-row"><span class="conn-summary-name">${escapeHtml(k)}</span><span class="conn-summary-detail">${escapeHtml(String(v))}</span></div>`).join('');
+  el.innerHTML = rows.map(([k, v]) => `<div class="conn-summary-row"><span class="conn-summary-name">${escapeHtml(k)}</span><span class="conn-summary-detail">${escapeHtml(String(v))}</span></div>`).join('') + certRow;
   updateA2aInstallArea(body);
   updateA2aModeCard(body);
   updateA2aConfigArea(body);
@@ -1706,10 +1719,10 @@ function updateA2aInstallArea(body) {
   if (!el || !fileInput || !btn) return;
   const version = body && (body.version || body.installedVersion);
   if (version) {
-    el.textContent = `已安装 baize-a2a v${String(version).replace(/^v/, '')}。如需升级请重新上传模块包。`;
+    el.textContent = `已安装 baize-a2a v${String(version).replace(/^v/, '')} — 上传更高版本的模块包（.tgz）可在线升级（相同或更低版本将被拒绝）。`;
     if (state) { state.textContent = '已安装'; state.className = 'channel-state ok'; }
-    fileInput.disabled = true;
-    btn.disabled = true;
+    fileInput.disabled = false;
+    btn.disabled = false;
   } else {
     el.textContent = '未安装 — 上传 baize-a2a 模块包（.tgz）完成安装。';
     if (state) { state.textContent = '未安装'; state.className = 'channel-state warn'; }
@@ -1769,11 +1782,16 @@ function updateA2aHealth(body, peerCountOverride) {
   } else if (_lastA2aPeerCount !== null) {
     peerCount = _lastA2aPeerCount;
   }
+  const bs = body && body.bootstrap ? body.bootstrap : null;
+  const bsLabel = !bs ? '' : (bs.status === 'ok' || bs.status === 'launched'
+    ? `启动中/已启动（${escapeHtml(String(bs.via || bs.status))}）`
+    : `失败：${escapeHtml(String(bs.error || bs.status))}`);
   const rows = [
     ['Daemon 健康', healthy ? '✅ 正常' : '❌ 异常'],
     ['运行模式', modeLabel],
     ['Peer 数', peerCount],
     ['最近心跳', a2aHeartbeatLabel(body)],
+    ...(bsLabel ? [['init 自启动', bsLabel]] : []),
   ].filter(([, v]) => v !== undefined && v !== null && v !== '');
   el.innerHTML = rows.map(([k, v]) => `<div class="conn-summary-row"><span class="conn-summary-name">${escapeHtml(k)}</span><span class="conn-summary-detail">${escapeHtml(String(v))}</span></div>`).join('');
   if (state) {
@@ -2269,7 +2287,7 @@ async function submitA2aInstall(basePath, btn) {
   }
   const original = btn.textContent;
   btn.disabled = true;
-  btn.textContent = '上传安装中...';
+  btn.textContent = '上传处理中...';
   feedback.textContent = '';
   feedback.className = '';
   const fd = new FormData();
@@ -2278,11 +2296,23 @@ async function submitA2aInstall(basePath, btn) {
     const { status, body } = await adminFetch(basePath, '/api/admin/a2a/install', { method: 'POST', body: fd });
     if (body.ok === true || body.success === true) {
       const version = body.version ? ` v${String(body.version).replace(/^v/, '')}` : '';
-      feedback.textContent = `✅ 安装成功${version}`;
+      const verb = body.upgraded ? '升级' : '安装';
+      let okMsg = `✅ ${verb}成功${version}`;
+      if (body.upgraded && body.restarted === false) {
+        okMsg += `（⚠️ daemon 重启失败：${body.restartError || '未知原因'}，请检查状态卡或手动重启）`;
+      }
+      feedback.textContent = okMsg;
       feedback.className = 'a2a-feedback-ok';
       fileInput.value = '';
-      setAdminMsg(`✅ baize-a2a 安装成功${version}`);
-      loadA2aStatus(basePath); // 刷新版本/模式/健康
+      setAdminMsg(`✅ baize-a2a ${verb}成功${version}`);
+      loadA2aStatus(basePath); // 刷新版本/模式/健康/安装卡
+    } else if (body.error === 'version_not_higher') {
+      const local = body.local ? `v${String(body.local).replace(/^v/, '')}` : '未知';
+      const incoming = body.incoming ? `v${String(body.incoming).replace(/^v/, '')}` : '未知';
+      const msg = `上传版本 ${incoming} 不高于已安装版本 ${local}，未执行升级`;
+      feedback.textContent = `❌ 升级被拒绝：${msg}`;
+      feedback.className = 'a2a-feedback-error';
+      setAdminMsg(`❌ 升级被拒绝：${msg}`, true);
     } else {
       const msg = body.error || body.message || `HTTP ${status}`;
       feedback.textContent = `❌ 安装失败：${msg}`;

package/skills/web-console/public/index.html

@@ -323,7 +323,7 @@
               <div class="cred-state" id="a2a-install-status" role="status" aria-live="polite">加载中...</div>
               <form id="form-a2a-install" class="settings-form">
                 <input type="file" id="a2a-install-file" accept=".tgz,.tar.gz,.zip" aria-label="选择 baize-a2a 模块包">
-                <button type="submit" class="btn btn-primary" id="btn-a2a-install">上传安装</button>
+                <button type="submit" class="btn btn-primary" id="btn-a2a-install">上传安装/升级</button>
               </form>
               <div class="cred-state" id="a2a-install-feedback" role="status" aria-live="polite"></div>
             </div>

package/skills/web-console/scripts/a2a-admin.js

@@ -362,63 +362,76 @@ function rebuildNativeDeps(cwd) {
 }
 
 /**
- * Install @baize-ai/baize-a2a from an uploaded .tar.gz (D25 私有交付).
- * Pipeline: entry listing + path-safety vetting (no `..`/absolute/links) →
- * manifest check (name = @baize-ai/baize-a2a, version present) → extract to
- * SKILLS_DIR/a2a → npm install --omit=dev → components.json registration.
- * Already installed → { ok:false, error } naming the installed version
- * (mirrors `baize add`; version bumps go through `baize upgrade a2a`).
+ * Shared upload vetting for install/upgrade (D25/D49): extension → size →
+ * entry listing → path-traversal scan → link scan → package manifest.
  *
- * @returns {Promise<{ok:boolean, version?:string, error?:string}>}
+ * @returns {{ error: string } | { pkg: object, entries: string[] }}
  */
-export async function installA2aTarball(tarballPath, {
-  skillsDir = defaultSkillsDir(),
-  componentsFile: componentsPath = componentsFile(),
-  installDeps = npmInstallDeps,
-  rebuildDeps = rebuildNativeDeps,
-  originalName = null,
-} = {}) {
-  const file = String(tarballPath || '');
+function validateA2aTarball(file, originalName) {
   const nameForType = String(originalName || file || '');
   if (!/\.(?:tar\.gz|tgz)$/i.test(nameForType)) {
-    return { ok: false, error: '安装包必须是 .tar.gz 归档' };
+    return { error: '安装包必须是 .tar.gz 归档' };
   }
   let stat;
   try {
     stat = fs.statSync(file);
   } catch {
-    return { ok: false, error: '上传文件不存在或不可读' };
+    return { error: '上传文件不存在或不可读' };
   }
   if (stat.size > A2A_INSTALL_MAX_BYTES) {
-    return { ok: false, error: `文件超过 ${A2A_INSTALL_MAX_MB}MB 限制` };
+    return { error: `文件超过 ${A2A_INSTALL_MAX_MB}MB 限制` };
   }
   let entries;
   try {
     entries = listTarballEntries(file);
   } catch (err) {
-    return { ok: false, error: `无法读取归档: ${err.message}` };
+    return { error: `无法读取归档: ${err.message}` };
   }
-  if (entries.length === 0) return { ok: false, error: '归档为空' };
+  if (entries.length === 0) return { error: '归档为空' };
   const unsafe = entries.find(isUnsafeArchiveEntry);
-  if (unsafe) return { ok: false, error: `归档包含不安全的路径条目: ${unsafe}` };
+  if (unsafe) return { error: `归档包含不安全的路径条目: ${unsafe}` };
   try {
     assertNoArchiveLinks(file);
   } catch (err) {
-    return { ok: false, error: err.message };
+    return { error: err.message };
   }
   let pkg;
   try {
     pkg = readTarballPackageJson(file, entries);
   } catch (err) {
-    return { ok: false, error: `manifest 解析失败: ${err.message}` };
+    return { error: `manifest 解析失败: ${err.message}` };
   }
-  if (!pkg) return { ok: false, error: '归档缺少 package.json' };
+  if (!pkg) return { error: '归档缺少 package.json' };
   if (pkg.name !== A2A_PACKAGE_NAME) {
-    return { ok: false, error: `manifest name 不符: 期望 ${A2A_PACKAGE_NAME}，实际 ${pkg.name}` };
+    return { error: `manifest name 不符: 期望 ${A2A_PACKAGE_NAME}，实际 ${pkg.name}` };
   }
   if (typeof pkg.version !== 'string' || !pkg.version.trim()) {
-    return { ok: false, error: 'manifest 缺少 version' };
+    return { error: 'manifest 缺少 version' };
   }
+  return { pkg, entries };
+}
+
+/**
+ * Install @baize-ai/baize-a2a from an uploaded .tar.gz (D25 私有交付).
+ * Pipeline: entry listing + path-safety vetting (no `..`/absolute/links) →
+ * manifest check (name = @baize-ai/baize-a2a, version present) → extract to
+ * SKILLS_DIR/a2a → npm install --omit=dev → components.json registration.
+ * Already installed → { ok:false, error } naming the installed version
+ * (the web route dispatches to upgradeA2aTarball instead — D49 K3).
+ *
+ * @returns {Promise<{ok:boolean, version?:string, error?:string}>}
+ */
+export async function installA2aTarball(tarballPath, {
+  skillsDir = defaultSkillsDir(),
+  componentsFile: componentsPath = componentsFile(),
+  installDeps = npmInstallDeps,
+  rebuildDeps = rebuildNativeDeps,
+  originalName = null,
+} = {}) {
+  const file = String(tarballPath || '');
+  const verdict = validateA2aTarball(file, originalName);
+  if (verdict.error) return { ok: false, error: verdict.error };
+  const { pkg, entries } = verdict;
   const targetDir = path.join(skillsDir, 'a2a');
   const installed = readComponents(componentsPath).a2a;
   if (fs.existsSync(targetDir) || installed) {
@@ -456,6 +469,175 @@ export async function installA2aTarball(tarballPath, {
   return { ok: true, version: pkg.version };
 }
 
+/** Semver compare (no deps; returns -1|0|1, null when unparseable).
+ * Prerelease ranks below release; prerelease identifiers compared
+ * numerically when numeric, lexically otherwise. */
+export function compareA2aSemver(a, b) {
+  const parse = (v) => String(v || '').trim().replace(/^v/, '')
+    .match(/^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/);
+  const pa = parse(a);
+  const pb = parse(b);
+  if (!pa || !pb) return null;
+  for (const i of [1, 2, 3]) {
+    const av = Number(pa[i]);
+    const bv = Number(pb[i]);
+    if (av !== bv) return av < bv ? -1 : 1;
+  }
+  if (pa[4] === pb[4]) return 0;
+  if (!pa[4]) return 1;
+  if (!pb[4]) return -1;
+  const aParts = pa[4].split('.');
+  const bParts = pb[4].split('.');
+  for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {
+    const av = aParts[i];
+    const bv = bParts[i];
+    if (av === bv) continue;
+    if (av === undefined) return -1;
+    if (bv === undefined) return 1;
+    const an = /^\d+$/.test(av) ? Number(av) : null;
+    const bn = /^\d+$/.test(bv) ? Number(bv) : null;
+    if (an !== null && bn !== null) return an < bn ? -1 : 1;
+    if (an !== null) return -1;
+    if (bn !== null) return 1;
+    return av < bv ? -1 : 1;
+  }
+  return 0;
+}
+
+function readInstalledPkgVersion(skillDir) {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(path.join(skillDir, 'package.json'), 'utf8'));
+    return typeof pkg.version === 'string' ? pkg.version.trim() : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Upgrade an installed @baize-ai/baize-a2a from an uploaded .tar.gz
+ * (D49 K3 — web 重传 = 升级). Gate: incoming semver must be strictly higher
+ * than the installed one (components.json version first, skill package.json
+ * fallback); otherwise { ok:false, error:'version_not_higher', local, incoming }.
+ * Pipeline: backup skillDir/.backup/<ts> (upgrade.js .backup convention) →
+ * extract over skillDir → npm install --omit=dev + rebuild (D44) →
+ * components.json version bump → a2a CLI `restart` (covers pm2 AND nohup
+ * daemon lifecycles). Extraction/install/rebuild failure rolls the skill dir
+ * back from the backup; restart failure is reported, not rolled back (the
+ * on-disk upgrade itself succeeded).
+ *
+ * @returns {Promise<{ok:boolean, version?:string, previousVersion?:string,
+ *   upgraded?:boolean, restarted?:boolean, restartError?:string, error?:string}>}
+ */
+export async function upgradeA2aTarball(tarballPath, {
+  skillsDir = defaultSkillsDir(),
+  componentsFile: componentsPath = componentsFile(),
+  installDeps = npmInstallDeps,
+  rebuildDeps = rebuildNativeDeps,
+  restartFn = () => runA2aCli(['restart'], { timeout: 120000 }),
+  originalName = null,
+} = {}) {
+  const file = String(tarballPath || '');
+  const verdict = validateA2aTarball(file, originalName);
+  if (verdict.error) return { ok: false, error: verdict.error };
+  const { pkg, entries } = verdict;
+  const targetDir = path.join(skillsDir, 'a2a');
+  const components = readComponents(componentsPath);
+  if (!fs.existsSync(targetDir) || !components.a2a) {
+    return { ok: false, error: 'a2a 未安装，请先安装' };
+  }
+
+  const localVersion = components.a2a.version || readInstalledPkgVersion(targetDir);
+  const cmp = compareA2aSemver(pkg.version, localVersion);
+  if (cmp === null) {
+    return { ok: false, error: '版本号无法解析，拒绝升级', local: localVersion || null, incoming: pkg.version };
+  }
+  if (cmp <= 0) {
+    return { ok: false, error: 'version_not_higher', local: localVersion || null, incoming: pkg.version };
+  }
+
+  // Backup before any write (mirrors cli/lib/upgrade.js step2_backup).
+  // Copied per top-level entry: cpSync refuses a destination that is a
+  // subdirectory of its source (.backup lives inside the skill dir).
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  const backupDir = path.join(targetDir, '.backup', timestamp);
+  try {
+    fs.mkdirSync(backupDir, { recursive: true });
+    for (const entry of fs.readdirSync(targetDir, { withFileTypes: true })) {
+      if (['node_modules', '.backup', '.baize'].includes(entry.name)) continue;
+      fs.cpSync(path.join(targetDir, entry.name), path.join(backupDir, entry.name), { recursive: true });
+    }
+  } catch (err) {
+    return { ok: false, error: `备份失败，升级中止: ${err.message}` };
+  }
+
+  // Rollback: clear everything except the backup itself, then copy the
+  // backup back (top-level .backup inside targetDir must survive the wipe).
+  const restoreBackup = async () => {
+    try {
+      for (const entry of fs.readdirSync(targetDir)) {
+        if (entry !== '.backup') fs.rmSync(path.join(targetDir, entry), { recursive: true, force: true });
+      }
+      fs.cpSync(backupDir, targetDir, { recursive: true });
+      // Best-effort dependency restore for the rolled-back code (node_modules
+      // was excluded from the backup); failure here is reported, not fatal.
+      await installDeps(targetDir);
+      return true;
+    } catch {
+      return false;
+    }
+  };
+
+  try {
+    extractTarballTo(file, targetDir, entries);
+  } catch (err) {
+    const restored = await restoreBackup();
+    return { ok: false, error: `解压失败（${restored ? '已回滚' : '回滚失败，请检查 .backup'}）: ${err.message}` };
+  }
+  const depResult = await installDeps(targetDir);
+  if (!depResult.ok) {
+    const restored = await restoreBackup();
+    return { ok: false, error: `npm install 失败（${restored ? '已回滚' : '回滚失败，请检查 .backup'}）: ${depResult.error}` };
+  }
+  const rebuildResult = await rebuildDeps(targetDir);
+  if (!rebuildResult.ok) {
+    const restored = await restoreBackup();
+    return { ok: false, error: `native 模块重建失败（${restored ? '已回滚' : '回滚失败，请检查 .backup'}）: ${rebuildResult.error}` };
+  }
+
+  components.a2a.version = pkg.version;
+  components.a2a.upgradedAt = new Date().toISOString();
+  try {
+    writeComponents(componentsPath, components);
+  } catch (err) {
+    const restored = await restoreBackup();
+    return { ok: false, error: `components.json 更新失败（${restored ? '已回滚' : '回滚失败，请检查 .backup'}）: ${err.message}` };
+  }
+
+  const restart = await restartFn();
+  return {
+    ok: true,
+    version: pkg.version,
+    previousVersion: localVersion || null,
+    upgraded: true,
+    restarted: Boolean(restart?.success),
+    ...(restart?.success ? {} : { restartError: restart?.error || 'restart 未返回成功' }),
+  };
+}
+
+/**
+ * Web upload entry (D49 K3): 未安装 = 安装（D25 现状）；已安装 = 走升级管线。
+ * The server route delegates here so the dispatch decision lives next to the
+ * install/upgrade implementations.
+ */
+export async function installOrUpgradeA2aTarball(tarballPath, opts = {}) {
+  const skillsDir = opts.skillsDir ?? defaultSkillsDir();
+  const componentsPath = opts.componentsFile ?? componentsFile();
+  const targetDir = path.join(skillsDir, 'a2a');
+  const installed = fs.existsSync(targetDir) || Boolean(readComponents(componentsPath).a2a);
+  if (installed) return upgradeA2aTarball(tarballPath, opts);
+  return installA2aTarball(tarballPath, opts);
+}
+
 function schedulerDbPath() {
   return path.join(baizeDir(), 'scheduler', 'scheduler.db');
 }
@@ -464,6 +646,23 @@ function a2aDbPath() {
   return process.env.BAIZE_A2A_DB || path.join(baizeDir(), 'components', 'a2a', 'a2a.db');
 }
 
+/**
+ * D49: read the `baize init` A2A bootstrap result written by the detached
+ * `cli.js start --background` child (see baize-a2a daemon-ctl.bootstrapStatePath).
+ * Tolerant when the file does not exist (a2a never bootstrapped).
+ * @returns {{status?:string, via?:string, pid?:number, error?:string, at?:string}|null}
+ */
+export function getA2aBootstrapState() {
+  const file = process.env.BAIZE_A2A_BOOTSTRAP_STATE
+    || path.join(baizeDir(), 'components', 'a2a', 'bootstrap-state.json');
+  try {
+    const raw = JSON.parse(fs.readFileSync(file, 'utf8'));
+    return raw && typeof raw === 'object' ? raw : null;
+  } catch {
+    return null;
+  }
+}
+
 /**
  * Task board: task_runs rows created by the A2A worker (source = 'a2a', §3).
  * Tolerant when the table/DB does not exist yet (baize-a2a not started).

package/skills/web-console/scripts/server.js

@@ -71,8 +71,9 @@ import {
   cancelA2aTask,
   getA2aTaskRuns,
   getA2aMessages,
-  installA2aTarball,
+  installOrUpgradeA2aTarball,
   probeA2aDaemonHealthy,
+  getA2aBootstrapState,
   resolveA2aMode,
   getSchedulerTasks,
 } from './a2a-admin.js';
@@ -1266,6 +1267,7 @@ app.get('/api/admin/a2a/status', async (req, res) => {
     const payload = { ...(result.json || {}) };
     payload.mode = resolveA2aMode(payload.mode);
     payload.daemonHealthy = await probeA2aDaemonHealthy();
+    payload.bootstrap = getA2aBootstrapState(); // D49: init bootstrap result (launched/ok/failed)
     if (result.success) {
       res.json({ success: true, ...payload });
     } else {
@@ -1385,11 +1387,14 @@ app.get('/api/admin/a2a/messages', (req, res) => {
   }
 });
 
-// Install @baize-ai/baize-a2a from an uploaded .tar.gz (D25 私有交付).
-// multipart field `file`; ≤100MB (413 over); entries vetted against `..` /
-// absolute paths / links before extraction; manifest must be the a2a package
-// with a version; then extract to SKILLS_DIR/a2a → npm install --omit=dev →
-// components.json. Response: {ok:true, version} | {ok:false, error}.
+// Install/upgrade @baize-ai/baize-a2a from an uploaded .tar.gz (D25 私有交付,
+// D49 K3 双语义). multipart field `file`; ≤100MB (413 over); entries vetted
+// against `..` / absolute paths / links before extraction. Dispatch (in
+// a2a-admin.js): 未安装 = 安装 (extract to SKILLS_DIR/a2a → npm install →
+// components.json); 已安装 = 升级 (version gate new>local else 409 → backup →
+// extract → npm install+rebuild → components.json bump → a2a cli restart).
+// Response: {ok:true, version, upgraded?} | {ok:false, error} | 409
+// {ok:false, error:'version_not_higher', local, incoming}.
 app.post('/api/admin/a2a/install', (req, res) => {
   a2aInstallUpload.single('file')(req, res, async (err) => {
     if (err) {
@@ -1403,10 +1408,13 @@ app.post('/api/admin/a2a/install', (req, res) => {
       return res.status(400).json({ ok: false, error: '缺少 file 字段（multipart 字段名必须为 file）' });
     }
     try {
-      const result = await installA2aTarball(file.path, { skillsDir: SKILLS_DIR, originalName: file.originalname });
+      const result = await installOrUpgradeA2aTarball(file.path, { skillsDir: SKILLS_DIR, originalName: file.originalname });
+      if (result.error === 'version_not_higher') {
+        return res.status(409).json(result);
+      }
       res.status(result.ok ? 200 : 400).json(result);
     } catch (e) {
-      res.status(500).json({ ok: false, error: `安装失败: ${e.message}` });
+      res.status(500).json({ ok: false, error: `安装/升级失败: ${e.message}` });
     } finally {
       fs.promises.rm(file.path, { force: true }).catch(() => {});
     }

package/templates/pm2/ecosystem.config.cjs

@@ -127,6 +127,12 @@ function loadComponentServices() {
         // Skip components that haven't finished setup (AI-mode install in progress)
         if (meta && meta.setupComplete === false) continue;
 
+        // D49: the baize-a2a daemon is owned by its own lifecycle manager
+        // (daemon-ctl: pm2 + readiness probe + nohup fallback). Registering it
+        // here too created a second start path that raced the dedicated one
+        // for port 8443 (double-instance) — a2a is intentionally excluded.
+        if (name === 'a2a' || (meta && meta.npmPkg === '@baize-ai/baize-a2a')) continue;
+
         const skillDir = (meta && meta.skillDir) || path.join(SKILLS_DIR, name);
 
         // Try loading the component's own ecosystem.config.cjs

package/test/channel-admin.test.js

@@ -237,14 +237,16 @@ describe('installChannel / uninstallChannel', () => {
 describe('a2a builtin channel (D19 单元 C)', () => {
   const a2aSchemaKeys = ['enabled', 'adminUrl', 'agentId', 'advertiseUrl', 'listenPort', 'certKeyPath', 'certCertPath'];
 
-  test('catalogue includes a2a with the contract config schema (target: config)', async () => {
+  test('a2a keeps the contract config schema but is hidden from the catalogue (D33)', async () => {
     const channels = await ca.discoverChannels({ fetch: noResultsFetch });
-    const a2a = channels.find((c) => c.name === 'a2a');
-    expect(a2a).toBeTruthy();
+    // Commercial project: a2a must not appear in any channel/component listing.
+    expect(channels.find((c) => c.name === 'a2a')).toBeUndefined();
+    // The builtin definition (used by configure/status) keeps the D19 schema.
+    const a2a = ca.BUILTIN_CHANNELS.a2a;
     expect(a2a).toMatchObject({
+      name: 'a2a',
       npmPkg: '@baize-ai/baize-a2a',
       repo: 'baize-ai/baize-a2a',
-      installed: false,
     });
     expect(a2a.configSchema.map((f) => f.key)).toEqual(a2aSchemaKeys);
     expect(a2a.configSchema.every((f) => f.target === 'config')).toBe(true);
@@ -286,7 +288,7 @@ describe('a2a builtin channel (D19 单元 C)', () => {
   });
 
   test('channelStatus for installed a2a: configured only when enabled + both urls', async () => {
-    const entry = (await ca.discoverChannels({ fetch: noResultsFetch })).find((c) => c.name === 'a2a');
+    const entry = ca.BUILTIN_CHANNELS.a2a;
     fs.writeFileSync(path.join(baizeDir, '.baize', 'components.json'), JSON.stringify({
       a2a: { version: '0.1.0', source: { type: 'npm' } },
     }));

package/test/helpers/run-upgrade-file-driver.mjs

@@ -0,0 +1,15 @@
+/**
+ * Child-process driver for the K4 --file upgrade e2e tests: runs the REAL
+ * upgradeComponent() flow in a clean process so BAIZE_DIR resolves the fixture
+ * root (cli/lib/config.js reads env at import time) — Jest's sandboxed
+ * process.env is not inherited by grandchildren, so the flow must run outside
+ * the Jest process.
+ *
+ * argv: <component> <tgzPath> [--check]
+ * stdout: the command output (JSON — --json is always passed)
+ */
+const [component, tgzPath, checkFlag] = process.argv.slice(2);
+const { upgradeComponent } = await import('../../cli/commands/component.js');
+const args = [component, '--file', tgzPath, '--yes', '--json'];
+if (checkFlag === '--check') args.push('--check');
+await upgradeComponent(args);