@tbox.cn/app-toolkit 0.3.0 → 0.5.0

package/src/views/modules.ts

@@ -1,14 +1,14 @@
-import type { ModuleDeclaration, ModuleDetailView, ProviderBinding, ServiceDemand } from '../dto.js';
+import type { ModuleDeclaration, ModuleBinding, ModuleDetailView, ServiceDemand } from '../dto.js';
 import { AppToolkitError } from '../core/errors.js';
-import { moduleDomainWritable, resolveDomainBinding } from '../integrations/domain-binding.js';
-import type { ViewSnapshot } from './context.js';
+import { moduleOwnershipWritable, resolveModuleBinding } from '../integrations/module-binding.js';
+import { resolveServiceDisplay, type ViewSnapshot } from './context.js';
 
 /**
  * 需求轴/模块静态投影（views/modules；C4）。静态端点结构性零求值（铁律 #3——
  * 无 resolution/issues/contracts 键，永不 503）。
- * v4.4 D34：domainKeys/providerBindings/configEditable 显式化；integration 仅单域
- * （writable）时在场——多域/零域/共享键无单键落点；多域回退兜底键机器拆除
- * （派生统一 = domainOfService 去重集合，moduleDomainWritable 单源）。
+ * v6 所有权模型：ownedServices（declare.owns 展平）/ binding 单数（resolveModuleBinding）/
+ * configEditable = owns>0（moduleOwnershipWritable 单源）；integration = modules[install id]
+ * 集成位投影（provider/config；resources 不投影——N2）。v5 domainKeys/providerBindings 退役。
  * 2026-09-16 双缺陷批：loadModulesView 排除 provider 家族包（供给/实施载体非可配置
  * 业务模块）——walk 声明集与 loadModuleDetailView 不变（装包仍合法，详情保持 200）。
  */
