dsh-nextsteps 1.3.2 → 1.3.4

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;
     }

package/index.js

@@ -124,17 +124,19 @@ const PARAMETER_SCHEMA = {
   required: ['followups']
 };
 
-function toolDescription(settings) {
-  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.'
-    : `LANGUAGE OVERRIDE, applies to this tool only: write every prompt and label in ${language} — even if the conversation or the session history is in another language. Never copy the conversation's language here.`;
+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 ${settings.maxFollowups} followup prompts the user is likely to want next.`,
+    'Suggest exactly the number of followup prompts stated in the nextsteps section of the system prompt.',
     '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.`,
-    languageRule,
+    'Write every prompt and label in the language the nextsteps section of the system prompt states.',
     '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:',
@@ -142,12 +144,31 @@ function toolDescription(settings) {
   ].join('\n');
 }
 
+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.`
+    : `LANGUAGE OVERRIDE, applies to the suggest_followups tool only: write every prompt and label in ${language} — even if the conversation or the session history is in another language. Never copy the conversation's language here.`;
+  return [
+    'nextsteps (the followup suggestion cards):',
+    `- Suggest exactly ${settings.maxFollowups} followup prompts when you call suggest_followups.`,
+    `- ${languageRule}`
+  ].join('\n');
+}
+
 const PLUGIN_REV = 'sf-2';
 
-function toolSpec(settings) {
+function toolSpec(settings = { lang: 'auto', maxFollowups: 3, model: '' }) {
+  const external = typeof settings.model === 'string' && settings.model !== '';
   return {
     name: TOOL_NAME,
-    description: toolDescription(settings),
+    description: toolDescription(external),
     parameters: PARAMETER_SCHEMA,
     output: {
       schema: { type: 'string' },
@@ -157,6 +178,7 @@ function toolSpec(settings) {
       ]
     },
     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;
@@ -193,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');
 }
@@ -308,20 +348,35 @@ async function apply(ctx) {
   let settings = settingsLoad();
   const json = (value, status = 200) => new Response(JSON.stringify(value), { status, headers: { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' } });
   const isExternal = (next) => typeof next.model === 'string' && next.model !== '';
-  try {
-    if (!isExternal(settings)) ctx.tools.register(toolSpec(settings));
-  } catch (error) {
-    console.error('dsh-nextsteps: tool registration failed:', error);
-  }
   const reapplyTool = (next) => {
     settings = next;
     try {
-      if (isExternal(next)) ctx.tools.unregister(TOOL_NAME);
-      else ctx.tools.register(toolSpec(settings));
+      try { ctx.tools.unregister(TOOL_NAME); } catch { /* not registered yet */ }
+      ctx.tools.register(toolSpec(next));
     } catch (error) {
       console.error('dsh-nextsteps: tool re-registration failed:', error);
     }
   };
+  try {
+    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 */ }
+        sub.tools.register(toolSpec(settings));
+      } 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);
+      }
+    });
+  }
   ctx.connection?.fetch?.register({
     path: '/api/dsh-nextsteps.settings',
     methods: ['GET', 'POST'],

package/package.json

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