dsh-nextsteps 1.3.3 → 1.4.0

package/client.js

@@ -9,7 +9,7 @@ window.__ModuleLoader__.load({
     const TOOL_NAME = 'suggest_followups';
     const MAX_FOLLOWUPS = 6;
     const PROMPT_TRUNCATE = 60;
-    const CLICKED_KEY = 'dsh.suggest-followups.clicked';
+    const CLICKED_KEY = 'dsh-nextsteps.clicked';
 
 
     const CSS = `
@@ -226,9 +226,12 @@ window.__ModuleLoader__.load({
     function captureForTurn(sessionId, turn) {
       const entries = captures.get(sessionId);
       if (entries === undefined) return null;
+      const external = typeof pluginSettings.model === 'string' && pluginSettings.model !== '';
       let best = null;
-      for (const entry of entries.values()) {
-        if (entry.turn === turn) best = entry;
+      for (const [callId, entry] of entries.entries()) {
+        if (entry.turn !== turn) continue;
+        if (external && !callId.startsWith('generated-')) continue;
+        best = entry;
       }
       return best;
     }
@@ -363,9 +366,9 @@ window.__ModuleLoader__.load({
     const SETTINGS_ROUTE = '/api/dsh-nextsteps.settings';
     const UPDATE_ROUTE = '/api/dsh-nextsteps.update';
     const DICTIONARIES = {
-      en: {"header":"Suggested followups","showEarlier":"Show earlier suggestions","hideEarlier":"Hide earlier suggestions","srFollowupSent":"Followup sent","sendFailed":"Could not send: ","intro":"Suggested next-step prompts under every finished agent turn — one click sends the followup.","setLanguage":"Language","setLanguageTip":"Followups are generated in this language. Auto follows the conversation.","optAuto":"Auto (follow the conversation)","optEn":"English","optPt":"Português (Brasil)","optZh":"简体中文","setModel":"Model","setModelTip":"The model that generates the suggestions. Auto keeps them inside the main turn.","optModelAuto":"Auto (same model as the chat)","setMax":"Followups per turn","setMaxTip":"How many suggested prompts the model should produce (1-6).","setHeader":"Show header","setHeaderTip":"The small “Suggested followups” label above the cards.","updates":"Updates","current":"Version","checking":"Checking…","upToDate":"up to date","available":"{v} is available","manualCopy":"Development or renamed copy — update it manually.","installing":"Installing {v}…","restartMsg":"Version {v} was installed. Restart the dsh to use it.","noReleases":"No releases published yet","checkFailed":"Update check failed ({e})","updateNow":"Update now","check":"Check for updates","openRelease":"Open release page","releaseNotes":"Release notes","repo":"GitHub repository","issues":"Report an issue"},
-      'pt-BR': {"header":"Sugestões de acompanhamento","showEarlier":"Mostrar sugestões anteriores","hideEarlier":"Ocultar sugestões anteriores","srFollowupSent":"Follow-up enviado","sendFailed":"Não consegui enviar: ","intro":"Sugestões de próximos passos sob cada turno concluído do agente — um clique envia o followup.","setLanguage":"Idioma","setLanguageTip":"Os followups são gerados neste idioma. Automático segue a conversa.","optAuto":"Automático (segue a conversa)","optEn":"English","optPt":"Português (Brasil)","optZh":"简体中文","setModel":"Modelo","setModelTip":"O modelo que gera as sugestões. Automático as mantém no turno principal.","optModelAuto":"Automático (mesmo modelo da conversa)","setMax":"Followups por turno","setMaxTip":"Quantas sugestões o modelo deve produzir (1-6).","setHeader":"Mostrar cabeçalho","setHeaderTip":"O rótulo pequeno “Sugestões de acompanhamento” acima dos cartões.","updates":"Atualizações","current":"Versão","checking":"Verificando…","upToDate":"em dia","available":"{v} disponível","manualCopy":"Cópia de desenvolvimento ou renomeada — atualize manualmente.","installing":"Instalando {v}…","restartMsg":"Versão {v} instalada. Reinicie o dsh para usá-la.","noReleases":"Nenhum release publicado ainda","checkFailed":"Falha ao verificar atualizações ({e})","updateNow":"Atualizar agora","check":"Verificar atualizações","openRelease":"Abrir página do release","releaseNotes":"Notas do release","repo":"Repositório no GitHub","issues":"Reportar um problema"},
-      'zh-CN': {"header":"建议的后续操作","showEarlier":"显示较早的建议","hideEarlier":"隐藏较早的建议","srFollowupSent":"后续操作已发送","sendFailed":"发送失败：","intro":"在每个智能体回合完成后的下方推荐下一步提示——单击即可发送。","setLanguage":"语言","setLanguageTip":"后续操作提示将以此语言生成。“自动”会跟随对话语言。","optAuto":"自动（跟随对话）","optEn":"English","optPt":"Português (Brasil)","optZh":"简体中文","setModel":"模型","setModelTip":"生成建议的模型。自动会跟随对话所用的模型。","optModelAuto":"自动（与对话相同的模型）","setMax":"每回合提示数","setMaxTip":"模型应生成的建议提示数量（1-6）。","setHeader":"显示标题","setHeaderTip":"卡片上方的小标题“建议的后续操作”。","updates":"更新","current":"版本","checking":"检查中…","upToDate":"已是最新","available":"{v} 可用","manualCopy":"开发或重命名的副本——请手动更新。","installing":"正在安装 {v}…","restartMsg":"版本 {v} 已安装。请重启 dsh 以使用。","noReleases":"尚未发布任何版本","checkFailed":"检查更新失败（{e}）","updateNow":"立即更新","check":"检查更新","openRelease":"打开发布页","releaseNotes":"发布说明","repo":"GitHub 仓库","issues":"反馈问题"}
+      en: {"header":"Suggested followups","showEarlier":"Show earlier suggestions","hideEarlier":"Hide earlier suggestions","srFollowupSent":"Followup sent","sendFailed":"Could not send: ","intro":"Suggested next-step prompts under every finished agent turn — one click sends the followup.","setLanguage":"Language","setLanguageTip":"Followups are generated in this language. Auto follows the conversation.","optAuto":"Auto (follow the conversation)","optEn":"English","optPt":"Português (Brasil)","optZh":"简体中文","setModel":"Model","setModelTip":"The model that generates the suggestions. Auto keeps them inside the main turn.","optModelAuto":"Auto (same model as the chat)","modelUnavailable":"No model list available in this install","setMax":"Followups per turn","setMaxTip":"How many suggested prompts the model should produce (1-6).","setHeader":"Show header","setHeaderTip":"The small “Suggested followups” label above the cards.","updates":"Updates","current":"Version","checking":"Checking…","upToDate":"up to date","available":"{v} is available","manualCopy":"Development or renamed copy — update it manually.","installing":"Installing {v}…","restartMsg":"Version {v} was installed. Restart the dsh to use it.","noReleases":"No releases published yet","checkFailed":"Update check failed ({e})","updateNow":"Update now","check":"Check for updates","openRelease":"Open release page","releaseNotes":"Release notes","repo":"GitHub repository","issues":"Report an issue"},
+      'pt-BR': {"header":"Sugestões de acompanhamento","showEarlier":"Mostrar sugestões anteriores","hideEarlier":"Ocultar sugestões anteriores","srFollowupSent":"Follow-up enviado","sendFailed":"Não consegui enviar: ","intro":"Sugestões de próximos passos sob cada turno concluído do agente — um clique envia o followup.","setLanguage":"Idioma","setLanguageTip":"Os followups são gerados neste idioma. Automático segue a conversa.","optAuto":"Automático (segue a conversa)","optEn":"English","optPt":"Português (Brasil)","optZh":"简体中文","setModel":"Modelo","setModelTip":"O modelo que gera as sugestões. Automático as mantém no turno principal.","optModelAuto":"Automático (mesmo modelo da conversa)","modelUnavailable":"Nenhuma lista de modelos disponível nesta instalação","setMax":"Followups por turno","setMaxTip":"Quantas sugestões o modelo deve produzir (1-6).","setHeader":"Mostrar cabeçalho","setHeaderTip":"O rótulo pequeno “Sugestões de acompanhamento” acima dos cartões.","updates":"Atualizações","current":"Versão","checking":"Verificando…","upToDate":"em dia","available":"{v} disponível","manualCopy":"Cópia de desenvolvimento ou renomeada — atualize manualmente.","installing":"Instalando {v}…","restartMsg":"Versão {v} instalada. Reinicie o dsh para usá-la.","noReleases":"Nenhum release publicado ainda","checkFailed":"Falha ao verificar atualizações ({e})","updateNow":"Atualizar agora","check":"Verificar atualizações","openRelease":"Abrir página do release","releaseNotes":"Notas do release","repo":"Repositório no GitHub","issues":"Reportar um problema"},
+      'zh-CN': {"header":"建议的后续操作","showEarlier":"显示较早的建议","hideEarlier":"隐藏较早的建议","srFollowupSent":"后续操作已发送","sendFailed":"发送失败：","intro":"在每个智能体回合完成后的下方推荐下一步提示——单击即可发送。","setLanguage":"语言","setLanguageTip":"后续操作提示将以此语言生成。“自动”会跟随对话语言。","optAuto":"自动（跟随对话）","optEn":"English","optPt":"Português (Brasil)","optZh":"简体中文","setModel":"模型","setModelTip":"生成建议的模型。自动会跟随对话所用的模型。","optModelAuto":"自动（与对话相同的模型）","modelUnavailable":"此安装没有可用的模型列表","setMax":"每回合提示数","setMaxTip":"模型应生成的建议提示数量（1-6）。","setHeader":"显示标题","setHeaderTip":"卡片上方的小标题“建议的后续操作”。","updates":"更新","current":"版本","checking":"检查中…","upToDate":"已是最新","available":"{v} 可用","manualCopy":"开发或重命名的副本——请手动更新。","installing":"正在安装 {v}…","restartMsg":"版本 {v} 已安装。请重启 dsh 以使用。","noReleases":"尚未发布任何版本","checkFailed":"检查更新失败（{e}）","updateNow":"立即更新","check":"检查更新","openRelease":"打开发布页","releaseNotes":"发布说明","repo":"GitHub 仓库","issues":"反馈问题"}
     };
     let pluginSettings = { lang: 'auto', maxFollowups: 3, showHeader: true };
     let pluginVersion;
@@ -611,7 +614,7 @@ window.__ModuleLoader__.load({
           row(t('setLanguage'), t('setLanguageTip'), h('select', { value: settings.lang, onChange: (event) => save({ lang: event.target.value }), style: controlStyle, 'aria-label': t('setLanguage') },
                       h('option', { value: 'auto' }, t('optAuto')),
           ...LANGUAGE_OPTIONS.map((option) => h('option', { key: option.value, value: option.value }, option.label))), 'lang'),
-          row(t('setModel'), t('setModelTip'), (models === undefined || (models.groups ?? []).length === 0) ? h('span', { style: { fontSize: 12, color: 'var(--dsw-alias-label-tertiary)' } }, t('checking')) : h('select', { value: settings.model, onChange: (event) => save({ model: event.target.value }), style: controlStyle, 'aria-label': t('setModel') },
+          row(t('setModel'), t('setModelTip'), models === undefined ? h('span', { style: { fontSize: 12, color: 'var(--dsw-alias-label-tertiary)' } }, t('checking')) : (models.groups ?? []).length === 0 ? h('span', { style: { fontSize: 12, color: 'var(--dsw-alias-label-tertiary)' } }, t('modelUnavailable')) : h('select', { value: settings.model, onChange: (event) => save({ model: event.target.value }), style: controlStyle, 'aria-label': t('setModel') },
             h('option', { value: '' }, t('optModelAuto')),
             ...(models.groups ?? []).map((group) => h('optgroup', { key: group.id, label: group.name },
               group.models.map((entry) => h('option', { key: group.id + '/' + entry.id, value: group.id + '/' + entry.id }, entry.name === entry.id ? entry.name : entry.name + ' (' + entry.id + ')'))))), 'model'),

package/index.js

@@ -6,7 +6,7 @@ import path from 'node:path';
 
 const TOOL_NAME = 'suggest_followups';
 const name = 'dsh-nextsteps';
-const inject = ['tools', 'connection', 'sessionQuery'];
+const inject = ['tools', 'connection'];
 const NPM_NAME = 'dsh-nextsteps';
 const RELEASES_URL = 'https://api.github.com/repos/klaus-2/dsh-nextsteps/releases/latest';
 const SETTINGS_FILE = path.join(homedir(), '.dsh', 'dsh-nextsteps', 'settings.json');
@@ -124,13 +124,19 @@ const PARAMETER_SCHEMA = {
   required: ['followups']
 };
 
-function toolDescription() {
+function toolDescription(external = false) {
+  if (external) {
+    return [
+      'This tool is not used any more: the host generates the followup suggestions after your turn with a separate model.',
+      'Do not call it. Just finish your answer as usual.'
+    ].join('\n');
+  }
   return [
     'MANDATORY in every turn: once all real work and other tool calls are done, call this tool BEFORE writing your final answer — the answer must come after this tool returns, so the turn ends cleanly right after it. Never write your final answer before calling it.',
-    'Suggest exactly the number of followup prompts stated in the nextsteps section of the system prompt.',
+    'Suggest exactly the number of followup prompts stated in the nextsteps section of the system prompt; when there is no such section, suggest three.',
     'Good suggestions include alternatives to the latest implementation, related features, cleanup opportunities, tests to add, or verification steps you could run yourself; if plan steps remain, one suggestion may be continuing with the next step.',
     `Each prompt must be short (usually one sentence), goal-oriented — name the outcome, not the steps — stand alone without conversation context, and be phrased in the user's first-person voice.`,
-    'Write every prompt and label in the language the nextsteps section of the system prompt states.',
+    'Write every prompt and label in the language the nextsteps section of the system prompt states; when there is no such section, use the language of the conversation.',
     'Never suggest actions the user would carry out themselves outside this session (e.g. "commit these changes"); judge by the tools you actually have.',
     'This never waits for an answer: its result only confirms the suggestions were recorded.',
     'Example input:',
@@ -140,6 +146,11 @@ function toolDescription() {
 
 function nextstepsSectionText() {
   const settings = settingsLoad();
+  if (typeof settings.model === 'string' && settings.model !== '') {
+    return [
+      'nextsteps (the followup suggestion cards): the host generates them after your turn with a separate model, so you must not call any followup tool. Just finish your answer as usual.'
+    ].join('\n');
+  }
   const language = LANGUAGE_NAMES[settings.lang] ?? LANGUAGE_NAMES.auto;
   const languageRule = settings.lang === 'auto'
     ? `Write every prompt and label in the same language the conversation has been using.`
@@ -153,10 +164,11 @@ function nextstepsSectionText() {
 
 const PLUGIN_REV = 'sf-2';
 
-function toolSpec() {
+function toolSpec(settings = { lang: 'auto', maxFollowups: 3, model: '' }) {
+  const external = typeof settings.model === 'string' && settings.model !== '';
   return {
     name: TOOL_NAME,
-    description: toolDescription(),
+    description: toolDescription(external),
     parameters: PARAMETER_SCHEMA,
     output: {
       schema: { type: 'string' },
@@ -166,6 +178,7 @@ function toolSpec() {
       ]
     },
     async execute(args) {
+      if (external) return 'The host generates the followup suggestions after this turn. Do not call this tool again.';
       const followups = coerceFollowups(args.followups);
       const problem = validationProblem(followups);
       if (problem !== null) return problem;
@@ -202,15 +215,33 @@ async function modelCatalog(ctx) {
   return out;
 }
 
+function textOf(content) {
+  if (typeof content === 'string') return content;
+  if (!Array.isArray(content)) return '';
+  const parts = [];
+  for (const part of content) {
+    if (part === null || typeof part !== 'object') continue;
+    if (part.type === 'text' && typeof part.text === 'string') parts.push(part.text);
+    else if (part.type === 'reasoning' && typeof part.text === 'string') parts.push(part.text);
+  }
+  return parts.join('\n');
+}
+
 function turnTranscript(events, afterSeq) {
   const lines = [];
   for (const entry of events) {
     const event = entry?.event ?? entry;
     if (event === null || typeof event !== 'object') continue;
     if (Number.isSafeInteger(afterSeq) && Number.isSafeInteger(event.seq) && event.seq > afterSeq) break;
-    if (event.type === 'user/message' && typeof event.data?.text === 'string') lines.push(`User: ${event.data.text.slice(0, 2000)}`);
-    else if (event.type === 'agent/message' && typeof event.data?.text === 'string') lines.push(`Assistant: ${event.data.text.slice(0, 2000)}`);
-    else if (event.type === 'tool/call' && typeof event.data?.name === 'string') lines.push(`Tool call: ${event.data.name}`);
+    if (event.type === 'user/message') {
+      const text = textOf(event.data?.content);
+      if (text !== '' && event.data?.source?.kind === 'user') lines.push(`User: ${text.slice(0, 2000)}`);
+    } else if (event.type === 'assistant/message') {
+      const text = textOf(event.data?.message?.content);
+      if (text !== '') lines.push(`Assistant: ${text.slice(0, 2000)}`);
+    } else if (event.type === 'tool/call' && typeof event.data?.name === 'string') {
+      lines.push(`Tool call: ${event.data.name}`);
+    }
   }
   return lines.join('\n\n');
 }
@@ -321,30 +352,25 @@ async function apply(ctx) {
     settings = next;
     try {
       try { ctx.tools.unregister(TOOL_NAME); } catch { /* not registered yet */ }
-      if (!isExternal(next)) ctx.tools.register(toolSpec());
+      ctx.tools.register(toolSpec(next));
     } catch (error) {
       console.error('dsh-nextsteps: tool re-registration failed:', error);
     }
   };
   try {
-    if (!isExternal(settings)) ctx.tools.register(toolSpec());
+    ctx.tools.register(toolSpec(settings));
   } catch (error) {
     console.error('dsh-nextsteps: tool registration failed:', error);
   }
-  if (typeof ctx.inject === 'function') {
-    ctx.inject(['tools', 'systemPrompt'], (sub) => {
-      try {
-        try { sub.tools.unregister(TOOL_NAME); } catch { /* not registered yet */ }
-        if (!isExternal(settings)) sub.tools.register(toolSpec());
-      } catch (error) {
-        console.error('dsh-nextsteps: tool registration via inject failed:', error);
-      }
-      try {
-        sub.systemPrompt.section({ name: 'dsh-nextsteps', order: 640, interpolate: false, text: () => nextstepsSectionText() });
-      } catch (error) {
-        console.error('dsh-nextsteps: system prompt section rejected:', error);
-      }
-    });
+  const systemPrompt = get(ctx, 'systemPrompt');
+  if (systemPrompt !== undefined && typeof systemPrompt.section === 'function') {
+    try {
+      systemPrompt.section({ name: 'dsh-nextsteps', order: 640, interpolate: false, text: () => nextstepsSectionText() });
+    } catch (error) {
+      console.error('dsh-nextsteps: system prompt section rejected:', error);
+    }
+  } else {
+    console.warn('dsh-nextsteps: the system prompt service is unavailable; the suggestions follow the conversation language');
   }
   ctx.connection?.fetch?.register({
     path: '/api/dsh-nextsteps.settings',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-nextsteps",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "type": "module",
   "exports": {
     ".": "./index.js",