termdock 1.4.71 → 1.4.73

package/dist/server/agent/titleNamerCatalog.js

@@ -4,10 +4,24 @@ import os from 'os';
 import path from 'path';
 import { promisify } from 'util';
 import { loadPlugins } from './plugins.js';
+import { getAutoRenameAgentsSetting, getAutoRenameNamerSetting } from '../utils/settings.js';
 const execFileAsync = promisify(execFile);
 const CACHE_FRESH_MS = 24 * 60 * 60_000;
 const PROBE_TIMEOUT_MS = 10_000;
 const CACHE_FILE = path.join(os.homedir(), '.termdock', 'title-namer-catalog.json');
+function pluginCommandEnv() {
+    const allowed = ['PATH', 'HOME', 'USER', 'LOGNAME', 'SHELL', 'LANG', 'TERM', 'TMPDIR', 'XDG_CONFIG_HOME', 'XDG_CACHE_HOME', 'XDG_DATA_HOME'];
+    const env = { NO_COLOR: '1', TERM: 'dumb' };
+    for (const key of allowed) {
+        if (process.env[key] !== undefined)
+            env[key] = process.env[key];
+    }
+    for (const [key, value] of Object.entries(process.env)) {
+        if (key.startsWith('LC_') && value !== undefined)
+            env[key] = value;
+    }
+    return env;
+}
 let cached = null;
 let refreshPromise = null;
 export function invalidateTitleNamerCatalog() {
@@ -27,19 +41,16 @@ function normalizeCachedCatalog(input) {
             return [];
         if (!Array.isArray(candidate.models))
             return [];
-        const models = candidate.models.filter((model) => Boolean(model
-            && typeof model.id === 'string'
-            && typeof model.displayName === 'string'
-            && typeof model.description === 'string'
-            && typeof model.isDefault === 'boolean'));
+        const catalog = normalizeDiscoveredModelCatalog({
+            models: candidate.models,
+            recommendedModel: candidate.recommendedModel,
+        });
         return [{
                 slug: candidate.slug,
                 displayName: typeof candidate.displayName === 'string' ? candidate.displayName : candidate.slug,
                 available: candidate.available === true,
-                models,
-                recommendedModel: typeof candidate.recommendedModel === 'string'
-                    ? candidate.recommendedModel
-                    : recommendTitleModel(models),
+                models: catalog.models,
+                recommendedModel: catalog.recommendedModel,
             }];
     });
     return value.length > 0 ? { version: 1, updatedAt: doc.updatedAt, value } : null;
@@ -60,7 +71,7 @@ async function savePersistentCache(doc) {
     await fs.promises.rename(temporary, CACHE_FILE);
 }
 export function recommendTitleModel(models) {
-    return models.find((model) => /affordable|cost[- ]efficient|cost[- ]sensitive/i.test(model.description))?.id
+    return models.find((model) => model.isEconomical)?.id
         ?? models.find((model) => model.isDefault)?.id
         ?? null;
 }
@@ -120,6 +131,7 @@ async function listCodexModels() {
                                 displayName: model.displayName,
                                 description: typeof model.description === 'string' ? model.description : '',
                                 isDefault: model.isDefault === true,
+                                isEconomical: false,
                             }];
                     }) : [];
                     finish(models);
