agentic-flow-kit 1.8.7 → 2.1.0

package/src/commands/install.mjs

@@ -0,0 +1,296 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { spawnSync } from 'node:child_process';
+import { flag } from '../cli/args.mjs';
+import { buildPlan } from '../install/plan.mjs';
+import { applyPlan, summaryLine } from '../install/apply.mjs';
+import { emptyManifest, readManifest, writeManifest } from '../install/manifest.mjs';
+import { buildVars } from '../render/tokens.mjs';
+import { HOST_NAMES, resolveHost } from '../hosts/registry.mjs';
+import { configureGit, isGitRepo } from '../git/config.mjs';
+import {
+  parseModelFlags, readInjectedModels, resolveModels, summarizeModels, writeLocalModelRoles,
+} from '../models/resolve.mjs';
+
+export function readKitVersion() {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(fileURLToPath(new URL('../../package.json', import.meta.url)), 'utf8'));
+    return pkg.version || '0.0.0';
+  } catch {
+    return '0.0.0';
+  }
+}
+
+const KIT_VERSION = readKitVersion();
+
+export function resolveTarget(args) {
+  const target = path.resolve(args.target || process.cwd());
+  if (!fs.existsSync(target)) {
+    const err = new Error(`target not found: ${target}`);
+    err.code = 'TARGET_MISSING';
+    throw err;
+  }
+  return target;
+}
+
+export function resolveHosts(args, t, fallback = []) {
+  const names = args.agents && args.agents.length ? args.agents : fallback;
+  if (!names.length) {
+    const err = new Error(t('error.noHosts', { hosts: HOST_NAMES.join(', ') }));
+    err.code = 'NO_HOSTS';
+    throw err;
+  }
+  const out = [];
+  for (const name of names) {
+    try {
+      resolveHost(name);
+    } catch {
+      const err = new Error(t('error.unknownHost', { name, hosts: HOST_NAMES.join(', ') }));
+      err.code = 'UNKNOWN_HOST';
+      throw err;
+    }
+    const key = String(name).trim().toLowerCase();
+    if (!out.includes(key)) out.push(key);
+  }
+  return out;
+}
+
+// 根目录标记，先匹配者胜出。package.json 放在最后，避免吞掉 Cargo.toml / go.mod / pom.xml / tsconfig.json。
+// label 是菜单上的典型标记；match 返回实际命中的文件名。
+const STACK_MARKERS = [
+  {
+    stack: 'dotnet',
+    label: '.sln / .csproj',
+    match: (names) => names.find((n) => n.endsWith('.sln')) || names.find((n) => n.endsWith('.csproj')) || null,
+  },
+  { stack: 'rust', label: 'Cargo.toml', match: (names) => (names.includes('Cargo.toml') ? 'Cargo.toml' : null) },
+  { stack: 'go', label: 'go.mod', match: (names) => (names.includes('go.mod') ? 'go.mod' : null) },
+  {
+    stack: 'java',
+    label: 'pom.xml / build.gradle',
+    match: (names) => ['pom.xml', 'build.gradle', 'build.gradle.kts'].find((n) => names.includes(n)) || null,
+  },
+  { stack: 'typescript', label: 'tsconfig.json', match: (names) => (names.includes('tsconfig.json') ? 'tsconfig.json' : null) },
+  { stack: 'node', label: 'package.json', match: (names) => (names.includes('package.json') ? 'package.json' : null) },
+];
+
+export function stackMarkerLabel(stack) {
+  return STACK_MARKERS.find((marker) => marker.stack === stack)?.label || '';
+}
+
+export function matchStack(names) {
+  const list = Array.isArray(names) ? names : [];
+  for (const marker of STACK_MARKERS) {
+    const file = marker.match(list);
+    if (file) return { stack: marker.stack, file };
+  }
+  return { stack: 'empty', file: null };
+}
+
+export function detectStackDetail(target) {
+  let top = [];
+  try {
+    top = fs.readdirSync(target);
+  } catch {
+    return { stack: 'empty', file: null };
+  }
+  return matchStack(top);
+}
+
+export function detectStack(target) {
+  return detectStackDetail(target).stack;
+}
+
+// 可选技术栈单一来源：TUI 向导栈菜单由它生成
+export const STACKS = ['dotnet', 'node', 'typescript', 'rust', 'go', 'java', 'empty'];
+
+export function resolveStack(args, target) {
+  const stack = String(args.stack || args.profile || detectStack(target));
+  const abs = fileURLToPath(new URL(`../../templates/profiles/${stack}/`, import.meta.url));
+  return fs.existsSync(abs) ? stack : 'empty';
+}
+
+export function installCommand({ args, t, lang, onLog }) {
+  const hosts = resolveHosts(args, t);
+  return runInstall({ args, t, lang, hosts, commandLabel: 'install', onLog });
+}
+
+const ACTION_MARK = { create: '+', update: '~', skip: '-', conflict: '!', merge: '~' };
+
+export function formatInstallLog(action, msg) {
+  return `${ACTION_MARK[action] || ' '} ${msg}`;
+}
+
+// 「已是最新」在升级时会占绝大多数，进度条已能表达。冲突和其余跳过必须留下原文。
+export function installLogNotable(action, msg) {
+  if (action === 'conflict') return true;
+  if (action === 'skip') return !String(msg).includes('已是最新');
+  return false;
+}
+
+// CLI 缺省进度行：action 前缀 + 消息（TUI 经 onLog 接管渲染）
+function logLine(action, msg) {
+  console.log(formatInstallLog(action, msg));
+}
+
+function normalizeModelMode(value) {
+  const v = String(value || 'recommend').toLowerCase();
+  return ['recommend', 'detect', 'inherit'].includes(v) ? v : 'recommend';
+}
+
+// 派生工件（索引/引擎地图）从单源现场取数生成，不能静态随模板漂移。
+// 它们不进 manifest：属于生成区，升级时重新生成即可。
+function generateDerivedArtifacts(target) {
+  for (const script of ['gen-workflow-index.mjs', 'gen-engine-map.mjs']) {
+    const abs = path.join(target, '.agents', 'scripts', script);
+    if (!fs.existsSync(abs)) continue;
+    try {
+      spawnSync(process.execPath, [abs], {
+        cwd: target, stdio: 'ignore', windowsHide: true, timeout: 30000,
+      });
+    } catch { /* 派生工件失败不阻断安装；verify/dream 会报漂移 */ }
+  }
+}
+
+const TIERS = ['lean', 'standard', 'enterprise'];
+function normalizeTier(value, t) {
+  const v = String(value || 'standard').toLowerCase();
+  if (!TIERS.includes(v)) {
+    const err = new Error(t('error.badTier', { value: value || '' }));
+    err.code = 'BAD_TIER';
+    throw err;
+  }
+  return v;
+}
+
+// onLog 回调契约：(action, msg, done, total) —— action ∈ create/update/skip/conflict/merge，
+// done/total 为已完成/总文件数，供 TUI 渲染 spinner 进度；缺省走 CLI 前缀行。
+export function runInstall({ args, t, lang, hosts, planHosts = hosts, categories, commandLabel, stackOverride, onLog = logLine }) {
+  const target = resolveTarget(args);
+  const dryRun = flag(args, 'dry-run');
+  const force = flag(args, 'force');
+  const stack = stackOverride || resolveStack(args, target);
+  const projectName = args.name || path.basename(target);
+  const previous = readManifest(target);
+  const hostSet = [...new Set([...(previous?.hosts || []), ...hosts])];
+  const trackHosts = flag(args, 'track-hosts');
+  // 档位：CLI > --hardened（=enterprise）> 既有 manifest > standard。
+  // 档位只影响交付面（CI / 加固），不削弱引擎门禁。
+  const tier = normalizeTier(
+    args.tier || (flag(args, 'hardened') ? 'enterprise' : null) || previous?.tier || 'standard',
+    t,
+  );
+  const hardened = flag(args, 'hardened') || tier === 'enterprise' || Boolean(previous?.hardened && !args.tier);
+
+  let modelFlags;
+  try {
+    modelFlags = parseModelFlags(args.models || []);
+  } catch (err) {
+    if (err.code !== 'BAD_MODEL') throw err;
+    const e = new Error(t('error.badModel', { value: err.value || '' }));
+    e.code = 'BAD_MODEL';
+    throw e;
+  }
+  const tuiModels = args.tuiModels || null;
+  const explicitModels = Object.keys(modelFlags.global).length > 0
+    || Object.keys(modelFlags.hosts).length > 0
+    || Boolean(tuiModels && Object.keys(tuiModels).length);
+  const modelMode = normalizeModelMode(args['model-mode']);
+  // 升级默认不重新探测：以本地 model-roles.local.json 为准，保证 agent 文件哈希稳定。
+  const shouldProbe = !previous || commandLabel === 'add-host' || explicitModels || modelMode === 'detect' || flag(args, 'probe-models');
+  const previousModels = commandLabel === 'upgrade'
+    ? readInjectedModels({ target, hosts: planHosts })
+    : {};
+  const models = flag(args, 'no-model-config') ? null : resolveModels({
+    hosts: planHosts,
+    target,
+    cli: modelFlags,
+    tui: tuiModels,
+    previous: previousModels,
+    mode: modelMode,
+    probe: shouldProbe,
+    allowCli: flag(args, 'probe-models'),
+  });
+
+  const plan = buildPlan({
+    target, hosts: planHosts, lang, stack, projectName, categories, models: models?.hosts, tier, hardened,
+  });
+  let done = 0;
+  const total = plan.entries.length;
+  const vars = buildVars({
+    target,
+    projectName,
+    stack,
+    language: lang,
+    hosts: hostSet,
+    kitVersion: KIT_VERSION,
+    installedAt: new Date().toISOString(),
+    trackHosts,
+  });
+
+  console.log(t('install.start', { command: commandLabel, target }));
+  console.log(t('install.plan', { hosts: hostSet.join(', '), stack, lang, count: plan.entries.length }));
+  console.log(t('install.tier', { tier, hardened: t(hardened ? 'tui.yes' : 'tui.no') }));
+  if (models) {
+    console.log(t('install.models', { models: summarizeModels(models) }));
+    for (const warning of models.warnings || []) {
+      console.log(t('install.modelWarning', { host: warning.host, role: warning.role }));
+    }
+  }
+  if (dryRun) console.log(t('install.dryRun'));
+
+  const manifest = previous || emptyManifest({
+    kitVersion: KIT_VERSION,
+    language: lang,
+    hosts: hostSet,
+    stack,
+  });
+
+  const result = applyPlan({
+    plan,
+    vars,
+    manifest,
+    dryRun,
+    force,
+    log: (action, msg) => onLog(action, msg, (done += 1), total),
+  });
+
+  console.log(summaryLine(result.stats, t));
+
+  if (!dryRun) {
+    generateDerivedArtifacts(target);
+    // 模型 ID 是机器本地状态：只写 gitignore 的 local 覆盖，不进 manifest。
+    if (models && (commandLabel !== 'upgrade' || explicitModels)) {
+      const saved = writeLocalModelRoles(target, models, {
+        overwrite: explicitModels || commandLabel === 'add-host',
+      });
+      if (saved.written) console.log(t('install.localModels', { path: path.join(target, '.agents/config/model-roles.local.json') }));
+    }
+
+    const next = {
+      ...manifest,
+      version: KIT_VERSION,
+      installedAt: new Date().toISOString(),
+      language: lang,
+      hosts: hostSet,
+      stack,
+      tier,
+      hardened,
+      files: result.files,
+    };
+    writeManifest(target, next);
+    console.log(t('install.manifest', { path: path.join(target, '.agents/install-manifest.json') }));
+
+    const gitConfig = flag(args, 'git-config') || (!flag(args, 'no-git-config') && isGitRepo(target));
+    if (gitConfig && isGitRepo(target)) {
+      configureGit(target);
+      console.log(t('install.gitConfig'));
+    } else if (!gitConfig) {
+      console.log(t('install.gitSkip'));
+    }
+    console.log(t('install.next'));
+  }
+
+  return result.stats.conflict > 0 ? 0 : 0;
+}

