@tbox.cn/app-toolkit 0.4.0 → 0.5.0

package/src/views/context.ts

@@ -1,12 +1,11 @@
 import { readIntegrationsConfig } from '../integrations/read.js';
-import { domainOfService } from '../integrations/domain-binding.js';
 import { walkManifests, type WalkCatalog, type WalkManifestsResult } from '../assembly/walk-manifests.js';
 import type { FileCache } from '../core/file-cache.js';
 import type { ResolvedContracts } from '../core/contracts-resolver.js';
 
 /**
  * 视图装配共享上下文（五投影共用；目录枚举零缓存——walkManifests 每次调用执行）。
- * 域前缀换算（service → 首点段）自 v4.4 F1 迁 integrations/domain-binding.ts（本文件 re-export 保导入路径）。
+ * v6：域前缀换算退役（domainOfService 随归属模型退场）——模块占用判定改 declare 三键直读。
  */
 
 export interface ViewContext {
@@ -22,8 +21,6 @@ export interface ViewSnapshot {
   contracts: ResolvedContracts;
 }
 
-export { domainOfService };
-
 /** 读取视图输入快照（每方法调用独立——Freshness Contract 单位 = 方法调用） */
 export async function loadViewSnapshot(ctx: ViewContext): Promise<ViewSnapshot> {
   const walk = walkManifests(ctx.appDir, ctx.cache);
@@ -40,12 +37,14 @@ export function loadViewSnapshotSync(ctx: ViewContext, contracts: ResolvedContra
   return { appDir: ctx.appDir, walk, catalog: walk.catalog, integrations, contracts };
 }
 
-/** 模块占用服务集（demand 侧——平台服务 = 词汇 − 本集） */
+/** 模块占用服务集（v6——demand ∪ supply ∪ owns：归属模型下「平台服务」= 无主服务；
+ *  mall-core owns auth.alipay-login → 移出 AppView.services 平台条目，入其模块页 ownedServices） */
 export function moduleOccupiedServices(walk: WalkManifestsResult): Set<string> {
   const occupied = new Set<string>();
   for (const mod of walk.modules) {
-    for (const need of mod.descriptor.contributes.services ?? []) occupied.add(need.service);
-    for (const slot of mod.descriptor.contributes.providers?.slots ?? []) occupied.add(slot.service);
+    for (const own of mod.descriptor.declare.owns ?? []) occupied.add(own.service);
+    for (const need of mod.descriptor.declare.consumes ?? []) occupied.add(need.service);
+    for (const slot of mod.descriptor.declare.providers?.slots ?? []) occupied.add(slot.service);
   }
   return occupied;
 }
@@ -66,22 +65,22 @@ export function suppliedByVendors(catalog: WalkCatalog, service: string): string
   return vendors.sort();
 }
 
-/** 服务展示名解析结果（title 恒有值——id 兜底内聚） */
+/** 服务展示名解析结果（name 恒有值——id 兜底内聚；v7 词汇统一 title→name） */
 export interface ServiceDisplay {
-  title: string;
+  name: string;
   description?: string;
 }
 
 /**
  * 服务展示名单源（B1）：词汇 meta（slotMeta——contracts-mall 词汇锁保证 mall 域覆盖）
  * > demand meta（catalog.services——域外槽兜底；首声明聚合）> service id。逐字段回落——
- * 词汇条目仅含 description 时 demand title 仍可达（外部契约包部分 meta 前向容错）。
+ * 词汇条目仅含 description 时 demand name 仍可达（外部契约包部分 meta 前向容错）。
  * 四视图唯一消费点（/modules/:m services、/app 平台条目、/services/:s、/providers/:p services）。
  */
 export function resolveServiceDisplay(walk: WalkManifestsResult, service: string): ServiceDisplay {
   const vocab = walk.slotMeta[service];
   const demand = walk.catalog.services[service];
-  const title = vocab?.title ?? demand?.title ?? service;
+  const name = vocab?.name ?? demand?.name ?? service;
   const description = vocab?.description ?? demand?.description;
-  return { title, ...(description !== undefined ? { description } : {}) };
+  return { name, ...(description !== undefined ? { description } : {}) };
 }

package/src/views/integration-schemas.ts

@@ -1,7 +1,7 @@
 import type { IntegrationFieldRegistryView, LayerIntegrationSchemas, ServiceIntegrationSchemas } from '../dto.js';
 import { isSupplied, type ViewSnapshot } from './context.js';
 import { resolveServiceConfigSchema } from './providers.js';
-import { domainOfService, moduleDomainWritable, providerFootprint, resolveDomainBinding } from '../integrations/domain-binding.js';
+import { moduleOwnershipWritable, providerFootprint, resolveModuleBinding } from '../integrations/module-binding.js';
 import { isControlledInlineProvider } from '../integrations/predicate.js';
 
 /**
@@ -117,6 +117,12 @@ export function buildIntegrationFieldRegistry(
       key,
       schema: mergeFieldSources(sources),
       sources: sources.map(({ service, required }) => ({ service, required })),
+      // G 批：x-tbox-global 聚合旗标（sources.some——subschema 属性标记直读，零新增 IO；
+      // 任一来源声明即 true——并集口径与 required 聚合同族）
+      global: sources.some(
+        (s) => !!s.subschema && typeof s.subschema === 'object'
+          && (s.subschema as Record<string, unknown>)['x-tbox-global'] === true,
+      ),
     });
   }
   return {
@@ -129,7 +135,7 @@ export function buildIntegrationFieldRegistry(
 }
 
 /** D37 生效厂商解析单源（实际/假想同径）：override（非空串）?? 实际解析。
- *  空串归一（I3）单点；module 轴 D34 不可写/不在册 → null（override 不豁免——预览服务于保存）。 */
+ *  空串归一（I3）单点；module 轴 v6 零归属 → null（override 不豁免——预览服务于保存）。 */
 export function formProviderOf(
   axis: 'app' | 'module',
   snapshot: ViewSnapshot,
@@ -144,10 +150,10 @@ export function formProviderOf(
   }
   const mod = snapshot.walk.modules.find((m) => m.id === moduleId);
   if (!mod) return null; // 视图已先行 404，此处防御
-  const w = moduleDomainWritable(snapshot.walk, mod);
-  if (!w.writable) return null; // D34 不豁免
+  const w = moduleOwnershipWritable(snapshot.walk, mod);
+  if (!w.writable) return null; // v6 零归属不豁免
   if (ovr !== undefined) return ovr;
-  return resolveDomainBinding(snapshot.integrations, w.domainKey).provider;
+  return resolveModuleBinding(snapshot.integrations, mod.id).provider;
 }
 
 /** D36/D37 表单层双投影（I1：同源同口径一次计算——双取单算 by construction） */
@@ -159,29 +165,39 @@ export interface LayerFormViews {
 /** 防御双 null（module 不在册/不可写/未绑定、app 未绑定——F3） */
 const NULL_FORM_VIEWS: LayerFormViews = { integrationSchemas: null, integrationFieldRegistry: null };
 
+/** G 批表单收窄（消费投影单点）：app/module 轴 registry.fields 只留 global===true——
+ *  未声明键落 ExtraFields 语义（P16 复合可见面：layer.properties 仍全量，字段级代数不受扰）。
+ *  schemaless/unsupplied/additionalPropertiesAllowed 描述服务/Schema 面，不随字段过滤。 */
+function narrowToGlobal(registry: IntegrationFieldRegistryView): IntegrationFieldRegistryView {
+  return { ...registry, fields: registry.fields.filter((f) => f.global) };
+}
+
 /** app 轴装配：scope = 供给足迹全量（≠ AppView.services——root.config 流向包括模块服务在内的所有服务）；
  *  unsupplied 恒 []（结构性：足迹 ⊆ 供给）。未知厂商/零足迹 → 非 null 空集（镜像 D32 mock 语义）。 */
 export function loadAppFormViews(snapshot: ViewSnapshot, appProvider?: string): LayerFormViews {
   const provider = formProviderOf('app', snapshot, undefined, appProvider);
   if (provider === null) return NULL_FORM_VIEWS;
   const layer = resolveLayerIntegrationSchemas(snapshot, provider, providerFootprint(snapshot.catalog, provider));
-  return { integrationSchemas: layer, integrationFieldRegistry: buildIntegrationFieldRegistry(layer) };
+  return { integrationSchemas: layer, integrationFieldRegistry: narrowToGlobal(buildIntegrationFieldRegistry(layer)) };
 }
 
-/** module 轴装配：仅 writable 单域（D34）；scope = demand ∩ 该厂商供给；unsupplied 同点派生
- *  （demand − 供给，Set 去重保序——manifest demand 不去重防御）。 */
+/** module 轴装配：仅 writable（v6 owns>0）；scope = ownedServices ∩ 该厂商供给（v6——模块
+ *  config 流向归属服务）；unsupplied 同点派生（ownedServices − 供给，Set 去重保序——
+ *  declare.owns 不去重防御）。 */
 export function loadModuleFormViews(snapshot: ViewSnapshot, moduleId: string, moduleProvider?: string): LayerFormViews {
   const provider = formProviderOf('module', snapshot, moduleId, moduleProvider);
   const mod = snapshot.walk.modules.find((m) => m.id === moduleId);
   if (provider === null || !mod) return NULL_FORM_VIEWS;
-  const demand = (mod.descriptor.contributes.services ?? []).map((s) => s.service);
+  const owned = (mod.descriptor.declare.owns ?? []).map((o) => o.service);
   const supplied = (s: string): boolean => isSupplied(snapshot.catalog, provider, s);
-  const layer = resolveLayerIntegrationSchemas(snapshot, provider, demand.filter(supplied));
+  const layer = resolveLayerIntegrationSchemas(snapshot, provider, owned.filter(supplied));
   return {
     integrationSchemas: layer,
-    integrationFieldRegistry: buildIntegrationFieldRegistry(layer, {
-      unsupplied: [...new Set(demand.filter((s) => !supplied(s)))],
-    }),
+    integrationFieldRegistry: narrowToGlobal(
+      buildIntegrationFieldRegistry(layer, {
+        unsupplied: [...new Set(owned.filter((s) => !supplied(s)))],
+      }),
+    ),
   };
 }
 
@@ -195,9 +211,20 @@ export function loadModuleIntegrationSchemas(snapshot: ViewSnapshot, moduleId: s
   return loadModuleFormViews(snapshot, moduleId).integrationSchemas;
 }
 
+/** 服务级生效绑定（v6 级联）：显式 ?? modules[ownerOf[s]].provider ?? root.provider。
+ *  服务无主 → 仅 root（平台槽语义）。 */
+function serviceLevelBindingProvider(snapshot: ViewSnapshot, service: string): string | null {
+  const owner = snapshot.walk.ownership[service];
+  if (owner !== undefined) {
+    return resolveModuleBinding(snapshot.integrations, owner).provider;
+  }
+  const p = (snapshot.integrations as { provider?: unknown } | null)?.provider;
+  return typeof p === 'string' && p.length > 0 ? p : null;
+}
+
 /** 服务级 loader（v4.7 D38）：四分支穷举（node.provider = 文件 services[s].provider 逐字原值；
  *  实例层无条件排除——node 级口径）；非空三分支归约一次复合解析。
- *  ① undefined/'' → resolveDomainBinding 域级联（域 + root 双缺 → 整字段 null）
+ *  ① undefined/'' → 模块级联（v6：modules[ownerOf[s]] → root 双缺 → 整字段 null）
  *  ② 非空 string → bare：catalog miss（未知厂商/未供给）→ configSchema:null 不 404（富化非门控）
  *  ③ 受控内联（isControlledInlineProvider 单源）→ 名 = p.provider；catalog 复合键 > p.configSchema ref
  *     （H9 逃逸 400 照抛——readInlineSchema 共享路径）
@@ -210,10 +237,10 @@ export function loadServiceIntegrationSchemas(
   const p = (snapshot.integrations as { services?: Record<string, { provider?: unknown }> } | null)
     ?.services?.[service]?.provider;
   if (p === undefined || p === '') {
-    const binding = resolveDomainBinding(snapshot.integrations, domainOfService(service));
-    return binding.provider === null
+    const provider = serviceLevelBindingProvider(snapshot, service);
+    return provider === null
       ? null
-      : { provider: binding.provider, configSchema: resolveServiceConfigSchema(snapshot, binding.provider, service) };
+      : { provider, configSchema: resolveServiceConfigSchema(snapshot, provider, service) };
   }
   if (typeof p === 'string') {
     return { provider: p, configSchema: resolveServiceConfigSchema(snapshot, p, service) };
@@ -224,3 +251,20 @@ export function loadServiceIntegrationSchemas(
   }
   return null;
 }
+
+/** G 批：服务轴字段注册表（D38 四分支链复用——消费 loadServiceIntegrationSchemas 单源；
+ *  伪层 {provider, services: {[s]: {configSchema}}} → buildIntegrationFieldRegistry——
+ *  fields = 该 schema 全部字段带 global 旗标；configSchema null → schemaless=[service]
+ *  非 null 空集；schemas 整体 null（全链未绑定/坏节点）→ registry null——镜像 D38 语义） */
+export function loadServiceFieldRegistry(
+  snapshot: ViewSnapshot,
+  service: string,
+): IntegrationFieldRegistryView | null {
+  const schemas = loadServiceIntegrationSchemas(snapshot, service);
+  if (schemas === null) return null;
+  const layer: LayerIntegrationSchemas = {
+    provider: schemas.provider,
+    services: { [service]: { configSchema: schemas.configSchema } },
+  };
+  return buildIntegrationFieldRegistry(layer);
+}

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 { 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）。
  */
@@ -33,46 +33,52 @@ export function loadModulesView(snapshot: ViewSnapshot): { modules: ModuleDeclar
     .filter((mod) => !isProviderFamily(mod))
     .map((mod) => ({
       id: mod.id,
-      name: mod.descriptor.name,
-      // 模块 meta（B1 additive）：manifest title/description——兜底 name / ''（视图层灌值）
-      title: mod.descriptor.title ?? mod.descriptor.name,
+      // 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) => {
+  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,
-      title: display.title,
+      name: display.name,
       ...(display.description !== undefined ? { description: display.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 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 {
-    // 模块 meta（B1 additive）——兜底与 /modules 同语义
-    title: mod.descriptor.title ?? mod.descriptor.name,
+    // v7 词汇统一：name = 展示名（兜底与 /modules 同语义——manifest name ?? id）
+    name: mod.descriptor.name ?? mod.descriptor.id,
     description: mod.descriptor.description ?? '',
-    domainKeys: [...w.domainKeys],
+    // v6：ownedServices（declare.owns 展平排序）——N13：展示名走 resolveServiceDisplay 链，不重复携带
+    ownedServices: w.ownedServices,
     integration,
-    providerBindings,
+    binding: { provider: binding.provider, layer: binding.layer },
     configEditable: w.writable,
     services,
   };

package/src/views/providers.ts

@@ -22,7 +22,7 @@ export function loadProvidersView(snapshot: ViewSnapshot): ProvidersView {
       local: entries.every((e) => e.local === true),
       owner: entries[0].owner,
       // 厂商展示元数据（B1 walk 层传播——首条目 = 首声明，与 owner 同语义）
-      ...(entries[0].title ? { title: entries[0].title } : {}),
+      ...(entries[0].name ? { name: entries[0].name } : {}),
       ...(entries[0].description ? { description: entries[0].description } : {}),
     });
   }
@@ -43,10 +43,10 @@ export function loadProviderDetailView(snapshot: ViewSnapshot, provider: string,
       bucket.implementations.push({ implementation: entry.implementation, credentialType: entry.credentialType });
     }
   }
-  // 服务展示名走链（B1）：词汇 meta > demand meta > id（title 恒发）
+  // 服务展示名走链（B1）：词汇 meta > demand meta > id（name 恒发）
   for (const [service, bucket] of Object.entries(services)) {
     const display = resolveServiceDisplay(snapshot.walk, service);
-    bucket.title = display.title;
+    bucket.name = display.name;
     if (display.description !== undefined) bucket.description = display.description;
   }
   if (include?.has('integrationSchemas')) {
@@ -59,8 +59,8 @@ export function loadProviderDetailView(snapshot: ViewSnapshot, provider: string,
     provider,
     local: entries.every((e) => e.local === true),
     owner: entries[0].owner,
-    // 厂商展示元数据（B1 walk 层传播——首条目透传）
-    ...(entries[0].title ? { title: entries[0].title } : {}),
+    // 厂商展示元数据（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

@@ -21,7 +21,7 @@ export function loadServiceDetailView(snapshot: ViewSnapshot, service: string):
   const display = resolveServiceDisplay(snapshot.walk, service);
   return {
     service,
-    title: display.title,
+    name: display.name,
     ...(display.description !== undefined ? { description: display.description } : {}),
     required: demand ? !demand.optional : false,
     // defaults 唯一落位（manifest 预填）

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,12 +46,15 @@ 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 {title,description}——B1 展示名链 fixture） */
-  meta?: Record<string, { title?: string; description?: 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';
@@ -63,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, meta, slotsLayout = 'root', 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"); ` : ''
@@ -73,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}`
     : [
@@ -84,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,
         '',
       ]
@@ -135,7 +140,7 @@ export function writeFakeContractsPackage(packageRoot: string, opts: FakeContrac
 export function writeSelfSrcContractPackage(
   appDir: string,
   name: string,
-  content: { slots: string[]; meta?: Record<string, { title?: string; description?: string }> },
+  content: { slots: string[]; meta?: Record<string, { name?: string; description?: string }> },
 ): string {
   const dir = join(appDir, 'packages', name, 'src');
   mkdirSync(dir, { recursive: true });

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

@@ -11,20 +11,20 @@ import { createTempApp, linkContracts, writeFakeContractsPackage, writeSelfSrcCo
  */
 
 /** 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: [],
@@ -125,13 +125,13 @@ describe('walkManifests · 词汇探测三跳 + slotMeta（B0）', () => {
     const store = join(app.appDir, '_store-a');
     writeFakeContractsPackage(store, {
       slots: ['auth.alipay-login', 'mall.info'],
-      meta: { 'auth.alipay-login': { title: '支付宝登录', description: '登录换码（code2Session）' } },
+      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({ title: '支付宝登录', description: '登录换码（code2Session）' });
+    expect(walk.slotMeta['auth.alipay-login']).toEqual({ name: '支付宝登录', description: '登录换码（code2Session）' });
     expect(walk.slotMeta['mall.info']).toBeUndefined(); // meta 缺席槽不入表
   });
 
@@ -149,25 +149,25 @@ describe('walkManifests · 词汇探测三跳 + slotMeta（B0）', () => {
     app = createTempApp('tbox-probe-');
     writeSelfSrcContractPackage(app.appDir, 'contracts-mall', {
       slots: ['member.account', 'parking.payment'],
-      meta: { 'member.account': { title: '会员账户' } },
+      meta: { 'member.account': { name: '会员账户' } },
     });
 
     const walk = walkManifests(app.appDir);
     expect(walk.vocabulary).toEqual(['member.account', 'parking.payment']);
-    expect(walk.slotMeta['member.account']).toEqual({ title: '会员账户' });
+    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': { title: '甲' } } });
+    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': { title: '乙' } } });
+    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({ title: '甲' });
+    expect(walk.slotMeta['x.y']).toEqual({ name: '甲' });
   });
 
   it('P5: 坏 meta 条目（非对象/非 string/空串）→ 宽松跳过，slots 正常', () => {
@@ -176,13 +176,13 @@ describe('walkManifests · 词汇探测三跳 + slotMeta（B0）', () => {
     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': { title: 42 }, 'e.f': { title: '甲', description: '' } } }),
+      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': { title: '甲' } }); // 空串 description 不入表（与 title 守卫对称）
+    expect(walk.slotMeta).toEqual({ 'e.f': { name: '甲' } }); // 空串 description 不入表（与 title 守卫对称）
   });
 
   it('P6: 无契约包（退化态）→ vocabulary 空 + slotMeta 空（P9 退化路径语义锁）', () => {

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