@@ -141,7 +153,7 @@ export function parseClaudeSupportedModels(output) {
         .split(/,|\band\b/i)
         .map((model) => model.trim().replace(/^["'`]+|["'`]+$/g, ''))
         .filter((model) => /^[a-zA-Z0-9][a-zA-Z0-9._:-]{0,119}$/.test(model))
-        .map((model) => ({ id: model, displayName: model, description: '', isDefault: false }));
+        .map((model) => ({ id: model, displayName: model, description: '', isDefault: false, isEconomical: false }));
 }
 async function listClaudeModels() {
     try {
@@ -159,35 +171,85 @@ async function listClaudeModels() {
         return parseClaudeSupportedModels(`${candidate.stdout ?? ''}\n${candidate.stderr ?? ''}`);
     }
 }
-function normalizeDiscoveredModels(input) {
-    if (!Array.isArray(input))
-        return [];
-    return input.flatMap((entry) => {
-        if (typeof entry === 'string' && /^[a-zA-Z0-9][a-zA-Z0-9._:-]{0,119}$/.test(entry)) {
-            return [{ id: entry, displayName: entry, description: '', isDefault: false }];
+export function normalizeDiscoveredModelCatalog(input) {
+    const root = input && typeof input === 'object' && !Array.isArray(input)
+        ? input
+        : null;
+    const entries = Array.isArray(input)
+        ? input
+        : Array.isArray(root?.models)
+            ? root.models
+            : Array.isArray(root?.data)
+                ? root.data
+                : [];
+    let ignoredEntries = 0;
+    const seenIds = new Set();
+    const models = entries.flatMap((entry) => {
+        const rawId = typeof entry === 'string'
+            ? entry
+            : entry && typeof entry === 'object'
+                ? (() => {
+                    const model = entry;
+                    return typeof model.id === 'string'
+                        ? model.id
+                        : typeof model.name === 'string'
+                            ? model.name
+                            : typeof model.model === 'string'
+                                ? model.model
+                                : '';
+                })()
+                : '';
+        const id = rawId.trim();
+        if (!/^[a-zA-Z0-9][a-zA-Z0-9._:-]{0,119}$/.test(id) || seenIds.has(id)) {
+            ignoredEntries += 1;
+            return [];
         }
-        if (!entry || typeof entry !== 'object')
+        seenIds.add(id);
+        if (typeof entry === 'string') {
+            return [{ id, displayName: id, description: '', isDefault: false, isEconomical: false }];
+        }
+        if (!entry || typeof entry !== 'object') {
+            ignoredEntries += 1;
             return [];
+        }
         const model = entry;
-        if (typeof model.id !== 'string' || !/^[a-zA-Z0-9][a-zA-Z0-9._:-]{0,119}$/.test(model.id))
-            return [];
+        const rawDisplayName = typeof model.displayName === 'string'
+            ? model.displayName
+            : typeof model.display_name === 'string'
+                ? model.display_name
+                : typeof model.label === 'string'
+                    ? model.label
+                    : id;
+        const displayName = rawDisplayName.trim().slice(0, 160) || id;
         return [{
-                id: model.id,
-                displayName: typeof model.displayName === 'string' ? model.displayName : model.id,
-                description: typeof model.description === 'string' ? model.description : '',
-                isDefault: model.isDefault === true,
+                id,
+                displayName,
+                description: typeof model.description === 'string' ? model.description.trim().slice(0, 1000) : '',
+                isDefault: model.isDefault === true || model.is_default === true || model.default === true,
+                isEconomical: model.isEconomical === true || model.is_economical === true || model.economical === true,
             }];
     });
+    const declared = typeof (root?.recommendedModel ?? root?.recommended_model) === 'string'
+        ? String(root?.recommendedModel ?? root?.recommended_model).trim()
+        : '';
+    const recommendedModel = declared && models.some((model) => model.id === declared)
+        ? declared
+        : recommendTitleModel(models);
+    return { models, recommendedModel, ignoredEntries };
 }
-async function listPluginModels(config) {
+function expandPluginPath(value, pluginDir) {
+    return value.replaceAll('{pluginDir}', pluginDir);
+}
+async function listPluginModels(config, pluginDir) {
     if (!config.models)
-        return [];
-    const { stdout } = await execFileAsync(config.models.command, config.models.args ?? [], {
+        return { models: [], recommendedModel: null, ignoredEntries: 0 };
+    const { stdout } = await execFileAsync(expandPluginPath(config.models.command, pluginDir), (config.models.args ?? []).map((arg) => expandPluginPath(arg, pluginDir)), {
         timeout: PROBE_TIMEOUT_MS,
         maxBuffer: 256 * 1024,
-        env: { ...process.env, NO_COLOR: '1', TERM: 'dumb' },
+        cwd: pluginDir,
+        env: pluginCommandEnv(),
     });
-    return normalizeDiscoveredModels(JSON.parse(stdout));
+    return normalizeDiscoveredModelCatalog(JSON.parse(stdout));
 }
 function pluginTitleNamers() {
     return loadPlugins().plugins.flatMap((plugin) => plugin.manifest.titleNamer
@@ -195,12 +257,144 @@ function pluginTitleNamers() {
                 slug: plugin.manifest.slug,
                 displayName: plugin.manifest.displayName,
                 config: plugin.manifest.titleNamer,
+                dir: plugin.dir,
             }]
         : []);
 }
+export function shouldRunPluginTitleCommands(slug, selected, enabledAgents) {
+    return selected === slug
+        || (selected === 'auto' && enabledAgents.includes(slug));
+}
+function isPluginTitleExecutionEnabled(slug) {
+    return shouldRunPluginTitleCommands(slug, getAutoRenameNamerSetting(), getAutoRenameAgentsSetting());
+}
+async function cacheExplicitPluginProbe(slug, displayName, catalog) {
+    if (!cached)
+        cached = await loadPersistentCache();
+    const current = cached?.value ?? await getTitleNamerCatalog();
+    const value = current.map((entry) => entry.slug === slug
+        ? {
+            slug,
+            displayName,
+            available: true,
+            models: catalog.models,
+            recommendedModel: catalog.recommendedModel,
+        }
+        : entry);
+    cached = { version: 1, updatedAt: Date.now(), value };
+    await savePersistentCache(cached).catch(() => undefined);
+}
+function expandTitleArg(value, pluginDir, prompt, model) {
+    return expandPluginPath(value, pluginDir).replaceAll('{prompt}', prompt).replaceAll('{model}', model);
+}
+export function buildPluginTitleArgs(config, pluginDir, prompt, model) {
+    const baseArgs = [];
+    for (const arg of config.args) {
+        if (arg.includes('{model}') && !model) {
+            // Legacy v2 manifests put paired flags in args. Remove an immediately
+            // preceding standalone flag too, so `-c model={model}` cannot degrade
+            // into the invalid `-c -p ...`. New plugins should use modelArgs.
+            if (baseArgs.at(-1)?.startsWith('-') && !baseArgs.at(-1)?.includes('='))
+                baseArgs.pop();
+            continue;
+        }
+        baseArgs.push(expandTitleArg(arg, pluginDir, prompt, model ?? ''));
+    }
+    const selectedModelArgs = model && config.modelArgs
+        ? config.modelArgs.map((arg) => expandTitleArg(arg, pluginDir, prompt, model))
+        : [];
+    return [...selectedModelArgs, ...baseArgs];
+}
+export async function probePluginTitleNamer(slug) {
+    const plugin = loadPlugins().plugins.find((entry) => entry.manifest.slug === slug);
+    if (!plugin)
+        return null;
+    const config = plugin.manifest.titleNamer;
+    if (!config) {
+        return {
+            slug,
+            displayName: plugin.manifest.displayName,
+            hasTitleNamer: false,
+            hasModelCommand: false,
+            status: 'missing-title-namer',
+            models: [],
+            recommendedModel: null,
+            selectionBehavior: 'This plugin cannot generate titles until manifest.titleNamer is added.',
+            warnings: ['manifest.json has no titleNamer declaration.'],
+            error: null,
+            nextSteps: ['Run `td agent-plugin --json`, add manifest.titleNamer, then update/reinstall the plugin.'],
+        };
+    }
+    const warnings = [];
+    if (!config.modelArgs && config.args.some((arg) => arg.includes('{model}'))) {
+        warnings.push('Legacy {model} placement detected in args; use modelArgs for optional paired flags.');
+    }
+    if (!config.models) {
+        return {
+            slug,
+            displayName: plugin.manifest.displayName,
+            hasTitleNamer: true,
+            hasModelCommand: false,
+            status: 'cli-default',
+            models: [],
+            recommendedModel: null,
+            selectionBehavior: 'Termdock will omit all model arguments and use the Agent CLI default model.',
+            warnings,
+            error: null,
+            nextSteps: ['Optional: add titleNamer.models to expose selectable models; otherwise the CLI default is used.'],
+        };
+    }
+    try {
+        const catalog = await listPluginModels(config, plugin.dir);
+        await cacheExplicitPluginProbe(slug, plugin.manifest.displayName, catalog);
+        if (catalog.ignoredEntries > 0) {
+            warnings.push(`${catalog.ignoredEntries} model entr${catalog.ignoredEntries === 1 ? 'y was' : 'ies were'} ignored because its identifier was invalid or duplicated.`);
+        }
+        if (catalog.models.length > 0 && !catalog.recommendedModel) {
+            warnings.push('No recommendedModel, isEconomical, or isDefault marker was found; automatic mode will use the Agent CLI default model.');
+        }
+        return {
+            slug,
+            displayName: plugin.manifest.displayName,
+            hasTitleNamer: true,
+            hasModelCommand: true,
+            status: catalog.models.length > 0 ? 'ok' : 'no-models',
+            models: catalog.models,
+            recommendedModel: catalog.recommendedModel,
+            selectionBehavior: catalog.recommendedModel
+                ? `Automatic selection will pass model ${catalog.recommendedModel}.`
+                : 'No recommended model was declared; Termdock will omit model arguments and use the Agent CLI default model.',
+            warnings: catalog.models.length === 0
+                ? [...warnings, 'The model command succeeded but returned no usable models.']
+                : warnings,
+            error: null,
+            nextSteps: catalog.models.length > 0
+                ? catalog.recommendedModel
+                    ? ['Select this provider/model in Settings, then enable automatic titles for the Agent.']
+                    : ['Declare recommendedModel, mark one model isEconomical/isDefault, or let users select a model manually.']
+                : ['Return a JSON array (or {models}) using id/name/model plus optional displayName, description, isDefault, and isEconomical fields.'],
+        };
+    }
+    catch (error) {
+        return {
+            slug,
+            displayName: plugin.manifest.displayName,
+            hasTitleNamer: true,
+            hasModelCommand: true,
+            status: 'probe-failed',
+            models: [],
+            recommendedModel: null,
+            selectionBehavior: 'Model selection is unavailable until the probe succeeds; title generation falls back to the Agent CLI default model.',
+            warnings,
+            error: error.message,
+            nextSteps: ['Run the declared models command directly, ensure it prints JSON only, or use a {pluginDir} adapter script to normalize its output.'],
+        };
+    }
+}
 export async function runTitleNamer(slug, prompt, model) {
     let command;
     let args;
+    let cwd;
     if (slug === 'codex') {
         command = 'codex';
         args = ['exec', '--ephemeral', '--skip-git-repo-check', '--color', 'never', ...(model ? ['--model', model] : []), prompt];
@@ -211,20 +405,18 @@ export async function runTitleNamer(slug, prompt, model) {
     }
     else {
         const provider = pluginTitleNamers().find((entry) => entry.slug === slug);
-        if (!provider)
+        if (!provider || !isPluginTitleExecutionEnabled(slug))
             return null;
-        command = provider.config.command;
-        args = provider.config.args.flatMap((arg) => {
-            if (arg.includes('{model}') && !model)
-                return [];
-            return [arg.replaceAll('{prompt}', prompt).replaceAll('{model}', model ?? '')];
-        });
+        cwd = provider.dir;
+        command = expandPluginPath(provider.config.command, provider.dir);
+        args = buildPluginTitleArgs(provider.config, provider.dir, prompt, model);
     }
     try {
         const { stdout } = await execFileAsync(command, args, {
             timeout: 45_000,
             maxBuffer: 256 * 1024,
-            env: { ...process.env, NO_COLOR: '1', TERM: 'dumb' },
+            cwd,
+            env: cwd ? pluginCommandEnv() : { ...process.env, NO_COLOR: '1', TERM: 'dumb' },
         });
         return stdout;
     }
@@ -240,7 +432,9 @@ async function refreshTitleNamerCatalog() {
         const [codex, claude, ...pluginResults] = await Promise.allSettled([
             listCodexModels(),
             listClaudeModels(),
-            ...plugins.map((provider) => listPluginModels(provider.config)),
+            ...plugins.map((provider) => provider.config.models && isPluginTitleExecutionEnabled(provider.slug)
+                ? listPluginModels(provider.config, provider.dir)
+                : Promise.resolve({ models: [], recommendedModel: null, ignoredEntries: 0 })),
         ]);
         const previousCodex = cached?.value.find((namer) => namer.slug === 'codex');
         const previousClaude = cached?.value.find((namer) => namer.slug === 'claude');
@@ -264,13 +458,14 @@ async function refreshTitleNamerCatalog() {
             ...plugins.map((provider, index) => {
                 const result = pluginResults[index];
                 const previous = cached?.value.find((namer) => namer.slug === provider.slug);
-                const models = result?.status === 'fulfilled' ? result.value : previous?.models ?? [];
+                const discovered = result?.status === 'fulfilled' ? result.value : null;
+                const models = discovered?.models ?? previous?.models ?? [];
                 return {
                     slug: provider.slug,
                     displayName: provider.displayName,
                     available: provider.config.models ? result?.status === 'fulfilled' || previous?.available === true : true,
                     models,
-                    recommendedModel: recommendTitleModel(models),
+                    recommendedModel: discovered?.recommendedModel ?? recommendTitleModel(models),
                 };
             }),
         ];