@sema-agent/server 7.127.2 → 7.129.0

package/dist/web-admin-client/skills-mcp.d.ts

@@ -1,31 +1,34 @@
-import type { A2aServerSpec, McpServerSpec } from "@sema-agent/core";
+import { type A2aServerSpec, type McpServerSpec } from "@sema-agent/core";
 import type { CenterMcp, ScopedA2aPeer } from "../config-types.js";
 import type { Logger } from "../observability/logger.js";
 import type { LoadedSkill } from "../capabilities/skills.js";
-import type { CenterEndpoint } from "./center-request.js";
+import type { ConfigProvider } from "../config-provider.js";
 import type { CenterA2aPeer, CenterMcpServer, CenterSkillManifest } from "./types.js";
 /**
- * Merge center skills OVER the image baseline ([ref]-sibling B1; `web-admin docs/MCP-SKILLS.md`). Load order =
- * `loadSkills(SKILLS_DIR)` baseline → center skills lazily fetched by hash and overlaid BY NAME (center
- * wins on a clash → can override a built-in; guarded center-side by publisher RBAC + the publish gate).
- * `enabled:false` is skipped. Content is verified + cached by hash (same hash fetched once). A skill whose
- * content fetch/verify fails is skipped (the baseline version, if any, stays) — never blocks startup.
+ * 技能正文的来源 = **拉到这份清单的配置源自己**(S-1556):`fetchSkillContent(contentHash)` 按 hash 答正文 —— 远程 = 中心内容端点
+ * (传输自验 hash;未知 hash ⇒ `undefined`),本地 = config.d 里内联的正文(与清单同一种容错读);`skillBodyCacheDir` = 这只配置源
+ * 声明的正文盘缓存目录(远程且开着 LKG 才有;本地恒缺席 —— 正文本就在这块盘上)。本函数不知道、也不问是哪一种。
+ */
+export type SkillBodySource = Pick<ConfigProvider, "fetchSkillContent" | "skillBodyCacheDir">;
+/**
+ * The skills domain's ONE read port (S-1556; [ref]-sibling B1; `web-admin docs/MCP-SKILLS.md`). Load order =
+ * `loadSkills(SKILLS_DIR)` baseline → the config source's skills (web-admin center OR local `config.d` — same manifest
+ * shape, same code path) overlaid BY NAME (config wins on a clash → can override a built-in; guarded center-side by
+ * publisher RBAC + the publish gate). `enabled:false` is skipped and never fetched. Bodies come from `bodies` by content
+ * hash, deduped in memory (same hash read once). A skill whose body is absent at the source or fails to read (incl. the
+ * remote transport's hash check) is NOT installed — exactly one `web_admin_skill_failed` warn names it (`reason`:
+ * `body_absent` | `read_failed`), the baseline of that name (if any) stays, and boot is never blocked.
  * Restart-to-apply: this runs at boot, before `buildScenarios` bakes skills into scenarios.
  */
