@baize-ai/core 0.3.14 → 0.3.16

package/skills/web-console/scripts/model-provider.js

@@ -4,7 +4,7 @@
  *
  * A provider entry carries per-runtime endpoints/models:
  *   cc:    { baseUrl, authToken, model, smallModel }   → ANTHROPIC_* env
- *   codex: { baseUrl, apiKey, model }                  → OPENAI_BASE_URL + auth.json + config.toml
+ *   codex: { kind, providerKey, baseUrl, apiKey, model } → dedicated provider block in config.toml
  *
  * Activation writes the same storage surfaces init uses (~/baize/.env +
  * ~/.claude/settings.json env + ~/.codex/auth.json + ~/.codex/config.toml)
@@ -31,6 +31,13 @@ import {
   restartAgentSession,
 } from './admin-auth.js';
 
+// D51: Codex provider-block writers shared with the CLI (same package tree).
+import {
+  applyCodexProviderBlock,
+  codexProviderKeyForId,
+  restoreCodexOfficialBlock,
+} from '../../../cli/lib/runtime-setup.js';
+
 // ── Config store (~/.baize/providers.json) ───────────────────────────────────
 
 function providersPath() {
@@ -53,13 +60,49 @@ function projectCodexConfigPath() {
   return path.join(process.env.BAIZE_DIR || path.join(process.env.HOME || '', 'baize'), '.codex', 'config.toml');
 }
 
+// Codex-side kind enum (D51 — DeepSeek remote-compaction fix):
+//   openai-official       use the built-in OpenAI provider (no model_provider block)
+//   responses-compatible  generic /responses endpoint → dedicated [model_providers.<slug>] block
+//   chat-only             legacy /chat wire only — Codex removed the Chat wire
+const CODEX_KINDS = new Set(['openai-official', 'responses-compatible', 'chat-only']);
+
+// Home/project roots, resolved from the same env vars every other path in
+// this module uses. Passed explicitly to the runtime-setup writers because
+// their os.homedir()/BAIZE_DIR fallbacks don't follow test env overrides
+// (jest sandboxes os.homedir()).
+function homeRoot() {
+  return process.env.HOME || '';
+}
+function baizeRoot() {
+  return process.env.BAIZE_DIR || path.join(process.env.HOME || '', 'baize');
+}
+
 function loadStore() {
   const data = readJson(providersPath()) || {};
-  return {
+  const store = {
     active: typeof data.active === 'string' ? data.active : 'official',
     providers: Array.isArray(data.providers) ? data.providers : [],
     stash: data.stash && typeof data.stash === 'object' ? data.stash : null,
   };
+  // Lazy D51 migration: entries saved before kind/providerKey existed get
+  // backfilled from the entry shape (baseUrl → responses-compatible) and the
+  // store is re-persisted so slugs stay stable from the first read onward.
+  let migrated = false;
+  for (const p of store.providers) {
+    const codex = p.codex && typeof p.codex === 'object' ? p.codex : {};
+    if (!codex.kind) {
+      codex.kind = codex.baseUrl ? 'responses-compatible' : 'openai-official';
+      p.codex = codex;
+      migrated = true;
+    }
+    if (!codex.providerKey && p.id) {
+      codex.providerKey = codexProviderKeyForId(p.id);
+      p.codex = codex;
+      migrated = true;
+    }
+  }
+  if (migrated) saveStore(store);
+  return store;
 }
 
 function saveStore(store) {
@@ -91,6 +134,7 @@ function validProviderInput(data) {
   const urlRe = /^https?:\/\/.+/;
   if (cc.baseUrl && !urlRe.test(String(cc.baseUrl))) return 'cc.baseUrl must start with http(s)://';
   if (codex.baseUrl && !urlRe.test(String(codex.baseUrl))) return 'codex.baseUrl must start with http(s)://';
+  if (codex.kind && !CODEX_KINDS.has(String(codex.kind))) return `codex.kind must be one of: ${[...CODEX_KINDS].join(', ')}`;
   return null;
 }
 
@@ -106,6 +150,8 @@ function sanitizeProvider(p) {
       authConfigured: Boolean(p.cc?.authToken),
     },
     codex: {
+      kind: p.codex?.kind || null,
+      providerKey: p.codex?.providerKey || null,
       baseUrl: p.codex?.baseUrl || null,
       model: p.codex?.model || null,
       apiConfigured: Boolean(p.codex?.apiKey),
@@ -131,8 +177,15 @@ export async function saveProvider(input) {
   const cc = input.cc || {};
   const codex = input.codex || {};
   const exists = input.id && store.providers.some((p) => p.id === input.id);
+  // D51: keep the pre-existing kind/providerKey on updates (slug is generated
+  // once and never regenerated — a rename must not orphan the TOML block).
+  const prevCodex = exists ? store.providers.find((p) => p.id === input.id).codex || {} : {};
+  const kind = codex.kind
+    ? String(codex.kind)
+    : (prevCodex.kind || (codex.baseUrl ? 'responses-compatible' : 'openai-official'));
+  const id = exists ? input.id : genId(name, store);
   const entry = {
-    id: exists ? input.id : genId(name, store),
+    id,
     name,
     cc: {
       baseUrl: cc.baseUrl ? String(cc.baseUrl).trim() : undefined,
@@ -141,6 +194,8 @@ export async function saveProvider(input) {
       smallModel: cc.smallModel ? String(cc.smallModel).trim() : undefined,
     },
     codex: {
+      kind,
+      providerKey: prevCodex.providerKey || codexProviderKeyForId(id),
       baseUrl: codex.baseUrl ? String(codex.baseUrl).trim() : undefined,
       apiKey: codex.apiKey ? String(codex.apiKey).trim() : undefined,
       model: codex.model ? String(codex.model).trim() : undefined,
@@ -165,9 +220,12 @@ function readRuntime() {
 
 function genId(name, store) {
   const base = name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '') || 'provider';
-  // 'official' / 'official-openai' are built-in restore targets — reserve them
-  // so a user-named provider can never shadow or be shadowed by them.
-  let id = (base === 'official' || base === 'official-openai') ? `${base}-custom` : base;
+  // Reserved ids never land in the store: the built-in restore targets
+  // ('official' / 'official-openai') plus Codex built-in provider keys that a
+  // user-named provider must not shadow (D51 — 'openai' would make the
+  // generated provider block collide with the built-in OpenAI entry).
+  const reserved = new Set(['official', 'official-openai', 'openai', 'azure', 'amazon-bedrock', 'amazon-bedrock-runtime', 'ollama', 'lmstudio', 'gpt-oss']);
+  let id = reserved.has(base) ? `${base}-custom` : base;
   let n = 2;
   while (store.providers.some((p) => p.id === id)) id = `${base}-${n++}`;
   return id;
@@ -189,7 +247,8 @@ const CC_EXTERNAL_KEYS = ['ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_BASE_URL', 'ANTHROP
 
 /**
  * Activate a provider or built-in official restore target.
- * @returns {Promise<{success: boolean, active: string, warnings: string[], restart?: object, error?: string}>}
+ * @returns {Promise<{success: boolean, active: string, warnings: string[],
+ *   restart?: object, codexProviderKey?: string|null, error?: string}>}
  */
 export async function activateProvider(id, deps = {}) {
   const store = loadStore();
@@ -206,6 +265,14 @@ export async function activateProvider(id, deps = {}) {
   // current runtime's side is meaningless (e.g. a cc-only provider while the
   // Codex runtime is active). Official restores and dual-side providers pass.
   if (provider) {
+    // D51: chat-only endpoints have no Codex wiring at all (the Chat wire was
+    // removed from Codex) — block activation before anything is written.
+    if (provider.codex?.kind === 'chat-only') {
+      return {
+        success: false,
+        error: '该供应商仅支持 Chat 接口，Codex 已移除 Chat wire，请改用 Claude 运行时',
+      };
+    }
     const runtime = readRuntime();
     const hasCc = Boolean(provider.cc?.authToken || provider.cc?.baseUrl || provider.cc?.model || provider.cc?.smallModel);
     const hasCodex = Boolean(provider.codex?.baseUrl || provider.codex?.apiKey || provider.codex?.model);
@@ -233,10 +300,11 @@ export async function activateProvider(id, deps = {}) {
     applyClaudeExternal(cc, store);
   }
 
+  let codexProviderKey = null;
   if (isOfficialOpenai) {
     applyCodexOfficial();
   } else if (provider?.codex) {
-    applyCodexExternal(provider.codex);
+    codexProviderKey = applyCodexExternal(provider.codex) || null;
   }
 
   // Non-blocking reachability probe for configured base URLs (informational).
@@ -251,7 +319,7 @@ export async function activateProvider(id, deps = {}) {
   store.active = id;
   saveStore(store);
   const restart = await (deps.restart ?? restartAgentSession)();
-  return { success: true, active: id, warnings, restart };
+  return { success: true, active: id, warnings, codexProviderKey, restart };
 }
 
 // Claude Code: external provider application
@@ -308,67 +376,37 @@ function applyOfficialClaude(store) {
   updateSettingsEnv(updates, CC_EXTERNAL_KEYS);
 }
 
-// Codex: external provider application
+// Codex: external provider application (D51 — dedicated provider block).
+// Returns the active codex provider slug, or null when nothing was written.
 function applyCodexExternal(codex) {
   let env = readEnv(envFile());
+  // Legacy override kept for health-probe/status consumers that still read it.
   if (codex.baseUrl) env = upsertEnv(env, 'OPENAI_BASE_URL', codex.baseUrl, 'OpenAI-compatible endpoint (web console)');
   writeEnvFile(env);
   if (codex.apiKey) writeCodexAuth(codex.apiKey);
-  editCodexConfigToml({ model: codex.model, openaiBaseUrl: codex.baseUrl });
+  if (codex.kind === 'openai-official') {
+    // Official endpoint: keep the built-in OpenAI provider (remote compaction
+    // works there) — just drop any leftover custom block/override.
+    restoreCodexOfficialBlock({ homeDir: homeRoot(), projectDir: baizeRoot() });
+    return null;
+  }
+  applyCodexProviderBlock({
+    providerKey: codex.providerKey || codexProviderKeyForId('provider'),
+    baseUrl: codex.baseUrl,
+    token: codex.apiKey,
+    model: codex.model,
+    homeDir: homeRoot(),
+    projectDir: baizeRoot(),
+  });
+  return codex.providerKey || null;
 }
 
-// Codex: restore official (clear external base_url, default model; auth untouched)
+// Codex: restore official (drop provider block + overrides, reset model; auth untouched)
 function applyCodexOfficial() {
   let env = readEnv(envFile());
   env = removeEnvKey(env, 'OPENAI_BASE_URL');
   writeEnvFile(env);
-  editCodexConfigToml({ model: 'gpt-5.5', openaiBaseUrl: null });
-}
-
-/**
- * Conservative top-level edit of a Codex config.toml: set/replace the
- * `model` and `openai_base_url` keys, preserving every other line (comments,
- * sections, providers). Only the TOP-LEVEL prefix (before the first section
- * header) is touched — keys inside [table] sections are also unindented, so
- * regex edits must never run past the first `[` header.
- */
-function writeCodexTomlTopLevel(targetPath, { model, openaiBaseUrl }) {
-  const dir = path.dirname(targetPath);
-  fs.mkdirSync(dir, { recursive: true });
-  let content = '';
-  try { content = fs.readFileSync(targetPath, 'utf8'); } catch { /* new file */ }
-
-  const sectionAt = content.search(/^\[/m);
-  const head = sectionAt === -1 ? content : content.slice(0, sectionAt);
-  const tail = sectionAt === -1 ? '' : content.slice(sectionAt);
-
-  const setTopLevel = (text, key, value) => {
-    const lineRe = new RegExp(`^${key}\\s*=.*$`, 'm');
-    const line = `${key} = ${JSON.stringify(value)}`;
-    if (lineRe.test(text)) return text.replace(lineRe, line);
-    return `${text.trimEnd()}\n${line}\n`;
-  };
-  const removeTopLevel = (text, key) => text.replace(new RegExp(`^${key}\\s*=.*\\n?`, 'm'), '');
-
-  let out = head;
-  if (model) out = setTopLevel(out, 'model', model);
-  if (openaiBaseUrl) out = setTopLevel(out, 'openai_base_url', openaiBaseUrl);
-  if (openaiBaseUrl === null) out = removeTopLevel(out, 'openai_base_url');
-  const joined = tail && !out.endsWith('\n') ? `${out}\n${tail}` : `${out}${tail}`;
-  fs.writeFileSync(targetPath, joined, 'utf8');
-  return targetPath;
-}
-
-/**
- * Apply a provider's Codex model/base_url to BOTH the global config.toml and
- * the baize project-level config.toml. codex prefers project-level keys, so
- * writing only the global file let baize init's backfilled defaults (model =
- * "gpt-5.5") shadow the provider config (D31).
- */
-export function editCodexConfigToml({ model, openaiBaseUrl }) {
-  writeCodexTomlTopLevel(codexConfigPath(), { model, openaiBaseUrl });
-  writeCodexTomlTopLevel(projectCodexConfigPath(), { model, openaiBaseUrl });
-  return codexConfigPath();
+  restoreCodexOfficialBlock({ homeDir: homeRoot(), projectDir: baizeRoot() });
 }
 
 // Reachability probe: any <500 status means the endpoint answers.

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(() => {});
     }
@@ -1550,23 +1558,6 @@ function readAuthz() {
   }
 }
 
-// Validates an allow/block list; returns { list } or { error }.
-function validateAuthzList(value, name) {
-  if (!Array.isArray(value)) return { error: `${name} 必须是数组` };
-  const seen = new Set();
-  const list = [];
-  for (const item of value) {
-    if (typeof item !== 'string' || item.trim() === '') {
-      return { error: `${name} 包含空项（必须是非空字符串）` };
-    }
-    const v = item.trim();
-    if (seen.has(v)) return { error: `${name} 包含重复的 agent_id：${v}` };
-    seen.add(v);
-    list.push(v);
-  }
-  return { list };
-}
-
 // Current authz policy (config.json authz; contract defaults when unconfigured)
 app.get('/api/admin/a2a/authz', (req, res) => {
   try {
@@ -1576,8 +1567,11 @@ app.get('/api/admin/a2a/authz', (req, res) => {
   }
 });
 
-// Save the authz policy — validates, then writes config.json (preserving other
-// fields) and returns the persisted policy
+// Save the authz policy — D52 governance: the LOCAL agent may only flip the
+// mode (open/allowlist); allow/block lists are admin-managed (admin-workspace
+// pushes the cluster policy; local lists here would be dead weight / bypass
+// confusion). Any allow/block sent is ignored and forced to [] — the UI hides
+// list editing, and a direct API call cannot reintroduce local lists.
 app.put('/api/admin/a2a/authz', (req, res) => {
   try {
     const body = req.body || {};
@@ -1585,11 +1579,7 @@ app.put('/api/admin/a2a/authz', (req, res) => {
     if (mode !== 'open' && mode !== 'allowlist') {
       return res.status(400).json({ success: false, error: 'mode 必须是 open 或 allowlist' });
     }
-    const allow = body.allow === undefined ? { list: [] } : validateAuthzList(body.allow, 'allow');
-    if (allow.error) return res.status(400).json({ success: false, error: allow.error });
-    const block = body.block === undefined ? { list: [] } : validateAuthzList(body.block, 'block');
-    if (block.error) return res.status(400).json({ success: false, error: block.error });
-    const authz = { mode, allow: allow.list, block: block.list };
+    const authz = { mode, allow: [], block: [] };
     const file = a2aConfigPath();
     let cfg = {};
     try {

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);