@@ -19,7 +19,7 @@ function familyName(s: string): string {
   return s.replace(/^@tbox\.cn\/app-/, '').replace(/^@[^/]+\//, '');
 }
 
-/** provider 家族包判定（模块清单排除供给/实施载体；生态三先例同源：verify-cli 排除判定 /
+/** provider 家族包判定（模块清单排除供给/实施载体；生态三先例同源：stage 排除判定 /
  *  guard-vendor-neutrality「provider-* 包」/ cli deriveModuleId 家族推导）。install id 与
  *  包名 basename 双查 = 防 .tbox/app.json 登记漂移纵深；命名而非结构（provider-custom 零贡献
  *  空壳与「零贡献合法」形态不可结构区分）；未来收敛 = manifest 显式角色标记（届时整体退场）。 */
@@ -33,35 +33,53 @@ export function loadModulesView(snapshot: ViewSnapshot): { modules: ModuleDeclar
     .filter((mod) => !isProviderFamily(mod))
     .map((mod) => ({
       id: mod.id,
-      name: mod.descriptor.name,
-      // 模块级 title/description：manifest 无模块级 meta 字段（demand meta 属 per-service）——
-      // 一期回退 install id / 空描述（UI 侧按词汇表或 demand meta 增强）
-      title: mod.descriptor.name,
-      description: '',
+      // v7 词汇统一：name = 展示名（manifest name；兜底 id——恒有值）
+      name: mod.descriptor.name ?? mod.descriptor.id,
+      description: mod.descriptor.description ?? '',
     }))
     .sort((a, b) => a.id.localeCompare(b.id));
   return { modules };
 }
 
-/** GET /modules/:module：模块静态一站式（integration 节点原值 + demand；PUT 读对偶） */
+/** GET /modules/:module：模块静态一站式（modules[install id] 集成位原值 + demand；PUT 读对偶） */
 export function loadModuleDetailView(snapshot: ViewSnapshot, moduleId: string): ModuleDetailView {
   const mod = snapshot.walk.modules.find((m) => m.id === moduleId);
   if (!mod) {
     throw new AppToolkitError('MODULE_NOT_FOUND', 404, `模块 ${moduleId} 非已装模块`);
   }
-  const services: ServiceDemand[] = (mod.descriptor.contributes.services ?? []).map((need) => ({
-    service: need.service,
-    ...(need.title ? { title: need.title } : {}),
-    ...(need.description ? { description: need.description } : {}),
-    required: need.optional === false,
-  }));
-  const w = moduleDomainWritable(snapshot.walk, mod);
-  const domains = (snapshot.integrations as { domains?: Record<string, unknown> } | null)?.domains ?? {};
-  // integration = domains[换算键] 节点原值（D21 编辑预填源）；未配置 = null；多域/零域/共享键 = null（D34）
-  const integration = w.writable ? ((domains[w.domainKey] as ModuleDetailView['integration']) ?? null) : null;
-  const providerBindings: ProviderBinding[] = w.domainKeys.map((d) => {
-    const binding = resolveDomainBinding(snapshot.integrations, d);
-    return { domain: d, effective: binding.provider, layer: binding.layer };
+  const services: ServiceDemand[] = (mod.descriptor.declare.consumes ?? []).map((need) => {
+    // 展示名单源走链（B1）：词汇 meta > demand meta > id——词汇主源防 manifest demand 漂移
+    const display = resolveServiceDisplay(snapshot.walk, need.service);
+    return {
+      service: need.service,
+      name: display.name,
+      ...(display.description !== undefined ? { description: display.description } : {}),
+      required: need.optional === false,
+    };
   });
-  return { domainKeys: [...w.domainKeys], integration, providerBindings, configEditable: w.writable, services };
+  const w = moduleOwnershipWritable(snapshot.walk, mod);
+  const modulesNode = (snapshot.integrations as { modules?: Record<string, unknown> } | null)?.modules ?? {};
+  // integration = modules[install id] 集成位投影（D21 编辑预填源；provider/config 两键——
+  // resources 不投影不写，N2）；未配置 = null
+  const rawNode = modulesNode[moduleId] as Record<string, unknown> | undefined;
+  const integration: ModuleDetailView['integration'] = rawNode
+    ? {
+        ...(typeof rawNode.provider === 'string' ? { provider: rawNode.provider } : {}),
+        ...(rawNode.config && typeof rawNode.config === 'object' && !Array.isArray(rawNode.config)
+          ? { config: rawNode.config as Record<string, unknown> }
+          : {}),
+      }
+    : null;
+  const binding: ModuleBinding = resolveModuleBinding(snapshot.integrations, moduleId);
+  return {
+    // v7 词汇统一：name = 展示名（兜底与 /modules 同语义——manifest name ?? id）
+    name: mod.descriptor.name ?? mod.descriptor.id,
+    description: mod.descriptor.description ?? '',
+    // v6：ownedServices（declare.owns 展平排序）——N13：展示名走 resolveServiceDisplay 链，不重复携带
+    ownedServices: w.ownedServices,
+    integration,
+    binding: { provider: binding.provider, layer: binding.layer },
+    configEditable: w.writable,
+    services,
+  };
 }

package/src/views/providers.ts

@@ -2,7 +2,7 @@ import type { ProviderDetail, ProviderEntry, ProviderServiceDetail, ProvidersVie
 import { AppToolkitError } from '../core/errors.js';
 import { existsSync, readFileSync, realpathSync } from 'node:fs';
 import { isAbsolute, join, relative, resolve, sep } from 'node:path';
-import type { ViewSnapshot } from './context.js';
+import { resolveServiceDisplay, type ViewSnapshot } from './context.js';
 
 /**
  * 供给轴投影（views/providers；C4）。供给关系三切片（P5）：
@@ -21,6 +21,9 @@ export function loadProvidersView(snapshot: ViewSnapshot): ProvidersView {
       provider,
       local: entries.every((e) => e.local === true),
       owner: entries[0].owner,
+      // 厂商展示元数据（B1 walk 层传播——首条目 = 首声明，与 owner 同语义）
+      ...(entries[0].name ? { name: entries[0].name } : {}),
+      ...(entries[0].description ? { description: entries[0].description } : {}),
     });
   }
   return { providers: providers.sort((a, b) => a.provider.localeCompare(b.provider)) };
@@ -40,6 +43,12 @@ export function loadProviderDetailView(snapshot: ViewSnapshot, provider: string,
       bucket.implementations.push({ implementation: entry.implementation, credentialType: entry.credentialType });
     }
   }
+  // 服务展示名走链（B1）：词汇 meta > demand meta > id（name 恒发）
+  for (const [service, bucket] of Object.entries(services)) {
+    const display = resolveServiceDisplay(snapshot.walk, service);
+    bucket.name = display.name;
+    if (display.description !== undefined) bucket.description = display.description;
+  }
   if (include?.has('integrationSchemas')) {
     for (const [service, bucket] of Object.entries(services)) {
       bucket.integrationSchemas = { configSchema: resolveServiceConfigSchema(snapshot, provider, service) };
@@ -50,6 +59,9 @@ export function loadProviderDetailView(snapshot: ViewSnapshot, provider: string,
     provider,
     local: entries.every((e) => e.local === true),
     owner: entries[0].owner,
+    // 厂商展示元数据（B1 walk 层传播——首条目透传；v7 title→name）
+    ...(entries[0].name ? { name: entries[0].name } : {}),
+    ...(entries[0].description ? { description: entries[0].description } : {}),
     services,
   };
 }

package/src/views/service-detail.ts

@@ -1,7 +1,7 @@
 import type { ServiceDetail } from '../dto.js';
 import { AppToolkitError } from '../core/errors.js';
 import { isKnownService } from '../integrations/read.js';
-import { suppliedByVendors, type ViewSnapshot } from './context.js';
+import { resolveServiceDisplay, suppliedByVendors, type ViewSnapshot } from './context.js';
 
 /**
  * 服务静态单体投影（views/service-detail；C4）。求值数据不在此（→ /service-resolutions/:service）。
@@ -17,10 +17,12 @@ export function loadServiceDetailView(snapshot: ViewSnapshot, service: string):
   }
   // integration = 文件 services[s] 逐字原值（编辑预填源 D21）；无声明 = null
   const integration = (configured[service] as ServiceDetail['integration'] | undefined) ?? null;
+  // 展示名单源走链（B1）：词汇 meta > demand meta > id——替换 demand 直拼（恒有值）
+  const display = resolveServiceDisplay(snapshot.walk, service);
   return {
     service,
-    ...(demand?.title ? { title: demand.title } : { title: service }),
-    ...(demand?.description ? { description: demand.description } : {}),
+    name: display.name,
+    ...(display.description !== undefined ? { description: display.description } : {}),
     required: demand ? !demand.optional : false,
     // defaults 唯一落位（manifest 预填）
     defaults: demand ? demand.defaults.map((d) => ({ ...d })) : [],

package/src/views/service-resolutions.ts

@@ -11,10 +11,10 @@ import type {
   ServiceStatus,
 } from '../dto.js';
 import { AppToolkitError } from '../core/errors.js';
-import { resolveDomainBinding } from '../integrations/domain-binding.js';
+import { resolveModuleBinding } from '../integrations/module-binding.js';
 import type { ResolvedContracts } from '../core/contracts-resolver.js';
 import type { WalkCatalog } from '../assembly/walk-manifests.js';
-import { domainOfService, isSupplied, type ViewSnapshot } from './context.js';
+import { isSupplied, type ViewSnapshot } from './context.js';
 
 /**
  * 求值轴投影（views/service-resolutions；C4；FX-2c——B6 effective 填充 + F2 layer 推导；
@@ -50,22 +50,22 @@ interface InstanceEvaluation {
   effective?: EffectiveBinding;
 }
 
-/** 最特异声明层推导（F2）：inst 位 provider 在场 → 'instance'；槽级 → 'service'；域级 → 'module'；
+/** 最特异声明层推导（F2）：inst 位 provider 在场 → 'instance'；槽级 → 'service'；模块级 → 'module'；
  *  root → 'app'。实例位查找复刻 TIER0 语义（精确键优先、'*' 通配兜底——与 resolveEffectiveService
- *  的 instances 查找层同轴）。v4.4 F1：域级段消费 resolveDomainBinding 单源；返回扩 null
- *  （四层全无 provider 声明 → null——Entry.layer「未配置双缺席」口径，D31）。 */
+ *  的 instances 查找层同轴）。v6：模块级段消费 resolveModuleBinding 单源（ownerOf=walk.ownership）；
+ *  返回扩 null（四层全无 provider 声明 → null——Entry.layer「未配置双缺席」口径，D31）。 */
 function deriveBindingLayer(snapshot: ViewSnapshot, service: string, instanceId: string): BindingLayer | null {
   const integrations = snapshot.integrations as {
     provider?: unknown;
-    domains?: Record<string, { provider?: unknown }>;
     services?: Record<string, { provider?: unknown; instances?: Record<string, { provider?: unknown }> }>;
   } | null;
-  const domain = domainOfService(service);
   const slot = integrations?.services?.[service];
   const inst = slot?.instances?.[instanceId] ?? slot?.instances?.['*'];
   if (inst && inst.provider !== undefined) return 'instance';
   if (slot?.provider !== undefined) return 'service';
-  if (resolveDomainBinding(integrations, domain).layer === 'module') return 'module';
+  const owner = snapshot.walk.ownership[service];
+  if (owner !== undefined
+    && resolveModuleBinding(snapshot.integrations, owner).layer === 'module') return 'module';
   if (typeof integrations?.provider === 'string' && integrations.provider.length > 0) return 'app';
   return null;
 }
@@ -292,10 +292,8 @@ function buildInheritance(
 ): ServiceResolution['inheritance'] {
   const integrations = snapshot.integrations as {
     provider?: string;
-    domains?: Record<string, { provider?: string }>;
     services?: Record<string, { provider?: unknown; implementation?: string; instances?: Record<string, { provider?: string; implementation?: string }> }>;
   } | null;
-  const domain = domainOfService(service);
   const slot = integrations?.services?.[service];
   const cfg = snapshot.integrations as { instances?: unknown; defaultInstanceId?: unknown } | null;
   const normalized = evaluationContracts(snapshot).normalizeInstances({
@@ -304,13 +302,16 @@ function buildInheritance(
   });
   const defaultInstanceId = normalized.defaultInstanceId ?? '*';
   const defaultInstance = slot?.instances?.[defaultInstanceId] ?? slot?.instances?.['*'];
-  // module 段消费 resolveDomainBinding 单源（v4.4 F1——与 ProviderBinding / 谓词 #7 同源）
-  const domainBinding = resolveDomainBinding(integrations as Record<string, unknown> | null, domain);
+  // module 段消费 resolveModuleBinding 单源（v6——与 binding / 谓词 #7 同源；ownerOf=walk.ownership）
+  const owner = snapshot.walk.ownership[service];
+  const moduleBinding = owner !== undefined
+    ? resolveModuleBinding(integrations as Record<string, unknown> | null, owner)
+    : { provider: null as string | null, layer: null as 'module' | 'app' | null };
   return [
     { layer: 'app' as const, ...(integrations?.provider ? { provider: integrations.provider } : {}) },
     {
       layer: 'module' as const,
-      ...(domainBinding.layer === 'module' && domainBinding.provider ? { provider: domainBinding.provider } : {}),
+      ...(moduleBinding.layer === 'module' && moduleBinding.provider ? { provider: moduleBinding.provider } : {}),
     },
     {
       layer: 'service' as const,

package/tests/credentials-view.test.ts

@@ -31,10 +31,10 @@ function credHarness(): { app: TempApp; tk: AppToolkit } {
     'packages/provider-w/tbox.module.json',
     JSON.stringify({
       schemaVersion: 1,
-      name: 'provider-w',
+      id: 'provider-w',
       version: '0.1.0',
       kind: 'business',
-      contributes: {
+      declare: {
         providers: {
           slots: [
             { service: 'parking.payment', provider: 'wanda', implementation: 'wanda-parking@1', credentialType: 'wanda-c-signed-v1', credentialSchema: 'schemas/cred.json' },

package/tests/demo-app.ts

@@ -46,10 +46,18 @@ export interface FakeContractsOptions {
   /** 严格校验失败 fixture（FX-1c T5）：parseIntegrationsConfig 对含该子串文档 throw */
   rejectMarker?: string;
   /** resolveEffectiveService 自定义函数体（FX-2c O4 fixture：默认恒 service-not-configured；
-   *  入参 (integrations, service, instanceId, supplies)，需 return EffectiveServiceResolution 形状） */
+   *  入参 (integrations, service, instanceId, supplies, ownerOf)，需 return EffectiveServiceResolution 形状） */
   resolveBody?: string;
+  /** v6 形状标记（OWNERSHIP_BINDING_V6）缺席 fixture——默认在场（v6 假件签名随动 N11）；
+   *  false = v5 contracts 形态（ownershipBindingV6: false → assertContractsUsable 503 第四分支） */
+  withMarker?: boolean;
   /** service-slots.json 词汇（P9 身份判据/求值键集；缺省不物化 = 词汇空） */
   slots?: string[];
+  /** 词汇 meta 节（per-service {name,description}——B1 展示名链 fixture） */
+  meta?: Record<string, { name?: string; description?: string }>;
+  /** service-slots.json 落位：'root' = 包根（缺省——夹具/旧布局形态）；
+   *  'src' = 包内 src/（发布包 src 附带 / shim 链接形态——B0 探测跳 ②） */
+  slotsLayout?: 'root' | 'src';
   /** zod 形拒绝 fixture（A1 T9/T10）：parseIntegrationsConfig 恒抛带 issues 的结构化错误
    *  （结构性 ZodError 形——issues[].path 供 fields 断言；仅在专属 fixture 上使用） */
   zodRejectPaths?: string[][];
@@ -58,7 +66,7 @@ export interface FakeContractsOptions {
 /** 假 contracts 包：package.json exports 形态逐字段复刻发布面（types+import 双条件、无 require/default）
  *  ——resolver 不经 exports 解析（包根直探），该形态为 E4 类错误的机械防线。 */
 export function writeFakeContractsPackage(packageRoot: string, opts: FakeContractsOptions = {}): void {
-  const { version = '0.9.0', withStrict = true, withDist = true, brokenDist = false, missingEvaluationExports = false, rejectMarker, resolveBody, slots, zodRejectPaths } = opts;
+  const { version = '0.9.0', withStrict = true, withDist = true, brokenDist = false, missingEvaluationExports = false, rejectMarker, resolveBody, withMarker = true, slots, meta, slotsLayout = 'root', zodRejectPaths } = opts;
   const strictBody = withStrict
     ? `export function parseIntegrationsConfig(raw) { ${
         rejectMarker ? `if (JSON.stringify(raw).includes(${JSON.stringify(rejectMarker)})) throw new Error("fake strict reject"); ` : ''
@@ -68,9 +76,10 @@ export function writeFakeContractsPackage(packageRoot: string, opts: FakeContrac
           : ''
       }return raw; }`
     : '';
-  const resolveLine = `export function resolveEffectiveService(integrations, service, instanceId, supplies) { ${
+  const resolveLine = `export function resolveEffectiveService(integrations, service, instanceId, supplies, ownerOf) { ${
     resolveBody ?? 'return { status: "service-not-configured" };'
   } }`;
+  const markerLine = withMarker ? 'export const OWNERSHIP_BINDING_V6 = true;' : '';
   const exportsBody = missingEvaluationExports
     ? `export const marker = 1;\n${strictBody}`
     : [
@@ -79,6 +88,7 @@ export function writeFakeContractsPackage(packageRoot: string, opts: FakeContrac
         'export function moduleDomainOf(service) { return String(service).split(".")[0] ?? ""; }',
         'export function normalizeInstances(config) { return { instances: (config && config.instances) || [], defaultInstanceId: (config && config.defaultInstanceId) ?? null }; }',
         'export const RESOURCE_TYPE_IDS = ["knowledge"];',
+        markerLine,
         strictBody,
         '',
       ]
@@ -113,12 +123,31 @@ export function writeFakeContractsPackage(packageRoot: string, opts: FakeContrac
     mkdirSync(join(packageRoot, 'src'), { recursive: true });
     writeFileSync(join(packageRoot, 'src', 'runtime.ts'), exportsBody);
   }
-  // service-slots.json（P9 词汇源——探测链发现位 = 包根；缺省不物化 = 词汇空）
+  // service-slots.json（P9 词汇源——探测三跳发现位；缺省不物化 = 词汇空；
+  // slotsLayout 控制包根/src 落位——B0 探测跳①/②）
   if (slots && slots.length > 0) {
-    writeFileSync(join(packageRoot, 'service-slots.json'), `${JSON.stringify({ slots }, null, 2)}\n`);
+    const slotsFile = slotsLayout === 'src' ? join(packageRoot, 'src', 'service-slots.json') : join(packageRoot, 'service-slots.json');
+    mkdirSync(dirname(slotsFile), { recursive: true });
+    writeFileSync(slotsFile, `${JSON.stringify(meta ? { slots, meta } : { slots }, null, 2)}\n`);
   }
 }
 
+/**
+ * 候选自身 src 词汇包（B0 探测跳 ③——local/codegen 全量副本形态）：
+ * 落 <appDir>/packages/<name>/src/service-slots.json（无 package.json/node_modules——
+ * mall 生成应用主形态：stage rewriteExportsToSrc 展开后永驻 packages/*，不依赖 install）。
+ */
+export function writeSelfSrcContractPackage(
+  appDir: string,
+  name: string,
+  content: { slots: string[]; meta?: Record<string, { name?: string; description?: string }> },
+): string {
+  const dir = join(appDir, 'packages', name, 'src');
+  mkdirSync(dir, { recursive: true });
+  writeFileSync(join(dir, 'service-slots.json'), `${JSON.stringify(content, null, 2)}\n`);
+  return join(appDir, 'packages', name);
+}
+
 export interface LinkOptions {
   /** 候选子目录：''（appDir 根）/ 'apps/server' / 'apps/client' / 'packages/<id>' */
   subdir: string;

package/tests/dev-manifest-catalog.test.ts

@@ -2,7 +2,7 @@ import { describe, it, expect, afterEach } from 'vitest';
 import { mkdirSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { walkManifests } from '../src/assembly/walk-manifests.js';
-import { createTempApp, type TempApp } from './demo-app.js';
+import { createTempApp, linkContracts, writeFakeContractsPackage, writeSelfSrcContractPackage, type TempApp } from './demo-app.js';
 
 /**
  * dev-manifest catalog 通道（通道 1.5）单测：聚合宽/声明窄不变量锁定。
@@ -11,20 +11,20 @@ import { createTempApp, type TempApp } from './demo-app.js';
  */
 
 /** strict descriptor（形状对齐 provider-custom 出厂 manifest——parseModuleDescriptor 严格面） */
-function descriptor(name: string, provider: string, service: string): Record<string, unknown> {
+function descriptor(id: string, provider: string, service: string): Record<string, unknown> {
   return {
     schemaVersion: 1,
-    name,
+    id,
     version: '1.0.0',
     kind: 'business',
     risk: { level: 'low', writeBoundary: 'source' },
     distribution: { defaultMode: 'codegen' },
-    contributes: {
-      handlers: [], tools: [], cards: [], routes: [], pages: [], tabs: [],
+    declare: {
+      handlers: [], tools: [], cards: [], routes: [], pages: [], tabs: [], owns: [], consumes: [],
       providers: {
         slots: [{ service, provider, implementation: `${provider}-impl@1`, credentialType: 'apikey' }],
       },
-      services: [],
+      resources: [],
     },
     dependencies: { modules: [] },
     env: [],
@@ -112,3 +112,83 @@ describe('walkManifests · dev-manifest catalog 通道（聚合宽/声明窄）'
     expect(walk.modules).toHaveLength(0);
   });
 });
+
+/**
+ * 词汇探测三跳（B0 回归锁）：词汇源三真实布局全覆盖——
+ * ① nm 包根（夹具/旧布局）② nm src/（发布包 src 附带 + 模板 shim 链接）③ 候选自身 src/
+ * （local/codegen 全量副本——mall 生成应用主形态，不依赖 install）。
+ * 修复前探测只扫包根 → 三形态全 miss（vocabulary 恒空）。
+ */
+describe('walkManifests · 词汇探测三跳 + slotMeta（B0）', () => {
+  it('P1: nm 包根布局（跳①）→ vocabulary 命中；slotMeta 透传', () => {
+    app = createTempApp('tbox-probe-');
+    const store = join(app.appDir, '_store-a');
+    writeFakeContractsPackage(store, {
+      slots: ['auth.alipay-login', 'mall.info'],
+      meta: { 'auth.alipay-login': { name: '支付宝登录', description: '登录换码（code2Session）' } },
+    });
+    linkContracts(app.appDir, store, { subdir: 'apps/server' });
+
+    const walk = walkManifests(app.appDir);
+    expect(walk.vocabulary).toEqual(['auth.alipay-login', 'mall.info']);
+    expect(walk.slotMeta['auth.alipay-login']).toEqual({ name: '支付宝登录', description: '登录换码（code2Session）' });
+    expect(walk.slotMeta['mall.info']).toBeUndefined(); // meta 缺席槽不入表
+  });
+
+  it('P2: nm src 布局（跳②——发布包 src 附带 / shim 链接形态）→ 命中', () => {
+    app = createTempApp('tbox-probe-');
+    const store = join(app.appDir, '_store-b');
+    writeFakeContractsPackage(store, { slots: ['parking.query'], slotsLayout: 'src' });
+    linkContracts(app.appDir, store, { subdir: 'apps/server' });
+
+    const walk = walkManifests(app.appDir);
+    expect(walk.vocabulary).toEqual(['parking.query']);
+  });
+
+  it('P3: 候选自身 src 布局（跳③——local/codegen 全量副本，无 node_modules 链接）→ 命中', () => {
+    app = createTempApp('tbox-probe-');
+    writeSelfSrcContractPackage(app.appDir, 'contracts-mall', {
+      slots: ['member.account', 'parking.payment'],
+      meta: { 'member.account': { name: '会员账户' } },
+    });
+
+    const walk = walkManifests(app.appDir);
+    expect(walk.vocabulary).toEqual(['member.account', 'parking.payment']);
+    expect(walk.slotMeta['member.account']).toEqual({ name: '会员账户' });
+  });
+
+  it('P4: 多包同槽 meta → 发现序首声明胜出（apps/* 先于 packages/* 候选序）', () => {
+    app = createTempApp('tbox-probe-');
+    const storeA = join(app.appDir, '_store-first');
+    writeFakeContractsPackage(storeA, { slots: ['x.y'], meta: { 'x.y': { name: '甲' } } });
+    linkContracts(app.appDir, storeA, { subdir: 'apps/server' });
+    const storeB = join(app.appDir, '_store-second');
+    writeFakeContractsPackage(storeB, { slots: ['x.y'], meta: { 'x.y': { name: '乙' } } });
+    linkContracts(app.appDir, storeB, { subdir: 'packages/mock' });
+
+    const walk = walkManifests(app.appDir);
+    expect(walk.slotMeta['x.y']).toEqual({ name: '甲' });
+  });
+
+  it('P5: 坏 meta 条目（非对象/非 string/空串）→ 宽松跳过，slots 正常', () => {
+    app = createTempApp('tbox-probe-');
+    const store = join(app.appDir, '_store-bad');
+    writeFakeContractsPackage(store, { slots: ['a.b'] });
+    writeFileSync(
+      join(store, 'service-slots.json'),
+      JSON.stringify({ slots: ['a.b', 'c.d', 'e.f'], meta: { 'a.b': '字符串', 'c.d': { name: 42 }, 'e.f': { name: '甲', description: '' } } }),
+    );
+    linkContracts(app.appDir, store, { subdir: 'apps/server' });
+
+    const walk = walkManifests(app.appDir);
+    expect(walk.vocabulary).toEqual(['a.b', 'c.d', 'e.f']);
+    expect(walk.slotMeta).toEqual({ 'e.f': { name: '甲' } }); // 空串 description 不入表（与 title 守卫对称）
+  });
+
+  it('P6: 无契约包（退化态）→ vocabulary 空 + slotMeta 空（P9 退化路径语义锁）', () => {
+    app = createTempApp('tbox-probe-');
+    const walk = walkManifests(app.appDir);
+    expect(walk.vocabulary).toEqual([]);
+    expect(walk.slotMeta).toEqual({});
+  });
+});

package/tests/file-cache.test.ts

@@ -132,7 +132,7 @@ describe('Freshness Contract W3/W7 — agent 动线矩阵（工厂方法级；FX
     mkdirSync(join(app.appDir, 'packages', 'module-new'), { recursive: true });
     writeFileSync(
       join(app.appDir, 'packages', 'module-new', 'tbox.module.json'),
-      JSON.stringify({ schemaVersion: 1, name: 'module-new', contributes: { services: [{ service: 'new.slot' }] } }),
+      JSON.stringify({ schemaVersion: 1, id: 'module-new', declare: { owns: [{ service: 'new.slot' }], consumes: [{ service: 'new.slot' }] } }),
     );
     const walk = walkManifests(app.appDir);
     expect(walk.modules.map((m) => m.id)).toContain('module-new');
@@ -172,10 +172,10 @@ describe('Freshness Contract W3/W7 — agent 动线矩阵（工厂方法级；FX
       join(app.appDir, 'packages', 'provider-x', 'tbox.module.json'),
       JSON.stringify({
         schemaVersion: 1,
-        name: 'provider-x',
-        contributes: {
+        id: 'provider-x',
+        declare: {
           providers: { slots: [{ service: 'parking.query', provider: 'joycity', implementation: 'joycity-parking@1', credentialType: 'joycity-c' }] },
-          services: [{ service: 'member.account' }],
+          consumes: [{ service: 'member.account' }],
         },
       }),
     );
@@ -196,7 +196,7 @@ describe('Freshness Contract W3/W7 — agent 动线矩阵（工厂方法级；FX
     mkdirSync(sdkDir, { recursive: true });
     writeFileSync(
       join(sdkDir, 'tbox.module.json'),
-      JSON.stringify({ schemaVersion: 1, name: 'module-sdk-y', contributes: { services: [{ service: 'sdk.slot-y', title: 'Sdk 槽' }] } }),
+      JSON.stringify({ schemaVersion: 1, id: 'module-sdk-y', declare: { owns: [{ service: 'sdk.slot-y' }], consumes: [{ service: 'sdk.slot-y', name: 'Sdk 槽' }] } }),
     );
     const modules2 = await tk.loadModules();
     expect(modules2.modules.map((m) => m.id)).toContain('module-sdk-y');