-export declare function applyCenterSkills(baseline: LoadedSkill[], manifest: {
+export declare function applySkillsManifest(baseline: LoadedSkill[], manifest: {
     skills: CenterSkillManifest[];
-}, 
-/** S-651:中心端点(基址 + 凭证来源;每次正文拉取取一次值)。 */
-center: CenterEndpoint, logger?: Logger, fetchImpl?: typeof fetch, 
-/** LKG 姊妹面(clay 拍 2026-07-18):skill 正文的 content-addressed 盘缓存目录。读序=内存→盘(验
- *  hash,坏文件忽略)→中心(成功后 best-effort 回写)。让 LKG-boot 在中心不可达时不再于正文拉取上
- *  挂数秒(live 实测黑洞 +5.3s/skill 批),顺带省正常 refresh 的重复拉取。undefined=无盘缓存(原行为)。 */
-diskCacheDir?: string): Promise<LoadedSkill[]>;
+}, bodies: SkillBodySource, logger?: Logger): Promise<LoadedSkill[]>;
 /**
  * Resolve center MCP servers (`/effective.mcp`) into core `McpServerSpec`s + the scenarios each applies to.
  * env-NAME refs → real values from THIS service's env (secret boundary unchanged); a server with any missing
- * ref is skipped (`resolveRefs` → null). `enabled:false` skipped. Restart-to-apply (filtered per scenario in
- * `resolveSpec` via `mcpForScenario`).
+ * ref is skipped (`resolveRefs` → null). `enabled:false` skipped. A server whose `toolFaces` / `toolAxes` declaration is
+ * malformed is skipped whole (both are trust-root declarations — see `mcp-tool-faces.ts` / `mcp-tool-axes.ts`). Restart-to-apply
+ * (filtered per scenario in `resolveSpec` via `mcpForScenario`).
  */
 export declare function resolveMcpServers(mcp: {
     servers: CenterMcpServer[];

package/dist/web-admin-client/skills-mcp.js

@@ -1,11 +1,13 @@
 import { readMcpSourceLabel } from "../mcp-source-label.js";
 import { readMcpToolFaces } from "../mcp-tool-faces.js";
 import { skillContentHash } from "@sema-agent/settings-schema";
+import { readMcpToolAxes } from "@sema-agent/core";
 import { CONTENT_ORIGIN_WORDS, describeBadContentOrigin, isContentOriginWord } from "../mcp-content-origin.js";
-import { fetchSkillContent } from "./http-client.js";
+import { noteMcpAssertionHeaderNotSent } from "../mcp-assertion-header.js";
 import { SHA256_HEX_RE } from "../digest-form.js";
 import { describeBadWireName, isUsableWireName } from "../wire-name-bound.js";
-export async function applyCenterSkills(baseline, manifest, center, logger, fetchImpl = fetch, diskCacheDir) {
+export async function applySkillsManifest(baseline, manifest, bodies, logger) {
+    const diskCacheDir = bodies.skillBodyCacheDir;
     const { promises: fsp } = await import("node:fs");
     const { join: joinPath } = await import("node:path");
     const diskRead = async (hash) => {
@@ -18,7 +20,7 @@ export async function applyCenterSkills(baseline, manifest, center, logger, fetc
             const text = await fsp.readFile(joinPath(diskCacheDir, hex), "utf8");
             if (skillContentHash(text) === hash)
                 return text;
-            logger?.warn("web_admin_skill_cache_corrupt", { hash, note: "on-disk body fails its own hash — ignored, refetching from center" });
+            logger?.warn("web_admin_skill_cache_corrupt", { hash, note: "on-disk body fails its own hash — ignored, re-reading from the config source" });
         }
         catch {
         }
@@ -43,14 +45,19 @@ export async function applyCenterSkills(baseline, manifest, center, logger, fetc
         if (m.enabled === false)
             continue;
         if (seenNames.has(m.name))
-            logger?.warn("web_admin_skill_duplicate_name", { name: m.name, note: "duplicate name in center manifest — last entry wins" });
+            logger?.warn("web_admin_skill_duplicate_name", { name: m.name, note: "duplicate name in the skills manifest — last entry wins" });
         seenNames.add(m.name);
         try {
             let content = contentCache.get(m.contentHash);
             if (content === undefined)
                 content = await diskRead(m.contentHash);
             if (content === undefined) {
-                content = await fetchSkillContent(center, m.contentHash, fetchImpl);
+                const answered = await bodies.fetchSkillContent(m.contentHash);
+                if (answered === undefined) {
+                    logger?.warn("web_admin_skill_failed", { name: m.name, hash: m.contentHash, reason: "body_absent", note: "the config source holds no body for this hash — this entry is NOT installed; the baseline skill of this name (if any) stays" });
+                    continue;
+                }
+                content = answered;
                 diskWrite(m.contentHash, content);
             }
             contentCache.set(m.contentHash, content);
@@ -59,7 +66,7 @@ export async function applyCenterSkills(baseline, manifest, center, logger, fetc
             logger?.info("web_admin_skill", { name: m.name, hash: m.contentHash, scenarios: m.scenarios, overrodeBuiltin });
         }
         catch (err) {
-            logger?.warn("web_admin_skill_failed", { name: m.name, hash: m.contentHash, err: String(err), note: "keeping baseline if any; skipping center version" });
+            logger?.warn("web_admin_skill_failed", { name: m.name, hash: m.contentHash, reason: "read_failed", err: String(err), note: "reading the body from the config source failed — this entry is NOT installed; the baseline skill of this name (if any) stays" });
         }
     }
     await Promise.all(pendingWrites);
@@ -117,22 +124,34 @@ export function resolveMcpServers(mcp, logger) {
             continue;
         }
         const toolFaces = facesRead.faces === undefined ? {} : { toolFaces: facesRead.faces };
+        const axesRead = readMcpToolAxes(s.toolAxes);
+        if (!axesRead.ok) {
+            logger?.warn("web_admin_mcp_tool_axes_invalid", {
+                server: s.name,
+                problem: axesRead.problem,
+                note: "server SKIPPED — a toolAxes declaration is a TRUST-ROOT declaration (it can lower an effect so a call skips the approval fence, or raise one); mounting the server without it, or with a half of it, would silently change what you declared. Fix the entry and republish.",
+            });
+            continue;
+        }
+        const toolAxes = axesRead.toolAxes === undefined ? {} : { toolAxes: axesRead.toolAxes };
         if (s.transport.kind === "stdio") {
             const env = resolveRefs(s.transport.envRefs, s.name, "env", logger);
             if (env === null)
                 continue;
             out.push({
                 scenarios: s.scenarios ?? [],
-                spec: { name: s.name, transport: { kind: "stdio", command: s.transport.command, args: s.transport.args, ...(Object.keys(env).length ? { env } : {}) }, ...allow, ...elicit, ...contentOrigin, ...source, ...toolFaces },
+                spec: { name: s.name, transport: { kind: "stdio", command: s.transport.command, args: s.transport.args, ...(Object.keys(env).length ? { env } : {}) }, ...allow, ...elicit, ...contentOrigin, ...source, ...toolFaces, ...toolAxes },
             });
         }
         else {
             const headers = resolveRefs(s.transport.headerRefs, s.name, "header", logger);
             if (headers === null)
                 continue;
+            if (s.transport.assertionHeader !== undefined)
+                noteMcpAssertionHeaderNotSent(logger, s.name);
             out.push({
                 scenarios: s.scenarios ?? [],
-                spec: { name: s.name, transport: { kind: "http", url: s.transport.url, ...(Object.keys(headers).length ? { headers } : {}), ...(s.transport.principalHeader ? { principalHeader: s.transport.principalHeader } : {}) }, ...allow, ...elicit, ...contentOrigin, ...source, ...toolFaces },
+                spec: { name: s.name, transport: { kind: "http", url: s.transport.url, ...(Object.keys(headers).length ? { headers } : {}), ...(s.transport.principalHeader ? { principalHeader: s.transport.principalHeader } : {}) }, ...allow, ...elicit, ...contentOrigin, ...source, ...toolFaces, ...toolAxes },
             });
         }
     }

package/dist/web-admin-client/types.d.ts

@@ -151,6 +151,18 @@ export interface CenterMcpServer {
      * 形上先写一个结构,等于把同一张判据表抄成两份(而其中一份没有执行力)。
      */
     toolFaces?: unknown;
+    /**
+     * S-1475(settings-schema 12.2.x `McpServerSpec.toolAxes`,解析透明 `z.unknown()`)—— 部署侧为这台 server 的**每只工具**声明的
+     * 风险轴(`effect` / `egress` / `irreversibility`),键 = server 的**原始(未加命名空间)**工具名,上 core
+     * `McpServerSpec.toolAxes`。
+     *
+     * 🔴 类型是 `unknown` 而不是那个结构,**刻意的**(与 {@link CenterMcpServer.toolFaces} 逐字同姿):本类型是两条部署腿的**承载形**
+     * (本地 config.d 经 `z.unknown()` 解析透明地过来、远端 /effective 是直读 JSON),形判与投影的单一属主是**引擎**根导出的
+     * `readMcpToolAxes`(core 7.51.2 #1763;`resolveMcpServers` 在铸 spec 那一刻调它;产出的型是引擎的 `McpServerSpec["toolAxes"]`;本仓自铸的那一只
+     * 7.129.0 退役)。坏形 ⇒ 整条 server 不进 + 一行 `web_admin_mcp_tool_axes_invalid`。
+     * (同批解析透明键 `authForm` / `entryKind` 的语义归连接器,本层仍只承载。)
+     */
+    toolAxes?: unknown;
     transport: {
         kind: "stdio";
         command: string;
@@ -160,11 +172,17 @@ export interface CenterMcpServer {
     /** `principalHeader` ([ref]): the header name into which the runner injects the task's authenticated
      *  end-user principal per-task, so a consumer MCP (e.g. oa-mcp) can enforce per-user RBAC. Not a ref — a
      *  literal header name. The runner fills the value (never the model). */
+    /** `assertionHeader` (settings-schema ≥12.2.0): the header NAME a hosted connector's assertion travels in. Mutually exclusive with
+     *  `principalHeader` (both answer "which header carries the identity this server sends"; the contract package refuses both-set at parse
+     *  time — the request face enforces the same rule at acceptance, see `mcp-assertion-header.ts`). A literal header name, not a ref.
+     *  This version CARRIES it up to the minting of the engine spec and does not send it (the engine's http transport has no seat yet):
+     *  `resolveMcpServers` leaves it off the spec and says one info line per mounted server. */
      | {
         kind: "http";
         url: string;
         headerRefs?: Record<string, string>;
         principalHeader?: string;
+        assertionHeader?: string;
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sema-agent/server",
-  "version": "7.127.2",
+  "version": "7.129.0",
   "description": "Sema Server — the server/API implementation layer for Sema, wiring core, registry, model providers, and cloud agent execution. Built on @sema-agent/core.",
   "type": "module",
   "license": "BUSL-1.1",
@@ -64,7 +64,7 @@
     "build:binary:run-local:darwin-arm64": "bun build --compile --target=bun-darwin-arm64 src/run-local.ts --outfile dist/run-local-darwin-arm64"
   },
   "dependencies": {
-    "@sema-agent/core": "7.50.2",
+    "@sema-agent/core": "7.51.2",
     "@sema-agent/settings-schema": "12.2.1",
     "e2b": "^2.28.0",
     "libsodium-wrappers": "^0.8.4",
@@ -80,7 +80,7 @@
     "sharp": "^0.35.3"
   },
   "devDependencies": {
-    "@sema-agent/sdk": "21.1.0",
+    "@sema-agent/sdk": "23.0.0",
     "@types/libsodium-wrappers": "^0.7.14",
     "@types/node": "22.10.2",
     "@types/pg": "^8.20.0",