package/src/commands/upgrade.mjs

@@ -0,0 +1,30 @@
+import { readManifest } from '../install/manifest.mjs';
+import { makeT } from '../i18n.mjs';
+import { resolveTarget, runInstall } from './install.mjs';
+
+export function upgradeCommand({ args, t, lang }) {
+  const target = resolveTarget(args);
+  const manifest = readManifest(target);
+  if (!manifest) {
+    const err = new Error(t('error.noManifest'));
+    err.code = 'NO_MANIFEST';
+    throw err;
+  }
+  const currentLang = args.lang || manifest.language || lang;
+  const tt = makeT(currentLang);
+  const hosts = manifest.hosts || [];
+  if (!hosts.length) {
+    const err = new Error(t('error.noHostsInManifest'));
+    err.code = 'NO_HOSTS_IN_MANIFEST';
+    throw err;
+  }
+  return runInstall({
+    args: { ...args, target },
+    t: tt,
+    lang: currentLang,
+    hosts,
+    planHosts: hosts,
+    commandLabel: 'upgrade',
+    stackOverride: args.stack || args.profile || manifest.stack,
+  });
+}

package/src/git/config.mjs

@@ -0,0 +1,61 @@
+import { execFileSync } from 'node:child_process';
+
+export const HOOKS_PATH = '.githooks';
+export const JSONL_UNION_DRIVER = 'node .agents/scripts/git-merge-jsonl.mjs %O %A %B';
+
+export function isGitRepo(target) {
+  try {
+    execFileSync('git', ['-C', target, 'rev-parse', '--git-dir'], { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export function getConfig(target, key) {
+  try {
+    return execFileSync('git', ['-C', target, 'config', '--get', key], { encoding: 'utf8' }).trim();
+  } catch {
+    return '';
+  }
+}
+
+export function setConfig(target, key, value) {
+  execFileSync('git', ['-C', target, 'config', key, value], { stdio: 'ignore' });
+}
+
+export function configureGit(target) {
+  setConfig(target, 'core.hooksPath', HOOKS_PATH);
+  setConfig(target, 'merge.ours.driver', 'true');
+  setConfig(target, 'merge.jsonl-union.driver', JSONL_UNION_DRIVER);
+}
+
+export function doctorGit(target) {
+  const checks = [];
+  if (!isGitRepo(target)) {
+    checks.push({ ok: false, name: 'git repository', detail: '目标不是 git 仓库，无法配置/校验 git 门禁' });
+    return checks;
+  }
+  const hooks = getConfig(target, 'core.hooksPath');
+  checks.push({
+    ok: hooks === HOOKS_PATH,
+    name: 'core.hooksPath',
+    detail: hooks || '未配置',
+    fix: `git -C "${target}" config core.hooksPath ${HOOKS_PATH}`,
+  });
+  const ours = getConfig(target, 'merge.ours.driver');
+  checks.push({
+    ok: ours === 'true',
+    name: 'merge.ours.driver',
+    detail: ours || '未配置',
+    fix: `git -C "${target}" config merge.ours.driver true`,
+  });
+  const jsonl = getConfig(target, 'merge.jsonl-union.driver');
+  checks.push({
+    ok: jsonl === JSONL_UNION_DRIVER,
+    name: 'merge.jsonl-union.driver',
+    detail: jsonl || '未配置',
+    fix: `git -C "${target}" config merge.jsonl-union.driver "${JSONL_UNION_DRIVER}"`,
+  });
+  return checks;
+}

package/src/hosts/registry.mjs

@@ -0,0 +1,170 @@
+// 宿主注册表：v1 十宿主。dir 为宿主点目录；rootMemory 为项目根记忆文件（仅 Claude 有）。
+// 能力字段描述安装器可以写什么、怎么写；探测不到的字段保持 null，不编造目录。
+// tracked 仅描述当前本仓的人库政策，不影响安装能力。
+
+export const HOSTS = {
+  trae: {
+    dir: '.trae',
+    label: 'Trae',
+    tracked: true,
+    commands: { dir: 'commands', ext: '.md' },
+    agents: { dir: 'agents', ext: '.md', modelField: null, inheritValue: null },
+    skills: { mode: 'index' },
+    hooks: { file: 'hooks.json', format: 'json' },
+    modelProbe: { configs: [], env: [], cli: [] },
+  },
+  codebuddy: {
+    dir: '.codebuddy',
+    label: 'CodeBuddy',
+    tracked: true,
+    commands: { dir: 'commands', ext: '.md' },
+    agents: { dir: 'agents', ext: '.md', modelField: null, inheritValue: null },
+    // CodeBuddy 官方文档不可得；本地既有 .codebuddy/skills/<name>/SKILL.md 约定
+    skills: { mode: 'native', dir: 'skills', file: 'SKILL.md' },
+    hooks: { file: 'settings.json', format: 'json' },
+    modelProbe: { configs: ['~/.codebuddy/settings.json'], env: ['CODEBUDDY_MODEL'], cli: [] },
+  },
+  claude: {
+    dir: '.claude',
+    label: 'Claude Code',
+    tracked: false,
+    rootMemory: 'CLAUDE.md',
+    commands: { dir: 'commands', ext: '.md' },
+    agents: { dir: 'agents', ext: '.md', modelField: 'model', inheritValue: 'inherit' },
+    skills: { mode: 'native', dir: 'skills', file: 'SKILL.md' },
+    hooks: { file: 'settings.json', format: 'json' },
+    modelProbe: {
+      configs: ['~/.claude/settings.json'],
+      env: ['ANTHROPIC_MODEL', 'CLAUDE_CODE_SUBAGENT_MODEL'],
+      cli: [],
+    },
+  },
+  opencode: {
+    dir: '.opencode',
+    label: 'OpenCode',
+    tracked: false,
+    commands: { dir: 'commands', ext: '.md' },
+    // 省略 model = 继承父级；不写 inherit 值
+    agents: { dir: 'agents', ext: '.md', modelField: 'model', inheritValue: null },
+    skills: { mode: 'native', dir: 'skills', file: 'SKILL.md' },
+    hooks: null,
+    modelProbe: { configs: ['~/.config/opencode/opencode.json'], env: ['OPENCODE_MODEL'], cli: [] },
+  },
+  qwen: {
+    dir: '.qwen',
+    label: 'Qwen Code',
+    tracked: false,
+    commands: { dir: 'commands', ext: '.md' },
+    agents: { dir: 'agents', ext: '.md', modelField: 'model', inheritValue: 'inherit' },
+    // Qwen 原生发现 .agents/skills；不复制宿主技能副本
+    skills: { mode: 'shared' },
+    hooks: { file: 'settings.json', format: 'json' },
+    modelProbe: { configs: ['~/.qwen/settings.json'], env: ['QWEN_MODEL'], cli: [] },
+  },
+  pi: {
+    dir: '.pi',
+    label: 'PI',
+    tracked: false,
+    commands: null,
+    // PI 的 model 是网关限定 ID，没有 inherit 语义；解析不到时保留模板原值
+    agents: { dir: 'agents', ext: '.md', modelField: 'model', inheritValue: null },
+    skills: { mode: 'index' },
+    hooks: null,
+    modelProbe: { configs: ['~/.pi/settings.json'], env: ['PI_MODEL'], cli: [] },
+  },
+  cline: {
+    dir: '.cline',
+    label: 'Cline',
+    tracked: false,
+    // Cline 的 workflows 是 Markdown 工作流，用作技能索引入口
+    commands: { dir: 'workflows', ext: '.md' },
+    agents: { dir: 'agents', ext: '.yml', modelField: null, inheritValue: null },
+    skills: { mode: 'index' },
+    hooks: null,
+    modelProbe: { configs: [], env: [], cli: [] },
+  },
+  commandcode: {
+    dir: '.commandcode',
+    label: 'Command Code',
+    tracked: false,
+    commands: { dir: 'commands', ext: '.md' },
+    agents: { dir: 'agents', ext: '.md', modelField: 'model', inheritValue: 'inherit' },
+    // Command Code 原生发现 .agents/skills；不复制宿主技能副本
+    skills: { mode: 'shared' },
+    hooks: { file: 'settings.json', format: 'json' },
+    modelProbe: {
+      configs: ['~/.commandcode/settings.json'],
+      env: ['COMMANDCODE_MODEL'],
+      // cmd --list-models 是唯一已核实的非交互列表命令；Windows 上跳过 cmd（可能是系统 cmd.exe）
+      cli: [{ command: 'cmd', args: ['--list-models'] }, { command: 'commandcode', args: ['--list-models'] }],
+    },
+  },
+  qoder: {
+    dir: '.qoder',
+    label: 'Qoder',
+    tracked: false,
+    commands: { dir: 'commands', ext: '.md' },
+    agents: { dir: 'agents', ext: '.md', modelField: null, inheritValue: null },
+    skills: { mode: 'index' },
+    hooks: { file: 'settings.json', format: 'json' },
+    modelProbe: { configs: ['~/.qoder/settings.json'], env: [], cli: [] },
+  },
+  zcode: {
+    dir: '.zcode',
+    label: 'ZCode',
+    tracked: false,
+    commands: null,
+    agents: { dir: 'agents', ext: '.md', modelField: null, inheritValue: null },
+    skills: { mode: 'index' },
+    hooks: { file: 'config.json', format: 'json' },
+    modelProbe: { configs: ['~/.zcode/config.json'], env: [], cli: [] },
+  },
+};
+
+export const HOST_NAMES = Object.keys(HOSTS);
+
+export function resolveHost(name) {
+  const key = String(name || '').trim().toLowerCase();
+  if (!HOSTS[key]) {
+    const err = new Error(`unknown host: ${name}`);
+    err.code = 'UNKNOWN_HOST';
+    throw err;
+  }
+  return { name: key, ...HOSTS[key] };
+}
+
+// 宿主模板相对路径 -> 目标相对路径。rootMemory 文件放项目根，其余放宿主点目录。
+export function hostTargetRel(name, rel) {
+  const h = HOSTS[name];
+  if (!h) {
+    const err = new Error(`unknown host: ${name}`);
+    err.code = 'UNKNOWN_HOST';
+    throw err;
+  }
+  const normalized = String(rel).replace(/\\/g, '/');
+  if (h.rootMemory && normalized === h.rootMemory) return h.rootMemory;
+  return `${h.dir}/${normalized}`;
+}
+
+// 子代理文件名 -> 引擎模型角色。未知角色按 judgment 处理（强推理默认更稳）。
+const MODEL_ROLE_BY_AGENT = {
+  implementer: 'code',
+  'independent-reviewer': 'review',
+  'pr-verifier': 'review',
+  'pr-adjudicator': 'judgment',
+  'pr-finder': 'judgment',
+  'ui-verifier': 'judgment',
+  'wiki-compiler': 'judgment',
+};
+
+export function modelRoleForAgent(rel) {
+  const base = String(rel).split('/').pop().replace(/\.[^.]+$/, '');
+  return MODEL_ROLE_BY_AGENT[base] || 'judgment';
+}
+
+export function isAgentTemplate(hostName, rel) {
+  const h = HOSTS[hostName];
+  if (!h?.agents) return false;
+  const normalized = String(rel).replace(/\\/g, '/');
+  return normalized.startsWith(`${h.agents.dir}/`) && normalized.endsWith(h.agents.ext);
+}

package/src/i18n.mjs

@@ -0,0 +1,35 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const HERE = path.dirname(fileURLToPath(import.meta.url));
+const KIT = path.resolve(HERE, '..');
+const LOCALES = path.join(KIT, 'locales');
+const FALLBACK = 'zh-CN';
+
+// 支持语言单一来源：cli/main.mjs 的 SUPPORTED_LANGS 与 TUI 向导语言菜单都由它派生
+export const LANGUAGES = ['zh-CN', 'en'];
+
+const cache = new Map();
+export function loadCatalog(lang) {
+  if (cache.has(lang)) return cache.get(lang);
+  const file = path.join(LOCALES, lang, 'installer.json');
+  let cat = {};
+  try {
+    cat = JSON.parse(fs.readFileSync(file, 'utf8'));
+  } catch {
+    if (lang !== FALLBACK) return loadCatalog(FALLBACK);
+    throw new Error(`missing installer locale: ${file}`);
+  }
+  cache.set(lang, cat);
+  return cat;
+}
+
+export function makeT(lang) {
+  const cat = loadCatalog(lang);
+  const fallback = lang === FALLBACK ? cat : loadCatalog(FALLBACK);
+  return (key, vars = {}) => {
+    const raw = cat[key] ?? fallback[key] ?? key;
+    return String(raw).replace(/\{\{(\w+)\}\}/g, (m, k) => (Object.prototype.hasOwnProperty.call(vars, k) ? String(vars[k]) : m));
+  };
+}