@fitlab-ai/agent-infra 0.11.7 → 0.11.9

package/templates/.agents/skills/update-agent-infra/scripts/sync-templates.js

@@ -60,9 +60,12 @@ const DEFAULTS = {
     "runtimes": [
       "node22"
     ],
-    "tools": [
-      "agent-infra"
-    ],
+    "tools": {
+      "ids": [
+        "agent-infra"
+      ],
+      "definitions": {}
+    },
     "refreshIntervalDays": 7,
     "dockerfile": null,
     "vm": {
@@ -222,17 +225,6 @@ const AGENT_CLIENT_MANIFEST = [
     }
   }
 ];
-const CUSTOM_TUI_CONTRACT = {
-  "requiredFields": [
-    "name",
-    "dir",
-    "invoke"
-  ],
-  "allowedPlaceholders": [
-    "skillName",
-    "projectName"
-  ]
-};
 // Add a new identifier here only after shipping matching .{platform}. template variants.
 const KNOWN_PLATFORMS = new Set(['github', 'none']);
 const KNOWN_LANGUAGES = new Set(['en', 'zh-CN']);
@@ -334,10 +326,20 @@ function normalizeAgentClientConfig(cfg) {
   const sandbox = cfg.sandbox && typeof cfg.sandbox === 'object' && !Array.isArray(cfg.sandbox)
     ? cfg.sandbox
     : undefined;
-  if (Array.isArray(sandbox?.tools)) {
-    for (const [index, tool] of sandbox.tools.entries()) {
+  if (sandbox && own(sandbox, 'customTools')) {
+    return failure('INVALID_AGENT_CLIENTS', 'sandbox.customTools');
+  }
+  if (sandbox && own(sandbox, 'tools')) {
+    const tools = sandbox.tools;
+    if (!tools || typeof tools !== 'object' || Array.isArray(tools)) {
+      return failure('INVALID_AGENT_CLIENTS', 'sandbox.tools');
+    }
+    if (!Array.isArray(tools.ids)) {
+      return failure('INVALID_AGENT_CLIENTS', 'sandbox.tools.ids');
+    }
+    for (const [index, tool] of tools.ids.entries()) {
       if (AGENT_CLIENT_IDS.includes(tool)) {
-        return failure('INVALID_AGENT_CLIENTS', `sandbox.tools[${index}]`);
+        return failure('INVALID_AGENT_CLIENTS', `sandbox.tools.ids[${index}]`);
       }
     }
   }
@@ -431,10 +433,6 @@ function trustedBaseline(value) {
   return typeof value === 'string' && /^sha256:[a-f0-9]{64}$/.test(value) ? value : null;
 }
 
-function normDir(p) {
-  return norm(p).replace(/^\.\//, '').replace(/\/+$/, '');
-}
-
 function isInsideProject(projectRoot, relativePath) {
   if (typeof relativePath !== 'string' || relativePath.trim() === '' || path.isAbsolute(relativePath)) {
     return false;
@@ -594,14 +592,6 @@ function isCustomProtected(targetPath, customSkills, customCommandTargets) {
   )) || customCommandTargets.has(normalized);
 }
 
-function recordCustomTUISkipped(report, entry) {
-  report?.custom?.customTUIs?.skipped?.push(entry);
-}
-
-function recordCustomTUISkippedRef(report, entry) {
-  report?.custom?.customTUIs?.skippedRefs?.push(entry);
-}
-
 function expandHome(inputPath) {
   if (inputPath === '~') return os.homedir();
   if (inputPath.startsWith('~/')) {
@@ -843,204 +833,6 @@ function generateAgentClientCommand(skill, lang, descriptor) {
   return `${lines.join('\n')}\n`;
 }
 
-function validateCustomTUIs(projectRoot, customTUIs, report) {
-  if (customTUIs === undefined) return [];
-  if (!Array.isArray(customTUIs)) {
-    recordCustomTUISkipped(report, {
-      index: -1,
-      name: '',
-      dir: '',
-      reason: 'customTUIs must be an array'
-    });
-    return [];
-  }
-  const tools = customTUIs;
-  return tools
-    .map((tool, index) => {
-      if (
-        typeof tool !== 'object'
-        || tool === null
-        || Array.isArray(tool)
-      ) {
-        recordCustomTUISkipped(report, {
-          index,
-          name: '',
-          dir: '',
-          reason: 'invalid custom TUI'
-        });
-        return null;
-      }
-
-      for (const field of CUSTOM_TUI_CONTRACT.requiredFields) {
-        if (
-          typeof tool[field] !== 'string'
-          || tool[field].trim() === ''
-          || /[\r\n]/.test(tool[field])
-        ) {
-          recordCustomTUISkipped(report, {
-            index,
-            name: String(tool.name || ''),
-            dir: String(tool.dir || ''),
-            reason: `invalid ${field}`
-          });
-          return null;
-        }
-      }
-
-      if (typeof tool?.dir !== 'string' || tool.dir.trim() === '') {
-        recordCustomTUISkipped(report, {
-          index,
-          name: String(tool?.name || ''),
-          dir: String(tool?.dir || ''),
-          reason: 'invalid dir'
-        });
-        return null;
-      }
-
-      if (tool.dir.includes('\\')) {
-        recordCustomTUISkipped(report, {
-          index,
-          name: tool.name,
-          dir: tool.dir,
-          reason: 'dir must use POSIX separators'
-        });
-        return null;
-      }
-
-      if (!isInsideProject(projectRoot, tool.dir)) {
-        recordCustomTUISkipped(report, {
-          index,
-          name: String(tool?.name || ''),
-          dir: tool.dir,
-          reason: 'dir must be a relative path inside the project root'
-        });
-        return null;
-      }
-
-      const placeholders = [...tool.invoke.matchAll(/\$\{([^}]+)\}/g)]
-        .map((match) => match[1]);
-      if (
-        !placeholders.includes('skillName')
-        || placeholders.some((placeholder) =>
-          !CUSTOM_TUI_CONTRACT.allowedPlaceholders.includes(placeholder)
-        )
-        || tool.invoke
-          .replaceAll('${skillName}', '')
-          .replaceAll('${projectName}', '')
-          .includes('${')
-      ) {
-        recordCustomTUISkipped(report, {
-          index,
-          name: tool.name,
-          dir: tool.dir,
-          reason: 'invalid invoke placeholders'
-        });
-        return null;
-      }
-
-      return { ...tool, index, dir: normDir(tool.dir) };
-    })
-    .filter(Boolean);
-}
-
-function customTUITargetPath(tool, refFile, refSkillName, skillName) {
-  const targetFile = refFile.includes(refSkillName)
-    ? refFile.replaceAll(refSkillName, skillName)
-    : `${skillName}${path.extname(refFile)}`;
-  return norm(path.join(tool.dir, targetFile));
-}
-
-function findCustomTUIReference(projectRoot, tool, templateSkillNames, report, logSkipped = false) {
-  const cmdDir = path.join(projectRoot, tool.dir);
-  if (!fs.existsSync(cmdDir) || !fs.statSync(cmdDir).isDirectory()) {
-    if (logSkipped) {
-      recordCustomTUISkipped(report, {
-        index: tool.index,
-        name: String(tool.name || ''),
-        dir: tool.dir,
-        reason: 'directory not found'
-      });
-    }
-    return null;
-  }
-
-  const cmdFiles = fs.readdirSync(cmdDir)
-    .filter((file) => fs.statSync(path.join(cmdDir, file)).isFile())
-    .sort((left, right) => left.localeCompare(right));
-  if (cmdFiles.length === 0) {
-    if (logSkipped) {
-      recordCustomTUISkipped(report, {
-        index: tool.index,
-        name: String(tool.name || ''),
-        dir: tool.dir,
-        reason: 'no command files'
-      });
-    }
-    return null;
-  }
-
-  let sawKnownSkillReference = false;
-
-  for (const file of cmdFiles) {
-    const content = fs.readFileSync(path.join(cmdDir, file), 'utf8');
-    const match = content.match(/\.agents\/skills\/([^/]+)\/SKILL\.md/);
-    if (!match) continue;
-
-    const skillName = match[1];
-    if (!templateSkillNames.has(skillName)) continue;
-
-    const skillMd = path.join(projectRoot, '.agents/skills', skillName, 'SKILL.md');
-    if (!fs.existsSync(skillMd)) continue;
-
-    const meta = parseSkillFrontmatter(skillMd);
-    if (!meta.description) continue;
-
-    sawKnownSkillReference = true;
-    if (!content.includes(meta.description)) {
-      if (logSkipped) {
-        recordCustomTUISkippedRef(report, {
-          index: tool.index,
-          name: String(tool.name || ''),
-          dir: tool.dir,
-          file,
-          skill: skillName,
-          reason: 'description not found in reference command file'
-        });
-      }
-      continue;
-    }
-
-    return { content, file, skillName, skillDesc: meta.description };
-  }
-
-  if (logSkipped) {
-    recordCustomTUISkipped(report, {
-      index: tool.index,
-      name: String(tool.name || ''),
-      dir: tool.dir,
-      reason: sawKnownSkillReference
-        ? 'no reference command file with matching description'
-        : 'no usable reference command file'
-    });
-  }
-
-  return null;
-}
-
-function buildCustomTUICommandTargets(projectRoot, customSkills, customTUIs, templateSkillNames) {
-  const targets = new Set();
-  for (const tool of customTUIs) {
-    const ref = findCustomTUIReference(projectRoot, tool, templateSkillNames, null, false);
-    if (!ref) continue;
-
-    for (const skill of customSkills) {
-      targets.add(customTUITargetPath(tool, ref.file, ref.skillName, skill.dirName));
-    }
-  }
-
-  return targets;
-}
-
 function buildBuiltinCustomCommandTargets(customSkills, enabledTUIs) {
   return new Set(AGENT_CLIENT_MANIFEST.flatMap((adapter) => {
     if (!enabledTUIs.has(adapter.id) || !adapter.customCommand) return [];
@@ -1050,33 +842,10 @@ function buildBuiltinCustomCommandTargets(customSkills, enabledTUIs) {
   }));
 }
 
-function learnAndGenerateCommands(projectRoot, customSkills, tool, templateSkillNames, report) {
-  const ref = findCustomTUIReference(projectRoot, tool, templateSkillNames, report, true);
-  if (!ref) return;
-
-  for (const skill of customSkills) {
-    const descToken = '__AGENT_INFRA_CUSTOM_SKILL_DESCRIPTION__';
-    const generated = ref.content
-      .replaceAll(ref.skillDesc, descToken)
-      .replaceAll(ref.skillName, skill.dirName)
-      .replaceAll(descToken, skill.description);
-
-    writeIfChanged(
-      projectRoot,
-      customTUITargetPath(tool, ref.file, ref.skillName, skill.dirName),
-      generated,
-      report.custom.commands
-    );
-  }
-}
-
 function generateCustomCommands(
-  projectRoot,
   customSkills,
   lang,
   report,
-  customTUIs,
-  templateSkillNames,
   enabledTUIs,
   managedWriter
 ) {
@@ -1094,11 +863,6 @@ function generateCustomCommands(
       );
     }
   }
-
-  const tools = Array.isArray(customTUIs) ? customTUIs : [];
-  for (const tool of tools) {
-    learnAndGenerateCommands(projectRoot, customSkills, tool, templateSkillNames, report);
-  }
 }
 
 function matchesAny(rel, patterns) {
@@ -1264,9 +1028,7 @@ function syncTemplates(projectRoot, templateRootOverride) {
   const configPathRel = norm(path.relative(projectRoot, cfgPath));
   let templateRoot = templateRootOverride;
   if (!templateRoot) {
-    const packageResolution = resolveAgentInfraPackage({
-      startPath: path.join(projectRoot, '.agents', 'scripts', 'lib', 'agent-infra-package.js')
-    });
+    const packageResolution = resolveAgentInfraPackage();
     if (packageResolution.templateRoot && fs.existsSync(packageResolution.templateRoot)) {
       templateRoot = packageResolution.templateRoot;
     } else {
@@ -1290,7 +1052,6 @@ function syncTemplates(projectRoot, templateRootOverride) {
     AGENT_CLIENT_IDS.filter((id) => enabledResolution.state[id].enabled)
   );
   materializeAgentClientConfig(cfg, enabledResolution);
-  const customTUIsConfig = Array.isArray(cfg.customTUIs) ? cfg.customTUIs : [];
   const vars = { project, org };
   const templateSkillNames = listTemplateSkillNames(templateRoot);
   const protectedCustomSkills = detectCustomSkills(projectRoot, templateSkillNames);
@@ -1377,24 +1138,13 @@ function syncTemplates(projectRoot, templateRootOverride) {
       unchanged: [],
       removed: [],
       sourceErrors: [],
-      customTUIs: { skipped: [], skippedRefs: [] },
       commands: { generated: [], updated: [], unchanged: [] }
     },
     ejected: { created: [], skipped: [] },
     merged:  { pending: [] },
     configUpdated: false
   };
-  const customTUIs = validateCustomTUIs(projectRoot, customTUIsConfig, report);
-  const customTUICommandTargets = buildCustomTUICommandTargets(
-    projectRoot,
-    protectedCustomSkills,
-    customTUIs,
-    templateSkillNames
-  );
-  const customCommandTargets = new Set([
-    ...buildBuiltinCustomCommandTargets(protectedCustomSkills, enabledTUIs),
-    ...customTUICommandTargets
-  ]);
+  const customCommandTargets = buildBuiltinCustomCommandTargets(protectedCustomSkills, enabledTUIs);
 
   for (const category of ['managed', 'merged', 'ejected']) {
     const before = currentRegistry[category];
@@ -1883,12 +1633,9 @@ function syncTemplates(projectRoot, templateRootOverride) {
   const customSkills = detectCustomSkills(projectRoot, templateSkillNames);
   report.custom.detected = customSkills.map((skill) => skill.dirName);
   generateCustomCommands(
-    projectRoot,
     customSkills,
     lang,
     report,
-    customTUIs,
-    templateSkillNames,
     enabledTUIs,
     writeProtectedManaged
   );

package/dist/lib/agent-clients/custom-tuis.js

@@ -1,99 +0,0 @@
-import path from 'node:path';
-const CUSTOM_TUI_CONTRACT = Object.freeze({
-    requiredFields: Object.freeze(['name', 'dir', 'invoke']),
-    allowedPlaceholders: Object.freeze(['skillName', 'projectName'])
-});
-function isRecord(value) {
-    return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-function isNonEmptySingleLine(value) {
-    return typeof value === 'string'
-        && value.trim() !== ''
-        && !/[\r\n]/.test(value);
-}
-function normalizeDir(projectRoot, value) {
-    if (!isNonEmptySingleLine(value)
-        || value.includes('\\')
-        || path.isAbsolute(value)
-        || /^[a-zA-Z]:/.test(value)) {
-        return null;
-    }
-    const normalized = path.posix.normalize(value);
-    if (normalized === '.'
-        || normalized === '..'
-        || normalized.startsWith('../')
-        || normalized.split('/').includes('..')) {
-        return null;
-    }
-    const relative = path.relative(path.resolve(projectRoot), path.resolve(projectRoot, normalized));
-    return relative === ''
-        || path.isAbsolute(relative)
-        || relative === '..'
-        || relative.startsWith(`..${path.sep}`)
-        ? null
-        : normalized;
-}
-function hasValidPlaceholders(invocation) {
-    const placeholders = [
-        ...invocation.matchAll(/\$\{([^}]+)\}/g)
-    ].map((match) => match[1]);
-    return placeholders.includes('skillName')
-        && placeholders.every((placeholder) => CUSTOM_TUI_CONTRACT.allowedPlaceholders.includes(placeholder))
-        && !invocation
-            .replaceAll('${skillName}', '')
-            .replaceAll('${projectName}', '')
-            .includes('${');
-}
-function normalizeCustomTUIs(projectRoot, input) {
-    const items = [];
-    const diagnostics = [];
-    if (!Array.isArray(input)) {
-        return Object.freeze({
-            items: Object.freeze([]),
-            diagnostics: Object.freeze([
-                Object.freeze({
-                    code: 'INVALID_CUSTOM_TUIS',
-                    path: 'customTUIs'
-                })
-            ])
-        });
-    }
-    for (const [index, candidate] of input.entries()) {
-        const base = `customTUIs[${index}]`;
-        if (!isRecord(candidate)) {
-            diagnostics.push({ code: 'INVALID_CUSTOM_TUI', path: base });
-            continue;
-        }
-        if (!isNonEmptySingleLine(candidate.name)) {
-            diagnostics.push({ code: 'INVALID_CUSTOM_TUI', path: `${base}.name` });
-            continue;
-        }
-        const dir = normalizeDir(projectRoot, candidate.dir);
-        if (!dir) {
-            diagnostics.push({ code: 'INVALID_CUSTOM_TUI', path: `${base}.dir` });
-            continue;
-        }
-        if (!isNonEmptySingleLine(candidate.invoke)) {
-            diagnostics.push({ code: 'INVALID_CUSTOM_TUI', path: `${base}.invoke` });
-            continue;
-        }
-        if (!hasValidPlaceholders(candidate.invoke)) {
-            diagnostics.push({
-                code: 'INVALID_CUSTOM_TUI_PLACEHOLDER',
-                path: `${base}.invoke`
-            });
-            continue;
-        }
-        items.push(Object.freeze({
-            name: candidate.name,
-            dir,
-            invocation: candidate.invoke
-        }));
-    }
-    return Object.freeze({
-        items: Object.freeze(items),
-        diagnostics: Object.freeze(diagnostics.map((diagnostic) => Object.freeze(diagnostic)))
-    });
-}
-export { CUSTOM_TUI_CONTRACT, normalizeCustomTUIs };
-//# sourceMappingURL=custom-tuis.js.map

package/lib/agent-clients/custom-tuis.ts

@@ -1,149 +0,0 @@
-import path from 'node:path';
-
-type CustomTUI = Readonly<{
-  name: string;
-  dir: string;
-  invocation: string;
-}>;
-
-type CustomTUIDiagnosticCode =
-  | 'INVALID_CUSTOM_TUIS'
-  | 'INVALID_CUSTOM_TUI'
-  | 'INVALID_CUSTOM_TUI_PLACEHOLDER';
-
-type CustomTUIDiagnostic = Readonly<{
-  code: CustomTUIDiagnosticCode;
-  path: string;
-}>;
-
-type NormalizeCustomTUIsResult = Readonly<{
-  items: readonly CustomTUI[];
-  diagnostics: readonly CustomTUIDiagnostic[];
-}>;
-
-const CUSTOM_TUI_CONTRACT = Object.freeze({
-  requiredFields: Object.freeze(['name', 'dir', 'invoke']),
-  allowedPlaceholders: Object.freeze(['skillName', 'projectName'])
-});
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
-function isNonEmptySingleLine(value: unknown): value is string {
-  return typeof value === 'string'
-    && value.trim() !== ''
-    && !/[\r\n]/.test(value);
-}
-
-function normalizeDir(projectRoot: string, value: unknown): string | null {
-  if (
-    !isNonEmptySingleLine(value)
-    || value.includes('\\')
-    || path.isAbsolute(value)
-    || /^[a-zA-Z]:/.test(value)
-  ) {
-    return null;
-  }
-  const normalized = path.posix.normalize(value);
-  if (
-    normalized === '.'
-    || normalized === '..'
-    || normalized.startsWith('../')
-    || normalized.split('/').includes('..')
-  ) {
-    return null;
-  }
-  const relative = path.relative(
-    path.resolve(projectRoot),
-    path.resolve(projectRoot, normalized)
-  );
-  return relative === ''
-    || path.isAbsolute(relative)
-    || relative === '..'
-    || relative.startsWith(`..${path.sep}`)
-    ? null
-    : normalized;
-}
-
-function hasValidPlaceholders(invocation: string): boolean {
-  const placeholders = [
-    ...invocation.matchAll(/\$\{([^}]+)\}/g)
-  ].map((match) => match[1]!);
-  return placeholders.includes('skillName')
-    && placeholders.every((placeholder) =>
-      CUSTOM_TUI_CONTRACT.allowedPlaceholders.includes(placeholder)
-    )
-    && !invocation
-      .replaceAll('${skillName}', '')
-      .replaceAll('${projectName}', '')
-      .includes('${');
-}
-
-function normalizeCustomTUIs(
-  projectRoot: string,
-  input: unknown
-): NormalizeCustomTUIsResult {
-  const items: CustomTUI[] = [];
-  const diagnostics: CustomTUIDiagnostic[] = [];
-
-  if (!Array.isArray(input)) {
-    return Object.freeze({
-      items: Object.freeze([]),
-      diagnostics: Object.freeze([
-        Object.freeze({
-          code: 'INVALID_CUSTOM_TUIS' as const,
-          path: 'customTUIs'
-        })
-      ])
-    });
-  }
-
-  for (const [index, candidate] of input.entries()) {
-    const base = `customTUIs[${index}]`;
-    if (!isRecord(candidate)) {
-      diagnostics.push({ code: 'INVALID_CUSTOM_TUI', path: base });
-      continue;
-    }
-    if (!isNonEmptySingleLine(candidate.name)) {
-      diagnostics.push({ code: 'INVALID_CUSTOM_TUI', path: `${base}.name` });
-      continue;
-    }
-    const dir = normalizeDir(projectRoot, candidate.dir);
-    if (!dir) {
-      diagnostics.push({ code: 'INVALID_CUSTOM_TUI', path: `${base}.dir` });
-      continue;
-    }
-    if (!isNonEmptySingleLine(candidate.invoke)) {
-      diagnostics.push({ code: 'INVALID_CUSTOM_TUI', path: `${base}.invoke` });
-      continue;
-    }
-    if (!hasValidPlaceholders(candidate.invoke)) {
-      diagnostics.push({
-        code: 'INVALID_CUSTOM_TUI_PLACEHOLDER',
-        path: `${base}.invoke`
-      });
-      continue;
-    }
-    items.push(Object.freeze({
-      name: candidate.name,
-      dir,
-      invocation: candidate.invoke
-    }));
-  }
-
-  return Object.freeze({
-    items: Object.freeze(items),
-    diagnostics: Object.freeze(
-      diagnostics.map((diagnostic) => Object.freeze(diagnostic))
-    )
-  });
-}
-
-export { CUSTOM_TUI_CONTRACT, normalizeCustomTUIs };
-export type {
-  CustomTUI,
-  CustomTUIDiagnostic,
-  CustomTUIDiagnosticCode,
-  NormalizeCustomTUIsResult
-};